Skip to content

M
marketing
Commit 063d772a by chenxin
Options

fix:build e袋洗 门店余额点击获取

parent f45a6d65
Showing with 36 additions and 28 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.19b837f62fa69e95ef6de18380f5cbfe.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.13.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.37.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.93.js></script><script type=text/javascript src=/marketing/static/js/manifest.386bf0bd5f16c5ccf1b2.js></script><script type=text/javascript src=/marketing/static/js/vendor.f6e5442e18ed1c7d4a4d.js></script><script type=text/javascript src=/marketing/static/js/main.7f855036aaadfe9f9079.js></script></body></html>
\ No newline at end of file
gio('send');</script><link href=/marketing/static/css/main.e835ad6814e27209e3e8a57ff854e3f4.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.13.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.37.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.93.js></script><script type=text/javascript src=/marketing/static/js/manifest.96ec448d4702bd364423.js></script><script type=text/javascript src=/marketing/static/js/vendor.f6e5442e18ed1c7d4a4d.js></script><script type=text/javascript src=/marketing/static/js/main.7f855036aaadfe9f9079.js></script></body></html>
\ No newline at end of file
dist/static/js/manifest.386bf0bd5f16c5ccf1b2.js → dist/static/js/manifest.96ec448d4702bd364423.js
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,a,c){for(var f,i,u,d=0,s=[];d<n.length;d++)i=n[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(r&&r(n,a,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[d]);return u};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 a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.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:"083a5b72add6de59024f",1:"2bc4dff887fff889bcfc",2:"dc31df9e7fef4aaa587c",3:"98da059bdef1af8fc5d7",4:"82b6062b9f7c9e15698f",5:"040c5edae738dc44ee28",6:"8d6b79cd72eecf0ea807",7:"6dfebb35a2cb22f7489d",8:"6c24a15c40acee15c8d9",9:"925a34b416ed002007fe"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var r=t[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,a.appendChild(c),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,a,c){for(var f,i,d,u=0,s=[];u<n.length;u++)i=n[u],t[i]&&s.push(t[i][0]),t[i]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(r&&r(n,a,c);s.length;)s.shift()();if(c)for(u=0;u<c.length;u++)d=o(o.s=c[u]);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 a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.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:"083a5b72add6de59024f",1:"fbbfe1c75140eddf4ca6",2:"41d4bef93a8857657ddc",3:"72d82a0415260b086d3f",4:"82b6062b9f7c9e15698f",5:"040c5edae738dc44ee28",6:"3cdedbeb7de6eea74c59",7:"6dfebb35a2cb22f7489d",8:"bd6f84bb38a1ad84a1c0",9:"925a34b416ed002007fe"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var r=t[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,a.appendChild(c),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
dist/static/js/msg.6c24a15c40acee15c8d9.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/msg.bd6f84bb38a1ad84a1c0.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/service/api/ewashApi.js
......@@ -19,3 +19,5 @@ export const getEdxCategory = params => requests(PREFIX + 'edx-category', params
export const exportEdxOrderCsv = config.api + PREFIX + 'edx-order-csv';
// e袋洗 门店列表
export const getEdxStoreList = params => requests(PREFIX + 'edx-store-list', params);
// e袋洗 获取门店余额
export const getEdxStoreYue = params => requests(PREFIX + 'edx-store-yue', params);
src/views/ecm/current-list.vue
<!--
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-08-06 20:53:23
* @LastEditTime: 2019-08-09 11:36:08
* @LastEditors: Please set LastEditors
-->
<template>
<section>
<div class="dm-wrap clearfix">
......
src/views/ewash/store-list.vue
......@@ -14,6 +14,12 @@
<span v-else>{{ scope.row[v.prop] }}</span>
</template>
</el-table-column>
<el-table-column label="当前余额" align="left" width="120" prop="storeBalance">
<template slot-scope="scope">
<el-button type="text" @click="getYue(scope.row)" v-if="!scope.row.balance">获取余额</el-button>
{{ scope.row.balance }}
</template>
</el-table-column>
</el-table>
<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 -->
......@@ -23,7 +29,7 @@
</section>
</template>
<script>
import { getEdxStoreList } from '@/service/api/ewashApi.js';
import { getEdxStoreList, getEdxStoreYue } from '@/service/api/ewashApi.js';
import tableMethods from '@/mixins/tableMethods.js';
import unableTips from './partials/unable-tips';
import storeChild from './partials/store-child';
......@@ -47,17 +53,7 @@ export default {
return `<div>${row.clerkManagerName}</div><div class="fz13 minor-font-color">${row.clerkManagerPhone}</div>`;
}
},
{ label: '门店地址', prop: 'address', minWidth: '160', tooltip: true, align: 'left' },
{
label: '当前余额',
prop: 'storeBalance',
minWidth: '120',
tooltip: false,
align: 'left',
formatter: row => {
return `¥ ${row.storeBalance ? row.storeBalance : '0.00'}`;
}
}
{ label: '门店地址', prop: 'address', minWidth: '160', tooltip: true, align: 'left' }
],
listParams: {
searchParam: '',
......@@ -79,13 +75,30 @@ export default {
this.dialogVisible = true;
this.$refs.storeChild.reload();
},
// 获取余额
getYue(row) {
this.loading = true;
const { storeId } = row;
getEdxStoreYue({ storeId })
.then(res => {
row.balance = `￥${res.result || 0.0}`;
this.loading = false;
})
.catch(() => {
this.loading = false;
});
},
// 获取列表
async getTableList() {
try {
this.loading = true;
let res = await getEdxStoreList(this.listParams);
if (res.errorCode === 0 && res.result) {
this.tableList = res.result.result || [];
this.tableList =
res.result.result.map(v => {
v.balance = null;
return v;
}) || [];
this.total = res.result.totalCount;
this.ewashDisable = true;
} else {
......
src/views/msg/edit.vue
......@@ -115,7 +115,7 @@
</section>
<!-- 积分变更提现 -->
<section class="dm-form__wrap" v-if="info.triggerCode === 'integralChange'">
<h3 class="dm-title__label">提醒配置</h3>
<h3 class="dm-title__label">提醒配置<i class="ml20 ml20 dm-title__label--icon iconfont icon-xinxixianshi"></i><span class="gray fz13"> 开关切换后即生效</span></h3>
<integral-change v-if="info.triggerCode === 'integralChange'" />
</section>
<div class="btn-wrap_fixed" :class="{ on: asideShow }">
......
src/views/msg/module/integral-change.vue
......@@ -7,7 +7,7 @@
<el-switch @change="handleSetIntegralChange(item)" :value="item.state" :active-value="1" :inactive-value="0" />
<template v-if="item.dictCode == 1101">
<i class="ml20 ml20 dm-title__label--icon iconfont icon-xinxixianshi"></i>
<span class="gray fz13">已有门店消费通知，不建议再开启积分变更提现</span>
<span class="gray fz13">已有门店消费通知，不建议再开启积分变更提醒</span>
</template>
</li>
</ul>
......
src/views/wechat/record.vue
<template>
<section class="dm-wrap">
<section class="dm-wrap" v-loading="loading">
<!-- <el-button type="danger" plain disabled>删除</el-button> -->
<div class="pb22">
<el-select class="vertical-middle w150" v-model="listParams.contentType" placeholder="选择群发类型" @change="search">
......@@ -19,7 +19,7 @@
</el-tooltip>
<el-button v-else class="fr" type="primary" @click="$router.push('/wechat/record/add')">新建群发</el-button>
</div>
<el-table tooltipEffect="light" :data="recordList" style="width: 100%" row-key="sendTime" v-loading="loading">
<el-table tooltipEffect="light" :data="recordList" style="width: 100%" row-key="sendTime">
<el-table-column :min-width="100" align="left" label="时间" prop="createTime">
<template slot-scope="scope">
<p class="cell-time">
......
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