From 47fdf715f31fb56463966eb98031e3a6adb680ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=8F?= <1978476055@qq.com>
Date: Wed, 25 Dec 2024 14:03:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E6=B4=BB=E5=8A=A8,ID?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                      | 2 +-
 src/views/order/list/orderDetails.vue | 8 ++++++--
 src/views/promoter/bonusLog/index.vue | 9 +++------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.env.development b/.env.development
index 5a24dde..f492ddc 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ ENV = 'development'
 # base api
 # www.shop.xyz
 # VUE_APP_BASE_API = 'http://zkx.tropjoin.com'
-VUE_APP_BASE_API = 'http://testg.tropjoin.com'
+VUE_APP_BASE_API = 'http://test.tropjoin.com'
 # VUE_APP_BASE_API = 'https://api.tropjoin.com'
 
 # socket 连接地址
diff --git a/src/views/order/list/orderDetails.vue b/src/views/order/list/orderDetails.vue
index 29eb673..5ba6b6e 100644
--- a/src/views/order/list/orderDetails.vue
+++ b/src/views/order/list/orderDetails.vue
@@ -223,7 +223,7 @@
                       {{ orderDetailList.delivery_type | sendWay }}
                     </div>
                   </li>
-                  <li
+                  <!-- <li
                     v-if="orderDetailList.platform_coupon_price > 0"
                     class="item"
                   >
@@ -241,7 +241,7 @@
                         orderDetailList.platform_coupon_price
                       }}元
                     </div>
-                  </li>
+                  </li> -->
                   <li class="item">
                     <div>支付运费：</div>
                     <div class="value">{{ orderDetailList.pay_postage }}</div>
@@ -313,6 +313,10 @@
                     <div>上级成长值：</div>
                     <div class="value">{{ orderDetailList.extension_two }}</div>
                   </li>
+                  <li class="item">
+                    <div>优惠活动：</div>
+                    <div class="value">{{ orderDetailList.luck_prizes }}</div>
+                  </li>
                 </ul>
               </div>
               <div class="section" v-if="orderDetailList.delivery_type === '1'">
diff --git a/src/views/promoter/bonusLog/index.vue b/src/views/promoter/bonusLog/index.vue
index e014b22..d856034 100644
--- a/src/views/promoter/bonusLog/index.vue
+++ b/src/views/promoter/bonusLog/index.vue
@@ -61,7 +61,8 @@
         <el-button size="small" type="primary" @click="exports">导出</el-button>
       </div>
       <el-table v-loading="listLoading" :data="tableData.data" size="small">
-        <el-table-column prop="bill_id" label="ID" min-width="50" />
+        <el-table-column prop="bill_id" label="ID" min-width="60" />
+        <el-table-column prop="user.number" label="ID号" min-width="70" />
         <el-table-column label="用户昵称" prop="nickname" min-width="150" />
         <el-table-column prop="user.phone" label="手机号" min-width="120" />
         <el-table-column
@@ -105,11 +106,7 @@
   </div>
 </template>
 <script>
-import {
-  integralLogTitle,
-  bonusLogLst,
-  bonusExport,
-} from "@/api/marketing";
+import { integralLogTitle, bonusLogLst, bonusExport } from "@/api/marketing";
 import fileList from "@/components/exportFile/fileList";
 import cardsData from "@/components/cards/index";
 import createWorkBook from "@/utils/newToExcel.js";