Merge branch 'developer' into developerA

src/main/resources/static/js/pay/caimei-pay.js

@@ -235,9 +235,9 @@ var payContainer = new Vue({
                 _self.isPayAlert = false;
                 var data = response.data.data;
                 if(data.status === '1'){
-                    window.location.href = '/pay/success.html?pageType=wechat&type=success&payAmount='+ _self.payInfo.payUnpaidAmount;
+                    window.location.href = '/pay/success.html?pageType=www&type=success&payAmount='+ _self.payInfo.payUnpaidAmount;
                 }else{
-                    window.location.href = '/pay/success.html?pageType=wechat&type=error&payAmount='+ _self.payInfo.payUnpaidAmount;
+                    window.location.href = '/pay/success.html?pageType=www&type=error&payAmount='+ _self.payInfo.payUnpaidAmount;
                 }
             });
         },

src/main/resources/static/js/supplier-center/setting/information.js

@@ -87,7 +87,7 @@
             license: '^[a-zA-Z0-9_]{18}$',
             email: '^(([^<>()\\[\\]\\\\.,;:\\s@&quot;]+(\\.[^<>()\\[\\]\\\\.,;:\\s@&quot;]+)*)|(&quot;.+&quot;))@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$',
             password: "^[^\\u4e00-\\u9fa5]{8,16}$",
-            num:'^[1-9]+(.[0-9]{2})?$'
+            num:'^[0-9]+(.[0-9]{2})?$'
         },
         provinceArray:[],
         cityArray: [],//市

src/main/resources/templates/shopping/cart.html

@@ -49,7 +49,7 @@
                     <div class="c0">
                         <input class="check" type="checkbox" @change="ckeckSupplier($event, supplier.isChecked)" v-model="supplier.isChecked">
                     </div>
-                    <a  class="shop" :href="'/supplier-'+supplier.id+'.html'" target="_blank">
+                    <a  class="shop" :href="'/supplier-'+supplier.shopId+'.html'" target="_blank">
                         <img class="img" :src="supplier.shopLogo">
                         <span class="name" v-text="supplier.shopName"></span>
                     </a>

src/main/resources/templates/supplier-center/shop/release.html

@@ -218,7 +218,7 @@
                             </div>
                             <div class="release-from clear">
                                 <div class="release-label"><span class="star">*</span>包装规格:</div>
-                                <div class="release-input"><input class="input" v-model="releaseParams.unit" type="text" placeholder="请输入包装规格，如：台，30ml/瓶" @blur="blur_aliasUnit"></div>
+                                <div class="release-input"><input class="input" v-model="releaseParams.unit" type="text" placeholder="请输入包装规格，如：台，30ml/瓶" @blur="blur_aliasUnit" maxlength="20"></div>
                                 <div class="release-tips" v-show="vShow_Unit">{{fromMessage}}</div>
                             </div>
                             <div class="release-from clear">