提交

pages/login.vue

@@ -110,8 +110,14 @@
 			} = this
 			console.log('autograph,appLogin', autograph, appLogin)
 			if (autograph && appLogin) {
-				this.toLogin(appLogin)
-				return
+				if(appLogin.unionId){
+					this.toLogin(appLogin)
+					return
+				}else{
+					this.smsLogin(appLogin)
+					return
+				}
+				
 			}
 			let data = await this.$api.base.getConfig()
 			this.base_info = data
@@ -176,11 +182,16 @@
 				}
 
 			},
-			async smsLogin(){
-				let userInfo = await this.$api.base.smsLogin({
-					phone:this.phone,
-					code:this.code
-				})
+			async smsLogin(item){
+				let userInfo;
+				if(!item){
+					userInfo = await this.$api.base.smsLogin({
+						phone:this.phone,
+						code:this.code
+					})
+				}else{
+					userInfo = item;
+				}
 				console.log(userInfo,"---")
 				this.$util.showLoading({
 					title: "登录中..."

pages/service.vue

@@ -47,7 +47,7 @@
 					<text>推荐技师</text>
 				</view>
 				<swiper class="swiper" circular :indicator-dots="false" :autoplay="true" :interval="2000"
-					:duration="1000" previous-margin="112px" next-margin="112px">
+					:duration="1000" previous-margin="108px" next-margin="108px">
 					
 					<swiper-item class="recommendItem" v-for="(item, index) in picList" :key="index">
 						<image :src="item.work_img"></image>

store/modules/order.js

@@ -29,7 +29,7 @@ export default {
 			id: 8
 		},{
 			title: '已取消',
-			id: 9
+			id: -1
 		}],
 		param: {
 			page: 1,