新增

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

@@ -231,7 +231,7 @@ 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) {
+            if (!/^[0-9a-zA-Z]+$/.test(enWeixin) && enWeixin) {
                 toaster.pop('error', '请输入正确的微信号');
                 return false;
             }
@@ -288,7 +288,7 @@ define(['app/app'], function (app) {
                 return false;
             }
 
-            if (!/^[a-zA-Z]{1}[-_a-zA-Z0-9]{5,19}$/.test(enWeixin) && enWeixin) {
+            if (!/^[0-9a-zA-Z]+$/.test(enWeixin) && enWeixin) {
                 toaster.pop('error', '请输入正确的微信号');
                 return false;
             }

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

@@ -449,7 +449,7 @@
 		float: left;
 	}
 	.edit-content div.width140{
-		width: 150px;
+		width: 156px;
 	}
 	.edit-content div.width130{
 		width: 185px;
@@ -1127,7 +1127,7 @@
 	}
 	.edit-contents .content .title span:last-child {
 		float: left;
-		width: 75px;
+		width: 74px;
 		overflow: hidden;
 		text-overflow: ellipsis;
 		white-space: nowrap;
@@ -2134,18 +2134,18 @@
                                                     <div class="content margin10">
                                                         <!--<p class="title">库存</p>-->
                                                         <div class="input-list">
-                                                            <span class="tit">库存：</span><input type="number" class="wid70 form-control" name="reserve" title="库存" placeholder="数量"
+                                                            <span class="tit" style="width: 84px">库存：</span><input type="number" class="wid70 form-control" name="reserve" title="库存" placeholder="数量"
                                                                                                ng-model="goods.editReserve" maxlength="9" ng-blur="setPriceMaxAmount(goods, false)" ng-class="{'error' : goods.editReserveInvalid}" oninput="if(value.length>9)value=value.slice(0,9)"/>
                                                         </div>
                                                         <div class="input-list">
-                                                            <span class="tit">最小起订量：</span><input type="number" class="wid70 form-control" name="minBuyQty" title="起拍"  placeholder="数量"
+                                                            <span class="tit" style="width: 84px">最小起订量：</span><input type="number" class="wid70 form-control" name="minBuyQty" title="起拍"  placeholder="数量"
                                                                                                 maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)" ng-model="goods.editMinBuyQty" ng-blur="setPriceMinAmount(goods, false)" ng-change="updateStartNumber(goods)" ng-class="{'error' : goods.editMinBuyQtyInValid}"/>
                                                         </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" style="width: 84px">最小包装数：</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="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;"/>
+																												<span class="tit" style="width: 84px">规格：</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,10 +2243,10 @@
 														<p class="title" ng-class="{'noBreak' : !goods.breakUp}" ng-if="goods.breakUp" ng-bind="goods.breakUp ? '可拆卖' : '不可拆卖'">不可拆卖</p>
 													</div>
 													<div class="content width130">
-														<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.spec">980</span></p>
+														<p class="title"><span style="width:84px">库存：</span><span ng-bind="goods.reserve">9023492</span></p>
+														<p class="title"><span style="width:84px">最小起订量：</span><span ng-bind="goods.minBuyQty">90492</span></p>
+														<p class="title"><span style="width:84px">最小包装数：</span><span ng-bind="goods.minPackQty">980</span></p>
+														<p class="title"><span style="width:84px">规格：</span><span ng-bind="goods.spec">980</span></p>
 													</div>
 													<div class="content width150">
 														<div class="title-price">
@@ -2334,25 +2334,25 @@
 													<div class="content margin10">
 														<!--<p class="title">库存</p>-->
 														<div class="input-list">
-															<span class="tit">库存：</span><input type="number" class="wid70 form-control" name="reserve" title="库存" placeholder="数量" ng-model="goods.editReserve" ng-blur="setPriceMaxAmount(goods, true)"
+															<span class="tit"  style="width: 84px">库存：</span><input type="number" class="wid70 form-control" name="reserve" title="库存" placeholder="数量" ng-model="goods.editReserve" ng-blur="setPriceMaxAmount(goods, true)"
 																							   maxlength="9" oninput="if(value.length>9)value=value.slice(0,9)"
 																							   ng-class="{'error' : goods.editReserveInvalid}"/>
 														</div>
 														<div class="input-list">
-															<span class="tit">最小起订量：</span><input type="number" class="wid70 form-control" name="minBuyQty"
+															<span class="tit" style="width: 84px">最小起订量：</span><input type="number" class="wid70 form-control" name="minBuyQty"
 																								maxlength="6"
 																								oninput="if(value.length>6)value=value.slice(0,6)"
 																								title="起订"  placeholder="数量" ng-model="goods.editMinBuyQty" ng-change="updateStartNumber(goods)"
 																								ng-blur="setPriceMinAmount(goods, true)" ng-class="{'error' : goods.editMinBuyQtyInValid}"/>
 														</div>
 														<div class="input-list">
-															<span class="tit">最小包装数：</span><input type="number" class="width70 form-control" name="minPackQty" title="最小包装数"  placeholder="数量" ng-model="goods.editMinPackQty" ng-blur="setPriceMinPackAmount(goods)"
+															<span class="tit"  style="width: 84px">最小包装数：</span><input type="number" class="width70 form-control" name="minPackQty" title="最小包装数"  placeholder="数量" ng-model="goods.editMinPackQty" ng-blur="setPriceMinPackAmount(goods)"
 																								 maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)"
 																								 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"
+															<span class="tit"  style="width: 84px">规格：</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>

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

@@ -1122,7 +1122,7 @@
                             </div>
                             <div class="margin0">
                                 <span class="marginL10">规格: </span>
-                                <span ng-bind="commodity.spec" title="{{commodity.spec}}" class="width45"></span>
+                                <span ng-bind="commodity.spec" title="{{commodity.spec}}" class="width45" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"></span>
                             </div>
                         </td>
                         <td>
@@ -1231,7 +1231,7 @@
                                     <div>
                                         <span style="width: 32px;">规格: </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>
+                                                     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_store_maintain.html

@@ -750,7 +750,8 @@
 					<span>微&nbsp;&nbsp;&nbsp;&nbsp;信</span>
 				</div>
 				<div class="col-md-10 custom_col">
-					<input type="text" class="form-control enWeixin" style="border-radius: inherit;" title="enWeixin" ng-blur="checkWeixin()" ng-model="sampleStore.enterprise.enWeixin"/>
+					<input type="text" class="form-control enWeixin" style="border-radius: inherit;" title="enWeixin" ng-pattern="/^[0-9a-zA-Z]+$/" ng-blur="checkWeixin()" ng-model="sampleStore.enterprise.enWeixin"/>
+					<!--<input type="text" class="form-control enWeixin" style="border-radius: inherit;" title="enWeixin" ng-blur="checkWeixin()" ng-model="sampleStore.enterprise.enWeixin"/>-->
 				</div>
 			</div>
 			<div class="row com_row" style="margin-top: 10px;">

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

@@ -685,12 +685,12 @@
                                 <span class="text-more" ng-bind="commodity.unit || 'PCS'">PCS</span>
                             </div>
                             <div class="text-more-80">
-                                <span>封装:<em ng-bind="commodity.encapsulation || '-'" class="text-more fr" style="width: 60px;" title="{{commodity.encapsulation}}"></em></span>
+                                <span>规格:<em ng-bind="commodity.spec || '-'" class="text-more fr" style="width: 60px;" title="{{commodity.spec}}"></em></span>
                             </div>
                         </td>
                         <td>
                             <div class="text-more-80">
-                                <span>起订量:</span>
+                                <span>最小起订量:</span>
                                 <span ng-bind="commodity.minBuyQty" title="{{commodity.minBuyQty}}" class="text-more"></span>
                             </div>
                             <div class="text-more-80">

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

@@ -644,7 +644,8 @@
                                     </td>
                                     <td>
                                         <div>库存：&nbsp;<span ng-bind="batchCommodity.reserve | number"></span></div>
-                                        <div>起拍：&nbsp;<span ng-bind="batchCommodity.minBuyQty | number"></span></div>
+                                        <div>最小起订量：&nbsp;<span ng-bind="batchCommodity.minBuyQty | number"></span></div>
+                                        <div>最小包装数：&nbsp;<span ng-bind="batchCommodity.minPackQty | number"></span></div>
                                         <!--<div>倍数/价格：&nbsp;-->
                                             <!--<span ng-bind="batchCommodity.minBuyQty | number"></span>-->
                                             <!--<span ng-if="batchCommodity.usdMinPackPrice">-->