commit -m 4月小需求

pages/login/binding.vue

@@ -144,6 +144,13 @@
 			console.log(option)
 			uni.setStorageSync('bind_id', option.userId);
 			this.params.userId = option.userId
+			authorize.checkLogin().then(res => {
+				this.getWxAuthorize()
+			})
+			.catch(err => {
+				this.isRegisterShow= true
+				this.$api.navigateTo('/pages/authorization/authorization')
+			})
 		},
 		filters: {
 			FirstFormat:function(type) {//处理金额
@@ -242,13 +249,7 @@
 			}
 		},
 		onShow() {
-			authorize.checkLogin().then(res => {
-				this.getWxAuthorize()
-			})
-			.catch(err => {
-				this.isRegisterShow= true
-				this.$api.navigateTo('/pages/authorization/authorization')
-			})
+			
 		}
 	}
 </script>

seller/pages/login/register-member.vue

@@ -183,7 +183,7 @@
 			</view>
 			<view class="main-form-item">
 				<view class="form-label">机构地址</view>
-				<view class="form-input">{{ clubInfo.provincialAddress }}</view>		
+				<view class="form-input">{{ clubInfo.addressDetail }}</view>		
 			</view>
 			<view class="main-form-item">
 				<view class="form-textarea">{{ clubInfo.address }}</view>		
@@ -383,6 +383,12 @@
 					this.$util.msg('请上传您的营业执照',2000);
 					return
 				}
+				if( this.params.firstClubType == 1){
+					if( this.params.medicalPracticeLicense == ''){
+						this.$util.msg('请上传您的医疗资质',2000);
+						return
+					}
+				}
 				if(this.params.firstClubType!=0){
 					console.log(this.params.mainProduct)
 					if(this.params.mainProduct == ''){
@@ -390,6 +396,17 @@
 						return
 					}
 				}
+				const mainproList = []
+				if(this.params.firstClubType == 1){
+					this.mentuzCampList.forEach(item =>{
+						mainproList.push(item.name)
+					})
+				}else{
+					this.medicaCampList.forEach(item =>{
+						mainproList.push(item.name)
+					})
+				}
+				this.params.mainProduct = mainproList.join('/')
 				if(this.params.isAgreed == 0){
 					this.$util.msg('请勾选同意协议',2000);
 					return
@@ -801,6 +818,9 @@
 					&.phone{
 						width: 418rpx;
 					}
+					&.none{
+						color: #999999;
+					}
 				}
 				.form-text{
 					width: 554rpx;

services/ajax.env.js

@@ -3,10 +3,10 @@ if(process.env.NODE_ENV === 'development'){
     // 开发环境
 	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
 	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
+	// URL_CONFIG = 'http://192.168.2.81:8008'
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
     URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'
-	// URL_CONFIG = 'http://192.168.2.81:8008'
 }else{
     // 生产环境
 	URL_CONFIG = 'https://spi-b.caimei365.com'