Commit 8ef0cbd8 by chenxin

fix:build

parent 32f26682
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=/marketing/static/css/iconfont.css><link rel=stylesheet type=text/css href=/marketing/static/css/common.css><link rel=stylesheet href=https://unpkg.com/element-ui/lib/theme-chalk/index.css><script type=text/javascript>!function(e,t,n,g,i){e[i]=e[i]||function(){(e[i].q=e[i].q||[]).push(arguments)},n=t.createElement("script"),tag=t.getElementsByTagName("script")[0],n.async=1,n.src=('https:'==document.location.protocol?'https://':'http://')+g,tag.parentNode.insertBefore(n,tag)}(window,document,"script","assets.giocdn.com/2.1/gio.js","gio");
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=/static/css/iconfont.css><link rel=stylesheet type=text/css href=/static/css/common.css><link rel=stylesheet href=https://unpkg.com/element-ui/lib/theme-chalk/index.css><script type=text/javascript>!function(e,t,n,g,i){e[i]=e[i]||function(){(e[i].q=e[i].q||[]).push(arguments)},n=t.createElement("script"),tag=t.getElementsByTagName("script")[0],n.async=1,n.src=('https:'==document.location.protocol?'https://':'http://')+g,tag.parentNode.insertBefore(n,tag)}(window,document,"script","assets.giocdn.com/2.1/gio.js","gio");
gio('init','8be12240a3749eab', {});
//custom page code begin here
//custom page code end here
gio('send');</script><link href=/marketing/static/css/main.19504f0684391881dcd6ffac423608fc.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.04.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.7d09288e66a788ad8b7d.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.682c24d06ab1102b8db0214f843349dc.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.04.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.ea38b75f20c82a200a26.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
!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:"5b55319965a6ac1a9434",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,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:"d68e776d93682930575d",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
......@@ -3,10 +3,16 @@ const PREFIX = 'api-marketing/';
import config from '@/config';
export const url = config.api + PREFIX;
//e袋洗 -- 列表/新增/删除 复用card的,些许参数不一样
// 卡券 - e袋洗 -- 列表/新增/删除 复用card的,些许参数不一样
// e袋洗 -- 对账列表
// 对账列表
export const edxOrderList = params => requests(PREFIX + 'edx-order-list', params);
// 获取子账户可选列表
export const openEdxStoreSearch = params => requests(PREFIX + 'open-edx-store-search', params);
// 保存子账户
export const openEdxStore = params => requests(PREFIX + 'open-edx-store', params);
// 订单详情
export const edxOrderDetail = params => requests(PREFIX + 'edx-order-detail', params);
// 导出卡券
export const exportEdxOrderCsv = config.api + PREFIX + 'edx-order-csv';
......@@ -6,9 +6,9 @@
<el-radio-group v-model="form.giftCouponDiscountType" :disabled="isEdit || isInfo">
<el-radio :label="1">洗衣券</el-radio>
<el-radio :label="2">免单券</el-radio>
<el-tooltip class="item" content="领取可免费叠加使用" placement="top-start">
<!-- <el-tooltip class="item" content="领取可免费叠加使用" placement="top-start">
<i class="el-icon-info place-font-color ml5 tips"></i>
</el-tooltip>
</el-tooltip> -->
</el-radio-group>
</el-form-item>
<!-- <el-form-item label="卡券适用渠道" prop="cardApplyChannel">
......
<template>
<section class="dm-wrap">
<!-- <store-child /> -->
<div class="game-ptyx-header pb10 clearfix">
<span class="pr10">卡券共{{ total }}</span>
<el-button-group class="vertical-middle pr4">
......@@ -10,13 +9,13 @@
<el-button @click="sortList('col4')">核销率<i class="el-icon--right" :class="listParams.sortBy === 'col4' ? 'el-icon-caret-top' : listParams.sortBy === 'col4 desc' ? 'el-icon-caret-bottom' : 'el-icon-d-caret'"></i></el-button>
<el-button @click="sortList('col5')">核销额<i class="el-icon--right" :class="listParams.sortBy === 'col5' ? 'el-icon-caret-top' : listParams.sortBy === 'col5 desc' ? 'el-icon-caret-bottom' : 'el-icon-d-caret'"></i></el-button>
</el-button-group>
<el-select class="dm-select" v-model="listParams.cardType" placeholder="选择卡券类型" @change="refresh">
<el-select class="dm-select" v-model="listParams.giftCouponDiscountType" placeholder="选择卡券类型" @change="refresh">
<el-option v-for="(item, index) in cardTypeOptions" :key="index" :label="item.label" :value="item.value"></el-option>
</el-select>
<el-input v-model="listParams.searchParam" class="w200 vertical-middle" placeholder="输入卡券名称/备注" clearable @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<div class="fr">
<el-button type="primary" @click="$router.push('/ewash/statements')">查看账单</el-button>
<el-button type="primary">创建子账户</el-button>
<el-button type="primary" @click="handleDialogShow">创建子账户</el-button>
<el-button type="primary" @click="$router.push('/ewash/add')">新增卡券</el-button>
</div>
</div>
......@@ -29,6 +28,8 @@
</div>
<adjust-stock :show.sync="adjustStock" :totalCount="currentCard.couponStock" :coupCardId="currentCard.coupCardId" @refresh="delayRefresh"></adjust-stock>
<el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<!-- 创建子账户dialog -->
<store-child ref="storeChild" :dialogVisible.sync="dialogVisible" />
</section>
</template>
<script>
......@@ -58,7 +59,8 @@ export default {
cardTypeOptions: [{ value: '', label: '全部卡券类型' }, { value: 1, label: '抵金券' }, { value: 2, label: '免单券' }],
sortFlag: false,
adjustStock: false,
currentCard: {}
currentCard: {},
dialogVisible: false
};
},
components: {
......@@ -72,6 +74,11 @@ export default {
this.$store.commit('mutations_breadcrumb', [{ name: 'e袋洗服务', path: '' }, { name: '卡券列表', path: '' }]);
},
methods: {
// 创建子账户dialog
handleDialogShow() {
this.dialogVisible = true;
this.$refs.storeChild.reload();
},
//编辑库存 前置
preAdjustStock(val) {
this.currentCard = val;
......
<template>
<div class="el-transfer">
<!-- 左侧 -->
<div class="el-transfer-panel">
<div class="el-transfer-panel__header">
<label class="el-checkbox">
门店列表
<span class="fr mr10">{{ leftSelect.length }}/{{ leftList.length }}</span>
</label>
</div>
<div class="el-transfer-panel__body">
<div class="el-transfer-panel__list">
<el-checkbox-group v-model="leftSelect">
<el-checkbox class="el-transfer-panel__item" v-for="item in leftList.filter( v => { return !v.select; })" :label="item.key" :key="item.key">
{{ item.key }}
</el-checkbox>
</el-checkbox-group>
<el-dialog title="提示" width="530px" :visible.sync="dialogVisible">
<div class="el-transfer" v-loading="loading">
<!-- 左侧 -->
<div class="el-transfer-panel">
<div class="el-transfer-panel__header">
<label class="el-checkbox">
门店列表
<span class="fr mr10">{{ leftSelect.length }}/{{ leftList.length }}</span>
</label>
</div>
<div class="el-transfer-panel__body">
<div class="el-transfer-panel__list">
<!-- eslint-disable -->
<el-checkbox-group v-model="leftSelect">
<el-checkbox
class="el-transfer-panel__item"
v-for="item in leftList.filter( v => { return !v.select; })"
:label="item.key"
:key="item"
>{{ item.key }}</el-checkbox>
</el-checkbox-group>
<p class="dm-store__list--more" v-if="leftMoreShow" :disabled="leftMoreLoading">
<el-button type="text" @click="leftLoadMore">{{ leftMoreLoading ? '加载中...' : '加载更多' }}</el-button>
</p>
<p class="dm-store__list--more" v-else><el-button class="fz12" type="text" disabled>无更多数据</el-button></p>
<!-- eslint-disable -->
</div>
</div>
</div>
</div>
<!-- 中间按钮区域 -->
<div class="inline-block">
<el-button class="mb10" type="primary" size="mini" icon="el-icon-arrow-right" :disabled="!leftSelect.length" @click="saveToRight">转入</el-button>
<br />
<el-button icon="el-icon-close" size="mini" :disabled="!rightSelect.length" @click="deleteRightItems(false)">移除</el-button>
</div>
<!-- 右侧 -->
<div class="el-transfer-panel">
<div class="el-transfer-panel__header">
<label class="el-checkbox">
已选({{ rightList.length }}个门店)
<span class="fr mr10">{{ rightSelect.length }}/{{ rightList.length }}</span>
</label>
<!-- 中间按钮区域 -->
<div class="inline-block">
<el-button class="mb10" type="primary" size="mini" icon="el-icon-arrow-right" :disabled="!leftSelect.length" @click="saveToRight">转入</el-button>
<br />
<el-button icon="el-icon-close" size="mini" :disabled="!rightSelect.length" @click="deleteRightItems(false)">移除</el-button>
</div>
<div class="el-transfer-panel__body">
<div class="el-transfer-panel__list">
<el-checkbox-group v-model="rightSelect">
<el-checkbox class="el-transfer-panel__item" v-for="item in rightList" :label="item.key" :key="item.key">{{ item.key }}</el-checkbox>
</el-checkbox-group>
<!-- 右侧 -->
<div class="el-transfer-panel">
<div class="el-transfer-panel__header">
<label class="el-checkbox">
已选({{ rightList.length }}个门店)
<span class="fr mr10">{{ rightSelect.length }}/{{ rightList.length }}</span>
</label>
</div>
<div class="el-transfer-panel__body">
<div class="el-transfer-panel__list">
<el-checkbox-group v-model="rightSelect">
<el-checkbox class="el-transfer-panel__item" v-for="item in rightList" :label="item.key" :key="item.key">{{ item.key }}</el-checkbox>
</el-checkbox-group>
</div>
</div>
</div>
</div>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
</span>
</el-dialog>
</template>
<script>
import { openEdxStoreSearch, openEdxStore } from '@/service/api/ewashApi';
export default {
name: 'ewash-store-child',
props: ['dialogVisible'],
data() {
return {
leftList: [
{
select: false,
key: 1
},
{
select: false,
key: 3
},
{
select: false,
key: 4
},
{
select: false,
key: 5
}
],
loading: false,
leftMoreShow: false,
leftMoreLoading: false,
leftList: [],
// leftList: [
// {
// select: false,
// key: 1
// },
// {
// select: false,
// key: 3
// },
// {
// select: false,
// key: 4
// },
// {
// select: false,
// key: 5
// }
// ],
leftSelect: [],
rightList: [],
rightSelect: []
rightSelect: [],
listParams: {
pageSize: 20,
currentPage: 1,
searchParam: ''
}
};
},
methods: {
// 移至右侧
saveToRight() {
// 右侧push左侧数据
this.rightList = this.rightList.concat(this.leftSelect);
this.rightList = this.rightList.concat(
this.leftList.filter(v => {
return this.leftSelect.includes(v.key);
})
);
// 左侧只保留未被选择的
const rightIds = this.rightList.map(v => {
return v.key;
}); // 右侧选中的ids
this.leftList = this.leftList.map(v => {
v.select = this.leftSelect.includes(v.key);
v.select = rightIds.includes(v.key);
return v;
});
// 重置左侧已选
......@@ -91,7 +125,7 @@ export default {
return !this.rightSelect.includes(v.key);
});
// 左侧数据去除disable
this.leftSelect = this.leftList.map(v => {
this.leftList = this.leftList.map(v => {
// 被选择且右侧选中移除
if (v.select && this.rightSelect.includes(v.key)) {
v.select = false;
......@@ -100,6 +134,19 @@ export default {
});
// 清除右侧数据
this.rightSelect = [];
},
// 获取左侧列表数据
getLeftList() {
this.loading = true;
openEdxStoreSearch(this.listParams).then(res => {
this.loading = false;
console.log(res);
})
},
reload() {
this.listParams.currentPage = 1;
this.listParams.searchParam = '';
this.getLeftList();
}
}
};
......
......@@ -7,28 +7,28 @@
<h3 class="dm-title__label">预约单信息</h3>
<el-row :gutter="20">
<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.orderNumber || '--' }}</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.couponNo || '--' }}</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.createTime || '--' }}</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.memberPhone }}</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.memberName }}</span>
</el-col>
<el-col :span="24">
<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.remark }}</span>
</el-col>
<el-col :span="24">
<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.storeName }}</span>
</el-col>
<el-col :span="24">
<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.storeAddress }}</span>
</el-col>
</el-row>
<el-table :data="info.ywTable" style="width: 100%" class="mt20">
......@@ -36,24 +36,24 @@
<el-table-column prop="name" label="数量" minWidth="180"></el-table-column>
<el-table-column prop="address" label="单价" minWidth="180"></el-table-column>
</el-table>
<p class="text-right mt10">服务总价<span class="fz16 ml5">¥ 38.00</span></p>
<p class="text-right mt10">卡券支付<span class="fz22 ml5 warning-color">¥ 38.00</span></p>
<p class="text-right mt10">服务总价<span class="fz16 ml5">¥ {{ info.totalAmount }}</span></p>
<p class="text-right mt10">卡券支付<span class="fz22 ml5 warning-color">¥ {{ info.couponAmount }}</span></p>
</section>
<!-- e袋洗订单信息 -->
<section class="dm-form__wrap statement-edit__info">
<h3 class="dm-title__label">e袋洗订单信息</h3>
<el-row :gutter="20">
<el-col :span="12">
<span class="primary-font-color">e袋洗单号:</span><span class="regular-font-color">{{ info.templateName || '--' }}</span>
<span class="primary-font-color">e袋洗单号:</span><span class="regular-font-color">{{ info.edaixiOrderNumber || '--' }}</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.edaixiPayNumber || '--' }}</span>
</el-col>
<el-col :span="12">
<span class="primary-font-color">取件时间:</span><span class="regular-font-color">{{ info.templateName || '--' }}</span>
</el-col>
<el-col :span="24">
<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.remark }}</span>
</el-col>
</el-row>
<el-table :data="info.ywTable" style="width: 100%" class="mt20">
......@@ -61,8 +61,8 @@
<el-table-column prop="name" label="数量" minWidth="180"></el-table-column>
<el-table-column prop="address" label="单价" minWidth="180"></el-table-column>
</el-table>
<p class="text-right mt10">服务总价<span class="fz16 ml5">¥ 38.00</span></p>
<p class="text-right mt10">订单总价<span class="gray ml5">(含运费10.0元)</span><span class="fz22 ml5 warning-color">¥ 38.00</span></p>
<p class="text-right mt10">服务总价<span class="fz16 ml5">¥ {{ info.totalAmount }}</span></p>
<p class="text-right mt10">订单总价<span class="gray ml5">(含运费{{ info.freightAmount }}元)</span><span class="fz22 ml5 warning-color">¥ {{ info.couponAmount }}</span></p>
</section>
</el-col>
<el-col :span="6">
......@@ -74,14 +74,14 @@
</el-timeline-item>
</el-timeline>
</section>
<section class="dm-form__wrap statement-edit__info ml5">
<!-- <section class="dm-form__wrap statement-edit__info ml5">
<h3 class="dm-title__label"><i class="el-icon-tickets success-color mr5"></i>订单跟踪</h3>
<el-timeline>
<el-timeline-item v-for="(order, index) in orderList" :key="index" :icon="order.icon" :type="order.type" :color="order.color" :size="order.size">
{{ order.content }}
</el-timeline-item>
</el-timeline>
</section>
</section> -->
<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>
......@@ -96,10 +96,13 @@
</template>
<script>
import { edxOrderDetail } from '@/service/api/ewashApi';
export default {
name: 'ewash-statement-detail',
data() {
return {
id: this.$route.params.id,
loading: false,
info: {
templateName: 'templateNametemplateNametemplateNametemplateName',
ywTable: []
......@@ -165,6 +168,19 @@ export default {
]
};
},
methods: {
handleDetail() {
this.loading = true;
edxOrderDetail({ orderId: this.id }).then(res => {
this.loading = false;
this.info = res.result || {};
this.logistics = res.resule.logistics || [];
})
}
},
mounted() {
this.handleDetail();
},
created() {
this.$store.commit('mutations_breadcrumb', [{ name: 'e袋洗服务', path: '/ewash/list' }, { name: 'e袋洗对账单', path: '/ewash/statements' }, { name: '对账单详情', path: '' }]);
}
......
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