commit -m 微服务调试

App.vue

@@ -5,7 +5,6 @@
 	import Vue from 'vue'
 	import { mapState,mapMutations} from 'vuex';
 	import authorize from '@/common/config/authorize.js'
-	import wxLogin from "@/common/config/wxLogin.js"
 	export default {
 		onLaunch: function() {
 			let self = this
@@ -67,12 +66,30 @@
 			// }
 		},
 		methods:{
+			...mapMutations(['login','logout']),
+			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 == 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)
+					}
+				})
+			},		
 			refresh(){
 				let TIME = (20*60)*1000;
 				setInterval(()=>{
 					authorize.getSetting().then(res =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
 						if(res == 1){
-							wxLogin.wxLoginAuthorize()
+							this.getWxAuthorize()
 						}else{
 							console.log('授权失败============>:'+'用户取消授权或者未操作')
 						}

common/config/wxLogin.js

@@ -1,39 +1,45 @@
 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'
+
+const newUserService = new UserService(ajaxService)
+
 // 根据微信的code获取用户登录状态:1已登录过 -1未登录过
-const wxLoginAuthorize = function(){
-	authorize.getCode('weixin').then(wechatcode =>{
-		authorize.getUserInfo('weixin').then(wxResponse =>{
-			userInfoLogin({code:wechatcode,encryptedData:wxResponse.encryptedData,iv:wxResponse.iv}).then(response =>{
+const wxLoginAuthorize = async function(){
+	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 =>{
+			if(response.code == 0 || response.code == 4){
 				store.commit('updateStatus',response.data)
 				store.commit('login',response.data);
-				store.commit('wxLogin',wxResponse.userInfo);
+				store.commit('wxLogin',getUserInfo.userInfo);
 				uni.setStorageSync('token',response.data.token)
-				uni.removeStorageSync('sessionid')
-				uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
-			}).catch(error =>{
-				uni.removeStorageSync('sessionid')
-				uni.setStorageSync('sessionid','JSESSIONID='+error.data)
-				store.commit('logout',error.data)
-				store.commit('updateStatus',error.data)
-				store.commit('wxLogin',wxResponse.userInfo);
-			})
+				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);
+			}
 		})
-	})
 }
-const wxLoginQuick = function(){// 根据微信的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 =>{
-					console.log(response)
+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',wxResponse.userInfo);
+					store.commit('wxLogin',getUserInfo.userInfo);
 					uni.setStorageSync('token',response.data.token)
-					uni.removeStorageSync('sessionid')
-					uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
+					uni.setStorageSync('unionId',response.data.unionId)
 					if(response.data.userIdentity ==1){
 						uni.navigateTo({url:'/seller/pages/index/index'})
 					}else if(response.data.userIdentity === 3){
@@ -41,15 +47,14 @@ const wxLoginQuick = function(){// 根据微信的code获取用户登录状态:1
 					}else{
 						uni.switchTab({url:'/pages/tabBar/user/user'})
 					}
-				}).catch(error =>{
-					uni.removeStorageSync('sessionid')
-					uni.setStorageSync('sessionid','JSESSIONID='+error.data)
-					store.commit('logout',error.data)
-					store.commit('updateStatus',error.data)
-					store.commit('wxLogin',wxResponse.userInfo);
-				})
+				}else{
+					uni.setStorageSync('unionId',response.data.unionId)
+					store.commit('logout',response.data)
+					store.commit('updateStatus',response.data)
+					store.commit('wxLogin',getUserInfo.userInfo);
+				}
+				
 			})
-		})
 }
 export default{
 	wxLoginAuthorize,

common/json/data.json.js

@@ -1,7 +1,7 @@
 const beautyList =  [
-						{value:'1',name:'诊所'},
-						{value:'2',name:'门诊'},
-						{value:'3',name:'医院'},
+						{value:1,name:'诊所'},
+						{value:2,name:'门诊'},
+						{value:3,name:'医院'},
 					]
 const mentuzCampNullList = [
 						{value:'1',name:'整形'},
@@ -20,10 +20,10 @@ const medicaCampNullList = [
 					]
 
 const supplierList = [
-						{value:'1',name:'一类器械'},
-						{value:'2',name:'二类器械'},
-						{value:'3',name:'三类器械'},
-						{value:'4',name:'其他'},
+						{value:1,name:'一类器械'},
+						{value:2,name:'二类器械'},
+						{value:3,name:'三类器械'},
+						{value:4,name:'其他'},
 					]
 const supplierMedicaCampNullList = [
 						{value:'1',name:'产品'},

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

@@ -77,7 +77,7 @@
 		},
 		created() {
 			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID ? resolve.userID : 0
+				this.userID = resolve.userId ? resolve.userId : 0
 				this.userIdentity = resolve.userIdentity
 				this.getHomeInformation()
 			})

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

@@ -170,7 +170,7 @@
 			},
 			getUserSellerHome(){
 				this.$api.getStorage().then((resolve) =>{
-					this.userId = resolve.userID
+					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:'' 	//协销名称

components/cm-module/listTemplate/classifyProductList.vue

@@ -135,7 +135,7 @@
 			this.setScrollHeight();		
 			this.$api.getComStorage('userInfo').then((resolve) =>{
 				this.clubStatus = resolve.clubStatus
-				this.userID = resolve.userID ? resolve.userID :0;
+				this.userID = resolve.userId ? resolve.userId :0;
 				this.userIdentity = resolve.userIdentity
 				this.getListFromServer();
 			}).catch(error =>{

components/cm-module/listTemplate/commodityList.vue

@@ -157,8 +157,8 @@
 			this.setScrollHeight();		
 			this.$api.getComStorage('userInfo').then((resolve) =>{
 				this.clubStatus = resolve.clubStatus
-				this.userID = resolve.userID ? resolve.userID : 0;
-				this.shopId = resolve.shopID ? resolve.shopID : 0;
+				this.userID = resolve.userId ? resolve.userId : 0;
+				this.shopId = resolve.shopId ? resolve.shopId : 0;
 				this.userIdentity = resolve.userIdentity
 				this.getListFromServer();
 			}).catch(error =>{

components/cm-module/listTemplate/productList.vue

@@ -109,7 +109,7 @@
 		created() {
 			this.setScrollHeight();		
 			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID
+				this.userID = resolve.userId ? resolve.userId : 0
 				this.getProductAgainInfo()
 			})
 		},

components/cm-module/pageFloorTemplate/templateA.vue

@@ -167,7 +167,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID ? resolve.shopID : 0
+					this.shopId = resolve.shopId ? resolve.shopId : 0
 				})
 				this.floorData = data
 				console.log(this.floorData)

components/cm-module/pageFloorTemplate/templateB.vue

@@ -179,7 +179,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID ? resolve.shopID : 0
+					this.shopId = resolve.shopId ? resolve.shopId : 0
 				})
 				this.floorData = data
 				// console.log(this.floorData)

components/cm-module/pageFloorTemplate/templateC.vue

@@ -179,7 +179,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID ? resolve.shopID : 0
+					this.shopId = resolve.shopId ? resolve.shopId : 0
 				})
 				this.floorData = data
 				// console.log(this.floorData)

components/cm-module/pageFloorTemplate/templateD.vue

@@ -191,7 +191,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID ? resolve.shopID : 0
+					this.shopId = resolve.shopId ? resolve.shopId : 0
 				})
 				this.floorData = data
 				// console.log(this.floorData)

components/cm-module/pageFloorTemplate/templateE.vue

@@ -167,7 +167,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID ? resolve.shopID : 0
+					this.shopId = resolve.shopId ? resolve.shopId : 0
 				})
 				this.floorData = data
 				// console.log(this.floorData)

components/cm-module/pageFloorTemplate/templateF.vue

@@ -155,7 +155,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID ? resolve.shopID : 0
+					this.shopId = resolve.shopId ? resolve.shopId : 0
 				})
 				this.floorData = data
 				// console.log(this.floorData)

components/cm-module/pageTemplate/templateA.vue

@@ -167,7 +167,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID ? resolve.shopID : 0
+					this.shopId = resolve.shopId ? resolve.shopId : 0
 				})
 				this.floorData = data
 				// console.log(this.floorData)

components/cm-module/pageTemplate/templateB.vue

@@ -179,7 +179,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID ? resolve.shopID : 0
+					this.shopId = resolve.shopId ? resolve.shopId : 0
 				})
 				this.floorData = data
 				// console.log(this.floorData)

components/cm-module/pageTemplate/templateC.vue

@@ -179,7 +179,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID ? resolve.shopID : 0
+					this.shopId = resolve.shopId ? resolve.shopId : 0
 				})
 				this.floorData = data
 				// console.log(this.floorData)

components/cm-module/pageTemplate/templateD.vue

@@ -191,7 +191,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID ? resolve.shopID : 0
+					this.shopId = resolve.shopId ? resolve.shopId : 0
 				})
 				this.floorData = data
 				// console.log(this.floorData)

components/cm-module/pageTemplate/templateE.vue

@@ -167,7 +167,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID ? resolve.shopID : 0
+					this.shopId = resolve.shopId ? resolve.shopId : 0
 				})
 				this.floorData = data
 				// console.log(this.floorData)

components/cm-module/pageTemplate/templateF.vue

@@ -167,7 +167,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID ? resolve.shopID : 0
+					this.shopId = resolve.shopId ? resolve.shopId : 0
 				})
 				this.floorData = data
 				// console.log(this.floorData)

components/cm-module/pageTemplate/templateG.vue

@@ -155,7 +155,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID ? resolve.shopID : 0
+					this.shopId = resolve.shopId ? resolve.shopId : 0
 				})
 				this.floorData = data
 				// console.log(this.floorData)

components/cm-module/pageTemplate/templateH.vue

@@ -171,7 +171,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID ? resolve.shopID : 0
+					this.shopId = resolve.shopId ? resolve.shopId : 0
 				})
 				if(data.floorImageList.length>0){
 					this.productList.splice(0,this.productList.length);

components/cm-module/supplier/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:{
@@ -77,7 +76,7 @@
 		},
 		created() {
 			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID ? resolve.userID : 0
+				this.userID = resolve.userId ? resolve.userId : 0
 				this.userIdentity = resolve.userIdentity
 				this.getHomeInformation()
 			})

components/cm-module/supplier/user.vue

@@ -155,30 +155,33 @@
 		},
 		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.GetHomePageData()
-							this.getPhone()
-						}).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.GetHomePageData()
+						this.getPhone()
+					}else{
+						this.isLogin = false;
+						this.logout()
+						uni.setStorageSync('unionId',response.data.unionId)
+						this.$store.commit('updateStatus',response.data)
+					}
 				})
