首頁 探索 說明
登入
molingzhide
/
colexiu-mall-admin
1
0
複刻 0
Files 問題管理 0 合併請求 0 Wiki
瀏覽代碼

1

1
mo 2 年之前
父節點
e4562a1ef1 c917b31025
當前提交
be1925306d
共有 13 個文件被更改，包括 119 次插入 和 35 次删除
分割檢視 顯示文件統計
  1. 5 1
      dist/index.html
  2. 1 0
      dist/static/css/app.b85b416bc7f544153aafd02450367a48.css
  3. 1 0
      dist/static/css/app.efea4e9363d0635dddad2863ddbb39ae.css
  4. 0 0
      dist/static/css/app.efea4e9363d0635dddad2863ddbb39ae.css.map
  5. 0 0
      dist/static/js/0.a2f7bb837bd99f74b7d6.js
  6. 0 0
      dist/static/js/0.a2f7bb837bd99f74b7d6.js.map
  7. 0 0
      dist/static/js/manifest.9fc44ecdbc4c55f25c13.js.map
  8. 0 0
      dist/static/js/manifest.c84d9d4e3ac69a503d4e.js
  9. 1 0
      dist/static/js/manifest.c84d9d4e3ac69a503d4e.js.map
  10. 33 33
      package-lock.json
  11. 1 1
      package.json
  12. 19 0
      src/api/order.js
  13. 58 0
      src/views/oms/order/orderDetail.vue

+ 5 - 1
dist/index.html
查看文件 

@@ -7,4 +7,8 @@
 
         hm.src = "https://hm.baidu.com/hm.js?8b02a318fde5831da10426656a43d03c";
 
         var s = document.getElementsByTagName("script")[0];
 
         s.parentNode.insertBefore(hm, s);
 
-      })();</script><script src=./static/ks3jssdk/plupload.full.min.js></script><script src=./static/ks3jssdk/ks3jssdk.min.js></script><link href=./static/css/app.b85b416bc7f544153aafd02450367a48.css rel=stylesheet></head><body><script src=https://unpkg.com/tinymce@4.7.5/tinymce.min.js></script><div id=app></div><script type=text/javascript src=./static/js/manifest.9fc44ecdbc4c55f25c13.js></script><script type=text/javascript src=./static/js/vendor.07015f4555c6e302e551.js></script><script type=text/javascript src=./static/js/app.3d4fadb44c56736e941c.js></script></body></html>
 
+<<<<<<< HEAD
 
+      })();</script><script src=./static/ks3jssdk/plupload.full.min.js></script><script src=./static/ks3jssdk/ks3jssdk.min.js></script><link href=./static/css/app.b85b416bc7f544153aafd02450367a48.css rel=stylesheet></head><body><script src=https://unpkg.com/tinymce@4.7.5/tinymce.min.js></script><div id=app></div><script type=text/javascript src=./static/js/manifest.9fc44ecdbc4c55f25c13.js></script><script type=text/javascript src=./static/js/vendor.07015f4555c6e302e551.js></script><script type=text/javascript src=./static/js/app.3d4fadb44c56736e941c.js></script></body></html>
 
+=======
 
+      })();</script><script src=./static/ks3jssdk/plupload.full.min.js></script><script src=./static/ks3jssdk/ks3jssdk.min.js></script><link href=./static/css/app.efea4e9363d0635dddad2863ddbb39ae.css rel=stylesheet></head><body><script src=https://unpkg.com/tinymce@4.7.5/tinymce.min.js></script><div id=app></div><script type=text/javascript src=./static/js/manifest.c84d9d4e3ac69a503d4e.js></script><script type=text/javascript src=./static/js/vendor.07015f4555c6e302e551.js></script><script type=text/javascript src=./static/js/app.bff9700db634556c8b21.js></script></body></html>
 
+>>>>>>> main

File diff suppressed because it is too large
+ 1 - 0
dist/static/css/app.b85b416bc7f544153aafd02450367a48.css


