commit -m 微服务

App.vue

@@ -70,8 +70,11 @@
 			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)
+				this.UserService.UserLoginAuthApplets({ 
+					code:wechatCode,
+					encryptedData:getUserInfo.encryptedData,
+					iv:getUserInfo.iv
+				})
 				.then(response =>{
 					this.$store.commit('updateStatus',response.data)
 					this.login(response.data);

api/use.js

@@ -114,22 +114,6 @@ export function personalInfo(params) {
 		})
 	})
 }
-/**
- *取消提示
- * userId
- */
-export function cancelPrompt(params) {
-	return new Promise(function(resolve,reject) {
-		request.post('/personalCenter/cancelPrompt',params,false, res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-
 /**
  *获取账户余额明细
  */

common/config/authorize.js

@@ -72,6 +72,7 @@ const getCode = provider => {
         uni.login({
             provider: provider,
             success: function(loginRes) {
+				console.log(loginRes)
                 if (loginRes && loginRes.code) { 
 					resolve(loginRes.code) 
 				} else {
@@ -81,7 +82,10 @@ const getCode = provider => {
 					})
 				}
             },
-			fail:function(){ reject("获取code失败")}
+			fail:function(error){ 
+				console.log(err)
+				reject("获取code失败")
+			}
         });
     })
 }
@@ -96,7 +100,8 @@ const getSetting = function() {
                 if(authSetting['scope.userInfo']===false){resolve(0);return;}//拒绝授权
                 resolve(2) //2未操作
             },
-            fail:function() { 
+            fail:function(error) { 
+				console.log(error)
 				reject("获取用户授权失败") 
 			}
         })

common/config/wxLogin.js

@@ -9,8 +9,11 @@ const newUserService = new UserService(ajaxService)
 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)
