From bdbe986a1948b02996e12025dba2e23622cb24c5 Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Thu, 24 Aug 2023 18:11:32 +0800
Subject: [PATCH] =?UTF-8?q?pc=E7=AB=AFbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/index.vue      |  4 ++++
 src/views/statistics/index.vue | 40 +++++++++++++++++++++++++++-------
 vue.config.js                  |  4 ++--
 3 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 7a2d7e5..00588eb 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -56,6 +56,10 @@
         <div v-show="scope.row.status == 2">待发货</div>
         <div v-show="scope.row.status == 3">待收货</div>
         <div v-show="scope.row.status == 4">已完成</div>
+        <div v-show="scope.row.status == 0">已取消</div>
+      </template>
+      <template slot-scope="scope" slot="position">
+        <div>{{scope.row.province}}{{scope.row.city}}{{scope.row.district}}{{scope.row.address}}</div>
       </template>
       <template slot-scope="scope" slot="menuLeft">
         <!-- <el-button type="danger" size="small" @click="deleteItem"
diff --git a/src/views/statistics/index.vue b/src/views/statistics/index.vue
index 2fd639e..d709410 100644
--- a/src/views/statistics/index.vue
+++ b/src/views/statistics/index.vue
@@ -14,9 +14,9 @@
           <el-option v-for="item in ageData" :key="item.value" :label="item.label" :value="item.value"></el-option>
         </el-select>
       </template>
-      <template slot-scope="scope" slot="purchaseChannel">
+      <template slot-scope="scope" slot="purchaseChannelSearch">
         <el-select v-model="form.purchaseChannel" placeholder="请选择购买渠道">
-          <el-option v-for="item in channelData" :key="item.value" :label="item.label" :value="item.value"></el-option>
+          <el-option v-for="item in channelData" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
         </el-select>
       </template>
       <template slot-scope="scope" slot="timeArrSearch">
@@ -32,6 +32,10 @@
       <template slot-scope="scope" slot="nameSearch">
         <el-input v-model="form.name" placeholder="请输入来访人姓名"></el-input>
       </template>
+      <template slot-scope="scope" slot="orderNumberSearch">
+        <el-input v-model="form.orderNumber" placeholder="请输入订单编号"></el-input>
+      </template>
+      
       <template slot-scope="scope" slot="phonenumberSearch">
         <el-input v-model="form.phonenumber" placeholder="请输入手机"></el-input>
       </template>
@@ -284,10 +288,10 @@ export default {
         column: [
           {
             label: "订单编号",
-            prop: "orderNo",
+            prop: "orderNumber",
             search: true,
             searchslot: true,
-            minWidth: '120',
+            hide: true,
             // searchSpan: 4,
           },
           {
@@ -350,7 +354,16 @@ export default {
             // searchSpan: 5,
             // searchLabelWidth:100
           },
-
+          {
+            label: "订单编号",
+            prop: "orderNo",
+            align: "center",
+            // search: true,
+            // searchslot: true,
+            overHidden: true,
+            minWidth: '120',
+            // searchSpan: 4,
+          },
           {
             label: "姓名",
             prop: "username",
@@ -487,7 +500,9 @@ export default {
   created() {
     getPurchaseChannel().then(res => {
       this.channelData = res.data.data;
+      console.log('channelData',this.channelData)
     })
+    
     this.onLoad()
   },
   methods: {
@@ -590,7 +605,9 @@ export default {
           phone: this.form.phonenumber ? this.form.phonenumber : '',
           pillowHardness: this.form.hardness ? this.form.hardness : '',
           pillowMaterial: this.form.material ? this.form.material : '',
-          ageRange: this.form.age ? this.form.age : ''
+          ageRange: this.form.age ? this.form.age : '',
+          purchaseChannel: this.form.purchaseChannel ? this.form.purchaseChannel : '',
+          orderNo: this.form.orderNumber ? this.form.orderNumber : '',
         }
       } else {
         params = {
@@ -601,6 +618,8 @@ export default {
           ageRange: this.form.age ? this.form.age : '',
           startTime: this.form.timeArr[0],
           endTime: this.form.timeArr[1],
+          purchaseChannel: this.form.purchaseChannel ? this.form.purchaseChannel : '',
+          orderNo: this.form.orderNumber ? this.form.orderNumber : '',
         }
       }
       console.log('par', params)
@@ -624,7 +643,9 @@ export default {
           phone: this.form.phonenumber ? this.form.phonenumber : '',
           pillowHardness: this.form.hardness ? this.form.hardness : '',
           pillowMaterial: this.form.material ? this.form.material : '',
-          ageRange: this.form.age ? this.form.age : ''
+          ageRange: this.form.age ? this.form.age : '',
+          purchaseChannel: this.form.purchaseChannel ? this.form.purchaseChannel : '',
+          orderNo: this.form.orderNumber ? this.form.orderNumber : '',
         }
       } else {
         params = {
@@ -635,6 +656,8 @@ export default {
           ageRange: this.form.age ? this.form.age : '',
           startTime: this.form.timeArr[0],
           endTime: this.form.timeArr[1],
+          purchaseChannel: this.form.purchaseChannel ? this.form.purchaseChannel : '',
+          orderNo: this.form.orderNumber ? this.form.orderNumber : '',
         }
       }
       exportList(params).then(res => {
@@ -680,7 +703,8 @@ export default {
           console.log(res)
           if (res.data.code == 200) {
             this.$message.success('删除成功');
-            this.page.pageSize = 1;
+            this.page.currentPage = 1
+            this.page.pageSize = 10;
             this.onLoad()
           }
         })
diff --git a/vue.config.js b/vue.config.js
index b60c44d..0481aa6 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -27,8 +27,8 @@ module.exports = {
       "/api": {
         //本地服务接口地址
         // target: "http://192.168.3.32:80",
-        // target: "http://47.104.224.41:80",
-        target: "http://192.168.1.106:80",
+        target: "http://47.104.224.41:80",
+        // target: "http://192.168.1.106:80",
         //远程演示服务地址,可用于直接启动项目
         //target: 'https://saber.bladex.vip/api',
         ws: true,