File diff suppressed because it is too large
+ 1 - 0
dist/static/css/app.efea4e9363d0635dddad2863ddbb39ae.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.efea4e9363d0635dddad2863ddbb39ae.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.a2f7bb837bd99f74b7d6.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.a2f7bb837bd99f74b7d6.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.9fc44ecdbc4c55f25c13.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.c84d9d4e3ac69a503d4e.js


File diff suppressed because it is too large
+ 1 - 0
dist/static/js/manifest.c84d9d4e3ac69a503d4e.js.map


+ 33 - 33
package-lock.json
查看文件 

@@ -12,7 +12,7 @@
 
         "clean-deep": "^3.4.0",
 
         "dayjs": "^1.11.2",
 
         "echarts": "^4.2.0-rc.2",
 
-        "element-ui": "^2.3.7",
 
+        "element-ui": "^2.13.2",
 
         "js-cookie": "^2.2.0",
 
         "normalize.css": "^8.0.0",
 
         "nprogress": "^0.2.0",
 
@@ -359,9 +359,9 @@
 
       "dev": true
 
     },
 
     "node_modules/async-validator": {
 
-      "version": "1.8.2",
 
-      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.2.tgz",
 
-      "integrity": "sha1-t3WXIm6WJC+NUxwNRq4pX2JCK6Q=",
 
+      "version": "1.8.5",
 
+      "resolved": "https://registry.npmmirror.com/async-validator/-/async-validator-1.8.5.tgz",
 
+      "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
 
       "dependencies": {
 
         "babel-runtime": "6.x"
 
       }
 
@@ -2820,7 +2820,7 @@
 
     },
 
     "node_modules/deepmerge": {
 
       "version": "1.5.2",
 
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
 
+      "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-1.5.2.tgz",
 
       "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==",
 
       "engines": {
 
         "node": ">=0.10.0"
 
@@ -3179,9 +3179,9 @@
 
       "dev": true
 
     },
 
     "node_modules/element-ui": {
 
-      "version": "2.3.7",
 
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.3.7.tgz",
 
-      "integrity": "sha512-C0ZOz7lAgg+ST3dNhIGJXEJ7/ObdKioVo/YwiYq0HIdvwUmp9fEOGVL39q2my+WUxPqzrqG1uKE1r59npgSN9A==",
 
+      "version": "2.13.2",
 
+      "resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.13.2.tgz",
 
+      "integrity": "sha512-r761DRPssMPKDiJZWFlG+4e4vr0cRG/atKr3Eqr8Xi0tQMNbtmYU1QXvFnKiFPFFGkgJ6zS6ASkG+sellcoHlQ==",
 
       "dependencies": {
 
         "async-validator": "~1.8.1",
 
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
 
@@ -3191,7 +3191,7 @@
 
         "throttle-debounce": "^1.0.1"
 
       },
 
       "peerDependencies": {
 
-        "vue": "^2.5.2"
 
+        "vue": "^2.5.17"
 
       }
 
     },
 
     "node_modules/elliptic": {
 
@@ -7020,8 +7020,8 @@
 
     },
 
     "node_modules/normalize-wheel": {
 
       "version": "1.0.1",
 
-      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
 
-      "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
 
+      "resolved": "https://registry.npmmirror.com/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
 
+      "integrity": "sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA=="
 
     },
 
     "node_modules/normalize.css": {
 
       "version": "8.0.0",
 
@@ -10877,9 +10877,9 @@
 
       "dev": true
 
     },
 
     "node_modules/resize-observer-polyfill": {
 
-      "version": "1.5.0",
 
-      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.0.tgz",
 
-      "integrity": "sha512-M2AelyJDVR/oLnToJLtuDJRBBWUGUvvGigj1411hXhAdyFWqMaqHp7TixW3FpiLuVaikIcR1QL+zqoJoZlOgpg=="
 
+      "version": "1.5.1",
 
+      "resolved": "https://registry.npmmirror.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
 
+      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
 
     },
 
     "node_modules/resolve": {
 
       "version": "1.22.1",
 
@@ -12339,11 +12339,11 @@
 
       }
 
     },
 
     "node_modules/throttle-debounce": {
 
-      "version": "1.0.1",
 
-      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.0.1.tgz",
 
-      "integrity": "sha1-2tD+Ew+drzcZ/eoz3Dao5rp/MLU=",
 
+      "version": "1.1.0",
 
+      "resolved": "https://registry.npmmirror.com/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
 
+      "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg==",
 
       "engines": {
 
-        "node": ">=0.10.0"
 
+        "node": ">=4"
 
       }
 
     },
 
     "node_modules/through2": {
 
@@ -13999,9 +13999,9 @@
 
       "dev": true
 
     },
 
     "async-validator": {
 
-      "version": "1.8.2",
 
-      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.2.tgz",
 
-      "integrity": "sha1-t3WXIm6WJC+NUxwNRq4pX2JCK6Q=",
 
+      "version": "1.8.5",
 
+      "resolved": "https://registry.npmmirror.com/async-validator/-/async-validator-1.8.5.tgz",
 
+      "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
 
       "requires": {
 
         "babel-runtime": "6.x"
 
       }
 
@@ -16217,7 +16217,7 @@
 
     },
 
     "deepmerge": {
 
       "version": "1.5.2",
 
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
 
+      "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-1.5.2.tgz",
 
       "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
 
     },
 
     "define-properties": {
 
@@ -16535,9 +16535,9 @@
 
       "dev": true
 
     },
 
     "element-ui": {
 
-      "version": "2.3.7",
 
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.3.7.tgz",
 
-      "integrity": "sha512-C0ZOz7lAgg+ST3dNhIGJXEJ7/ObdKioVo/YwiYq0HIdvwUmp9fEOGVL39q2my+WUxPqzrqG1uKE1r59npgSN9A==",
 
+      "version": "2.13.2",
 
+      "resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.13.2.tgz",
 
+      "integrity": "sha512-r761DRPssMPKDiJZWFlG+4e4vr0cRG/atKr3Eqr8Xi0tQMNbtmYU1QXvFnKiFPFFGkgJ6zS6ASkG+sellcoHlQ==",
 
       "requires": {
 
         "async-validator": "~1.8.1",
 
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
 
@@ -19724,8 +19724,8 @@
 
     },
 
     "normalize-wheel": {
 
       "version": "1.0.1",
 
-      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
 
-      "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
 
+      "resolved": "https://registry.npmmirror.com/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
 
+      "integrity": "sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA=="
 
     },
 
     "normalize.css": {
 
       "version": "8.0.0",
 
@@ -22891,9 +22891,9 @@
 
       "dev": true
 
     },
 
     "resize-observer-polyfill": {
 
-      "version": "1.5.0",
 
-      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.0.tgz",
 
-      "integrity": "sha512-M2AelyJDVR/oLnToJLtuDJRBBWUGUvvGigj1411hXhAdyFWqMaqHp7TixW3FpiLuVaikIcR1QL+zqoJoZlOgpg=="
 
+      "version": "1.5.1",
 
+      "resolved": "https://registry.npmmirror.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
 
+      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
 
     },
 
     "resolve": {
 
       "version": "1.22.1",
 
@@ -24068,9 +24068,9 @@
 
       "dev": true
 
     },
 
     "throttle-debounce": {
 
-      "version": "1.0.1",
 
-      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.0.1.tgz",
 
-      "integrity": "sha1-2tD+Ew+drzcZ/eoz3Dao5rp/MLU="
 
+      "version": "1.1.0",
 
+      "resolved": "https://registry.npmmirror.com/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
 
+      "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="
 
     },
 
     "through2": {
 
       "version": "2.0.3",

+ 1 - 1
package.json
查看文件 

@@ -14,7 +14,7 @@
 
     "clean-deep": "^3.4.0",
 
     "dayjs": "^1.11.2",
 
     "echarts": "^4.2.0-rc.2",
 
-    "element-ui": "^2.3.7",
 
+    "element-ui": "^2.13.2",
 
     "js-cookie": "^2.2.0",
 
     "normalize.css": "^8.0.0",
 
     "nprogress": "^0.2.0",

+ 19 - 0
src/api/order.js
查看文件 

@@ -65,3 +65,22 @@ export function updateOrderNote(params) {
 
     params:params
 
   })
 
 }
 
