From bd06f19214035964eaf0dd4030907326dbc0f56a Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 20 Mar 2024 16:29:58 +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

---
 pages/activeCode/subsidy.vue |  2 +-
 pages/product/basicSet.vue   | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pages/activeCode/subsidy.vue b/pages/activeCode/subsidy.vue
index 092230b..2ed42a0 100644
--- a/pages/activeCode/subsidy.vue
+++ b/pages/activeCode/subsidy.vue
@@ -17,7 +17,7 @@
         <view class="c-body-text">
           <view class="price">{{info.subsidy_amount}}元</view>
           <view>
-            <text v-if="info.subsidy_status" class="price">{{info.subsidy_status_name}}</text>
+            <text v-if="info.subsidy_status==2" class="price">{{info.subsidy_status_name}}</text>
             <text v-else>{{info.subsidy_status_name}}</text>
           </view>
         </view>
diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue
index 44620b5..9bfcced 100644
--- a/pages/product/basicSet.vue
+++ b/pages/product/basicSet.vue
@@ -98,10 +98,10 @@
 					<text class="sub_title">配送方式：</text>
 					<view class="flex">
 						<checkbox-group name="" @change="checkboxChange">
-							<checkbox disabled='true' :checked="isZiti" :value="check.ziti" /><text
-								class="text ziti">到店自提(加入供应链)</text>
-							<checkbox disabled='true' :checked="isKuaidi" :value="check.kuaidi" /><text
-								class="text">快递配送</text>
+							<checkbox disabled :checked="isZiti" :value="check.ziti" /><text
+								class="text ziti">到店自提</text>
+							<checkbox :checked="isKuaidi" :value="check.kuaidi" /><text
+								class="text">商家配送</text>
 						</checkbox-group>
 					</view>
 				</view>
@@ -258,7 +258,7 @@
 				},
 				isZiti: false,
 				isKuaidi: false,
-				delivery_way: [1, 2],
+				delivery_way: [1],
 				takeName: '',
 				takePhone: '',
 				servicePhone: '',
@@ -318,7 +318,6 @@
 			this.getMerchantInfo(e.mer_id)
 
 			this.isZiti = true
-			this.isKuaidi = true
 		},
 		onShow() {},
 		methods: {
@@ -423,7 +422,7 @@
 					mer_avatar: this.images[1].img,
 					mini_banner: this.images[2].img,
 					mer_certificate: this.images[3].img,
-					delivery_way: [1, 2],
+					delivery_way: this.delivery_way,
 					mer_take_name: this.takeName,
 					mer_take_phone: this.takePhone,
 					mer_take_address: this.detailSite,