From 0fe154778d12909193a7b1baa6f8810b4e67f98d Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Mon, 5 Feb 2024 14:26:59 +0800
Subject: [PATCH] 11111

---
 pages/good/transfer.vue               |   9 +++--
 pages/home/myCellar.vue               |  15 ++++----
 pages/records/reservationRecords3.vue |  48 ++++++++++++++------------
 pages/records/reservationRecords4.vue |  36 +++++++++----------
 static/dingwei.png                    | Bin 0 -> 355 bytes
 5 files changed, 54 insertions(+), 54 deletions(-)
 create mode 100644 static/dingwei.png

diff --git a/pages/good/transfer.vue b/pages/good/transfer.vue
index f49a068..e3d27a0 100644
--- a/pages/good/transfer.vue
+++ b/pages/good/transfer.vue
@@ -1,7 +1,7 @@
 <template>
 	<view style="width: 100%;height: 100%;background: #FFA35A;display: flex;flex-direction: column;">
 
-	<!-- 	<NavBar ref="nav" navTitle="转赠亲友" :showIcon="true" :supportChange="false">
+		<!-- 	<NavBar ref="nav" navTitle="转赠亲友" :showIcon="true" :supportChange="false">
 		</NavBar> -->
 
 		<view
@@ -45,7 +45,7 @@
 								<view style="display: flex;flex-direction: row;align-items: center;justify-content: space-between; margin-top: 15px;
 						margin-right: 15px;">
 									<view style="display: flex;flex-direction: row;align-items: center;">
-										<text style="font-size: 10px;color: #FF5006;">剩余：</text>
+										<text style="font-size: 10px;color: #FF5006;">存量：</text>
 										<text
 											style="font-size: 14px;color: #FF5006;">{{item.goodsNumber}}{{item.unitName}}</text>
 									</view>
@@ -96,7 +96,7 @@
 			<view style="display: flex;flex-direction: row;align-items: center;margin-top: 15px;
 			padding-left: 15px;padding-right: 15px;">
 				<text style="font-size: 14px;margin-right: 10px;font-weight: 600;">转赠留言</text>
-				<input placeholder="可以写下您对亲友的祝福"  
+				<input placeholder="可以写下您对亲友的祝福"
 					style="font-size: 30rpx;flex: 1;background: #F2F2F2;border-radius: 5px;height: 40px;line-height: 40px;padding-left: 10px;padding-right: 10px;"
 					:value="transferInfo.remarks" @input="onKeyInput" />
 			</view>
