1111

dist/js/chat/index.js

@@ -129,7 +129,7 @@ $(function () {
             var id, name, img, touserid, img1;
             var id, name, img, touserid, img1;
             if (isDefault) {
             if (isDefault) {
                 id = this.defaultName;
                 id = this.defaultName;
-                name = 'IC助手客服';
+                name = '芯掌柜客服';
                 touserid = "";
                 touserid = "";
                 img = dist + "/images/timg.jpg";
                 img = dist + "/images/timg.jpg";
                 img1 = dist + "/images/timg.jpg";
                 img1 = dist + "/images/timg.jpg";
@@ -650,7 +650,7 @@ $(function () {
             };
             };
             if (message.from == this.defaultName) {
             if (message.from == this.defaultName) {
                 obj.img = dist + "/images/timg.jpg";
                 obj.img = dist + "/images/timg.jpg";
-                obj.name = 'IC助手客服';
+                obj.name = '芯掌柜客服';
             } else {
             } else {
                 obj.img = message.ext.img || (dist + "/images/default.jpg");
                 obj.img = message.ext.img || (dist + "/images/default.jpg");
                 obj.name = message.ext.name || '--';
                 obj.name = message.ext.name || '--';
@@ -736,7 +736,7 @@ $(function () {
                 success: function (id, serverMsgId) {
                 success: function (id, serverMsgId) {
                     $('#' + userId).find('.notice_item_content').append(self.messageHtml(1, {
                     $('#' + userId).find('.notice_item_content').append(self.messageHtml(1, {
                         message: emojiMessage,
                         message: emojiMessage,
-                        name: self.customerNum == self.defaultName ? 'IC助手客服' : self.name,
+                        name: self.customerNum == self.defaultName ? '芯掌柜客服' : self.name,
                         img: self.customerNum == self.defaultName ? dist + "/images/timg.jpg" : self.img,
                         img: self.customerNum == self.defaultName ? dist + "/images/timg.jpg" : self.img,
                         id: self.id
                         id: self.id
                     }, false));
                     }, false));
@@ -843,7 +843,7 @@ $(function () {
                     var htmlStr = '<img src ="' + file.url + '" class="edit_img"/>';
                     var htmlStr = '<img src ="' + file.url + '" class="edit_img"/>';
                     $('#' + userId).find('.notice_item_content').append(self.messageHtml(1, {
                     $('#' + userId).find('.notice_item_content').append(self.messageHtml(1, {
                         message: htmlStr,
                         message: htmlStr,
-                        name: self.customerNum == self.defaultName ? 'IC助手客服' : self.name,
+                        name: self.customerNum == self.defaultName ? '芯掌柜客服' : self.name,
                         img: self.customerNum == self.defaultName ? dist + "/images/timg.jpg" : self.img,
                         img: self.customerNum == self.defaultName ? dist + "/images/timg.jpg" : self.img,
                         id: self.id
                         id: self.id
                     }, false));
                     }, false));

dist/js/global/global.min.js

@@ -437,7 +437,7 @@
       return {
       return {
         randomStr: randomStr,
         randomStr: randomStr,
         singnatrueStr: singnatrueStr,
         singnatrueStr: singnatrueStr,
-        timestampStr:timestamp
+        timestampStr: timestamp
       }
       }
     },
     },
     sort: function (arr) { //数组排序
     sort: function (arr) { //数组排序
@@ -511,19 +511,19 @@
       }).join("");
       }).join("");
       return hex;
       return hex;
     },
     },
-    showOrHideQrcode:function(ele1,ele2){
+    showOrHideQrcode: function (ele1, ele2) {
       $('.' + ele1).hover(function () {
       $('.' + ele1).hover(function () {
         $('.' + ele2).slideDown()
         $('.' + ele2).slideDown()
       }, function () {
       }, function () {
         $('.' + ele2).stop().slideUp()
         $('.' + ele2).stop().slideUp()
       })
       })
     },
     },
-    fourPoint:function(num){//检测价格是否是四位小数点的小数
-          var strArr = num.split('.');
-          if ((strArr.length == 1) || (strArr.length == 2 && strArr[1].length == 4)) {
-            return true
-          } else {
+    fourPoint: function (num) { //检测价格是否是四位小数点的小数
+      var reg = /^(([1-9][0-9]*)|(([0]\.\d{1,4}|[1-9][0-9]*\.\d{1,4})))$/;
+      if (!reg.test(num)) {
         return false;
         return false;
+      } else {
+        return true;
       }
       }
     }
     }
   };
   };

dist/js/goodmanage/uploadsingle.js

@@ -317,7 +317,7 @@
         },
         },
         pointLimit: function (value, item) {
         pointLimit: function (value, item) {
           if(!Util.fourPoint(value)){
           if(!Util.fourPoint(value)){
-              return '价格只支持4位小数点'
+              return '价格为整数或不超过4位小数'
           }
           }
       },
       },
       });
       });

dist/js/quoteprice/quotedetail.js

@@ -219,7 +219,7 @@ $(function () {
                 },
                 },
                 pointLimit: function (value, item) {
                 pointLimit: function (value, item) {
                     if(!Util.fourPoint(value)){
                     if(!Util.fourPoint(value)){
-                        return '价格只支持4位小数点'
+                        return '价格为整数或不超过4位小数'
                     }
                     }
                 },
                 },
             });
             });

dist/js/quoteprice/releaseinquiry.js

@@ -218,7 +218,7 @@
         },
         },
         pointLimit: function (value, item) {
         pointLimit: function (value, item) {
           if(!Util.fourPoint(value)){
           if(!Util.fourPoint(value)){
-              return '价格只支持4位小数点'
+              return '价格为整数或不超过4位小数'
           }
           }
       },
       },
       });
       });