From ceb82a778e324caee1bc65592bf72880167219da Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Tue, 2 Jul 2024 19:50:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package/pages/zysc/index/commoditydetail.vue |  3 +-
 package/pages/zysc/index/index.vue           | 53 ++++++++++++++++++--
 package/pages/zysc/member/order.vue          |  2 +-
 pages.json                                   |  6 +++
 pages/index/addClock.vue                     |  4 +-
 5 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/package/pages/zysc/index/commoditydetail.vue b/package/pages/zysc/index/commoditydetail.vue
index a2adb30..a78dcb6 100644
--- a/package/pages/zysc/index/commoditydetail.vue
+++ b/package/pages/zysc/index/commoditydetail.vue
@@ -139,7 +139,8 @@
 			<view class="goods_reco" style="margin-top: 20rpx;border-radius: 15upx;" v-if="ordersList.descrition">
 				<view class="goods-info-title" style="color: #333;font-weight: bold;">宝贝详情</view>
 				<view class="imglist">
-					<uparse :content="ordersList.descrition" @navigate="navigate" class="is-response"></uparse>
+					<!-- <uparse :content="ordersList.descrition" @navigate="navigate" class="is-response"></uparse> -->
+					<div v-html="ordersList.descrition"></div>
 				</view>
 			</view>
 
diff --git a/package/pages/zysc/index/index.vue b/package/pages/zysc/index/index.vue
index bdd86c3..a37f730 100644
--- a/package/pages/zysc/index/index.vue
+++ b/package/pages/zysc/index/index.vue
@@ -99,14 +99,44 @@
 						<view class="fr-jutext" style="width: 86%;text-align: right;color: #999999;">查看更多<text
 								class="cuIcon-right" style="margin-left: 2px"></text></view>
 					</view>
-					<view style="display: flex;justify-content: space-around;margin-left: 20upx;"
+					<view style="display: flex;justify-content: space-around;"
 						v-if="mrscList.length>0">
 						<view v-for="(g, index) in mrscList" :key="index" class="box-float" @tap='goDetail(g.id)'>
 							<image lazy-load='true' fade-show='true'
 								style="border-radius: 16upx;width: 214upx;height: 214upx;margin-right: 20upx;"
 								class="image" :src="g.coverImg" mode="scaleToFill"></image>
 							<!-- <view class="index-conts">{{g.title}}</view> -->
-							<view>
+							<view style="text-align: center;">
+								<view v-if="relation" class="index-conts2"><text
+										style="font-size: 30upx;">￥</text>{{ g.memberPrice }}
+									<text
+										style="font-size: 24upx;color: #999999;text-decoration:line-through;margin-left: 4upx">￥{{g.originalPrice}}</text>
+								</view>
+								<view v-if='!relation' class="index-conts2">
+									<text style="font-size: 30upx;">￥</text>{{ g.price }}
+									<text
+										style="font-size: 20upx;color: #999999;text-decoration:line-through;margin-left: 4upx;font-weight:400;">￥{{g.originalPrice}}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="header-wus" v-if="wlcgList.length>0">
+					<view @tap="goWlcgList()" style="display: flex;margin-bottom: 20upx;">
+						<view style="color:#333333;width: 86%; font-size: 32upx;font-weight: bold;">
+							物料采购
+						</view>
+						<view class="fr-jutext" style="width: 86%;text-align: right;color: #999999;">查看更多<text
+								class="cuIcon-right" style="margin-left: 2px"></text></view>
+					</view>
+					<view style="display: flex;justify-content: space-around;"
+						v-if="wlcgList.length>0">
+						<view v-for="(g, index) in wlcgList" :key="index" class="box-float" @tap='goDetail(g.id)'>
+							<image lazy-load='true' fade-show='true'
+								style="border-radius: 16upx;width: 214upx;height: 214upx;margin-right: 20upx;"
+								class="image" :src="g.coverImg" mode="scaleToFill"></image>
+							<!-- <view class="index-conts">{{g.title}}</view> -->
+							<view style="text-align: center;">
 								<view v-if="relation" class="index-conts2"><text
 										style="font-size: 30upx;">￥</text>{{ g.memberPrice }}
 									<text
