注释权限

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_store_maintain_ctrl.js

@@ -227,10 +227,10 @@ define(['app/app'], function (app) {
          */
         $scope.checkWeixin = function () {
             var enWeixin = angular.element('.enWeixin').val();
-            // if (!/^[a-zA-Z]{1}[-_a-zA-Z0-9]{5,19}$/.test(enWeixin) && enWeixin) {
-            //     toaster.pop('error', '请输入正确的微信号');
-            //     return false;
-            // }
+            if (!/^[a-zA-Z]{1}[-_a-zA-Z0-9]{5,19}$/.test(enWeixin) && enWeixin) {
+                toaster.pop('error', '请输入正确的微信号');
+                return false;
+            }
 
         }
 
@@ -284,10 +284,10 @@ define(['app/app'], function (app) {
                 return false;
             }
 
-            // if (!/^[a-zA-Z]{1}[-_a-zA-Z0-9]{5,19}$/.test(enWeixin) && enWeixin) {
-            //     toaster.pop('error', '请输入正确的微信号');
-            //     return false;
-            // }
+            if (!/^[a-zA-Z]{1}[-_a-zA-Z0-9]{5,19}$/.test(enWeixin) && enWeixin) {
+                toaster.pop('error', '请输入正确的微信号');
+                return false;
+            }
             if (!/^[1-9][0-9]{4,10}$/.test(enQQ) && enQQ) {
                 toaster.pop('error', '请输入正确的QQ号');
                 return false;

src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -2142,7 +2142,7 @@
 										                    <span class="tit">最小包装数：</span><input type="number" maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)" class="wid70 form-control" name="minPackQty" title="最小包装数" placeholder="数量" ng-model="goods.editMinPackQty" ng-blur="setPriceMinPackAmount(goods)" ng-class="{'error' : goods.editMinPackQtyInValid}" style="width: 70px;"/>
                                                         </div>
 																											<div class="input-list">
-																												<span class="tit">规格：</span><input type="number" maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)" class="wid70 form-control" name="minPackQty" title="最小包装数" placeholder="数量" ng-model="goods.editMinPackQty" ng-blur="setPriceMinPackAmount(goods)" ng-class="{'error' : goods.editMinPackQtyInValid}" style="width: 70px;"/>
+																												<span class="tit">规格：</span><input type="number" maxlength="40" oninput="if(value.length>40)value=value.slice(0,6)" class="wid70 form-control" name="minPackQty" title="规格" placeholder="4 * 2.5" ng-model="goods.spec"  style="width: 70px;"/>
 																											</div>
                                                     </div>
                                                     <div class="content">
@@ -2243,7 +2243,7 @@
 														<p class="title"><span>库存：</span><span ng-bind="goods.reserve">9023492</span></p>
 														<p class="title"><span>最小起订量：</span><span ng-bind="goods.minBuyQty">90492</span></p>
 														<p class="title"><span>最小包装数：</span><span ng-bind="goods.minPackQty">980</span></p>
-														<p class="title"><span>规格：</span><span ng-bind="goods.minPackQty">980</span></p>
+														<p class="title"><span>规格：</span><span ng-bind="goods.spec">980</span></p>
 													</div>
 													<div class="content width150">
 														<div class="title-price">
@@ -2348,6 +2348,11 @@
 																								 ng-class="{'error' : goods.editMinPackQtyInValid}"
 																								 style="width: 70px;"/>
 														</div>
+														<div class="input-list">
+															<span class="tit">规格：</span><input class="width70 form-control" name="spec" title="规格"  placeholder="数量" ng-model="goods.spec"
+																																		maxlength="40" oninput="if(value.length>40)value=value.slice(0,6)"
+																																		style="width: 70px;"/>
+														</div>
 													</div>
 													<div class="content">
 														<p class="title height24">梯度/pcs</p>

src/main/webapp/resources/view/vendor/forstore/vendor_onSale.html

@@ -1118,7 +1118,7 @@
                             </div>
                             <div class="margin0">
                                 <span class="marginL10">规格: </span>
-                                <span ng-bind="commodity.minPackQty" title="{{commodity.minPackQty}}" class="width45"></span>
+                                <span ng-bind="commodity.spec" title="{{commodity.spec}}" class="width45"></span>
                             </div>
                         </td>
                         <td>
@@ -1226,8 +1226,8 @@
                                     </div>
                                     <div>
                                         <span style="width: 32px;">规格: </span>
-                                        <span><input style="width:90px" type="text" ng-blur="changeMinPackQty(commodity)"
-                                                     ng-class="{'error' : commodity.editMinPackQtyInValid}" placeholder="数量" maxlength="20" ng-model="commodity.editMinPackQty" class="wid48 form-control"/></span>
+                                        <span><input style="width:90px" type="text"
+                                                     ng-class="{'error' : commodity.spec}" placeholder="请输入规格" maxlength="40" ng-model="commodity.spec" class="wid48 form-control"/></span>
                                     </div>
                                 </div>
                                 <div class="content-show width135">

src/main/webapp/resources/view/vendor/forstore/vendor_upload.html

@@ -627,7 +627,7 @@
                                         <div class="text-more">品牌：&nbsp;<em title="{{batchCommodity.b2cBranden || '空'}}" ng-bind="batchCommodity.b2cBranden || '空'"></em></div>
                                         <div class="text-more">类目(产品名称)：&nbsp;<em title="{{batchCommodity.kindName || '空'}}" ng-bind="batchCommodity.kindName || '空'"></em></div>
                                         <div class="text-more">型号：&nbsp;<em title="{{batchCommodity.b2cCode || '空'}}" ng-bind="batchCommodity.b2cCode || '空'"></em></div>
-                                        <div class="text-more">规格：&nbsp;<em title="{{batchCommodity.b2cCode || '空'}}" ng-bind="batchCommodity.b2cCode || '空'"></em></div>
+                                        <div class="text-more">规格：&nbsp;<em title="{{batchCommodity.spec || '空'}}" ng-bind="batchCommodity.spec || '空'"></em></div>
                                     </td>
                                     <td>
                                         <!--<div>类型：&nbsp;<span ng-bind="batchCommodity.original == 1311 ? '现货' : '呆滞库存' "></span></div>-->