Skip to content

M
marketing
Commit 40dd94ac by chenxin
Options

fix:edx 物流信息修改

parent 03b7c8e5
Showing with 19 additions and 10 deletions
dist/index.html
......@@ -2,4 +2,4 @@
gio('init','8be12240a3749eab', {});
//custom page code begin here
//custom page code end here
gio('send');</script><link href=/marketing/static/css/main.dc2f219e63d19e3c2825db893c75559e.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=https://unpkg.com/element-ui/lib/index.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.31.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.09.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.31.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.1.91.js></script><script type=text/javascript src=/marketing/static/js/manifest.a2f5242e14e2d4b3ee02.js></script><script type=text/javascript src=/marketing/static/js/vendor.4cb744d5df3ad4bdbad7.js></script><script type=text/javascript src=/marketing/static/js/main.b3eb0bce64fbab2035a9.js></script></body></html>
\ No newline at end of file
gio('send');</script><link href=/marketing/static/css/main.28157050a0041ff094b46d09f98cecc9.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=https://unpkg.com/element-ui/lib/index.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.31.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.09.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.31.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.1.91.js></script><script type=text/javascript src=/marketing/static/js/manifest.ada29fb7b84287a08122.js></script><script type=text/javascript src=/marketing/static/js/vendor.4cb744d5df3ad4bdbad7.js></script><script type=text/javascript src=/marketing/static/js/main.b3eb0bce64fbab2035a9.js></script></body></html>
\ No newline at end of file
dist/static/js/manifest.a2f5242e14e2d4b3ee02.js → dist/static/js/manifest.ada29fb7b84287a08122.js
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,c,a){for(var i,u,f,d=0,s=[];d<n.length;d++)u=n[d],t[u]&&s.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(r&&r(n,c,a);s.length;)s.shift()();if(a)for(d=0;d<a.length;d++)f=o(o.s=a[d]);return f};var n={},t={12:0};function o(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var r=t[e];if(0===r)return new Promise(function(e){e()});if(r)return r[2];var n=new Promise(function(n,o){r=t[e]=[n,o]});r[2]=n;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+({0:"game",1:"card",2:"wechat",3:"ewash",4:"evaluation",5:"message",6:"ecm",7:"recharge",8:"msg",9:"calllog"}[e]||e)+"."+{0:"939ef154a34f1a744ce0",1:"3e1481af8e558d5d77b9",2:"74cec9b4e7b2d7c30c85",3:"ac92094893ef171ce33f",4:"a639d4b91d56334ec9ea",5:"8b5a84b02f4c6a9c3090",6:"31d8299ebecd59279d15",7:"6235075e2c47716c5050",8:"5d9bccc98221e443f872",9:"101d05cb830d169de2d6"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var r=t[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),n},o.m=e,o.c=n,o.d=function(e,r,n){o.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:n})},o.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(r,"a",r),r},o.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},o.p="/marketing/",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,c,a){for(var i,u,f,d=0,s=[];d<n.length;d++)u=n[d],t[u]&&s.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(r&&r(n,c,a);s.length;)s.shift()();if(a)for(d=0;d<a.length;d++)f=o(o.s=a[d]);return f};var n={},t={12:0};function o(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var r=t[e];if(0===r)return new Promise(function(e){e()});if(r)return r[2];var n=new Promise(function(n,o){r=t[e]=[n,o]});r[2]=n;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+({0:"game",1:"card",2:"wechat",3:"ewash",4:"evaluation",5:"message",6:"ecm",7:"recharge",8:"msg",9:"calllog"}[e]||e)+"."+{0:"939ef154a34f1a744ce0",1:"3e1481af8e558d5d77b9",2:"74cec9b4e7b2d7c30c85",3:"cf3f92c47719bb15a6b8",4:"a639d4b91d56334ec9ea",5:"8b5a84b02f4c6a9c3090",6:"31d8299ebecd59279d15",7:"6235075e2c47716c5050",8:"5d9bccc98221e443f872",9:"101d05cb830d169de2d6"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var r=t[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),n},o.m=e,o.c=n,o.d=function(e,r,n){o.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:n})},o.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(r,"a",r),r},o.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},o.p="/marketing/",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/views/ewash/statements-detail.vue
......@@ -89,7 +89,8 @@
<p class="text-right mt10">
订单总价
<span class="gray ml5">(含运费{{ info.freightAmount | amount }}元)</span>
<span class="fz22 ml5 warning-color">¥ {{ (this.orderTableAmount + info.freightAmount) | amount }}</span>
<!-- 订单总价=真实支付金额+包括运费+补差价金额 -->
<span class="fz22 ml5 warning-color">¥ {{ (this.orderTableAmount + info.freightAmount + info.fixedPrice) | amount }}</span>
</p>
</section>
</el-col>
......@@ -105,8 +106,8 @@
<section class="dm-form__wrap statement-edit__info ml5">
<h3 class="dm-title__label"><i class="el-icon-location danger-color mr5"></i>物流跟踪</h3>
<el-timeline v-if="logistics.length">
<el-timeline-item v-for="(logistic, index) in logistics" :key="index" :icon="logistic.icon" :type="logistic.type" :color="logistic.color" :size="logistic.size" :timestamp="logistic.timestamp">
{{ logistic.content }}
<el-timeline-item v-for="(logistic, index) in logistics" :key="index" :color="index === logistics.length - 1 ? '#f5222d' : ''" :timestamp="logistic.time" :size="logistic.size">
{{ logistic.text }}
</el-timeline-item>
</el-timeline>
<div v-else class="gray">暂无数据</div>
......@@ -171,7 +172,12 @@ export default {
edxOrderDetail({ orderId: this.id }).then(res => {
this.loading = false;
this.info = res.result || {};
this.logistics = res.result.logistics || [];
try {
this.logistics = JSON.parse(res.result.logistics.logisticsInfo).delivery_status_list || [];
} catch (error) {
this.logistics = [];
}
/* eslint-disable */
this.ywTable = res.result.orderItems
? res.result.orderItems.filter(v => {
......@@ -179,7 +185,7 @@ export default {
})
: [];
this.ywTableAmount = this.ywTable.reduce((total, item) => {
return total + item.amount;
return total + (item.amount * item.total);
}, 0);
this.orderTable = res.result.orderItems
? res.result.orderItems.filter(v => {
......@@ -187,7 +193,7 @@ export default {
})
: [];
this.orderTableAmount = this.orderTable.reduce((total, item) => {
return total + item.amount;
return total + (item.amount * item.total);
}, 0);
/* eslint-disable */
const { status } = res.result;
......@@ -240,5 +246,8 @@ export default {
.dm-form__wrap {
margin: 0 auto;
}
.el-timeline-item__content {
line-height: 18px;
}
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment