From d9de630f4080b8bed21477e037d81045e69698bd Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Sat, 2 Dec 2023 13:42:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=EF=BC=9A=E6=96=87=E5=88=9B?=
 =?UTF-8?q?=E8=B1=86=E5=85=91=E6=8D=A2=E5=95=86=E5=93=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=85=91=E6=8D=A2=E9=A2=9D=E5=BA=A6=E5=85=91=E6=8D=A2?=
 =?UTF-8?q?=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/goods/goods_order.vue                    |  6 +++---
 src/views/goods/goods_order_controller.js          |  2 ++
 src/views/member/weight_value/legumes/shopping.vue | 11 +++++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/views/goods/goods_order.vue b/src/views/goods/goods_order.vue
index eb523c9..f611dad 100644
--- a/src/views/goods/goods_order.vue
+++ b/src/views/goods/goods_order.vue
@@ -829,10 +829,10 @@
       </div>
 
       <div class="price list" v-if="is_legumes_exchange && is_allow_use_legumes_exchange && use_legumes_exchange > 0">
-        <div class="left ">需要文创豆</div>
+        <div class="left ">需要兑换额度</div>
         <div class="right">
           <div class="right">
-            <span style="color: #e84e40;">{{ use_legumes_exchange }}豆</span>
+            <span style="color: #e84e40;">{{ use_legumes_price_total }}</span>
           </div>
         </div>
       </div>
@@ -866,7 +866,7 @@
     <div class="detail_pay">
       <template v-if="is_legumes_exchange == 1">
         <div v-if="is_allow_use_legumes_exchange" class="order_delete" :class="{ disabled: yz_subscribe_disabled }" @click="submit">立即兑换</div>
-        <div v-else class="order_delete" :class="{ disabled: yz_subscribe_disabled }">文创豆不足</div>
+        <div v-else class="order_delete" :class="{ disabled: true }">额度不足</div>
       </template>
       <template v-else>
         <ul class="total">
diff --git a/src/views/goods/goods_order_controller.js b/src/views/goods/goods_order_controller.js
index 429d99e..8859f09 100644
--- a/src/views/goods/goods_order_controller.js
+++ b/src/views/goods/goods_order_controller.js
@@ -345,6 +345,7 @@ export default {
       is_legumes_exchange: 0,// 是否使用文创豆兑换
       is_allow_use_legumes_exchange: 0,// 是否允许使用文创豆兑换
       use_legumes_exchange: 0,// 使用的文创豆数量
+      use_legumes_price_total: 0,// 使用的额度
     };
   },
 
@@ -2110,6 +2111,7 @@ export default {
 
       this.use_legumes_exchange = data.use_legumes_exchange_total || 0;
       this.is_allow_use_legumes_exchange = data.is_allow_exchange || 0;
+      this.use_legumes_price_total = data.use_legumes_price_total || 0;
 
       if (data.discount && data.discount.default_deduction && data.discount.default_deduction != 0) {
         // 获取第一次接口默认积分抵扣
diff --git a/src/views/member/weight_value/legumes/shopping.vue b/src/views/member/weight_value/legumes/shopping.vue
index 86f73bf..9e2aade 100644
--- a/src/views/member/weight_value/legumes/shopping.vue
+++ b/src/views/member/weight_value/legumes/shopping.vue
@@ -12,7 +12,7 @@
           </div>
           <i class="fa fa-angle-right legumes-icon"></i>
         </div>
-        <div class="exchange_legumes">兑换额度：<span class="hold_exchange_legumes">{{ goods_legumes }}</span></div>
+        <div class="exchange_legumes">兑换额度：<span class="hold_exchange_legumes">{{ goods_legumes_money }}</span></div>
       </div>
       <!--任务和商品-->
       <div class="task-and-goods" v-if="task_video_link || is_show_share">
@@ -48,16 +48,16 @@
               <img class="legumes-img" :src="item.goods_thumb">
               <div class="info">
                 <div class="g-title">{{ item.goods_title }}</div>
-                <div class="g-price">价值 ¥ {{ item.legumes_exchange_price }}</div>
+                <div class="g-price">价值 ¥ {{ item.goods_price }}</div>
                 <div class="g-footer">
                   <div class="g-f-left">
                     <div class="sale">7613人已兑换</div>
                     <div class="need-legumes">
-                      <span class="need-num">{{ item.use_legumes }}</span>文创豆
+                      <span class="need-num">¥{{ item.legumes_exchange_price }}</span>
                     </div>
                   </div>
                   <div v-if="item.is_allow_exchange" class="g-f-btn" @click="exchangeGoods(item)">立即兑换</div>
-                  <div v-else class="g-f-btn not-click">文创豆不足</div>
+                  <div v-else class="g-f-btn not-click">额度不足</div>
                 </div>
               </div>
             </div>
@@ -221,6 +221,7 @@ export default {
       // 顶部内容
       hold_legumes: 0,// 当前持有文创豆数量
       goods_legumes: 0,// 兑换额度
+      goods_legumes_money: 0,// 兑换金额
       task_video_link: '',
       is_show_share: false,// 是否显示分享任务  仅微信浏览器中显示
       // 提现相关
@@ -277,6 +278,7 @@ export default {
           if (response.result === 1) {
             _this.hold_legumes = Math.floor(response.data.voucher_number);
             _this.goods_legumes = Math.floor(response.data.goods_legumes);
+            _this.goods_legumes_money = response.data.goods_legumes_money;
             _this.task_video_link = response.data.task_video_link || '';
           } else {
             _this.$dialog.alert({message: response.msg}).then(() => {
@@ -787,6 +789,7 @@ export default {
               .need-legumes {
                 color: #f9564b;
                 font-size: 12px;
+                text-align: left;
 
                 .need-num {
                   font-size: 16px;