Merge branch 'dev-20210728' into 'release'

Dev 20210728

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!282

src/style/common.scss

@@ -34,6 +34,13 @@ body, div, span, header, footer, nav, section, aside, article, ul, dl, dt, dd, l
     height: 0px;
     background-color: #fff;
 }
+.el-table ::-webkit-scrollbar{
+  width: 10px;
+  height: 10px;
+  background-color: rgb(184, 180, 180);
+}
+
+
 
 /*定义滚动条轨道 内阴影+圆角*/
 ::-webkit-scrollbar-track
@@ -265,4 +272,4 @@ html,body{
         height: 24px;
         width: 106px;
     }
-}
\ No newline at end of file
+}

src/utils/shop/index.js

@@ -47,6 +47,17 @@ export const queryOrderList = (params) => {
   })
 };
 
+export const expressInfo = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`campaign/distribution/logistics/expressInfo`),
+    method: 'get',
+    params: params,
+    description: '查询订单列表',
+  })
+};
+
+
 export const updateExpress = (params) => {
   return fetch({
     headers,

src/views/goods/order-detail.vue

@@ -8,7 +8,7 @@
         <div class="trade-status" v-if="showStatus == 2"><img src="../../assets/image/order/order_status2.png"/>已发货</div>
         <div class="trade-status" v-if="showStatus == 3"><img src="../../assets/image/order/order_status3.png"/>待发货</div>
         <div class="trade-status" v-if="showStatus == 4"><img src="../../assets/image/order/order_status4.png"/>等待买家付款</div>
-        <div class="trade-status" v-if="showStatus == 5"><img src="../../assets/image/order/order_status5.png"/>交易关闭</div>
+        <div class="trade-status" v-if="showStatus == 5"><img src="../../assets/image/order/order_status5.png"/>退款/关闭</div>
         <div class="trade-info">
           <el-card class="left-card">
             <div slot="header" class="clearfix">

src/views/goods/order-manage.vue

@@ -347,11 +347,7 @@
                 >查看详情</el-button
               >
               <el-button
-                v-if="
-                  (scope.row.storeType == 1 || scope.row.storeType == 2) &&
-                  scope.row.showStatus == 3 &&
-                  scope.row.refundStatus == 0
-                "
+                v-if="(scope.row.storeType == 1 || scope.row.storeType == 2) &&scope.row.showStatus == 3 &&scope.row.refundStatus == 0"
                 @click="openTuiDialog(scope.row)"
                 type="text"
                 size="small"
@@ -466,15 +462,36 @@
         :visible="viewLogisticsDialog"
         @close="cancelView"
         :show-close="false"
-        width="600px"
+        width="700px"
         center
       >
         <div class="view-content">
-          <i class="el-icon-truck" style="font-size: 18px"></i
-          ><span class="send-status">已发货</span>
-          <span class="view-number">{{ logisticeInfo }}</span>
-          <el-button type="text" @click="copyTxt">复制单号</el-button>
-          <el-button type="text" @click="updateOrderNo">修改物流单号</el-button>
+          <div>
+            <i class="el-icon-truck" style="font-size: 18px"></i
+            ><span class="send-status">已发货</span>
+            <span class="view-number">{{ logisticeInfo }}</span>
+          </div>
+          <div>
+            <el-button type="text" @click="copyTxt">复制单号</el-button>
+            <el-button type="text" @click="updateOrderNo"
+             v-if="showStatus == 2"
+              >修改物流单号</el-button
+            >
+          </div>
+        </div>
+        <div class="steps-logistics">
+          <el-steps direction="vertical" :active="0">
+            <el-step
+              v-for="(item,index) in expressData"
+              :title="item.time"
+              :description="item.context"
+              :key="index"
+            >
+            <div slot="icon">
+              <div class="dot"></div>
+            </div>
+            </el-step>
+          </el-steps>
         </div>
         <input type="text" id="copyInput" class="hidden-input" />
         <span slot="footer" class="dialog-footer">
@@ -607,6 +624,7 @@ import {
   brokerListAll,
   brokerOwnerListAll,
   updateExpressNo,
+  expressInfo
 } from "@/utils/shop";
 import { toDecimal2 } from "@/utils";
 
@@ -621,7 +639,7 @@ export default {
       curmbFirst: "云鹊店铺",
       curmbSecond: "订单管理",
       activeName: "all",
-
+      showStatus:-1,
       searchForm: {
         showStatus: -1,
         storeId: 0,
@@ -663,6 +681,10 @@ export default {
           { required: true, message: "请选择退款对象", trigger: "blur" },
         ],
       },
+      expressData:[{
+        time:"2021-06-23 12:21:21",
+        context:"待揽收"
+      }],
       showTuiDialog: false,
       tuiForm: {
         order: null,
@@ -858,13 +880,21 @@ export default {
     },
     //查看物流
     viewLogistics(row) {
-      this.viewLogisticsDialog = true;
-      this.logisticeInfo = `${row.expressName} ${row.expressNo}`;
-      this.expressForm.order = row;
-      this.expressForm.company = `${row.expressName}`;
-      this.expressForm.no = `${row.expressNo}`;
-      this.expressForm.extendMessage = `${row.remark}`;
+      console.log("row-----",row)
+      expressInfo({ expressNo: row.expressNo }).then((res) => {
+        if (res.code == "000000") {
+            this.expressData=[...res.data.data,...this.expressData]
+            this.logisticeInfo = `${row.expressName} ${row.expressNo}`;
+            this.expressForm.order = row;
+            this.expressForm.company = `${row.expressName}`;
+            this.expressForm.no = `${row.expressNo}`;
+            this.expressForm.extendMessage = `${row.remark}`;
+            this.showStatus=row.showStatus;
+            this.viewLogisticsDialog = true;
+        }
+      });
     },
+
     cancelView() {
       this.viewLogisticsDialog = false;
     },
@@ -946,7 +976,7 @@ export default {
       refundApply({
         orderId: this.tuiForm.order.id,
         userType: this.userType,
-        refundReason:this.tuiForm.refundReason
+        refundReason: this.tuiForm.refundReason,
       }).then((res) => {
         if (res.code == "000000") {
           this.$message.success("操作成功");
@@ -1062,6 +1092,25 @@ export default {
 </script>
 <style lang="scss">
 .order-manage-wrapper {
+  .el-step__icon{
+    border: none;
+    background: transparent;
+  }
+  .el-step__title{
+    font-size: 14px;
+  }
+
+  .el-step:last-of-type .el-step__line {
+    display: block !important;
+    height: 30%;
+  }
+  .dot{
+    border-radius: 50%;
+    height: 8px;
+    width: 8px;
+    border: 1px solid #999999;
+    background-color: #b8b8b8;
+  }
   .order-manage-content {
     background: #fff;
     padding: 10px;
@@ -1105,6 +1154,8 @@ export default {
 }
 
 .view-content {
+  display: flex;
+  justify-content: space-between;
   .send-status {
     margin-left: 5px;
   }
@@ -1123,6 +1174,10 @@ export default {
     color: #999999;
   }
 }
+.steps-logistics {
+  height: 350px;
+  overflow-y: scroll;
+}
 .hidden-input {
   height: 0;
 }