From b20042135e8a62fe7945a0712e64247344581141 Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Thu, 12 Dec 2024 16:37:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/index.vue   |  9 ++++++++-
 pages/order_details.vue | 21 ++++++++++++---------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/pages/order/index.vue b/pages/order/index.vue
index ddc25b4..26e1333 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -179,7 +179,14 @@
           v-if="!(iSdefaults == 5)"
           align="center"
           width="150"
-        ></el-table-column>
+        >
+          <template slot-scope="scope">
+            <!-- 在这里添加自定义内容和判断逻辑 -->
+            <span v-if="scope.row.order_status_name == `待审核` && scope.row.order_status == 1">待发货</span>
+            <span v-else>11{{scope.row.order_status_name}}</span>
+          </template>
+        </el-table-column>
+        <!--待审核是展示-->
         <el-table-column
           prop="refund_status_name"
           label="订单状态"
diff --git a/pages/order_details.vue b/pages/order_details.vue
index 1efd21c..b5c7b34 100644
--- a/pages/order_details.vue
+++ b/pages/order_details.vue
@@ -4,7 +4,8 @@
     <div class="crumbs">
       <el-breadcrumb separator="/">
         <el-breadcrumb-item :to="{ path: '/order' }">我的订单</el-breadcrumb-item>
-        <el-breadcrumb-item>{{ orderData.order_status_name }}</el-breadcrumb-item>
+        <el-breadcrumb-item v-if="orderData.order_status_name == `待审核` && orderData.order_status == 1">待发货</el-breadcrumb-item>
+        <el-breadcrumb-item v-else>{{ orderData.order_status_name }}</el-breadcrumb-item>
       </el-breadcrumb>
     </div>
     <!-- 订单信息 -->
@@ -96,7 +97,7 @@
             "
           >
             <div class="l">商品金额</div>
-            <div class="r">¥{{ orderData.pay.total_money }}</div>
+            <div class="r">¥{{ payInfo.total_money }}</div>
           </div>
 
           <div
@@ -111,7 +112,7 @@
             "
           >
             <div class="l">已付金额</div>
-            <div class="r">¥{{ orderData.pay.received_money }}</div>
+            <div class="r">¥{{ payInfo.received_money }}</div>
           </div>
           <div
             class="item"
@@ -125,7 +126,7 @@
             "
           >
             <div class="l">未付金额</div>
-            <div class="r">¥{{ orderData.pay.pay_money }}</div>
+            <div class="r">¥{{ payInfo.pay_money }}</div>
           </div>
 
 
@@ -250,7 +251,7 @@
 
 
         <!--展示该按钮的情况[pay.pay_status=0],不展示按钮的情况[订单锁定的is_lock=1,order.order_status=-1] -->
-        <div class="gl" v-if="orderData.pay.pay_status == 0 && orderData.pay.pay_money > 0 && orderData.order_status != -1" @click="clickJxfk">
+        <div class="gl" v-if="payInfo.pay_status == 0 && payInfo.pay_money > 0 && orderData.order_status != -1" @click="clickJxfk">
           继续付款
         </div>
 
@@ -416,10 +417,10 @@
             v-if="payState == 1"
           >
             <el-radio-group v-model="isBalance" class="czText" @change="paidChange">
-              <el-radio :label="false">待支付金额：￥{{ orderData.pay.pay_money }}</el-radio>
+              <el-radio :label="false">待支付金额：￥{{ payInfo.pay_money }}</el-radio>
               <el-radio :label="true"
                 >预存款支付（当前余额{{ userInfo.balance }}，本次抵扣{{
-                  orderData.pay.pay_money
+                  payInfo.pay_money
                 }}）</el-radio
               >
             </el-radio-group>
@@ -428,7 +429,7 @@
               <el-input
                 v-model="paymentForm.payment_money"
                 size="small"
-                :placeholder="Tobepaid ? orderData.pay.pay_money : Tobepaid"
+                :placeholder="Tobepaid ? payInfo.pay_money : Tobepaid"
                 disabled
               ></el-input>
             </el-form-item>
@@ -612,6 +613,7 @@ export default {
       userInfo: JSON.parse(localStorage.getItem("userInfo")),
       imgUrl: Setting.uplodBaseURL,
       orderData: {},
+      payInfo: {},//订单支付信息
       // 提示弹框配置
       dialogCon: {},
       dialogType: "", //弹框当前打开的弹框
@@ -682,6 +684,7 @@ export default {
         .then((res) => {
           console.log(res.data);
           this.orderData = res.data;
+          this.payInfo = res.data.pay;
           this.tableData = res.data.order_goods;
           this.tableData.map((item) => {
             item.buyer_messag = this.orderData.buyer_message;
@@ -786,7 +789,7 @@ export default {
         this.paymentForm.is_balance = false;
         this.Tobepaid = Number(this.orderData.pay_money);
       } else if (val) {
-        let num = Number(this.userInfo.balance) - Number(this.orderData.pay.pay_money);
+        let num = Number(this.userInfo.balance) - Number(this.payInfo.pay_money);
         this.paymentForm.is_balance = true;
         if (num < Number(this.userInfo.balance)) {
           this.Tobepaid = 0;