+
 
+// 获取物流信息
 
+export function getSelectCourier(params) {
 
+  return request({
 
+    url:'/order/selectCourier',
 
+    method:'get',
 
+    params:params
 
+  })
 
+}
 
+
 
+// 刷新物流信息
 
+export function refreshCourier(params) {
 
+  return request({
 
+    url:'/order/refreshCourier',
 
+    method:'get',
 
+    params:params
 
+  })
 
+}
 
+

+ 58 - 0
src/views/oms/order/orderDetail.vue
查看文件 

@@ -312,6 +312,23 @@
 
           </template>
 
         </el-table-column>
 
       </el-table>
 
+      <div style="margin-top: 20px" class="flexbox">
 
+        <div>
 
+          <svg-icon icon-class="marker" style="color: #606266"></svg-icon>
 
+          <span class="font-small">物流信息</span>
 
+        </div>
 
+
 
+        <el-button size="mini" @click="refreshCourierList">刷新物流</el-button>
 
+      </div>
 
+      <el-timeline :reverse="reverse">
 
+        <el-timeline-item
 
+          v-for="(activity, index) in activities"
 
+          :key="index"
 
+          :timestamp="activity.timestamp"
 
+        >
 
+          {{ activity.content }}
 
+        </el-timeline-item>
 