-			},
+			},	
 			GetHomePageData(){
 				this.$api.getStorage().then((resolve) =>{
-					this.userId = resolve.userID
+					this.userId = resolve.userId ? resolve.userId : 0
 					this.ShopService.GetHomePageData({userId:this.userId}).then(response =>{
 						let data = response.data
 						this.name = data.shop.name 	//协销名称

h5/pages/activity/meobohui.vue

@@ -276,8 +276,8 @@
 			this.modallayer = false
 			this.$api.getComStorage('userInfo').then((resolve) =>{
 				this.clubStatus = resolve.clubStatus
-				this.userID = resolve.userID ? resolve.userID : 0;
-				this.shopId = resolve.shopID ? resolve.shopID : 0;
+				this.userID = resolve.userId ? resolve.userId : 0;
+				this.shopId = resolve.shopId ? resolve.shopId : 0;
 				this.userIdentity = resolve.userIdentity
 				this.GetActitityInit()
 			}).catch(error =>{

pages/goods/good-floor.vue

@@ -62,8 +62,8 @@
 			}
 			this.pageId = option.linkId
 			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.userID = resolve.userID ? resolve.userID : 0;
-				this.shopId = resolve.shopID ? resolve.shopID : 0;
+				this.userID = resolve.userId ? resolve.userId : 0;
+				this.shopId = resolve.shopId ? resolve.shopId : 0;
 				this.userIdentity = resolve.userIdentity
 				this.GetInstrumentPageData();
 			}).catch(error =>{

pages/goods/good-floorMore.vue

@@ -69,8 +69,8 @@
 			uni.setNavigationBarTitle({title:option.title});
 			this.$api.getComStorage('userInfo').then((resolve) =>{
 				this.clubStatus = resolve.clubStatus
-				this.userID = resolve.userID ? resolve.userID : 0;
-				this.shopId = resolve.shopID ? resolve.shopID : 0;
+				this.userID = resolve.userId ? resolve.userId : 0;
+				this.shopId = resolve.shopId ? resolve.shopId : 0;
 				this.userIdentity = resolve.userIdentity
 				this.GetHomeFloorContentDetails(this.pageType);
 			}).catch(error =>{

pages/goods/goods-active.vue

@@ -65,7 +65,7 @@
 		onLoad(option) {
 			this.promotionsId=option.id
 			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.userID = resolve.userID ? resolve.userID :0;
+				this.userID = resolve.userId ? resolve.userId :0;
 				this.initSsoMemberCollectionList()
 			}).catch(error =>{
 				this.initSsoMemberCollectionList()

pages/goods/goods-classify.vue

@@ -264,8 +264,8 @@
 				this.listQuery.idType = this.classifyType = Number(option.classType);
 				uni.setNavigationBarTitle({title:option.title});
 				this.$api.getComStorage('userInfo').then((resolve) =>{
-					this.userID = resolve.userID ? resolve.userID : 0
-					this.shopID = resolve.shopID ? resolve.shopID : 0
+					this.userID = resolve.userId ? resolve.userId : 0
+					this.shopID = resolve.shopId ? resolve.shopId : 0
 					this.userIdentity = resolve.userIdentity
 					this.isRequest = true
 					this.GetProductListInfo()

pages/login/apply-supplier.vue

@@ -38,7 +38,7 @@
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">公司简称:</view>
-					<input class="row-input" type="text" v-model="shopInfo.sname" placeholder="请输入您的公司简称" maxlength="10"/>
+					<input class="row-input" type="text" v-model="shopInfo.shortName" placeholder="请输入您的公司简称" maxlength="10"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
@@ -75,9 +75,9 @@
 				<view class="register-picture">
 					<view class="label">营业执照:</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="shopInfo.businessLicenseImage === ''"  @click="chooseBusinessImage"><text class="iconfont icon-jiahao"></text></view>
+						<view class="upload-none" v-if="shopInfo.businessLicense === ''"  @click="chooseBusinessImage"><text class="iconfont icon-jiahao"></text></view>
 						<view class="upload-image" v-else>
-							<image :src="shopInfo.businessLicenseImage" mode="" @click="viewBusinessImage"></image>
+							<image :src="shopInfo.businessLicense" mode="" @click="viewBusinessImage"></image>
 							<view class="upload-del" @click="delBusinessImage">
 								<text class='iconfont icon-shanchu1'></text>
 							</view>
@@ -187,22 +187,22 @@
 				auditStatus:'',			//审核状态
 				isPreviewImage:false,   //预览图片开关
 				shopInfo:{
-					userID:'',				//用户ID
-					shopID:'',				//供应商ID
+					userId:'',				//用户ID
+					shopId:'',				//供应商ID
 					linkMan:'',				//联系人
 					name:'',				//公司名称
 					email:"",				//法人邮箱地址
-				    provinceID :'',			//省ID
-					cityID : '',			//市ID
-					townID : '',			//区ID
+				    provinceId :'',			//省ID
+					cityId : '',			//市ID
+					townId : '',			//区ID
 					address:'',				//公司详细地址
-					sname:'',	 			//公司简称
+					shortName:'',	 			//公司简称
 					socialCreditCode:'',	//统一社会信用代码
-					businessLicenseImage:'',//营业执照图片
-					firstShopType:0,		//公司类型
-					secondShopType: '',
-					mainpro:'',				//公司主营内容
-					isAgreed:0,				//勾选协议状态
+					businessLicense:'',//营业执照图片
+					firstShopType: 0,		//公司类型
+					secondShopType: 0,
+					mainProduct:'',				//公司主营内容
+					isAgreed:1,				//勾选协议状态
 				},
 				addressText:'请选择公司所在地区',
 				isDisabled:true,
@@ -219,7 +219,7 @@
 				customItemValue:'', 	//自定义项目
 				isMainproCheck:false,
 				isSupplierAlert:true,
-				isCheck:false
+				isCheck:true
 			}	
 		},
 		onLoad() {
@@ -235,8 +235,8 @@
 			},
 			GetSupplierInfo(){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopInfo.userID = resolve.userID
-					this.UserService.SupplierShopInfo({userId:this.shopInfo.userID}).then(response =>{
+					this.shopInfo.userId = resolve.userId ? resolve.userId : 0
+					this.UserService.SupplierShopInfo({userId:this.shopInfo.userId}).then(response =>{
 						let responseData = response.data
 						let supplierShop = responseData.shop
 						let supplierUser = responseData.user
@@ -244,27 +244,27 @@
 						if(supplierUser.auditNoteList!=null){
 							this.errorList = supplierUser.auditNoteList
 						}
-						this.shopInfo.shopID = supplierUser.shopID
+						this.shopInfo.shopId = supplierUser.shopId
 						this.shopInfo.name = this.$reg.checkData(supplierShop.name)
 						this.shopInfo.linkMan = this.$reg.checkData(supplierShop.linkMan)
 						this.shopInfo.email = this.$reg.checkData(supplierUser.email)
-						this.shopInfo.sname = this.$reg.checkData(supplierShop.sname)
+						this.shopInfo.shortName = this.$reg.checkData(supplierShop.shortName)
 						this.addressText = supplierShop.provincialAddress ? supplierShop.provincialAddress : '请选择公司所在地区'
 						this.shopInfo.address = supplierShop.address
-						this.shopInfo.provinceID = supplierShop.provinceID
-						this.shopInfo.cityID = supplierShop.cityID
-						this.shopInfo.townID = supplierShop.townID
+						this.shopInfo.provinceId = supplierShop.provinceId
+						this.shopInfo.cityId = supplierShop.cityId
+						this.shopInfo.townId = supplierShop.townId
 						this.shopInfo.socialCreditCode = this.$reg.checkData(supplierShop.socialCreditCode)
-						this.shopInfo.businessLicenseImage = this.$reg.checkData(supplierShop.businessLicenseImage) 
+						this.shopInfo.businessLicense = this.$reg.checkData(supplierShop.businessLicense) 
 						this.shopInfo.firstShopType = supplierShop.firstShopType
 						this.shopInfo.secondShopType = this.$reg.checkData(supplierShop.secondShopType)
 						//机构类型&&主营项目
 						switch(this.shopInfo.firstShopType){
-							case '1':
+							case 1:
 								this.organizationTypeText = '医疗'
 								this.shopInfo.firstShopType = 1
 								break;
-							case '2':
+							case 2:
 								this.organizationTypeText = '非医疗'
 								this.shopInfo.firstShopType = 2
 								break;
@@ -273,10 +273,10 @@
 								this.shopInfo.firstShopType = 0
 								break;
 						}	
-						if(supplierShop.mainpro){
-							this.supplierMedicaCampList = this.setNewMainpro(supplierShop.mainpro)
+						if(supplierShop.mainProduct){
+							this.supplierMedicaCampList = this.setNewMainpro(supplierShop.mainProduct)
 							console.log(this.supplierMedicaCampList)
-							this.mainpro = supplierShop.mainpro;
+							this.shopInfo.mainProduct = supplierShop.mainProduct;
 						}else{
 							this.supplierMedicaCampList = this.medicaCampList
 							console.log(this.supplierMedicaCampList)
@@ -310,7 +310,7 @@
 					this.$util.msg('请输入正确的邮箱地址',2000);
 					return
 				}
-				if( this.shopInfo.townID == ''){
+				if( this.shopInfo.townId == ''){
 					this.$util.msg('请选择公司地址',2000);
 					return
 				}
@@ -322,7 +322,7 @@
 					this.$util.msg('请填写统一社会信用代码',2000);
 					return
 				}
-				if( !this.shopInfo.businessLicenseImage){
+				if( !this.shopInfo.businessLicense){
 					this.$util.msg('请上传您的营业执照',2000);
 					return
 				}
@@ -330,7 +330,7 @@
 					this.$util.msg('请选择公司类型',2000);
 					return
 				}
-				if(this.shopInfo.mainpro == ''){
+				if(this.shopInfo.mainProduct == ''){
 					this.$util.msg('请选择主营内容',2000);
 					return
 				}
@@ -348,11 +348,11 @@
 			},
 			chooseBusinessImage() {//营业执照图片上传
 				uploadFileImage().then(res =>{
-					this.shopInfo.businessLicenseImage = JSON.parse(res.data).data
+					this.shopInfo.businessLicense = JSON.parse(res.data).data
 				})
 			},
 			viewBusinessImage(e) {
-				this.myPreviewImageFn(this.businessLicenseImage)
+				this.myPreviewImageFn(this.businessLicense)
 			},
 			myPreviewImageFn(url){
 				this.isPreviewImage = true
@@ -365,7 +365,7 @@
 			},
 			delBusinessImage(){
 				this.$util.modal('','确定删除营业执照图片吗？','确定','取消',true,() =>{
-					 this.shopInfo.businessLicenseImage = ''
+					 this.shopInfo.businessLicense = ''
 				})
 			},
 			radioChange(e) {
@@ -374,7 +374,7 @@
 			},
 			chooseMaleLike(e){
 				this.isMainproCheck = true
-				this.shopInfo.mainpro = this.checkLikes(e,this.supplierMedicaCampList)
+				this.shopInfo.mainProduct = this.checkLikes(e,this.supplierMedicaCampList)
 			},
 			bindPickerChange(e) {
 				let self = this
@@ -412,9 +412,9 @@
 			},
 			onConfirm(e) {
 				this.addressText = e.name;
-				this.shopInfo.townID = e.townCode;
-				this.shopInfo.cityID = e.cityCode;
-				this.shopInfo.provinceID = e.provinceCode;
+				this.shopInfo.townId = e.townCode;
+				this.shopInfo.cityId = e.cityCode;
+				this.shopInfo.provinceId = e.provinceCode;
 				console.log(this.shopInfo)
 			},	
 			onTextareaInput(e){

pages/login/apply.vue

@@ -21,7 +21,7 @@
 			<view class="register-row none clearfix">
 				<view class="register-from">
 					<view class="label">邮箱</view>
-					<input class="row-input" type="text" name="input" v-model="registerEmail" placeholder="请输入您的常用邮箱"placeholder-class="placeholder" maxlength="30"/>
+					<input class="row-input" type="text" name="input" v-model="contractEmail" placeholder="请输入您的常用邮箱"placeholder-class="placeholder" maxlength="30"/>
 				</view>
 				<view class="register-tip"><text>提示：邮箱可用作登录账号，请使用公司邮箱或法人邮箱</text></view>
 			</view>
@@ -34,7 +34,7 @@
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">机构简称</view>
-					<input class="row-input" type="text" v-model="abbreviation" placeholder="请输入您的机构简称" placeholder-class="placeholder" maxlength="10"/>
+					<input class="row-input" type="text" v-model="shortName" placeholder="请输入您的机构简称" placeholder-class="placeholder" maxlength="10"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
@@ -71,11 +71,11 @@
 				<view class="register-picture">
 					<view class="label">营业执照</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadBusinessImage === ''"  @click="chooseBusinessImage">
+						<view class="upload-none" v-if="businessLicense === ''"  @click="chooseBusinessImage">
 							<image src="https://static.caimei365.com/app/img/upload/club-zizhi.png"></image>
 						</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>
@@ -87,11 +87,11 @@
 				<view class="register-picture">
 					<view class="label">门头照</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadMentuzImage === ''" @click="chooseMentuzImage">
-							<image src="https://static.caimei365.com/app/img/upload/club-zizhi.png"></image>
+						<view class="upload-none" v-if="shopPhoto === ''" @click="chooseMentuzImage">
+							<image src="https://static.caimei365.com/app/img/upload/club-door.png"></image>
 						</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>
@@ -122,11 +122,11 @@
 				<view class="register-picture zz">
 					<view class="label zz">医疗执业许可证</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadMedicalImage === ''" @click="chooseMedicalImage">
+						<view class="upload-none" v-if="medicalPracticeLicense === ''" @click="chooseMedicalImage">
 							<image src="https://static.caimei365.com/app/img/upload/club-zizhi.png"></image>
 							</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>
@@ -223,22 +223,22 @@
 				tabCurrentIndex:3,	
 				clubStatus:'',			//审核状态
 				isPreviewImage:false,   //预览图片开关
-				userID:'',				//用户ID
-				clubID:'',				//会所ID
-				registerEmail:'',		//邮箱
+				userId:'',				//用户ID
+				clubId:'',				//会所ID
+				contractEmail:'',		//邮箱
 				clubName:'',	 		//机构名称
-				abbreviation:'',	 	//机构简称
+				shortName:'',	 	//机构简称
 				socialCreditCode:'',	//统一社会信用代码
 				isDisabled:true,
 				isShowInput:true,
 				textareaFocus:false,
-				uploadBusinessImage:'',	//营业执照图片
-				uploadMentuzImage:'',  	//门头照图片
-				uploadMedicalImage:'', 	//资质照图片
+				businessLicense:'https://static.caimei365.com/app/img/upload/club-zizhi.png',	//营业执照图片
+				shopPhoto:'',  	//门头照图片
+				medicalPracticeLicense:'', 	//资质照图片
 				department:'',			//科室
 				isDepartment:false,     //是否显示科室
 				secondClubType:'',		//机构类型二级分类
-				mainpro:'',				//主营内容
+				mainProduct:'',				//主营内容
 				firstClubType:'',		//机构类型
 				isOrganizationType:0,
 				organizationTypeText:'请选择机构类型',
@@ -255,9 +255,9 @@
 				isMainproCheck:false,
 				addressData:{
 					address:'请选择机构所在地区',
-					townID:'',			//区ID
-					cityID:'',			//市ID
-					provinceID:'',		//省ID
+					townId:'',			//区ID
+					cityId:'',			//市ID
+					provinceId:'',		//省ID
 					addressDetail: '',	//地址详情
 				},
 				typename:[
@@ -281,31 +281,31 @@
 			},
 			organizationInfo(){
 				this.$api.getStorage().then((resolve) =>{
-					this.userID = resolve.userID
-					this.UserService.OrganizationUpdateModifyInfo({userID:this.userID}).then(response =>{
+					this.userId = resolve.userId ? resolve.userId : 0
+					this.UserService.OrganizationUpdateModifyInfo({userId:this.userId}).then(response =>{
 						let organizationClub = response.data.club
 						let organizationUser = response.data.user
 						if(organizationUser.auditNoteList!=null){
 							this.errorList =organizationUser.auditNoteList
 						}
-						this.registerEmail = organizationUser.email	
-						this.clubID = organizationUser.clubID
+						this.contractEmail = organizationUser.contractEmail	
+						this.clubId = organizationUser.clubId
 						this.clubName = this.$reg.checkData(organizationClub.name)
-						this.abbreviation = this.$reg.checkData(organizationClub.sname)
-						if( organizationClub.provinceID==''||organizationClub.provinceID==null){
-							this.addressData.provinceID = ''
+						this.shortName = this.$reg.checkData(organizationClub.shortName)
+						if( organizationClub.provinceId==''||organizationClub.provinceId==null){
+							this.addressData.provinceId = ''
 						}else{
-							this.addressData.provinceID = organizationClub.provinceID
+							this.addressData.provinceId = organizationClub.provinceId
 						}
-						if( organizationClub.cityID==''||organizationClub.cityID===null){
-							this.addressData.cityID = ''
+						if( organizationClub.cityId==''||organizationClub.cityId===null){
+							this.addressData.cityId = ''
 						}else{
-							this.addressData.cityID = organizationClub.cityID
+							this.addressData.cityId = organizationClub.cityId
 						}
-						if( organizationClub.townID==''||organizationClub.townID==null){
-							this.addressData.townID = ''
+						if( organizationClub.townId==''||organizationClub.townId==null){
+							this.addressData.townId = ''
 						}else{
-							this.addressData.townID = organizationClub.townID
+							this.addressData.townId = organizationClub.townId
 						}
 						console.log('66666666666666')
 						this.addressData.address = organizationClub.provincialAddress ? organizationClub.provincialAddress:'请选择机构所在地区'
@@ -313,9 +313,9 @@
 						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)		
 						//机构类型&&主营项目
 						switch(this.firstClubType){
@@ -332,18 +332,18 @@
 								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){
@@ -368,13 +368,13 @@
 							mainproList.push(item.name)
 						})
 					}
-					this.mainpro = mainproList.join('/')
+					this.mainProduct = mainproList.join('/')
 				}
-				if( this.registerEmail == ''){
+				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
 				}
@@ -382,7 +382,7 @@
 					this.$util.msg('请输入机构名称',2000);
 					return
 				}
-				if( this.addressData.townID == ''){
+				if( this.addressData.townId == ''){
 					this.$util.msg('请选择机构地址',2000);
 					return
 				}
@@ -390,34 +390,35 @@
 					this.$util.msg('请填写机构详细地址',2000);
 					return
 				}
-				if( this.uploadBusinessImage == ''){
-					this.$util.msg('请上传您的营业执照',2000);
-					return
-				}
+				// if( this.businessLicense == ''){
+				// 	this.$util.msg('请上传您的营业执照',2000);
+				// 	return
+				// }
 				if(this.isOrganizationType!=0){
-					if(this.mainpro == ''){
+					if(this.mainProduct == ''){
 						this.$util.msg('请选择住机构主营内容',2000);
 						return
 					}
 				}
 				let params ={
-						userID:this.userID,
-						clubID:this.clubID,					//会所ID
-						contractEmail1:this.registerEmail,
+						userId:this.userId,
+						clubId:this.clubId,					//会所ID
+						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,
+						businessLicense:'https://static.caimei365.com/app/img/upload/club-zizhi.png',
+						shopPhoto:this.shopPhoto,
 						firstClubType:this.isOrganizationType,  //机构类型分类 医美:1和生美:2
 						secondClubType:this.secondClubType,		//机构类型二级分类 诊所:1,门诊:2,医院:3
 						department:this.department,				//科室
-						medicalPracticeLicenseImg:this.uploadMedicalImage,//资质图片
-						mainpro:this.mainpro,
+						medicalPracticeLicense:this.medicalPracticeLicense,//资质图片
+						mainProduct:this.mainProduct,
 				}
 				this.UserService.OrganizationRegister(params).then(response =>{
 					this.$util.msg('您的升级申请已提交审核',2000);
@@ -435,9 +436,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;
@@ -452,27 +453,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
@@ -485,17 +486,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(e) {
@@ -537,11 +538,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

pages/login/bindwechat.vue

@@ -46,7 +46,7 @@
 			<view class="login-form clearfix">
 				<view class="login-input code">
 					<input type="number" 
-						   v-model="mobildeCode"  
+						   v-model="smsCode"  
 						   maxlength="6" 
 						   class="input" 
 						   placeholder="请输入短信验证码"
@@ -72,17 +72,17 @@
 	import { mapState,mapMutations } from 'vuex'
 	import authorize from '@/common/config/authorize.js' 
 	import wxLogin from "@/common/config/wxLogin.js"
-	import { bindingWechat } from "@/api/use.js"
 	import { getbindWechatCode } from "@/api/utils.js"
 	export default{
 		data() {
 			return{
 				userIdentity:'',
-				userID:'',
+				userId:'',
+				unionId:'',
 				bindMobile:'',
 				bindLinkName:'',  		//用户姓名
 				bindLinkPhone:'',  		//用户手机号
-				mobildeCode:'',  		//手机验证码
+				smsCode:'',  		//手机验证码
 				imageCode:'',			//图形验证码
 				imageCodeUrl:'',		//图形验证码地址
 				imageCodetoken:'',		//图形校验token
@@ -113,11 +113,11 @@
 					this.$util.msg('请输入正确的手机号',2000)
 					return
 				}
-				if( this.mobildeCode == ''){
+				if( this.smsCode == ''){
 					this.$util.msg('请输入手机验证码',2000)
 					return
 				}
-				if(!this.$reg.isMobileCode(this.mobildeCode)){
+				if(!this.$reg.isMobileCode(this.smsCode)){
 					this.$util.msg('验证码格式不正确',2000)
 					return
 				}
@@ -144,34 +144,37 @@
 				}
 				let params = {
 						mobile:this.bindLinkPhone,
-						mobileOrEmail:this.bindMobile,
+						bindMobile:this.bindMobile,
 						platformType:2,
+						isCheckCaptcha:0,
 						imgCode:this.imageCode,
 						token:this.imageCodetoken,
 				}
 				this.isMobileDisabled = true;
-				getbindWechatCode(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;
-				})
+				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(){//获取用户基本信息登录
 				wx.getUserInfo({
@@ -179,35 +182,37 @@
 						this.isUserInfo = false;
 						this.userInfo = res.userInfo;
 						let params ={
-								userID:this.userID,
+								userId:this.userId,
 								mobile:this.bindLinkPhone,
 								linkName:this.bindLinkName,
-								verificationCode:this.mobildeCode,
+								smsCode:this.smsCode,
+								unionId:this.unionId,
 								nickName:res.userInfo.nickName,
-								headimgurl:res.userInfo.avatarUrl,
+								avatarUrl:res.userInfo.avatarUrl,
 						}
-						// console.log(params)
-						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)
+							})							
 					}
 				})
 			},
@@ -218,7 +223,10 @@
 		},
 		onShow() {
 			this.$api.getStorage().then((resolve) => {
-				this.userID = resolve.userID
+				console.log(resolve)
+				this.unionId = resolve.unionId
+				console.log(this.unionId)
+				this.userId = resolve.userId
 				this.bindMobile = resolve.bindMobile
 				this.userIdentity = resolve.userIdentity
 			})

pages/login/information.vue

@@ -8,7 +8,7 @@
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">联系人</view>
-					<input class="row-input" type="text" v-model="clubContact" placeholder="请输入联系姓名" placeholder-class="placeholder" maxlength="6"/>
+					<input class="row-input" type="text" v-model="linkMan" placeholder="请输入联系姓名" placeholder-class="placeholder" maxlength="6"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
@@ -26,19 +26,19 @@
 			<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="请输入邮箱地址"placeholder-class="placeholder" maxlength="30"/>
+					<input class="row-input" type="text" name="input" v-model="contractEmail" placeholder="请输入邮箱地址"placeholder-class="placeholder" maxlength="30"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">机构名称</view>
-					<input class="row-input" type="text" v-model="clubName" placeholder="请输入您的机构名称" placeholder-class="placeholder" maxlength="30"/>
+					<input class="row-input" type="text" v-model="name" placeholder="请输入您的机构名称" placeholder-class="placeholder" maxlength="30"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">机构简称</view>
-					<input class="row-input" type="text" v-model="abbreviation" placeholder="请输入您的机构简称" placeholder-class="placeholder" maxlength="10"/>
+					<input class="row-input" type="text" v-model="shortName" placeholder="请输入您的机构简称" placeholder-class="placeholder" maxlength="10"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
@@ -75,11 +75,11 @@
 				<view class="register-picture">
 					<view class="label">营业执照</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadBusinessImage == ''"  @click="chooseBusinessImage">
+						<view class="upload-none" v-if="businessLicense == ''"  @click="chooseBusinessImage">
 							<image src="https://static.caimei365.com/app/img/upload/club-zizhi.png"></image>
 						</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>
@@ -91,11 +91,11 @@
 				<view class="register-picture">
 					<view class="label">门头照</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadMentuzImage == ''" @click="chooseMentuzImage">
+						<view class="upload-none" v-if="shopPhoto == ''" @click="chooseMentuzImage">
 							<image src="https://static.caimei365.com/app/img/upload/club-door.png"></image>
 						</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>
@@ -109,28 +109,28 @@
 					<view class="row-input">
 						<radio-group @change="bindPickerChange">
 							 <label class="label-radio" v-for="(item, index) in typename" :key="item.value">
-								 <radio class="row-radio" :value="item.value" :checked="item.value === isOrganizationType" color='#E15616'/>{{item.name }}
+								 <radio class="row-radio" :value="item.value" :checked="item.value === firstClubType" color='#E15616'/>{{item.name }}
 							 </label>
 						</radio-group>
 					</view>
 				</view>
 			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 1">
+			<view class="register-row clearfix" v-if="firstClubType == 1">
 				<view class="register-from bordernone second" >
 					<view class="secondTyperadio" v-for="(item,index) in beautyList" :key="item.value" @click="radioChange(item)" :class="item.value==secondClubType?'active':''">
 						<view class="secondRadio" >{{item.name}}</view>
 					</view>
 				</view>
 			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 1">
+			<view class="register-row clearfix" v-if="firstClubType == 1">
 				<view class="register-picture zz">
 					<view class="label zz">医疗执业许可证</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadMedicalImage == ''||uploadMedicalImage == null" @click="chooseMedicalImage">
+						<view class="upload-none" v-if="medicalPracticeLicense == ''||medicalPracticeLicense == null" @click="chooseMedicalImage">
 							<image src="https://static.caimei365.com/app/img/upload/club-yiliao.png"></image>
 						</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>
@@ -144,7 +144,7 @@
 					<textarea class="keshi"  placeholder="请填写经营的科室，至少三个，用逗号隔开" placeholder-style="placeholder" v-model="department" maxlength="16"></textarea>
 				</view>
 			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 1">
+			<view class="register-row clearfix" v-if="firstClubType == 1">
 				<view class="register-from group bordernone">
 					<view class="label">主营内容</view>
 					<view class="content-class">
@@ -174,7 +174,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 2">
+			<view class="register-row clearfix" v-if="firstClubType == 2">
 				<view class="register-from group">
 					<view class="label">主营内容</view>
 					<view class="content-class">
@@ -231,7 +231,7 @@
 				<view class="label">公司介绍</view>
 					<textarea 	class="textarea" 
 								type="text" 
-								v-model="companyPprofile" 
+								v-model="profile" 
 								placeholder="请填写公司简介，最多500字" 
 								placeholder-class="placeholder"
 								maxlength="500"
@@ -270,30 +270,30 @@
 				isIphoneX:this.$store.state.isIphoneX,
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				isPreviewImage:false,   	//预览图片开关
-				userID:'',					//用户ID
-				clubID:'',					//会所ID
+				userId:'',					//用户ID
+				clubId:'',					//会所ID
 				userIdentity:'',			//机构用户类型
-				email:'',					//邮箱
-				clubName:'',	 			//机构名称
-				abbreviation:'',	 		//机构简称
-				clubContact:'',	 			//联系人
+				contractEmail:'',					//邮箱
+				name:'',	 			//机构名称
+				shortName:'',	 		//机构简称
+				linkMan:'',	 			//联系人
 				mobile:'',					//联系人手机号
 				socialCreditCode:'',	//统一社会信用代码
 				isDisabled:true,
 				isShowInput:true,
 				textareaFocus:false,
-				uploadBusinessImage:'',	//营业执照图片
-				uploadMentuzImage:'',  	//门头照图片
-				uploadMedicalImage:'', 	//资质照图片
+				businessLicense:'',	//营业执照图片
+				shopPhoto:'',  	//门头照图片
+				medicalPracticeLicense:'', 	//资质照图片
 				department:'',			//科室
 				isDepartment:false,     //是否显示科室
 				secondClubType:'',		//机构类型二级分类
-				mainpro:'',				//主营内容
+				mainProduct:'',				//主营内容
 				clubTelePhone:'',		//固定电话
 				clubFax:'',				//传真
-				companyPprofile:'',		//公司简介
+				profile:'',		//公司简介
 				firstClubType:'',		//机构类型
-				isOrganizationType:0,
+				firstClubType:0,
 				organizationTypeText:'请选择机构类型',
 				beautyList:beautyList,
 				mentuzCampNullList:mentuzCampNullList,
@@ -308,14 +308,14 @@
 				isMainproCheck:false,
 				addressData:{
 					address:'请选择机构所在地区',
-					townID:'',			//区ID
-					cityID:'',			//市ID
-					provinceID:'',		//省ID
+					townId:'',			//区ID
+					cityId:'',			//市ID
+					provinceId:'',		//省ID
 					addressDetail: '',	//地址详情
 				},
 				typename:[
-					{name:'医美',value:'1'},
-					{name:'生美',value:'2'}
+					{name:'医美',value:1},
+					{name:'生美',value:2}
 				],
 			}	
 		},
@@ -332,68 +332,68 @@
 			},
 			organizationInfo(){
 				this.$api.getStorage().then((resolve) =>{
-					this.userID = resolve.userID
-					this.UserService.OrganizationUpdateModifyInfo({userID:this.userID}).then(response =>{
+					this.userId = resolve.userId ? resolve.userId : 0
+					this.UserService.OrganizationUpdateModifyInfo({userId:this.userId}).then(response =>{
 						let organizationClub = response.data.club
 						let organizationUser = response.data.user
-						this.email = organizationUser.email ? organizationUser.email :''	
-						this.clubID = organizationUser.clubID
+						this.contractEmail = organizationClub.contractEmail ? organizationClub.contractEmail : organizationClub.email	
+						this.clubId = organizationUser.clubId
 						this.userIdentity = organizationUser.userIdentity
-						this.clubName = organizationClub.name ? organizationClub.name : ''
-						this.clubContact = organizationClub.linkMan1
+						this.name = organizationClub.name ? organizationClub.name : ''
+						this.linkMan = organizationClub.linkMan
 						this.mobile = organizationUser.bindMobile ? organizationUser.bindMobile : ''
-						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.addressDetail = organizationClub.address ? organizationClub.address : ''
 						this.socialCreditCode = this.$reg.checkData(organizationClub.socialCreditCode)
 						this.firstClubType = 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.headpic)
 						this.department = organizationClub.department						
 						this.clubTelePhone = this.$reg.checkData(organizationClub.contractPhone)
 						this.clubFax = this.$reg.checkData(organizationClub.fax)
-						this.companyPprofile = this.$reg.checkData(organizationClub.info)
+						this.profile = this.$reg.checkData(organizationClub.profile)
 						//机构类型&&主营项目
 						switch(this.firstClubType){
-							case '1':
+							case 1:
 								this.organizationTypeText = '医美'
-								this.isOrganizationType = 1
+								this.firstClubType = 1
 								break;
-							case '2':
+							case 2:
 								this.organizationTypeText = '生美'
-								this.isOrganizationType = 2
+								this.firstClubType = 2
 								break;
 							case null:
 								this.organizationTypeText = '请选择机构类型'
-								this.isOrganizationType = 0
+								this.firstClubType = 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
 							}
 						}
@@ -412,17 +412,17 @@
 				let params = {}
 				if(this.userIdentity === 4){
 					 params = {
-							userID:this.userID,
-							clubID:this.clubID,					//会所ID
-							linkMan1:this.clubContact,
+							userId:this.userId,
+							clubId:this.clubId,					//会所ID
+							linkMan:this.linkMan,
 							fax:this.clubFax,
 							contractPhone:this.clubTelePhone,
-							info : this.companyPprofile,
+							info : this.profile,
 						}		
 				}else{
 					if(!this.isMainproCheck){
 						let mainproList = []
-						if(this.firstClubType == '1'){
+						if(this.firstClubType == 1){
 							this.mentuzCampList.forEach(item =>{
 								mainproList.push(item.name)
 							})
@@ -431,30 +431,30 @@
 								mainproList.push(item.name)
 							})
 						}
-						this.mainpro = mainproList.join('/')
+						this.mainProduct = mainproList.join('/')
 					}
 					params 	= {
-							userID:this.userID,
-							clubID:this.clubID,					//会所ID
-							name:this.clubName,
-							linkMan1:this.clubContact,
-							sname:this.abbreviation,
-							contractEmail1:this.email,
-							provinceID:this.addressData.provinceID,
-							cityID:this.addressData.cityID,
-							townID:this.addressData.townID,
+							userId:this.userId,
+							clubId:this.clubId,					//会所ID
+							name:this.name,
+							linkMan:this.linkMan,
+							shortName:this.shortName,
+							contractEmail:this.contractEmail,
+							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,
-							firstClubType:this.isOrganizationType, //机构类型分类 医美:0和生美:1
+							businessLicense:this.businessLicense,
+							shopPhoto:this.shopPhoto,
+							firstClubType:this.firstClubType, //机构类型分类 医美: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.profile
 					}
 				}
 				this.UserService.OrganizationUpdate(params).then(response =>{
@@ -473,9 +473,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;
@@ -489,31 +489,31 @@
 				this.textareaFocus = false
 			},
 			onTextareaInputInfo(e){
-			   this.companyPprofile = e.detail.value;
+			   this.profile = e.detail.value;
 			},
 			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
@@ -526,27 +526,27 @@
 			},
 			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(e) {
-				this.isOrganizationType = e.target.value;
+				this.firstClubType = e.target.value;
 				// let self = this
 				// uni.showActionSheet({
 				// 	title:'标题',
 				// 	itemList: ['医美', '生美'],
 				// 	success: (e) => {
-				// 		self.isOrganizationType = e.tapIndex+1
+				// 		self.firstClubType = e.tapIndex+1
 				// 		switch(e.tapIndex){
 				// 			case 0:
 				// 				this.organizationTypeText = '医美'
@@ -561,7 +561,7 @@
 			},
 			bindPickerChange2(e) {
 				this.typtIndex = e.target.value
-				this.isOrganizationType = e.target.value
+				this.firstClubType = e.target.value
 			},
 			radioChange(item) {
 				this.secondClubType =item.value;
@@ -620,7 +620,7 @@
 				if(this.customItemValue==''){
 					this.$util.msg('请输入自定义项目',2000);
 					}else{
-						if(this.isOrganizationType == 1){
+						if(this.firstClubType == 1){
 							let item = {value:`${this.mentuzCampList.length+1}`,name:this.customItemValue,checked:true}
 							if(this.checkedArray(this.customItemValue,this.mentuzCampList)){
 								this.$util.msg('主营内容已存在!',2000)

pages/login/login.vue

@@ -6,15 +6,15 @@
 		<view class="login-form">
 			<view class="login-input">
 				<input type="text" 
-					   v-model="accountNumber"  
+					   v-model="params.mobileOrEmail"  
 					   maxlength="30" 
 					   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 class="login-input link">
@@ -38,17 +38,12 @@
 				isShowEye:false,
 				iconEyes:'icon-yanjing_yincang_o',
 				iconEyen:'icon-yanjing_xianshi_o',
-				accountNumber:'',  //用户登录账号
-				password:'',	   //用户登录密码	
-				toestText:'',
-				telPhone:'',
-				loginType:'',		//跳转类型
-				alertText:'',
-				listType: '',
-				listVal: '',
-				detilType:'',
-				id:'',			//商品ID
-				getOption:''	//页面传递参数
+				getOption:'',	//页面传递参数
+				params:{
+					mobileOrEmail:'',//用户登录账号
+					password:'',//用户登录密码	
+					unionId:''
+				}
 			}
 		},
 		onLoad(option) {
@@ -59,37 +54,37 @@
 		},
 		methods:{
 			...mapMutations(['login']),
-			confirmLogin(){
-				if( this.accountNumber == ''){
+			async confirmLogin(){
+				if( this.params.mobileOrEmail == ''){
 					this.$util.msg('请输入账户名',2000)
 					return
 				}
-				if( this.password == ''){
+				if( this.params.password == ''){
 					this.$util.msg('请输入密码',2000)
 					return
 				}
-				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-					if(wxResponse == 1){
-						this.AorganizationLogin()
-					}else{
-						this.$api.navigateTo('/pages/authorization/authorization?type=0')
-					}
-				})
+				const wxCode = await authorize.getSetting();
+				if(wxCode == 1){
+					this.AorganizationLogin()
+				}else{
+					this.$api.navigateTo('/pages/authorization/authorization?type=0')
+				}
 			},
 			AorganizationLogin(){
-				this.UserService.AorganizationLogin({mobileOrEmail:this.accountNumber,password:this.password,source:'www'}).then(response =>{
-					if(response.code === 0){
-						this.storeUpdataeStatus(response.data)
-						this.$api.navigateTo(`/pages/login/bindwechat?data=${JSON.stringify(this.getOption)}&codeType=${response.code}`)
-					}else if(response.code === -3){
-						this.$util.modal('','您的企业账号审核未通过，请修改资料','前往修改','',false,() =>{
-							this.$store.commit('updateStatus',response.data)
-							this.$api.navigateTo('/pages/login/apply-supplier')
-						})
-					}else{
-						this.$util.msg(response.msg,2000);
-					}
-				})
+				this.UserService.AorganizationLogin(this.params)
+					.then(response =>{
+						if(response.code === 0){
+							this.storeUpdataeStatus(response.data)
+							this.$api.navigateTo(`/pages/login/bindwechat?data=${JSON.stringify(this.getOption)}&codeType=${response.code}`)
+						}else if(response.code === -3){
+							this.$util.modal('','您的企业账号审核未通过，请修改资料','前往修改','',false,() =>{
+								this.$store.commit('updateStatus',response.data)
+								this.$api.navigateTo('/pages/login/apply-supplier')
+							})
+						}else{
+							this.$util.msg(response.msg,2000);
+						}
+					})
 			},
 			storeUpdataeStatus(data){
 				uni.setStorageSync('token',data.token)
@@ -99,16 +94,20 @@
 			passwordClick() { //密码显隐操作
 				this.isShowEye = !this.isShowEye;
 			},
-		},
-		onShow() {
-			authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-				if(wxResponse == 1){
+			async InitAuthorize(){ //是否已授权 0:为取消授权 1:为已授权 2:为未操作
+				const code = await authorize.getSetting();
+				if(code == 1){
 					wxLogin.wxLoginQuick()
-					console.log(this.isLoginType)
 				}else{
 					this.$api.navigateTo('/pages/authorization/authorization?type=0')
-				}	
+				}
+			}
+		},
+		onShow() {
+			this.$api.getStorage().then((resolve) =>{
+				this.params.unionId = resolve.unionId
 			})
+			this.InitAuthorize()
 		}
 	}
 </script>

pages/login/register-supplier.vue

@@ -41,7 +41,7 @@
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">短信验证码:</view>
-					<input class="row-input code" type="text" v-model="firstParmas.mobileCode" placeholder="请输入短信验证码" maxlength="6"/>
+					<input class="row-input code" type="text" v-model="firstParmas.smsCode" placeholder="请输入短信验证码" maxlength="6"/>
 					<view class="row-btn" :class="[isMobileDisabled  ? 'disabled' : '']">
 						<button class="row-input"
 								type="button" 
@@ -100,7 +100,7 @@
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">公司简称:</view>
-					<input class="row-input" type="text" v-model="threeParmas.sname" placeholder="请输入您的公司简称" maxlength="10"/>
+					<input class="row-input" type="text" v-model="threeParmas.shortName" placeholder="请输入您的公司简称" maxlength="10"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
@@ -137,9 +137,9 @@
 				<view class="register-picture">
 					<view class="label">营业执照:</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="threeParmas.businessLicenseImage === ''"  @click="chooseBusinessImage"><text class="iconfont icon-jiahao"></text></view>
+						<view class="upload-none" v-if="threeParmas.businessLicense === ''"  @click="chooseBusinessImage"><text class="iconfont icon-jiahao"></text></view>
 						<view class="upload-image" v-else>
-							<image :src="threeParmas.businessLicenseImage" mode="" @click="viewBusinessImage"></image>
+							<image :src="threeParmas.businessLicense" mode="" @click="viewBusinessImage"></image>
 							<view class="upload-del" @click="delBusinessImage">
 								<text class='iconfont icon-shanchu1'></text>
 							</view>
@@ -263,7 +263,7 @@
 				stepIndex:0,
 				firstParmas:{
 					bindMobile:'',
-					mobileCode:'',
+					smsCode:'',
 					password:'',
 					passWordConfirm:'',
 					whichStep:1
@@ -275,20 +275,17 @@
 					whichStep:2
 				},
 				threeParmas:{
-				    provinceID :'',
-					cityID : '',
-					townID : '',
 					address:'',
-					sname:'',	 	//公司简称
+					shortName:'',	 	//公司简称
 					socialCreditCode:'',	//统一社会信用代码
-					businessLicenseImage:'',	//营业执照图片
-					provinceID :'',
-					cityID : '',
-					townID : '',
+					businessLicense:'https://static.caimei365.com/app/img/upload/club-zizhi.png',	//营业执照图片
+					provinceId :'',
+					cityId : '',
+					townId : '',
 					address:'',
 					firstShopType:0,
 					secondShopType: '',
-					mainpro:'',
+					mainProduct:'',
 					isAgreed:0,
 					whichStep:3,
 					source:1,
@@ -343,12 +340,13 @@
 				let params = {
 						mobile:this.firstParmas.bindMobile,
 						imgCode:this.imageCode,
+						isCheckCaptcha:0,
+						token:this.imageCodetoken,
 						activateCodeType:3,
 						platformType:2,
-						token:this.imageCodetoken
 					}
 				this.isMobileDisabled = true;
-				this.PublicService.GetMobileCode(params).then(response =>{
+				this.PublicService.GetRegisterMobileCode(params).then(response =>{
 					this.$util.msg('验证短信已发送',2000);
 					const TIME_COUNT = 60;
 			     	if (!this.mobilTime) {
@@ -401,11 +399,11 @@
 					this.$util.msg('请输入正确的手机号',2000);
 					return
 				}
-				if( this.firstParmas.mobileCode == ''){
+				if( this.firstParmas.smsCode == ''){
 					this.$util.msg('请输入手机验证码',2000);
 					return
 				}
-				if(!this.$reg.isMobileCode(this.firstParmas.mobileCode)){
+				if(!this.$reg.isMobileCode(this.firstParmas.smsCode)){
 					this.$util.msg('验证码格式不正确',2000);
 					return
 				}
@@ -421,7 +419,7 @@
 					uni.showToast({title: '两次输入的密码不一致',duration: 2000,mask:true,icon:'none'})
 					return
 				}
-				this.ShopService.SupplierAppletsRegistered(this.firstParmas).then(response =>{
+				this.UserService.SupplierAppletsRegistered(this.firstParmas).then(response =>{
 					this.stepIndex = 1
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);
@@ -444,14 +442,15 @@
 					this.$util.msg('请输入正确的邮箱地址',2000);
 					return
 				}
-				this.ShopService.SupplierAppletsRegistered(this.twoParmas).then(response =>{
+				let postParmas =  Object.assign(this.firstParmas,this.twoParmas)
+				this.UserService.SupplierAppletsRegistered(postParmas).then(response =>{
 					this.stepIndex = 2
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);
 				})	
 			},
 			SupplierRegisteredThree(){
-				if( this.threeParmas.townID == ''){
+				if( this.threeParmas.townId == ''){
 					this.$util.msg('请选择公司地址',2000);
 					return
 				}
@@ -463,15 +462,15 @@
 					this.$util.msg('请填写统一社会信用代码',2000);
 					return
 				}
-				if( !this.threeParmas.businessLicenseImage){
-					this.$util.msg('请上传您的营业执照',2000);
-					return
-				}
+				// if( !this.threeParmas.businessLicense){
+				// 	this.$util.msg('请上传您的营业执照',2000);
+				// 	return
+				// }
 				if(this.threeParmas.firstShopType == 0){
 					this.$util.msg('请选择公司类型',2000);
 					return
 				}
-				if(this.threeParmas.mainpro == ''){
+				if(this.threeParmas.mainProduct == ''){
 					this.$util.msg('请选择主营内容',2000);
 					return
 				}
@@ -483,9 +482,9 @@
 				this.supplierMedicaCampList.forEach(item =>{
 					mainproList.push(item.name)
 				})
-				this.threeParmas.mainpro = mainproList.join('/')
+				this.threeParmas.mainProduct = mainproList.join('/')
 				let postParmas =  Object.assign(this.firstParmas,this.twoParmas,this.threeParmas)
-				this.UserService.appSupplierRegister(postParmas).then(response =>{
+				this.UserService.SupplierAppletsRegistered(postParmas).then(response =>{
 					this.$util.modal('','您的资料已提交成功，系统将在1-2个工作日内进行审核~','知道了','',false,() =>{
 						this.$api.switchTabTo('/pages/tabBar/home/index')
 					})
@@ -495,11 +494,11 @@
 			},
 			chooseBusinessImage() {//营业执照图片上传
 				uploadFileImage().then(res =>{
-					this.threeParmas.businessLicenseImage = JSON.parse(res.data).data
+					this.threeParmas.businessLicense = JSON.parse(res.data).data
 				})
 			},
 			viewBusinessImage(e) {
-				this.myPreviewImageFn(this.businessLicenseImage)
+				this.myPreviewImageFn(this.businessLicense)
 			},
 			myPreviewImageFn(url){
 				this.isPreviewImage = true
@@ -512,7 +511,7 @@
 			},
 			delBusinessImage(){
 				this.$util.modal('','确定删除营业执照图片吗？','确定','取消',true,() =>{
-					 this.threeParmas.businessLicenseImage = ''
+					 this.threeParmas.businessLicense = ''
 				})
 			},
 			radioChange(e) {
@@ -520,7 +519,7 @@
 			},
 			chooseMaleLike(e){
 				this.isMainproCheck = true
-				this.threeParmas.mainpro = this.checkLikes(e,this.supplierMedicaCampList)
+				this.threeParmas.mainProduct = this.checkLikes(e,this.supplierMedicaCampList)
 			},
 			checkLikes(e,list){
 				let	values = e.detail.value
@@ -554,9 +553,9 @@
 			},
 			onConfirm(e) {
 				this.addressText = e.name;
-				this.threeParmas.townID = e.townCode;
-				this.threeParmas.cityID = e.cityCode;
-				this.threeParmas.provinceID = e.provinceCode;
+				this.threeParmas.townId = e.townCode;
+				this.threeParmas.cityId = e.cityCode;
+				this.threeParmas.provinceId = e.provinceCode;
 			},	
 			onTextareaInput(e){
 			   this.threeParmas.address = e.detail.value;

pages/login/register.vue

@@ -8,19 +8,19 @@
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">联系人:</view>
-					<input class="row-input" type="text" name="input" v-model="userName" placeholder="请输入机构联系人姓名" maxlength="6"/>
+					<input class="row-input" type="text" name="input" v-model="params.userName" placeholder="请输入机构联系人姓名" maxlength="6"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">手机号:</view>
-					<input class="row-input" type="number" name="input" v-model="bindMobile" placeholder="请输入联系人常用手机号" maxlength="11"/>
+					<input class="row-input" type="number" name="input" v-model="params.bindMobile" placeholder="请输入联系人常用手机号" maxlength="11"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">短信验证码:</view>
-					<input class="row-input code" type="text" v-model="mobileCode" placeholder="请输入短信验证码" maxlength="6"/>
+					<input class="row-input code" type="text" v-model="params.smsCode" placeholder="请输入短信验证码" maxlength="6"/>
 					<view class="row-btn" :class="[isMobileDisabled  ? 'disabled' : '']">
 						<button class="row-input"
 								type="button" 
@@ -34,13 +34,13 @@
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">登录密码:</view>
-					<input class="row-input" type="password" name="input" v-model="password" placeholder="密码必须为8-16位字母数字组合" maxlength="16"/>
+					<input class="row-input" type="password" name="input" v-model="params.password" placeholder="密码必须为8-16位字母数字组合" maxlength="16"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">确认密码:</view>
-					<input class="row-input" type="password" name="input" v-model="passwordCheck" placeholder="请确认密码" maxlength="16"/>
+					<input class="row-input" type="password" name="input" v-model="params.passWordConfirm" placeholder="请确认密码" maxlength="16"/>
 				</view>
 			</view>
 			<view class="register-main clearfix">
@@ -72,7 +72,7 @@
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
 	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/json/data.json.js' //本地数据
 	import { organizationVerifyRegisterFirst } from "@/api/use.js"
-	import { getRegisterMobileCode, uploadFileImage } from "@/api/utils.js"
+	import { uploadFileImage } from "@/api/utils.js"
 	export default{
 		components:{
 			mpvueCityPicker
@@ -91,15 +91,21 @@
 			    mobilCount: '',				//倒计时
 			    mobileCodeText: '获取验证码',
 			    mobilTime: null,
-				password:'',			//密码
-				passwordCheck:'',		//校验密码
-				userName:'',	 		//联系人
-				bindMobile:'',		//联系人手机号
-				mobileCode:'',			//手机验证码
+				params:{
+					userName:'',
+					bindMobile:'',
+					isAgreed:0,	
+					password:'',	
+					passWordConfirm:'',	
+					smsCode:'',
+					avatarUrl:'',	
+					nickName:'',	
+					source:1,	
+					unionId:''	
+				},
 				imageCode:'',			//图形验证码
 				imageCodeUrl:'',		//图形验证码图片
 				imageCodetoken:'',		//图形验证校验
-				isAgreed:0,				//是否勾选协议
 				isCheck:false,			//是否勾选协议
 				userID:'',		//机构userID
 				clubID:'',		//机构ID
@@ -123,19 +129,49 @@
 			registerStepsfirst(){
 				wx.getUserInfo({
 					success: res => {
-						let params ={
-								source:1,
-								userName:this.userName,
-								bindMobile:this.bindMobile,
-								activationCode:this.mobileCode,
-								password:this.password,
-								passWordConfirm:this.passwordCheck,
-								isAgreed:this.isAgreed,	//是否勾选协议
-								nickName:res.userInfo.nickName,
-								headimgurl:res.userInfo.avatarUrl,
-						}
-						organizationVerifyRegisterFirst(params).then(response =>{
-							this.storeUpdataeStatus(response.data)
+						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')
@@ -152,21 +188,21 @@
 				this.login(data);
 			},
 			getMobileCodeFn(){
-				if( this.bindMobile == ''){
+				if( this.params.bindMobile == ''){
 					this.$util.msg('请输入手机号',2000);
 					return
 				}
-				if(!this.$reg.isMobile(this.bindMobile)){
+				if(!this.$reg.isMobile(this.params.bindMobile)){
 					this.$util.msg('请输入正确的手机号',2000);
 					return
 				}
 				let params = {
-						mobile:this.bindMobile,
+						mobile:this.params.bindMobile,
 						activateCodeType:2,
 						platformType:2
 					}
 				this.isMobileDisabled = true;
-				getRegisterMobileCode(params).then(response =>{
+				this.PublicService.GetRegisterMobileCode(params).then(response =>{
 					this.$util.msg('验证短信已发送',2000);
 					const TIME_COUNT = 60;
 			     	if (!this.mobilTime) {
@@ -192,20 +228,25 @@
 			agreeCheck() {
 				this.isCheck = !this.isCheck
 				if(this.isCheck){
-					this.isAgreed = 1
+					this.params.isAgreed = 1
 				}else{
-					this.isAgreed = 0
+					this.params.isAgreed = 0
 				}
-			}
-		},
-		onShow() {
-			authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-				if(wxResponse == 1){
+			},
+			async InitAuthorize(){ //是否已授权 0:为取消授权 1:为已授权 2:为未操作
+				const code = await authorize.getSetting();
+				if(code == 1){
 					wxLogin.wxLoginQuick()
 				}else{
 					this.$api.navigateTo('/pages/authorization/authorization?type=0')
-				}	
+				}
+			}
+		},
+		onShow() {
+			this.$api.getStorage().then((resolve) =>{
+				this.params.unionId = resolve.unionId
 			})
+			this.InitAuthorize()
 		}
 	}
 </script>
@@ -435,6 +476,7 @@
 							.row-input{
 								background: #F7F7F7;
 								color: #999999;
+								font-size: 24rpx;
 							}
 						}
 					}

pages/tabBar/home/index.vue

@@ -33,7 +33,6 @@
 	import pageSpecial from '@/components/cm-module/homeIndex/pageSpecial.vue'
 	import supplierList from '@/components/cm-module/homeIndex/supplierList.vue'
 	import activityAlert from '@/components/cm-module/activity/activity_01.vue'
-	import { userInfoLogin } from "@/api/use.js"
 	import { mapState,mapMutations} from 'vuex';
 	export default {
 		components:{
@@ -85,34 +84,33 @@
 		},
 		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 =>{
-							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.removeStorageSync('sessionid')
-							uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
-							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.removeStorageSync('sessionid')
-							uni.setStorageSync('sessionid','JSESSIONID='+error.data)
-							this.$store.commit('updateStatus',error.data)
-							this.getHomeInformation()
-						})
-					})
+			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 == 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()
+					}
 				})
 			},		
 			GetHomeInit(){//金刚区分类
@@ -168,6 +166,19 @@
 				uni.setStorageSync('lockTime',Date.now())
 				uni.setStorageSync('isActivityStatus',true)	
 			},
+			async InitAuthorize(){ //是否已授权 0:为取消授权 1:为已授权 2:为未操作
+				const code = await authorize.getSetting();
+				if(code == 1){
+					this.getWxAuthorize()
+				}else{
+					this.$api.getComStorage('userInfo').then((resolve) =>{
+						this.userID = resolve.userId ? resolve.userId :0;
+						this.getHomeInformation()
+					}).catch(error =>{
+						this.getHomeInformation()
+					})
+				}
+			}
 		},
 		onPageScroll(e){//实时获取到滚动的值
 			if(e.scrollTop>50){
@@ -197,18 +208,7 @@
 		},
 		onShow(){
 			this.modallayer = false
-			authorize.getSetting().then(res =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-				if(res == 1){
-					this.getWxAuthorize()
-				}else{
-					this.$api.getComStorage('userInfo').then((resolve) =>{
-						this.userID = resolve.userID ? resolve.userID :0;
-						this.getHomeInformation()
-					}).catch(error =>{
-						this.getHomeInformation()
-					})
-				}
-			})		
+			this.InitAuthorize()
 		}
 	}
 </script>

pages/tabBar/user/user.vue

@@ -344,7 +344,7 @@
 		onShow(){
 			if(this.hasLogin){
 				this.$api.getComStorage('userInfo').then((resolve) =>{
-					this.userID = resolve.userID
+					this.userID = resolve.userId ? resolve.userId : 0
 					this.getUserInfo()
 				}).catch(reject =>{
 					console.log('异常处理=========>',reject)

pages/user/account/account.vue

@@ -137,7 +137,7 @@
 					 }
 				})
 				this.$api.getStorage().then((resolve) =>{
-					 this.userID =resolve.userID
+					 this.userID =resolve.userId ? resolve.userId : 0
 					 /**
 					  * @余额明细初始化加载  仅加载第一页码
 					  * @param：type(查询余额类型:0全部,1收入,2支出)

pages/user/address/address.vue

@@ -152,7 +152,7 @@
 		},
 		onShow() {
 			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID
+				this.userID = resolve.userId ? resolve.userId : 0
 				this.pageNum = 1;
 				this.addressList = [];
 				this.initAddressList();

pages/user/address/addressManage.vue

@@ -189,7 +189,7 @@
 		},
 		onShow() {
 			this.$api.getStorage().then((resolve) =>{
-				this.addressData.userID = resolve.userID
+				this.addressData.userID = resolve.userId ? resolve.userId : 0
 			})
 		}
 	}

pages/user/operator/addoperator.vue

@@ -72,8 +72,8 @@
 		},
 		onShow() {
 			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID
-				this.clubID = resolve.clubID
+				this.userID = resolve.userId ? resolve.userId : 0
+				this.clubID = resolve.clubId ? resolve.clubId : 0
 			})
 		}
 	}

pages/user/operator/list.vue

@@ -29,8 +29,8 @@
 						<view class="list-left">
 							<view class="list-head"><image :src="item.headimgurl ? item.headimgurl : 'https://static.caimei365.com/app/img/icon/icon-seller@3x.png'" mode=""></image></view>
 							<view class="list-tel">
-								<text class="txt">{{item.linkName}}</text>
-								<text class="txt">{{item.mobile}}</text>
+								<text class="txt">{{ item.linkName ? item.linkName : ''}}</text>
+								<text class="txt">{{ item.mobile ? item.mobile : '' }}</text>
 							</view>
 						</view>
 						<view class="list-opea">

pages/user/order/create-order.vue

@@ -130,7 +130,7 @@
 				this.productIds = data.data.productID
 			}
 			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID
+				this.userID = resolve.userId ? resolve.userId : 0
 				this.getInitCrearOrder(option);
 			})
 		},

pages/user/order/order-list.vue

@@ -263,7 +263,7 @@
 				}
 				setTimeout(()=>{
 					this.$api.getStorage().then((resolve) =>{
-						this.userID = resolve.userID
+						this.userID = resolve.userId ? resolve.userId : 0
 						let params = {orderState:index,userId:this.userID,pageNum:1,pageSize:this.pageSize};
 						this.OrderService.QueryOrderList(params).then(response =>{
 							let orderList = response.data.results.filter(item=>{

pages/user/regularPurchase/regularPurchase.vue

@@ -160,7 +160,7 @@
 		onShow() {
 			let pages = getCurrentPages(),thisPage = pages[pages.length - 1];
 			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID
+				this.userID = resolve.userId ? resolve.userId : 0
 			})
 		},
 	}

pages/user/setting/phone.vue

@@ -153,7 +153,7 @@
 		},
 		onShow() {
 			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID
+				this.userID = resolve.userId ? resolve.userId : 0
 			})
 		}
 	}

pages/user/setting/setting.vue

@@ -31,7 +31,7 @@
 		methods:{
 			initSetting(){
 				this.$api.getStorage().then((resolve) =>{
-					this.UserService.PersonalInfo({userID:resolve.userID}).then(response =>{
+					this.UserService.PersonalInfo({userID:resolve.userId}).then(response =>{
 						this.bindMobile=response.data.user.bindMobile
 					}).catch(error =>{
 						this.$util.msg(error.msg,2000)

search/pages/search/search-order.vue

@@ -182,7 +182,7 @@
 			},
 			initGetSerachRecord(){
 				this.$api.getStorage().then((resolve) =>{
-					this.userID = resolve.userID
+					this.userID = resolve.userId ? resolve.userId : 0
 					this.OrderService.SearchOrderHistory({userId:this.userID}).then(response =>{
 						this.serachRecordList = response.data
 						if(this.serachRecordList.length>0){

search/pages/search/search.vue

@@ -222,8 +222,8 @@
 				})	
 			}
 			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID ? resolve.userID : 0;
-				this.shopId = resolve.shopID ? resolve.shopID : 0;
+				this.userID = resolve.userId ? resolve.userId : 0;
+				this.shopId = resolve.shopId ? resolve.shopId : 0;
 				this.userIdentity = resolve.userIdentity;
 				this.listQuery.identity = this.identity;
 				if(option.keyWord){

seller/pages/address/address.vue

@@ -157,7 +157,7 @@
 		},
 		onShow() {
 			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID
+				this.userID = resolve.userId ? resolve.userId : 0
 				this.pageNum = 1;
 				this.addressList = [];
 				this.initAddressList();

seller/pages/cart/buyagain.vue

@@ -169,7 +169,7 @@
 				this.clubID = resolve.clubID
 			})
 			this.$api.getStorage().then((resolve) =>{
-				this.serviceProviderId = resolve.serviceProviderID
+				this.serviceProviderId = resolve.serviceProviderId
 				this.getClubProductNum()
 			})
 		},

seller/pages/cart/immediately.vue

@@ -307,7 +307,7 @@
 				this.clubID = resolve.clubID
 			})
 			this.$api.getStorage().then((resolve) =>{
-				this.serviceProviderId = resolve.serviceProviderID
+				this.serviceProviderId = resolve.serviceProviderId
 				this.getClubProductNum()
 			})
 		},

seller/pages/cart/second.vue

@@ -189,7 +189,7 @@
 				this.clubID = resolve.clubID
 			})
 			this.$api.getStorage().then((resolve) =>{
-				this.serviceProviderId = resolve.serviceProviderID
+				this.serviceProviderId = resolve.serviceProviderId
 				this.getClubProductNum()
 			})
 		},

seller/pages/login/register.vue

@@ -605,7 +605,7 @@
 				return
 			}
 			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID
+				this.userID = resolve.userId ? resolve.userId : 0
 			})
 		}
 	}

seller/pages/order/create-order.vue

@@ -180,7 +180,7 @@
 			getInitProdcutCrearOrder(option){//二手下单初始化查询
 				this.$api.getStorage().then((resolve) =>{
 					this.seconDepositFlg = false;
-					this.serviceProviderId = resolve.serviceProviderID
+					this.serviceProviderId = resolve.serviceProviderId
 					let params ={clubId:this.clubId,serviceProviderId:this.serviceProviderId,productCount:this.productCount,productId:this.productIds}
 					this.SellerService.GetSettlementBySencondProduct(params).then(response =>{
 						let resData = response.data
@@ -195,7 +195,7 @@
 			},
 			getInitCrearOrder(option){//协销购物车跳转确认订单初始化信息
 				this.$api.getStorage().then((resolve) =>{
-					this.serviceProviderId = resolve.serviceProviderID
+					this.serviceProviderId = resolve.serviceProviderId
 					let params ={clubId:this.clubId,serviceProviderId:this.serviceProviderId,count:this.productCount,productIds:this.productIds}
 					this.SellerService.SellerSettlement(params).then(response =>{
 						let data = response.data

seller/pages/order/myOrder.vue

@@ -178,7 +178,7 @@
 				 */ 
 				// setTimeout(()=>{this.skeletonShow = false},1500)
 				this.$api.getStorage().then((resolve) =>{
-					this.userID = resolve.userID
+					this.userID = resolve.userId ? resolve.userId : 0
 					let param = {orderState:index,userID:this.userID,index:1,pageSize:this.pageSize,organizeID:this.userOrganizeID}
 					this.$api.lodingGet('/order/myOrder',param,
 						response => {

seller/pages/order/order-details.vue

@@ -139,7 +139,7 @@
 				this.listType = option.listType
 			}
 			this.$api.getStorage().then((resolve) =>{
-				this.againUserId = resolve.userID
+				this.againUserId = resolve.userId ? resolve.userId : 0
 			})
 			this.getHeaderTopHeight()
 			this.initOrderDetaileData()
@@ -360,7 +360,7 @@
 		},
 		onShow() {
 			this.$api.getStorage().then((resolve) =>{
-				this.serviceProviderId = resolve.serviceProviderID
+				this.serviceProviderId = resolve.serviceProviderId
 			})
 		}
 	}

seller/pages/order/order-historylist.vue

@@ -184,7 +184,7 @@
 				}
 			});
 			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID
+				this.userID = resolve.userId ? resolve.userId : 0
 			})
 		},
 		filters:{

seller/pages/order/order-list.vue

@@ -222,7 +222,7 @@
 				}
 			});
 			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID
+				this.userID = resolve.userId ? resolve.userId : 0
 			})
 		},
 		filters:{
@@ -299,7 +299,7 @@
 				}
 				setTimeout(()=>{
 					this.$api.getStorage().then((resolve) =>{
-						this.serviceProviderId = resolve.serviceProviderID
+						this.serviceProviderId = resolve.serviceProviderId
 						let params = {
 								listType:index,
 								orderSubmitType:this.screenTab,

seller/pages/search/search-order.vue

@@ -185,7 +185,7 @@
 			},
 			initGetSerachRecord(){
 				this.$api.getComStorage('userInfo').then((resolve) =>{
-					this.userID = resolve.userID
+					this.userID = resolve.userId ? resolve.userId : 0
 					this.OrderService.SearchOrderHistory({userId:this.userID}).then(response =>{
 						this.serachRecordList = response.data
 						if(this.serachRecordList.length>0){
@@ -429,7 +429,7 @@
 		onShow() {
 			this.setScrollHeight();
 			this.$api.getStorage().then((resolve) =>{
-				this.serviceProviderId = resolve.serviceProviderID
+				this.serviceProviderId = resolve.serviceProviderId
 			})
 		}
 	}

services/ajax.service.js

@@ -1,7 +1,8 @@
 /**
  * ajax请求相关的服务
  */
-import baseUrl from './ajax.env'
+import spiServiceUrl from './ajax.env'
+import corServiceUrl from './config.env'
 import { msg } from '@/utils/util'
 
 class AjaxService {
@@ -9,7 +10,7 @@ class AjaxService {
 		this.name = 'AjaxService'
 	}
 	getBaseUrl (url = '') {
-		return url.indexOf('://') > -1 ? url : baseUrl + url
+		return url.indexOf('://') > -1 ? url : url
 	}
 	getHeaders({ header = {} }) {
 		const REV_TOKEN_ENV = uni.getStorageSync('token') ? uni.getStorageSync('token') : 'X-token';
@@ -22,10 +23,15 @@ class AjaxService {
 	}
 	request(options = {}) {
 		let header = this.getHeaders(options)
+		let url = this.getBaseUrl(options.url)
 		if (options.header) {
 			header = Object.assign(header, options.header)
 		}
-		let url = this.getBaseUrl(options.url)
+		if(options.isHost){
+			url = corServiceUrl + url
+		}else{
+			url = spiServiceUrl + url
+		}
 		let { isLoading = true } = options
 		if (isLoading) {
 			wx.showLoading({ title: '加载中' })

services/config.env.js

@@ -0,0 +1,10 @@
+let URL_CONFIG = ''
+if(process.env.NODE_ENV === 'development'){
+    // 开发环境
+    // URL_CONFIG = 'http://192.168.2.75:18002'	 //采美测试地址
+	URL_CONFIG = 'https://core-b.caimei365.com'
+}else{
+    // 生产环境
+	URL_CONFIG = 'https://core.caimei365.com'
+}
+export default URL_CONFIG

services/public.service.js

@@ -11,13 +11,68 @@ export default class PublicService {
 	 * platformType:小程序 2  WWW 0  CRM 1 
 	 */
 	GetImgVerifyCode (data = {platformType:2}) {
-		return this.AjaxService.get({ url:'/user/getImgVerifyCode', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/user/captcha', 
+			data, 
+			isLoading: true,
+			isHost:true
+		})
 	}
 	/**
 	 * 获取图形验证码
 	 * activateCodeType:机构 2  供应商 3 找回密码 1 
 	 */
 	GetMobileCode (data = {}) {
-		return this.AjaxService.get({ url:'/user/activateCodeByReg', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/user/activateCodeByReg', 
+			data, 
+			isLoading: true 
+		})
 	}
-}
+	/**
+	 * 获取图形验证码
+	 * activateCodeType:机构 2  供应商 3 找回密码 1 
+	 */
+	GetMobileCode (data = {}) {
+		return this.AjaxService.get({ 
+			url:'/user/activateCodeByReg', 
+			data, 
+			isLoading: true 
+		})
+	}
+	/**
+	 * 获取手机短信验证码
+	 * isCheckCaptcha 	是否需要图形验证码：1:检查 , 0：不检查
+	 * mobile			手机号
+	 * activateCodeType 短信类型 :1:找回密码, 2:手机号注册机构, 3:供应商注册
+	 * imgCode          图片验证码
+	 * token            图片验证码token
+	 * platformType: 	来源：0:www，1:crm/h5，2:小程序
+	 */
+	GetRegisterMobileCode (data = {}) {
+		return this.AjaxService.get({ 
+			url:'/user/sms/code', 
+			data, 
+			isLoading: true,
+			isHost:true
+		})
+	}
+	/**
+	 * 获取手机短信验证码
+	 * bindMobile 		机构手机号
+	 * isCheckCaptcha 	是否需要图形验证码：1:检查 , 0：不检查
+	 * mobile			运营人员手机号
+	 * activateCodeType 短信类型 :1:找回密码, 2:手机号注册机构, 3:供应商注册
+	 * imgCode          图片验证码
+	 * token            图片验证码token
+	 * platformType: 	来源：0:www，1:crm/h5，2:小程序
+	 */
+	GetBindMobileCode (data = {}) {
+		return this.AjaxService.get({ 
+			url:'/user/sms/bind', 
+			data, 
+			isLoading: true,
+			isHost:true
+		})
+	}
+}	

services/shop.service.js

@@ -8,7 +8,12 @@ export default class ShopService {
 	}
 	/* 小程序-供应商注册第一步 */
 	SupplierAppletsRegistered (data = {}) {
-		return this.AjaxService.post({ url:'/supplier/appletsRegistered', data, isLoading: true })
+		return this.AjaxService.post({ 
+			url:'/user/register/shop', 
+			data, 
+			isLoading: true,
+			isHost:true
+		})
 	}
 	/* 小程序-搜索供应商列表 */
 	GetSearchSupplierList (data = {}) {

services/user.service.js

@@ -6,13 +6,34 @@ export default class UserService {
 		Object.assign(this, { AjaxService })
 		this.name = 'UserService'
 	}
-	/* 供应商注册 */ 
-	appSupplierRegister (data = {}) {
-		return this.AjaxService.post({ url:'/supplier/register', data, isLoading: true })
+	/* 初始化授权登录 */
+	UserLoginAuthApplets (data = {}) {
+		return this.AjaxService.post({
+			// url: '/club/authorization',
+			url: '/user/login/auth/applets',
+			data,
+			isLoading: false,
+			isStatus: true,
+			isHost:true
+		})
+	}
+	/* 普通机构注册 */
+	UserRegisterClub (data = {}) {
+		return this.AjaxService.post({ 
+			url:'/user/register/club', 
+			data, 
+			isLoading: true,
+			isHost:true
+		})
 	}
-	/* 初始化查询用户是否为正常用户 */ 
-	appSelectLoginUser (data = {}) {
-		return this.AjaxService.post({ url:'', data, isLoading: true })
+	/* 供应商注册 */ 
+	SupplierAppletsRegistered (data = {}) {
+		return this.AjaxService.post({ 
+			url:'/user/register/shop', 
+			data, 
+			isLoading: true,
+			isHost:true
+		})
 	}
 	/**
 	 * 账号登录
@@ -21,7 +42,78 @@ export default class UserService {
 	 * @param source 来源 PC与小程序传:'www'crm就传'crm'
 	 */
 	AorganizationLogin (data = {}) {
-		return this.AjaxService.post({ url:'/user/login', data, isLoading: true ,isStatus: true})
+		return this.AjaxService.post({ 
+			url:'/user/login/password', 
+			data, 
+			isLoading: true ,
+			isStatus: true,
+			isHost:true
+		})
+	}
+	/* 查询机构资料*/
+	OrganizationUpdateModifyInfo (data = {}) {
+		return this.AjaxService.get({ 
+			url:'/user/club/info',
+			data, 
+			isLoading: true,
+			isHost:true
+		})
+	}
+	/* 机构升级会员机构 */
+	OrganizationRegister (data = {}) {
+		return this.AjaxService.post({ 
+			url:'/user/register/club/upgrade', 
+			data, 
+			isLoading: true,
+			isHost:true
+		})
+	}
+	/* 机构提交资料修改 */
+	OrganizationUpdate (data = {}) {
+		return this.AjaxService.post({ 
+			url:'/user/club/info/update', 
+			data, 
+			isLoading: true,
+			isHost:true
+		})
+	}
+	/* 供应商资料信息-数据回显 */
+	SupplierShopInfo (data = {}) {
+		return this.AjaxService.get({ 
+			url:'/user/shop/info', 
+			data, 
+			isLoading: true,
+			isHost:true
+		})
+	}
+	/* 供应商修改申请信息保存 */
+	SupplierUpdateCompanyInfo (data = {}) {
+		return this.AjaxService.post({ 
+			url:'/user/register/shop/apply', 
+			data, 
+			isLoading: true,
+			isHost:true
+		})
+	}
+	/* 供应商资料信息-提交修改 */
+	SupplierModifiedData (data = {}) {
+		return this.AjaxService.post({ 
+			url:'/user/shop/info/update', 
+			data, 
+			isLoading: true,
+			isHost:true
+		})
+	}
+	/**
+	 *运营人员绑定微信
+	 */
+	BindingWechat (data = {}) {
+		return this.AjaxService.post({ 
+			url:'/user/login/auth/bind', 
+			data, 
+			isLoading: true,
+			isHost:true
+		})
 	}
 	/**
 	 * @机构-地址列表
@@ -71,30 +163,5 @@ export default class UserService {
 	PostUpdateOperatorCode (data = {}) {
 		return this.AjaxService.post({ url:'/operation/updateInvitationCode', data, isLoading: true })
 	}
-	/* 机构资料*/
-	OrganizationUpdateModifyInfo (data = {}) {
-		return this.AjaxService.get({ url:'/user/club/applicationData', data, isLoading: true })
-	}
-	/* 机构升级会员机构 */
-	OrganizationRegister (data = {}) {
-		return this.AjaxService.post({ url:'/club/upgrade', data, isLoading: true })
-	}
-	/* 机构提交资料修改 */
-	OrganizationUpdate (data = {}) {
-		return this.AjaxService.post({ url:'/operation/modifiedData', data, isLoading: true })
-	}
-	/* 供应商资料信息-数据回显 */
-	SupplierShopInfo (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/shopInfo', data, isLoading: true })
-	}
-	/* 供应商资料信息-提交修改 */
-	SupplierModifiedData (data = {}) {
-		return this.AjaxService.post({ url:'/supplier/modifiedData', data, isLoading: true })
-	}
-	/* 供应商修改申请信息保存 */
-	SupplierUpdateCompanyInfo (data = {}) {
-		return this.AjaxService.post({ url:'/supplier/updateCompanyInfo', data, isLoading: true })
-	}
-	
 	
 }

supplier/pages/order/order-list.vue

@@ -327,7 +327,7 @@
 		},
 		onShow(){
 			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.listQuery.shopID = this.shopID = resolve.shopID
+				this.listQuery.shopID = this.shopID = resolve.shopId
 				this.getOrderDatainit()
 			})
 		}	

supplier/pages/user/information.vue

@@ -10,7 +10,7 @@
 			</view>
 			<view class="info-from">
 				<view class="label">公司简称</view>
-				<input class="row-input" type="text" v-model="params.sname" placeholder="请输入公司简称" placeholder-class="placeholder" maxlength="10"/>
+				<input class="row-input" type="text" v-model="params.shortName" placeholder="请输入公司简称" placeholder-class="placeholder" maxlength="10"/>
 			</view>
 			<view class="info-from">
 				<view class="label">公司地址</view>
@@ -49,7 +49,7 @@
 			</view>
 			<view class="info-from">
 				<view class="label">公司性质</view>
-				<input class="row-input" v-model="params.nature" type="text" placeholder="请填写公司性质" placeholder-class="placeholder"/>
+				<input class="row-input" v-model="params.companyNature" type="text" placeholder="请填写公司性质" placeholder-class="placeholder"/>
 			</view>
 			<view class="info-from">
 				<view class="label">年营业额</view>
@@ -79,8 +79,8 @@
 			<view class="zizhi" v-if="params.secondShopType==3">
 				<view class="info2-title zizhi-title">资质</view>
 				<view class="uploadImage">
-					 <view class="form-upload-image"  v-if="params.medicalPracticeLicenseImg1!=''&&params.medicalPracticeLicenseImg1!=null">
-						   <image class="upload-img" :src="params.medicalPracticeLicenseImg1" alt="" ></image>
+					 <view class="form-upload-image"  v-if="params.medicalPracticeLicense!=''&&params.medicalPracticeLicense!=null">
+						   <image class="upload-img" :src="params.medicalPracticeLicense" alt="" ></image>
 						   <view class="iconfont icon-shanchu1" @click="deleteMedicalImage()"></view>
 					 </view>
 					 <view class="formLine-file" @click="uploadzizhiImageFn" v-else>
@@ -124,11 +124,11 @@
 			</view>
 			<view class="info">
 				<view class="info2-title">公司介绍</view>
-				 <textarea  v-model="params.info"  maxlength="2000" placeholder="公司简介会在公司介绍页面展示，有助于机构更好的了解您， 建议从个人规模、代理产品、机构服务、荣誉资质这4方面进行介绍" placeholder-class="placeholder" name="textarea"/>
+				 <textarea  v-model="params.shopDesc"  maxlength="2000" placeholder="公司简介会在公司介绍页面展示，有助于机构更好的了解您， 建议从个人规模、代理产品、机构服务、荣誉资质这4方面进行介绍" placeholder-class="placeholder" name="textarea"/>
 			</view>
 			<view class="info">
 				<view class="info2-title">主打系列商品说明</view>
-				 <textarea placeholder="请输入主打系列商品说明" v-model="params.productDesc" maxlength="500" placeholder-class="placeholder" name="textarea"/>
+				 <textarea placeholder="请输入主打系列商品说明" v-model="params.mainProductDesc" maxlength="500" placeholder-class="placeholder" name="textarea"/>
 			</view>
 		</view>
 		
@@ -143,8 +143,8 @@
 			<view class="zizhi">
 				<view class="info2-title zizhi-title">营业执照图片</view>
 				<view class="uploadImage">
-					 <view class="form-upload-image"  v-if="params.businessLicenseImage!=''&&params.businessLicenseImage!=null">
-						   <image class="upload-img" :src="params.businessLicenseImage" @click="showViewerImageFn()" ></image>
+					 <view class="form-upload-image"  v-if="params.businessLicense!=''&&params.businessLicense!=null">
+						   <image class="upload-img" :src="params.businessLicense" @click="showViewerImageFn()" ></image>
 						   <view class="iconfont icon-shanchu1" @click="deleteBusinessImage()"></view>
 					 </view>
 					 <view class="formLine-file" @click="uploadBusinessLicenseImageFn" v-else>
@@ -167,8 +167,8 @@
 			<view class="zizhi">
 				<view class="info2-title zizhi-title">生产许可证</view>
 				<view class="uploadImage">
-					 <view class="form-upload-image"  v-if="params.productionLicence!=''&&params.productionLicence!=null">
-						   <image class="upload-img" :src="params.productionLicence" alt="" @click="showViewerImageFn2()"></image>
+					 <view class="form-upload-image"  v-if="params.operationLicence!=''&&params.operationLicence!=null">
+						   <image class="upload-img" :src="params.operationLicence" alt="" @click="showViewerImageFn2()"></image>
 						   <view class="iconfont icon-shanchu1" @click="deleteproducImage()"></view>
 					 </view>
 					 <view class="formLine-file" @click="uploadproductionLicenceImageFn" v-else>
@@ -255,20 +255,20 @@
 				issecondshow:false,
 				addressData:{
 					address:'请选择公司所在地区',
-					townID:'',			//区ID
-					cityID:'',			//区ID
-					provinceID:'',		//区ID
+					townId:'',			//区ID
+					cityId:'',			//区ID
+					provinceId:'',		//区ID
 					addressDetail: '',	//地址
 				},
 				typename:[
-					{name:'医疗',value:'1'},
-					{name:'非医疗',value:'2'}
+					{name:'医疗',value:1},
+					{name:'非医疗',value:2}
 				],
 				secondtype:[
-					{name:'一类器械',value:'1'},
-					{name:'二类器械',value:'2'},
-					{name:'三类器械',value:'3'},
-					{name:'其它',value:'4'}
+					{name:'一类器械',value:1},
+					{name:'二类器械',value:2},
+					{name:'三类器械',value:3},
+					{name:'其它',value:4}
 				],
 				mentuzCampNullList:[
 					{value:'1',name:'产品'},
@@ -291,37 +291,37 @@
 					{value:'13',name:'纤体减肥'}
 				],
 				params:{
-					userID:'',
-					shopID:'',
-					townID:'',
-					provinceID: '',//省id
-					cityID: '',
+					userId:'',
+					shopId:'',
+					townId:'',
+					provinceId: '',//省id
+					cityId: '',
 					address:'',
 					name:'',//公司名称
-					sname:'',//公司简称
+					shortName:'',//公司简称
 					linkMan:'',//联系人
 					email:'',//
 					contractPhone:'',//固定电话
 					fax:'',//传真
 					legalPerson:'',//法人代表
 					registeredCapital:'',//注册资本
-					nature:'',//公司性质
+					companyNature:'',//公司性质
 					turnover:'',//年营业额
 					firstShopType:'',//公司类型 1医疗  2非医疗
 					secondShopType:'',//医疗下的二级分类
-					medicalPracticeLicenseImg1:'',//资质
-					mainpro:'',//主营产品
+					medicalPracticeLicense:'',//资质
+					mainProduct:'',//主营产品
 					businessScope:'',//经营内容
-					info:'',//公司介绍
-					productDesc:'',//主打说明
-					medicalPracticeLicenseImg1:'',//三级器械/医疗执照
+					shopDesc:'',//公司介绍
+					mainProductDesc:'',//主打说明
+					medicalPracticeLicense:'',//三级器械/医疗执照
 					socialCreditCode:'',//营业执照编号
-					businessLicenseImage:'',//营业执照
+					businessLicense:'',//营业执照
 					logo:'',//公司logo
-					productionLicence:'',//生产
+					operationLicence:'',//生产
 					hygienicLicense:'',//卫生
 					taxLicense:'',//税务
-					certificateHonor:'',//荣誉
+					honorCertification:'',//荣誉
 					productCertification:'',//产品
 				},
 				mentuzCampList:[],
@@ -345,7 +345,7 @@
 		methods:{
 			chooseMaleLike(e){
 				this.isMainproCheck = true
-				this.params.mainpro = this.checkLikes(e,this.mentuzCampList)
+				this.params.mainProduct = this.checkLikes(e,this.mentuzCampList)
 			},
 			chooseMaleLikes(e){
 				this.isMainproCheck = true
@@ -377,23 +377,23 @@
 			},
 		  shopInfo(){
 			  this.$api.getStorage().then((resolve) =>{
-				  this.params.userID = resolve.userID;
-				  this.params.shopID = resolve.shopID;
+				  this.params.userId = resolve.userId;
+				  this.params.shopId = resolve.shopId;
 				  	console.log(resolve)
-				  this.UserService.SupplierShopInfo({userId:this.params.userID}).then(response =>{
+				  this.UserService.SupplierShopInfo({userId:this.params.userId}).then(response =>{
 					if(response.code==0){
 						console.log(response)
 						let shop = response.data.shop;
 						let user = response.data.user;
 						this.params.name = shop.name;
-						this.params.sname = shop.sname;
+						this.params.shortName = shop.shortName;
 						this.params.linkMan = shop.linkMan;
 						this.params.email = user.email;
 						this.addressData.address =  shop.provincialAddress;
 						this.params.address = shop.address;
-						this.params.provinceID = shop.provinceID;
-						this.params.cityID = shop.cityID;
-						this.params.townID = shop.townID;
+						this.params.provinceId = shop.provinceId;
+						this.params.cityId = shop.cityId;
+						this.params.townId = shop.townId;
 						if(shop.contractPhone!=""&&shop.contractPhone!=null){
 							this.params.contractPhone = shop.contractPhone;
 						}
@@ -402,32 +402,32 @@
 						}
 						this.params.legalPerson = shop.legalPerson;
 						this.params.registeredCapital = shop.registeredCapital;
-						this.params.nature = shop.nature;
+						this.params.companyNature = shop.companyNature;
 						this.params.turnover = shop.turnover;
 						this.params.firstShopType = shop.firstShopType ? shop.firstShopType:'';
 						this.params.secondShopType = shop.secondShopType ? shop.secondShopType : '';
-						this.params.medicalPracticeLicenseImg1 = shop.medicalPracticeLicenseImg1;
-						this.params.info = shop.info;
-						this.params.productDesc = shop.productDesc;
+						this.params.medicalPracticeLicense = shop.medicalPracticeLicense;
+						this.params.shopDesc = shop.shopDesc;
+						this.params.mainProductDesc = shop.mainProductDesc;
 						this.params.socialCreditCode = shop.socialCreditCode;
-						this.params.businessLicenseImage = shop.businessLicenseImage;
+						this.params.businessLicense = shop.businessLicense;
 						this.params.logo = shop.logo;
-						this.params.productionLicence = shop.productionLicence;
+						this.params.operationLicence = shop.operationLicence;
 						this.params.hygienicLicense = shop.hygienicLicense;
 						this.params.taxLicense = shop.taxLicense;
-						this.HonorImagesList = response.data.certificateHonor;
+						this.HonorImagesList = response.data.honorCertification;
 						this.productImagesList = response.data.productCertification;
-						if( response.data.certificateHonor!=''&& response.data.certificateHonor!=null){
-							this.params.certificateHonor =this.HonorImagesList.toString()+',';
+						if( response.data.honorCertification!=''&& response.data.honorCertification!=null){
+							this.params.honorCertification =this.HonorImagesList.toString()+',';
 						}
 						if( response.data.productCertification!=''&& response.data.productCertification!=null){
 							this.params.productCertification =this.productImagesList.toString()+',';
 						}
-						if(shop.mainpro == "" || shop.mainpro == null){
+						if(shop.mainProduct == "" || shop.mainProduct == null){
 							this.mentuzCampList = this.mentuzCampNullList
 						}else{
-							this.mentuzCampList = this.setNewMainpro(shop.mainpro)
-							this.params.mainpro = shop.mainpro
+							this.mentuzCampList = this.setNewMainpro(shop.mainProduct)
+							this.params.mainProduct = shop.mainProduct
 						}
 						if(shop.businessScope == "" || shop.businessScope == null){
 								this.medicaCampList = this.medicaCampNullList
@@ -440,11 +440,10 @@
 				 })
 			 },
 			shopSubmit(){//提交修改
-				console.log(this.params);
 				if(this.params.name==''||this.params.name==null){
 					this.$util.msg('请输入公司名称',2000);
 					return
-				}else if(this.params.townID==''||this.params.townID==null){
+				}else if(this.params.townId==''||this.params.townId==null){
 					this.$util.msg('请选择联系地址',2000);
 					return
 				}else if(this.params.address==''||this.params.address==null){
@@ -459,7 +458,7 @@
 				}else if(this.params.registeredCapital==''||this.params.registeredCapital==null){
 					this.$util.msg('请输入注册资本',2000);
 					return
-				}else if(this.params.nature==''||this.params.nature==null){
+				}else if(this.params.companyNature==''||this.params.companyNature==null){
 					this.$util.msg('请输入公司性质',2000);
 					return
 				}else if(this.params.turnover==''||this.params.turnover==null){
@@ -471,28 +470,28 @@
 				}else if(this.params.firstShopType==1 && this.params.secondShopType==""){
 					this.$util.msg('请选择公司类型',2000);
 					return
-				}else if(this.params.mainpro==''||this.params.mainpro==null){
+				}else if(this.params.mainProduct==''||this.params.mainProduct==null){
 					this.$util.msg('请选择主营内容',2000);
 					return
 				}else if(this.params.businessScope==''||this.params.businessScope==null){
 					this.$util.msg('请选择经营内容',2000);
 					return
-				}else if(this.params.info==''||this.params.info==null){
+				}else if(this.params.shopDesc==''||this.params.shopDesc==null){
 					this.$util.msg('请填写公司介绍',2000);
 					return
-				}else if(this.params.productDesc==''||this.params.productDesc==null){
+				}else if(this.params.mainProductDesc==''||this.params.mainProductDesc==null){
 					this.$util.msg('请填系列商品说明',2000);
 					return
 				}else if(this.params.socialCreditCode==''||this.params.socialCreditCode==null){
 					this.$util.msg('请输入正确的统一社会信用代码',2000);
 					return
-				}else if(this.params.businessLicenseImage==''||this.params.businessLicenseImage==null){
+				}else if(this.params.businessLicense==''||this.params.businessLicense==null){
 					this.$util.msg('请上传营业执照图片',2000);
 					return
 				}else if(this.params.logo==''||this.params.logo==null){
 					this.$util.msg('请上传公司logo',2000);
 					return
-				}else if(this.params.productionLicence==''||this.params.productionLicence==null){
+				}else if(this.params.operationLicence==''||this.params.operationLicence==null){
 					this.$util.msg('请上传生产许可证',2000);
 					return
 				}else if(this.params.hygienicLicense==''||this.params.hygienicLicense==null){
@@ -501,7 +500,7 @@
 				}else if(this.params.taxLicense==''||this.params.taxLicense==null){
 					this.$util.msg('请上传税务许可证',2000);
 					return
-				}else if(this.params.certificateHonor==''||this.params.certificateHonor==null){
+				}else if(this.params.honorCertification==''||this.params.honorCertification==null){
 					this.$util.msg('请上传荣誉证书',2000);
 					return
 				}else if(this.params.productCertification==''||this.params.productCertification==null){
@@ -573,13 +572,13 @@
 				this.myPreviewImageFn(this.params.hygienicLicense)
 			},
 			showViewerImageFn2(e) {//预览生产
-				this.myPreviewImageFn(this.params.productionLicence)
+				this.myPreviewImageFn(this.params.operationLicence)
 			},
 			showViewerImageFn1(e) {//预览logo
 				this.myPreviewImageFn(this.params.logo)
 			},
 			showViewerImageFn(e) {//预览营业执照
-				this.myPreviewImageFn(this.params.businessLicenseImage)
+				this.myPreviewImageFn(this.params.businessLicense)
 			},
 			myPreviewImageFnlist(arr){//多张预览
 				this.isPreviewImage = true;
@@ -598,72 +597,74 @@
 				});
 			},
 			uploadproductImageFn(event){//产品证书
-					 uploadFileImage().then(res =>{
-						 this.productImagesList.push(JSON.parse(res.data).data);
-						 this.params.productCertification =this.productImagesList.toString()+',';
-					 })
-			       },
-			 uploadHonorImageFn(event){//荣誉证书上传
-					 uploadFileImage().then(res =>{
-						 this.HonorImagesList.push(JSON.parse(res.data).data);
-						 this.params.certificateHonor =this.HonorImagesList.toString()+',';
-					 })
-			        },
+				uploadFileImage().then(res =>{
+					let imagePath = JSON.parse(res.data).data;
+					this.productImagesList.push(imagePath);
+					this.params.productCertification =this.productImagesList.toString()+',';
+				 })
+			},
+			uploadHonorImageFn(event){//荣誉证书上传
+				uploadFileImage().then(res =>{
+					let imagePath = JSON.parse(res.data).data;
+					this.HonorImagesList.push(imagePath);
+					this.params.honorCertification =this.HonorImagesList.toString()+',';
+				})
+			},
 			 uploadlogoImageFn(event){//上传公司logo
-					uploadFileImage().then(res =>{
-						this.params.logo = JSON.parse(res.data).data;
-					})
+				uploadFileImage().then(res =>{
+					this.params.logo = JSON.parse(res.data).data;
+				})
 			},
 			uploadproductionLicenceImageFn(event){//上传生产
-					uploadFileImage().then(res =>{
-						this.params.productionLicence = JSON.parse(res.data).data;
-					})
+				uploadFileImage().then(res =>{
+					this.params.operationLicence = JSON.parse(res.data).data;
+				})
 			},
 			 uploadhygienicLicenseImageFn(event){//上传卫生
-					uploadFileImage().then(res =>{
-						this.params.hygienicLicense = JSON.parse(res.data).data;
-					})
+				uploadFileImage().then(res =>{
+					this.params.hygienicLicense = JSON.parse(res.data).data;
+				})
 			},
 			 uploadtaxLicenseImageFn(event){//上传税务
-				   uploadFileImage().then(res =>{
-					this.params.taxLicense = JSON.parse(res.data).data;
-				   })
+			   uploadFileImage().then(res =>{
+				this.params.taxLicense = JSON.parse(res.data).data;
+			   })
 			},
 			uploadBusinessLicenseImageFn(event){//上传营业执照图片
-					uploadFileImage().then(res =>{
-						this.params.businessLicenseImage = JSON.parse(res.data).data;
-					})
+				uploadFileImage().then(res =>{
+					this.params.businessLicense = JSON.parse(res.data).data;
+				})
 			},
 			uploadzizhiImageFn(event){//上传医疗图片
-					uploadFileImage().then(res =>{
-						this.params.medicalPracticeLicenseImg1 = JSON.parse(res.data).data;
-					})
+				uploadFileImage().then(res =>{
+					this.params.medicalPracticeLicense = JSON.parse(res.data).data;
+				})
 			},
-			 removeGoodsImagesFn(index){//删除荣誉图片
+			removeGoodsImagesFn(index){//删除荣誉图片
 					this.HonorImagesList.splice(index,1);
-					this.params.certificateHonor = this.HonorImagesList.toString()+',';
-				 },
+					this.params.honorCertification = this.HonorImagesList.toString()+',';
+			},
 			removeproductImagesFn(index){//删除产品图片
 				this.productImagesList.splice(index,1);
 				this.params.productCertification = this.productImagesList.toString()+',';
 			 },
 			deletaxImage(){//删除卫生
 			      this.params.taxLicense = '';
-			   },
+			},
 			 deletehygienicImage(){//删除卫生
 				this.params.hygienicLicense = '';
 			},
 			deleteproducImage(){//删除生产
-				this.params.productionLicence = '';
+				this.params.operationLicence = '';
 			},
 			 deletelogoImage(){//删除logo图片
 				this.params.logo = '';
 			},
 			 deleteBusinessImage(){//删除营业执照图片
-				this.params.businessLicenseImage = '';
+				this.params.businessLicense = '';
 			},
 			 deleteMedicalImage(){//删除商品图片
-			   this.medicalPracticeLicenseImg1 = '';
+			   this.medicalPracticeLicense = '';
 			 },
 			secondypeRidio(item){
 				this.params.secondShopType = item.value;
@@ -680,12 +681,12 @@
 			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.params.townID = this.addressData.townID;
-				this.params.provinceID = this.addressData.provinceID;
-				this.params.cityID = this.addressData.cityID;
+				this.addressData.townId = e.townCode;
+				this.addressData.cityId = e.cityCode;
+				this.addressData.provinceId = e.provinceCode;
+				this.params.townId = this.addressData.townId;
+				this.params.provinceId = this.addressData.provinceId;
+				this.params.cityId = this.addressData.cityId;
 				this.params.address = this.addressData.address;
 			},
 			onConfirmbrand(e){

supplier/pages/user/my-product.vue

@@ -207,7 +207,7 @@
 					break;
 			}
 			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.listQuery.shopID = this.shopID = resolve.shopID
+				this.listQuery.shopID = this.shopID = resolve.shopId
 				this.GetProductListInfo()
 				this.GetPrimaryClassification()
 			})

supplier/pages/user/my-shop.vue

@@ -285,8 +285,8 @@
 			}
 			this.listQuery.id = this.supplierId = option.shopId
 			this.$api.getStorage().then((resolve) =>{
-				this.shopId = resolve.shopID ? resolve.shopID : 0
-				this.userID = resolve.userID ? resolve.userID : 0
+				this.shopId = resolve.shopId ? resolve.shopId : 0
+				this.userID = resolve.userId ? resolve.userId : 0
 				this.userIdentity = resolve.userIdentity
 				this.InitShopDataInfo()
 			}).catch( error =>{

supplier/pages/user/operator/addoperator.vue

@@ -67,8 +67,9 @@
 		},
 		onShow() {
 			this.$api.getStorage().then((resolve) =>{
-				this.params.userID = resolve.userID
-				this.params.shopID = resolve.shopID
+				this.params.userID = resolve.userId ? resolve.userId : 0
+				this.params.shopID = resolve.shopId ? resolve.shopId : 0 
+				
 			})
 		}
 	}

supplier/pages/user/operator/list.vue

@@ -29,8 +29,8 @@
 						<view class="list-left">
 							<view class="list-head"><image :src="item.headimgurl ? item.headimgurl : defalutLogo" mode=""></image></view>
 							<view class="list-tel">
-								<text class="txt">{{item.linkName}}</text>
-								<text class="txt">{{item.mobile}}</text>
+								<text class="txt">{{ item.linkName ? item.linkName : '' }}</text>
+								<text class="txt">{{ item.mobile ? item.mobile : '' }}</text>
 							</view>
 						</view>
 						<view class="list-opea">
@@ -139,7 +139,7 @@
 			},
 			GetHomePageData(){//初始化供应商信息
 				this.$api.getStorage().then((resolve) =>{
-					this.userId = resolve.userID
+					this.userId = resolve.userId ? resolve.userId : 0
 					this.ShopService.GetHomePageData({userId:this.userId}).then(response =>{
 						console.log(response)
 						let data = response.data

supplier/pages/user/setting/phone.vue

@@ -153,7 +153,7 @@
 		},
 		onShow() {
 			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID
+				this.userID = resolve.userId ? resolve.userId : 0
 			})
 		}
 	}

supplier/pages/user/setting/setting.vue

@@ -31,7 +31,7 @@
 		methods:{
 			initSetting(){
 				this.$api.getStorage().then((resolve) =>{
-					this.ShopService.GetHomePageData({userId:resolve.userID}).then(response =>{
+					this.ShopService.GetHomePageData({userId:resolve.userId}).then(response =>{
 						this.bindMobile=response.data.user.bindMobile
 					}).catch(error =>{
 						this.$util.msg(error.msg,2000)