@@ -222,6 +252,7 @@
 				homegoodsList: [],
 				bannerList: [],
 				mrscList: [],
+				wlcgList: [],
 				navlist: [],
 				relation_id: '',
 				navlists: [],
@@ -258,7 +289,7 @@
 			}
 			this.getmrsc();
 			this.getHomeGoods();
-
+			this.getwlcg();
 		},
 		onLoad() {
 			this.getBannerList();
@@ -305,6 +336,13 @@
 					}
 				});
 			},
+			getwlcg() {
+				this.$Request.getT('/app/goods/wlcglist?page=0&size=3&sort=createAt').then(res => {
+					if (res.status === 0) {
+						this.wlcgList = res.data.content;
+					}
+				});
+			},
 			getNews() {
 				this.$Request.getT('/app/goods/news?page=0&size=1&sort=createAt').then(res => {
 					if (res.status === 0) {
@@ -393,6 +431,11 @@
 					url: '/package/pages/zysc/index/commodityList?name=' + name
 				});
 			},
+			goWlcgList() {
+				uni.navigateTo({
+					url: '/package/pages/zysc/index/wlcgList?name=物料采购'
+				});
+			},
 			// 传进数组和指定个数，进行拆分
 			chunk: function(array, size) {
 				//获取数组的长度，如果你传入的不是数组，那么获取到的就是undefined
@@ -755,10 +798,10 @@
 		font-size: 30upx;
 		font-weight: bold;
 		position: absolute;
-		float: left;
+		// float: left;
 		color: #FF2638;
 		width: 80%;
-		text-align: left;
+		text-align: center;
 	}
 
 	.header-imgsuo {
diff --git a/package/pages/zysc/member/order.vue b/package/pages/zysc/member/order.vue
index abc498c..d76e9d6 100644
--- a/package/pages/zysc/member/order.vue
+++ b/package/pages/zysc/member/order.vue
@@ -2,7 +2,7 @@
 	<view>
 		<view
 			style="width: 690upx;height: 130upx;background: #FFFFFF;margin: 30upx; padding: 10upx;border-radius: 20upx;"
-			@tap='goEditAddress' v-if="isExpress === 1">
+			@tap='goEditAddress' v-if="sendName != '自取'">
 			<view style="display: flex;margin: 10upx 0 0 20upx;">
 				<image src="https://api.shengqianxiong.com.cn/img/20201118/276b48a6ab854b64bcfbd5377b5f5901.png"
 					style="width: 70upx; height: 70upx;margin-top: 10upx;"></image>
diff --git a/pages.json b/pages.json
index 88cbafe..8f52f6a 100644
--- a/pages.json
+++ b/pages.json
@@ -767,6 +767,12 @@
 					}
 				}
 			},
+			{
+				"path": "zysc/index/wlcgList",
+				"style": {
+					"navigationBarTitleText": "物料采购"
+				}
+			},
 
 			{
 				"path": "zysc/index/commodityList",
diff --git a/pages/index/addClock.vue b/pages/index/addClock.vue
index bd56463..c7ed203 100644
--- a/pages/index/addClock.vue
+++ b/pages/index/addClock.vue
@@ -39,7 +39,7 @@
 					
 					<view class="mian-list">
 						<view class="mian-list-top">
-							<view class="mian-list-top-biao">{{item.status=='3'?'已完成':'待评价'}}</view>
+							<view class="mian-list-top-biao">{{item.status=='3'?'待评价':'已完成'}}</view>
 							<view class="mian-list-top-time">
 								<span>预约时间: </span>
 								<span>{{item.serveTime}}</span>
@@ -78,7 +78,7 @@
 				<view class="mina-view"  v-if="isSfwc=='0'" v-for="item in listData" :key="item.id" @click="goOder(item)">
 					<view class="mian-list">
 						<view class="mian-list-top">
-							<view class="mian-list-top-biao">{{item.status=='3'?'已完成':'待评价'}}</view>
+							<view class="mian-list-top-biao">{{item.status=='3'?'待评价':'已完成'}}</view>
 							<view class="mian-list-top-time">
 								<span>预约时间: </span>
 								<span>{{item.serveTime}}</span>