提交

manifest.json

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

pages/login.vue

@@ -67,14 +67,14 @@
 		<button :disabled="!phone||!code" @click="smsLogin()" class="loginBtn">登录</button>
 		<!-- <view >登录</view> -->
 		 <!-- #ifdef APP-PLUS -->
-		<view class="otherLogin">
+		<!-- <view class="otherLogin">
 			<view class="line"></view>
 			<view class="otext">其他登录</view>
 			<view class="line"></view>
 		</view>
 		
 		<image src="@/static/wlogin.png" class="wlogin" @tap="$refs.show_rule_item.open()" mode="widthFix"></image>
-		
+		 -->
 		<!-- <view class="page-height flex-center flex-column">
 			<image mode="aspectFill" lazy-load class="logo-img mb-md" :src="base_info.app_logo"></image>
 			<view class="f-caption c-caption">{{base_info.app_text}}</view>
@@ -84,7 +84,7 @@
 			</view>
 		</view> -->
 
-		<uni-popup ref="show_rule_item" type="center" :maskClick="false">
+		<!-- <uni-popup ref="show_rule_item" type="center" :maskClick="false">
 			<view class="common-popup-content fill-base pd-lg radius-34">
 				<view class="title">温馨提示</view>
 				<view class="f-desc c-title mt-lg">
@@ -100,7 +100,7 @@
 						:style="{background: primaryColor,color:'#fff'}">确定</view>
 				</view>
 			</view>
-		</uni-popup>
+		</uni-popup> -->
 		<!-- #endif -->
 		
 		<!-- #ifdef MP-WEIXIN -->

pages/technician.vue

@@ -107,7 +107,7 @@
 					</view>
 					<view class="flex-between">
 						<view class="flex-y-center f-desc c-caption">
-							<view @tap.stop="toShowPopup(index,'message')" class="flex-y-center"><i
+							<view @tap.stop="toShowPopup(item,index,'message')" class="flex-y-center"><i
 									class="iconfont iconpinglun mr-sm"></i>{{item.comment_num}} </view>
 							<view @tap.stop="toCollect(index)" class="flex-y-center ml-md"><i class="iconfont mr-sm"
 									:class="[{'iconshoucang1':!item.is_collect},{'iconshoucang2':item.is_collect}]"
@@ -118,9 +118,8 @@
 							</view>
 						</view>
 
-						<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 @tap.stop="toShowPopup(item,index,'technician')" class="item-btn flex-center f-desc c-base" v-if="item.near_time"
+							:style="{background:item.user_id?primaryColor:'#888'}">{{item.is_work!=0?'预约':'休息中'}}</view>
 					</view>
 				</view>
 			</view>
@@ -643,10 +642,16 @@ import { onLoad } from "../uni_modules/uview-ui/libs/mixin/mixin"
 					urls
 				})
 			},
-			async toShowPopup(index, key) {
+			async toShowPopup(item,index, key) {
 				this.showInd = index
 				this.showType = key
 				if (key == 'technician') {
+					if(item.is_work==0){
+						this.$util.showToast({
+							title: '该技师已休息'
+						})
+						return;
+					}
 					let {
 						user_id = 0
 					} = this.list.data[index]