From aa36d0191d8af8c7173fdcff7d738ae2ef07695a Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Mon, 28 Aug 2023 16:51:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=B5=81=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E8=AF=A6=E6=83=85=E6=A0=B7=E5=BC=8F=EF=BC=8C=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=8A=A5=E5=90=8D=E5=8D=95=E4=B8=AD=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/index.vue      | 53 +++++++++++++++++-------
 src/views/statistics/index.vue | 75 +++++++++++++++++-----------------
 src/views/wel/index.vue        |  2 +-
 3 files changed, 76 insertions(+), 54 deletions(-)

diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 0c035cd..0b1e129 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -96,7 +96,7 @@
             <template slot="label">
               <div>地址</div>
             </template>
-            <div style="width: 158px">{{ checkaccept.address }}</div>
+            <div>{{ checkaccept.province }}{{ checkaccept.city }}{{ checkaccept.district }}{{ checkaccept.address }}</div>
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">订单状态</template>
@@ -138,7 +138,28 @@
             :timestamp="activity.time"
             :color="activity.color">
             <div>
-              <p>{{activity.status == '揽收' ? '已揽件' : activity.status == '运输中' ? '运输中' : activity.status == '派件' ? '派件中' : activity.status == '投柜或驿站' ? '投柜或驿站' : ''}}</p> 
+              <!-- <p>{{activity.status == '揽收' ? '已揽件' : activity.status == '运输中' ? '运输中' : activity.status == '派件' ? '派件中' : activity.status == '投柜或驿站' ? '投柜或驿站' : ''}}</p>  -->
+              <p class="top_title" style="margin-top:0px;" :class="index == 0 ? 'active_top' : ''" v-if="activity.statusCode == '1' || activity.status == '103'">
+							已揽收
+						</p>
+						<p class="top_title" style="margin-top:0px;" :class="index == 0 ? 'active_top' : ''"  v-if="activity.statusCode == '101'">
+							已下单
+						</p>
+						<p class="top_title" style="margin-top:0px;"  :class="index == 0 ? 'active_top' : ''" v-if="activity.statusCode == '102'">
+							待揽收
+						</p>
+						<p class="top_title" style="margin-top:0px;" :class="index == 0 ? 'active_top' : ''"  v-if="activity.statusCode == '0' || activity.statusCode == '1001' || activity.statusCode == '1002' || activity.statusCode == '1003'">
+							运输中
+						</p>
+						<p class="top_title" style="margin-top:0px;" :class="index == 0 ? 'active_top' : ''" v-if="activity.statusCode == '5'">
+							派件中
+						</p>
+						<p class="top_title" style="margin-top:0px;" :class="index == 0 ? 'active_top' : ''" v-if="activity.statusCode == '501'">
+							已投递菜鸟驿站/快递柜
+						</p>
+						<p class="top_title" style="margin-top:0px;" :class="index == 0 ? 'active_top' : ''" v-if="activity.statusCode == '3' || activity.statusCode == '301' || activity.statusCode == '302' || activity.statusCode == '303' || activity.statusCode == '304'">
+							已签收
+						</p>
               <p>{{activity.context}}</p> 
             </div>
             
