Skip to content

M
marketing
Commit 2805a3c1 by chenxin
Options

fix:build ewash

parent 2ae040a2
Showing with 222 additions and 32 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/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=//web-1251519181.file.myqcloud.com/components/element.2.12.0.css><link href=/marketing/static/css/main.906c770f2c7345e864dcb04427b891bd.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=//web-1251519181.file.myqcloud.com/components/element.2.12.0.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.12.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.d503a6dbe85694510506.js></script><script type=text/javascript src=/marketing/static/js/vendor.4cb744d5df3ad4bdbad7.js></script><script type=text/javascript src=/marketing/static/js/main.3639797d6ecd87cf5c8b.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/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=//web-1251519181.file.myqcloud.com/components/element.2.12.0.css><link href=/marketing/static/css/main.6289499be60dd77a0cc708faa691827c.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=//web-1251519181.file.myqcloud.com/components/element.2.12.0.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.12.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.21d256695b0223c8c323.js></script><script type=text/javascript src=/marketing/static/js/vendor.4cb744d5df3ad4bdbad7.js></script><script type=text/javascript src=/marketing/static/js/main.1de41939b0d834cb42c3.js></script></body></html>
\ No newline at end of file
dist/static/js/card.0a9d63521a2959f9688f.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/card.d80b966f3b4d25756663.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.d503a6dbe85694510506.js → dist/static/js/manifest.21d256695b0223c8c323.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:"0a9d63521a2959f9688f",2:"f6b389dec9254beb0d27",3:"516785b2fc7fdf2061a2",4:"a639d4b91d56334ec9ea",5:"502b333f72343683390c",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,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:"d80b966f3b4d25756663",2:"f6b389dec9254beb0d27",3:"44997b2262d711e8b648",4:"a639d4b91d56334ec9ea",5:"502b333f72343683390c",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/router/modules/ewash.js
......@@ -52,6 +52,33 @@ export default {
meta: {
path: '/ewash/list'
}
},
{
path: 'addgroupsend/:id',
name: 'e袋洗投放',
component: () => import(/* webpackChunkName: "card" */ '../../views/ewash/group-send.vue'),
meta: {
type: 'send',
path: '/ewash/list'
}
},
{
path: 'info/:id',
name: 'e袋洗详情',
component: () => import(/* webpackChunkName: "card" */ '../../views/ewash/form.vue'),
meta: {
type: 'info',
path: '/card/record/get'
}
},
{
path: 'copy/:id',
name: 'e袋洗复制',
component: () => import(/* webpackChunkName: "card" */ '../../views/ewash/form.vue'),
meta: {
type: 'copy',
path: '/card/record/get'
}
}
]
};
src/views/ewash/form.js
......@@ -546,18 +546,32 @@ export default {
// }
// // sale_limit.fee 消费金额满,sale_limit.goods 消费指定商品; goods.ok 适用商品, goods.no 不适应商品, only: 1 不与其他优惠共享(不勾选only不传)
// } else if (this.form.cardType === 2) {
// card.useCondition = {
// sale_limit: {
// fee: this.sale_limit.fee,
// goods: this.sale_limit.goods
// },
// goods: {
// ok: this.goods.ok,
// no: this.goods.no
// },
// only: Number(this.only),
// proNo: this.form.proNoList.length ? this.form.proNoList[0].id : '',
// products_exchange_number: this.form.proNoList.length ? this.form.products_exchange_number : 0
// };
// 写死 e袋洗没有使用条件
card.useCondition = {
sale_limit: {
fee: this.sale_limit.fee,
goods: this.sale_limit.goods
fee: 0,
goods: ''
},
goods: {
ok: this.goods.ok,
no: this.goods.no
ok: '',
no: ''
},
only: Number(this.only),
proNo: this.form.proNoList.length ? this.form.proNoList[0].id : '',
products_exchange_number: this.form.proNoList.length ? this.form.products_exchange_number : 0
only: 0,
proNo: '',
products_exchange_number: 0
};
if (this.only) {
card.useCondition.only = Number(this.only);
......
src/views/ewash/partials/card-item.vue
......@@ -93,6 +93,14 @@ export default {
*/
handler(val) {
switch (val) {
case 1:
this.$router.push({
path: '/ewash/addgroupsend/' + this.item.coupCardId,
query: {
name: this.item.cardName
}
});
break;
case 2:
this.$router.push('/ewash/analysis/' + this.item.coupCardId);
break;
......@@ -102,6 +110,12 @@ export default {
case 4:
this.$emit('delete-card', this.item.coupCardId);
break;
case 5:
this.$router.push('/ewash/info/' + this.item.coupCardId);
break;
case 6:
this.$router.push('/ewash/copy/' + this.item.coupCardId);
break;
}
},
//编辑库存 前置
......
src/views/ewash/partials/item-card.vue 0 → 100644
<template>
<div class="dm-card__item__wrap">
<div class="dm-card__item" :style="{ background: item.cardColor }">
<img class="dm-card__item__avatar" :src="item.brandLogo || loadErrorImg" alt="" />
<div class="inline-block">
<p class="dm-card__item__title">{{ item.cardName }}</p>
<p class="dm-card__item__desc" v-if="item.cardEffectiveMode !== 0">领取后第{{ item.startDay + 1 }}-{{ item.limitDay + item.startDay }}天</p>
<p class="dm-card__item__desc" v-if="item.cardEffectiveMode === 0">{{ formatDateTimeByType(item.beginDate, 'yyyy-MM-dd') }} 至 {{ formatDateTimeByType(item.endDate, 'yyyy-MM-dd') }}</p>
</div>
</div>
<p class="dm-card__item--bottom">
<span>适用{{ item.storeMode === 0 ? '所有门店' : item.storeMode === 1 ? '部分分组' : '部分门店' }}</span>
</p>
</div>
</template>
<script>
import { formatDateTimeByType } from '@/utils';
export default {
name: 'item-card',
data() {
return {
formatDateTimeByType,
// eslint-disable-next-line
loadErrorImg: require('../../../assets/img/loaderror.png')
};
},
props: {
item: {
type: Object,
default() {
return {};
}
}
}
};
</script>
<style lang="scss" scoped>
/* card */
.dm-card__item__wrap {
display: inline-block;
position: relative;
width: 298px;
height: 142px;
margin: 0 10px;
vertical-align: middle;
border: 1px solid rgba(228, 231, 237, 1);
border-radius: 4px;
}
.dm-card__item {
padding: 0 15px;
background: rgba(72, 170, 3, 0.85);
height: 106px;
line-height: 106px;
}
.dm-card__item__avatar {
width: 60px;
height: 60px;
border-radius: 50%;
vertical-align: middle;
}
.dm-card__item__title {
vertical-align: middle;
margin-left: 8px;
max-width: 180px;
font-size: 16px;
font-weight: 500;
line-height: 30px;
color: #fff;
overflow: hidden;
text-overflow: ellipsis;
}
.dm-card__item__desc {
vertical-align: middle;
margin-left: 8px;
max-width: 200px;
font-size: 12px;
line-height: 20px;
color: #fff;
overflow: hidden;
text-overflow: ellipsis;
}
.dm-card__item--bottom {
vertical-align: middle;
line-height: 106px;
color: #909399;
font-size: 12px;
line-height: 36px;
padding-left: 15px;
}
</style>
src/views/ewash/partials/status-render.js
......@@ -9,11 +9,11 @@ export default Vue.component('render-temp', {
}
},
render(h) {
// const bind1 = (
// <a title="投放" onClick={this.handler.bind(null, 1)}>
// <i class="iconfont icon-daohang-" />
// </a>
// );
const bind1 = (
<a title="投放" onClick={this.handler.bind(null, 1)}>
<i class="iconfont icon-daohang-" />
</a>
);
const bind2 = (
<a title="报表" onClick={this.handler.bind(null, 2)}>
<i class="el-icon-tickets" />
......@@ -29,21 +29,21 @@ export default Vue.component('render-temp', {
<i class="el-icon-delete" />
</a>
);
// const bind5 = (
// <a title="详情" onClick={this.handler.bind(null, 5)}>
// <i class="el-icon-document" />
// </a>
// );
// const bind6 = (
// <a title="复制" onClick={this.handler.bind(null, 6)}>
// <i class="iconfont icon-wxcard-copy" />
// </a>
// );
const bind5 = (
<a title="详情" onClick={this.handler.bind(null, 5)}>
<i class="el-icon-document" />
</a>
);
const bind6 = (
<a title="复制" onClick={this.handler.bind(null, 6)}>
<i class="iconfont icon-wxcard-copy" />
</a>
);
const statushtml = (
<span>
{/* {bind6} */}
{/* {bind1} */}
{bind6}
{bind1}
{bind2}
{bind3}
{bind4}
......@@ -52,15 +52,15 @@ export default Vue.component('render-temp', {
const overDateHtml = (
<span>
<span class="danger">已过期</span>
{/* {bind6} */}
{bind6}
{bind2}
{/* {bind5} */}
{bind5}
{bind4}
</span>
);
const noputonStatushtml = (
<span>
{/* {bind6} */}
{bind6}
{bind2}
{bind3}
{bind4}
......@@ -69,7 +69,7 @@ export default Vue.component('render-temp', {
const statusNostockhtml = noputonStatushtml;
const statusFaildhtml = (
<span>
{/* {bind6} */}
{bind6}
{bind3}
{bind4}
</span>
......
src/views/ewash/partials/variables.vue 0 → 100644
<template>
<el-dialog title="提示" :visible.sync="show" width="30%" :before-close="close">
<el-select v-model="value" placeholder="请选择">
<el-option v-for="item in options" :key="item.label" :label="item.label" :value="item.label"> </el-option>
</el-select>
<span slot="footer" class="dialog-footer">
<el-button @click="close">取 消</el-button>
<el-button type="primary" @click="submit">确 定</el-button>
</span>
</el-dialog>
</template>
<script>
export default {
props: {
options: Array,
show: {
type: Boolean,
default: false
}
},
data() {
return {
value: ''
};
},
methods: {
close() {
this.$emit('update:show', false);
},
submit() {
if (this.value) {
this.$emit('get-data', this.value);
this.close();
} else {
this.$tips({ type: 'warning', message: '未选择变量' });
}
}
}
};
</script>
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