+      </el-timeline>
 
     </el-card>
 
     <el-dialog
 
       title="修改收货人信息"
 
@@ -490,10 +507,13 @@ import {
 
   closeOrder,
 
   updateOrderNote,
 
   deleteOrder,
 
+  getSelectCourier,
 
+  refreshCourier
 
 } from "@/api/order";
 
 import LogisticsDialog from "@/views/oms/order/components/logisticsDialog";
 
 import { formatDate } from "@/utils/date";
 
 import VDistpicker from "v-distpicker";
 
+import dayjs from "dayjs";
 
 const defaultReceiverInfo = {
 
   orderId: null,
 
   receiverName: null,
 
@@ -528,12 +548,26 @@ export default {
 
       markOrderDialogVisible: false,
 
       markInfo: { note: null },
 
       logisticsDialogVisible: false,
 
+      reverse: false,
 
+      activities: [],
 
     };
 
   },
 
   created() {
 
     this.id = this.list = this.$route.query.id;
 
     getOrderDetail(this.id).then((response) => {
 
       this.order = response.data;
 
+      if (this.order.deliverySn) {
 
+        getSelectCourier({ deliverySn: this.order.deliverySn }).then((res) => {
 
+          if (res.code == 200) {
 
+            this.activities = JSON.parse(res.data.logistics).map((item) => {
 
+              return {
 
+                content: item.context,
 
+                timestamp: dayjs(item.time).format("YYYY-MM-DD HH:mm:ss"),
 
+              };
 
+            });
 
+          }
 
+        });
 
+      }
 
     });
 
   },
 
   filters: {
 
@@ -819,6 +853,20 @@ export default {
 
     showLogisticsDialog() {
 
       this.logisticsDialogVisible = true;
 
     },
 
+    refreshCourierList(){
 
+      if (this.order.deliverySn) {
 
+        refreshCourier({ deliverySn: this.order.deliverySn }).then((res) => {
 
+          if (res.code == 200) {
 
+            this.activities = JSON.parse(res.data.logistics).map((item) => {
 
+              return {
 
+                content: item.context,
 
+                timestamp: dayjs(item.time).format("YYYY-MM-DD HH:mm:ss"),
 
+              };
 
+            });
 
+          }
 
+        });
 
+      }
 
+    }
 
   },
 
 };
 
 </script>
 
@@ -874,6 +922,16 @@ export default {
 
   white-space: nowrap;
 
   margin: 0;
 
 }
 
+.el-timeline {
 
+  padding-left: 0 !important;
 
+  margin-top: 20px;
 
+}
 
+.flexbox {
 
+  display: flex;
 
+  flex-direction: row;
 
+  align-items: center;
 
+  justify-content: space-between;
 
+}
 
 </style>

Some files were not shown because too many files changed in this diff