commit -m

common/config/wxLogin.js

@@ -9,7 +9,6 @@ const newUserService = new UserService(ajaxService)
 const wxLoginAuthorize = async function(){
 	const wechatCode = await authorize.getCode('weixin');// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
 	const getUserInfo = await authorize.getUserInfo('weixin');
-	console.log(getUserInfo)
 	newUserService.UserLoginAuthApplets({ 
 		code:wechatCode,
 		encryptedData:getUserInfo.encryptedData,
@@ -18,7 +17,6 @@ const wxLoginAuthorize = async function(){
 	.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)
 	})
@@ -26,7 +24,6 @@ const wxLoginAuthorize = async function(){
 		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未登录过跳转
@@ -42,7 +39,6 @@ const wxLoginQuick = async function(){// 根据微信的code获取用户登录
 			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){
@@ -57,7 +53,6 @@ const wxLoginQuick = async function(){// 根据微信的code获取用户登录
 			uni.setStorageSync('unionId',error.data.unionId)
 			store.commit('logout',error.data)
 			store.commit('updateStatus',error.data)
-			store.commit('wxLogin',getUserInfo.userInfo);
 		})
 }
 export default{

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

@@ -134,7 +134,7 @@
 				firstList:[
 					{name:'机构列表',path:'/seller/pages/club/list',icon:'icon-jigouliebiao'},
 					{name:'帮机构下单',path:'/seller/pages/club/club-list',icon:'icon-bangjigouxiadan'},
-					{name:'拉机构上线',path:'/seller/pages/login/register',icon:'icon-lajigoushangxian'},
+					{name:'拉机构上线',path:'/seller/pages/login/register-select',icon:'icon-lajigoushangxian'},
 					{name:'邀请运营人员',path:'/seller/pages/club/allClub-list',icon:'icon-yaoqingyunyingrenyuan'}
 				],
 			}

pages.json

@@ -208,6 +208,12 @@
 						"navigationBarTitleText": "绑定邮箱"
 					}
 				},
