增加机构类型

pages/h5/activity/activity-topic.vue

@@ -138,7 +138,7 @@
 		    }
 			return {
 			  title: '采美-一站式生/医美采购服务平台',
-			  path: `pages/goods/good-floor?type=share&linkId=${this.pageId}`
+			  path: `pages/h5/activity/activity-topic?type=share&linkId=${this.pageId}`
 			}
 		},
 		

pages/login/apply.vue

@@ -533,9 +533,11 @@ export default {
 				this.$util.msg('请上传您的营业执照', 2000)
 				return
 			}
-			if (this.medicalPracticeLicense == '') {
-				this.$util.msg('请上传您的资质许可证', 2000)
-				return
+			if (this.isOrganizationType == 1){
+				if (this.medicalPracticeLicense == '') {
+					this.$util.msg('请上传您的资质许可证', 2000)
+					return
+				}
 			}
 			if (this.isOrganizationType == 1 || this.isOrganizationType == 2) {
 				if(this.secondClubType == ''){

pages/login/binding.vue

@@ -121,9 +121,9 @@
 
 <script>
 	import { mapState,mapMutations } from 'vuex'
-	import { uploadFileImage } from "@/services/public.js"
+	import { uploadFileImage } from '@/services/public.js'
 	import authorize from '@/common/config/authorize.js'
-	import wxLogin from "@/common/config/wxLogin.js"
+	import wxLogin from '@/common/config/wxLogin.js'
 	export default{
 		data() {
 			return{
@@ -157,27 +157,30 @@
 		},	
 		onLoad(option) {
 			console.log('option=========>',this.option)
-			uni.setStorageSync('bind_id', option.bindId);
+			uni.setStorageSync('bind_id', option.bindId)
 			this.bindId = Number(option.bindId)
 			this.isUserIdentity = option.Identity
 		},
 		filters: {
 			FirstFormat:function(type) {//处理金额
-				let name='';
+				let name=''
 				switch(type){
-					case 1: name = '医美'; break;
-					case 2: name = '生美'; break;
+					case 1: name = '医美'; break
+					case 2: name = '生美'; break
+					case 3: name = '项目公司'; break
+					case 4: name = '个人'; break
+					case 5: name = '其他'; break
 				}	
-				return name;
+				return name
 			},
 			TwoFormat:function(type) {//处理金额
-				let text='';
+				let text=''
 				switch(type){
-					case 1: text = '诊所'; break;
-					case 2: text = '门诊'; break;
-					case 3: text = '医院'; break;
+					case 1: text = '诊所'; break
+					case 2: text = '门诊'; break
+					case 3: text = '医院'; break
 				}	
-				return text;
+				return text
 			},
 		},	
 		computed: {
@@ -186,15 +189,15 @@
 		methods:{
 			...mapMutations(['login','logout','wxLogin']),
 			async getWxAuthorize(){
-				const wechatCode = await authorize.getCode('weixin');// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
-				const getUserInfo = await authorize.getUserInfo('weixin');
+				const wechatCode = await authorize.getCode('weixin')// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
+				const getUserInfo = await authorize.getUserInfo('weixin')
 				this.UserService.UserLoginAuthApplets({ 
 					code:wechatCode,
 					encryptedData:getUserInfo.encryptedData,
 					iv:getUserInfo.iv ,
 				})
 				.then(response =>{
-					this.login(response.data);
+					this.login(response.data)
 					this.$store.commit('updateStatus',response.data)
 					uni.setStorageSync('token',response.data.token)
 					uni.setStorageSync('unionId',response.data.unionId)
@@ -237,7 +240,7 @@
 				})
 			},
 			SubmitRegister(){//确认并登录绑定微信
-				if(this.isSubLoading){ return; }
+				if(this.isSubLoading){ return }
 				this.GetUserProfile()
 			},
 			GetUserProfile(){//获取微信用户信息
@@ -271,7 +274,7 @@
 					},1000)
 				})
 				.catch(error =>{
-					this.$util.msg(error.msg,2000);
+					this.$util.msg(error.msg,2000)
 					
 				})
 			},

pages/login/information.vue

@@ -479,11 +479,6 @@ export default {
 						this.addressData.addressDetail = organizationClub.address ? organizationClub.address : ''
 						this.socialCreditCode = this.$reg.checkData(organizationClub.socialCreditCode)
 						this.firstClubType = organizationClub.firstClubType
-						if(this.firstClubType == 1){
-							this.firstClubTypeCurrent = 0
-						}else{
-							this.firstClubTypeCurrent = 1
-						}
 						this.secondClubType = this.$reg.checkData(organizationClub.secondClubType)
 						this.addressData.address = organizationClub.provincialAddress
 							? organizationClub.provincialAddress
@@ -499,21 +494,27 @@ export default {
 						switch(this.firstClubType){
 							case 1:
 								this.organizationTypeText = '医美'
+								this.firstClubTypeCurrent = 0
 								break
 							case 2:
 								this.organizationTypeText = '生美'
+								this.firstClubTypeCurrent = 1
 								break
 							case 3:
 								this.organizationTypeText = '项目公司'
+								this.firstClubTypeCurrent = 2
 								break
 							case 4:
 								this.organizationTypeText = '个人'
+								this.firstClubTypeCurrent = 3
 								break
 							case 5:
 								this.organizationTypeText = '其他'
+								this.firstClubTypeCurrent = 4
 								break
 							case null:
 								this.organizationTypeText = '请选择机构类型'
+								this.firstClubTypeCurrent = 5
 								break
 						}	
 						if (organizationClub.mainProduct == '' || organizationClub.mainProduct == null) {
@@ -598,13 +599,13 @@ export default {
 					this.$util.msg('请上传您的营业执照', 2000)
 					return
 				}
-				if (this.medicalPracticeLicense == '') {
-					this.$util.msg('请上传您的资质许可证', 2000)
-					return
+				if (this.firstClubType == 1){
+					if (this.medicalPracticeLicense == '') {
+						this.$util.msg('请上传您的资质许可证', 2000)
+						return
+					}
 				}
-				console.log('mainProduct', this.mainProduct)
-				console.log('firstClubType', this.firstClubType)
-				if (this.firstClubType != 0) {
+				if (this.firstClubType == 1 || this.firstClubType == 2) {
 					if (this.mainProduct == '') {
 						this.$util.msg('请选择住机构主营内容', 2000)
 						return

pages/seller/login/apply.vue

@@ -619,7 +619,7 @@ export default {
 				return
 			}
 			console.log(this.isOrganizationType)
-			if (this.isOrganizationType != 0) {
+			if (this.isOrganizationType == 1 || this.isOrganizationType == 2) {
 				if (this.mainProduct == '') {
 					this.$util.msg('请选择住机构主营内容', 2000)
 					return

pages/seller/login/register-member.vue

@@ -536,7 +536,7 @@ export default {
 					return
 				}
 			}
-			if (this.params.firstClubType != 0) {
+			if (this.params.firstClubType == 1 || this.params.firstClubType == 2) {
 				console.log(this.params.mainProduct)
 				if (this.params.mainProduct == '') {
 					this.$util.msg('请选择住机构主营内容', 2000)