Skip to content

M
marketing
Commit 360003d6 by chenxin
Options

fix:edx 补差价

parent 10993d93
Showing with 25 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.3d86c380ed7d2f30df574df74b141c2f.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.04.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.2bcd0db4535a4c80b645.js></script><script type=text/javascript src=/marketing/static/js/vendor.4cb744d5df3ad4bdbad7.js></script><script type=text/javascript src=/marketing/static/js/main.4302aa674177ad5a8881.js></script></body></html>
\ No newline at end of file
gio('send');</script><link href=/marketing/static/css/main.563bb16b8b3706ac63a01fd32b5b3ad1.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.04.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.31e4281aa8cc069a23de.js></script><script type=text/javascript src=/marketing/static/js/vendor.4cb744d5df3ad4bdbad7.js></script><script type=text/javascript src=/marketing/static/js/main.4302aa674177ad5a8881.js></script></body></html>
\ No newline at end of file
dist/static/js/manifest.2bcd0db4535a4c80b645.js deleted 100644 → 0
!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:"ed20d27aeaa55df29c5d",2:"74cec9b4e7b2d7c30c85",3:"24548e35863d5a9af20c",4:"a639d4b91d56334ec9ea",5:"8b5a84b02f4c6a9c3090",6:"082b04e2e2d5c4e505cc",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
dist/static/js/manifest.31e4281aa8cc069a23de.js 0 → 100644
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,o,a){for(var i,u,d,f=0,s=[];f<n.length;f++)u=n[f],t[u]&&s.push(t[u][0]),t[u]=0;for(i in o)Object.prototype.hasOwnProperty.call(o,i)&&(e[i]=o[i]);for(r&&r(n,o,a);s.length;)s.shift()();if(a)for(f=0;f<a.length;f++)d=c(c.s=a[f]);return d};var n={},t={12:0};function c(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,c),t.l=!0,t.exports}c.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,c){r=t[e]=[n,c]});r[2]=n;var o=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,c.nc&&a.setAttribute("nonce",c.nc),a.src=c.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:"ed20d27aeaa55df29c5d",2:"74cec9b4e7b2d7c30c85",3:"d1d7acc6579e8edd261d",4:"a639d4b91d56334ec9ea",5:"8b5a84b02f4c6a9c3090",6:"082b04e2e2d5c4e505cc",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,o.appendChild(a),n},c.m=e,c.c=n,c.d=function(e,r,n){c.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:n})},c.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(r,"a",r),r},c.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},c.p="/marketing/",c.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/views/ewash/statements-detail.vue
......@@ -13,7 +13,7 @@
<span class="primary-font-color">卡券核销码：</span><span class="regular-font-color">{{ info.couponNo || '--' }}</span>
</el-col>
<el-col :span="12">
<span class="primary-font-color">预约时间：</span><span class="regular-font-color">{{ info.createTime || '--' }}</span>
<span class="primary-font-color">预约时间：</span><span class="regular-font-color">{{ info.preTime || '--' }}</span>
</el-col>
<el-col :span="12">
<span class="primary-font-color">会员手机号：</span><span class="regular-font-color">{{ info.memberPhone }}</span>
......@@ -42,7 +42,7 @@
</el-table>
<p class="text-right mt10">
服务总价
<span class="fz16 ml5">¥ {{ info.totalAmount | amount }}</span>
<span class="fz16 ml5">¥ {{ this.ywTableAmount | amount }}</span>
</p>
<p class="text-right mt10">
卡券支付
......@@ -60,10 +60,13 @@
<span class="primary-font-color">支付流水号：</span><span class="regular-font-color">{{ info.edaixiPayNumber || '--' }}</span>
</el-col>
<el-col :span="12">
<span class="primary-font-color">取件时间：</span><span class="regular-font-color">{{ info.templateName || '--' }}</span>
<span class="primary-font-color">取件时间：</span><span class="regular-font-color">{{ info.deliverTime || '--' }}</span>
</el-col>
<el-col :span="12">
<span class="primary-font-color">补差价原因：</span><span class="regular-font-color">{{ info.fixedReason || '--' }}</span>
</el-col>
<el-col :span="24">
<span class="primary-font-color">订单备注：</span><span class="regular-font-color">{{ info.remark }}</span>
<span class="primary-font-color">订单备注：</span><span class="regular-font-color">{{ info.remark || '--' }}</span>
</el-col>
</el-row>
<el-table :data="orderTable" style="width: 100%" class="mt20">
......@@ -77,12 +80,16 @@
</el-table>
<p class="text-right mt10">
服务总价
<span class="fz16 ml5">¥ {{ info.totalAmount }}</span>
<span class="fz16 ml5">¥ {{ this.orderTableAmount | amount }}</span>
</p>
<p class="text-right mt10">
补差价
<span class="fz16 ml5">¥ {{ info.fixedPrice | amount }}</span>
</p>
<p class="text-right mt10">
订单总价
<span class="gray ml5">(含运费{{ info.freightAmount | amount }}元)</span>
<span class="fz22 ml5 warning-color">¥ {{ info.couponAmount | amount }}</span>
<span class="fz22 ml5 warning-color">¥ {{ (this.orderTableAmount + info.freightAmount) | amount }}</span>
</p>
</section>
</el-col>
......@@ -141,7 +148,9 @@ export default {
orderItems: []
},
ywTable: [], // 预约单table
ywTableAmount: 0, // 预约单服务总价
orderTable: [], // 订单table
orderTableAmount: 0, // 订单服务总价
// 订单状态 0(删除);1(待送洗或待揽收);2(待下单);3(待取件或预约成功);4(取件中);5(分拣计价);6(清洗中);7(待送回或送回中);8(待取件/已收件);9(已签收/已完成);10(已取消)
orderStatus: [],
logistics: []
......@@ -167,11 +176,17 @@ export default {
return v.itemType === 0;
})
: [];
this.ywTableAmount = this.ywTable.reduce((total, item) => {
return total + item.amount;
}, 0);
this.orderTable = res.result.orderItems
? res.result.orderItems.filter(v => {
return v.itemType === 1;
})
: [];
this.orderTableAmount = this.orderTable.reduce((total, item) => {
return total + item.amount;
}, 0);
/* eslint-disable */
const { status } = res.result;
if(status === 0 || status === 10) {
......
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