Skip to content

M
marketing
Commit 9947046d by chenxin
Options

fix:edx update

parent ecf6f546
Showing with 32 additions and 14 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.f773a99c2c1573999fa765b74e355ddf.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.0f32a43ac3f52f9f7acf.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.8d29dd9805fd8a848c1ec063942368f9.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.e250a6206bdd9f06a707.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.0f32a43ac3f52f9f7acf.js → dist/static/js/manifest.e250a6206bdd9f06a707.js
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,c,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 c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(r&&r(n,c,a);s.length;)s.shift()();if(a)for(f=0;f<a.length;f++)d=o(o.s=a[f]);return d};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:"9e106d768c74472c79c0",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,s=0,d=[];s<n.length;s++)u=n[s],t[u]&&d.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);d.length;)d.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);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:"19e1231283fde567c8f5",2:"74cec9b4e7b2d7c30c85",3:"8a9846b7cc75e13f4e8f",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/card/record-get.vue
......@@ -74,7 +74,8 @@
</el-table-column>
<el-table-column label="操作" align="left" width="120px" fixed="right">
<template slot-scope="scope">
<el-button type="text" v-if="scope.row.status === 4 && Date.now() < scope.row.limitTime + 24 * 60 * 60 * 1000" @click="orderData(scope.row)">核销</el-button>
<!-- 卡券类型为 e袋洗 时 列表操作按钮 无手动核销按钮 -->
<el-button type="text" v-if="scope.row.status === 4 && Date.now() < scope.row.limitTime + 24 * 60 * 60 * 1000 && scope.row.gicCouponType !== 1" @click="orderData(scope.row)">核销</el-button>
<el-button type="text" v-if="scope.row.status === 4 && Date.now() < scope.row.limitTime + 24 * 60 * 60 * 1000" @click="delData(scope.row)">销毁</el-button>
</template>
</el-table-column>
......
src/views/ewash/statements-detail.vue
......@@ -94,6 +94,19 @@
<span v-else class="fz22 ml5 warning-color">¥ {{ (this.orderTableAmount + info.freightAmount) | amount }}</span>
</p>
</section>
<!-- 分拣信息 status > 5 && status !== 10 -->
<section class="dm-form__wrap statement-edit__info" v-if="info.status > 5 && info.status !== 10">
<h3 class="dm-title__label">分拣明细</h3>
<el-table :data="sortTable" style="width: 100%" class="mt20">
<el-table-column prop="categoryName" label="名称" minWidth="180"></el-table-column>
<el-table-column prop="total" label="数量" minWidth="180"></el-table-column>
<el-table-column label="单价" minWidth="180">
<template slot-scope="scope">
{{ scope.row.amount | amount }}
</template>
</el-table-column>
</el-table>
</section>
</el-col>
<el-col :span="6">
<section class="dm-form__wrap statement-edit__info ml5">
......@@ -154,6 +167,7 @@ export default {
ywTableAmount: 0, // 预约单服务总价
orderTable: [], // 订单table
orderTableAmount: 0, // 订单服务总价
sortTable: [], // 分拣table
// 订单状态 0(删除);1(待送洗或待揽收);2(待下单);3(待取件或预约成功);4(取件中);5(分拣计价);6(清洗中);7(待送回或送回中);8(待取件/已收件);9(已签收/已完成);10(已取消)
orderStatus: [],
logistics: []
......@@ -196,20 +210,22 @@ export default {
this.orderTableAmount = this.orderTable.reduce((total, item) => {
return total + (item.amount * item.total);
}, 0);
this.sortTable = res.result.orderItems
? res.result.orderItems.filter(v => {
return v.itemType === 3;
})
: [];
/* eslint-disable */
const { status } = res.result;
if(status === 0 || status === 10) {
this.orderStatus = status === 0 ? [ ...status1 ] : [ ...status10 ];
} else {
this.orderStatus = [ ...status2 ];
// 找到对应的status
const idx =this.orderStatus.findIndex(v => {
return v.status === status;
this.orderStatus = status2.map(v => {
v.size = v.status === status ? 'large' : '';
v.type = v.status === status ? 'primary' : '';
return v;
})
if (idx !== -1) {
this.orderStatus[idx].size='large';
this.orderStatus[idx].type='primary';
}
}
});
}
......@@ -218,7 +234,7 @@ export default {
this.handleDetail();
},
created() {
this.$store.commit('mutations_breadcrumb', [{ name: 'e袋洗服务', path: '/ewash/list' }, { name: 'e袋洗账单', path: '/ewash/statements' }, { name: '账单详情', path: '' }]);
this.$store.commit('mutations_breadcrumb', [{ name: 'e袋洗服务', path: '' }, { name: '服务列表', path: '/ewash/list' }, { name: 'e袋洗账单', path: '/ewash/statements' }, { name: '账单详情', path: '' }]);
}
};
</script>
......@@ -228,6 +244,7 @@ export default {
&__info {
/deep/ .el-col {
padding: 10px 0;
line-height: 17px;
}
padding: 20px 0;
// border-bottom:1px solid #DCDFE6;
......
src/views/ewash/statements.vue
......@@ -83,7 +83,7 @@ export default {
this.getTableList();
},
created() {
this.$store.commit('mutations_breadcrumb', [{ name: 'e袋洗服务', path: '' }, { name: 'e袋洗账单', path: '' }]);
this.$store.commit('mutations_breadcrumb', [{ name: 'e袋洗服务', path: '' }, { name: '服务列表', path: '/ewash/list' }, { name: 'e袋洗账单', path: '' }]);
},
methods: {
formatDateTimeByType,
......
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