Browse Source

店铺信息中企业地址和账户企业注册地址去关联

zhaohongpeng 7 years ago
parent
commit
e84a8dd07d

+ 1 - 1
src/main/java/com/uas/platform/b2c/prod/store/model/EnterpriseSimple.java

@@ -230,7 +230,7 @@ public class EnterpriseSimple {
 		simple.enName = enterprise.getEnName();
 		simple.enName = enterprise.getEnName();
 		simple.enShortname = enterprise.getEnShortname();
 		simple.enShortname = enterprise.getEnShortname();
 		simple.enAddress = enterprise.getEnAddress();
 		simple.enAddress = enterprise.getEnAddress();
-		simple.address = enterprise.getEnAddress();
+		//simple.address = enterprise.getEnAddress();
 		simple.enFax = enterprise.getEnFax();
 		simple.enFax = enterprise.getEnFax();
 		simple.enTel = enterprise.getEnTel();
 		simple.enTel = enterprise.getEnTel();
 		simple.enType = enterprise.getEnType();
 		simple.enType = enterprise.getEnType();

+ 1 - 1
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_store_maintain_ctrl.js

@@ -81,7 +81,7 @@ define(['app/app'], function (app) {
             $scope.sampleStore.enQQ = '';
             $scope.sampleStore.enQQ = '';
 
 
 			$scope.sampleStore.enterprise = angular.copy($scope.storeInfo.enterprise);
 			$scope.sampleStore.enterprise = angular.copy($scope.storeInfo.enterprise);
-			$scope.sampleStore.enterprise.address = $scope.sampleStore.enterprise.address || $scope.storeInfo.enterprise.enAddress;
+			$scope.sampleStore.enterprise.address = $scope.sampleStore.enterprise.address || '暂无信息';
 			qulifications = angular.copy($scope.storeInfo.qualifications);
 			qulifications = angular.copy($scope.storeInfo.qualifications);
 			$scope.sampleStore.qualifications = qulifications.filter(function (qualification) {
 			$scope.sampleStore.qualifications = qulifications.filter(function (qualification) {
 				return qualification && qualification.type == 'APTITUDE';
 				return qualification && qualification.type == 'APTITUDE';