提交

manifest.json

@@ -3,8 +3,8 @@
     "appid" : "__UNI__3303922",
     // "appid" : "__UNI__AE4A250",
     "description" : "希希到家",
-    "versionName" : "14.0.0",
-    "versionCode" : 1400,
+    "versionName" : "15.0.0",
+    "versionCode" : 1500,
     "transformPx" : false,
     "uniStatistics" : {
         "enable" : false //全局关闭  

pages/login.vue

@@ -57,7 +57,7 @@
 				<u-checkbox activeColor="#08BF77" name="1" shape="circle"></u-checkbox>
 			</u-checkbox-group>
 			<view class="">
-				登录即表示您已详细阅读并同意<text @tap.stop="goDetail(1)" :style="{color:primaryColor}">
+				请您详细阅读并同意<text @tap.stop="goDetail(1)" :style="{color:primaryColor}">
 					《隐私政策》
 				</text>与<text @tap.stop="goDetail(2)" :style="{color:primaryColor}">
 					《用户协议》
@@ -110,7 +110,9 @@
 			<view class="line"></view>
 		</view>
 		
-		<image src="@/static/wlogin.png" class="wlogin" @tap="miniLoginHandle" mode="widthFix"></image>
+		<!-- <image src="@/static/wlogin.png" class="wlogin" @tap="miniLoginHandle" mode="widthFix"></image> -->
+		<button  @click="miniLoginHandle" class="loginBtn">微信登录</button>
+		
 		<!-- #endif -->
 
 	</view>
@@ -249,7 +251,7 @@
 			//小程序微信登陆
 			async miniLoginHandle(){
 				if(this.checked.length==0){
-					uni.$u.toast('请阅读并同意《隐私政策》');
+					uni.$u.toast('请阅读并同意《隐私政策》和用户协议');
 					 return false;
 				}
 				let res = await this.miniproLogin();
@@ -292,11 +294,23 @@
 				}
 				let userInfo;
 				if(!item){
-					userInfo = await this.$api.base.smsLogin({
+					let params={
 						phone:this.phone,
 						code:this.code,
 						pid:this.pid
-					})
+					}
+					// #ifdef MP-WEIXIN
+					let [providerErr, providerData] = await uni.getProvider({
+						service: 'oauth',
+					});
+					let [loginErr, loginData] = await uni.login({
+						provider: providerData.provider[0]
+					});
+					params.wx_code =loginData.code
+					// #endif
+					userInfo = await this.$api.base.smsLogin(params)
+					
+					
 				}else{
 					userInfo = item;
 				}

pages/technician.vue

@@ -81,7 +81,7 @@
 						</view>
 						
 					</view>
-					<view class="flex-y-center timeInfo" v-if="item.near_time">
+					<view class="flex-y-center timeInfo" v-if="item.near_time&&item.is_work!=0">
 						<view class="zao">
 							最早可约
 						</view>
@@ -118,7 +118,7 @@
 							</view>
 						</view>
 
-						<view @tap.stop="toShowPopup(index,'technician')" class="item-btn flex-center f-desc c-base" v-if="item.near_time"
+						<view @tap.stop="toShowPopup(index,'technician')" class="item-btn flex-center f-desc c-base" v-if="item.near_time&&item.is_work!=0"
 							:style="{background:item.user_id?primaryColor:'#888'}">预约
 						</view>
 					</view>
@@ -312,7 +312,7 @@ import { onLoad } from "../uni_modules/uview-ui/libs/mixin/mixin"
 			// #ifndef H5
 			this.$util.showLoading()
 			// #endif
-			await this.initIndex(true)
+			// await this.initIndex(true)
 			if (this.pageActive) {
 				this.isLoad = true
 				this.loading = false
@@ -325,6 +325,9 @@ import { onLoad } from "../uni_modules/uview-ui/libs/mixin/mixin"
 				val: true
 			})
 		},
+		async onShow(){
+			await this.initIndex(true)
+		},
 		onPullDownRefresh() {
 			// #ifndef APP-PLUS
 			uni.showNavigationBarLoading()