Merge branch 'master' of http://119.23.72.7/shiyu/icsales

dist/css/bulkupload.css

@@ -78,3 +78,4 @@
 .upload_bulk_content .inquiry_form .upload_text p {
   margin-top: 10px;
 }
+/*# sourceMappingURL=bulkupload.css.map */
\ No newline at end of file

dist/css/bulkupload.css.map

-{"version":3,"sources":["bulkupload.less"],"names":[],"mappings":"AAAA;EACI,eAAA;;AADJ,oBAGI;EACI,eAAA;;AAJR,oBAOI;EACI,sBAAA;EACA,oBAAA;;AATR,oBAOI,cAII;EACI,oBAAA;;AAZZ,oBAOI,cAII,WAGI;EACI,eAAA;EACA,cAAA;EACA,iBAAA;;AAjBhB,oBAOI,cAII,WASI;EACI,eAAA;EACA,WAAA;EACA,YAAA;EACA,iBAAA;EACA,eAAA;EACA,kBAAA;EACA,yBAAA;;AA3BhB,oBAOI,cAyBI;EACI,YAAA;EACA,iBAAA;EACA,yBAAA;EACA,wBAAA;EACA,cAAA;EACA,eAAA;;AAtCZ,oBAOI,cAyBI,IAQI;EACI,eAAA;EACA,oBAAA;;AA1ChB,oBAOI,cAuCI;EACI,oBAAA;EACA,yBAAA;EACA,aAAA;EACA,0BAAA;EACA,kBAAA;EACA,eAAA;;AApDZ,oBAOI,cAuCI,gBAQI;EACI,cAAA;EACA,eAAA;EACA,iBAAA;;AAzDhB,oBAOI,cAuCI,gBAcI;EACI,eAAA;EACA,cAAA;EACA,gBAAA;;AA/DhB,oBAOI,cA4DI;EACI,kBAAA;EACA,gBAAA;;AArEZ,oBAOI,cA4DI,SAGI;EACI,YAAA;;AACA,oBAjEZ,cA4DI,SAGI,EAEK;EACG,iBAAA;;AAEJ,oBApEZ,cA4DI,SAGI,EAKK,GAAG;EACF,2BAAA;;AA5ElB,oBAOI,cA0EI;EACI,gBAAA;EACA,cAAA;EACA,mBAAA;EACA,eAAA;;AArFZ,oBAOI,cA0EI,aAKI;EACI,gBAAA","file":"bulkupload.css"}
\ No newline at end of file
+{"version":3,"sources":["bulkupload.less"],"names":[],"mappings":"AAAA;EACI,eAAA;;AADJ,oBAGI;EACI,eAAA;;AAJR,oBAOI;EACI,sBAAA;EACA,oBAAA;EACA,kBAAA;;AAVR,oBAOI,cAKI;EACI,oBAAA;;AAbZ,oBAOI,cAKI,WAGI;EACI,eAAA;EACA,cAAA;EACA,iBAAA;;AAlBhB,oBAOI,cAKI,WASI;EACI,eAAA;EACA,WAAA;EACA,YAAA;EACA,iBAAA;EACA,eAAA;EACA,kBAAA;EACA,yBAAA;;AA5BhB,oBAOI,cA0BI;EACI,YAAA;EACA,iBAAA;EACA,yBAAA;EACA,wBAAA;EACA,cAAA;EACA,eAAA;;AAvCZ,oBAOI,cA0BI,IAQI;EACI,eAAA;EACA,oBAAA;;AA3ChB,oBAOI,cAwCI;EACI,oBAAA;EACA,yBAAA;EACA,aAAA;EACA,0BAAA;EACA,kBAAA;EACA,eAAA;;AArDZ,oBAOI,cAwCI,gBAOI;EACI,cAAA;EACA,eAAA;EACA,iBAAA;;AAzDhB,oBAOI,cAwCI,gBAaI;EACI,eAAA;EACA,cAAA;EACA,gBAAA;;AA/DhB,oBAOI,cA2DI;EACI,kBAAA;EACA,gBAAA;;AApEZ,oBAOI,cA2DI,SAGI;EACI,YAAA;;AACA,oBAhEZ,cA2DI,SAGI,EAEK;EACG,iBAAA;;AAEJ,oBAnEZ,cA2DI,SAGI,EAKK,GAAG;EACF,2BAAA;;AA3ElB,oBAOI,cAyEI;EACI,gBAAA;EACA,cAAA;EACA,mBAAA;EACA,eAAA;;AApFZ,oBAOI,cAyEI,aAKI;EACI,gBAAA","file":"bulkupload.css"}
\ No newline at end of file

