From a35ab8982e22c5a993a8f5de6d523549cf32a672 Mon Sep 17 00:00:00 2001
From: taozi <9108791@qq.com>
Date: Wed, 5 Apr 2023 18:59:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E7=9B=B8=E5=85=B3=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/shop/afterSeals/checkDialog.vue     | 52 +++++++++++++++++--
 src/views/shop/order/detail.vue               |  2 +-
 .../toolModule/tool-single-img.vue            |  4 +-
 3 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/src/views/shop/afterSeals/checkDialog.vue b/src/views/shop/afterSeals/checkDialog.vue
index c8f465c..1f3b83a 100644
--- a/src/views/shop/afterSeals/checkDialog.vue
+++ b/src/views/shop/afterSeals/checkDialog.vue
@@ -25,11 +25,11 @@
             <b>用户未上传图片</b>
           </div>
           <div v-else>
-            <el-image 
+            <el-image
               v-for="(item,index) in checkForm.explainImg.split(',')"
               :key="index"
               style="width: 100px; height: 100px"
-              :src="item" 
+              :src="item"
               :preview-src-list="[item]">
             </el-image>
           </div>
@@ -63,6 +63,18 @@
           <el-form-item label="邮费：">
             <el-input v-model="item.productInfo.postage" disabled />
           </el-form-item>
+          <el-form-item v-if="checkForm.deliveryName" label="快递公司：">
+            <el-input v-model="checkForm.deliveryName" disabled />
+          </el-form-item>
+          <el-form-item v-if="checkForm.deliverySn" label="快递单号：">
+            <el-input v-model="checkForm.deliverySn" disabled />
+          </el-form-item>
+          <el-form-item v-if="checkForm.deliveryTime" label="发货时间：">
+            <el-input v-model="checkForm.deliveryTime" disabled />
+          </el-form-item>
+          <el-form-item v-if="checkForm.deliverySn" label="订单跟踪：">
+            <el-button size="mini" @click="showLogisticsDialog">订单跟踪</el-button>
+          </el-form-item>
         </div>
       </el-form>
     </div>
@@ -83,6 +95,19 @@
         </el-form-item>
       </el-form>
     </div>
+    <el-dialog title="订单跟踪"
+               :visible.sync="kuaidiDialogVisible"
+               width="40%">
+      <el-steps direction="vertical"
+                :active="90"
+                finish-status="success"
+                space="50px">
+        <el-step  v-for="item in logisticsList"
+                  :key="item.AcceptStation"
+                  :title="item.AcceptStation"
+                  :description="item.AcceptTime"></el-step>
+      </el-steps>
+    </el-dialog>
     <div slot="footer" class="dialog-footer">
       <el-button class="refuse" type="danger" v-if="isShow" :loading="loading" @click="submit(1)">拒绝</el-button>
       <el-button class="check" type="primary" v-if="isShow" :loading="loading" @click="submit(0)">确认</el-button>
@@ -92,6 +117,7 @@
 
 <script>
 import {salesCheck} from '@/api/yxStoreAfterSales.js'
+import { express } from '@/api/yxStoreOrder'
 export default {
   props: {
   },
@@ -100,7 +126,9 @@ export default {
       visible: false,
       isShow: false,
       loading: false,
+      kuaidiDialogVisible: false,
       serviceType: '',
+      logisticsList:[],
       checkForm: {},
       form: {
         salesId: '', // 售后id
@@ -122,6 +150,24 @@ export default {
       this.visible = false
       this.$refs['form'].resetFields()
     },
+    showLogisticsDialog(){
+      this.express();
+    },
+    express() {
+      let params ={
+        "orderCode": this.checkForm.id,
+        "shipperCode": this.checkForm.deliverySn,
+        "logisticCode": this.checkForm.deliveryId
+      }
+
+      express(params).then(res=>{
+        this.expressInfo = res.Traces
+        this.kuaidiDialogVisible = true;
+        this.logisticsList = this.expressInfo
+      }).catch(err => {
+      })
+
+    },
     async submit(type) {
       this.loading = true
       if (this.serviceType === 0) {
@@ -168,4 +214,4 @@ export default {
   .refuse{}
   .check{}
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/shop/order/detail.vue b/src/views/shop/order/detail.vue
index 2dba2c3..831c0e1 100644
--- a/src/views/shop/order/detail.vue
+++ b/src/views/shop/order/detail.vue
@@ -24,7 +24,7 @@
           <el-button size="mini" @click="remark(order)">备注订单</el-button>
         </div>
         <div class="operate-button-container" v-show="order._status===3">
-          <el-button size="mini" @click="refund(order)">立即退款</el-button>
+<!--          <el-button size="mini" @click="refund(order)">立即退款</el-button>-->
           <el-button size="mini" @click="remark(order)">备注订单</el-button>
         </div>
         <div class="operate-button-container" v-show="order._status===2">
diff --git a/src/views/theme/components/rootcompToolbar/toolModule/tool-single-img.vue b/src/views/theme/components/rootcompToolbar/toolModule/tool-single-img.vue
index d6c91c3..510af05 100644
--- a/src/views/theme/components/rootcompToolbar/toolModule/tool-single-img.vue
+++ b/src/views/theme/components/rootcompToolbar/toolModule/tool-single-img.vue
@@ -28,8 +28,8 @@
         class="overlay"
         v-if="imageUrl"
       >
-        <!-- <i class="iconfont icon-chakan" @click="showImage"></i>
-        <i class="iconfont icon-shanchu1" @click="delImage"></i> -->
+        <i class="iconfont icon-chakan" @click="showImage"></i>
+        <i class="iconfont icon-shanchu1" @click="delImage"></i>
       </div>
     </div>
     <el-dialog