From 4b939623717cc917d7bb7d12962fac2e96218184 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Fri, 12 Apr 2024 15:40:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=94=AF=E4=BB=98=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E8=AF=B4=E6=98=8E,=20=E5=95=86=E5=93=81=E5=A4=9A?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BC=E6=98=BE=E7=A4=BA"=E8=B5=B7"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                 | 4 ++--
 pages/goods_details/index.vue | 3 ++-
 pages/order_details/index.vue | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index 4711d00..3614d55 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "2.0.27",
-    "versionCode" : 2027,
+    "versionName" : "2.0.28",
+    "versionCode" : 2028,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index 3ff34d4..89c2bee 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -61,7 +61,8 @@
                 <view class='money p-color skeleton-rect' style="min-width: 70rpx;">
                   ￥
                   <text class='num'>{{storeInfo.price}}</text>
-                  <text style="color: #000;font-weight: 500;">{{"/"}}{{ storeInfo.unit_name}}</text>
+                  <text style="color: #000;font-weight: 500;" v-if="storeInfo.attr.length==0">{{"/"}}{{ storeInfo.unit_name}}</text>
+                  <text style="color: #000;font-weight: 500;" v-else>{{" 起 "}}</text>
                   <view v-if="svipData && svipData.show_svip_price && svipData.show_svip"
                     style="display: inline-block;">
                     <text class="vip-money">￥{{storeInfo.svip_price}}</text>
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index 099cf9e..6ebd316 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -244,6 +244,9 @@
 						<view class='conter' v-if="orderInfo.pay_type==4 || orderInfo.pay_type==5">支付宝支付</view>
 						<view class='conter'
 							v-if="orderInfo.pay_type==1 || orderInfo.pay_type==2 || orderInfo.pay_type==3">微信支付</view>
+            <view class='conter' v-if="orderInfo.pay_type==11">微信收款</view>
+            <view class='conter' v-if="orderInfo.pay_type==12">现金收款</view>
+            <view class='conter' v-if="orderInfo.pay_type==13">支付宝收款</view>
 					</view>
 					<view class='item acea-row row-between' v-if="orderInfo.mark">
 						<view>买家留言：</view>