Merge branch 'dev-mysql' into liuam-bind-enterprise-0413

src/main/java/com/uas/platform/b2c/prod/store/service/impl/StoreApplyServiceImpl.java

@@ -122,6 +122,7 @@ public class StoreApplyServiceImpl implements StoreApplyService {
 		storeApply.setUserUU(user.getUserUU());
 		storeApply.setUserName(user.getUserName());
 		storeApply.setCreateTime(date);
+		//将storeApply设置为预审核状态;
 		storeApply.setStatus(StoreApply.ApplyStatus.PREPARE);
 		// 设置店铺基础信息
 		storeApply.setEnUU(user.getEnterprise().getUu());

src/main/resources/dev/account.properties

@@ -11,7 +11,7 @@ sso.cookie.secure=false
 sso.cookie.browser=false
 sso.login.url=http://192.168.253.6:32323
 sso.logout.url=http://192.168.253.6:32323/logquit
-sso.register.url=http://192.168.253.6:32323/register/personalRegistration?appId=mall
+sso.register.url=http://192.168.253.6:32323/register/personalRegistration
 sso.updatePassword.url=http://192.168.253.6:32323/reset/changePasswordChooseStyle
 sso.updateMobile.url=http://192.168.253.6:32323/validation/phoneValidation
 sso.updateEmail.url=http://192.168.253.6:32323/validation/emailValidation

src/main/resources/prod/account.properties

@@ -10,7 +10,7 @@ sso.cookie.secure=false
 sso.cookie.browser=false
 sso.login.url=https://sso.ubtob.com
 sso.logout.url=https://sso.ubtob.com/logquit
-sso.register.url=https://sso.ubtob.com/register/personalRegistration?appId=mall
+sso.register.url=https://sso.ubtob.com/register/personalRegistration
 sso.updatePassword.url=https://sso.ubtob.com/reset/changePasswordChooseStyle
 sso.updateMobile.url=https://sso.ubtob.com/validation/phoneValidation
 sso.updateEmail.url=https://sso.ubtob.com/validation/emailValidation

src/main/resources/test/account.properties

@@ -10,7 +10,7 @@ sso.cookie.secure=false
 sso.cookie.browser=false
 sso.login.url=http://192.168.253.6:32323
 sso.logout.url=http://192.168.253.6:32323/logquit
-sso.register.url=http://192.168.253.6:32323/register/personalRegistration?appId=mall
+sso.register.url=http://192.168.253.6:32323/register/personalRegistration
 sso.updatePassword.url=http://192.168.253.6:32323/reset/changePasswordChooseStyle
 sso.updateMobile.url=http://192.168.253.6:32323/validation/phoneValidation
 sso.updateEmail.url=http://192.168.253.6:32323/validation/emailValidation

src/main/webapp/resources/js/admin/controllers/help/HelpDetailCtrl.js

@@ -33,9 +33,9 @@ define(['app/app'], function(app) {
 
         $scope.rootPath = BaseService.getRootPath();
         function switchBase64ToImg(el) {
-            var deferred = $q.defer();
+            const regex = new RegExp(':(.*?);');
             var data = el.src;
-            var arr = data.split(','), mime = arr[0].match(/:(.*?);/)[1],
+            var arr = data.split(','), mime = regex.exec(arr[0])[1],
                 bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n);
             while(n--){
                 u8arr[n] = bstr.charCodeAt(n);
@@ -76,8 +76,10 @@ define(['app/app'], function(app) {
             var imgs = els.find('img');
             var promises = [];
             angular.forEach(imgs, function (img) {
-                promises.push(switchBase64ToImg(img).$promise);
-            })
+                if (img.src && img.src.indexOf('http://') < 0) {
+                    promises.push(switchBase64ToImg(img).$promise);
+                }
+            });
             $q.all(promises).then(function () {
                 // console.log(els.html());
                 $scope.issue.article = els.html()
@@ -99,7 +101,9 @@ define(['app/app'], function(app) {
             var imgs = els.find('img');
             var promises = [];
             angular.forEach(imgs, function (img) {
-                promises.push(switchBase64ToImg(img).$promise);
+                if (img.src && img.src.indexOf('http://') < 0) {
+                    promises.push(switchBase64ToImg(img).$promise);
+                }
             })
             $q.all(promises).then(function () {
                 // console.log(els.html());

src/main/webapp/resources/js/admin/controllers/help/HelpEditCtrl.js

@@ -33,9 +33,9 @@ define(['app/app'], function(app) {
 
         $scope.rootPath = BaseService.getRootPath();
         function switchBase64ToImg(el) {
-            var deferred = $q.defer();
+            const regex = new RegExp(':(.*?);');
             var data = el.src;
-            var arr = data.split(','), mime = arr[0].match(/:(.*?);/)[1],
+            var arr = data.split(','), mime = regex.exec(arr[0])[1],
                 bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n);
             while(n--){
                 u8arr[n] = bstr.charCodeAt(n);
@@ -59,7 +59,9 @@ define(['app/app'], function(app) {
             var imgs = els.find('img');
             var promises = [];
             angular.forEach(imgs, function (img) {
-                promises.push(switchBase64ToImg(img).$promise);
+                if (img.src && img.src.indexOf('http://') < 0) {
+                    promises.push(switchBase64ToImg(img).$promise);
+                }
             })
             $q.all(promises).then(function () {
                 // console.log(els.html());

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

@@ -221,10 +221,10 @@ define(['app/app'], function (app) {
 				toaster.pop('error', '企业信息不能为空');
 				return false;
 			}
-			if (!$scope.sampleStore.enterprise.enUrl || $scope.sampleStore.enterprise.enUrl == '') {
+			/*if (!$scope.sampleStore.enterprise.enUrl || $scope.sampleStore.enterprise.enUrl == '') {
 				toaster.pop('error', '企业官网地址不能为空');
 				return false;
-			}
+			}*/
 			if (!$scope.sampleStore.enterprise.address || $scope.sampleStore.enterprise.address == '') {
 				toaster.pop('error', '企业地址不能为空');
 				return false;
@@ -233,10 +233,10 @@ define(['app/app'], function (app) {
 				toaster.pop('error', '请输入正确的电话号码');
 				return false;
 			}
-			if (!$scope.sampleStore.enterprise.enFax || $scope.sampleStore.enterprise.enFax == '') {
+			/*if (!$scope.sampleStore.enterprise.enFax || $scope.sampleStore.enterprise.enFax == '') {
 				toaster.pop('error', '请输入正确的企业传真');
 				return false;
-			}
+			}*/
 			var store = {};
 			store.storeShortName = $scope.sampleStore.storeShortName;
             store.storeName = $scope.sampleStore.storeName;

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

@@ -731,7 +731,7 @@
 			</div>
 			<div class="row com_row" style="margin-top: 10px;">
 				<div class="col-md-2 custom_col">
-					<span>传&nbsp;&nbsp;&nbsp;&nbsp;真<strong class="text-inverse">*</strong></span>
+					<span>传&nbsp;&nbsp;&nbsp;&nbsp;真</span>
 				</div>
 				<div class="col-md-10 custom_col">
 					<input type="text" class="form-control" style="border-radius: inherit;" title="enFax" ng-pattern="/^[\d-]{0,20}$/" ng-model="sampleStore.enterprise.enFax" maxlength="20"/>