From d1ecd1c0b460dc999230142f660c88908e917f71 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 1 Jul 2024 22:17:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=AD=E4=B9=B0=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=8C=85=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package/pages/zysc/member/order.vue |  7 ++---
 pages/index/index.vue               | 42 +++++++++++++++++------------
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/package/pages/zysc/member/order.vue b/package/pages/zysc/member/order.vue
index 554956a..7dd1043 100644
--- a/package/pages/zysc/member/order.vue
+++ b/package/pages/zysc/member/order.vue
@@ -40,13 +40,14 @@
 						</view>
 					</view>
 					<view style="display: flex;">
-						<view
+						<!-- <view
 							:style="checkString != '' ? 'display: flex;width: 70%;margin-top: 10upx;' : 'display: flex;width: 70%;margin-top: 30upx;'">
 							<view style="font-size: 30upx;color: #333333;margin-top: 25upx;">¥ {{money}}</view>
 							<view style="font-size: 20upx;color: #666666;margin-top: 30upx;margin-left: 15upx;">
 								x{{number}}</view>
-						</view>
-						<view v-if="isExpress === 1 && className === '' && checkString == '' "
+						</view> -->
+						<!-- <view v-if="isExpress === 1 && className === '' && checkString == '' " -->
+						<view 
 							style="width:200upx;height: 60upx;display: flex;margin-top: 30upx;border-radius: 5upx;border:1px solid #E6E6E6;">
 							<view
 								style="border-right:1px solid #E6E6E6;width: 70upx;color: #999999;text-align: center;margin-top: 15upx;"
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7e8eff1..141f0fc 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -208,8 +208,7 @@
 				</view>
 			</view>
 			<view class="flex align-center justify-between" style="margin-top: 20px;">
-				<view :class="activeTab == item.id ? 'tapDsalk' : 'dsalk'" @click="getJqqd(item.id)"
-					v-for="(item,homeIindex) in homePageCountNum" :key="homeIindex">
+				<view :class="activeTab == item.id ? 'tapDsalk' : 'dsalk'" @click="getJqqd(item.id)" v-for="(item,homeIindex) in homePageCountNum" :key="homeIindex">
 					<view class="sda flex align-center" v-if="homeIindex==indexImg" v-for="(imgItem,indexImg) in jiazhongIimg" :key="indexImg">
 						<image :src="imgItem.url" mode="" style="width: 30px;height: 30px;"></image>
 						<!-- <image :src="item.icon" style="width: 20px;height: 20px;"></image> -->
@@ -425,21 +424,25 @@
 					<text
 						style="border-radius: 10rpx 10rpx 0 0; background: linear-gradient(90deg, #019C88, #28BA92, #35C495);padding: 15rpx 15rpx 5rpx 15rpx;color: white;">今日服务</text>
 				</view>
-				<view class="pintuan_syrs flex justify-between" v-if="item.status == 6">
-					<view class="pintuan-title" >
-						<image src="../../static/clock.png" class="pintuan-img"></image>
-						<span class="pintuan-text">服务倒计时</span>
-					</view>
-					<!-- 						<uni-countdown ref="countDownEl" :title="'剩余'" :fontSize="'14'" :showDay="false"
-						:hour="item.endTime.hour" :minute="item.endTime.minute" :second="item.endTime.second"
-						color="#20C675">
-					</uni-countdown> -->
-					<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
-						font-size="30" separator-size="30"></u-count-down>
-				</view>
+				
 				<view class="bgwhite radius margin-top-sm padding-bottom-sm"
 					:style="{ backgroundColor: item.status == 2 ? '#f6fcfa' : '', border: item.status == 2 ? '2px solid rgb(207, 237, 225)' : '' }"
 					v-for="(item, index) in goods" :key='index' @click="goNav('/my/order/revenueDetails?ordersId=' + item.ordersId)">
+					
+					<view class="xian" v-if="item.status == 6"></view>
+					<view class="pintuan_syrs flex justify-between" v-if="item.status == 6">
+						<view class="pintuan-title" >
+							<image src="../../static/clock.png" class="pintuan-img"></image>
+							<span class="pintuan-text">服务倒计时</span>
+						</view>
+						<!-- <uni-countdown ref="countDownEl" :title="'剩余'" :fontSize="'14'" :showDay="false"
+							:hour="item.endTime.hour" :minute="item.endTime.minute" :second="item.endTime.second"
+							color="#20C675">
+						</uni-countdown> -->
+						<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
+							font-size="30" separator-size="30"></u-count-down>
+					</view>
+					
 					<view class="flex justify-between padding-sm ">
 						<view class="progress-text">预约时间：{{ item.serveTime }}</view>
 						<view class="progress-status" v-if="item.status == 1">待付款...</view>
@@ -455,8 +458,6 @@
 						<view class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> -->
 
 					</view>
-					<view class="xian" v-if="item.status == 6"></view>
-					
 					<view class=" u-flex u-p-t-30 padding-sm">
 						<view class="u-m-r-10">
 							<u-avatar :src="item.massageImg ? item.massageImg : '../../static/logo.png'" mode="square"
@@ -698,7 +699,6 @@ export default {
 		
 	},
 	onShow() {
-		console.log(this.isLogin);
 		this.getHomeListData();
 		this.getHomeMaterialPackageList();
 		//是否开启理疗师端实时定位	330
@@ -730,6 +730,7 @@ export default {
 		// this.userId = uni.getStorageSync('userId')
 		this.userId = this.$queue.getData("userId")
 		
+			console.log('this.userId------------->',this.userId);
 		this.isCashDeposit = uni.getStorageSync('isCashDeposit')
 		if (this.userId) {
 			console.log(this.userId, "dwdwadwdawd============>");
@@ -831,6 +832,11 @@ export default {
 							this.formatHomeMaterialPackageList = res?.data.slice(0, 3);
 							// this.formatHomeMaterialPackageList = [];
 							this.homeMaterialPackageList = res.data;
+							
+							
+							console.log('this.homeMaterialPackageList------>>',this.homeMaterialPackageList);
+							console.log('this.formatHomeMaterialPackageList------>>',this.formatHomeMaterialPackageList);
+							
 						}
 					})
 			}
@@ -859,6 +865,8 @@ export default {
 		//获取App首页数据
 		getHomeListData() {
 			let artificerId = uni.getStorageSync("artificerId");
+			
+			console.log('artificerId------->',artificerId);
 			if (artificerId) {
 				this.$Request.getXZX("/app/artificer/integral/home/?artificerId=" + artificerId,).then((res) => {
 					if (res && res.data) {