From cd95a0bcfd6bfdb6e7abcc3f421022af1c963f16 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 4 Mar 2024 11:05:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                     |  4 ++--
 pages.json                        |  4 ++--
 pages/activeCode/subsidy.vue      |  4 ++--
 pages/index/index.vue             |  2 +-
 pages/moreProject/moreProject.vue |  8 ++++----
 pages/payment/get_payment.vue     |  2 +-
 pages/payment/qrcode.vue          | 11 +++++++----
 pages/users/embody/embody.vue     | 12 +++++++++---
 8 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/manifest.json b/manifest.json
index f786258..0278643 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农商户平台",
     "appid" : "__UNI__1EE148C",
     "description" : "",
-    "versionName" : "1.2.2",
-    "versionCode" : 122,
+    "versionName" : "1.2.4",
+    "versionCode" : 124,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages.json b/pages.json
index 4e691d2..851600c 100644
--- a/pages.json
+++ b/pages.json
@@ -296,13 +296,13 @@
 			"pages": [{
 				"path": "qrcode",
 				"style": {
-					"navigationBarTitleText": "面对面收款",
+					"navigationBarTitleText": "提货付款",
 					"navigationStyle": "custom"
 				}
 			}, {
 				"path": "get_payment",
 				"style": {
-					"navigationBarTitleText": "面对面收款",
+					"navigationBarTitleText": "提货付款",
 					"navigationStyle": "custom"
 				}
 			}, {
diff --git a/pages/activeCode/subsidy.vue b/pages/activeCode/subsidy.vue
index df8f84c..c648a83 100644
--- a/pages/activeCode/subsidy.vue
+++ b/pages/activeCode/subsidy.vue
@@ -30,8 +30,8 @@
     <view class="body" >
       <view class="b-card" v-if="type==1">
         <view class="b-top">
-          <view>春耕采购余额{{info.spring_subsidy_amount}}元</view>
-          <view>采购余额{{info.spring_subsidy}}元</view>
+          <view>春耕采购金额{{info.spring_subsidy_amount}}元</view>
+          <view>剩余金额{{info.spring_subsidy}}元</view>
         </view>
         <view class="b-bottom">
           <view class="pro">
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 0a61b56..1307631 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -403,7 +403,7 @@
         </form>
       </view>
     </uni-popup>
-    <activePopup v-if="userInfoData.mer_info.type_id"></activePopup>
+    <activePopup v-if="userInfoData.mer_info&&userInfoData.mer_info.type_id"></activePopup>
   </view>
 </template>
 
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index b91197e..a1bc262 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -104,7 +104,7 @@
               <view class="examine" @click="navigator(`/pages/payment/qrcode`)">
                 <image class="icon_img" src="@/static/images/index24.png" mode="aspectFit">
                 </image>
-                <text class="text">面对面收款</text>
+                <text class="text">提货付款</text>
               </view>
               
               <!-- <view class="examine" @click="navigator(`/pages/nongKe/teach_video/teach_video`)">
@@ -268,7 +268,7 @@
                 <view class="examine" @click="navigator(`/pages/payment/qrcode`)">
                   <image class="icon_img" src="@/static/images/index24.png" mode="aspectFit">
                   </image>
-                  <text class="text">面对面收款</text>
+                  <text class="text">提货付款</text>
                 </view>
 
                 <!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
@@ -369,7 +369,7 @@
                 <view class="examine" @click="navigator(`/pages/payment/qrcode`)">
                   <image class="icon_img" src="@/static/images/index24.png" mode="aspectFit">
                   </image>
-                  <text class="text">面对面收款</text>
+                  <text class="text">提货付款</text>
                 </view>
 
 
@@ -457,7 +457,7 @@
                 <view class="examine" @click="navigator(`/pages/payment/qrcode`)">
                   <image class="icon_img" src="@/static/images/index24.png" mode="aspectFit">
                   </image>
-                  <text class="text">面对面收款</text>
+                  <text class="text">提货付款</text>
                 </view>
 
               </view>
diff --git a/pages/payment/get_payment.vue b/pages/payment/get_payment.vue
index 90685a8..64cdcfc 100644
--- a/pages/payment/get_payment.vue
+++ b/pages/payment/get_payment.vue
@@ -3,7 +3,7 @@
 		<view style="height: var(--status-bar-height);"></view>
 
 		<view class="v-navbar">
-			<u-navbar title="面对面收款" @rightClick="rightClick" :autoBack="true" :fixed="false" bgColor="transparent"
+			<u-navbar title="提货付款" @rightClick="rightClick" :autoBack="true" :fixed="false" bgColor="transparent"
 				leftIconColor="#fff" :titleStyle="{color:'#fff',fontWeight:'bold',fontSize:'32rpx'}">
 			</u-navbar>
 		</view>
diff --git a/pages/payment/qrcode.vue b/pages/payment/qrcode.vue
index 310c770..9137cea 100644
--- a/pages/payment/qrcode.vue
+++ b/pages/payment/qrcode.vue
@@ -78,18 +78,19 @@
 <template>
 	<view class="container">
 		<view class="v-navbar">
-			<u-navbar title="面对面收款" :autoBack="true" :fixed="false" bgColor="transparent" leftIconColor="#fff"
+			<u-navbar title="提货付款" :autoBack="true" :fixed="false" bgColor="transparent" leftIconColor="#fff"
 				:titleStyle="{color:'#fff',fontWeight:'bold',fontSize:'32rpx'}">
 			</u-navbar>
 		</view>
 
-		<view class="v-desc">
+		<!-- <view class="v-desc">
 			<view class="v-desc-main">扫描二维码</view>
 			<view class="v-desc-sub">即可进入面对面付款</view>
-		</view>
+		</view> -->
 
 		<view class="v-qrcode">
 			<u-image width="540rpx" height="540rpx" :showLoading="true" :src="img" class="v-qrcode-img"></u-image>
+      <view style="color: #FF5E0C;text-align: center;" v-if="userInfo.mer_info">{{userInfo.mer_info.mer_name}}</view>
 		</view>
 
 		<view class="v-btn" @click="handleSavePic">
@@ -106,12 +107,14 @@
 	export default {
 		data() {
 			return {
-				img: ''
+				img: '',
+        userInfo: {}
 			}
 		},
 		onLoad(opt) {
       let user = this.$store.state.app.userInfo;
       if(typeof user =='string') user = JSON.parse(user);
+      this.userInfo = user;
       this.getQrcode(user.service.mer_id)
 		},
 		methods: {
diff --git a/pages/users/embody/embody.vue b/pages/users/embody/embody.vue
index ba6eea3..f1fb21d 100644
--- a/pages/users/embody/embody.vue
+++ b/pages/users/embody/embody.vue
@@ -66,7 +66,9 @@
             		当前押金: ￥{{ot_margin}}
             </view>
 						<view class='tip'>
-								说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额
+								说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br/>
+                提货付款订单完成后，该笔订单金额冻结时间为20分钟<br/>
+                因第三方平台收取0.6%的手续费，提现手续费在商户入驻后前三个月暂由平台垫付，由平台垫付的手续费后续在押金中扣除
 						</view>
 						<view class="btn-submit">
 							<button formType="submit" class='bnt b-color'>提现</button>
@@ -110,7 +112,9 @@
               		当前押金: ￥{{ot_margin}}
               </view>
 							<view class='tip'>
-								说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额
+								说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br/>
+                提货付款订单完成后，该笔订单金额冻结时间为20分钟<br/>
+                因第三方平台收取0.6%的手续费，提现手续费在商户入驻后前三个月暂由平台垫付，由平台垫付的手续费后续在押金中扣除
 							</view>
 							<button formType="submit" class='bnt b-color'>提现</button>
 						</view>
@@ -162,7 +166,9 @@
              		当前押金: ￥{{ot_margin}}
              </view>
 							<view class='tip'>
-								说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额
+								说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br/>
+                提货付款订单完成后，该笔订单金额冻结时间为20分钟<br/>
+                因第三方平台收取0.6%的手续费，提现手续费在商户入驻后前三个月暂由平台垫付，由平台垫付的手续费后续在押金中扣除
 							</view>
 						<view class="btn-submit">
 							<button formType="submit" class='bnt b-color'>提现</button>