From 1e18ee32b19a6f8913a71c490593e9494dac32f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=8F?= <1978476055@qq.com>
Date: Wed, 20 Nov 2024 16:25:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development               |  4 ++--
 src/views/order/list/index.vue | 26 +++++++-------------------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/.env.development b/.env.development
index bee31c8..f492ddc 100644
--- a/.env.development
+++ b/.env.development
@@ -4,8 +4,8 @@ ENV = 'development'
 # http://mer.crmeb.net/admin
 # base api
 # www.shop.xyz
-VUE_APP_BASE_API = 'http://zkx.tropjoin.com'
-# VUE_APP_BASE_API = 'http://test.tropjoin.com'
+# VUE_APP_BASE_API = 'http://zkx.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/index.vue b/src/views/order/list/index.vue
index 7f23a67..2f7d753 100644
--- a/src/views/order/list/index.vue
+++ b/src/views/order/list/index.vue
@@ -108,10 +108,10 @@
             @change="getList(1), getCardList()"
           >
             <el-option
-              v-for="item in activity"
-              :key="item.type"
-              :label="item.name"
-              :value="item.type"
+              v-for="(item, key) in activity"
+              :key="key"
+              :label="item"
+              :value="key"
             />
           </el-select>
         </el-form-item>
@@ -386,9 +386,7 @@
         </el-table-column>
         <el-table-column label="活动类型" min-width="100">
           <template slot-scope="scope">
-            <span>{{
-              scope.row.activity_type_name ? scope.row.activity_type_name : ""
-            }}</span>
+            <span>{{ scope.row.activity_type_name }}</span>
           </template>
         </el-table-column>
         <el-table-column label="商品信息" min-width="330">
@@ -584,18 +582,7 @@ export default {
         data: [],
         total: 0,
       },
-      activity: [
-        { name: "普通订单", type: 0 },
-        // {name: "秒杀订单",type: 1},
-        { name: "预售订单", type: 2 },
-        // 51 特惠 52惠美 53双十一活动   54 全折扣
-        { name: "特惠", type: 51 },
-        { name: "惠美", type: 52 },
-        { name: "双十一活动", type: 53 },
-        { name: "全折扣", type: 54 },
-        // {name: "助力订单",type: 3},
-        // {name: "拼团订单",type: 4}
-      ],
+      activity: {},
       listLoading: true,
       tableFrom: {
         order_sn: this.$route.query.order_sn ? this.$route.query.order_sn : "",
@@ -928,6 +915,7 @@ export default {
       orderListApi(this.tableFrom)
         .then((res) => {
           this.tableData.data = res.data.list;
+          this.activity = res.data.activity_types;
           this.tableData.total = res.data.count;
           //   this.cardLists = res.data.stat;
           this.listLoading = false;