Merge branch 'dev' of ssh://10.10.101.21/source/platform-b2c into dev

src/main/java/com/uas/platform/b2c/common/account/controller/UserController.java

@@ -101,6 +101,9 @@ public class UserController {
 	 */
 	@RequestMapping(value = "/updatePassword", method = RequestMethod.POST)
 	public ResponseEntity<String> updatePassword(HttpSession session, String password, String newPassword) {
+		if (password.equals(newPassword)){
+			throw new IllegalOperatorException("新密码与旧密码相同");
+		}
 		User sysUser = SystemSession.getUser();
 		User user = userService.findUserPwdByUserUU(sysUser.getUserUU());
 		Enterprise enterprise = user.getEnterprise();

src/main/java/com/uas/platform/b2c/trade/order/status/PurchaseStatus.java

@@ -34,7 +34,7 @@ public enum PurchaseStatus {
 	/**
 	 * {@code unavailable 售后中}
 	 */
-	TOBEREVIEWED("toBeReviewed","404-503-520");
+	TOBEREVIEWED("toBeReviewed","404-503");
 
 	/**
 	 * 状态名称

src/main/java/com/uas/platform/b2c/trade/presale/controller/CollectionController.java

@@ -136,13 +136,20 @@ public class CollectionController {
 		while (it.hasNext()){
 			String uuid = it.next();
 			ComponentInfo componentInfo = componentInfoDao.findByUuid(uuid);
-			Collection store = new Collection();
-			store.setComponentid(componentInfo.getId());
-			store.setUseruu(SystemSession.getUser().getUserUU());
-			store.setEnuu(SystemSession.getUser().getEnterprise().getUu());
-			store.setCreatetime(new Date());
-			store.setKind(2);
-			storeList.add(store);
+			if (componentInfo != null){
+				Collection store = new Collection();
+				store.setComponentid(componentInfo.getId());
+				store.setUseruu(SystemSession.getUser().getUserUU());
+				if (SystemSession.getUser().getEnterprise() != null){
+					store.setDissociative(Type.ENTERPRISING.value());
+					store.setEnuu(SystemSession.getUser().getEnterprise().getUu());
+				}else {
+					store.setDissociative(Type.PERSONAL.value());
+				}
+				store.setCreatetime(new Date());
+				store.setKind(2);
+				storeList.add(store);
+			}
 		}
 		collectionService.save(storeList);
 		return "success";
@@ -160,15 +167,17 @@ public class CollectionController {
 		String result = "success";
 		if (StringUtils.hasText(str)) {
 			Collection store = FastjsonUtils.fromJson(str, Collection.class);
-			store.setUseruu(SystemSession.getUser().getUserUU());
-			if (SystemSession.getUser().getEnterprise() != null) {
-				store.setDissociative(Type.ENTERPRISING.value());
-				store.setEnuu(SystemSession.getUser().getEnterprise().getUu());
-			} else {
-				store.setDissociative(Type.PERSONAL.value());
+			if (store.getComponentid() != null){
+				store.setUseruu(SystemSession.getUser().getUserUU());
+				if (SystemSession.getUser().getEnterprise() != null) {
+					store.setDissociative(Type.ENTERPRISING.value());
+					store.setEnuu(SystemSession.getUser().getEnterprise().getUu());
+				} else {
+					store.setDissociative(Type.PERSONAL.value());
+				}
+				store.setCreatetime(new Date());
+				result = collectionService.save(store);
 			}
-			store.setCreatetime(new Date());
-			result = collectionService.save(store);
 		}
 		System.out.println("result = " + result);
 		return result;

src/main/java/com/uas/platform/b2c/trade/presale/dao/CollectionDao.java

@@ -85,4 +85,15 @@ public interface CollectionDao extends JpaRepository<Collection, Long>, JpaSpeci
 	 * List<Collection> 返回收藏记录列表
 	 */
 	List<Collection> findStoreByUseruuAndEnuuAndKindAndComponentid(Long useruu, Long enuu, int kind, Long componentid);
+
+	/**
+	 * 获取指定的store 判断器件是否存在
+	 *
+	 * @param useruu 个人uu
+	 * @param dissociative 是否为个人用户
+	 * @param kind 收藏类型，品牌或者器件
+	 * @param componentid 器件id
+	 * @return
+	 */
+	List<Collection> findStoreByUseruuAndDissociativeAndKindAndComponentid(Long useruu, Integer dissociative, int kind, Long componentid);
 }

src/main/java/com/uas/platform/b2c/trade/presale/service/impl/CartServiceImpl.java

@@ -396,8 +396,9 @@ public class CartServiceImpl implements CartService {
 
 		Map<String, Object> map = new HashMap<String, Object>();
 		Map<String, List<Cart>> contentMap = new HashMap<>();
-		info.sorting("storeUuid", Sort.Direction.DESC);
-		info.sorting("id", Sort.Direction.DESC);
+//		info.sorting("storeUuid", Sort.Direction.DESC);
+//		info.sorting("id", Sort.Direction.DESC);
+		info.sorting(Sort.Direction.DESC, "storeUuid", "id");
 		// 获取当前页的购物车记录信息
 		Page<Cart> carts = cartDao.findAll(new Specification<Cart>() {
 			@Override

src/main/java/com/uas/platform/b2c/trade/presale/service/impl/CollectionServiceImpl.java

@@ -79,9 +79,13 @@ public class CollectionServiceImpl implements CollectionService {
 				return "repeat";
 			}
 		} else if (store.getKind() == 2) {
-			List<Collection> storelist = collectionDao.findStoreByUseruuAndEnuuAndKindAndComponentid(
-					SystemSession.getUser().getUserUU(), SystemSession.getUser().getEnterprise().getUu(), 2, store.getComponentid());
-			if (storelist.size() == 0) {
+			if (SystemSession.getUser().getEnterprise() != null){
+				storeList = collectionDao
+						.findStoreByUseruuAndEnuuAndKindAndComponentid(SystemSession.getUser().getUserUU(), SystemSession.getUser().getEnterprise().getUu(), 2, store.getComponentid());
+			} else {
+				storeList = collectionDao.findStoreByUseruuAndDissociativeAndKindAndComponentid(SystemSession.getUser().getUserUU(), Type.PERSONAL.value(), 2, store.getComponentid());
+			}
+			if (storeList.size() == 0) {
 				collectionDao.save(store);
 			}else {
 				return "repeat";

src/main/webapp/resources/js/usercenter/controllers/forstore/account_manager_ctrl.js

@@ -439,6 +439,10 @@ define(['app/app'], function(app) {
 
 		//修改密码
 		$scope.ok = function () {
+			if($scope.user.newPassword == $scope.user.password){
+				toaster.pop('error', '错误', '新密码与原密码相同');
+				return;
+			}
 			if($scope.user.newPassword == $scope.user.newPassword1) {//验证重复密码相等
 				User.updatePassword({password: $scope.user.password, newPassword: $scope.user.newPassword}, {}, function(){
 					toaster.pop('success', '成功', '修改密码成功，请牢记您的新密码。');

src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_home_ctrl.js

@@ -86,8 +86,8 @@ define(['app/app', 'calendar'], function(app) {
         $scope.editAddr = function(isSetTop, addr) {
             $scope.isnotCheck = true;
             $modal.open({
-                templateUrl : $rootScope.rootPath + '/static/view/prod/modal/editAddr_modal.html',
-                controller : 'editAddrCtrl',
+                templateUrl : $rootScope.rootPath + '/static/view/common/modal/edit_address_modal.html',
+                controller : 'editAddrHomeCtrl',
                 size : 'lg',
                 resolve : {
                     isSetTop : function(){
@@ -194,46 +194,61 @@ define(['app/app', 'calendar'], function(app) {
     }]);
 
     //地址编辑模态框
-    app.register.controller('editAddrCtrl', ['$scope', 'isSetTop', 'addr', '$modalInstance', 'toaster', '$http', 'ShippingAddress', function($scope, isSetTop, addr, $modalInstance, toaster, $http, ShippingAddress){
-        $scope.isSetTop = isSetTop;
+    app.register.controller('editAddrHomeCtrl', ['$scope', 'isSetTop', 'addr', '$modalInstance', 'toaster', '$http', 'ShippingAddress', function($scope, isSetTop, addr, $modalInstance, toaster, $http, ShippingAddress){
+        if (addr){
+            $scope.isSetTop = addr.num == 1;
+        }else {
+            $scope.isSetTop = isSetTop;
+        }
         //验证数据
         $scope.checkeds = {};
-        $scope.checkform = function(name,num) {
+
+        $scope.checkForm = function(num) {
             var size;
             if(num == 1) {
-                size = document.getElementById("muserName").value.length;
-                console.log(size);
-                if (size > 10) {
-                    $scope.userError = true;
-                    console.log($scope.linkError);
-                    return;
+                if ($scope.address.name){
+                    size = $scope.address.name.replace(/[^x00-xFF]/g,'**').length;
+                    if (size > 20) {
+                        console.log(size);
+                        $scope.userError = true;
+                        return;
+                    }
+                    $scope.userError = false;
                 }
-                $scope.userError = false;
-                // console.log($scope.userError);
             } else if(num == 2) {
-                size = document.getElementById("maddr").value.length;
-                console.log(size);
-                if (size > 30) {
-                    $scope.addrError = true;
-                    console.log($scope.linkError);
-                    return;
+                if ($scope.address.tel){
+                    size = $scope.address.tel.replace(/[^x00-xFF]/g,'**').length;
+                    if (size < 8 || size > 11) {
+                        $scope.telError = true;
+                        return;
+                    }
+                    $scope.telError = false;
+                    var telPatt = new RegExp("^[0-9]+$");
+                    if (telPatt.test($scope.address.tel)){
+                        $scope.telPatternError = false;
+                    }else {
+                        $scope.telPatternError = true;
+                    }
                 }
-                $scope.addrError = false;
-                console.log($scope.userError);
             } else if(num == 3) {
-                if(angular.isUndefined(name)) {
-                    $scope.checkeds.tel = false;
-                } else {
-                    $scope.checkeds.tel = true;
+                if ($scope.address.detailAddress){
+                    size = $scope.address.detailAddress.replace(/[^x00-xFF]/g,'**').length;
+                    if (size > 60) {
+                        $scope.addrError = true;
+                        return;
+                    }
+                    $scope.addrError = false;
                 }
             } else if(num == 4) {
-                if(angular.isUndefined(name)) {
-                    $scope.checkeds.landlineNumber = false;
-                } else {
-                    $scope.checkeds.landlineNumber = true;
+                var emailPatt = new RegExp("^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$");
+                if ($scope.address.email.length > 0 && !emailPatt.test($scope.address.email)){
+                    $scope.emailPatternError = true;
+                }else {
+                    $scope.emailPatternError = false;
                 }
             }
         };
+
         $http.get('static/js/prod/data/city.json').success(function(data) {
             $scope.division = data;
             if(addr){
@@ -246,16 +261,29 @@ define(['app/app', 'calendar'], function(app) {
                 $scope.address = addr;
                 $scope.addr = true;
             }
-        }).error(function(e) {
+        }).error(function() {
             toaster.pop('error', '系统错误 ' + '加载城市信息失败');
         });
 
         $scope.save = function () {
             var address = $scope.address;
+
+            if (!address){
+                toaster.pop('error', '请补充未填写的信息');
+                return ;
+            }
+            if (!address.name || !address.province || !address.city || !address.district ||
+                !address.detailAddress || !address.tel){
+                toaster.pop('error', '请补充未填写的信息');
+                return ;
+            }
+            if ($scope.userError || $scope.telError || $scope.addrError || $scope.telPatternError ||
+                $scope.emailPatternError){
+                toaster.pop('error', '请修改红色框内的信息');
+                return ;
+            }
+
             //拼装地区
-            /**
-             * TODO 这里没做校验
-             */
             var strAres = address.province + ',' + address.city + ',' + address.district;
             address.area = strAres;
 

src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_order_ctrl.js

@@ -351,7 +351,7 @@ define(['app/app'], function (app) {
 		};
 
 		// 选择查找日期
-		$scope.onDateCondition = function(){
+		$scope.onDateCondition = function(isStart){
 			if(typeof $scope.startDate == 'undefined' || typeof $scope.endDate == 'undefined'){
 				alert("日期格式错误，请重新输入！");
 				$scope.startDate = null;
@@ -362,6 +362,16 @@ define(['app/app'], function (app) {
 				$scope.endDate = $scope.endDate.toString().replace(/[0-9]{2}:[0-9]{2}:[0-9]{2}/g, '23:59:59');//;'23.59';//DateUtil.yyyyMmDd($scope.endDate.getTime() + 86399000);
 				$scope.endDate = new Date(formatDateTime(new Date($scope.endDate.toString())));
 			}
+			if ($scope.endDate !== null && $scope.startDate>$scope.endDate){
+				if (isStart){
+					alert("开始日期大于结束日期，请重新输入！");
+					$scope.startDate = null;
+				} else {
+					alert("开始日期大于结束日期，请重新输入！");
+					$scope.endDate = null;
+				}
+				return;
+			}
 			$scope.param.startDate = $scope.startDate ? $scope.startDate.getTime() : null;
 			$scope.param.endDate = $scope.endDate ? $scope.endDate.getTime()  : null;
 

src/main/webapp/resources/js/usercenter/controllers/forstore/order_detail_ctrl.js

@@ -185,6 +185,11 @@ define(['app/app'], function(app) {
 				// 查询店铺信息
 				$scope.findStoreInfoByStoreUuid($scope.order.storeid);
 
+				//订单备注
+				if ($scope.order.orderRemark){
+					$scope.remarkList = angular.fromJson($scope.order.orderRemark);
+				}
+
 				//发票信息
 				$scope.order.invoiceInfo = angular.fromJson($scope.order.invoiceAddress);
 

src/main/webapp/resources/js/usercenter/controllers/forstore/order_pay_ctrl.js

@@ -142,11 +142,9 @@ define(['app/app'], function(app) {
 		$scope.loadShippingAddress = function () {
 			return ShippingAddress.get({send : false}, function(data) {
 				$scope.sendAddress = data;
-				angular.forEach($scope.sendAddress, function (shippingAddress) {
-					if (shippingAddress.num == 1) {
-						$scope.selectAdd(shippingAddress);
-					}
-				})
+				if (data.length != 0){
+					$scope.selectAdd($scope.sendAddress[0]);
+				}
 			}, function(response) {
 				toaster.pop("error", "获取收货地址信息失败 "  + response.data);
 			});
@@ -476,6 +474,7 @@ define(['app/app'], function(app) {
 					}
 				}
 				$scope.payment.address = address;
+				$scope.formatArea = $scope.payment.address.area.replace(/,/g,' ');
 			}, function(){
 				toaster.pop('info', '提示 ' + '您已取消收货地址的编辑');
 			});

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

@@ -365,6 +365,10 @@ define(['app/app'], function(app) {
 
 		//修改密码
 		$scope.ok = function () {
+			if($scope.user.newPassword == $scope.user.password){
+				toaster.pop('error', '错误', '新密码与原密码相同');
+				return;
+			}
 			if($scope.user.newPassword == $scope.user.newPassword1) {//验证重复密码相等
 				User.updatePassword({password: $scope.user.password, newPassword: $scope.user.newPassword}, {}, function(){
 					toaster.pop('success', '成功', '修改密码成功，请牢记您的新密码。');

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

@@ -120,7 +120,7 @@ define(['app/app'], function (app) {
                     state = '602-603-315-604-605-606';
                     break;
                 case 'toBeReviewed':
-                    state = '404-503-520';
+                    state = '404-503';
                     break;
                 //下面的状态栏新增的状态
                 case 'tobepay':
@@ -576,6 +576,18 @@ define(['app/app'], function (app) {
                 $scope.endDate = $scope.endDate.toString().replace(/[0-9]{2}:[0-9]{2}:[0-9]{2}/g, '23:59:59');//;'23.59';//DateUtil.yyyyMmDd($scope.endDate.getTime() + 86399000);
                 $scope.endDate = new Date(formatDateTime(new Date($scope.endDate.toString())));
             }
+            $scope.vaildDate(false);
+        };
+        $scope.vaildDate = function (isStart) {
+            if ($scope.endDate !== null && $scope.startDate>$scope.endDate){
+                if (isStart){
+                    alert("开始日期大于结束日期，请重新输入！");
+                    $scope.startDate = null;
+                } else {
+                    alert("开始日期大于结束日期，请重新输入！");
+                    $scope.endDate = null;
+                }
+            }
         };
         var formatDateTime = function (date) {
             var y = date.getFullYear();

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

@@ -321,8 +321,8 @@ define(['app/app'], function (app) {
 			if(!$scope.checkGoodsInfo(standard)) {
 				return ;
 			}
-
-            // 如果没有开启店铺，第一次寄售时则弹出寄售协议
+            productStandardPutOnInfoPutOn(standard, index);
+            /*// 如果没有开启店铺，第一次寄售时则弹出寄售协议
             if (!$scope.$$putOn.isSelfStore) {
 				ConsignmentAgreementRecord.findRecordOfUser({}, {}, function (record) {
 					if (!record.id) {
@@ -345,7 +345,7 @@ define(['app/app'], function (app) {
 				});
             } else {
 				productStandardPutOnInfoPutOn(standard, index);
-            }
+            }*/
         };
 
         function productStandardPutOnInfoPutOn(standard, index) {
@@ -373,9 +373,10 @@ define(['app/app'], function (app) {
 			    console.log('AVSSC');
 				return ;
 			}
+			updateProductStandardPutOnInfo(standard, index);
 
 			// 如果没有开启店铺，第一次寄售时则弹出寄售协议
-			if (!$scope.$$putOn.isSelfStore) {
+			/*if (!$scope.$$putOn.isSelfStore) {
 				ConsignmentAgreementRecord.findRecordOfUser({}, {}, function (record) {
 					if (!record.id) {
 						// 弹出寄售协议弹窗
@@ -397,7 +398,7 @@ define(['app/app'], function (app) {
 				});
 			} else {
 				updateProductStandardPutOnInfo(standard, index);
-			}
+			}*/
         };
 
         function updateProductStandardPutOnInfo(standard, index) {
@@ -419,9 +420,9 @@ define(['app/app'], function (app) {
         $scope.changeSale = function (standard) {
             standard.editIsSelfSale = standard.editSelfSaleNum == 0;
 
-            if (!standard.editIsSelfSale) {
+            /*if (!standard.editIsSelfSale) {
 				checkAndShowConsignmentAgreement(standard);
-            }
+            }*/
         };
 
 		/**

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

@@ -228,11 +228,11 @@ define(['app/app'], function (app) {
 				return false;
 			}
 			if (!$scope.sampleStore.enterprise.enTel || $scope.sampleStore.enterprise.enTel == '') {
-				toaster.pop('error', '企业电话不能为空');
+				toaster.pop('error', '请输入正确的电话号码');
 				return false;
 			}
 			if (!$scope.sampleStore.enterprise.enFax || $scope.sampleStore.enterprise.enFax == '') {
-				toaster.pop('error', '企业传真不能为空');
+				toaster.pop('error', '请输入正确的企业传真');
 				return false;
 			}
 			var store = {};

src/main/webapp/resources/view/admin/store/store_info_detail.html

@@ -107,7 +107,7 @@
 		<div class="col-sm-8">
 			<div class="btn-group" role="group">
 				<a role="presentation" class="btn btn-default" ng-class="{ 'btn-primary': tabSelected === 'ENTERPRISE' }" ng-click="switchTab('ENTERPRISE')">企业信息</a>
-				<a role="presentation" class="btn btn-default" ng-class="{ 'btn-primary': tabSelected === 'VIOLATIONS' }" ng-click="switchTab('VIOLATIONS')" ng-if="storeType !== 'CONSIGNMENT'">违规</a>
+				<!--<a role="presentation" class="btn btn-default" ng-class="{ 'btn-primary': tabSelected === 'VIOLATIONS' }" ng-click="switchTab('VIOLATIONS')" ng-if="storeType !== 'CONSIGNMENT'">违规</a>-->
 			</div>
 		</div>
 	</div>

src/main/webapp/resources/view/admin/trade/trade_order_detail.html

@@ -337,8 +337,9 @@
 		<div class="row-fluid" ng-if="orderDetailInfo.proofingid == null">
 			<div class="col-md-3">
 				<span>送货方式：</span>
-				<span ng-if="orderDetailInfo.deliverytype == '1301'">物流配送</span>
-				<span ng-if="orderDetailInfo.deliverytype == '1302'">上门自取</span>	
+				<span ng-if="orderDetailInfo.deliverytype == '1301'">第三方配送</span>
+				<span ng-if="orderDetailInfo.deliverytype == '1302'">卖家配送</span>
+				<span ng-if="orderDetailInfo.deliverytype == '1303'">上门自提</span>
 				<span ng-if="orderDetailInfo.deliverytype == null"><strong>未录入</strong></span>				
 			</div>
 		</div>

src/main/webapp/resources/view/usercenter/forstore/buyer_order.html

@@ -601,7 +601,7 @@
 							   max-date="endDate" current-text="今天" clear-text="清除" close-text="关闭"
 							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
                                ng-click="openDatePicker($event, condition, 'startDateOpen',1)"
-							   ng-change="onDateCondition()"/>
+							   ng-change="onDateCondition(true)"/>
 							<button class="open" ng-click="openDatePicker($event, condition, 'startDateOpen')"></button>
 					</div>
 
@@ -614,7 +614,7 @@
 								 min-date="startDate" current-text="今天" clear-text="清除" close-text="关闭"
 								 datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
                                  ng-click="openDatePicker($event, condition, 'endDateOpen',2)"
-								 ng-change="onDateCondition()"/>
+								 ng-change="onDateCondition(false)"/>
 								<button class="open" ng-click="openDatePicker($event, condition, 'endDateOpen')"></button>
 						</div>
 				</div>

src/main/webapp/resources/view/usercenter/forstore/order_detail.html

@@ -355,7 +355,7 @@
 					<dd class="oder-remark" ng-class="{'length3': order.orderDetails.length > 3}">
 						<span style="width: 100%;">
 							<em>订单备注：</em>
-							<i class="fl" ng-bind="order.orderRemark || '无'">用便宜的物流最好！</i>
+							<i class="fl" ng-bind="remarkList[order.storeid] || '无'">用便宜的物流最好！</i>
 							<!--<input type="text"  class="form-control" placeholder="请填写订单备注" ng-model="order.orderRemark"/>-->
 						</span>
 					</dd>

src/main/webapp/resources/view/usercenter/forstore/order_pay.html

@@ -515,7 +515,7 @@
 							<span style="width: 100%">
 								<em>订单备注：</em>
 								<input ng-if="order.status==501" type="text"  class="form-control" placeholder="请填写订单备注" ng-model="remarkList[details[0].storeid]" maxlength="200"/>
-								<em ng-if="order.status!=501" ng-bind="remarkList[details[0].storeid] || '无'" style="margin-left: 0;"></em>
+								<em ng-if="order.status!=501" ng-bind="remarkList[order.storeid] || '无'" style="margin-left: 0;"></em>
 							</span>
 						</dd>
 						<dd class="line60">

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

@@ -666,6 +666,7 @@
 						   max-date="endDate" current-text="今天" clear-text="清除" close-text="关闭"
                                ng-click="openDatePicker($event, condition, 'startDateOpen',1)"
 						   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-change="vaildDate(true)"
 						/>
 						<button class="open" ng-click="openDatePicker($event, condition, 'startDateOpen')"></button>
 					</div>
@@ -724,7 +725,7 @@
 							<a ng-if=" status == 'all'" ng-click="setChildStatus('502-406','待发货')" title="">待发货</a>
 							<a ng-if="status == 'inbound' || status == 'all' || status == 'toBeReviewed'" ng-click="setChildStatus('404','待买家收货')" title="">待买家收货</a>
 							<a ng-if="status == 'tobepaid' || status == 'all' || status == 'toBeReviewed'" ng-click="setChildStatus('514','待商城付款')" title="">待商城付款</a>
-							<a ng-if="status == 'completed' || status == 'tobepaid' || status == 'all' || status == 'toBeReviewed'" ng-click="setChildStatus('520','交易完成')" title="">交易完成</a>
+							<a ng-if="status == 'completed' || status == 'tobepaid' || status == 'all'" ng-click="setChildStatus('520','交易完成')" title="">交易完成</a>
 							<a ng-if="status == 'completed' || status == 'all'" ng-click="setChildStatus('606','交易关闭')" title="">交易关闭</a>
 							<a ng-if=" status == 'all'" ng-click="setChildStatus('602-603-315-604-605-606','已取消')" title=""> 已取消</a>
 							<a ng-if="status == 'inbound' || status == 'all' || status == 'tobepaid'" ng-click="setChildStatus('606','售后中')" title="">售后中</a>

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

@@ -638,9 +638,10 @@
 				</div>
 			</div>
 			<!-- 简介不正确提示信息 -->
-			<div class="row com_row" ng-show="storeInfoForm.description.$dirty && storeInfoForm.description.$invalid && !storeInfoForm.description.$error.required">
+			<div class="row com_row" ng-show="storeInfoForm.description.$dirty && storeInfoForm.description.$invalid">
 				<div class="col-md-2 custom_col"></div>
 				<div class="col-md-10 custom_col">
+					<span style="color: #ff0000;" ng-show="storeInfoForm.description.$error.required">简介信息必填</span>
 					<span style="color: #ff0000;" ng-show="storeInfoForm.description.$error.maxlength">请勿超过500个字</span>
 				</div>
 			</div>
@@ -655,9 +656,10 @@
 				</div>
 			</div>
 			<!-- 官网地址不正确提示信息 -->
-			<div class="row com_row" ng-show="storeInfoForm.enUrl.$dirty && storeInfoForm.enUrl.$invalid && !storeInfoForm.enUrl.$error.required">
+			<div class="row com_row" ng-show="storeInfoForm.enUrl.$dirty && storeInfoForm.enUrl.$invalid">
 				<div class="col-md-2 custom_col"></div>
 				<div class="col-md-10 custom_col">
+					<span style="color: #ff0000;" ng-show="storeInfoForm.description.$error.required">官网地址必填</span>
 					<span style="color: #ff0000;" ng-show="storeInfoForm.enUrl.$error.maxlength">请勿超过30个字</span>
 				</div>
 			</div>
@@ -681,9 +683,10 @@
 				</div>
 			</div>
 			<!-- 地址不正确提示信息 -->
-			<div class="row com_row" ng-show="storeInfoForm.address.$dirty && storeInfoForm.address.$invalid && !storeInfoForm.address.$error.required">
+			<div class="row com_row" ng-show="storeInfoForm.address.$dirty && storeInfoForm.address.$invalid">
 				<div class="col-md-2 custom_col"></div>
 				<div class="col-md-10 custom_col">
+					<span style="color: #ff0000;" ng-show="storeInfoForm.description.$error.required">地址信息必填</span>
 					<span style="color: #ff0000;" ng-show="storeInfoForm.address.$error.maxlength">请勿超过30个字</span>
 				</div>
 			</div>

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

@@ -699,7 +699,7 @@
 				<span>电&nbsp;&nbsp;&nbsp;&nbsp;话<strong class="text-inverse">*</strong></span>
 			</div>
 			<div class="col-md-10 custom_col">
-				<input type="text" class="form-control" style="border-radius: inherit;" title="enTel" ng-model="sampleStore.enterprise.enTel" maxlength="20"/>
+				<input type="text" class="form-control" style="border-radius: inherit;" title="enTel"  ng-pattern="/^(\d){8,12}$/" ng-model="sampleStore.enterprise.enTel" maxlength="12"/>
 			</div>
 		</div>
 		<div class="row com_row" style="margin-top: 10px;">
@@ -707,7 +707,7 @@
 				<span>传&nbsp;&nbsp;&nbsp;&nbsp;真<strong class="text-inverse">*</strong></span>
 			</div>
 			<div class="col-md-10 custom_col">
-				<input type="text" class="form-control" style="border-radius: inherit;" title="enFax" ng-model="sampleStore.enterprise.enFax" maxlength="20"/>
+				<input type="text" class="form-control" style="border-radius: inherit;" title="enFax" ng-pattern="/^[\d-]{0,20}$/" ng-model="sampleStore.enterprise.enFax" maxlength="20"/>
 			</div>
 		</div>
 	</div><!-- 店铺基础信息输入 end -->