Skip to content

M
marketing
Commit afc3cdc7 by chenxin
Options

fix:build e袋洗功能

parent 32da3402
Showing with 192 additions and 391 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.d18bf09887d5733d9b71ab2b86a42627.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.30.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.07.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.48fd9d296d8ec510a0ec.js></script><script type=text/javascript src=/marketing/static/js/vendor.4cb744d5df3ad4bdbad7.js></script><script type=text/javascript src=/marketing/static/js/main.4029a5ea242b5cf3720d.js></script></body></html>
\ No newline at end of file
gio('send');</script><link href=/marketing/static/css/main.8342d0b7532d3f8c89cfe3ac92445328.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.30.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.07.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.8ec78b4377cf2b88678b.js></script><script type=text/javascript src=/marketing/static/js/vendor.4cb744d5df3ad4bdbad7.js></script><script type=text/javascript src=/marketing/static/js/main.4029a5ea242b5cf3720d.js></script></body></html>
\ No newline at end of file
dist/static/js/manifest.48fd9d296d8ec510a0ec.js → dist/static/js/manifest.8ec78b4377cf2b88678b.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:"e34fbb233db6fd4dbd94",2:"74cec9b4e7b2d7c30c85",3:"38984ab90b711b2239d0",4:"a639d4b91d56334ec9ea",5:"8b5a84b02f4c6a9c3090",6:"1eea4e6e08cc95d8322d",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:"e34fbb233db6fd4dbd94",2:"74cec9b4e7b2d7c30c85",3:"0be1cc33ec6a3ae5a487",4:"a639d4b91d56334ec9ea",5:"8b5a84b02f4c6a9c3090",6:"1eea4e6e08cc95d8322d",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/service/api/ewashApi.js
......@@ -13,6 +13,7 @@ export const openEdxStoreSearch = params => requests(PREFIX + 'open-edx-store-se
export const openEdxStore = params => requests(PREFIX + 'open-edx-store', params);
// 订单详情
export const edxOrderDetail = params => requests(PREFIX + 'edx-order-detail', params);
// e袋洗 商品使用类目
export const getEdxCategory = params => requests(PREFIX + 'edx-category', params);
// 导出卡券
export const exportEdxOrderCsv = config.api + PREFIX + 'edx-order-csv';
src/views/ewash/form.js
......@@ -48,10 +48,11 @@ const initForm = {
proNoList: [],
discount_amount_upper_limit: 0,
goods_discounts_number_upper_limit: 0,
products_exchange_number: 0
products_exchange_number: 0,
edxGoodsList: [] // e袋洗适用类目
};
const sale_limit = { fee: 0, goods: '', flag: false, type: 0 }; //最低消费
const goods = { ok: '', no: '', flag: false };
const goods = { ok: '', no: '', flag: false, edx: false };
export default {
// mixins: [xxSysp_mix],
data() {
......@@ -66,9 +67,7 @@ export default {
goods: JSON.parse(JSON.stringify(goods)),
only: false,
// e袋洗适用类目
ableCategory: {
visible: false
},
ableCategoryVisible: false,
cardLimitRadio: 1,
rules: {
// cardApplyChannel: { required: true, type: 'array', message: '请选择卡券渠道', trigger: 'change' },
......@@ -175,6 +174,17 @@ export default {
}
},
methods: {
/** e袋洗 */
saveAbleCategory() {
const edxGoodsList = this.$refs.category.getCategory();
if (edxGoodsList.length === 0) {
this.$tips({ message: '请先选择适用类目', type: 'error' });
return;
}
this.form.edxGoodsList = edxGoodsList;
this.ableCategoryVisible = false;
},
/** e袋洗 */
//切换卡券类型 表单置为默认值
reset(e) {
this.form = JSON.parse(JSON.stringify(initForm));
......@@ -255,6 +265,11 @@ export default {
this.form.cardColor = card.cardColor;
this.form.cardDenomination = card.cardDenomination || 0;
this.form.giftCouponValue = card.giftCouponValue || 0;
console.log(card);
if (card.edxGoodsList) {
this.goods.edx = true;
this.form.edxGoodsList = JSON.parse(card.edxGoodsList) || []; // e袋洗适用商品
}
if (card.useCondition) {
const useCondition = (this.form.useCondition = JSON.parse(card.useCondition));
this.sale_limit.fee = useCondition.sale_limit ? useCondition.sale_limit.fee || 0 : 0;
......@@ -533,8 +548,13 @@ export default {
if (this.only) {
card.useCondition.only = Number(this.only);
}
// }
// e袋洗适用商品
if (this.goods.edx) {
card.edxGoodsList = JSON.stringify(this.form.edxGoodsList);
}
// }
console.log(card);
// 微盟适用商品
// if ((this.form.cardType === 0 || this.form.cardType === 1) && this.form.cardApplyChannel.indexOf('WMmicroMall') !== -1 && this.coupGoodsWeimobList.length !== 0) {
// card.coupGoodsWeimobList = this.coupGoodsWeimobList;
......
src/views/ewash/form.vue
......@@ -43,9 +43,16 @@
<!-- <el-form-item label="最大商品优惠数" v-if="form.cardType === 1"> <el-input-number controls-position="right" :disabled="isEdit || isInfo || goodsDiscountCheck" v-model="form.goods_discounts_number_upper_limit" class="200" :precision="0" :step="1" :min="0"></el-input-number> 件 &nbsp;<el-checkbox v-model="goodsDiscountCheck" :disabled="isEdit || isInfo">无上限</el-checkbox><span class="pl10 fz12 gray vertical-baseline">*该条件目前仅线上可用</span> </el-form-item> -->
<el-form-item prop="" label="使用条件">
<div class="mb10">
<el-checkbox :disabled="isEdit || isInfo" v-model="goods.flag">适用类目(e袋洗类目)</el-checkbox>
<!-- <el-button type="primary" @click="ableCategory.visible = true" size="mini">编辑</el-button> -->
<div class="mb10 clearfix">
<div class="inline-block fl" style="width:240px;">
<el-checkbox :disabled="isEdit || isInfo" v-model="goods.edx">适用类目(e袋洗类目)</el-checkbox>
<el-button type="primary" class="ml5" @click="ableCategoryVisible = true" size="mini" :disabled="isEdit">编辑</el-button>
</div>
<div class="sysp__content clearfix inline-block fl" style="width:calc(100% - 440px);">
<template v-for="(item, idx) in form.edxGoodsList">
<span :key="idx" class="item mr5">{{ item.name }}</span>
</template>
</div>
</div>
<div class="mb10">
<el-checkbox :disabled="isEdit || isInfo" v-model="goods.flag">适用门店</el-checkbox>
......@@ -269,11 +276,11 @@
<el-button v-if="isAdd || isCopy" type="primary" @click="xxSyspConfirm">确定</el-button>
</div>
</el-dialog> -->
<el-dialog title="适用类目" :visible.sync="ableCategory.visible" width="800px">
<good-category />
<el-dialog title="适用类目" :visible.sync="ableCategoryVisible" width="500px">
<good-category ref="category" />
<div slot="footer" class="dialog-footer">
<el-button @click="ableCategory.visible = false">{{ isEdit ? '关闭' : '取消' }}</el-button>
<el-button v-if="isAdd || isCopy" type="primary" @click="ableCategory">确定</el-button>
<el-button @click="ableCategoryVisible = false">{{ isEdit ? '关闭' : '取消' }}</el-button>
<el-button v-if="isAdd || isCopy" type="primary" @click="saveAbleCategory">确定</el-button>
</div>
</el-dialog>
</div>
......
src/views/ewash/partials/ewash-good-category.vue
......@@ -5,322 +5,87 @@
</template>
<script>
// const options = ['a', 'b', 'c'].map(f1 => {
// return {
// value: f1,
// label: f1,
// children: [1, 2, 3].map(v => {
// return {
// value: f1 + v,
// label: f1 + v,
// children: [1, 2, 3, 4].map(f3 => {
// return {
// value: f1 + v + f3,
// label: f1 + v + f3
// };
// })
// };
// })
// };
// });
import { getEdxCategory } from '@/service/api/ewashApi.js';
export default {
data() {
return {
options: [
{
value: 'zhinan',
label: '指南',
children: [
{
value: 'shejiyuanze',
label: '设计原则',
children: [
{
value: 'yizhi',
label: '一致'
},
{
value: 'fankui',
label: '反馈'
},
{
value: 'xiaolv',
label: '效率'
},
{
value: 'kekong',
label: '可控'
}
]
},
{
value: 'daohang',
label: '导航',
children: [
{
value: 'cexiangdaohang',
label: '侧向导航'
},
{
value: 'dingbudaohang',
label: '顶部导航'
}
]
}
]
},
{
value: 'zujian',
label: '组件',
children: [
{
value: 'basic',
label: 'Basic',
children: [
{
value: 'layout',
label: 'Layout 布局'
},
{
value: 'color',
label: 'Color 色彩'
},
{
value: 'typography',
label: 'Typography 字体'
},
{
value: 'icon',
label: 'Icon 图标'
},
{
value: 'button',
label: 'Button 按钮'
}
]
},
{
value: 'form',
label: 'Form',
children: [
{
value: 'radio',
label: 'Radio 单选框'
},
{
value: 'checkbox',
label: 'Checkbox 多选框'
},
{
value: 'input',
label: 'Input 输入框'
},
{
value: 'input-number',
label: 'InputNumber 计数器'
},
{
value: 'select',
label: 'Select 选择器'
},
{
value: 'cascader',
label: 'Cascader 级联选择器'
},
{
value: 'switch',
label: 'Switch 开关'
},
{
value: 'slider',
label: 'Slider 滑块'
},
{
value: 'time-picker',
label: 'TimePicker 时间选择器'
},
{
value: 'date-picker',
label: 'DatePicker 日期选择器'
},
{
value: 'datetime-picker',
label: 'DateTimePicker 日期时间选择器'
},
{
value: 'upload',
label: 'Upload 上传'
},
{
value: 'rate',
label: 'Rate 评分'
},
{
value: 'form',
label: 'Form 表单'
}
]
},
{
value: 'data',
label: 'Data',
children: [
{
value: 'table',
label: 'Table 表格'
},
{
value: 'tag',
label: 'Tag 标签'
},
{
value: 'progress',
label: 'Progress 进度条'
},
{
value: 'tree',
label: 'Tree 树形控件'
},
{
value: 'pagination',
label: 'Pagination 分页'
},
{
value: 'badge',
label: 'Badge 标记'
}
]
},
{
value: 'notice',
label: 'Notice',
children: [
{
value: 'alert',
label: 'Alert 警告'
},
{
value: 'loading',
label: 'Loading 加载'
},
{
value: 'message',
label: 'Message 消息提示'
},
{
value: 'message-box',
label: 'MessageBox 弹框'
},
{
value: 'notification',
label: 'Notification 通知'
}
]
},
{
value: 'navigation',
label: 'Navigation',
children: [
{
value: 'menu',
label: 'NavMenu 导航菜单'
},
{
value: 'tabs',
label: 'Tabs 标签页'
},
{
value: 'breadcrumb',
label: 'Breadcrumb 面包屑'
},
{
value: 'dropdown',
label: 'Dropdown 下拉菜单'
},
{
value: 'steps',
label: 'Steps 步骤条'
}
]
},
{
value: 'others',
label: 'Others',
children: [
{
value: 'dialog',
label: 'Dialog 对话框'
},
{
value: 'tooltip',
label: 'Tooltip 文字提示'
},
{
value: 'popover',
label: 'Popover 弹出框'
},
{
value: 'card',
label: 'Card 卡片'
},
{
value: 'carousel',
label: 'Carousel 走马灯'
},
{
value: 'collapse',
label: 'Collapse 折叠面板'
}
]
}
]
},
{
value: 'ziyuan',
label: '资源',
children: [
{
value: 'axure',
label: 'Axure Components'
},
{
value: 'sketch',
label: 'Sketch Templates'
},
{
value: 'jiaohu',
label: '组件交互文档'
}
]
}
]
value: '',
options: [],
props: {
multiple: true
}
};
},
methods: {
handleGetEdxCategory() {
getEdxCategory().then(res => {
// console.log(res);
this.options = res.result.map(v => {
return {
label: v.category_name,
value: v.category_id,
children:
v.clothes.map(y => {
return {
label: y.clothes_name,
value: y.clothes_id,
category_id: v.category_id // 保存category_id
};
}) || []
};
});
});
},
/* 父组件调用 */
getCategory() {
let clothes = [];
this.options.map(v => {
clothes = clothes.concat(v.children);
});
const clothesIds = this.value.map(v => {
return v[1];
});
return clothes
.filter(v => {
return clothesIds.includes(v.value);
})
.map(v => {
return {
id: v.value,
name: v.label
// category_id: v.category_id
};
});
}
},
mounted() {
this.handleGetEdxCategory();
}
};
// export default {
// data() {
// return {
// value: [],
// props: {
// expandTrigger: 'hover',
// multiple: true
// },
// options: [...options]
// };
// },
// methods: {
// handleChange(value) {
// console.log(value);
// }
// }
// };
</script>
<style lang="scss" scoped>
.ewash-good {
/deep/ .cascader {
width: 100%;
margin: 0 auto;
/deep/ {
.el-cascader-menu {
width: 50%;
}
.cascader {
width: 100%;
margin: 0 auto;
}
.el-cascader-menu__wrap {
margin: 0 auto !important;
}
.el-scrollbar__wrap {
overflow: auto;
}
.el-scrollbar__bar {
opacity: 0;
}
.el-cascader-menu {
height: 500px;
}
}
}
</style>
src/views/ewash/partials/store-child.vue
......@@ -10,7 +10,7 @@
</label>
</div>
<div class="search">
<el-input type="text" v-model="listParams.searchParam" clearable placeholder="请输入门店名称" @change="search"/>
<el-input type="text" v-model="listParams.searchParam" clearable placeholder="请输入门店名称" @change="search" />
</div>
<div class="el-transfer-panel__body">
<div class="el-transfer-panel__list" v-infinite-scroll="leftScrollLoad" :infinite-scroll-disabled="!shouldLeftLoad" style="overflow:auto">
......@@ -74,7 +74,7 @@ export default {
return {
loading: false,
leftLoading: false, // 左侧列表加载
shouldLeftLoad: true, // 左侧是否可以滚动触发加载
shouldLeftLoad: true, // 左侧是否可以滚动触发加载
leftList: [],
leftSelect: [],
rightList: [],
......@@ -132,18 +132,19 @@ export default {
this.leftLoading = true;
openEdxStoreSearch(this.listParams).then(res => {
this.leftLoading = false;
if(res.result.result && res.result.result.length < pageSize) {
if (res.result.result && res.result.result.length < pageSize) {
this.shouldLeftLoad = false; // 不可以加载更多
}
const _leftList = res.result.result.map(v => {
return {
key: v.storeId,
name: v.storeName,
select: false,
}
}) || [];
const _leftList =
res.result.result.map(v => {
return {
key: v.storeId,
name: v.storeName,
select: false
};
}) || [];
this.leftList = this.leftList.concat(_leftList);
})
});
},
// 滚动加载触发
leftScrollLoad() {
......@@ -170,22 +171,26 @@ export default {
},
// 保存子账户
handleSave() {
const storeIds = this.rightList.map(v => {
return v.key;
}).join();
if(storeIds === '') {
const storeIds = this.rightList
.map(v => {
return v.key;
})
.join();
if (storeIds === '') {
this.$tips({ message: '请选择门店', type: 'error' });
return;
}
this.loading = true;
openEdxStore({ storeIds }).then(res => {
this.loading = false;
console.log(res);
this.$tips({ message: res.message || '保存成功' });
this.close();
}).catch(() => {
this.loading = false;
})
openEdxStore({ storeIds })
.then(res => {
this.loading = false;
console.log(res);
this.$tips({ message: res.message || '保存成功' });
this.close();
})
.catch(() => {
this.loading = false;
});
},
/** 父组件调用 **/
/** 左侧列表重置 加载 **/
......@@ -198,7 +203,7 @@ export default {
this.listParams.currentPage = 1;
this.listParams.searchParam = '';
this.getLeftList();
},
}
}
};
</script>
......
src/views/ewash/statements-detail.vue
......@@ -40,8 +40,14 @@
</template>
</el-table-column>
</el-table>
<p class="text-right mt10">服务总价<span class="fz16 ml5">¥ {{ info.totalAmount | amount }}</span></p>
<p class="text-right mt10">卡券支付<span class="fz22 ml5 warning-color">¥ {{ info.couponAmount | amount }}</span></p>
<p class="text-right mt10">
服务总价
<span class="fz16 ml5">¥ {{ info.totalAmount | amount }}</span>
</p>
<p class="text-right mt10">
卡券支付
<span class="fz22 ml5 warning-color">¥ {{ info.couponAmount | amount }}</span>
</p>
</section>
<!-- e袋洗订单信息 -->
<section class="dm-form__wrap statement-edit__info">
......@@ -69,8 +75,12 @@
</template>
</el-table-column>
</el-table>
<p class="text-right mt10">服务总价<span class="fz16 ml5">¥ {{ info.totalAmount }}</span></p>
<p class="text-right mt10">订单总价
<p class="text-right mt10">
服务总价
<span class="fz16 ml5">¥ {{ info.totalAmount }}</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>
</p>
......@@ -101,46 +111,25 @@
<script>
import { edxOrderDetail } from '@/service/api/ewashApi';
const status = [
{
content: '待下单',
status: 2
},
{
content: '待取件/预约成功',
status: 3
},
{
content: '取件中',
status: 4
},
{
content: '待揽收/待送洗',
status: 1
},
{
content: '清洗中',
status: 6
},
{
content: '分拣计价',
status: 5
},
{
content: '待送回/送回中',
status: 7
},
{
content: '待取件/已收件',
status: 8
},
{
content: '已签收/已完成',
status: 9
}
/* eslint-disable */
const status1 = [
{ content: '删除', status: 0 }
]
const status2 = [
{ content: '待送洗/待揽收', status: 1 },
{ content: '待下单', status: 2 },
{ content: '待取件/预约成功', status: 3 },
{ content: '取件中', status: 4 },
{ content: '分拣计价', status: 5 },
{ content: '清洗中', status: 6 },
{ content: '待送回/送回中', status: 7 },
{ content: '待取件/已收件', status: 8 },
{ content: '已签收/已完成', status: 9 }
];
const status10 = [
{ content: '已取消', status: 10 }
]
/* eslint-disable */
export default {
name: 'ewash-statement-detail',
data() {
......@@ -184,6 +173,20 @@ export default {
})
: [];
/* 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;
})
if (idx !== -1) {
this.orderStatus[idx].size='large';
this.orderStatus[idx].type='primary';
}
}
});
}
},
......
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