@@ -169,19 +190,21 @@ import md5 from "js-md5";
 export default {
   data() {
     return {
-      activities: [{
-          status:'在途',
-          content: '【昆明市】 快件已到达 昆明中转',
-          time: '2023-08-15 15:30:16'
-        }, {
-          status:'在途',
-          content: '【丽江市】 快件已发往 昆明中转',
-          time: '2023-08-14 19:02:02'
-        }, {
-          status:'揽收',
-          content: '【丽江市】 【丽江华坪县】（0888-8834031） 的 P1陈平（15108866686） 已揽收',
-          time: '2023-08-14 19:01:18'
-        }],
+      activities: [
+        // {
+        //   status:'在途',
+        //   content: '【昆明市】 快件已到达 昆明中转',
+        //   time: '2023-08-15 15:30:16'
+        // }, {
+        //   status:'在途',
+        //   content: '【丽江市】 快件已发往 昆明中转',
+        //   time: '2023-08-14 19:02:02'
+        // }, {
+        //   status:'揽收',
+        //   content: '【丽江市】 【丽江华坪县】（0888-8834031） 的 P1陈平（15108866686） 已揽收',
+        //   time: '2023-08-14 19:01:18'
+        // }
+        ],
       active: "1",
       form: {},
       dialogVisible: false,
diff --git a/src/views/statistics/index.vue b/src/views/statistics/index.vue
index 5659c5e..146ae6f 100644
--- a/src/views/statistics/index.vue
+++ b/src/views/statistics/index.vue
@@ -14,8 +14,8 @@
           <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="purchaseChannelSearch">
-        <el-select v-model="form.purchaseChannel" placeholder="请选择购买渠道">
+      <template slot-scope="scope" slot="roadSearch">
+        <el-select v-model="form.road" placeholder="请选择购买渠道">
           <el-option v-for="item in channelData" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
         </el-select>
       </template>
@@ -48,10 +48,12 @@
         <div v-show="scope.row.sleepingPosture == 1">仰睡</div>
         <div v-show="scope.row.sleepingPosture == 2">侧睡</div>
       </template>
-      <template slot-scope="scope" slot="road">
-        <div v-show="scope.row.road == 0">微信商城</div>
-        <div v-show="scope.row.road == 1">抖音商城</div>
-        <div v-show="scope.row.road == 2">微信小程序</div>
+      <template slot-scope="scope" slot="purchaseChannel">
+        <div>{{calcChannel(scope.row.purchaseChannel) }}</div>
+        <!-- <div v-show="scope.row.purchaseChannel == 0">微信商城</div>
+        <div v-show="scope.row.purchaseChannel == 1">抖音商城</div>
+        <div v-show="scope.row.purchaseChannel == 2">微信小程序</div>
+        <div v-show="scope.row.purchaseChannel == 4">微信小程序</div> -->
       </template>
       <template slot-scope="scope" slot="neckShoulderWidth">
         <div v-show="scope.row.neckShoulderWidth != '-1'">{{ scope.row.neckShoulderWidth }}</div>
@@ -79,10 +81,10 @@
       <template slot-scope="scope" slot="finishTime">
         <div>{{ scope.row.finishTime !== '' ? scope.row.finishTime : '---/-/---' }}</div>
       </template>
-      <template slot-scope="scope" slot="position">
+      <!-- <template slot-scope="scope" slot="position">
         <div>{{ (scope.row.province ? scope.row.province : '') + (scope.row.city ? scope.row.city : '') +
           (scope.row.district ? scope.row.district : '') + (scope.row.detail ? scope.row.detail : '') }}</div>
-      </template>
+      </template> -->
       <template slot-scope="scope" slot="menuLeft">
         <el-button icon="el-icon-delete" type="danger" size="small" plain @click="deleteItem">删除</el-button>
         <el-button icon="el-icon-download" type="warning" size="small" plain @click="exportData">导出</el-button>
@@ -118,12 +120,12 @@
           </template>
           <div>{{ checkaccept.weight }}</div>
         </el-descriptions-item>
-        <el-descriptions-item>
+        <!-- <el-descriptions-item>
           <template slot="label">
             <div>地址</div>
           </template>
           <div style="width: 158px">{{ checkaccept.position }}</div>
-        </el-descriptions-item>
+        </el-descriptions-item> -->
         <el-descriptions-item>
           <template slot="label">睡眠姿势</template>
           <div>
@@ -338,7 +340,7 @@ export default {
           },
           {
             label: "购买渠道",
-            prop: "purchaseChannel",
+            prop: "road",
             search: true,
             searchslot: true,
             hide: true,
@@ -389,13 +391,13 @@ export default {
             prop: "weight",
             align: "center",
           },
-          {
-            label: "地址",
-            overHidden: true,
-            prop: "position",
-            slot: true,
-            align: "center",
-          },
+          // {
+          //   label: "地址",
+          //   overHidden: true,
+          //   prop: "position",
+          //   slot: true,
+          //   align: "center",
+          // },
           {
             label: "睡眠姿势",
             slot: true,
@@ -452,14 +454,11 @@ export default {
             slot: true,
             align: "center",
           },
-          // {
-          //   label: "购买渠道",
-          //   prop: "purchaseChannel",
-          //   type: "select",
-          //   search: true,
-          //   slot: true,
-          //   align: "center",
-          // },
+          {
+            label: "购买渠道",
+            prop: "purchaseChannel",
+            align: "center",
+          },
           {
             label: "备注",
             prop: "remark",
@@ -516,10 +515,10 @@ export default {
       detailList({ id: row.id }).then(res => {
         console.log(res)
         this.checkaccept = res.data.data;
-        this.checkaccept.position = this.checkaccept.province +
-          this.checkaccept.city +
-          this.checkaccept.district +
-          this.checkaccept.detail
+        // this.checkaccept.position = this.checkaccept.province +
+        //   this.checkaccept.city +
+        //   this.checkaccept.district +
+        //   this.checkaccept.detail
       })
     },
     selectionChange(data) {
@@ -606,7 +605,7 @@ export default {
           pillowHardness: this.form.hardness ? this.form.hardness : '',
           pillowMaterial: this.form.material ? this.form.material : '',
           ageRange: this.form.age ? this.form.age : '',
-          purchaseChannel: this.form.purchaseChannel ? this.form.purchaseChannel : '',
+          purchaseChannel: this.form.road ? this.form.road : '',
           orderNo: this.form.orderNumber ? this.form.orderNumber : '',
         }
       } else {
@@ -618,7 +617,7 @@ 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 : '',
+          purchaseChannel: this.form.road ? this.form.road : '',
           orderNo: this.form.orderNumber ? this.form.orderNumber : '',
         }
       }
@@ -644,7 +643,7 @@ export default {
           pillowHardness: this.form.hardness ? this.form.hardness : '',
           pillowMaterial: this.form.material ? this.form.material : '',
           ageRange: this.form.age ? this.form.age : '',
-          purchaseChannel: this.form.purchaseChannel ? this.form.purchaseChannel : '',
+          purchaseChannel: this.form.road ? this.form.road : '',
           orderNo: this.form.orderNumber ? this.form.orderNumber : '',
         }
       } else {
@@ -656,7 +655,7 @@ 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 : '',
+          purchaseChannel: this.form.road ? this.form.road : '',
           orderNo: this.form.orderNumber ? this.form.orderNumber : '',
         }
       }
@@ -726,10 +725,10 @@ export default {
       this.diaType = 'edit';
       detailList({ id: row.id }).then(res => {
         this.checkaccept = res.data.data;
-        this.checkaccept.position = this.checkaccept.province +
-          this.checkaccept.city +
-          this.checkaccept.district +
-          this.checkaccept.detail
+        // this.checkaccept.position = this.checkaccept.province +
+        //   this.checkaccept.city +
+        //   this.checkaccept.district +
+        //   this.checkaccept.detail
       })
 
     },
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 83dd029..840a4c3 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -351,7 +351,7 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    // font-size: 80px;
+    font-size: 80px;
 
     .left_form{
       width: 70%;