微服务联调

App.vue

@@ -71,17 +71,17 @@
 				const wechatCode = await authorize.getCode('weixin');// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
 				const getUserInfo = await authorize.getUserInfo('weixin');
 				const params = { code:wechatCode,encryptedData:getUserInfo.encryptedData,iv:getUserInfo.iv }
-				this.UserService.UserLoginAuthApplets(params).then(response =>{
-					if(response.code == 0 || response.code == 4){
-						this.$store.commit('updateStatus',response.data)
-						this.login(response.data);
-						uni.setStorageSync('token',response.data.token)
-						uni.setStorageSync('unionId',response.data.unionId)
-					}else{
-						this.logout(response.data)
-						uni.setStorageSync('unionId',response.data.unionId)
-						this.$store.commit('updateStatus',response.data)
-					}
+				this.UserService.UserLoginAuthApplets(params)
+				.then(response =>{
+					this.$store.commit('updateStatus',response.data)
+					this.login(response.data);
+					uni.setStorageSync('token',response.data.token)
+					uni.setStorageSync('unionId',response.data.unionId)
+				})
+				.catch(error =>{
+					this.logout(response.data)
+					uni.setStorageSync('unionId',response.data.unionId)
+					this.$store.commit('updateStatus',response.data)
 				})
 			},		
 			refresh(){

api/use.js

@@ -104,20 +104,6 @@ export function bindingWechat(params) {
 		})
 	})
 }