@@ -208,9 +208,8 @@
 						// console.log("=========0", params);
 
 						_this.$api.transSubmission(params).then((resp) => {
-
+							uni.navigateBack()
 							// console.log("=========", resp);
-							_this.showModal3 = false
 
 							let shareData = JSON.stringify({
 								params: {
diff --git a/pages/home/myCellar.vue b/pages/home/myCellar.vue
index 4fd70fa..879fd62 100644
--- a/pages/home/myCellar.vue
+++ b/pages/home/myCellar.vue
@@ -165,7 +165,7 @@
 
 		</loading-state>
 
-	
+
 		<!-- 转赠弹框 -->
 		<view class="model" catchtouchmove='preventTouchMove' v-if='showModal3' @click="colseDialog3()"></view>
 		<view class="modalDlg3" catchtouchmove='preventTouchMove' v-if='showModal3'>
@@ -292,7 +292,8 @@
 				</view>
 
 
-				<text style="color: #666; font-size: 13px; width: 95%;text-align:right;margin-top: 20px;">{{noticeInfo.releaseTime}}</text>
+				<text
+					style="color: #666; font-size: 13px; width: 95%;text-align:right;margin-top: 20px;">{{noticeInfo.releaseTime}}</text>
 
 				<view
 					style="flex-shrink: 0;display: flex;flex-direction: row;align-items: center;justify-content: center;margin-top: 20px;">
@@ -374,7 +375,7 @@
 		created() {
 
 			// console.log("==========", getApp().globalData.isNewUser);
-		
+
 		},
 		onShow() {
 			if (typeof this.$mp.page.getTabBar === 'function' && this.$mp.page.getTabBar()) {
@@ -620,7 +621,7 @@
 				}
 
 			},
-			
+
 			colseDialog3() {
 				this.showModal3 = false
 			},
@@ -629,6 +630,8 @@
 			},
 			onShareAppMessage: function(res) {
 
+				_this.showModal3 = false
+
 				let _this = this
 				const promise = new Promise(resolve => {
 					// 模拟网络请求
@@ -659,7 +662,6 @@
 						_this.$api.transSubmission(params).then((resp) => {
 
 							// console.log("=========", resp);
-							_this.showModal3 = false
 
 							let shareData = JSON.stringify({
 								params: {
@@ -702,7 +704,6 @@
 </script>
 
 <style>
-
 	.swiper-box {
 		margin-top: -55px;
 		height: 50rpx;
@@ -722,7 +723,7 @@
 		text-overflow: ellipsis;
 		color: #E26040;
 		font-size: 10px;
-		
+
 	}
 
 	button {
diff --git a/pages/records/reservationRecords3.vue b/pages/records/reservationRecords3.vue
index 20131d9..6fdff80 100644
--- a/pages/records/reservationRecords3.vue
+++ b/pages/records/reservationRecords3.vue
@@ -20,28 +20,36 @@
 						<text class="item-top-state">{{item.stateValue}}</text>
 					</view>
 
-					<view style="display: flex;flex-direction: row;align-items: center;margin-left: 16px;margin-right: 16px;margin-top: 15px;">
-						<text style="font-size: 16px;margin-right: 8px;flex: 1;margin-right: 10px;">{{item.storeName}}</text>
-					
-					
+					<view
+						style="display: flex;flex-direction: row;align-items: center;margin-left: 16px;margin-right: 16px;margin-top: 15px;">
+						<text
+							style="font-size: 16px;margin-right: 8px;flex: 1;margin-right: 15px;">{{item.storeName}}</text>
+
+						<view style="display: flex;flex-direction: row;align-items: center;"
+							@click="makePhoneCall(item.linkPhone)">
+							<image src="../../static/phone-2.png" style="width: 20px;height: 20px;margin-right: 5px;">
+							</image>
+							<text>咨询电话</text>
+						</view>
+
 					</view>
 
-					<view class="item-bom" style="margin-left: 16px;margin-right: 16px;">
+
+					<view
+						style="display: flex;flex-direction: row;align-items: center;margin-left: 16px;margin-right: 16px;margin-top: 6px;">
+						<image src="../../static/dingwei.png" style="width: 20px;height: 20px;margin-right: 5px;" mode="aspectFit">
+						</image>
+						<text style="font-size: 12px;color: #333;">{{item.address}}</text>
+					</view>
+
+					<view class="item-bom" style="margin-left: 16px;margin-right: 16px;margin-top: 10px;">
 
 						<view class="item-bom-left">
-							
-							
-							<view style="display: flex;flex-direction: row;align-items: center;" 	@click="makePhoneCall(item.linkPhone)">
-								<image src="../../static/phone-2.png" style="width: 20px;height: 20px;margin-right: 5px;"></image>
-									<text>咨询电话</text>
-							</view>
-							
-							<!-- 	<view style="display: flex;flex-direction: row;align-items: center;margin-top: 8px;">
-								<image src="../../static/logo.png" style="width: 15px;height: 15px;margin-right: 5px;">
-								</image>
+
+							<view style="display: flex;flex-direction: row;align-items: center;margin-top: 8px;">
 								<text style="font-size: 12px;color: #999; margin-right: 5px;">提菜日期：</text>
-								<text style="font-size: 12px;color: #FF5006;">{{item.date}}</text>
-							</view> -->
+								<text style="font-size: 12px;color: #FD6D2B;">{{item.reserveDate}}</text>
+							</view>
 
 							<view style="display: flex;flex-direction: row;align-items: center;margin-top: 16px;">
 								<text style="font-size: 12px;color: #999; margin-right: 5px;">提菜人：</text>
@@ -49,12 +57,6 @@
 								<text style="font-size: 12px;color: #333; ">{{item.userPhone}}</text>
 							</view>
 
-							<view style="display: flex;flex-direction: row;align-items: center;margin-top: 8px;">
-								<text style="font-size: 12px;color: #999; margin-right: 5px;">预约日期：</text>
-								<text style="font-size: 12px;color: #333;">{{item.reserveDate}}</text>
-							</view>
-
-
 						</view>
 
 						<view class="item-bom_right">
diff --git a/pages/records/reservationRecords4.vue b/pages/records/reservationRecords4.vue
index cc2dca0..b70e587 100644
--- a/pages/records/reservationRecords4.vue
+++ b/pages/records/reservationRecords4.vue
@@ -22,29 +22,27 @@
 					<view
 						style="display: flex;flex-direction: row;align-items: center;margin-left: 16px;margin-right: 16px;margin-top: 15px;">
 						<text
-							style="font-size: 16px;margin-right: 8px;color: #bbb;flex: 1;margin-right: 10px;">{{item.storeName}}</text>
-
+							style="font-size: 16px;margin-right: 8px;color: #bbb;flex: 1;margin-right: 15px;">{{item.storeName}}</text>
+						<view style="display: flex;flex-direction: row;align-items: center;"
+							@click="makePhoneCall(item.linkPhone)">
+							<image src="../../static/phone-2.png" style="width: 20px;height: 20px;margin-right: 5px;">
+							</image>
+							<text style="">咨询电话</text>
+						</view>
 
 					</view>
-
-					<view class="item-bom" style="margin-left: 16px;margin-right: 16px;margin-top: 8px;">
-
-						<view class="item-bom-left">
+					<view
+						style="display: flex;flex-direction: row;align-items: center;margin-left: 16px;margin-right: 16px;margin-top: 6px;">
+						<image src="../../static/dingwei.png" style="width: 20px;height: 20px;margin-right: 5px;"
+							mode="aspectFit">
+						</image>
+						<text style="font-size: 12px;color: #BBBBBB;">{{item.address}}</text>
+					</view>
 
 
-							<view style="display: flex;flex-direction: row;align-items: center;"
-								@click="makePhoneCall(item.linkPhone)">
-								<image src="../../static/phone-1.png"
-									style="width: 20px;height: 20px;margin-right: 5px;"></image>
-								<text style="color: #bbb;">咨询电话</text>
-							</view>
+					<view class="item-bom" style="margin-left: 16px;margin-right: 16px;margin-top: 10px;">
 
-						<!-- 	<view style="display: flex;flex-direction: row;align-items: center;">
-								<text
-									style="font-size: 16px;margin-right: 8px;color: #BBBBBB;">{{item.storeName}}</text>
-								<image src="../../static/phone-1.png" style="width: 20px;height: 20px;"
-									@click="makePhoneCall(item.linkPhone)"></image>
-							</view> -->
+						<view class="item-bom-left">
 
 							<view style="display: flex;flex-direction: row;align-items: center;margin-top: 8px;">
 								<image src="../../static/time.png" style="width: 15px;height: 15px;margin-right: 5px;">
@@ -72,7 +70,7 @@
 
 							<text style="opacity: 0.7;font-size: 18px;font-weight: 800;font-family: sans-serif;z-index: 101;
 								width: 104px; height: 104px;line-height: 104px; text-align: center; background: #666;
-								position: absolute;border-radius: 20px;color: #fff;">已失效</text>
+								position: absolute;border-radius: 20px;color: #fff;">已提菜</text>
 
 							<image src="https://supervise.yxtsoft.com/lpk/image/daiticai.png"
 								style="width: 104px; height: 104px;z-index: 100;border-radius: 20px;">
diff --git a/static/dingwei.png b/static/dingwei.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ddeb071f8faf9816c0199409041f4e19872efe3
GIT binary patch
literal 355
zcmeAS@N?(olHy`uVBq!ia0vp^av;pY3?xs=ZJr3Eqyv0HT!Hk=nKP$PpFV5WEFc5U
zo-t#_pTj?v0Hrxgg8YIR{wwUiU+<7G-$uc-8z}hB)5S5QVovUay?uua1X`Y(xjR*A
z&uKR5m@mc6b*e$YR8T*mqKT!`PEh~cvDX3<ZXEl!=UYYDhpl4ioA-XTNVvDrved(@
zG(t>`+eUV)^`_qkwp|NXKB}@N#e4t1Kd0HV17|;*w_3_@b79Ali$$IHzeGKeSTb++
zn!QFof~zm+IR`7vYv?fwuuu_pxM>wr<dQr=#?#Z-sC>86qN?dqS2k40_1T{9cc>|U
z^xXgNE90LLe=j+*tMWac`l~O5Z^p}I5v4y*=qR0xwOes3<(bu7f44=-zfT3f>9{{(
ul9p7*{e36w?%h^8_Ud72;^)R%TgEp`vNL6vb8Y~A&fw|l=d#Wzp$P!9$C^F>

literal 0
HcmV?d00001