李非凡 7 年之前
父节点
当前提交
b6de5048d2
共有 6 个文件被更改,包括 10 次插入29 次删除
  1. 1 1
      .babelrc
  2. 1 0
      src/demo.vue
  3. 1 1
      src/demo/demonav.vue
  4. 6 1
      src/package/dialog/src/dialog.vue
  5. 0 25
      src/package/luckycard/src/luckycard.js
  6. 1 1
      webpack.config.js

+ 1 - 1
.babelrc

@@ -6,4 +6,4 @@
     "transform-runtime",
     "syntax-dynamic-import"
   ]
-}
+}

+ 1 - 0
src/demo.vue

@@ -27,6 +27,7 @@ body{
   padding: 8px;
   padding-top: 40px;
   min-height:100vh;
+  box-sizing:border-box;
 }
 .button-primary {
     display: block;

+ 1 - 1
src/demo/demonav.vue

@@ -17,7 +17,7 @@ export default {
     },
     methods:{
         goback(){
-            if (self != top) { 
+            if (self != top || history.length===1) { 
                 this.$router.push('./index');
             }else{
                 history.back();

+ 6 - 1
src/package/dialog/src/dialog.vue

@@ -112,6 +112,7 @@ export default {
     display: flex;
     align-items: center;
     justify-content: center;
+    z-index:9998;
 }
 
 .nut-dialog {
@@ -203,19 +204,23 @@ export default {
     font-size: .32rem;
     border: none;
     background: transparent;
-    border-radius:0;
     &.disabled {
         background: #DADADA;
         color: #A3A3A3;
     }
+    &:only-child{
+        border-radius: 0 0 .2rem .2rem;
+    }
 }
 
 .nut-dialog-ok {
+    border-radius: 0 0 .2rem 0;
     background: #F23030;
     color: #FFF;
 }
 
 .nut-dialog-cancel {
+    border-radius: 0 0 0 .2rem;
     border-top: 1px solid #E0E0E0;
 }
 

+ 0 - 25
src/package/luckycard/src/luckycard.js

@@ -3,21 +3,11 @@
  *
  * Copyright (c) 2015 Frans Lee dmon@foxmail.com
  *
- * https://github.com/Franslee/lucky-card
- *
  * Licensed under the MIT license:
  *   http://www.opensource.org/licenses/mit-license.php
  *
  * Version:  1.0.3
- *
- * Update:
- *          1.0.1 Fixed a bug with "coverImg".(Thanks to dongnanyanhai reported the problem) 2015-11-10
- *          1.0.2 Fixed a bug when page can be scrolling.(Thanks to agileago's report & Tomatoo's pull) 2016-03-17
- *          1.0.3 Fixed some bugs. 2017-08-17
- *
  */
-/* ;
-(function(window, document, undefined) { */
     'use strict';
 
     /**
@@ -194,7 +184,6 @@
         /* this.scratchDiv = document.getElementById('scratch');*/
         if (!this.scratchDiv) return;
         this.cardDiv = this.scratchDiv.querySelector('.nut-content'); 
-        console.log(this.cardDiv);
         if (!this.cardDiv) return;
         
         this.cHeight = this.cardDiv.clientHeight;
@@ -214,18 +203,4 @@
         return new LuckyCard(settings, callback);
     };
 
-
-/*     if (typeof define === 'function' && typeof define.amd === 'object' && define.amd) {
-        define(function() {
-            return LuckyCard;
-        });
-    } else if (typeof module !== 'undefined' && module.exports) {
-        module.exports = LuckyCard.case;
-        module.exports.LuckyCard = LuckyCard;
-    } else {
-        window.LuckyCard = LuckyCard;
-    }
-
-})(window, document); */
-
 export default LuckyCard.case;

+ 1 - 1
webpack.config.js

@@ -122,7 +122,7 @@ if (isProduction) {
     webpackConfig.devServer = {
         contentBase: path.resolve(__dirname, 'dist'),
         compress: true, //gzip压缩
-        //host:'192.168.191.1',
+        // host:'10.0.39.18',
         historyApiFallback: true
     };
 }