Skip to content

M
marketing
Commit 63e3613a by chenxin
Options

fix:ewash 修改bug

parent 6d2bcc82
Showing with 49 additions and 27 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.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.08.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
gio('send');</script><link href=/marketing/static/css/main.672e54fa3046ee78666b08e952cd2487.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.08.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.41c9f69ee9c10bb7c784.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/ecm.082b04e2e2d5c4e505cc.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/ecm.1eea4e6e08cc95d8322d.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/manifest.41c9f69ee9c10bb7c784.js 0 → 100644
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,o,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 o)Object.prototype.hasOwnProperty.call(o,i)&&(e[i]=o[i]);for(r&&r(n,o,a);s.length;)s.shift()();if(a)for(d=0;d<a.length;d++)f=c(c.s=a[d]);return f};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:"e34fbb233db6fd4dbd94",2:"74cec9b4e7b2d7c30c85",3:"bc6b97093b4b92c7acbb",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
dist/static/js/manifest.8ec78b4377cf2b88678b.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:"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
index.html
......@@ -31,7 +31,7 @@
<script src="https://unpkg.com/element-ui/lib/index.js"></script>
<!-- <script src="//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js"></script> -->
<!-- 组件引用cdn -->
<script src="//web-1251519181.file.myqcloud.com/components/header.2.0.30.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>
......
src/views/ecm/form.vue
......@@ -175,7 +175,7 @@
<div class="mb20" v-if="form.memberType === 0">
<vue-gic-people :projectName="projectName" :isAdd="isAdd" :triggerReset="true" :useId="useId" :hasSearchData="hasSearchData" :sceneValue="sceneValue" ref="peopleFilter" @findFilter="findFilter" @getBackData="getBackData" @editHide="editHide" @editShow="editShow" @hideBtn="hideBtn" />
<div class="gic-people--button" v-show="toggleTag">
<el-button size="small" type="primary" @click="getData">确 定</el-button>
<el-button size="small" :disabled="isEdit" type="primary" @click="getData">确 定</el-button>
<el-button size="small" @click="cancelFilter">取 消</el-button>
</div>
</div>
......
src/views/ewash/form.js
......@@ -52,7 +52,7 @@ const initForm = {
edxGoodsList: [] // e袋洗适用类目
};
const sale_limit = { fee: 0, goods: '', flag: false, type: 0 }; //最低消费
const goods = { ok: '', no: '', flag: false, edx: false };
const goods = { ok: '', no: '', edx: false };
export default {
// mixins: [xxSysp_mix],
data() {
......@@ -124,6 +124,14 @@ export default {
};
},
watch: {
'goods.edx'(val) {
if (!val) {
this.form.edxGoodsList = [];
if (this.$refs.category) {
this.$refs.category.value = [];
}
}
},
'sale_limit.flag'(val) {
if (!val) {
this.sale_limit.type = 0;
......@@ -289,7 +297,7 @@ export default {
this.form.discount_amount_upper_limit = useCondition.discount_amount_upper_limit || 0;
this.form.products_exchange_number = useCondition.products_exchange_number || 0;
if (this.goods.ok || this.goods.no) {
this.goods.flag = true;
// this.goods.flag = true;
}
this.only = !!useCondition.only || false;
this.form.proNoList = useCondition.proNo ? [{ name: useCondition.proNo, id: useCondition.proNo }] : [];
......@@ -437,6 +445,12 @@ export default {
return;
}
// add e袋洗使用类目
if (this.goods.edx && this.form.edxGoodsList.length === 0) {
this.$tips({ type: 'warning', message: '请选择e袋洗适用类目' });
return;
}
// 验证号段 不能为空 起始号段和结尾号段必须位数一致
// if (this.form.useCustomCode) {
// if (!this.form.customCodeBegin || !this.form.customCodeEnd) {
......
src/views/ewash/form.vue
......@@ -4,7 +4,7 @@
<p class="mb20 fz18">基本信息</p>
<el-form-item label="卡券类型">
<el-radio-group v-model="form.giftCouponDiscountType" :disabled="isEdit || isInfo">
<el-radio :label="1">洗衣券</el-radio>
<el-radio :label="1">抵金券</el-radio>
<el-radio :label="2">免单券</el-radio>
<!-- <el-tooltip class="item" content="领取可免费叠加使用" placement="top-start">
<i class="el-icon-info place-font-color ml5 tips"></i>
......@@ -43,10 +43,10 @@
<!-- <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 clearfix">
<div class="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>
<el-button type="primary" class="ml5" @click="ableCategoryVisible = true" size="mini" :disabled="isEdit || !goods.edx">编辑</el-button>
</div>
<div class="sysp__content clearfix inline-block fl" style="width:calc(100% - 440px);">
<template v-for="(item, idx) in form.edxGoodsList">
......@@ -54,16 +54,6 @@
</template>
</div>
</div>
<div class="mb10">
<el-checkbox :disabled="isEdit || isInfo" v-model="goods.flag">适用门店</el-checkbox>
<dm-input class="w400" v-model="form.cardExplain" :disabled="isInfo" :maxlength="50"></dm-input>
</div>
<div class="ml25">
<el-radio :disabled="isEdit" v-model="storeMode" :label="0">所有门店</el-radio>
<el-radio :disabled="isEdit" v-model="storeMode" :label="1">部分门店</el-radio>
<span v-if="isEdit" class="fz12 gray ml20">卡券编辑时修改的适用门店信息不再回写至ERP</span>
<vue-gic-store-card class="pt10" v-show="storeMode" ref="storeCard" :uuid.sync="uuid" scenes="edaixi" />
</div>
<!-- <div v-show="form.cardType === 0" class="mb10">
<el-checkbox :disabled="isEdit || isInfo" v-model="sale_limit.flag">最低消费满</el-checkbox>
<el-input-number controls-position="right" :min="0" @focus="sale_limit.flag = true" :disabled="isEdit || isInfo" v-model="sale_limit.fee" class="w200"></el-input-number> 元可使用
......@@ -156,6 +146,17 @@
</div> -->
</el-form-item>
<el-form-item label="适用门店">
<el-radio :disabled="isEdit" v-model="storeMode" :label="0">所有门店</el-radio>
<el-radio :disabled="isEdit" v-model="storeMode" :label="1">部分门店</el-radio>
<span v-if="isEdit" class="fz12 gray ml20">卡券编辑时修改的适用门店信息不再回写至ERP</span>
<vue-gic-store-card class="pt10" v-show="storeMode" ref="storeCard" :uuid.sync="uuid" scenes="edaixi" />
</el-form-item>
<el-form-item label="适用门店说明" prop="cardExplain">
<dm-input class="w400" v-model="form.cardExplain" :disabled="isInfo" :maxlength="50"></dm-input>
</el-form-item>
<el-form-item label="优惠内容" prop="giftCouponValue">
<el-input-number controls-position="right" class="w150" :disabled="isEdit || isInfo" v-model="form.giftCouponValue" :precision="0" :min="0"></el-input-number> {{ form.giftCouponDiscountType === 1 ? '元' : '件' }}
<span class="fz13 gray">* 温馨提醒：单笔订单满50元免邮，50元以下需由己方承担10元运费</span>
......
src/views/ewash/partials/store-child.vue
<template>
<el-dialog title="提示" width="535px" :visible.sync="dialogVisible" @closed="close">
<div class="el-transfer" v-loading="loading">
<el-dialog title="创建子账户" width="600px" :visible.sync="dialogVisible" @closed="close">
<p class="mb20 red">注：创建企业e卡结算账户，以支持e袋洗活动的进行，备选门店屏蔽已创建关联的门店。</p>
<div class="el-transfer" v-loading="loading" style="width:500px;margin:0 auto;">
<!-- 左侧 -->
<div class="el-transfer-panel">
<div class="el-transfer-panel__header">
......@@ -13,7 +14,8 @@
<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">
<!-- v-infinite-scroll="leftScrollLoad" :infinite-scroll-disabled="!shouldLeftLoad" -->
<div class="el-transfer-panel__list" style="overflow:auto">
<!-- eslint-disable -->
<el-checkbox-group v-model="leftSelect">
<el-checkbox
......@@ -21,10 +23,12 @@
v-for="item in leftList.filter( v => { return !v.select; })"
:label="item.key"
:key="item"
>{{ item.name }}</el-checkbox>
>
{{ item.name }}
</el-checkbox>
</el-checkbox-group>
<p class="text-center" v-if="shouldLeftLoad">
<el-button class="gray" type="text">{{ leftLoading ? '加载中...' : '加载更多' }}</el-button>
<el-button class="gray" type="text" @click="leftScrollLoad">{{ leftLoading ? '加载中...' : '加载更多' }}</el-button>
</p>
<p class="text-center" v-else><el-button class="fz12" type="text" disabled>无更多数据</el-button></p>
<!-- eslint-disable -->
......@@ -148,6 +152,9 @@ export default {
},
// 滚动加载触发
leftScrollLoad() {
if (this.leftLoading) {
return;
}
this.listParams.currentPage += 1;
this.getLeftList();
},
......
src/views/ewash/statements.vue
......@@ -75,7 +75,7 @@ export default {
currentPage: 1,
pageSize: 20
},
dateTime: ['', ''],
dateTime: [Date.now() - 30 * 24 * 60 * 60 * 1000, Date.now()],
total: 0
};
},
......
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