update

commonFun.js

@@ -5,20 +5,20 @@ import IMService from "./lib/imservice"
 import commonData from './commonData.js'
 /*线上使用*/
 // 静态图片路径
-//const serverUrl = 'https://api.kuailaiyou.top/prjcenter/prjKLY/fileroot/images/front/';
+const serverUrl = 'https://api.kuailaiyou.top/prjcenter/prjKLY/fileroot/images/front/';
 // 请求URL路径
-//const serverUrlReq = 'https://api.kuailaiyou.top/';
-// const serverUrlReq = 'https://zpwebapi.kaidekuai.com/';  
+const serverUrlReq = 'https://api.kuailaiyou.top/';
+//const serverUrlReq = 'https://zpwebapi.kaidekuai.com/';  
 // 请求webviewURL路径
-//const webviewServerUrlReq = 'https://admin.kuailaiyou.top/';
+const webviewServerUrlReq = 'https://admin.kuailaiyou.top/';
 
 
 // 静态图片路径
-const serverUrl = 'https://app.tjzhxx.cn:4100/prjcenter/prjKLY/fileroot/images/front/';
+//const serverUrl = 'https://app.tjzhxx.cn:4100/prjcenter/prjKLY/fileroot/images/front/';
 // 请求URL路径
-const serverUrlReq = 'https://app.tjzhxx.cn:4100/';
+//const serverUrlReq = 'https://app.tjzhxx.cn:4100/';
 // 请求webviewURL路径
-const webviewServerUrlReq = 'https://app.tjzhxx.cn:4101/';
+//const webviewServerUrlReq = 'https://app.tjzhxx.cn:4100/';
 
 
 

pages/merchant/index.vue

@@ -411,8 +411,10 @@
 						// this.count_three = res.data.Result.count_three
 						this.get_info()
 						this.data = res.data.Result.pageData.map(item => {
-							let count_signed_num = Number(item.accepted_ok) + Number(item
+							/*let count_signed_num = Number(item.accepted_ok) + Number(item
 								.todowork_status_three) + Number(item.todowork_status_four) + Number(
+								item.todowork_status_five)*/
+							let count_signed_num = Number(item.todowork_status_four) + Number(
 								item.todowork_status_five)
 							console.log(count_signed_num)
 							return ({

pages/merchant/memberList.vue

@@ -119,7 +119,7 @@
 								</view>
 							</view>
 							<!-- 待结算显示 -->
-							<view class="order_btn_box" v-if="item.status==2">
+							<view class="order_btn_box" v-if="item.status==2||item.status==3||item.status==4">
 								<view @click="open_modal('refusePay',item.id,item)" class="cancel">拒绝支付</view>
 								<view @click="open_modal('allowPay',item.id,item)" class="confirm">确认支付</view>
 							</view>

pages/personal/index.vue

@@ -17,7 +17,8 @@
 					<!-- 非商家昵称年龄性别 -->
 					<view v-if="sys_role==0" style="margin-left: 30upx;">
 						<view style="font-size: 36upx;margin-left: 4upx;">
-							<view class="start_box" @click="to_per_info()">
+							<!--<view class="start_box" @click="to_per_info()">-->
+							<view class="start_box">
 								{{user_info.nickname?user_info.nickname:'会员昵称'}}
 								<view v-if="!loading" @click="to_appraisal(0)" style="margin-left: 10upx;">
 									<trailerStars allowTap="0" :innerScore="user_info.worker_appraisal_avg">