Skip to content

M
marketing
Commit 0c98a55b by chenxin
Options

fix:update edx

parent 3e220407
Showing with 38 additions and 25 deletions
dist/index.html
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
gio('init','8be12240a3749eab', {}); gio('init','8be12240a3749eab', {});
//custom page code begin here //custom page code begin here
//custom page code end here //custom page code end here
gio('send');</script><link href=/marketing/static/css/main.e8752fefb85321b979b89605e826c94a.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.fc45c56e6ae84d07c7d5.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> gio('send');</script><link href=/marketing/static/css/main.3d86c380ed7d2f30df574df74b141c2f.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.f0fb85a4d853b8d07bd3.js></script><script type=text/javascript src=/marketing/static/js/vendor.4cb744d5df3ad4bdbad7.js></script><script type=text/javascript src=/marketing/static/js/main.d656ca61dad002699cba.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/manifest.f0fb85a4d853b8d07bd3.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:"ed20d27aeaa55df29c5d",2:"74cec9b4e7b2d7c30c85",3:"cd5acf90ada07f015f98",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.fc45c56e6ae84d07c7d5.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:"a8bcb9b897b6cfee9308",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,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/assets/style/base/reset.scss
...@@ -69,6 +69,9 @@ a:hover { ...@@ -69,6 +69,9 @@ a:hover {
.pb20{ .pb20{
padding-bottom: 20px!important; padding-bottom: 20px!important;
} }
.pb40{
padding-bottom: 40px!important;
}
.pb22{ .pb22{
padding-bottom: 22px!important; padding-bottom: 22px!important;
} }
...@@ -162,6 +165,9 @@ a:hover { ...@@ -162,6 +165,9 @@ a:hover {
.mb20{ .mb20{
margin-bottom: 20px!important; margin-bottom: 20px!important;
} }
.mb40{
margin-bottom: 40px!important;
}
.width20{ .width20{
width: 20%!important; width: 20%!important;
} }
......
src/service/api/cardApi.js
...@@ -4,7 +4,7 @@ import config from '@/config'; ...@@ -4,7 +4,7 @@ import config from '@/config';
export const url = config.api + PREFIX; export const url = config.api + PREFIX;
//卡券营销--卡券库--卡券分页列表 //卡券营销--卡券库--卡券分页列表
export const cardPageList = params => requests(PREFIX + 'card-page', params); export const cardPageList = params => requests(PREFIX + 'card-page', params, false, false, 'POST', false);
//卡券营销--卡券库--卡券分页列表 //卡券营销--卡券库--卡券分页列表
export const updateCardStock = params => requests(PREFIX + 'update-card-stock', params); export const updateCardStock = params => requests(PREFIX + 'update-card-stock', params);
......
src/service/api/index.js
...@@ -48,7 +48,7 @@ function popRequest(config) { ...@@ -48,7 +48,7 @@ function popRequest(config) {
* @param {*} code * @param {*} code
* @param {string} [message='请求错误'] * @param {string} [message='请求错误']
*/ */
function handlerErr(code, message = '请求错误') { function handlerErr(code, message = '请求错误', alertError = true) {
switch (code) { switch (code) {
case 404: case 404:
message = '404,错误请求'; message = '404,错误请求';
...@@ -81,14 +81,16 @@ function handlerErr(code, message = '请求错误') { ...@@ -81,14 +81,16 @@ function handlerErr(code, message = '请求错误') {
message = '网关错误'; message = '网关错误';
break; break;
} }
// eslint-disable-next-line if (alertError) {
Vue.prototype.$tips({ type: 'warning', message: message }); // eslint-disable-next-line
Vue.prototype.$tips({ type: 'warning', message: message });
}
} }
/** /**
* 请求地址，请求数据，是否静默，请求方法 * 请求地址，请求数据，是否静默，请求方法
*/ */
const requests = (url, data = {}, contentTypeIsJSON = false, isSilence = false, method = 'POST') => { const requests = (url, data = {}, contentTypeIsJSON = false, isSilence = false, method = 'POST', alertError = true) => {
let _opts = { method, url }; let _opts = { method, url };
const _query = {}; const _query = {};
let _timer = null; let _timer = null;
...@@ -118,7 +120,7 @@ const requests = (url, data = {}, contentTypeIsJSON = false, isSilence = false, ...@@ -118,7 +120,7 @@ const requests = (url, data = {}, contentTypeIsJSON = false, isSilence = false,
popRequest(_random); popRequest(_random);
if (res.data.errorCode !== 0) { if (res.data.errorCode !== 0) {
reject(res); reject(res);
handlerErr(res.data.errorCode, res.data.message); handlerErr(res.data.errorCode, res.data.message, alertError);
} else { } else {
resolve(res.data); resolve(res.data);
} }
...@@ -127,7 +129,7 @@ const requests = (url, data = {}, contentTypeIsJSON = false, isSilence = false, ...@@ -127,7 +129,7 @@ const requests = (url, data = {}, contentTypeIsJSON = false, isSilence = false,
clearTimeout(_timer); clearTimeout(_timer);
popRequest(_random); popRequest(_random);
if (res) { if (res) {
handlerErr(res.response.status, '接口异常'); handlerErr(res.response.status, '接口异常', alertError);
} }
reject(res); reject(res);
}); });
......
src/views/card/form.vue
<!--
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-08-06 20:53:23
* @LastEditTime: 2019-08-21 09:27:41
* @LastEditors: Please set LastEditors
-->
<template> <template>
<div> <div>
<el-form class="dm-wrap" :model="form" ref="form" :rules="rules" label-width="120px"> <el-form class="dm-wrap" :model="form" ref="form" :rules="rules" label-width="120px">
......
src/views/ewash/form.vue
...@@ -17,15 +17,15 @@ ...@@ -17,15 +17,15 @@
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<el-form-item prop="cardName" label="卡券名称"> <el-form-item prop="cardName" label="卡券名称">
<dm-input v-model="form.cardName" class="w400" placeholder="请输入卡券名称" :disabled="isEdit || isInfo" :byteType="1" :maxlength="30"></dm-input> <dm-input v-model="form.cardName" class="w400" placeholder="请输入卡券名称" :disabled="isEdit || isInfo" :byteType="1" :maxlength="9"></dm-input>
</el-form-item> </el-form-item>
<el-form-item prop="subName" label="备注名"> <el-form-item prop="subName" label="备注名">
<dm-input v-model="form.subName" class="w400" placeholder="请输入备注名称" :disabled="isEdit || isInfo" :byteType="1" :maxlength="20"></dm-input> <dm-input v-model="form.subName" class="w400" placeholder="请输入备注名称" :disabled="isEdit || isInfo" :byteType="1" :maxlength="10"></dm-input>
</el-form-item> </el-form-item>
<el-form-item prop="subTitle" label="卡券副标题"> <el-form-item prop="subTitle" label="卡券副标题">
<dm-input v-model="form.subTitle" class="w400" placeholder="请输入卡券副标题" :disabled="isEdit || isInfo" :byteType="1" :maxlength="20"></dm-input> <dm-input v-model="form.subTitle" class="w400" placeholder="请输入卡券副标题" :disabled="isEdit || isInfo" :byteType="1" :maxlength="18"></dm-input>
</el-form-item> </el-form-item>
<el-form-item prop="cardColor" label="卡券颜色" style="height: 40px;"> <el-form-item prop="cardColor" label="卡券颜色" style="height: 40px;">
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
<el-form-item label="优惠内容" prop="giftCouponValue"> <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 ? '元' : '件' }} <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> <span class="fz13 gray">* 温馨提醒：单笔订单满80元免邮，80元以下需由己方承担10元运费</span>
</el-form-item> </el-form-item>
<!-- <el-form-item prop="cardLimit" label="领券限制"> <!-- <el-form-item prop="cardLimit" label="领券限制">
......
src/views/ewash/list.vue
...@@ -30,6 +30,13 @@ ...@@ -30,6 +30,13 @@
<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> <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 --> <!-- 创建子账户dialog -->
<store-child ref="storeChild" :dialogVisible.sync="dialogVisible" /> <store-child ref="storeChild" :dialogVisible.sync="dialogVisible" />
<!-- 为创建e袋洗服务 -->
<el-dialog title="提示" :visible="ewashTipDialog" width="400px" :show-close="false">
<div class="text-center pb40">
<i class="el-icon-error red fz40 mb40"></i>
<div class="fz16">未开通e袋洗服务</div>
</div>
</el-dialog>
</section> </section>
</template> </template>
<script> <script>
...@@ -60,7 +67,8 @@ export default { ...@@ -60,7 +67,8 @@ export default {
sortFlag: false, sortFlag: false,
adjustStock: false, adjustStock: false,
currentCard: {}, currentCard: {},
dialogVisible: false dialogVisible: false,
ewashTipDialog: false
}; };
}, },
components: { components: {
...@@ -71,7 +79,7 @@ export default { ...@@ -71,7 +79,7 @@ export default {
created() { created() {
window.scrollTo(0, 0); window.scrollTo(0, 0);
this.getTableList(); this.getTableList();
this.$store.commit('mutations_breadcrumb', [{ name: 'e袋洗服务', path: '' }, { name: '卡券列表', path: '' }]); this.$store.commit('mutations_breadcrumb', [{ name: 'e袋洗服务', path: '' }, { name: '服务列表', path: '' }]);
}, },
methods: { methods: {
// 创建子账户dialog // 创建子账户dialog
...@@ -100,7 +108,11 @@ export default { ...@@ -100,7 +108,11 @@ export default {
this.tableList = res.result.result; this.tableList = res.result.result;
this.total = res.result.totalCount; this.total = res.result.totalCount;
} catch (err) { } catch (err) {
this.$tips({ type: 'error', message: '加载列表失败' }); if (err.data && err.data.errorCode === 170049) {
// 未开通e袋洗服务
this.ewashTipDialog = true;
}
// this.$tips({ type: 'error', message: '加载列表失败' });
} }
this.loading = false; this.loading = false;
}, },
......
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