Browse Source

【我】测试问题处理

yangc 7 years ago
parent
commit
b0aad7e915

+ 6 - 2
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 (!/^[0-9a-zA-Z]+$/.test(enWeixin) && enWeixin) {
+            if (!/^[0-9a-zA-Z]{6,20}$/.test(enWeixin) && enWeixin) {
                 toaster.pop('error', '请输入正确的微信号');
                 return false;
             }
@@ -288,7 +288,7 @@ define(['app/app'], function (app) {
                 return false;
             }
 
-            if (!/^[0-9a-zA-Z]+$/.test(enWeixin) && enWeixin) {
+            if (!/^[0-9a-zA-Z]{6,20}$/.test(enWeixin) && enWeixin) {
                 toaster.pop('error', '请输入正确的微信号');
                 return false;
             }
@@ -542,6 +542,10 @@ define(['app/app'], function (app) {
 		$scope.cancleProductEdit = cancleProductEdit;
 
 		function editRecommendProduct(module, status) {
+			if ($rootScope.userInfo.userUU != $rootScope.userInfo.enterprise.enAdminuu) {
+				toaster.pop('error', '您无该模块的编辑权限,请联系企业管理员进行编辑维护!');
+				return;
+			}
 			if (module == 'BATCH_OPERATION') {
 				$scope.canBatchOperation = status;
 				return ;

+ 1 - 1
src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -2352,7 +2352,7 @@
 																								 style="width: 70px;"/>
 														</div>
 														<div class="input-list">
-															<span class="tit"  style="width: 84px">规格:</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="20"
 																																		style="width: 70px;"/>
 														</div>

+ 1 - 1
src/main/webapp/resources/view/vendor/forstore/vendor_store_maintain.html

@@ -750,7 +750,7 @@
 					<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-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-pattern="/^[0-9a-zA-Z]{6,20}$/" 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>