-/**
- *邀请码授权登录
- */
-export function invitationCodeLogin(params) {
-	return new Promise(function(resolve,reject) {
-		request.post('/club/invitationCode',params,true, res => {
-			if(res.code == 0 || res.code == 4){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
 /**
  *获取个人中心信息
  */

common/config/wxLogin.js

@@ -1,6 +1,5 @@
 import store from '@/store/index.js'
 import authorize from '@/common/config/authorize.js'
-import { userInfoLogin } from "@/api/use.js"
 import ajaxService from '@/services/ajax.service.js'
 import UserService from '@/services/user.service'
 
@@ -12,49 +11,46 @@ const wxLoginAuthorize = async function(){
 	const getUserInfo = await authorize.getUserInfo('weixin');
 	const params = { code:wechatCode,encryptedData:getUserInfo.encryptedData,iv:getUserInfo.iv }
 	newUserService.UserLoginAuthApplets(params)
-		.then(response =>{
-			if(response.code == 0 || response.code == 4){
-				store.commit('updateStatus',response.data)
-				store.commit('login',response.data);
-				store.commit('wxLogin',getUserInfo.userInfo);
-				uni.setStorageSync('token',response.data.token)
-				uni.setStorageSync('unionId',response.data.unionId)
-			}else{
-				uni.setStorageSync('unionId',response.data.unionId)
-				store.commit('logout',response.data)
-				store.commit('updateStatus',response.data)
-				store.commit('wxLogin',getUserInfo.userInfo);
-			}
-		})
+	.then(response =>{
+		store.commit('updateStatus',response.data)
+		store.commit('login',response.data);
+		store.commit('wxLogin',getUserInfo.userInfo);
+		uni.setStorageSync('token',response.data.token)
+		uni.setStorageSync('unionId',response.data.unionId)
+	})
+	.catch(error =>{
+		uni.setStorageSync('unionId',error.data.unionId)
+		store.commit('logout',error.data)
+		store.commit('updateStatus',error.data)
+		store.commit('wxLogin',error.userInfo);
+	})
 }
 const wxLoginQuick = async function(){// 根据微信的code获取用户登录状态:1已登录过 -1未登录过跳转
 		const wechatCode = await authorize.getCode('weixin');// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
 		const getUserInfo = await authorize.getUserInfo('weixin');
 		const params = { code:wechatCode,encryptedData:getUserInfo.encryptedData,iv:getUserInfo.iv }
 		newUserService.UserLoginAuthApplets(params)
-			.then(response =>{
-				console.log(response)
-				if(response.code == 0 || response.code == 4){
-					store.commit('updateStatus',response.data)
-					store.commit('login',response.data);
-					store.commit('wxLogin',getUserInfo.userInfo);
-					uni.setStorageSync('token',response.data.token)
-					uni.setStorageSync('unionId',response.data.unionId)
-					if(response.data.userIdentity ==1){
-						uni.navigateTo({url:'/seller/pages/index/index'})
-					}else if(response.data.userIdentity === 3){
-						uni.navigateTo({url:'/supplier/pages/index/index'})
-					}else{
-						uni.switchTab({url:'/pages/tabBar/user/user'})
-					}
-				}else{
-					uni.setStorageSync('unionId',response.data.unionId)
-					store.commit('logout',response.data)
-					store.commit('updateStatus',response.data)
-					store.commit('wxLogin',getUserInfo.userInfo);
-				}
-				
-			})
+		.then(response =>{
+			console.log(response)
+			store.commit('updateStatus',response.data)
+			store.commit('login',response.data);
+			store.commit('wxLogin',getUserInfo.userInfo);
+			uni.setStorageSync('token',response.data.token)
+			uni.setStorageSync('unionId',response.data.unionId)
+			if(response.data.userIdentity ==1){
+				uni.navigateTo({url:'/seller/pages/index/index'})
+			}else if(response.data.userIdentity === 3){
+				uni.navigateTo({url:'/supplier/pages/index/index'})
+			}else{
+				uni.switchTab({url:'/pages/tabBar/user/user'})
+			}
+		})
+		.catch(error =>{
+			uni.setStorageSync('unionId',response.data.unionId)
+			store.commit('logout',response.data)
+			store.commit('updateStatus',response.data)
+			store.commit('wxLogin',getUserInfo.userInfo);
+		})
 }
 export default{
 	wxLoginAuthorize,

components/cm-module/cm-seller/home.vue

@@ -32,7 +32,6 @@
 	import pageFloor from '@/components/cm-module/homeIndex/pageFloor.vue'
 	import pageSpecial from '@/components/cm-module/homeIndex/pageSpecial.vue'
 	import supplierList from '@/components/cm-module/homeIndex/supplierList.vue'
-	import { userInfoLogin } from "@/api/use.js"
 	import { mapState,mapMutations} from 'vuex';
 	export default {
 		components:{

components/cm-module/cm-seller/user.vue

@@ -101,7 +101,6 @@
 	import authorize from '@/common/config/authorize.js'
 	import uniBadge from '@/components/uni-badge/uni-badge.vue'
 	import { mapState,mapMutations } from 'vuex'
-	import { userInfoLogin } from "@/api/use.js"
 	
 	export default{
 		components: {
@@ -148,32 +147,36 @@
 		},
 		methods:{
 			...mapMutations(['login','logout']),
-			initData(){
-				authorize.getCode('weixin').then(wechatcode =>{// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
-					authorize.getUserInfo('weixin').then(wxResponse =>{
-						userInfoLogin({code:wechatcode,encryptedData:wxResponse.encryptedData,iv:wxResponse.iv}).then(response =>{
-							this.$store.commit('updateStatus',response.data)
-							this.login(response.data);
-							uni.setStorageSync('token',response.data.token)
-							uni.removeStorageSync('sessionid')
-							uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
-							this.getUserSellerHome()
-						}).catch(response =>{
-							this.logout()
-							uni.removeStorageSync('sessionid')
-							uni.setStorageSync('sessionid','JSESSIONID='+response.data)
-							this.$store.commit('updateStatus',response.data)
-							this.$api.navigateTo('/seller/pages/login/login')
-						})
-					})
+			async initData(){
+				const wechatCode = await authorize.getCode('weixin');// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
+				const getUserInfo = await authorize.getUserInfo('weixin');
+				const params = { code:wechatCode,encryptedData:getUserInfo.encryptedData,iv:getUserInfo.iv }
+				this.UserService.UserLoginAuthApplets(params).then(response =>{
+					if(response.code == 0 || response.code == 4){
+						this.isLogin = true;
+						this.userID = response.data.userId;						
+						this.userIdentity = response.data.userIdentity;						
+						this.clubStatus = response.data.clubStatus;						
+						this.$store.commit('updateStatus',response.data)
+						this.login(response.data);
+						uni.setStorageSync('token',response.data.token)
+						uni.setStorageSync('unionId',response.data.unionId)
+						this.getUserSellerHome()
+					}else{
+						this.isLogin = false;
+						this.logout()
+						uni.setStorageSync('unionId',response.data.unionId)
+						this.$store.commit('updateStatus',response.data)
+						this.$api.navigateTo('/seller/pages/login/login')
+					}
 				})
-			},
+			},	
 			getUserSellerHome(){
 				this.$api.getStorage().then((resolve) =>{
 					this.userId = resolve.userId ? resolve.userId : 0
 					this.SellerService.GetSellerHome({userId:this.userId}).then(response =>{
 						let sellerData = response.data
-						this.name = sellerData.seller.linkMan1?sellerData.seller.linkMan1:'' 	//协销名称
+						this.name = sellerData.seller.linkMan?sellerData.seller.linkMan:'' 	//协销名称
 						this.headpic = sellerData.seller.logo //会所头像
 						this.beforeConfirmCount = this.showBadge(sellerData.beforeConfirmCount)//待付款
 						this.beforePayCount = this.showBadge(sellerData.beforePayCount)//待付款

components/cm-module/supplier/user.vue

@@ -99,7 +99,6 @@
 	import authorize from '@/common/config/authorize.js'
 	import uniBadge from '@/components/uni-badge/uni-badge.vue'
 	import { mapState,mapMutations } from 'vuex'
-	import { userInfoLogin } from "@/api/use.js"
 	
 	export default{
 		components: {

h5/pages/activity/meobohui-booth.vue

@@ -23,7 +23,6 @@
 	import authorize from '@/common/config/authorize.js'
 	import pageFloor from '@/components/cm-module/homeIndex/pageFloor.vue'
 	import supplierList from '@/components/cm-module/homeIndex/supplierList.vue'
-	import { userInfoLogin } from "@/api/use.js"
 	import { mapState,mapMutations} from 'vuex';
 	var isPreviewImg;
 	export default {

h5/pages/activity/meobohui-supplier.vue

@@ -17,7 +17,6 @@
 	import authorize from '@/common/config/authorize.js'
 	import pageFloor from '@/components/cm-module/homeIndex/pageFloor.vue'
 	import supplierList from '@/components/cm-module/homeIndex/supplierList.vue'
-	import { userInfoLogin } from "@/api/use.js"
 	import { mapState,mapMutations} from 'vuex';
 	export default {
 		components:{

h5/pages/activity/meobohui.vue

@@ -205,7 +205,6 @@
 	import authorize from '@/common/config/authorize.js'
 	import uniGrader from '@/components/uni-grade/uni-grade.vue'
 	import modalLayer from "@/components/modal-layer"
-	import { userInfoLogin } from "@/api/use.js"
 	import { mapState,mapMutations} from 'vuex';
 	var isPreviewImg;
 	export default {

pages/login/apply.vue

@@ -232,7 +232,7 @@
 				isDisabled:true,
 				isShowInput:true,
 				textareaFocus:false,
-				businessLicense:'https://static.caimei365.com/app/img/upload/club-zizhi.png',	//营业执照图片
+				businessLicense:'',	//营业执照图片
 				shopPhoto:'',  	//门头照图片
 				medicalPracticeLicense:'', 	//资质照图片
 				department:'',			//科室
@@ -390,10 +390,10 @@
 					this.$util.msg('请填写机构详细地址',2000);
 					return
 				}
-				// if( this.businessLicense == ''){
-				// 	this.$util.msg('请上传您的营业执照',2000);
-				// 	return
-				// }
+				if( this.businessLicense == ''){
+					this.$util.msg('请上传您的营业执照',2000);
+					return
+				}
 				if(this.isOrganizationType!=0){
 					if(this.mainProduct == ''){
 						this.$util.msg('请选择住机构主营内容',2000);

pages/login/bindOperator.vue

@@ -80,7 +80,6 @@
 	import { mapState,mapMutations } from 'vuex'
 	import authorize from '@/common/config/authorize.js' 
 	import wxLogin from "@/common/config/wxLogin.js"
-	import { userInfoLogin } from "@/api/use.js"
 	import { getbindOperatorCode } from "@/api/utils.js"
 	export default{
 		data() {
@@ -117,31 +116,35 @@
 		},
 		methods:{
 			...mapMutations(['login','logout']),
-			getWxAuthorize(){// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
-				authorize.getCode('weixin').then(wechatcode =>{
-					// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
-					authorize.getUserInfo('weixin').then(wxResponse =>{
-						userInfoLogin({code:wechatcode,encryptedData:wxResponse.encryptedData,iv:wxResponse.iv}).then(response =>{
-							this.login(response.data)
-							uni.setStorageSync('token',response.data.token)
-							uni.removeStorageSync('sessionid')
-							uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
-							this.$store.commit('updateStatus',response.data)
-							if(response.data.userIdentity ==1){
-								// this.$api.navigateTo('/seller/pages/index/index')
+			async getWxAuthorize(){
+				const wechatCode = await authorize.getCode('weixin');// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
+				const getUserInfo = await authorize.getUserInfo('weixin');
+				const params = { code:wechatCode,encryptedData:getUserInfo.encryptedData,iv:getUserInfo.iv }
+				this.UserService.UserLoginAuthApplets(params)
+					.then(response =>{
+						this.login(response.data);
+						this.$store.commit('updateStatus',response.data)
+						uni.setStorageSync('token',response.data.token)
+						uni.setStorageSync('unionId',response.data.unionId)
+						setTimeout(()=>{
+							if(response.data.userIdentity === 1){
+								this.$api.navigateTo('/seller/pages/index/index')
+							}else if(response.data.userIdentity === 2 || response.data.userIdentity === 4){
+								this.$api.switchTabTo('/pages/tabBar/user/user')
+							}else if(response.data.userIdentity === 3){
+								this.$api.navigateTo('/supplier/pages/index/index')
 							}else{
-								// this.$api.switchTabTo('/pages/tabBar/home/index')
+								this.isUserInfo= true
 							}
-						}).catch(error =>{
-							this.logout()
-							this.isUserInfo = true
-							uni.removeStorageSync('sessionid')
-							uni.setStorageSync('sessionid','JSESSIONID='+error.data)
-							this.$store.commit('updateStatus',error.data)
-						})
+						},1000)
 					})
-				})
-			},
+					.catch(error =>{
+						this.logout()
+						uni.setStorageSync('unionId',response.data.unionId)
+						this.$store.commit('updateStatus',response.data)
+						this.isUserInfo = true
+					})
+			},	
 			bindWechatInfo(){
 				if( this.bindLinkName == ''){
 					this.$util.msg('请输入姓名',2000)
@@ -189,37 +192,40 @@
 				if( this.imageCode == ''){
 					this.$util.msg('请输入图形验证码',2000);
 					return
-				}			
+				}		
 				let params = {
-						userId:uni.getStorageSync('bind_id'),
 						mobile:this.bindMobile,
+						userId:uni.getStorageSync('bind_id'),
 						platformType:2,
+						isCheckCaptcha:0,
 						imgCode:this.imageCode,
 						token:this.imageCodetoken,
 				}
 				this.isMobileDisabled = true;
-				getbindOperatorCode(params).then(res =>{
-					const TIME_COUNT = 60;
-					this.$util.msg('验证短信已发送',2000)
-			     	if (!this.codeTime) {
-			       		this.count = TIME_COUNT;
-						this.isMobileDisabled = true;
-			       		this.codeTime = setInterval(() => {
-			       			if (this.count > 1 && this.count <= TIME_COUNT) {
-			         			this.count--
-			         			this.mobileCodeText = this.count +'s重新发送'
-			        		} else {
-				         		this.isMobileDisabled = false;
-				         		clearInterval(this.codeTime)
-				         		this.codeTime = null
-								this.mobileCodeText = '获取验证码'
-			        		}
-			       		},1000)
-			      	}
-				}).catch( res =>{
-					this.$util.msg(res.msg,2000)
-					this.isMobileDisabled = false;
-				})
+				this.PublicService.GetBindMobileCode(params)
+					.then(res =>{
+						const TIME_COUNT = 60;
+						this.$util.msg('验证短信已发送',2000)
+				     	if (!this.codeTime) {
+				       		this.count = TIME_COUNT;
+							this.isMobileDisabled = true;
+				       		this.codeTime = setInterval(() => {
+				       			if (this.count > 1 && this.count <= TIME_COUNT) {
+				         			this.count--
+				         			this.mobileCodeText = this.count +'s重新发送'
+				        		} else {
+					         		this.isMobileDisabled = false;
+					         		clearInterval(this.codeTime)
+					         		this.codeTime = null
+									this.mobileCodeText = '获取验证码'
+				        		}
+				       		},1000)
+				      	}
+					})
+					.catch( error =>{
+						this.$util.msg(error.msg,2000)
+						this.isMobileDisabled = false;
+					})
 			},
 			
 			bindingWechatLogin(){//获取用户基本信息登录
@@ -227,14 +233,15 @@
 					success: res => {
 						this.wxUserInfo = res.userInfo;
 						let params ={
-								userID: uni.getStorageSync('bind_id'),
-								mobile: this.bindMobile,
-								linkName: this.bindLinkName,
-								verificationCode: this.mobildeCode,
-								nickName: this.wxUserInfo.nickName,
-								headimgurl: this.wxUserInfo.avatarUrl,
+								userId:uni.getStorageSync('bind_id'),
+								mobile:this.bindMobile,
+								linkName:this.bindLinkName,
+								smsCode:this.mobildeCode,
+								unionId:uni.getStorageSync('unionId'),
+								nickName:this.wxUserInfo.nickName,
+								avatarUrl:this.wxUserInfo.avatarUrl,
 						}
-						this.SellerService.SellerBindingOperation(params).then(response =>{
+						this.UserService.BindingWechat(params).then(response =>{
 							this.login(response.data)
 							this.$api.switchTabTo('/pages/tabBar/home/index')
 						}).catch(error =>{

pages/login/information.vue

@@ -18,8 +18,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="register-main clearfix" >
-			<!-- v-if="userIdentity === 2"  -->
+		<view class="register-main clearfix" v-if="userIdentity === 2">
 			<view class="register-row">
 				<view class="register-title">升级信息</view>
 			</view>
@@ -417,7 +416,7 @@
 							linkMan:this.linkMan,
 							fax:this.clubFax,
 							contractPhone:this.clubTelePhone,
-							info : this.profile,
+							profile : this.profile,
 						}		
 				}else{
 					if(!this.isMainproCheck){

pages/login/logincode.vue

@@ -22,11 +22,11 @@
 	import authorize from '@/common/config/authorize.js'
 	import wxLogin from "@/common/config/wxLogin.js"
 	import {mapState,mapMutations } from 'vuex';
-	import { invitationCodeLogin  } from '@/api/use.js'
 	export default{
 		data() {
 			return{
 				invitationCode:'',  //获取用户登录的邀请码
+				unionId:'',
 			}
 		},
 		onLoad(option) {
@@ -45,13 +45,13 @@
 				wx.getUserInfo({
 					success: res => {
 						this.isUserInfo = false
-						this.userInfo = res.userInfo;
 						let params ={
 								invitationCode:this.invitationCode,
 								nickName:res.userInfo.nickName,
-								headimgurl:res.userInfo.avatarUrl,
+								avatarUrl:res.userInfo.avatarUrl,
+								unionId:uni.getStorageSync('unionId')
 						}							
-						invitationCodeLogin(params).then(response =>{
+						this.UserService.InvitationCodeLogin(params).then(response =>{
 							this.login(response.data)
 							wxLogin.wxLoginAuthorize()
 							if(response.data.userIdentity === 3){

pages/tabBar/home/index.vue

@@ -88,29 +88,29 @@
 				const wechatCode = await authorize.getCode('weixin');// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
 				const getUserInfo = await authorize.getUserInfo('weixin');
 				const params = { code:wechatCode,encryptedData:getUserInfo.encryptedData,iv:getUserInfo.iv }
-				this.UserService.UserLoginAuthApplets(params).then(response =>{
-					if(response.code == 0 || response.code == 4){
-						this.isLogin = true;
-						this.userID = response.data.userId;						
-						this.userIdentity = response.data.userIdentity;						
-						this.clubStatus = response.data.clubStatus;						
-						this.$store.commit('updateStatus',response.data)
-						this.login(response.data);
-						uni.setStorageSync('token',response.data.token)
-						uni.setStorageSync('unionId',response.data.unionId)
-						if(response.data.userIdentity ==1){
-							this.$api.redirectTo('/seller/pages/index/index')
-						}else if(response.data.userIdentity === 3){
-							this.$api.redirectTo('/supplier/pages/index/index')
-						}
-						this.getHomeInformation()
-					}else{
-						this.isLogin = false;
-						this.logout()
-						uni.setStorageSync('unionId',response.data.unionId)
-						this.$store.commit('updateStatus',response.data)
-						this.getHomeInformation()
+				this.UserService.UserLoginAuthApplets(params)
+				.then(response =>{
+					this.isLogin = true;
+					this.userID = response.data.userId;						
+					this.userIdentity = response.data.userIdentity;						
+					this.clubStatus = response.data.clubStatus;						
+					this.$store.commit('updateStatus',response.data)
+					this.login(response.data);
+					uni.setStorageSync('token',response.data.token)
+					uni.setStorageSync('unionId',response.data.unionId)
+					if(response.data.userIdentity ==1){
+						this.$api.redirectTo('/seller/pages/index/index')
+					}else if(response.data.userIdentity === 3){
+						this.$api.redirectTo('/supplier/pages/index/index')
 					}
+					this.getHomeInformation()
+				})
+				.catch(error =>{
+					this.isLogin = false;
+					this.logout()
+					uni.setStorageSync('unionId',error.data.unionId)
+					this.$store.commit('updateStatus',error.data)
+					this.getHomeInformation()
 				})
 			},		
 			GetHomeInit(){//金刚区分类

seller/pages/club/allClub-list.vue

@@ -29,7 +29,7 @@
 							<view class="list-tel">
 								<text class="txt">{{item.name == null ? item.username : item.name}}</text>
 								<text class="txt sm">
-									<text class="txt-le">{{checkData(item.linkMan1)  ? desensitizationName(item.linkMan1) : ''}}</text>
+									<text class="txt-le">{{checkData(item.linkMan)  ? desensitizationName(item.linkMan) : ''}}</text>
 									{{item.contractMobile1 ? hidePhone(item.contractMobile1) : ''}}
 								</text>
 							</view>
@@ -206,7 +206,7 @@
 		},
 		onShow() {
 			this.$api.getStorage().then(response =>{
-				this.serviceProviderId = response.serviceProviderID
+				this.serviceProviderId = response.serviceProviderId
 				this.pageNum = 1;
 				this.initclubList();
 			})

seller/pages/club/club-list.vue

@@ -192,7 +192,7 @@
 		},
 		onShow() {
 			this.$api.getStorage().then(response =>{
-				this.serviceProviderId = response.serviceProviderID
+				this.serviceProviderId = response.serviceProviderId
 				this.pageNum = 1;
 				this.initclubList();
 			})

seller/pages/club/list.vue

@@ -35,10 +35,10 @@
 						<view class="list-left">
 							<view class="list-head"><image :src="item.headpic ? item.headpic : 'https://static.caimei365.com/app/img/icon/icon-club@3x.png'" mode=""></image></view>
 							<view class="list-tel">
-								<text class="txt">{{item.userIdentity ===2 ? item.name : item.linkMan1}}</text>
+								<text class="txt">{{item.userIdentity ===2 ? item.name : item.linkMan}}</text>
 								<text class="txt sm">
-									<text class="txt-le">{{item.linkMan1 ? item.linkMan1 : ''}}</text>
-									{{item.contractMobile1 ? item.contractMobile1 : ''}}</text>
+									<text class="txt-le">{{item.linkMan ? item.linkMan : ''}}</text>
+									{{item.contractMobile ? item.contractMobile : ''}}</text>
 							</view>
 						</view>
 						<view class="list-opea">
@@ -262,7 +262,7 @@
 		},
 		onShow() {
 			this.$api.getStorage().then(response =>{
-				this.serviceProviderId = response.serviceProviderID
+				this.serviceProviderId = response.serviceProviderId
 				this.pageNum = 1;
 				this.initclubList();
 			})

seller/pages/login/apply.vue

@@ -87,7 +87,7 @@
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">邮箱:</view>
-					<input class="row-input" type="text" name="input" v-model="registerEmail" placeholder="请输入您的常用邮箱" maxlength="30"/>
+					<input class="row-input" type="text" name="input" v-model="contractEmail" placeholder="请输入您的常用邮箱" maxlength="30"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
@@ -99,7 +99,7 @@
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">机构简称:</view>
-					<input class="row-input" type="text" v-model="abbreviation" placeholder="请输入您的机构简称" maxlength="10"/>
+					<input class="row-input" type="text" v-model="shortName" placeholder="请输入您的机构简称" maxlength="10"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
@@ -136,9 +136,9 @@
 				<view class="register-picture">
 					<view class="label">营业执照:</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadBusinessImage === ''"  @click="chooseBusinessImage"><text class="iconfont icon-jiahao"></text></view>
+						<view class="upload-none" v-if="businessLicense === ''"  @click="chooseBusinessImage"><text class="iconfont icon-jiahao"></text></view>
 						<view class="upload-image" v-else>
-							<image :src="uploadBusinessImage" mode="" @click="viewBusinessImage"></image>
+							<image :src="businessLicense" mode="" @click="viewBusinessImage"></image>
 							<view class="upload-del" @click="delBusinessImage">
 								<text class='iconfont icon-shanchu1'></text>
 							</view>
@@ -148,9 +148,9 @@
 				<view class="register-picture">
 					<view class="label">门头照:</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadMentuzImage === ''" @click="chooseMentuzImage"><text class="iconfont icon-jiahao"></text></view>
+						<view class="upload-none" v-if="shopPhoto === ''" @click="chooseMentuzImage"><text class="iconfont icon-jiahao"></text></view>
 						<view class="upload-image" v-else>
-							<image :src="uploadMentuzImage" mode=""  @click="viewMentuzImage"></image>
+							<image :src="shopPhoto" mode=""  @click="viewMentuzImage"></image>
 							<view class="upload-del" @click="delMentuzImage">
 								<text class='iconfont icon-shanchu1'></text>
 							</view>
@@ -185,9 +185,9 @@
 				<view class="register-picture zz">
 					<view class="label zz">医疗执业许可证:</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadMedicalImage === ''" @click="chooseMedicalImage"><text class="iconfont icon-jiahao"></text></view>
+						<view class="upload-none" v-if="medicalPracticeLicense === ''" @click="chooseMedicalImage"><text class="iconfont icon-jiahao"></text></view>
 						<view class="upload-image" v-else>
-							<image :src="uploadMedicalImage" mode=""  @click="viewMedicalImage"></image>
+							<image :src="medicalPracticeLicense" mode=""  @click="viewMedicalImage"></image>
 							<view class="upload-del" @click="delMedicalImage">
 								<text class='iconfont icon-shanchu1'></text>
 							</view>
@@ -290,13 +290,13 @@ import { mapMutations } from 'vuex';
 				tabCurrentIndex:3,	
 				clubStatus:'',			//审核状态
 				isPreviewImage:false,   //预览图片开关
-				userID:'',				//用户ID
-				clubID:'',				//会所ID
+				userId:'',				//用户ID
+				clubId:'',				//会所ID
 				clubContact:'',			//联系人姓名
 				mobile:'',				//联系人手机号
-				registerEmail:'',		//邮箱
+				contractEmail:'',		//邮箱
 				clubName:'',	 		//机构名称
-				abbreviation:'',	 	//机构简称
+				shortName:'',	 	//机构简称
 				socialCreditCode:'',	//统一社会信用代码
 				isDisabled:true,
 				isShowInput:true,
@@ -304,17 +304,17 @@ import { mapMutations } from 'vuex';
 				isUpgrade:false,
 				isShowUpgrade:false,
 				isDownUpgrade:true,
-				uploadBusinessImage:'',	//营业执照图片
-				uploadMentuzImage:'',  	//门头照图片
-				uploadMedicalImage:'', 	//资质照图片
+				businessLicense:'',	//营业执照图片
+				shopPhoto:'',  	//门头照图片
+				medicalPracticeLicense:'', 	//资质照图片
 				department:'',			//科室
 				isDepartment:false,     //是否显示科室
-				secondClubType:'',		//机构类型二级分类
-				mainpro:'',				//主营内容
+				secondClubType:null,		//机构类型二级分类
+				mainProduct:'',				//主营内容
 				clubTelePhone:'',		//固定电话
 				clubFax:'',				//传真
 				companyPprofile:'',		//公司简介
-				firstClubType:'',		//机构类型
+				firstClubType:null,		//机构类型
 				isOrganizationType:0,
 				organizationTypeText:'请选择机构类型',
 				beautyList:beautyList,//医美分类
@@ -330,16 +330,16 @@ import { mapMutations } from 'vuex';
 				isMainproCheck:false,
 				addressData:{
 					address:'请选择机构所在地区',
-					townID:'',			//区ID
-					cityID:'',			//市ID
-					provinceID:'',		//省ID
+					townId:'',			//区ID
+					cityId:'',			//市ID
+					provinceId:'',		//省ID
 					addressDetail: '',	//地址详情
 				},
 				registerBtnText:'确定'
 			}	
 		},
 		onLoad(option) {
-			this.userID = option.userID
+			this.userId = option.userID
 			this.organizationInfo()
 		},
 		methods:{
@@ -351,7 +351,7 @@ import { mapMutations } from 'vuex';
 				})
 			},
 			organizationInfo(){
-				this.UserService.OrganizationUpdateModifyInfo({userID:this.userID}).then(response =>{
+				this.UserService.OrganizationUpdateModifyInfo({userId:this.userId}).then(response =>{
 					let organizationClub = response.data.club
 					let organizationUser = response.data.user
 					this.clubStatus = organizationClub.status
@@ -363,46 +363,46 @@ import { mapMutations } from 'vuex';
 					if(organizationUser.auditNoteList!=null){
 						this.errorList =organizationUser.auditNoteList
 					}
-					this.clubContact = organizationClub.linkMan1
+					this.clubContact = organizationClub.linkMan
 					this.mobile = organizationUser.bindMobile
-					this.registerEmail = organizationUser.email	
-					this.clubID = organizationUser.clubID
+					this.contractEmail = organizationClub.contractEmail	
+					this.clubId = organizationUser.clubId
 					this.clubName = this.$reg.checkData(organizationClub.name)
-					this.abbreviation = this.$reg.checkData(organizationClub.sname)
-					if( organizationClub.provinceID == null ){
-						this.addressData.provinceID = ''
+					this.shortName = this.$reg.checkData(organizationClub.shortName)
+					if( organizationClub.provinceId == null ){
+						this.addressData.provinceId = ''
 					}else{
-						this.addressData.provinceID = organizationClub.provinceID
+						this.addressData.provinceId = organizationClub.provinceId
 					}
-					if( organizationClub.cityID == null ){
-						this.addressData.cityID = ''
+					if( organizationClub.cityId == null ){
+						this.addressData.cityId = ''
 					}else{
-						this.addressData.cityID = organizationClub.cityID
+						this.addressData.cityId = organizationClub.cityId
 					}
-					if( organizationClub.townID == null ){
-						this.addressData.townID = ''
+					if( organizationClub.townId == null ){
+						this.addressData.townId = ''
 					}else{
-						this.addressData.townID = organizationClub.townID
+						this.addressData.townId = organizationClub.townId
 					}
 					this.addressData.address = organizationClub.provincialAddress ? organizationClub.provincialAddress:'请选择机构所在地区'
 					this.addressData.addressDetail = this.$reg.checkData(organizationClub.address)
 					this.socialCreditCode = this.$reg.checkData(organizationClub.socialCreditCode)
 					this.firstClubType = organizationClub.firstClubType
 					this.secondClubType = this.$reg.checkData(organizationClub.secondClubType)
-					this.uploadBusinessImage = this.$reg.checkData(organizationClub.businessLicenseImage) 
-					this.uploadMentuzImage = this.$reg.checkData(organizationClub.headpic)
-					this.uploadMedicalImage = this.$reg.checkData(organizationClub.medicalPracticeLicenseImg)
+					this.businessLicense = this.$reg.checkData(organizationClub.businessLicense) 
+					this.shopPhoto = this.$reg.checkData(organizationClub.shopPhoto)
+					this.medicalPracticeLicense = this.$reg.checkData(organizationClub.medicalPracticeLicense)
 					this.department = this.$reg.checkData(organizationClub.department)
 					this.clubTelePhone = this.$reg.checkData(organizationClub.contractPhone)
 					this.clubFax = this.$reg.checkData(organizationClub.fax)
-					this.companyPprofile = this.$reg.checkData(organizationClub.info)
+					this.companyPprofile = this.$reg.checkData(organizationClub.profile)
 					//机构类型&&主营项目
 					switch(this.firstClubType){
-						case '1':
+						case 1:
 							this.organizationTypeText = '医美'
 							this.isOrganizationType = 1
 							break;
-						case '2':
+						case 2:
 							this.organizationTypeText = '生美'
 							this.isOrganizationType = 2
 							break;
@@ -411,24 +411,24 @@ import { mapMutations } from 'vuex';
 							this.isOrganizationType = 0
 							break;
 					}	
-					if(organizationClub.mainpro == "" || organizationClub.mainpro == null){
+					if(organizationClub.mainProduct == "" || organizationClub.mainProduct == null){
 						this.mentuzCampList = this.mentuzCampNullList
 						this.medicaCampList = this.medicaCampNullList
 					}else{
 						if(this.firstClubType == '1'){
-							this.mentuzCampList = this.setNewMainpro(organizationClub.mainpro)
+							this.mentuzCampList = this.setNewMainpro(organizationClub.mainProduct)
 							this.medicaCampList = this.medicaCampNullList							
 						}else{
-							this.medicaCampList = this.setNewMainpro(organizationClub.mainpro)
+							this.medicaCampList = this.setNewMainpro(organizationClub.mainProduct)
 							this.mentuzCampList = this.mentuzCampNullList
 						}
-						this.mainpro = organizationClub.mainpro;
+						this.mainProduct = organizationClub.mainProduct;
 					}
 					//机构类型
 					switch(this.secondClubType){
-						case '1':this.current = 0;break;
-						case '2':this.current = 1;this.isDepartment=true;break;
-						case '3':this.current = 2;this.isDepartment=true;break;
+						case 1:this.current = 0;break;
+						case 2:this.current = 1;this.isDepartment=true;break;
+						case 3:this.current = 2;this.isDepartment=true;break;
 					}
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
@@ -441,13 +441,17 @@ import { mapMutations } from 'vuex';
 				if(this.isUpgrade){
 					this.clubUpgradeApi()
 				}else{
+					if( this.clubContact == ''){
+						this.$util.msg('请输入联系人姓名',2000);
+						return
+					}
 					 let params = {
-							userID:this.userID,
-							clubID:this.clubID,					//会所ID
-							linkMan1:this.clubContact,
+							userId:this.userId,
+							clubId:this.clubId,	//会所ID
+							linkMan:this.clubContact,
 							fax:this.clubFax,
 							contractPhone:this.clubTelePhone,
-							info : this.companyPprofile,
+							profile : this.companyPprofile,
 						}		
 					this.UserService.OrganizationUpdate(params).then(response =>{
 						this.$util.msg('修改成功',2000,true,'success')
@@ -462,7 +466,7 @@ import { mapMutations } from 'vuex';
 			clubUpgradeApi(){
 				if(this.isMainproCheck){
 					let mainproList = []
-					if(this.firstClubType == '1'){
+					if(this.firstClubType == 1){
 						this.mentuzCampList.forEach(item =>{
 							mainproList.push(item.name)
 						})
@@ -471,14 +475,14 @@ import { mapMutations } from 'vuex';
 							mainproList.push(item.name)
 						})
 					}
-					this.mainpro = mainproList.join('/')
+					this.mainProduct = mainproList.join('/')
 				}
-				console.log(this.mainpro)
-				if( this.registerEmail == ''){
+				console.log(this.mainProduct)
+				if( this.contractEmail == ''){
 					this.$util.msg('请输入邮箱地址',2000);
 					return
 				}
-				if( !this.$reg.isEmail(this.registerEmail)){
+				if( !this.$reg.isEmail(this.contractEmail)){
 					this.$util.msg('请输入正确的邮箱地址',2000);
 					return
 				}
@@ -486,7 +490,7 @@ import { mapMutations } from 'vuex';
 					this.$util.msg('请输入机构名称',2000);
 					return
 				}
-				if( this.addressData.townID == ''){
+				if( this.addressData.townId == ''){
 					this.$util.msg('请选择机构地址',2000);
 					return
 				}
@@ -494,39 +498,39 @@ import { mapMutations } from 'vuex';
 					this.$util.msg('请填写机构详细地址',2000);
 					return
 				}
-				if( this.uploadBusinessImage == ''){
+				if( this.businessLicense == ''){
 					this.$util.msg('请上传您的营业执照',2000);
 					return
 				}
 				console.log(this.isOrganizationType)
 				if(this.isOrganizationType!=0){
-					if(this.mainpro == ''){
+					if(this.mainProduct == ''){
 						this.$util.msg('请选择住机构主营内容',2000);
 						return
 					}
 				}
 				let params = {
-						userID:this.userID,
-						clubID:this.clubID,		//会所ID	
-						linkMan1:this.clubContact,
-						contractEmail1:this.registerEmail,
+						userId:this.userId,
+						clubId:this.clubId,		//会所ID	
+						linkMan:this.clubContact,
+						contractEmail:this.contractEmail,
 						name:this.clubName,
-						sname:this.abbreviation,
-						provinceID:this.addressData.provinceID,
-						cityID:this.addressData.cityID,
-						townID:this.addressData.townID,
+						shortName:this.shortName,
+						provinceId:this.addressData.provinceId,
+						cityId:this.addressData.cityId,
+						townId:this.addressData.townId,
 						address:this.addressData.addressDetail,
 						socialCreditCode:this.socialCreditCode,
-						businessLicenseImage:this.uploadBusinessImage,
-						headpic:this.uploadMentuzImage,
+						businessLicense:this.businessLicense,
+						shopPhoto:this.shopPhoto,
 						firstClubType:this.isOrganizationType,  //机构类型分类 医美:0和生美:1
 						secondClubType:this.secondClubType,		//机构类型二级分类 诊所:1,门诊:2,医院:3
 						department:this.department,				//科室
-						medicalPracticeLicenseImg:this.uploadMedicalImage,//资质图片
-						mainpro:this.mainpro,
+						medicalPracticeLicense:this.medicalPracticeLicense,//资质图片
+						mainProduct:this.mainProduct,
 						fax:this.clubFax,
 						contractPhone:this.clubTelePhone,
-						info : this.companyPprofile,
+						profile : this.companyPprofile,
 				}
 				this.UserService.OrganizationRegister(params).then(response =>{
 					this.$util.msg('您的升级申请已提交审核',2000);
@@ -544,9 +548,9 @@ import { mapMutations } from 'vuex';
 			},
 			onConfirm(e) {
 				this.addressData.address = e.name;
-				this.addressData.townID = e.townCode;
-				this.addressData.cityID = e.cityCode;
-				this.addressData.provinceID = e.provinceCode;
+				this.addressData.townId = e.townCode;
+				this.addressData.cityId = e.cityCode;
+				this.addressData.provinceId = e.provinceCode;
 			},	
 			onTextareaInput(e){
 			   this.addressData.addressDetail = e.detail.value;
@@ -561,27 +565,27 @@ import { mapMutations } from 'vuex';
 			},
 			chooseBusinessImage() {//营业执照图片上传
 				uploadFileImage().then(res =>{
-					this.uploadBusinessImage = JSON.parse(res.data).data
+					this.businessLicense = JSON.parse(res.data).data
 				})
 			},
 			chooseMentuzImage() {//门头照图片上传
 				uploadFileImage().then(res =>{
-					this.uploadMentuzImage = JSON.parse(res.data).data
+					this.shopPhoto = JSON.parse(res.data).data
 				})
 			},
 			chooseMedicalImage() {//资质照图片上传
 				uploadFileImage().then(res =>{
-					this.uploadMedicalImage = JSON.parse(res.data).data
+					this.medicalPracticeLicense = JSON.parse(res.data).data
 				})
 			},
 			viewBusinessImage(e) {
-				this.myPreviewImageFn(this.uploadBusinessImage)
+				this.myPreviewImageFn(this.businessLicense)
 			},
 			viewMentuzImage(e) {
-				this.myPreviewImageFn(this.uploadMentuzImage)
+				this.myPreviewImageFn(this.shopPhoto)
 			},
 			viewMedicalImage(e) {
-				this.myPreviewImageFn(this.uploadMedicalImage)
+				this.myPreviewImageFn(this.medicalPracticeLicense)
 			},
 			myPreviewImageFn(url){
 				this.isPreviewImage = true
@@ -594,17 +598,17 @@ import { mapMutations } from 'vuex';
 			},
 			delBusinessImage(){
 				this.$util.modal('','确定删除营业执照图片吗？','确定','取消',true,() =>{
-					 this.uploadBusinessImage = ''
+					 this.businessLicense = ''
 				})
 			},
 			delMentuzImage(){
 				this.$util.modal('','确定删除门头照图片吗？','确定','取消',true,() =>{
-					this.uploadMentuzImage = ''
+					this.shopPhoto = ''
 				})
 			},			
 			delMedicalImage(){
 				this.$util.modal('','确定删除资质图片吗？','确定','取消',true,() =>{
-					this.uploadMedicalImage = ''
+					this.medicalPracticeLicense = ''
 				})
 			},
 			bindPickerChange() {
@@ -632,7 +636,7 @@ import { mapMutations } from 'vuex';
 			},
 			radioChange(e) {
 				this.secondClubType = e.target.value;
-				if( this.secondClubType == '2' || this.secondClubType == '3'){
+				if( this.secondClubType == 2 || this.secondClubType == 3){
 					this.isDepartment = true
 				}else{
 					this.isDepartment = false
@@ -646,11 +650,11 @@ import { mapMutations } from 'vuex';
 			},
 			chooseMaleLike(e){
 				this.isMainproCheck = true
-				this.mainpro = this.checkLikes(e,this.mentuzCampList)
+				this.mainProduct = this.checkLikes(e,this.mentuzCampList)
 			},
 			chooseMaleLikes(e){
 				this.isMainproCheck = true
-				this.mainpro = this.checkLikes(e,this.medicaCampList)
+				this.mainProduct = this.checkLikes(e,this.medicaCampList)
 			},
 			checkLikes(e,list){
 				let	values = e.detail.value

seller/pages/login/information.vue

@@ -67,7 +67,7 @@
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">邮箱:</view>
-					<input class="row-input" type="text" name="input" v-model="email" placeholder="请输入邮箱地址" maxlength="30"/>
+					<input class="row-input" type="text" name="input" v-model="contractEmail" placeholder="请输入邮箱地址" maxlength="30"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
@@ -79,7 +79,7 @@
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">机构简称:</view>
-					<input class="row-input" type="text" v-model="abbreviation" placeholder="请输入您的机构简称" maxlength="10"/>
+					<input class="row-input" type="text" v-model="shortName" placeholder="请输入您的机构简称" maxlength="10"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
@@ -116,9 +116,9 @@
 				<view class="register-picture">
 					<view class="label">营业执照:</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadBusinessImage == ''"  @click="chooseBusinessImage"><text class="iconfont icon-jiahao"></text></view>
+						<view class="upload-none" v-if="businessLicense == ''"  @click="chooseBusinessImage"><text class="iconfont icon-jiahao"></text></view>
 						<view class="upload-image" v-else>
-							<image :src="uploadBusinessImage" mode="" @click="viewBusinessImage"></image>
+							<image :src="businessLicense" mode="" @click="viewBusinessImage"></image>
 							<view class="upload-del" @click="delBusinessImage">
 								<text class='iconfont icon-shanchu1'></text>
 							</view>
@@ -128,9 +128,9 @@
 				<view class="register-picture">
 					<view class="label">门头照:</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadMentuzImage == ''" @click="chooseMentuzImage"><text class="iconfont icon-jiahao"></text></view>
+						<view class="upload-none" v-if="shopPhoto == ''" @click="chooseMentuzImage"><text class="iconfont icon-jiahao"></text></view>
 						<view class="upload-image" v-else>
-							<image :src="uploadMentuzImage" mode=""  @click="viewMentuzImage"></image>
+							<image :src="shopPhoto" mode=""  @click="viewMentuzImage"></image>
 							<view class="upload-del" @click="delMentuzImage">
 								<text class='iconfont icon-shanchu1'></text>
 							</view>
@@ -165,9 +165,9 @@
 				<view class="register-picture zz">
 					<view class="label zz">医疗执业许可证:</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadMedicalImage == ''" @click="chooseMedicalImage"><text class="iconfont icon-jiahao"></text></view>
+						<view class="upload-none" v-if="medicalPracticeLicense == ''" @click="chooseMedicalImage"><text class="iconfont icon-jiahao"></text></view>
 						<view class="upload-image" v-else>
-							<image :src="uploadMedicalImage" mode=""  @click="viewMedicalImage"></image>
+							<image :src="medicalPracticeLicense" mode=""  @click="viewMedicalImage"></image>
 							<view class="upload-del" @click="delMedicalImage">
 								<text class='iconfont icon-shanchu1'></text>
 							</view>
@@ -267,13 +267,13 @@
 				},
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				isPreviewImage:false,   //预览图片开关
-				userID:'',				//机构的userID
-				clubID:'',				//会所ID
+				userId:'',				//机构的userId
+				clubId:'',				//会所ID
 				mobile:'',				//联系人手机号
 				userIdentity:'',		//机构用户类型
-				email:'',				//邮箱
+				contractEmail:'',				//邮箱
 				clubName:'',	 		//机构名称
-				abbreviation:'',	 	//机构简称
+				shortName:'',	 	//机构简称
 				clubContact:'',	 		//联系人
 				socialCreditCode:'',	//统一社会信用代码
 				isAgreed:1,				//是否勾选协议
@@ -281,13 +281,13 @@
 				isShowInput:true,
 				textareaFocus:false,
 				isCheck:true,			//是否勾选协议
-				uploadBusinessImage:'',	//营业执照图片
-				uploadMentuzImage:'',  	//门头照图片
-				uploadMedicalImage:'', 	//资质照图片
+				businessLicense:'',	//营业执照图片
+				shopPhoto:'',  	//门头照图片
+				medicalPracticeLicense:'', 	//资质照图片
 				department:'',			//科室
 				isDepartment:false,     //是否显示科室
 				secondClubType:'',		//机构类型二级分类
-				mainpro:'',				//主营内容
+				mainProduct:'',				//主营内容
 				clubTelePhone:'',		//固定电话
 				clubFax:'',				//传真
 				companyPprofile:'',		//公司简介
@@ -307,16 +307,16 @@
 				isMainproCheck:false,
 				addressData:{
 					address:'请选择机构所在地区',
-					townID:'',			//区ID
-					cityID:'',			//市ID
-					provinceID:'',		//省ID
+					townId:'',			//区ID
+					cityId:'',			//市ID
+					provinceId:'',		//省ID
 					addressDetail: '',	//地址详情
 				},
 			}	
 		},
 		onLoad(option) {
 			console.log(option)
-			this.userID = option.userID
+			this.userId = option.userID
 			this.organizationInfo()
 		},
 		methods:{
@@ -328,50 +328,50 @@
 				})
 			},
 			organizationInfo(){
-				this.UserService.OrganizationUpdateModifyInfo({userID:this.userID}).then(response =>{
+				this.UserService.OrganizationUpdateModifyInfo({userId:this.userId}).then(response =>{
 					let organizationClub = response.data.club
 					let organizationUser = response.data.user
-					this.clubID = organizationUser.clubID
+					this.clubId = organizationUser.clubId
 					this.userIdentity = organizationUser.userIdentity
-					this.clubContact = organizationClub.linkMan1
+					this.clubContact = organizationClub.linkMan
 					this.mobile = organizationUser.bindMobile
 					this.clubTelePhone = organizationClub.contractPhone ? organizationClub.contractPhone : ''
 					this.clubFax = organizationClub.fax ? organizationClub.fax : ''
-					this.companyPprofile = organizationClub.info ? organizationClub.info : ''
-					this.email = organizationUser.email	
+					this.companyPprofile = organizationClub.profile ? organizationClub.profile : ''
+					this.contractEmail = organizationClub.contractEmail	
 					this.clubName = organizationClub.name
-					this.abbreviation = organizationClub.sname
-					if( organizationClub.provinceID == null ){
-						this.addressData.provinceID = ''
+					this.shortName = organizationClub.shortName
+					if( organizationClub.provinceId == null ){
+						this.addressData.provinceId = ''
 					}else{
-						this.addressData.provinceID = organizationClub.provinceID
+						this.addressData.provinceId = organizationClub.provinceId
 					}
-					if( organizationClub.cityID == null ){
-						this.addressData.cityID = ''
+					if( organizationClub.cityId == null ){
+						this.addressData.cityId = ''
 					}else{
-						this.addressData.cityID = organizationClub.cityID
+						this.addressData.cityId = organizationClub.cityId
 					}
-					if( organizationClub.townID == null ){
-						this.addressData.townID = ''
+					if( organizationClub.townId == null ){
+						this.addressData.townId = ''
 					}else{
-						this.addressData.townID = organizationClub.townID
+						this.addressData.townId = organizationClub.townId
 					}
 					this.addressData.addressDetail = organizationClub.address ? organizationClub.address : ''
 					this.socialCreditCode = this.$reg.checkData(organizationClub.socialCreditCode)
 					this.firstClubType = this.$reg.checkData(organizationClub.firstClubType)
 					this.secondClubType = this.$reg.checkData(organizationClub.secondClubType)
 					this.addressData.address = organizationClub.provincialAddress ? organizationClub.provincialAddress : ''
-					this.uploadBusinessImage = this.$reg.checkData(organizationClub.businessLicenseImage)
-					this.uploadMedicalImage = this.$reg.checkData(organizationClub.medicalPracticeLicenseImg)
-					this.uploadMentuzImage = this.$reg.checkData(organizationClub.headpic)
+					this.businessLicense = this.$reg.checkData(organizationClub.businessLicense)
+					this.medicalPracticeLicense = this.$reg.checkData(organizationClub.medicalPracticeLicense)
+					this.shopPhoto = this.$reg.checkData(organizationClub.shopPhoto)
 					this.department = this.$reg.checkData(organizationClub.department)						
 					//机构类型&&主营项目
 					switch(this.firstClubType){
-						case '1':
+						case 1:
 							this.organizationTypeText = '医美'
 							this.isOrganizationType = 1
 							break;
-						case '2':
+						case 2:
 							this.organizationTypeText = '生美'
 							this.isOrganizationType = 2
 							break;
@@ -380,23 +380,23 @@
 							this.isOrganizationType = 0
 							break;
 					}	
-					if(organizationClub.mainpro == "" || organizationClub.mainpro == null){
+					if(organizationClub.mainProduct == "" || organizationClub.mainProduct == null){
 						this.mentuzCampList = this.mentuzCampNullList
 						this.medicaCampList = this.medicaCampNullList
 					}else{
-						if(this.firstClubType == '1'){
-							this.mentuzCampList = this.setNewMainpro(organizationClub.mainpro)
+						if(this.firstClubType == 1){
+							this.mentuzCampList = this.setNewMainpro(organizationClub.mainProduct)
 							this.medicaCampList = this.medicaCampNullList
 						}else{
-							this.medicaCampList = this.setNewMainpro(organizationClub.mainpro)
+							this.medicaCampList = this.setNewMainpro(organizationClub.mainProduct)
 							this.mentuzCampList = this.mentuzCampNullList
 						}
 					}
 					//机构类型
 					switch(this.secondClubType){
-						case '1':this.current = 0;break;
-						case '2':this.current = 1;this.isDepartment=true;break;
-						case '3':this.current = 2;this.isDepartment=true;break;
+						case 1:this.current = 0;break;
+						case 2:this.current = 1;this.isDepartment=true;break;
+						case 3:this.current = 2;this.isDepartment=true;break;
 					}
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
@@ -405,7 +405,7 @@
 			organizationUpdateInfo(){//提交审核
 				if(!this.isMainproCheck){
 					let mainproList = []
-					if(this.firstClubType == '1'){
+					if(this.firstClubType == 1){
 						this.mentuzCampList.forEach(item =>{
 							mainproList.push(item.name)
 						})
@@ -414,30 +414,30 @@
 							mainproList.push(item.name)
 						})
 					}
-					this.mainpro = mainproList.join('/')
+					this.mainProduct = mainproList.join('/')
 				}
 				let params = {
-						userID:this.userID,
-						clubID:this.clubID,					//会所ID
+						userId:this.userId,
+						clubId:this.clubId,					//会所ID
 						name:this.clubName,
-						linkMan1:this.clubContact,
-						sname:this.abbreviation,
-						provinceID:this.addressData.provinceID,
-						cityID:this.addressData.cityID,
-						townID:this.addressData.townID,
+						linkMan:this.clubContact,
+						shortName:this.shortName,
+						provinceId:this.addressData.provinceId,
+						cityId:this.addressData.cityId,
+						townId:this.addressData.townId,
 						address:this.addressData.addressDetail,
 						socialCreditCode:this.socialCreditCode,
-						businessLicenseImage:this.uploadBusinessImage,
-						headpic:this.uploadMentuzImage,
+						businessLicense:this.businessLicense,
+						shopPhoto:this.shopPhoto,
 						firstClubType:this.isOrganizationType, //机构类型分类 医美:0和生美:1
 						secondClubType:this.secondClubType,		//机构类型二级分类 诊所:1,门诊:2,医院:3
 						department:this.department,				//科室
-						medicalPracticeLicenseImg:this.uploadMedicalImage,//资质图片
+						medicalPracticeLicense:this.medicalPracticeLicense,//资质图片
 						isAgreed:this.isAgreed,				//是否勾选协议	
-						mainpro:this.mainpro,
+						mainProduct:this.mainProduct,
 						fax:this.clubFax,
 						contractPhone:this.clubTelePhone,
-						info : this.companyPprofile,
+						profile : this.companyPprofile,
 					}
 				this.UserService.OrganizationUpdate(params).then(response =>{
 					this.$util.msg('修改成功',2000,true,'success')
@@ -457,9 +457,9 @@
 			},
 			onConfirm(e) {
 				this.addressData.address = e.name;
-				this.addressData.townID = e.townCode;
-				this.addressData.cityID = e.cityCode;
-				this.addressData.provinceID = e.provinceCode;
+				this.addressData.townId = e.townCode;
+				this.addressData.cityId = e.cityCode;
+				this.addressData.provinceId = e.provinceCode;
 			},	
 			onTextareaInput(e){
 			   this.addressData.addressDetail = e.detail.value;
@@ -477,27 +477,27 @@
 			},
 			chooseBusinessImage() {//营业执照图片上传
 				uploadFileImage().then(res =>{
-					this.uploadBusinessImage = JSON.parse(res.data).data
+					this.businessLicense = JSON.parse(res.data).data
 				})
 			},
 			chooseMentuzImage() {//门头照图片上传
 				uploadFileImage().then(res =>{
-					this.uploadMentuzImage = JSON.parse(res.data).data
+					this.shopPhoto = JSON.parse(res.data).data
 				})
 			},
 			chooseMedicalImage() {//资质照图片上传
 				uploadFileImage().then(res =>{
-					this.uploadMedicalImage = JSON.parse(res.data).data
+					this.medicalPracticeLicense = JSON.parse(res.data).data
 				})
 			},
 			viewBusinessImage(e) {
-				this.myPreviewImageFn(this.uploadBusinessImage)
+				this.myPreviewImageFn(this.businessLicense)
 			},
 			viewMentuzImage(e) {
-				this.myPreviewImageFn(this.uploadMentuzImage)
+				this.myPreviewImageFn(this.shopPhoto)
 			},
 			viewMedicalImage(e) {
-				this.myPreviewImageFn(this.uploadMedicalImage)
+				this.myPreviewImageFn(this.medicalPracticeLicense)
 			},
 			myPreviewImageFn(url){
 				this.isPreviewImage = true
@@ -510,17 +510,17 @@
 			},
 			delBusinessImage(){
 				this.$util.modal('','确定删除营业执照图片吗？','确定','取消',true,() =>{
-					 this.uploadBusinessImage = ''
+					 this.businessLicense = ''
 				})
 			},
 			delMentuzImage(){
 				this.$util.modal('','确定删除门头照图片吗？','确定','取消',true,() =>{
-					this.uploadMentuzImage = ''
+					this.shopPhoto = ''
 				})
 			},			
 			delMedicalImage(){
 				this.$util.modal('','确定删除资质图片吗？','确定','取消',true,() =>{
-					this.uploadMedicalImage = ''
+					this.medicalPracticeLicense = ''
 				})
 			},
 			bindPickerChange() {
@@ -548,7 +548,7 @@
 			},
 			radioChange(e) {
 				this.secondClubType = e.target.value;
-				if( this.secondClubType == '2' || this.secondClubType == '3'){
+				if( this.secondClubType == 2 || this.secondClubType == 3){
 					this.isDepartment = true
 				}else{
 					this.isDepartment = false
@@ -562,11 +562,11 @@
 			},
 			chooseMaleLike(e){
 				this.isMainproCheck = true
-				this.mainpro = this.checkLikes(e,this.mentuzCampList)
+				this.mainProduct = this.checkLikes(e,this.mentuzCampList)
 			},
 			chooseMaleLikes(e){
 				this.isMainproCheck = true
-				this.mainpro = this.checkLikes(e,this.medicaCampList)
+				this.mainProduct = this.checkLikes(e,this.medicaCampList)
 			},
 			checkLikes(e,list){
 				let	values = e.detail.value

seller/pages/login/login.vue

@@ -7,11 +7,11 @@
 		</view>
 		<view class="login-form">
 			<view class="login-input">
-				<input type="number" v-model="accountNumber"  maxlength="11" class="input" placeholder="请输入手机号"/>
+				<input type="number" v-model="params.mobileOrEmail"  maxlength="11" class="input" placeholder="请输入手机号"/>
 			</view>
 			<view class="login-input">
-				<input v-show="isShowEye" type="text" v-model="password"  maxlength="18" class="input" placeholder="请输入密码" autocomplete="new-password"/>
-				<input v-show="!isShowEye" type="password" v-model="password"  :password="true" maxlength="18" class="input" placeholder="请输入密码" autocomplete="new-password"/>
+				<input v-show="isShowEye" type="text" v-model="params.password"  maxlength="18" class="input" placeholder="请输入密码" autocomplete="new-password"/>
+				<input v-show="!isShowEye" type="password" v-model="params.password"  :password="true" maxlength="18" class="input" placeholder="请输入密码" autocomplete="new-password"/>
 				<view class="iconfont" :class="isShowEye ? iconEyen : iconEyes"  @click="passwordClick"></view>
 			</view>
 		</view>
@@ -25,7 +25,6 @@
 	import { mapState,mapMutations } from 'vuex';
 	import errorAlert from '@/components/cm-module/modelAlert/errorAlert.vue'
 	import authorize from '@/common/config/authorize.js' 
-	import { userInfoLogin } from "@/api/use.js"
 	var self;
 	export default{
 		components:{
@@ -47,8 +46,11 @@
 				iseErrorAlert:false,
 				iconEyes:'icon-yanjing_yincang_o',
 				iconEyen:'icon-yanjing_xianshi_o',
-				accountNumber:'',  //协销用户登录账号
-				password:'',	   //协销登录密码	
+				params:{
+					mobileOrEmail:'',//协销用户登录账号
+					password:'',//协销登录密码	
+					unionId:uni.getStorageSync('unionId')
+				}
 			}
 		},
 		onLoad() {
@@ -66,40 +68,34 @@
 		},
 		methods:{
 			...mapMutations(['login','logout']),
-			getWxAuthorize(){
-				authorize.getCode('weixin').then(wechatcode =>{
-					// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
-					authorize.getUserInfo('weixin').then(wxResponse =>{
-						userInfoLogin({code:wechatcode,encryptedData:wxResponse.encryptedData,iv:wxResponse.iv}).then(response =>{
-							if(response.code != -6){//判断是否为微信绑定了供应商的账户
-								if(response.data.userIdentity !=1){
-									this.logout()
-									uni.removeStorageSync('sessionid')
-									uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
-									this.isSeller= true
-								}else{
-									this.login(response.data);
-									this.$store.commit('updateStatus',response.data)
-									uni.setStorageSync('token',response.data.token)
-									uni.removeStorageSync('sessionid')
-									uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
-									this.$api.navigateTo('/seller/pages/index/index')
-								}
-							}else{
-								this.isSeller= true
-								this.iseErrorAlert= true
-							}
-						}).catch(error =>{
+			async getWxAuthorize(){
+				const wechatCode = await authorize.getCode('weixin');// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
+				const getUserInfo = await authorize.getUserInfo('weixin');
+				const params = { code:wechatCode,encryptedData:getUserInfo.encryptedData,iv:getUserInfo.iv }
+				this.UserService.UserLoginAuthApplets(params).then(response =>{
+					if(response.code != -6){//判断是否为微信绑定了供应商的账户
+						if(response.data.userIdentity === 1){
+							this.login(response.data);
+							this.$store.commit('updateStatus',response.data)
+							uni.setStorageSync('token',response.data.token)
+							uni.setStorageSync('unionId',response.data.unionId)
+							setTimeout(()=>{
+								this.$api.navigateTo('/seller/pages/index/index')
+							},1500)
+						}else{
 							this.logout()
-							uni.removeStorageSync('sessionid')
-							uni.setStorageSync('sessionid','JSESSIONID='+error.data)
+							uni.setStorageSync('unionId',response.data.unionId)
+							this.$store.commit('updateStatus',response.data)
 							this.isSeller= true
-						})
-					})
-				})	
+						}
+					}else{
+						this.isSeller= true
+						this.iseErrorAlert= true
+					}
+				})
 			},	
 			confirmLogin(){
-				if( this.accountNumber == ''){
+				if( this.params.mobileOrEmail == ''){
 					this.$util.msg('请输入账户名',2000)
 					return
 				}
@@ -116,16 +112,19 @@
 				})	
 			},
 			SellerLogin(){
-				this.SellerService.SellerLogin({mobile:this.accountNumber,password:this.password}).then(response =>{
-						this.$store.commit('updateStatus',response.data)
+				this.SellerService.SellerLogin(this.params)
+					.then(response =>{
 						this.login(response.data);
+						this.$store.commit('updateStatus',response.data)
 						uni.setStorageSync('token',response.data.token)
-						uni.removeStorageSync('sessionid')
-						uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
-						this.$api.redirectTo('/seller/pages/index/index')
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
+						uni.setStorageSync('unionId',response.data.unionId)
+						setTimeout(()=>{
+							this.$api.navigateTo('/seller/pages/index/index')
+						},1500)
+					})
+					.catch(error =>{
+						this.$util.msg(error.msg,2000);
+					})
 			},
 			storeUpdataeStatus(data){
 				let user_key = {

seller/pages/login/register.vue

@@ -14,7 +14,7 @@
 			<view class="register-row clearfix">
 				<view class="register-from code">
 					<view class="label">手机号:</view>
-					<input class="row-input phone" type="text" v-model="registerMobile" placeholder="请输入联系人手机号" maxlength="11"/>
+					<input class="row-input phone" type="text" v-model="bindMobile" placeholder="请输入联系人手机号" maxlength="11"/>
 				</view>
 				<view class="register-from btn">
 					<button class="row-input" type="button" @click.stop="registerCheckMobile()">检测</button>
@@ -66,7 +66,7 @@
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">机构简称:</view>
-					<input class="row-input" type="text" v-model="abbreviation" placeholder="请输入您的机构简称" maxlength="10"/>
+					<input class="row-input" type="text" v-model="shortName" placeholder="请输入您的机构简称" maxlength="10"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
@@ -103,10 +103,10 @@
 				<view class="register-picture">
 					<view class="label">营业执照:</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadBusinessImage === ''"  @click="chooseBusinessImage"><text class="iconfont icon-jiahao"></text></view>
+						<view class="upload-none" v-if="businessLicense === ''"  @click="chooseBusinessImage"><text class="iconfont icon-jiahao"></text></view>
 						<view class="upload-image" v-else>
-							<image :src="uploadBusinessImage" mode="" @click="viewBusinessImage"></image>
-							<view class="upload-del" @click="delBusinessImage">
+							<image :src="businessLicense" mode="" @click="viewBusinessImage"></image>
+							<view class="upload-del" @click="DelImage(1)">
 								<text class='iconfont icon-shanchu1'></text>
 							</view>
 						</view>
@@ -115,10 +115,10 @@
 				<view class="register-picture">
 					<view class="label">门头照:</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadMentuzImage === ''" @click="chooseMentuzImage"><text class="iconfont icon-jiahao"></text></view>
+						<view class="upload-none" v-if="shopPhoto === ''" @click="chooseMentuzImage"><text class="iconfont icon-jiahao"></text></view>
 						<view class="upload-image" v-else>
-							<image :src="uploadMentuzImage" mode=""  @click="viewMentuzImage"></image>
-							<view class="upload-del" @click="delMentuzImage">
+							<image :src="shopPhoto" mode=""  @click="viewMentuzImage"></image>
+							<view class="upload-del" @click="DelImage(2)">
 								<text class='iconfont icon-shanchu1'></text>
 							</view>
 						</view>
@@ -152,10 +152,10 @@
 				<view class="register-picture zz">
 					<view class="label zz">医疗执业许可证:</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadMedicalImage === ''" @click="chooseMedicalImage"><text class="iconfont icon-jiahao"></text></view>
+						<view class="upload-none" v-if="medicalPracticeLicense === ''" @click="chooseMedicalImage"><text class="iconfont icon-jiahao"></text></view>
 						<view class="upload-image" v-else>
-							<image :src="uploadMedicalImage" mode=""  @click="viewMedicalImage"></image>
-							<view class="upload-del" @click="delMedicalImage">
+							<image :src="medicalPracticeLicense" mode=""  @click="viewMedicalImage"></image>
+							<view class="upload-del" @click="DelImage(3)">
 								<text class='iconfont icon-shanchu1'></text>
 							</view>
 						</view>
@@ -256,13 +256,13 @@
 				},
 				isIphoneX:this.$store.state.isIphone,
 				CustomBar:this.CustomBar,// 顶部导航栏高度
-				userID:'',//协销ID
+				userId:'',//协销ID
 				isPreviewImage:false,   	//预览图片开关
 				registerEmail:'', 		//注册邮箱
 				clubName:'',	 		//机构名称
-				abbreviation:'',	 	//机构简称
+				shortName:'',	 	//机构简称
 				clubContact:'',	 		//联系人
-				registerMobile:'',		//联系人手机号
+				bindMobile:'',		//联系人手机号
 				socialCreditCode:'',	//统一社会信用代码
 				isAgreed:0,				//是否勾选协议
 				isDisabled:true,
@@ -271,13 +271,13 @@
 				isUpgrade:false,
 				isDownUpgrade:true,
 				isCheck:false,			//是否勾选协议
-				uploadBusinessImage:'',	//营业执照图片
-				uploadMentuzImage:'',  	//门头照图片
-				uploadMedicalImage:'', 	//资质照图片
+				businessLicense:'https://static.caimei365.com/app/img/icon/icon-seller@3x.png',	//营业执照图片
+				shopPhoto:'',  	//门头照图片
+				medicalPracticeLicense:'', 	//资质照图片
 				department:'',			//科室
 				isDepartment:false,     //是否显示科室
 				secondClubType:'',		//机构类型二级分类
-				mainpro:'',				//主营内容
+				mainProduct:'',				//主营内容
 				isOrganizationType:0,
 				organizationTypeText:'请选择机构类型',
 				beautyList:beautyList,
@@ -290,9 +290,9 @@
 				customItemValue:'', 	//自定义项目
 				addressData:{
 					address:'请选择机构所在地区',
-					townID:'',			//区ID
-					cityID:'',			//区ID
-					provinceID:'',		//区ID
+					townId:'',			//区ID
+					cityId:'',			//区ID
+					provinceId:'',		//区ID
 					addressDetail: '',	//地址
 				},
 				registerBtnText:'确定'
@@ -309,19 +309,21 @@
 				})
 			},
 			registerCheckMobile(){
-				if( this.registerMobile == ''){
+				if( this.bindMobile == ''){
 					this.$util.msg('请输入手机号',2000);
 					return
 				}
-				if(!this.$reg.isMobile(this.registerMobile)){
+				if(!this.$reg.isMobile(this.bindMobile)){
 					this.$util.msg('请输入正确的手机号',2000);
 					return
 				}
-				this.SellerService.SellerClubCheck({mobileOrEmail:this.registerMobile}).then(response =>{
-					this.$util.msg(response.data,2000);
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
+				this.SellerService.SellerClubCheck({bindMobile:this.bindMobile})
+					.then(response =>{
+						this.$util.msg(response.data,2000);
+					})
+					.catch(error =>{
+						this.$util.msg(error.msg,2000);
+					})
 			},
 			registerStepsSub(){
 				let params = {};
@@ -330,11 +332,11 @@
 						this.$util.msg('请输入联系人姓名',2000);
 						return
 					}
-					if( this.registerMobile == ''){
+					if( this.bindMobile == ''){
 						this.$util.msg('请输入联系人手机号',2000);
 						return
 					}
-					if(!this.$reg.isMobile(this.registerMobile)){
+					if(!this.$reg.isMobile(this.bindMobile)){
 						this.$util.msg('手机格式不正确',2000);
 						return
 					}	
@@ -350,7 +352,7 @@
 						this.$util.msg('请输入机构名称',2000);
 						return
 					}
-					if( this.addressData.townID == ''){
+					if( this.addressData.townId == ''){
 						this.$util.msg('请选择机构地址',2000);
 						return
 					}
@@ -358,12 +360,12 @@
 						this.$util.msg('请填写机构详细地址',2000);
 						return
 					}
-					if( this.uploadBusinessImage == ''){
+					if( this.businessLicense == ''){
 						this.$util.msg('请上传您的营业执照',2000);
 						return
 					}
 					if(this.isOrganizationType!=0){
-						if(this.mainpro == ''){
+						if(this.mainProduct == ''){
 							this.$util.msg('请选择住机构主营内容',2000);
 							return
 						}
@@ -373,37 +375,36 @@
 						return
 					}
 					params ={
-						source:1,
 						email:this.registerEmail,
 						name:this.clubName,
-						linkMan1:this.clubContact,
-						bindMobile:this.registerMobile,
-						sname:this.abbreviation,
-						provinceID:this.addressData.provinceID,
-						cityID:this.addressData.cityID,
-						townID:this.addressData.townID,
+						linkMan:this.clubContact,
+						bindMobile:this.bindMobile,
+						shortName:this.shortName,
+						provinceId:this.addressData.provinceId,
+						cityId:this.addressData.cityId,
+						townId:this.addressData.townId,
 						address:this.addressData.addressDetail,
 						socialCreditCode:this.socialCreditCode,
-						businessLicenseImage:this.uploadBusinessImage,
-						headpic:this.uploadMentuzImage,
+						businessLicense:this.businessLicense,
+						shopPhoto:this.shopPhoto,
 						firstClubType:this.isOrganizationType, //机构类型分类 医美:0和生美:1
 						secondClubType:this.secondClubType,	//机构类型二级分类 诊所:1,门诊:2,医院:3
 						department:this.department,			//科室
-						medicalPracticeLicenseImg:this.uploadMedicalImage,//资质图片
+						medicalPracticeLicense:this.medicalPracticeLicense,//资质图片
 						isAgreed:this.isAgreed,				//是否勾选协议	
-						mainpro:this.mainpro,
-						userID:this.userID
+						mainProduct:this.mainProduct,
+						userId:this.userId
 					}
 				}else{
 					if( this.clubContact == ''){
 						this.$util.msg('请输入联系人姓名',2000);
 						return
 					}
-					if( this.registerMobile == ''){
+					if( this.bindMobile == ''){
 						this.$util.msg('请输入联系人手机号',2000);
 						return
 					}
-					if(!this.$reg.isMobile(this.registerMobile)){
+					if(!this.$reg.isMobile(this.bindMobile)){
 						this.$util.msg('手机格式不正确',2000);
 						return
 					}	
@@ -412,11 +413,10 @@
 						return
 					}
 					params ={
-						source:1,
-						linkMan1:this.clubContact,
-						bindMobile:this.registerMobile,
+						linkMan:this.clubContact,
+						bindMobile:this.bindMobile,
 						isAgreed:this.isAgreed,				//是否勾选协议	
-						userID:this.userID
+						userId:this.userId
 					}
 				}
 				this.SellerService.SellerClubRegister(params).then(response =>{
@@ -437,9 +437,9 @@
 			onConfirm(e) {//获取选择的地址信息
 				console.log('地址',e);
 				this.addressData.address = e.name;
-				this.addressData.townID = e.townCode;
-				this.addressData.cityID = e.cityCode;
-				this.addressData.provinceID = e.provinceCode;
+				this.addressData.townId = e.townCode;
+				this.addressData.cityId = e.cityCode;
+				this.addressData.provinceId = e.provinceCode;
 			},	
 			onTextareaInput(e){//地址详细信息
 			   this.addressData.addressDetail = e.detail.value;
@@ -457,27 +457,27 @@
 			},
 			chooseBusinessImage() {//营业执照图片上传
 				uploadFileImage().then(res =>{
-					this.uploadBusinessImage = JSON.parse(res.data).data
+					this.businessLicense = JSON.parse(res.data).data
 				})
 			},
 			chooseMentuzImage() {//门头照图片上传
 				uploadFileImage().then(res =>{
-					this.uploadMentuzImage = JSON.parse(res.data).data
+					this.shopPhoto = JSON.parse(res.data).data
 				})
 			},
 			chooseMedicalImage() {//资质照图片上传
 				uploadFileImage().then(res =>{
-					this.uploadMedicalImage = JSON.parse(res.data).data
+					this.medicalPracticeLicense = JSON.parse(res.data).data
 				})
 			},
 			viewBusinessImage(e) {//预览营业执照图片
-				this.myPreviewImageFn(this.uploadBusinessImage)
+				this.myPreviewImageFn(this.businessLicense)
 			},
 			viewMentuzImage(e) {//预览门头照图片
-				this.myPreviewImageFn(this.uploadMentuzImage)
+				this.myPreviewImageFn(this.shopPhoto)
 			},
 			viewMedicalImage(e) {//预览资质照图片
-				this.myPreviewImageFn(this.uploadMedicalImage)
+				this.myPreviewImageFn(this.medicalPracticeLicense)
 			},
 			myPreviewImageFn(url){//预览图片公共方法
 				this.isPreviewImage = true
@@ -488,20 +488,25 @@
 					current: 0
 				});
 			},
-			delBusinessImage(){//删除营业执照图片
-				this.$util.modal('','确定删除营业执照图片吗？','确定','取消',true,() =>{
-					 this.uploadBusinessImage = ''
-				})
-			},
-			delMentuzImage(){//删除门头照图片
-				this.$util.modal('','确定删除门头照图片吗？','确定','取消',true,() =>{
-					this.uploadMentuzImage = ''
-				})
-			},			
-			delMedicalImage(){//删除资质图片
-				this.$util.modal('','确定删除资质图片吗？','确定','取消',true,() =>{
-					this.uploadMedicalImage = ''
-				})
+			DelImage(index){//删除营业执照图片
+				switch(index){
+					case 1:
+						this.$util.modal('','确定删除营业执照图片吗？','确定','取消',true,() =>{
+							 this.businessLicense = ''
+						})
+						break;
+					case 2:
+						this.$util.modal('','确定删除门头照图片吗？','确定','取消',true,() =>{
+							this.shopPhoto = ''
+						})
+						break;
+					case 3:
+						this.$util.modal('','确定删除资质图片吗？','确定','取消',true,() =>{
+							this.medicalPracticeLicense = ''
+						})
+						break;
+				}
+				
 			},
 			bindPickerChange() {//机构类型选择
 				let self = this
@@ -541,10 +546,10 @@
 				}
 			},
 			chooseMaleLike(e){
-				this.mainpro = this.checkLikes(e,this.mentuzCampList)
+				this.mainProduct = this.checkLikes(e,this.mentuzCampList)
 			},
 			chooseMaleLikes(e){
-				this.mainpro = this.checkLikes(e,this.medicaCampList)
+				this.mainProduct = this.checkLikes(e,this.medicaCampList)
 			},
 			checkLikes(e,list){
 				let	values = e.detail.value
@@ -605,7 +610,7 @@
 				return
 			}
 			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userId ? resolve.userId : 0
+				this.userId = resolve.userId ? resolve.userId : 0
 			})
 		}
 	}

services/public.service.js

@@ -60,9 +60,9 @@ export default class PublicService {
 	/**
 	 * 获取手机短信验证码
 	 * bindMobile 		机构手机号
-	 * isCheckCaptcha 	是否需要图形验证码：1:检查 , 0：不检查
+	 * isCheckCaptcha 	是否需要图形验证码：1:检查 , 0：不检查z
 	 * mobile			运营人员手机号
-	 * activateCodeType 短信类型 :1:找回密码, 2:手机号注册机构, 3:供应商注册
+	 * userId			机构用户UserId
 	 * imgCode          图片验证码
 	 * token            图片验证码token
 	 * platformType: 	来源：0:www，1:crm/h5，2:小程序

services/sellse.service.js

@@ -14,7 +14,12 @@ export default class SellerService {
 	 *@param password 密码
 	 */
 	SellerLogin (data={}){
-		return this.AjaxService.post({ url:'/seller/login', data, isLoading: true })
+		return this.AjaxService.post({ 
+			url:'/user/seller/login', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/**
 	 *@协销账户中心
@@ -28,14 +33,24 @@ export default class SellerService {
 	 *@param userID 协销ID
 	 */
 	SellerClubRegister (data={}){
-		return this.AjaxService.post({ url:'/seller/club/register', data, isLoading: true })
+		return this.AjaxService.post({ 
+			url:'/user/register/club/online', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/**
 	 *@协销拉机构上线检测手机号和邮箱
 	 *@param mobileOrEmail 手机号和邮箱
 	 */
 	SellerClubCheck (data={}){
-		return this.AjaxService.post({ url:'/seller/club/check', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/user/register/check', 
+			data, 
+			isLoading: true,
+			isHost:true
+		})
 	}
 	/**
 	 *@协销机构列表

services/user.service.js

@@ -9,11 +9,19 @@ export default class UserService {
 	/* 初始化授权登录 */
 	UserLoginAuthApplets (data = {}) {
 		return this.AjaxService.post({
-			// url: '/club/authorization',
 			url: '/user/login/auth/applets',
 			data,
 			isLoading: false,
-			isStatus: true,
+			isHost:true
+		})
+	}
+	/* 邀请码授权登录 */
+	InvitationCodeLogin (data = {}) {
+		return this.AjaxService.post({
+			url: '/user/login/auth/invitation',
+			data,
+			isLoading: true,
+			isStatus: false,
 			isHost:true
 		})
 	}