+	newUserService.UserLoginAuthApplets({ 
+		code:wechatCode,
+		encryptedData:getUserInfo.encryptedData,
+		iv:getUserInfo.iv
+	})
 	.then(response =>{
 		store.commit('updateStatus',response.data)
 		store.commit('login',response.data);
@@ -28,8 +31,12 @@ const wxLoginAuthorize = async function(){
 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)
+		const params = 
+		newUserService.UserLoginAuthApplets({ 
+			code:wechatCode,
+			encryptedData:getUserInfo.encryptedData,
+			iv:getUserInfo.iv
+		})
 		.then(response =>{
 			console.log(response)
 			store.commit('updateStatus',response.data)

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

@@ -176,7 +176,7 @@
 					this.userId = resolve.userId ? resolve.userId : 0
 					this.SellerService.GetSellerHome({userId:this.userId}).then(response =>{
 						let sellerData = response.data
-						this.name = sellerData.seller.linkMan?sellerData.seller.linkMan:'' 	//协销名称
+						this.name = sellerData.seller.linkMan1?sellerData.seller.linkMan1:'' 	//协销名称
 						this.headpic = sellerData.seller.logo //会所头像
 						this.beforeConfirmCount = this.showBadge(sellerData.beforeConfirmCount)//待付款
 						this.beforePayCount = this.showBadge(sellerData.beforePayCount)//待付款

main.js

@@ -26,32 +26,34 @@ Vue.prototype.$getStorage = function(key){
  * 友盟+小程序统计
  */
 // #ifdef MP-WEIXIN
-// import { umtrackWxKey } from '@/utils/config.js'
-// import uma from 'umtrack-wx';
-// uma.init({
-// 	appKey: umtrackWxKey, //由友盟分配的APP_KEY
-// 	// 使用Openid进行统计，此项为false时将使用友盟+uuid进行用户统计。
-// 	// 使用Openid来统计微信小程序的用户，会使统计的指标更为准确，对系统准确性要求高的应用推荐使用Openid。
-// 	useOpenid: true,
-// 	// 使用openid进行统计时，是否授权友盟自动获取Openid，
-// 	// 如若需要，请到友盟后台"设置管理-应用信息"(https://mp.umeng.com/setting/appset)中设置appId及secret
-// 	autoGetOpenid: true,
-// 	debug: true, //是否打开调试模式
-// 	uploadUserInfo: false // 自动上传用户信息，设为false取消上传，默认为false
-// });
-// uma.install = function (Vue) {
-// 	Vue.prototype.$uma = uma;
-// }
+import { umtrackWxKey } from '@/utils/config.js'
+import uma from 'umtrack-wx';
+if(process.env.NODE_ENV != 'development'){
+	uma.init({
+		appKey: umtrackWxKey, //由友盟分配的APP_KEY
+		// 使用Openid进行统计，此项为false时将使用友盟+uuid进行用户统计。
+		// 使用Openid来统计微信小程序的用户，会使统计的指标更为准确，对系统准确性要求高的应用推荐使用Openid。
+		useOpenid: true,
+		// 使用openid进行统计时，是否授权友盟自动获取Openid，
+		// 如若需要，请到友盟后台"设置管理-应用信息"(https://mp.umeng.com/setting/appset)中设置appId及secret
+		autoGetOpenid: true,
+		debug: true, //是否打开调试模式
+		uploadUserInfo: false // 自动上传用户信息，设为false取消上传，默认为false
+	});
+	uma.install = function (Vue) {
+		Vue.prototype.$uma = uma;
+	}
+	Vue.use(uma);
+}
 // #endif
 
-
+// Vue实例化
 Vue.config.productionTip = false
 Vue.prototype.$fire = new Vue();
 Vue.prototype.$store = store;
 Vue.prototype.$util = {msg,prePage,modal};
 Vue.prototype.$api = Api;
 Vue.prototype.$reg = Regs;
-// Vue.use(uma);
 App.mpType = 'app'
 
 const app = new Vue({

pages/login/apply.vue

@@ -261,8 +261,8 @@
 					addressDetail: '',	//地址详情
 				},
 				typename:[
-					{name:'医美',value:'1'},
-					{name:'生美',value:'2'}
+					{name:'医美',value:1},
+					{name:'生美',value:2}
 				],
 			}	
 		},
@@ -288,9 +288,14 @@
 						if(organizationUser.auditNoteList!=null){
 							this.errorList =organizationUser.auditNoteList
 						}
-						this.contractEmail = organizationUser.contractEmail	
+						this.contractEmail = organizationClub.contractEmail	
+						console.log(this.contractEmail)
 						this.clubId = organizationUser.clubId
-						this.clubName = this.$reg.checkData(organizationClub.name)
+						if(this.contractEmail){
+							this.clubName = this.$reg.checkData(organizationClub.name)
+						}else{
+							this.clubName = ''
+						}
 						this.shortName = this.$reg.checkData(organizationClub.shortName)
 						if( organizationClub.provinceId==''||organizationClub.provinceId==null){
 							this.addressData.provinceId = ''
@@ -307,7 +312,6 @@
 						}else{
 							this.addressData.townId = organizationClub.townId
 						}
-						console.log('66666666666666')
 						this.addressData.address = organizationClub.provincialAddress ? organizationClub.provincialAddress:'请选择机构所在地区'
 						this.addressData.addressDetail = this.$reg.checkData(organizationClub.address)
 						this.socialCreditCode = this.$reg.checkData(organizationClub.socialCreditCode)
@@ -319,11 +323,11 @@
 						this.department = this.$reg.checkData(organizationClub.department)		
 						//机构类型&&主营项目
 						switch(this.firstClubType){
-							case '1':
+							case 1:
 								this.organizationTypeText = '医美'
 								this.isOrganizationType = 1
 								break;
-							case '2':
+							case 2:
 								this.organizationTypeText = '生美'
 								this.isOrganizationType = 2
 								break;
@@ -336,7 +340,7 @@
 							this.mentuzCampList = this.mentuzCampNullList
 							this.medicaCampList = this.medicaCampNullList
 						}else{
-							if(this.firstClubType == '1'){
+							if(this.firstClubType == 1){
 								this.mentuzCampList = this.setNewMainpro(organizationClub.mainProduct)
 								this.medicaCampList = this.medicaCampNullList							
 							}else{
@@ -347,9 +351,9 @@
 						}
 						//机构类型
 						switch(this.secondClubType){
-							case '1':this.current = 0;break;
-							case '2':this.current = 1;this.isDepartment=true;break;
-							case '3':this.current = 2;this.isDepartment=true;break;
+							case 1:this.current = 0;break;
+							case 2:this.current = 1;this.isDepartment=true;break;
+							case 3:this.current = 2;this.isDepartment=true;break;
 						}
 					}).catch(error =>{
 						this.$util.msg(error.msg,2000)
@@ -359,7 +363,7 @@
 			organizationUpdateInfo(){//提交审核
 				if(!this.isMainproCheck){
 					let mainproList = []
-					if(this.firstClubType == '1'){
+					if(this.firstClubType == 1){
 						this.mentuzCampList.forEach(item =>{
 							mainproList.push(item.name)
 						})
@@ -411,8 +415,7 @@
 						townId:this.addressData.townId,
 						address:this.addressData.addressDetail,
 						socialCreditCode:this.socialCreditCode,
-						// businessLicense:this.businessLicense,
-						businessLicense:'https://static.caimei365.com/app/img/upload/club-zizhi.png',
+						businessLicense:this.businessLicense,
 						shopPhoto:this.shopPhoto,
 						firstClubType:this.isOrganizationType,  //机构类型分类 医美:1和生美:2
 						secondClubType:this.secondClubType,		//机构类型二级分类 诊所:1,门诊:2,医院:3
@@ -524,7 +527,7 @@
 			},
 			radioChange(item) {
 				this.secondClubType = item.value;
-				if( this.secondClubType == '2' || this.secondClubType == '3'){
+				if( this.secondClubType == 2 || this.secondClubType == 3){
 					this.isDepartment = true
 				}else{
 					this.isDepartment = false

pages/login/bindOperator.vue

@@ -119,31 +119,34 @@
 			async getWxAuthorize(){
 				const wechatCode = await authorize.getCode('weixin');// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
 				const getUserInfo = await authorize.getUserInfo('weixin');
-				const params = { code:wechatCode,encryptedData:getUserInfo.encryptedData,iv:getUserInfo.iv }
-				this.UserService.UserLoginAuthApplets(params)
-					.then(response =>{
-						this.login(response.data);
-						this.$store.commit('updateStatus',response.data)
-						uni.setStorageSync('token',response.data.token)
-						uni.setStorageSync('unionId',response.data.unionId)
-						setTimeout(()=>{
-							if(response.data.userIdentity === 1){
-								this.$api.navigateTo('/seller/pages/index/index')
-							}else if(response.data.userIdentity === 2 || response.data.userIdentity === 4){
-								this.$api.switchTabTo('/pages/tabBar/user/user')
-							}else if(response.data.userIdentity === 3){
-								this.$api.navigateTo('/supplier/pages/index/index')
-							}else{
-								this.isUserInfo= true
-							}
-						},1000)
-					})
-					.catch(error =>{
-						this.logout()
-						uni.setStorageSync('unionId',response.data.unionId)
-						this.$store.commit('updateStatus',response.data)
-						this.isUserInfo = true
-					})
+				this.UserService.UserLoginAuthApplets({ 
+					code:wechatCode,
+					encryptedData:getUserInfo.encryptedData,
+					iv:getUserInfo.iv ,
+				})
+				.then(response =>{
+					this.login(response.data);
+					this.$store.commit('updateStatus',response.data)
+					uni.setStorageSync('token',response.data.token)
+					uni.setStorageSync('unionId',response.data.unionId)
+					setTimeout(()=>{
+						if(response.data.userIdentity === 1){
+							this.$api.navigateTo('/seller/pages/index/index')
+						}else if(response.data.userIdentity === 2 || response.data.userIdentity === 4){
+							this.$api.switchTabTo('/pages/tabBar/user/user')
+						}else if(response.data.userIdentity === 3){
+							this.$api.navigateTo('/supplier/pages/index/index')
+						}else{
+							this.isUserInfo= true
+						}
+					},1000)
+				})
+				.catch(error =>{
+					this.logout()
+					uni.setStorageSync('unionId',error.data.unionId)
+					this.$store.commit('updateStatus',error.data)
+					this.isUserInfo = true
+				})
 			},	
 			bindWechatInfo(){
 				if( this.bindLinkName == ''){

pages/login/information.vue

@@ -179,7 +179,7 @@
 					<view class="content-class">
 						<checkbox-group @change="chooseMaleLikes">
 							<label class="item" v-for="(item, index) in medicaCampList" :key="index" :class="{on: item.checked}">
-							   <checkbox :value="item.value"></checkbox>
+							   <checkbox :value="item.value" :checked="item.checked"></checkbox>
 							   <text class="item-text">{{item.name}}</text>
 							</label>
 						</checkbox-group>
@@ -364,7 +364,7 @@
 						this.addressData.address =  organizationClub.provincialAddress ? organizationClub.provincialAddress : ''
 						this.businessLicense = this.$reg.checkData(organizationClub.businessLicense)
 						this.medicalPracticeLicense = this.$reg.checkData(organizationClub.medicalPracticeLicense)
-						this.shopPhoto = this.$reg.checkData(organizationClub.headpic)
+						this.shopPhoto = this.$reg.checkData(organizationClub.shopPhoto)
 						this.department = organizationClub.department						
 						this.clubTelePhone = this.$reg.checkData(organizationClub.contractPhone)
 						this.clubFax = this.$reg.checkData(organizationClub.fax)
@@ -398,9 +398,9 @@
 						}
 						//机构类型
 						switch(this.secondClubType){
-							case '1':this.current = 0;break;
-							case '2':this.current = 1;this.isDepartment=true;break;
-							case '3':this.current = 2;this.isDepartment=true;break;
+							case 1:this.current = 0;break;
+							case 2:this.current = 1;this.isDepartment=true;break;
+							case 3:this.current = 2;this.isDepartment=true;break;
 						}
 					}).catch(error =>{
 						this.$util.msg(error.msg,2000)
@@ -564,7 +564,7 @@
 			},
 			radioChange(item) {
 				this.secondClubType =item.value;
-				if( this.secondClubType == '2' || this.secondClubType == '3'){
+				if( this.secondClubType == 2 || this.secondClubType == 3){
 					this.isDepartment = true
 				}else{
 					this.isDepartment = false
@@ -595,6 +595,7 @@
 						this.$set(item,'checked',false)
 					}
 				})
+				console.log(list)
 				return arr.join('/')
 			},
 			onBlurInput(e){//
@@ -613,38 +614,38 @@
 					let _OBJ = {value:(index+1).toString(),name:item,checked:true}
 					_ARRAY.push(_OBJ)
 				})
+				console.log(_ARRAY)
 				return _ARRAY
 			},
 			addCustomItem(){
 				if(this.customItemValue==''){
 					this.$util.msg('请输入自定义项目',2000);
+				}else{
+					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)
+						}else{
+							this.mentuzCampList.push(item)
+						}
 					}else{
-						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)
-							}else{
-								this.mentuzCampList.push(item)
-							}
+						let item = {value:`${this.medicaCampList.length+1}`,name:this.customItemValue,checked:true}
+						if(this.checkedArray(this.customItemValue,this.medicaCampList)){
+							this.$util.msg('主营内容已存在!',2000)
 						}else{
-							let item = {value:`${this.medicaCampList.length+1}`,name:this.customItemValue,checked:true}
-							if(this.checkedArray(this.customItemValue,this.medicaCampList)){
-								this.$util.msg('主营内容已存在!',2000)
-							}else{
-								this.medicaCampList.push(item)
-							}
+							this.medicaCampList.push(item)
 						}
 					}
+				}
 			},
 			checkedArray(content,arr){//判断主营内容是否已存在
-			console.log(content,arr)
-					 for(var i in arr){
-							if(arr[i].name == content){
-								return true;
-							}
-						}
-			           return false;
-			       },
+				for(var i in arr){
+					if(arr[i].name == content){
+						return true;
+					}
+				}
+				return false;
+		   },
 		},
 		onShow() {
 			this.$api.getStorage().then((resolve) =>{

pages/login/logincode.vue

@@ -52,12 +52,11 @@
 								unionId:uni.getStorageSync('unionId')
 						}							
 						this.UserService.InvitationCodeLogin(params).then(response =>{
-							this.login(response.data)
 							wxLogin.wxLoginAuthorize()
 							if(response.data.userIdentity === 3){
 								setTimeout(()=>{
 									this.$api.navigateTo('/supplier/pages/index/index')
-								},1000)
+								},1500)
 							}else{
 								setTimeout(()=>{
 									switch(this.isLoginType){
@@ -73,7 +72,7 @@
 										default:
 											this.$api.switchTabTo('/pages/tabBar/user/user')
 									}
-								},1000)
+								},1500)
 							}
 						}).catch(error =>{
 							this.$util.msg(error.msg,2000)

pages/tabBar/home/index.vue

@@ -84,11 +84,48 @@
 		},
 		methods: {
 			...mapMutations(['login','logout']),
+			GetWxAuthorize(){
+				authorize.getCode('weixin').then(wechatcode =>{// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
+					authorize.getUserInfo('weixin').then(getUserInfo =>{
+						this.UserService.UserLoginAuthApplets({ 
+							code:wechatcode,
+							encryptedData:getUserInfo.encryptedData,
+							iv:getUserInfo.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.setStorageSync('unionId',response.data.unionId)
+							if(response.data.userIdentity ==1){
+								this.$api.redirectTo('/seller/pages/index/index')
+							}else if(response.data.userIdentity === 3){
+								this.$api.redirectTo('/supplier/pages/index/index')
+							}
+							this.getHomeInformation()
+						})
+						.catch(error =>{
+							this.isLogin = false;
+							this.logout()
+							uni.setStorageSync('unionId',error.data.unionId)
+							this.$store.commit('updateStatus',error.data)
+							this.getHomeInformation()
+						})
+					})
+				})						
+			},
 			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)
+				this.UserService.UserLoginAuthApplets({ 
+					code:wechatCode,
+					encryptedData:getUserInfo.encryptedData,
+					iv:getUserInfo.iv
+				})
 				.then(response =>{
 					this.isLogin = true;
 					this.userID = response.data.userId;						
@@ -168,8 +205,9 @@
 			},
 			async InitAuthorize(){ //是否已授权 0:为取消授权 1:为已授权 2:为未操作
 				const code = await authorize.getSetting();
+				console.log(code)
 				if(code == 1){
-					this.getWxAuthorize()
+					this.GetWxAuthorize()
 				}else{
 					this.$api.getComStorage('userInfo').then((resolve) =>{
 						this.userID = resolve.userId ? resolve.userId :0;

pages/tabBar/user/user.vue

@@ -234,8 +234,10 @@
 						this.userType = '会员机构'
 					}else{
 						this.name = $userData.userName //普通机构名称
-						this.isUpgradeAlert = true
 						this.userType = '普通机构'
+					}		
+					if($userData.guideFlag == 0){
+						this.isUpgradeAlert = true
 					}
 					this.headpic = $userData.image //会所头像
 					this.bindMobile = $userData.bindMobile//登录手机号
@@ -265,12 +267,12 @@
 				});
 			},
 			hanldUnBindUpgrade(){//普通用户不升级会员机构
-				cancelPrompt({ userId:this.userID}).then(response =>{
+				this.UserService.CancelPrompt({ userId:this.userID}).then(response =>{
 					this.isUpgradeAlert = false
 				})
 			},
 			hanldGoApply(){
-				cancelPrompt({ userId:this.userID}).then(response =>{
+				this.UserService.CancelPrompt({ userId:this.userID}).then(response =>{
 					this.isUpgradeAlert = false
 					this.$api.navigateTo(`/pages/login/apply?clubStatus=${this.clubStatus}`);
 				})

seller/pages/login/apply.vue

@@ -563,6 +563,9 @@ import { mapMutations } from 'vuex';
 				this.isShowInput = true
 				this.textareaFocus = false
 			},
+			onTextareaInputInfo(e){
+			   this.companyPprofile = e.detail.value;
+			},
 			chooseBusinessImage() {//营业执照图片上传
 				uploadFileImage().then(res =>{
 					this.businessLicense = JSON.parse(res.data).data

seller/pages/login/login.vue

@@ -71,27 +71,24 @@
 			async getWxAuthorize(){
 				const wechatCode = await authorize.getCode('weixin');// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
 				const getUserInfo = await authorize.getUserInfo('weixin');
-				const params = { code:wechatCode,encryptedData:getUserInfo.encryptedData,iv:getUserInfo.iv }
-				this.UserService.UserLoginAuthApplets(params).then(response =>{
-					if(response.code != -6){//判断是否为微信绑定了供应商的账户
-						if(response.data.userIdentity === 1){
-							this.login(response.data);
-							this.$store.commit('updateStatus',response.data)
-							uni.setStorageSync('token',response.data.token)
-							uni.setStorageSync('unionId',response.data.unionId)
-							setTimeout(()=>{
-								this.$api.navigateTo('/seller/pages/index/index')
-							},1500)
-						}else{
-							this.logout()
-							uni.setStorageSync('unionId',response.data.unionId)
-							this.$store.commit('updateStatus',response.data)
-							this.isSeller= true
-						}
-					}else{
-						this.isSeller= true
-						this.iseErrorAlert= true
-					}
+				this.UserService.UserLoginAuthApplets({ 
+					code:wechatCode,
+					encryptedData:getUserInfo.encryptedData,
+					iv:getUserInfo.iv ,
+				})
+				.then(response =>{
+					this.login(response.data);
+					this.$store.commit('updateStatus',response.data)
+					uni.setStorageSync('token',response.data.token)
+					uni.setStorageSync('unionId',response.data.unionId)
+					setTimeout(()=>{
+						this.$api.navigateTo('/seller/pages/index/index')
+					},1500)
+				}).catch(error =>{
+					this.logout()
+					uni.setStorageSync('unionId',error.data.unionId)
+					this.$store.commit('updateStatus',error.data)
+					this.isSeller= true
 				})
 			},	
 			confirmLogin(){
@@ -118,8 +115,10 @@
 						this.$store.commit('updateStatus',response.data)
 						uni.setStorageSync('token',response.data.token)
 						uni.setStorageSync('unionId',response.data.unionId)
+						this.$api.navigateTo('/seller/pages/index/index')
+						this.isSeller= false
 						setTimeout(()=>{
-							this.$api.navigateTo('/seller/pages/index/index')
+							this.isSeller= true
 						},1500)
 					})
 					.catch(error =>{

services/ajax.service.js

@@ -48,7 +48,6 @@ class AjaxService {
 						resolve(res.data)
 					}else{
 						if (res.data.code === 0) {
-							console.log('2222222222')
 							resolve(res.data)
 						} else {
 							reject(res.data)

services/sellse.service.js

@@ -15,7 +15,7 @@ export default class SellerService {
 	 */
 	SellerLogin (data={}){
 		return this.AjaxService.post({ 
-			url:'/user/seller/login', 
+			url:'/user/login/seller', 
 			data, 
 			isLoading: true ,
 			isHost:true

services/user.service.js

@@ -123,6 +123,15 @@ export default class UserService {
 			isHost:true
 		})
 	}
+	/*普通机构取消提示*/
+	CancelPrompt (data = {}) {
+		return this.AjaxService.get({ 
+			url:'/user/register/guide', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
+	}
 	/**
 	 * @机构-地址列表
 	 * @param:userId 用户ID(必传)，
@@ -130,7 +139,11 @@ export default class UserService {
 	 * @param:pageSize 每页条数
 	 */
 	QueryAddressList (data = {}) {
-		return this.AjaxService.get({ url:'/personalCenter/findAddress', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/personalCenter/findAddress', 
+			data, 
+			isLoading: true ,
+		})
 	}
 	/**
 	 * @机构-添加&&修改地址
@@ -138,7 +151,11 @@ export default class UserService {
 	 * @param:地址信息，
 	 */
 	AddNewAddress (data = {}) {
-		return this.AjaxService.post({ url:'/personalCenter/saveAddress', data, isLoading: true })
+		return this.AjaxService.post({ 
+			url:'/personalCenter/saveAddress', 
+			data, 
+			isLoading: true ,
+		})
 	}
 	/**
 	 * @机构-删除地址
@@ -146,30 +163,53 @@ export default class UserService {
 	 * @param:地址信息，
 	 */
 	DeleteNewAddress (data = {}) {
-		return this.AjaxService.get({ url:'/personalCenter/deleteAddress', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/personalCenter/deleteAddress', 
+			data, 
+			isLoading: true ,
+		})
 	}
 	/**
 	 * @机构-个人中心
 	 * @param:userId 用户ID(必传)，
 	 */
 	PersonalInfo (data = {}) {
-		return this.AjaxService.get({ url:'/personalCenter/myCentre', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/personalCenter/myCentre', 
+			data, 
+			isLoading: false ,
+		})
 	}
 	/* 运营人员管理-列表 */
 	QueryOperatorList (data = {}) {
-		return this.AjaxService.get({ url:'/operation/list', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/operation/list', 
+			data, 
+			isLoading: true ,
+		})
 	}
 	/* 运营人员管理-添加 */
 	PostAddOperator (data = {}) {
-		return this.AjaxService.post({ url:'/operation/add', data, isLoading: true })
+		return this.AjaxService.post({ 
+			url:'/operation/add', 
+			data, 
+			isLoading: true ,
+		})
 	}
 	/* 运营人员管理-删除 */
 	PostDeleteOperator (data = {}) {
-		return this.AjaxService.post({ url:'/operation/delete', data, isLoading: true })
+		return this.AjaxService.post({ 
+			url:'/operation/delete', 
+			data, 
+			isLoading: true ,
+		})
 	}
 	/* 运营人员管理-更新邀请码 */
 	PostUpdateOperatorCode (data = {}) {
-		return this.AjaxService.post({ url:'/operation/updateInvitationCode', data, isLoading: true })
+		return this.AjaxService.post({ 
+			url:'/operation/updateInvitationCode', 
+			data, 
+			isLoading: true ,
+		})
 	}
-	
 }