+				{
+					"path": "binding",
+					"style": {
+						"navigationBarTitleText": "注册信息"
+					}
+				},
 				{
 					"path": "bindwechat",
 					"style": {

pages/authorization/authorization.vue

@@ -45,16 +45,19 @@
 			...mapState(['hasLogin','userInfo'])
 		},
 		methods:{
+			...mapMutations(['wxLogin']),
 			getUserProfile(){
 				const self = this
 				// 可以通过 wx.getSetting 先查询一下用户是否授权了 "scope.record" 这个 scope
 				wx.getUserProfile({
 					desc: '采美采购商城小程序获取您的信息', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
 					success(res) {
+						console.log('新API',res)	
+						self.wxLogin(res.userInfo)		
 						uni.login({
 							provider: 'weixin',
 							scopes: 'auth_user',
-							success() {
+							success(res) {
 								self.WxGetUserInfo()
 							},
 							fail(err) {

pages/login/binding.vue

@@ -0,0 +1,575 @@
+
+<template>
+	<view class="register" v-show="isRegisterShow">
+		<view class="register-main" v-if="isUserIdentity == 4">
+			<view class="main-form-item">
+				<view class="form-label">联系人</view>
+				<view class="form-text"> {{ clubInfo.linkMan }} </view>
+			</view>
+			<view class="main-form-item">
+				<view class="form-label">手机号</view>
+				<view class="form-text">{{ clubInfo.contractMobile }}</view>
+			</view>
+			<view class="register-fiexd clearfix" :style="{paddingBottom:isIphoneX ? '68rpx':''}">
+				<view class="register-agree">
+					<view class="agree-text">
+						提示：采美销售顾问已帮您填写好注册信息，请确认信息是否正确，点击确认并登录按钮可直接登录采美商城。
+					</view>
+				</view>
+				<view class="register-row">
+					<view class="register-btn sub" @click.stop="SubmitRegister">确认并登录</view>
+				</view>
+			</view>
+		</view>
+		<view class="register-main" v-if="isUserIdentity == 2">
+			<view class="main-form-item">
+				<view class="form-label">联系人</view>
+				<view class="form-text"> {{ clubInfo.linkMan }} </view>
+			</view>
+			<view class="main-form-item">
+				<view class="form-label">手机号</view>
+				<view class="form-text">{{ clubInfo.contractMobile }}</view>
+			</view>
+			<view class="main-form-item">
+				<view class="form-label">邮箱</view>
+				<view class="form-text">{{ clubInfo.contractEmail ? clubInfo.contractEmail : '' }}</view>
+			</view>
+			<view class="main-form-item">
+				<view class="form-label">机构名称</view>
+				<view class="form-text">{{ clubInfo.name }}</view>
+			</view>
+			<view class="main-form-item">
+				<view class="form-label">机构简称</view>
+				<view class="form-text">{{ clubInfo.shortName }}</view>
+			</view>
+			<view class="main-form-item">
+				<view class="form-label">机构地址</view>
+				<view class="form-input">{{ clubInfo.provincialAddress }}</view>		
+			</view>
+			<view class="main-form-item">
+				<view class="form-textarea">{{ clubInfo.address }}</view>		
+			</view>
+			<view class="main-form-item">
+				<view class="form-label lang">营业执照编号</view>
+				<view class="form-input lang">{{ clubInfo.socialCreditCode }}</view>		
+			</view>
+			<view class="main-form-item file">
+				<view class="main-form-upload">
+					<view class="label">营业执照</view>
+					<view class="upload-picture">
+						<view class="upload-image"><image :src="clubInfo.businessLicense" mode="" @click="ShowPreviewImage(1)"></image></view>
+					</view>
+				</view>
+				<view class="main-form-upload">
+					<view class="label">门头照</view>
+					<view class="upload-picture">
+						<view class="upload-image"><image :src="clubInfo.shopPhoto" mode=""  @click="ShowPreviewImage(2)"></image></view>
+					</view>	
+				</view>
+			</view>	
+			<view class="main-form-item">
+				<view class="form-label">机构类型</view>
+				<view class="form-text">
+					{{ clubInfo.firstClubType | FirstFormat }}
+					-
+					{{ clubInfo.secondClubType | TwoFormat }}
+				</view>
+			</view>
+			<view class="main-form-item file" v-if="clubInfo.firstClubType == 1">
+				<view class="main-form-upload">
+					<view class="label">资质</view>
+					<view class="upload-picture">
+						<view class="upload-image"><image :src="clubInfo.medicalPracticeLicense" mode=""  @click="ShowPreviewImage(2)"></image></view>
+					</view>	
+				</view>
+			</view>	
+			<view class="main-form-item" v-if="clubInfo.secondClubType == 2">
+				<view class="form-label">科室</view>
+				<view class="form-text">{{ clubInfo.department }}</view>
+			</view>
+			<view class="main-form-item none">
+				<view class="form-label none">主营内容</view>
+				<view class="form-checkbox-group">
+					<view class="form-table-item" v-for="(item, index) in medicaCampList" :key="index">
+						{{ item.name }}
+					</view>
+				</view>
+			</view>
+			<view class="register-fiexd clearfix" :style="{paddingBottom:isIphoneX ? '68rpx':''}">
+				<view class="register-agree">
+					<view class="agree-text">
+						提示：采美销售顾问已帮您填写好注册信息，请确认信息是否正确，点击确认并登录按钮可直接登录采美商城。
+					</view>
+				</view>
+				<view class="register-row">
+					<view class="register-btn sub" @click.stop="SubmitRegister">确定</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { mapState,mapMutations } from 'vuex'
+	import { uploadFileImage } from "@/api/utils.js"
+	import authorize from '@/common/config/authorize.js'
+	import wxLogin from "@/common/config/wxLogin.js"
+	export default{
+		data() {
+			return{
+				isRegisterShow:false,
+				isUserIdentity:0,
+				isIphoneX:this.$store.state.isIphone,
+				medicaCampList:[],
+				params:{
+					userId:0,
+					mobile:'',
+					linkName:'',
+					unionId:uni.getStorageSync('unionId'),
+					isCheckSmsCode:1,
+					nickName:'',
+					avatarUrl:'',
+				},
+				clubInfo:{
+					linkMan:'',
+					bindMobile:'',
+					userId:0
+				}
+			}
+		},
+		filters: {
+			
+		},	
+		onLoad(option) {
+			console.log(option)
+			uni.setStorageSync('bind_id', option.userId);
+			this.params.userId = option.userId
+		},
+		filters: {
+			FirstFormat:function(type) {//处理金额
+				let name='';
+				switch(type){
+					case 1: name = '医美'; break;
+					case 2: name = '生美'; break;
+				}	
+				return name;
+			},
+			TwoFormat:function(type) {//处理金额
+				let text='';
+				switch(type){
+					case 1: text = '诊所'; break;
+					case 2: text = '门诊'; break;
+					case 3: text = '医院'; break;
+				}	
+				return text;
+			},
+		},	
+		computed: {
+			...mapState(['isWxAuthorize'])
+		},
+		methods:{
+			...mapMutations(['login','logout']),
+			async getWxAuthorize(){
+				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.$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.GetClubUserInfo(this.params.userId)
+							this.isRegisterShow= true
+						}
+					},1000)
+				})
+				.catch(error =>{
+					this.logout()
+					uni.setStorageSync('unionId',error.data.unionId)
+					this.$store.commit('updateStatus',error.data)
+					this.GetClubUserInfo(this.params.userId)
+					this.isRegisterShow = true
+				})
+			},	
+			SubmitRegister(){//微信用户帮机构运营人员
+				const userInfo = uni.getStorageSync('wechatUserInfo')
+				this.params.nickName = userInfo.nickName
+				this.params.avatarUrl = userInfo.avatarUrl
+				this.UserService.BindingWechat(this.params)
+				.then(response =>{
+					this.login(response.data)
+					this.$api.switchTabTo('/pages/tabBar/home/index')
+				})
+				.catch(error =>{
+					this.$util.msg(error.msg,2000)
+					this.isUserInfo = true
+				})			
+			},
+			GetClubUserInfo(userId){
+				this.UserService.OrganizationUpdateModifyInfo({userId:userId})
+				.then(response =>{
+					this.isUserIdentity = response.data.user.userIdentity
+					this.clubInfo = response.data.club
+					this.params.mobile = this.clubInfo.contractMobile
+					this.params.linkName = this.clubInfo.linkMan
+					if(this.clubInfo.mainProduct){
+						this.medicaCampList = this.ArrayFormat(this.clubInfo.mainProduct)
+					}
+				})
+				.catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},
+			ArrayFormat(Array) {//处理金额
+				const newArray = []
+				Array.split('/').forEach((item,index) =>{
+					let _OBJ = {value:(index+1).toString(),name:item,checked:true}
+					newArray.push(_OBJ)
+				})
+				return newArray
+			}
+		},
+		onShow() {
+			authorize.checkLogin().then(res => {
+				this.getWxAuthorize()
+			})
+			.catch(err => {
+				this.isRegisterShow= true
+				this.$api.navigateTo('/pages/authorization/authorization')
+			})
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{
+		height: auto;
+	}
+	.register{
+		width: 100%;
+		position: relative;
+		box-sizing: border-box;
+		padding-bottom: 411rpx;
+		.register-main{
+			width: 100%;
+			height: auto;
+			box-sizing: border-box;
+			padding: 0 24rpx;
+			margin-top: 24rpx;
+			.main-form-item{
+				width: 100%;
+				height: 88rpx;
+				box-sizing: border-box;
+				padding: 13rpx 0;
+				border-bottom: 1px solid #e1e1e1;
+				margin-top: 10rpx;
+				position: relative;
+				&.none{
+					border-bottom: none;
+					height: auto;
+				}
+				&.file{
+					height: 273rpx;
+					border-bottom: none;
+					.main-form-upload{
+						width: 50%;
+						height: 100%;
+						float: left;
+						.label{
+							width: 100%;
+							float: left;
+							height: 56rpx;
+							line-height: 56rpx;
+							font-size: $font-size-28;
+							text-align: left;
+							color: #999999;
+						}
+						.upload-picture{
+							width: 100%;
+							height: 180rpx;
+							float: left;
+							margin-top: 17rpx;
+							.upload-none{
+								width: 200rpx;
+								height: 180rpx;
+								border-radius: 6rpx;
+								border:1px solid #e1e1e1;
+								box-sizing: border-box;
+								padding-top: 64rpx;
+								.icon-jiahao{
+									display: inline-block;
+									width: 100%;
+									text-align: center;
+									line-height: 48rpx;
+									font-size: 40rpx;
+									color: #b2b2b2;
+								}
+								.upload-text{
+									display: inline-block;
+									width: 100%;
+									text-align: center;
+									line-height: 40rpx;
+									font-size: $font-size-24;
+									color: #b2b2b2;
+								}
+							}
+							.upload-image{
+								width: 200rpx;
+								height: 180rpx;
+								border-radius: 6rpx;
+								border:1px solid #e1e1e1;
+								box-sizing: border-box;
+								position: relative;
+								image{
+									width: 200rpx;
+									height: 180rpx;
+									display: block;
+								}
+								.upload-del{
+									width: 40rpx;
+									height: 40rpx;
+									position: absolute;
+									top: -20rpx;
+									right: -20rpx;
+									line-height: 40rpx;
+									text-align: center;
+									.iconfont{
+										font-size: $font-size-32;
+										color: #999999;
+									}
+								}
+							}
+						}
+					}
+				}
+				&.picker{
+					border-bottom: none;
+					.label-radio{
+						margin-left: 30rpx;
+						font-size: $font-size-28;
+						float: left;
+					}
+					.row-radio{
+						float: left;
+						transform: scale(0.7);
+					}
+					.row-text{
+						text-align: center;
+						float: left;
+						font-size: $font-size-28;
+					}
+					.picker-radio{
+						box-sizing: border-box;
+						padding-left: 180rpx;
+						.secondTyperadio{
+							border: 2rpx solid #e1e1e1;
+							display: inline-block;
+							font-size: 26rpx;
+							color: #999999;
+							padding: 0 24rpx;
+							border-radius: 22rpx;
+							line-height: 42rpx;
+							margin-right: 56rpx;
+							float: left;
+							&.active{
+								border: 2rpx solid #ffe6dc;
+								color: $color-system;
+							}
+						}	
+					}
+				}
+				&.textarea{
+					height: 142rpx;
+					.textarea{
+						width: 100%;
+						height: 142rpx;
+						box-sizing: border-box;
+						font-size: $font-size-28;
+						color: $text-color;
+						z-index: 1;
+					}
+					.textarea.hide{
+						opacity: 0;
+					}
+					.textarea.show{
+						color: #999999;
+					}
+				}
+				.textarea-ke{
+					width: 100%;
+					height: 160rpx;
+					border-radius: 6rpx;
+					border: 1px solid #e1e1e1;
+					font-size: $font-size-28;
+					box-sizing: border-box;
+					padding: 15rpx 20rpx;
+				}
+				.form-textarea{
+					font-size: $font-size-28;
+					color: #333333;
+				}
+				.form-label{
+					width: 148rpx;
+					float: left;
+					height: 100%;
+					line-height: 56rpx;
+					font-size: $font-size-28;
+					text-align: left;
+					color: #999999;
+					&.lang{
+						width: 188rpx;
+					}
+					&.none{
+						width: 100%;
+					}
+				}
+				.form-input{
+					width: 554rpx;
+					height: 56rpx;
+					line-height: 56rpx;
+					font-size: $font-size-28;
+					text-align: left;
+					color: #333333;
+					float: left;
+					&.lang{
+						width: 514rpx;
+					}
+					&.phone{
+						width: 418rpx;
+					}
+				}
+				.form-text{
+					width: 554rpx;
+					height: 56rpx;
+					line-height: 56rpx;
+					font-size: $font-size-28;
+					text-align: left;
+					color: #333333;
+					float: left;
+				}
+				.form-btn{
+					width: 136rpx;
+					height: 56rpx;
+					background: $btn-confirm;
+					color: #FFFFFF;
+					font-size: $font-size-28;
+					text-align: center;
+					border-radius: 28rpx;
+					line-height: 56rpx;
+					float: left;
+				}
+				.icon-xiayibu{
+					width: 80rpx;
+					height: 80rpx;
+					position: absolute;
+					right: 0;
+					top: 0;
+					line-height: 80rpx;
+					text-align: center;
+					color: #b2b2b2;
+				}
+				.form-checkbox-group {
+					width: 100%;
+					float: left;
+					.form-table-item{
+						height: 48rpx;
+						padding: 0 32rpx;
+						border: 1px solid #b2b2b2;
+						text-align: center;
+						font-size: $font-size-28;
+						color: #333333;
+						float: left;
+						line-height: 48rpx;
+						border-radius: 26rpx;
+						margin-right: 12rpx;
+						margin-top: 20rpx;
+					}
+				}
+				.form-checkbox-input{
+					width: 100%;
+					height: 64rpx;
+					margin-top: 20rpx;
+					.checkbox-input{
+						width: 518rpx;
+						height: 64rpx;
+						box-sizing: border-box;
+						text-align: left;
+						font-size: $font-size-26;
+						color: #333333;
+						line-height: 64rpx;
+						float: left;
+						border: 1px solid #e1e1e1;
+						border-radius: 32rpx;
+						padding: 0 20rpx;
+					}
+					.checkbox-btn{
+						width: 160rpx;
+						height: 64rpx;
+						border-radius: 32rpx;
+						background-color: #ffe6dc;
+						line-height: 64rpx;
+						text-align: center;
+						color: #e15616;
+						font-size: $font-size-28;
+						float: right;
+					}
+				}
+			}
+			.register-fiexd{
+				width: 100%;
+				height: auto;
+				padding: 20rpx 0;
+				position: fixed;
+				bottom: 0;
+				left: 0;
+				z-index: 888;
+				background: #FFFFFF;
+				.register-agree{
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					margin:0 0 32rpx 0;
+					box-sizing: border-box;
+					padding: 0 105rpx;
+					.agree-text{
+						font-size: 20rpx;
+						line-height: 38rpx;
+						color: #fea785;
+					}
+				}
+			}
+			.register-btn{
+				width: 702rpx;
+				height: 88rpx;
+				border-radius: 44rpx;
+				font-size: $font-size-28;
+				line-height: 88rpx;
+				color: #FFFFFF;
+				margin: 0 auto;
+				text-align: center;
+				background: $btn-confirm;
+				margin-top: 96rpx;
+				&.none{
+					background: #FFFFFF;
+					color: $text-color;
+					margin-top: 0;
+				}
+				&.sub{
+					margin-top: 0;
+				}
+			}
+		}
+	}
+</style>

pages/login/bindwechat.vue

@@ -177,44 +177,40 @@
 					})
 			},
 			bindingWechatLogin(){//获取用户基本信息登录
-				wx.getUserInfo({
-					success: res => {
-						this.isUserInfo = false;
-						this.userInfo = res.userInfo;
-						let params ={
-								userId:this.userId,
-								mobile:this.bindLinkPhone,
-								linkName:this.bindLinkName,
-								smsCode:this.smsCode,
-								unionId:this.unionId,
-								nickName:res.userInfo.nickName,
-								avatarUrl:res.userInfo.avatarUrl,
+				const userInfo = uni.getStorageSync('wechatUserInfo')
+				this.isUserInfo = false;
+				let params ={
+						userId:this.userId,
+						mobile:this.bindLinkPhone,
+						linkName:this.bindLinkName,
+						smsCode:this.smsCode,
+						unionId:this.unionId,
+						nickName:userInfo.nickName,
+						avatarUrl:userInfo.avatarUrl,
+				}
+				this.UserService.BindingWechat(params)
+					.then(response =>{
+						if(this.userIdentity === 3){
+							this.$api.navigateTo('/supplier/pages/index/index')
+						}else{
+							switch(this.isLoginType){
+								case 9:
+									this.$api.navigateTo(`/h5/pages/activity/activity_mid`)
+									break;
+								case 8:
+									this.$api.navigateTo(`/pages/goods/product?id=${this.isLoginProductId}`)
+									break;
+								case 7:
+									this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderID=${this.isLoginOrderId}`)
+									break;
+								default:
+									this.$api.switchTabTo('/pages/tabBar/user/user')
+							}
 						}
-						this.UserService.BindingWechat(params)
-							.then(response =>{
-								if(this.userIdentity === 3){
-									this.$api.navigateTo('/supplier/pages/index/index')
-								}else{
-									switch(this.isLoginType){
-										case 9:
-											this.$api.navigateTo(`/h5/pages/activity/activity_mid`)
-											break;
-										case 8:
-											this.$api.navigateTo(`/pages/goods/product?id=${this.isLoginProductId}`)
-											break;
-										case 7:
-											this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderID=${this.isLoginOrderId}`)
-											break;
-										default:
-											this.$api.switchTabTo('/pages/tabBar/user/user')
-									}
-								}
-							})
-							.catch(error =>{
-								this.$util.msg(error.msg,2000)
-							})							
-					}
-				})
+					})
+					.catch(error =>{
+						this.$util.msg(error.msg,2000)
+					})							
 			},
 			//关闭未授权用户授权提示弹窗
 			hideModel(){

pages/login/logincode.vue

@@ -38,48 +38,46 @@
 		methods:{
 			...mapMutations(['login']),
 			goLogin() {
+				const userInfo = uni.getStorageSync('wechatUserInfo')
 				if( this.invitationCode == ''){
 					this.$util.msg('请输入邀请码',2000)
 					return
 				}
-				wx.getUserInfo({
-					success: res => {
-						this.isUserInfo = false
-						let params ={
-								invitationCode:this.invitationCode,
-								nickName:res.userInfo.nickName,
-								avatarUrl:res.userInfo.avatarUrl,
-								unionId:uni.getStorageSync('unionId')
-						}							
-						this.UserService.InvitationCodeLogin(params).then(response =>{
-							wxLogin.wxLoginAuthorize()
-							if(response.data.userIdentity === 3){
-								setTimeout(()=>{
-									this.$api.navigateTo('/supplier/pages/index/index')
-								},1500)
-							}else{
-								setTimeout(()=>{
-									switch(this.isLoginType){
-										case 9:
-											this.$api.navigateTo(`/h5/pages/activity/activity_mid`)
-											break;
-										case 8:
-											this.$api.navigateTo(`/pages/goods/product?id=${this.isLoginProductId}`)
-											break;
-										case 7:
-											this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderID=${this.isLoginOrderId}`)
-											break;
-										default:
-											this.$api.switchTabTo('/pages/tabBar/user/user')
-									}
-								},1500)
+				this.isUserInfo = false
+				this.UserService.InvitationCodeLogin({
+						invitationCode:this.invitationCode,
+						nickName:userInfo.nickName,
+						avatarUrl:userInfo.avatarUrl,
+						unionId:uni.getStorageSync('unionId')
+				})
+				.then(response =>{
+					wxLogin.wxLoginAuthorize()
+					if(response.data.userIdentity === 3){
+						setTimeout(()=>{
+							this.$api.navigateTo('/supplier/pages/index/index')
+						},1500)
+					}else{
+						setTimeout(()=>{
+							switch(this.isLoginType){
+								case 9:
+									this.$api.navigateTo(`/h5/pages/activity/activity_mid`)
+									break;
+								case 8:
+									this.$api.navigateTo(`/pages/goods/product?id=${this.isLoginProductId}`)
+									break;
+								case 7:
+									this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderID=${this.isLoginOrderId}`)
+									break;
+								default:
+									this.$api.switchTabTo('/pages/tabBar/user/user')
 							}
-						}).catch(error =>{
-							this.$util.msg(error.msg,2000)
-							this.isUserInfo = false
-						})
+						},1500)
 					}
 				})
+				.catch(error =>{
+					this.$util.msg(error.msg,2000)
+					this.isUserInfo = false
+				})
 			}
 		}
 	}

pages/login/register.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container register" :style="{paddingTop:CustomBar+'px'}" v-if="isWxAuthorize">
+	<view class="container register" :style="{paddingTop:CustomBar+'px'}">
 		<cu-custom :navbar-data='nvabarData'  @navigateBack="hanldNavigateBack"></cu-custom>
 		<view class="register-main clearfix">
 			<view class="register-logo">
@@ -127,60 +127,57 @@
 				})
 			},
 			registerStepsfirst(){
-				wx.getUserInfo({
-					success: res => {
-						this.params.nickName = res.userInfo.nickName
-						this.params.avatarUrl = res.userInfo.avatarUrl
-						if( this.params.userName == ''){
-							this.$util.msg('请输入联系人名称',2000);
-							return
-						}
-						if( this.params.bindMobile == ''){
-							this.$util.msg('请输入手机号',2000);
-							return
-						}
-						if(!this.$reg.isMobile(this.params.bindMobile)){
-							this.$util.msg('手机格式不正确',2000);
-							return
-						}
-						if( this.params.smsCode == ''){
-							this.$util.msg('请输入手机验证码',2000);
-							return
-						}
-						if(!this.$reg.isMobileCode(this.params.smsCode)){
-							this.$util.msg('验证码格式不正确',2000);
-							return
-						}
-						if( this.params.password == ''){
-							this.$util.msg('请输入密码',2000);
-							return
-						}
-						if(!this.$reg.checkPwd(this.params.password)){
-							this.$util.msg('密码必须为8-16位字母数字的组合',2000);
-							return
-						}
-						if( this.params.passWordConfirm == ''){
-							this.$util.msg('请再次确认密码',2000);
-							return
-						}
-						if( this.params.passWordConfirm !== this.params.password){
-							this.$util.msg('两次输入的密码不一致',2000);
-							return
-						}
-						if(this.params.isAgreed == 0){
-							this.$util.msg('请勾选同意协议',2000);
-							return
-						}
-						this.UserService.UserRegisterClub(this.params).then(response =>{
-							wxLogin.wxLoginAuthorize()
-							setTimeout(() =>{
-								this.$api.switchTabTo('/pages/tabBar/user/user')
-							},2000)
-						}).catch(error =>{
-							this.$util.msg(error.msg,2000);
-						})		
-					}
-				})
+				const userInfo = uni.getStorageSync('wechatUserInfo')
+				this.params.nickName = userInfo.nickName
+				this.params.avatarUrl = userInfo.avatarUrl
+				if( this.params.userName == ''){
+					this.$util.msg('请输入联系人名称',2000);
+					return
+				}
+				if( this.params.bindMobile == ''){
+					this.$util.msg('请输入手机号',2000);
+					return
+				}
+				if(!this.$reg.isMobile(this.params.bindMobile)){
+					this.$util.msg('手机格式不正确',2000);
+					return
+				}
+				if( this.params.smsCode == ''){
+					this.$util.msg('请输入手机验证码',2000);
+					return
+				}
+				if(!this.$reg.isMobileCode(this.params.smsCode)){
+					this.$util.msg('验证码格式不正确',2000);
+					return
+				}
+				if( this.params.password == ''){
+					this.$util.msg('请输入密码',2000);
+					return
+				}
+				if(!this.$reg.checkPwd(this.params.password)){
+					this.$util.msg('密码必须为8-16位字母数字的组合',2000);
+					return
+				}
+				if( this.params.passWordConfirm == ''){
+					this.$util.msg('请再次确认密码',2000);
+					return
+				}
+				if( this.params.passWordConfirm !== this.params.password){
+					this.$util.msg('两次输入的密码不一致',2000);
+					return
+				}
+				if(this.params.isAgreed == 0){
+					this.$util.msg('请勾选同意协议',2000);
+					return
+				}
+				this.UserService.UserRegisterClub(this.params).then(response =>{
+					wxLogin.wxLoginAuthorize()
+					setTimeout(() =>{
+						this.$api.switchTabTo('/pages/tabBar/user/user')
+					},2000)
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000);
+				})		
 			},
 			storeUpdataeStatus(data){
 				uni.setStorageSync('token',data.token)
@@ -234,12 +231,13 @@
 				}
 			},
 			async InitAuthorize(){ //是否已授权 0:为取消授权 1:为已授权 2:为未操作
-				const code = await authorize.getSetting();
-				if(code == 1){
+				authorize.checkLogin()
+				.then(res => {
 					wxLogin.wxLoginQuick()
-				}else{
+				})
+				.catch(err => {
 					this.$api.navigateTo('/pages/authorization/authorization?type=0')
-				}
+				})
 			}
 		},
 		onShow() {

seller/pages/club/club-list.vue

@@ -25,14 +25,21 @@
 			<view v-else class="club-list">
 				<scroll-view scroll-y="true" >
 					<view class="list" v-for="(item, index) in clubList" :key="index">
-						<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>
-						<view class="list-item">
-							<view class="list-title">
-								<text class="list-name">{{item.name}}</text>
-								<text class="list-hist" @click.stop="_goHistory(item)"><text class="iconfont icon-dingdanxuanzhong"></text>订单列表</text>
+						<view class="club-list-top">
+							<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>
+							<view class="list-item">
+								<view class="list-title">
+									<text class="list-name">{{item.name}}</text>
+									<text class="list-hist" @click.stop="_goHistory(item)"><text class="iconfont icon-dingdanxuanzhong"></text>订单列表</text>
+								</view>
+								<view class="list-opea">
+									
+								</view>
 							</view>
+						</view>
+						<view class="club-list-bot">
 							<view class="list-opea">
 								<view class="btn org" @click.stop="_goImmediately(item)">
 									<text>立即下单</text>
@@ -43,8 +50,11 @@
 								<view class="btn yel" @click.stop="_goBuyagain(item)">
 									<text>再次购买</text>
 								</view>
+								<view class="btn yeo" @click.stop="_goBuyagain(item)">
+									<text>充值/下定金</text>
+								</view>
 							</view>
-						</view>
+						</view>	
 					</view>
 					<!--加载loadding-->
 					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
@@ -280,78 +290,99 @@
 			background: #FFFFFF;
 			position: relative;
 			border-bottom: 1px solid #EBEBEB;
-			display: flex;
-			.list-left{
+			float: left;
+			.club-list-top{
+				width: 100%;
 				height: 140rpx;
-				flex: 2;
-				margin-right: 10rpx;
-				.list-head{
-					width: 140rpx;
+				float: left;
+				display: flex;
+				align-items: center;
+				.list-left{
 					height: 140rpx;
-					border-radius: 14rpx;
-					image{
+					flex: 2;
+					margin-right: 10rpx;
+					.list-head{
 						width: 140rpx;
 						height: 140rpx;
 						border-radius: 14rpx;
+						image{
+							width: 140rpx;
+							height: 140rpx;
+							border-radius: 14rpx;
+						}
 					}
 				}
-			}
-			.list-item{
-				height: 140rpx;
-				flex: 8;
-				display: flex;
-				flex-direction:column ;
-				.list-title{
-					flex: 2;
-					line-height: 80rpx;
-					width: 100%;
-					font-size: $font-size-28;
-					color: $text-color;
-					padding-left: 11rpx;
-					flex-direction: row;
-					justify-content: flex-start;
-					.list-name{
-						width: 400rpx;
-						display: block;
-						float: left;
-						text-align: left;
-						-o-text-overflow: ellipsis;
-						text-overflow: ellipsis;
-						display: -webkit-box;
-						word-break: break-all;
-						-webkit-box-orient: vertical;
-						-webkit-line-clamp: 1;
-						overflow: hidden;
-					}
-					.list-hist{
-						display: block;
-						float: right;
-						color: #E19B30;
-						font-size: $font-size-24;
-						text-align: right;
-						padding-right: 30rpx;
-						.icon-dingdanxuanzhong{
-							font-size: $font-size-34;
+				.list-item{
+					height: 140rpx;
+					flex: 8;
+					display: flex;
+					flex-direction:column ;
+					.list-title{
+						flex: 2;
+						line-height: 80rpx;
+						width: 100%;
+						font-size: $font-size-28;
+						color: $text-color;
+						padding-left: 11rpx;
+						flex-direction: row;
+						justify-content: flex-start;
+						.list-name{
+							width: 390rpx;
+							display: block;
+							float: left;
+							text-align: left;
+							-o-text-overflow: ellipsis;
+							text-overflow: ellipsis;
+							display: -webkit-box;
+							word-break: break-all;
+							-webkit-box-orient: vertical;
+							-webkit-line-clamp: 1;
+							overflow: hidden;
+						}
+						.list-hist{
+							display: block;
+							float: right;
 							color: #E19B30;
+							font-size: $font-size-24;
+							text-align: right;
+							padding-right: 30rpx;
+							.icon-dingdanxuanzhong{
+								font-size: $font-size-34;
+								color: #E19B30;
+							}
 						}
 					}
+					.list-opea{
+						width: 100%;
+						display: flex;
+						flex: 4;
+						color: #166CE1;
+						flex-direction: row;
+						align-items: center;
+					}
 				}
+			}
+			.club-list-bot{
+				width: 100%;
+				height: 60rpx;
+				float: left;
+				margin-top: 20rpx;
 				.list-opea{
 					width: 100%;
 					display: flex;
-					flex: 4;
+					flex: 1;
 					color: #166CE1;
 					flex-direction: row;
 					align-items: center;
 					.btn{
-						width: 156rpx;
+						width: 160rpx;
 						height: 60rpx;
 						line-height: 60rpx;
 						border-radius: 30rpx;
 						font-size: $font-size-24;
 						color: $text-color;
 						text-align: center;
-						margin: 0 17rpx;
+						margin: 0 15rpx;
 						&.org{
 							background:rgba(22,225,77,.1);
 							color: #16E14D;
@@ -364,6 +395,10 @@
 							background:rgba(225,86,22,.1);
 							color: #E15616;
 						}
+						&.yeo{
+							background: #fff5cf;
+							color: #ffaa01;
+						}
 					}
 				}
 			}

seller/pages/club/list.vue

@@ -31,9 +31,11 @@
 			</view>
 			<view v-else class="club-list">
 				<scroll-view scroll-y="true" >
-					<view class="list" v-for="(item, index) in clubList" :key="index">
+					<!-- <view class="list" v-for="(item, index) in clubList" :key="index">
 						<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-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.linkMan}}</text>
 								<text class="txt sm">
@@ -56,7 +58,30 @@
 								<text>修改资料</text>
 							</view>
 						</view>
-					</view>
+					</view> -->
+					<view class="list" v-for="(item, index) in clubList" :key="index">
+						<view class="list-logo">
+							<image :src="item.headpic ? item.headpic : 'https://static.caimei365.com/app/img/icon/icon-club@3x.png'" mode=""></image>
+						</view>	
+						<view class="list-content">
+							<view class="list-name">{{item.userIdentity ===2 ? item.name : item.linkMan}}</view>
+							<view class="list-ntel">
+								<text class="list-link">{{item.linkMan ? item.linkMan : ''}}</text>
+								<text class="list-texl">{{item.contractMobile ? item.contractMobile : ''}}</text>
+							</view>
+							<view class="list-opera">
+								<button class="btn org" @click.stop="checkData(item)">修改资料</button>
+								<view class="btn gre"  @click.stop="orderHistory(item)">
+									历史订单
+									<text v-if="item.orderNum >0"
+										  class="opea-badge uni-badge uni-badge-error uni-small uni-badge--small icon-num">
+										  {{showBadge(item.orderNum)}}
+									</text>
+								</view>
+								<button open-type="share" class="btn yel" @tap="shareBindClub">分享登录</button>
+							</view>
+						</view>	
+					</view>		
 					<!--加载loadding-->
 					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
 					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
@@ -144,8 +169,15 @@
 				this.initclubList()
 			},
 			initclubList(){	
-				let params = {userIdentity:this.userIdentity,name:this.searchInputVal,pageNum:1,pageSize:this.pageSize,spId:this.serviceProviderId,status:this.listStatus}
-				this.SellerService.GetSellerClubList(params).then(response =>{
+				this.SellerService.GetSellerClubList({
+					userIdentity:this.userIdentity,
+					name:this.searchInputVal,
+					pageNum:1,
+					pageSize:this.pageSize,
+					spId:this.serviceProviderId,
+					status:this.listStatus,
+				})
+				.then(response =>{
 					let responseData = response.data
 					if(responseData.results&&responseData.results.length > 0){
 						this.isEmpty = false
@@ -164,14 +196,22 @@
 					}else{
 						this.isEmpty = true
 					}
-				}).catch(error =>{
+				})
+				.catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
 			},	
 			getOnReachBottomData(){
 				this.pageNum+=1
-				let params = {userIdentity:this.userIdentity,name:this.searchInputVal,pageNum:this.pageNum,pageSize:this.pageSize,spId:this.serviceProviderId,status:this.listStatus}
-				this.SellerService.GetSellerClubList(params).then(response =>{
+				this.SellerService.GetSellerClubList({
+					userIdentity:this.userIdentity,
+					name:this.searchInputVal,
+					pageNum:this.pageNum,
+					pageSize:this.pageSize,
+					spId:this.serviceProviderId,
+					status:this.listStatus,
+				})
+				.then(response =>{
 					let responseData = response.data
 					if(responseData.results&&responseData.results.length > 0){
 						this.hasNextPage = response.data.hasNextPage
@@ -187,7 +227,8 @@
 							this.nomoreText = '已至底部'
 						}
 					}
-				}).catch(error =>{
+				})
+				.catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
 			},
@@ -222,7 +263,7 @@
 						break
 				}
 			},	
-			checkData(item){
+			checkData(item){//修改机构资料
 				switch(this.tabCurrentNum){
 					case 0:
 						this.$api.navigateTo(`/seller/pages/login/apply?userID=${item.userID}`)
@@ -232,10 +273,17 @@
 						break;
 				}
 			},
-			orderHistory(item){
+			orderHistory(item){//跳转机构历史订单
 				this.$api.setStorage('orderUserInfo',item)
 				this.$api.navigateTo(`/seller/pages/order/order-historylist?clubID=${item.clubID}&listType=0`)
 			},
+			shareBindClub(item){//分享登录
+				return {
+				  title: '您已注册采美365网，请点击登录',
+				  path: `pages/login/binding?userId=${item.userID}`,
+				  imageUrl:'https://static.caimei365.com/app/img/icon/icon-sharebind.jpg'
+				}
+			},
 			onShowClose () {//输入框失去焦点时触发
 				if(this.searchInputVal != ''){
 					this.isShowClose = true
@@ -383,75 +431,90 @@
 	.club-main{
 		padding-top: 224rpx;
 		.list{
-			display: flex;
-			align-items: center;
-			width: 702rpx;
-			height: 92rpx;
+			width: 100%;
+			height: 228rpx;
 			padding: 24rpx;
+			box-sizing: border-box;
 			background: #FFFFFF;
 			position: relative;
 			border-bottom: 1px solid #EBEBEB;
-			.list-left{
-				display: flex;
-				flex: 8;
-				.list-head{
-					width: 92rpx;
-					height: 92rpx;
-					border-radius: 14rpx;
-					image{
-						width: 92rpx;
-						height: 92rpx;
-						border-radius: 14rpx;
-					}
-				}
-				.list-tel{
-					margin-left: 18rpx;
-					.txt{
-						display: flex;
-						flex: 1;
-						font-size: $font-size-28;
-						color: $text-color;
-						line-height: 46rpx;
-						&.sm{
-							font-size: $font-size-24;
-							color: #666666;
-							.txt-le{
-								margin-right: 26rpx;
-							}
-						}
-					}
+			.list-logo{
+				width: 180rpx;
+				height: 180rpx;
+				float: left;
+				image{
+					width: 180rpx;
+					height: 180rpx;
+					border-radius: 8rpx;
 				}
 			}
-			.list-opea{
-				display: flex;
-				flex: 2;
-				color: #166CE1;
-				flex-direction: column;
-				.opea-type-cell{
-					font-size: 24rpx;
-					.iconfont{
-						font-size: 34rpx;
-						margin-right: 5rpx;
-					}
+			.list-content{
+				width: 498rpx;
+				height: 180rpx;
+				float: right;
+				.list-name{
+					width: 100%;
+					height: 50rpx;
+					float: left;
+					line-height: 50rpx;
+					text-align: left;
+					font-size: $font-size-26;
+					color: #333333;
 				}
-				.opea-type-dell{
-					line-height: 46rpx;
-					font-size: 24rpx;
-					position: relative;
-					.opea-badge{
-						position: absolute;
-						left: -45rpx;
-						top: -10rpx;
-						&.right{
-							left: -20rpx;
-						}
+				.list-ntel{
+					width: 100%;
+					height: 50rpx;
+					float: left;
+					line-height: 50rpx;
+					text-align: left;
+					font-size: $font-size-26;
+					color: #666666;
+					.list-link{
+						display: inline-block;
+						float: left;
+						margin-right: 40rpx;
 					}
-					&.or{
-						color: #E19B16;
+					.list-texl{
+						display: inline-block;
+						float: left;
 					}
-					.iconfont{
-						font-size: 34rpx;
-						margin-right: 5rpx;
+				}
+				.list-opera{
+					width: 100%;
+					height: 60rpx;
+					display: flex;
+					color: #166CE1;
+					flex-direction: row;
+					align-items: center;
+					float: left;
+					margin-top: 20rpx;
+					.btn{
+						width: 160rpx;
+						height: 60rpx;
+						line-height: 60rpx;
+						border-radius: 30rpx;
+						font-size: $font-size-24;
+						color: $text-color;
+						text-align: center;
+						margin:0 20rpx 0 0;
+						position: relative;
+						.opea-badge{
+							position: absolute;
+							right: -10rpx;
+							top: -20rpx;
+						}
+						&.org{
+							border: 1px solid #2769d5;
+							color: #2769d5;
+						}
+						&.gre{
+							border: 1px solid #e15616;
+							color: #e15616;
+						}
+						&.yel{
+							border: 1px solid #4ad04c;
+							color: #4ad04c;
+						}
 					}
 				}
 			}

seller/pages/login/apply.vue

@@ -414,7 +414,7 @@ import { mapMutations } from 'vuex';
 						this.mentuzCampList = this.mentuzCampNullList
 						this.medicaCampList = this.medicaCampNullList
 					}else{
-						if(this.firstClubType == '1'){
+						if(this.firstClubType == 1){
 							this.mentuzCampList = this.setNewMainpro(organizationClub.mainProduct)
 							this.medicaCampList = this.medicaCampNullList							
 						}else{

seller/pages/login/register-general.vue

@@ -37,7 +37,7 @@
 			</view>
 			<view class="register-fiexd clearfix" :style="{paddingBottom:isIphoneX ? '68rpx':''}">
 				<view class="register-row">
-					<button open-type="share" class="register-btn sub" @click.stop="ShareRegister">分享</button>
+					<button open-type="share" class="register-btn sub" @tap="ShareRegister">分享</button>
 				</view>
 			</view>
 		</view>
@@ -48,7 +48,7 @@
 	export default{
 		data() {
 			return{
-				isRegisterStep:false,
+				isRegisterStep:true,
 				isIphoneX:this.$store.state.isIphone,
 				isCheck:false,
 				clubUserId:0,
@@ -109,12 +109,12 @@
 					return
 				}
 				this.SellerService.SellerClubRegister(this.params).then(response =>{
-					this.$util.msg('注册成功,已短息通知联系人',2000);
-					this.clubInfo.userId = response.data.userId
+					this.$util.msg('注册成功',2000);
+					// this.clubInfo.userId = response.data.userId
 					setTimeout(()=>{
 						this.isRegisterStep = false
-						this.GetClubUserInfo(response.data.userId)
-					},2000)
+						this.GetClubUserInfo(11162)
+					},1500)
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);
 				})
@@ -122,7 +122,7 @@
 			GetClubUserInfo(userId){
 				this.UserService.OrganizationUpdateModifyInfo({userId:userId})
 				.then(response =>{
-					
+					this.clubInfo = response.data.club
 				})
 				.catch(error =>{
 					this.$util.msg(error.msg,2000)
@@ -133,7 +133,7 @@
 				}
 				return {
 				  title: '您已注册采美365网，请点击登录',
-				  path: `pages/login/bindOperator?clubUserId=${this.clubInfo.userId}`,
+				  path: `/pages/login/binding?userId=${this.clubInfo.userId}`,
 				  imageUrl:'https://static.caimei365.com/app/img/icon/icon-addShare@3x.png'
 				}
 			},
@@ -145,16 +145,7 @@
 					this.params.isAgreed = 0
 				}
 			},
-		},
-		onShareAppMessage(res){//分享转发
-			if (res.from === 'button') { // 来自页面内转发按钮
-		    }
-			return {
-			  title: '您已注册采美365网，请点击登录',
-			  path: `pages/login/bindOperator?clubUserId=${this.clubInfo.userId}`,
-			  imageUrl:'https://static.caimei365.com/app/img/icon/icon-addShare@3x.png'
-			}
-		},
+		}
 	}
 </script>
 

seller/pages/login/register-member.vue

@@ -167,7 +167,7 @@
 			</view>
 			<view class="main-form-item">
 				<view class="form-label">手机号</view>
-				<view class="form-text">{{ clubInfo.bindMobile }}</view>
+				<view class="form-text">{{ clubInfo.contractMobile }}</view>
 			</view>
 			<view class="main-form-item">
 				<view class="form-label">邮箱</view>
@@ -183,14 +183,14 @@
 			</view>
 			<view class="main-form-item">
 				<view class="form-label">机构地址</view>
-				<view class="form-input">{{ clubInfo.address }}</view>		
+				<view class="form-input">{{ clubInfo.provincialAddress }}</view>		
 			</view>
 			<view class="main-form-item">
-				<view class="form-textarea">{{ clubInfo.addressDetail }}</view>		
+				<view class="form-textarea">{{ clubInfo.address }}</view>		
 			</view>
 			<view class="main-form-item">
-				<view class="form-label">营业执照编号</view>
-				<view class="form-input">{{ clubInfo.socialCreditCode }}</view>		
+				<view class="form-label lang">营业执照编号</view>
+				<view class="form-input lang">{{ clubInfo.socialCreditCode }}</view>		
 			</view>
 			<view class="main-form-item file">
 				<view class="main-form-upload">
@@ -210,12 +210,33 @@
 				<view class="form-label">机构类型</view>
 				<view class="form-text">
 					{{ clubInfo.firstClubType | FirstFormat }}
+					-
 					{{ clubInfo.secondClubType | TwoFormat }}
 				</view>
 			</view>
+			<view class="main-form-item file" v-if="clubInfo.firstClubType == 1">
+				<view class="main-form-upload">
+					<view class="label">资质</view>
+					<view class="upload-picture">
+						<view class="upload-image"><image :src="clubInfo.medicalPracticeLicense" mode=""  @click="ShowPreviewImage(2)"></image></view>
+					</view>	
+				</view>
+			</view>	
+			<view class="main-form-item" v-if="clubInfo.secondClubType == 2">
+				<view class="form-label">科室</view>
+				<view class="form-text">{{ clubInfo.department }}</view>
+			</view>
+			<view class="main-form-item none">
+				<view class="form-label none">主营内容</view>
+				<view class="form-checkbox-group">
+					<view class="form-table-item" v-for="(item, index) in medicaCampList" :key="index">
+						{{ item.name }}
+					</view>
+				</view>
+			</view>
 			<view class="register-fiexd clearfix" :style="{paddingBottom:isIphoneX ? '68rpx':''}">
 				<view class="register-row">
-					<button open-type="share" class="register-btn sub" @click.stop="ShareRegister">分享</button>
+					<button open-type="share" class="register-btn sub" @tap="ShareRegister">分享</button>
 				</view>
 			</view>
 		</view>
@@ -234,7 +255,7 @@
 	export default{
 		data() {
 			return{
-				isRegisterStep:true,
+				isRegisterStep:false,
 				isIphoneX:this.$store.state.isIphone,
 				isCheck:false,
 				clubUserId:0,
@@ -281,15 +302,15 @@
 		},
 		filters: {
 			FirstFormat:function(type) {//处理金额
-				const text='';
+				let name='';
 				switch(type){
-					case 1: text = '医美'; break;
-					case 2: text = '生美'; break;
+					case 1: name = '医美'; break;
+					case 2: name = '生美'; break;
 				}	
-				return text;
+				return name;
 			},
 			TwoFormat:function(type) {//处理金额
-				const text='';
+				let text='';
 				switch(type){
 					case 1: text = '诊所'; break;
 					case 2: text = '门诊'; break;
@@ -373,7 +394,7 @@
 					return
 				}
 				this.SellerService.SellerClubRegister(this.params).then(response =>{
-					this.$util.msg('注册成功,已短息通知联系人',2000);
+					this.$util.msg('提交成功',2000);
 					this.clubInfo.userId = response.data.userId
 					setTimeout(()=>{
 						this.isRegisterStep = false
@@ -384,9 +405,9 @@
 				})
 			},
 			GetClubUserInfo(userId){
-				this.UserService.OrganizationUpdateModifyInfo({userId:userId})
+				this.UserService.OrganizationUpdateModifyInfo({userId:11162})
 				.then(response =>{
-					
+					this.clubInfo = response.data.club
 				})
 				.catch(error =>{
 					this.$util.msg(error.msg,2000)
@@ -397,7 +418,7 @@
 				}
 				return {
 				  title: '您已注册采美365网，请点击登录',
-				  path: `pages/login/bindOperator?clubUserId=${this.clubInfo.userId}`,
+				  path: `/pages/login/binding?userId=${this.clubInfo.userId}`,
 				  imageUrl:'https://static.caimei365.com/app/img/icon/icon-addShare@3x.png'
 				}
 			},
@@ -564,10 +585,13 @@
 		    }
 			return {
 			  title: '您已注册采美365网，请点击登录',
-			  path: `pages/login/bindOperator?clubUserId=${this.clubInfo.userId}`,
+			  path: `/pages/login/binding?userId=${this.clubInfo.userId}`,
 			  imageUrl:'https://static.caimei365.com/app/img/icon/icon-addShare@3x.png'
 			}
 		},
+		onShow() {
+			this.GetClubUserInfo()
+		}
 	}
 </script>
 
@@ -734,6 +758,10 @@
 					box-sizing: border-box;
 					padding: 15rpx 20rpx;
 				}
+				.form-textarea{
+					font-size: $font-size-28;
+					color: #333333;
+				}
 				.form-label{
 					width: 148rpx;
 					float: left;
@@ -849,6 +877,19 @@
 							color:$color-system;
 						}
 					}
+					.form-table-item{
+						height: 48rpx;
+						padding: 0 32rpx;
+						border: 1px solid #b2b2b2;
+						text-align: center;
+						font-size: $font-size-28;
+						color: #333333;
+						float: left;
+						line-height: 48rpx;
+						border-radius: 26rpx;
+						margin-right: 12rpx;
+						margin-top: 20rpx;
+					}
 				}
 				.form-checkbox-input{
 					width: 100%;

seller/pages/login/register-select.vue

@@ -2,25 +2,24 @@
 <template>
 	<view class="container register">
 		<view class="main">
-			<view class="title">请选择注册的账号类型</view>
 			<view class="main-item">
-				<view class="item" @click.stop="this.$api.navigateTo('/pages/login/register')">
+				<view class="item" @click.stop="this.$api.navigateTo('/seller/pages/login/register-general')">
 					<view class="icon">
-						<image src="https://static.caimei365.com/app/img/icon/icon-club.png" mode=""></image>
+						<image src="https://static.caimei365.com/app/img/icon/icon-general.png" mode=""></image>
 					</view>
-					<view class="text by">采购方(买家)</view>
-					<view class="text-small">医院机构/美容会所/个人买家</view>
+					<view class="text">普通机构</view>
 				</view>
-				<view class="item" @click.stop="this.$api.navigateTo('/pages/login/register-supplier')">
+				<view class="item" @click.stop="this.$api.navigateTo('/seller/pages/login/register-member')">
 					<view class="icon">
-						<image src="https://static.caimei365.com/app/img/icon/icon-supplier.png" mode=""></image>
+						<image src="https://static.caimei365.com/app/img/icon/icon-member.png" mode=""></image>
 					</view>
-					<view class="text my">供应商(卖家)</view>
-					<view class="text-small">仪器/产品/服务供应商</view>
+					<view class="text">会员机构</view>
 				</view>
 			</view>
+			<view class="main-item-text">
+				提示：请尽量搜集客户完整信息，优先注册会员机构
+			</view>	
 		</view>
-		<image class="bg_image" src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/%E8%83%8C%E6%99%AF.png" mode=""></image>
 	</view>
 </template>
 
@@ -53,15 +52,16 @@
 		.main{
 			width: 100%;
 			height: 370rpx;
-			.title{
+			.main-item-text{
 				width: 100%;
-				height: 46rpx;
-				line-height: 46rpx;
+				height: 100rpx;
 				float: left;
+				box-sizing: border-box;
+				margin-top: 150rpx;
 				text-align: center;
-				font-size: $font-size-34;
-				color: $text-color;
-				font-weight: bold;
+				font-size: 24rpx;
+				line-height: 100rpx;
+				color: #fea785;
 			}
 			.main-item{
 				width: 100%;
@@ -76,13 +76,13 @@
 					display: flex;
 					flex-direction: column;
 					align-items: center;
-					margin-top: 50rpx;
+					margin-top: 80rpx;
 					.icon{
-						width: 186rpx;
-						height: 186rpx;
+						width: 190rpx;
+						height: 190rpx;
 						image{
-							width: 186rpx;
-							height: 186rpx;
+							width: 190rpx;
+							height: 190rpx;
 							display: block;
 						}
 					}
@@ -90,12 +90,7 @@
 						line-height: 54rpx;
 						font-size: $font-size-30;
 						text-align: center;
-						&.by{
-							color: #3b77ff;
-						}
-						&.my{
-							color: #ff7a51;
-						}
+						color: #333333;
 					}
 					.text-small{
 						line-height: 54rpx;
@@ -106,12 +101,5 @@
 				}
 			}
 		}
-		.bg_image{
-			position: absolute;
-			width: 100%;
-			height:354rpx;
-			left: 0;
-			bottom: 0;
-		}
 	}
 </style>

services/config.env.js

@@ -2,6 +2,7 @@ let URL_CONFIG = ''
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
     // URL_CONFIG = 'http://192.168.2.75:18002'	 //采美测试地址
+	// URL_CONFIG = 'http://192.168.2.67:18002'	 //裴裴联调地址
 	URL_CONFIG = 'https://core-b.caimei365.com'
 }else{
     // 生产环境