dist/css/person.css

@@ -175,6 +175,7 @@ body {
   font-size: 16px;
   line-height: 40px;
   text-indent: 1em;
+  height: 40px;
 }
 .person .wrap .verify-code .input-wrap .w.w1 {
   width: 255px;
@@ -271,6 +272,7 @@ body {
   font-size: 16px;
   line-height: 40px;
   text-indent: 1em;
+  height: 40px;
 }
 .person .wrap .login .input-wrap .w.w1 {
   width: 255px;
@@ -360,6 +362,7 @@ body {
   font-size: 16px;
   line-height: 40px;
   text-indent: 1em;
+  height: 40px;
 }
 .person .wrap .register .input-wrap .w.w1 {
   width: 255px;

dist/css/person.less

@@ -208,6 +208,7 @@ body {
           font-size: 16px;
           line-height: 40px;
           text-indent: 1em;
+          height: 40px;
 
           &.w1 {
             width: 255px;
@@ -287,7 +288,7 @@ body {
         }
       }
 
-      .iconiconxiantiaoshouji,.iconjuxing27 {
+      .iconiconxiantiaoshouji, .iconjuxing27 {
         font-size: 20px;
         color: #adb6bf;
         width: 112px;
@@ -321,6 +322,7 @@ body {
           font-size: 16px;
           line-height: 40px;
           text-indent: 1em;
+          height: 40px;
 
           &.w1 {
             width: 255px;
@@ -397,7 +399,7 @@ body {
         }
       }
 
-      .iconjuxing27,.iconiconxiantiaoshouji{
+      .iconjuxing27, .iconiconxiantiaoshouji {
         font-size: 20px;
         color: #adb6bf;
         width: 112px;
@@ -422,7 +424,7 @@ body {
           font-size: 16px;
           line-height: 40px;
           text-indent: 1em;
-
+          height: 40px;
           &.w1 {
             width: 255px;
           }
@@ -449,7 +451,7 @@ body {
           }
         }
 
-        .codepic{
+        .codepic {
           cursor: pointer;
         }
 

dist/js/global/global.min.js

@@ -3,10 +3,10 @@
     init: function () {
       this.mounted(this).handleBind(this);
     },
-    getData: function (url, type, param, callback,isload,isheader) {
+    getData: function (url, type, param, callback, isload, isheader) {
       
       //是否启动loadin效果
-      if(isload == undefined){
+      if (isload == undefined) {
         var index = layer.load(1, {
           offset: ['50%', "50%"],
           shade: false
@@ -25,8 +25,8 @@
       }
       // if(isheader){
       $.ajaxSetup({
-          headers:{
-            Authorization:'Bearer '+Util.getCookie('token')
+        headers: {
+          Authorization: 'Bearer ' + Util.getCookie('token')
         },
       });
       // };
@@ -125,11 +125,11 @@
      * @param name
      */
     delCookie: function (name, domain) {
+      domain = domain ? ";domain=" + domain : "";
       var exp = new Date();
-      exp.setTime(exp.getTime() - 1);
-      var cval = this.getCookie(name);
-      if (cval != null)
-        document.cookie = name + "=" + cval + ";expires=" + exp.toGMTString() + ";path=/" + domain;
+      exp.setTime(exp.getTime() - 10000);
+      document.cookie = name + "=" + '' + ";expires=" + exp.toGMTString() + ";path=/" + domain;
+      return true;
     },
     /**
      * 获取参数