Skip to content

M
marketing
Commit e0fd069c by liuchenxi
Options

update: bug修复

parent f54211e2
Showing with 644 additions and 53 deletions
src/assets/iconfont/iconfont.css
@font-face {
font-family: "iconfont"; /* Project id 688955 */
src: url('iconfont.woff2?t=1623822833759') format('woff2'),
url('iconfont.woff?t=1623822833759') format('woff'),
url('iconfont.ttf?t=1623822833759') format('truetype');
src: url('iconfont.woff2?t=1637225676006') format('woff2'),
url('iconfont.woff?t=1637225676006') format('woff'),
url('iconfont.ttf?t=1637225676006') format('truetype');
}
.iconfont {
......@@ -13,6 +13,174 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-a-1_heimingdanguanli:before {
content: "\e68d";
}
.icon-weixinquguan:before {
content: "\e68c";
}
.icon-jifen1:before {
content: "\e689";
}
.icon-yingxiao:before {
content: "\e765";
}
.icon-shouqi1:before {
content: "\e6b8";
}
.icon-xiala:before {
content: "\e6b9";
}
.icon-chuzhizhanghu:before {
content: "\e682";
}
.icon-mendianbaojiadan:before {
content: "\e684";
}
.icon-weimeng:before {
content: "\e6e4";
}
.icon-weixin1:before {
content: "\e685";
}
.icon-01_kaquanguanli:before {
content: "\e686";
}
.icon-chenggong:before {
content: "\e67f";
}
.icon-shibai:before {
content: "\e681";
}
.icon-dengji-:before {
content: "\e6a3";
}
.icon-dengji-1:before {
content: "\e6a4";
}
.icon-dengji-2:before {
content: "\e6a2";
}
.icon-dengji-3:before {
content: "\e6a5";
}
.icon-dengji-4:before {
content: "\e6a6";
}
.icon-dengji-5:before {
content: "\e67a";
}
.icon-dengji-6:before {
content: "\e67b";
}
.icon-dengji-7:before {
content: "\e67c";
}
.icon-dengji-8:before {
content: "\e67d";
}
.icon-dengji-9:before {
content: "\e67e";
}
.icon-yonghuliebiao:before {
content: "\e679";
}
.icon-yichang:before {
content: "\e677";
}
.icon-SwapOutlined:before {
content: "\e672";
}
.icon-BellOutlined:before {
content: "\e673";
}
.icon-chakanxiangqing:before {
content: "\e892";
}
.icon-jiaocheng:before {
content: "\e6f8";
}
.icon-caozuorizhi:before {
content: "\e675";
}
.icon-querenyuanzhengqueduigoutijiaochenggongwancheng:before {
content: "\e671";
}
.icon-umidd17:before {
content: "\e66d";
}
.icon-xuanzhong11-copy:before {
content: "\eb59";
}
.icon-xuanzhong11:before {
content: "\e690";
}
.icon-huiyuanqia:before {
content: "\e668";
}
.icon-zhifubaoxiaochengxu:before {
content: "\e669";
}
.icon-shouye:before {
content: "\e66c";
}
.icon-fuwuhao2:before {
content: "\e665";
}
.icon-xiaochengxu4:before {
content: "\e666";
}
.icon-xiaochengxu12:before {
content: "\e662";
}
.icon-zhuangtailan:before {
content: "\e663";
}
.icon-jiantou:before {
content: "\e8a3";
}
.icon-Icon-yishanchu:before {
content: "\e65a";
}
......@@ -169,6 +337,10 @@
content: "\e643";
}
.icon-dingdan-copy:before {
content: "\eb5a";
}
.icon-dingdan:before {
content: "\e660";
}
......
src/assets/iconfont/iconfont.js
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/iconfont/iconfont.json
......@@ -6,6 +6,300 @@
"description": "",
"glyphs": [
{
"icon_id": "22465139",
"name": "1_黑名单管理",
"font_class": "a-1_heimingdanguanli",
"unicode": "e68d",
"unicode_decimal": 59021
},
{
"icon_id": "25735940",
"name": "微信取关",
"font_class": "weixinquguan",
"unicode": "e68c",
"unicode_decimal": 59020
},
{
"icon_id": "25698898",
"name": "积分",
"font_class": "jifen1",
"unicode": "e689",
"unicode_decimal": 59017
},
{
"icon_id": "5880283",
"name": "营销",
"font_class": "yingxiao",
"unicode": "e765",
"unicode_decimal": 59237
},
{
"icon_id": "672034",
"name": "收起",
"font_class": "shouqi1",
"unicode": "e6b8",
"unicode_decimal": 59064
},
{
"icon_id": "672036",
"name": "下拉",
"font_class": "xiala",
"unicode": "e6b9",
"unicode_decimal": 59065
},
{
"icon_id": "2523534",
"name": "储值账户",
"font_class": "chuzhizhanghu",
"unicode": "e682",
"unicode_decimal": 59010
},
{
"icon_id": "4192439",
"name": "门店报价单",
"font_class": "mendianbaojiadan",
"unicode": "e684",
"unicode_decimal": 59012
},
{
"icon_id": "7722415",
"name": "微盟",
"font_class": "weimeng",
"unicode": "e6e4",
"unicode_decimal": 59108
},
{
"icon_id": "15933094",
"name": "微信",
"font_class": "weixin1",
"unicode": "e685",
"unicode_decimal": 59013
},
{
"icon_id": "18480966",
"name": "01_卡券管理",
"font_class": "01_kaquanguanli",
"unicode": "e686",
"unicode_decimal": 59014
},
{
"icon_id": "1046178",
"name": "成功",
"font_class": "chenggong",
"unicode": "e67f",
"unicode_decimal": 59007
},
{
"icon_id": "1046180",
"name": "失败",
"font_class": "shibai",
"unicode": "e681",
"unicode_decimal": 59009
},
{
"icon_id": "7128865",
"name": "等级-3",
"font_class": "dengji-",
"unicode": "e6a3",
"unicode_decimal": 59043
},
{
"icon_id": "7128866",
"name": "等级-6",
"font_class": "dengji-1",
"unicode": "e6a4",
"unicode_decimal": 59044
},
{
"icon_id": "7128868",
"name": "等级-1",
"font_class": "dengji-2",
"unicode": "e6a2",
"unicode_decimal": 59042
},
{
"icon_id": "7128870",
"name": "等级-5",
"font_class": "dengji-3",
"unicode": "e6a5",
"unicode_decimal": 59045
},
{
"icon_id": "7128874",
"name": "等级-8",
"font_class": "dengji-4",
"unicode": "e6a6",
"unicode_decimal": 59046
},
{
"icon_id": "9829436",
"name": "等级-10",
"font_class": "dengji-5",
"unicode": "e67a",
"unicode_decimal": 59002
},
{
"icon_id": "9829439",
"name": "等级-7",
"font_class": "dengji-6",
"unicode": "e67b",
"unicode_decimal": 59003
},
{
"icon_id": "9829440",
"name": "等级-9",
"font_class": "dengji-7",
"unicode": "e67c",
"unicode_decimal": 59004
},
{
"icon_id": "9829441",
"name": "等级-4",
"font_class": "dengji-8",
"unicode": "e67d",
"unicode_decimal": 59005
},
{
"icon_id": "9829444",
"name": "等级-2",
"font_class": "dengji-9",
"unicode": "e67e",
"unicode_decimal": 59006
},
{
"icon_id": "25597267",
"name": "用户列表",
"font_class": "yonghuliebiao",
"unicode": "e679",
"unicode_decimal": 59001
},
{
"icon_id": "11495063",
"name": "异常",
"font_class": "yichang",
"unicode": "e677",
"unicode_decimal": 58999
},
{
"icon_id": "20893458",
"name": "SwapOutlined",
"font_class": "SwapOutlined",
"unicode": "e672",
"unicode_decimal": 58994
},
{
"icon_id": "22596519",
"name": "BellOutlined",
"font_class": "BellOutlined",
"unicode": "e673",
"unicode_decimal": 58995
},
{
"icon_id": "9002691",
"name": "查看详情",
"font_class": "chakanxiangqing",
"unicode": "e892",
"unicode_decimal": 59538
},
{
"icon_id": "22607678",
"name": "教程",
"font_class": "jiaocheng",
"unicode": "e6f8",
"unicode_decimal": 59128
},
{
"icon_id": "10605659",
"name": "操作日志",
"font_class": "caozuorizhi",
"unicode": "e675",
"unicode_decimal": 58997
},
{
"icon_id": "23089611",
"name": "确认 圆 正确 对勾 提交 成功 完成 ",
"font_class": "querenyuanzhengqueduigoutijiaochenggongwancheng",
"unicode": "e671",
"unicode_decimal": 58993
},
{
"icon_id": "18516314",
"name": "支付宝",
"font_class": "umidd17",
"unicode": "e66d",
"unicode_decimal": 58989
},
{
"icon_id": "23794372",
"name": "选中",
"font_class": "xuanzhong11-copy",
"unicode": "eb59",
"unicode_decimal": 60249
},
{
"icon_id": "18683817",
"name": "选中",
"font_class": "xuanzhong11",
"unicode": "e690",
"unicode_decimal": 59024
},
{
"icon_id": "3796375",
"name": "会员卡",
"font_class": "huiyuanqia",
"unicode": "e668",
"unicode_decimal": 58984
},
{
"icon_id": "6180166",
"name": "支付宝小程序",
"font_class": "zhifubaoxiaochengxu",
"unicode": "e669",
"unicode_decimal": 58985
},
{
"icon_id": "21471056",
"name": "首 页",
"font_class": "shouye",
"unicode": "e66c",
"unicode_decimal": 58988
},
{
"icon_id": "16840237",
"name": "服务号",
"font_class": "fuwuhao2",
"unicode": "e665",
"unicode_decimal": 58981
},
{
"icon_id": "19703591",
"name": "小程序",
"font_class": "xiaochengxu4",
"unicode": "e666",
"unicode_decimal": 58982
},
{
"icon_id": "8444051",
"name": "小程序",
"font_class": "xiaochengxu12",
"unicode": "e662",
"unicode_decimal": 58978
},
{
"icon_id": "22292746",
"name": "状态栏",
"font_class": "zhuangtailan",
"unicode": "e663",
"unicode_decimal": 58979
},
{
"icon_id": "9724564",
"name": "右箭头",
"font_class": "jiantou",
"unicode": "e8a3",
"unicode_decimal": 59555
},
{
"icon_id": "22270569",
"name": "Icon-yishanchu",
"font_class": "Icon-yishanchu",
......@@ -279,6 +573,13 @@
"unicode_decimal": 58947
},
{
"icon_id": "25750336",
"name": "订单",
"font_class": "dingdan-copy",
"unicode": "eb5a",
"unicode_decimal": 60250
},
{
"icon_id": "10094849",
"name": "订单",
"font_class": "dingdan",
......
src/views/card/record-get.vue
......@@ -144,7 +144,6 @@ export default {
// limit: false, // 限制筛选时间前后七天
cardStatusOptions: [
{ value: '', label: '全部卡券状态' },
{ value: 3, label: '待领取' },
{ value: 4, label: '待使用' },
{ value: 5, label: '已使用' },
{ value: 6, label: '已过期' },
......@@ -409,8 +408,8 @@ export default {
if (row.status == 3) {
_content = `<div class="dm-status--warning">待领取</div>`;
} else if (row.status == 4) {
// let isOverdue = Date.now() >= row.limitTime;
_content = `<div class="dm-status--primary">待使用</div>`;
let isOverdue = Date.now() >= row.limitTime;
_content = `<div class="${isOverdue ? 'dm-status--info' : 'dm-status--primary'}">${isOverdue ? '已过期' : '待使用'}</div>`;
} else if (row.status == 5) {
_content = `<div class="dm-status--warning">已使用</div>`;
} else if (row.status == 6) {
......
src/views/card/record-send-Info.vue
......@@ -187,8 +187,8 @@ export default {
if (status == 3) {
_content = `<div class="dm-status--error">待领取</div>`;
} else if (status == 4) {
// let isOverdue = Date.now() >= row.limitTime;
_content = `<div class="dm-status--primary">待使用</div>`;
let isOverdue = Date.now() >= row.limitTime;
_content = `<div class="${isOverdue ? 'dm-status--info' : 'dm-status--primary'}">${isOverdue ? '已过期' : '待使用'}</div>`;
} else if (status == 5) {
_content = `<div class="dm-status--warning">已使用</div>`;
} else if (status == 6) {
......
src/views/message/blackList.vue
......@@ -77,6 +77,11 @@ export default {
else cb(new Error('请填写添加黑名单原因'));
} else cb();
};
const validateList = (rules, value, cb) => {
const res = value.trim();
if (!res) return cb(new Error('请填写内容'));
else cb();
};
return {
search: {
phone: '',
......@@ -95,7 +100,7 @@ export default {
visible: false,
form: {
rules: {
phoneList: { required: true, message: '请输入手机号', trigger: 'blur' },
phoneList: { validator: validateList, trigger: 'blur' },
reasonType: { validator: validateReason, trigger: 'blur' }
},
phoneList: '',
......@@ -129,8 +134,8 @@ export default {
currentPage,
pageSize,
phoneNumber: phone,
startTime: new Date(time[0]).getTime() || '',
endTime: new Date(time[1]).getTime() || ''
startTime: formatDateTimeByType(time[0], 'yyyy-MM-dd-HH-mm-ss', true).y || '',
endTime: formatDateTimeByType(time[1], 'yyyy-MM-dd-HH-mm-ss', true).y || ''
};
const result = await getBlackList(para);
this.tableData.data = result.result.result || [];
......@@ -154,14 +159,18 @@ export default {
para.phoneNumber = this.validatePhoneList();
para.reasonType = reasonType;
para.reason = reasonType ? reason : null;
await addBlackList(para);
if (!this.isExiteErrorPhone) {
this.$tips({ type: 'success', message: '添加成功' });
this.dialogData.visible = false;
if (para.phoneNumber) {
await addBlackList(para);
if (!this.isExiteErrorPhone) {
this.$tips({ type: 'success', message: '添加成功' });
this.dialogData.visible = false;
} else {
this.$tips({ type: 'warning', message: '部分添加成功' });
}
this.getTableData();
} else {
this.$tips({ type: 'warning', message: '部分添加成功' });
this.$tips({ type: 'error', message: '添加失败,无正确的手机号' });
}
this.getTableData();
}
});
},
......@@ -169,8 +178,8 @@ export default {
// 返回正确手机号的Array
const reg = /^1[0-9]{10}$/;
const arr = this.dialogData.form.phoneList.split('\n');
this.dialogData.form.errorPhoneList = arr.filter(el => !reg.test(el));
const result = arr.filter(el => reg.test(el));
this.dialogData.form.errorPhoneList = arr.filter(el => el.trim() && !reg.test(el.trim()));
const result = arr.filter(el => reg.test(el.trim())).map(el => el.trim());
return result.toString();
},
resetDialog() {
......
src/views/message/detail.vue
......@@ -93,11 +93,12 @@
<span v-else>{{ row[v.prop] }}</span>
</template>
</el-table-column>
<el-table-column :min-width="80" align="left" label="错误码" prop="errorMsg">
<el-table-column :min-width="80" align="left" label="错误信息" prop="errorMsg">
<template slot-scope="scope">
<span v-if="scope.row.errorMsg == -1">--</span>
<span v-else-if="scope.row.backStatus == '--' && scope.row.sendStatus !== 2">--</span>
<el-button v-else type="text" @click="errorCodeShow = true">{{ scope.row.errorMsg }}</el-button>
<!-- <el-button v-else type="text" @click="errorCodeShow = true">{{ scope.row.errorMsg }}</el-button> -->
<span v-else type="text">{{ scope.row.errorMsg }}</span>
</template>
</el-table-column>
<el-table-column :min-width="120" align="left" label="上报时间" prop="backTime">
......@@ -113,7 +114,7 @@
<el-popover :open-delay="300" class="item" trigger="hover" width="300" v-if="scope.row.remark && scope.row.remark.length > 10" :content="scope.row.remark" placement="top-start">
<span slot="reference" class="ellipsis">{{ scope.row.remark }}</span>
</el-popover>
<span v-else>{{ scope.row.remark }}</span>
<span v-else>{{ scope.row.remark || '--' }}</span>
</template>
</el-table-column>
</el-table>
......
src/views/message/form.vue
......@@ -77,30 +77,6 @@ export default {
sendTypeOptions: [{ value: 0, label: '立即发送' }, { value: 1, label: '定时发送' }], // eslint-disable-line
smsTempList: [],
pickerOptions: {
shortcuts: [
{
text: '今天',
onClick(picker) {
picker.$emit('pick', new Date());
}
},
{
text: '昨天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() - 3600 * 1000 * 24);
picker.$emit('pick', date);
}
},
{
text: '一周前',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit('pick', date);
}
}
],
disabledDate(val) {
return Date.now() >= val.getTime() + 24 * 60 * 60 * 1000;
}
......
src/views/message/importSendDetail.vue
......@@ -74,11 +74,12 @@
<span v-else>{{ row[v.prop] || '--' }}</span>
</template>
</el-table-column>
<el-table-column :min-width="80" align="left" label="错误码" prop="errorMsg" show-overflow-tooltip>
<el-table-column :min-width="80" align="left" label="错误信息" prop="errorMsg" show-overflow-tooltip>
<template slot-scope="scope">
<span v-if="scope.row.errorMsg == -1">--</span>
<span v-else-if="scope.row.backStatus == '--' && scope.row.sendStatus !== 2">--</span>
<el-button style="text-overflow:ellipsis;overflow:hidden;white-space:nowrap;width:100%" v-else type="text" @click="errorCodeShow = true">{{ scope.row.errorMsg }}</el-button>
<!-- <el-button style="text-overflow:ellipsis;overflow:hidden;white-space:nowrap;width:100%" v-else type="text" @click="errorCodeShow = true">{{ scope.row.errorMsg }}</el-button> -->
<span style="text-overflow:ellipsis;overflow:hidden;white-space:nowrap;width:100%" v-else type="text">{{ scope.row.errorMsg }}</span>
</template>
</el-table-column>
<el-table-column :min-width="100" align="left" label="上报时间" prop="backTime">
......@@ -91,10 +92,10 @@
</el-table-column>
<el-table-column :show-overflow-tooltip="false" :min-width="150" align="left" label="短信内容" prop="remark">
<template slot-scope="scope">
<el-popover class="item" trigger="hover" width="300" v-if="scope.row.remark.length > 10" :content="scope.row.remark" placement="top-start">
<el-popover class="item" trigger="hover" width="300" v-if="scope.row.remark && scope.row.remark.length > 10" :content="scope.row.remark" placement="top-start">
<span slot="reference" class="ellipsis">{{ scope.row.remark }}</span>
</el-popover>
<span v-else>{{ scope.row.remark }}</span>
<span v-else>{{ scope.row.remark || '--' }}</span>
</template>
</el-table-column>
</el-table>
......
static/fonts/iconfont.css
@font-face {
font-family: "iconfont"; /* Project id 688955 */
src: url('iconfont.woff2?t=1636701873582') format('woff2'),
url('iconfont.woff?t=1636701873582') format('woff'),
url('iconfont.ttf?t=1636701873582') format('truetype');
src: url('iconfont.woff2?t=1637225676006') format('woff2'),
url('iconfont.woff?t=1637225676006') format('woff'),
url('iconfont.ttf?t=1637225676006') format('truetype');
}
.iconfont {
......@@ -13,6 +13,50 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-a-1_heimingdanguanli:before {
content: "\e68d";
}
.icon-weixinquguan:before {
content: "\e68c";
}
.icon-jifen1:before {
content: "\e689";
}
.icon-yingxiao:before {
content: "\e765";
}
.icon-shouqi1:before {
content: "\e6b8";
}
.icon-xiala:before {
content: "\e6b9";
}
.icon-chuzhizhanghu:before {
content: "\e682";
}
.icon-mendianbaojiadan:before {
content: "\e684";
}
.icon-weimeng:before {
content: "\e6e4";
}
.icon-weixin1:before {
content: "\e685";
}
.icon-01_kaquanguanli:before {
content: "\e686";
}
.icon-chenggong:before {
content: "\e67f";
}
......@@ -293,6 +337,10 @@
content: "\e643";
}
.icon-dingdan-copy:before {
content: "\eb5a";
}
.icon-dingdan:before {
content: "\e660";
}
......
static/fonts/iconfont.js
This source diff could not be displayed because it is too large. You can view the blob instead.
static/fonts/iconfont.json
......@@ -6,6 +6,83 @@
"description": "",
"glyphs": [
{
"icon_id": "22465139",
"name": "1_黑名单管理",
"font_class": "a-1_heimingdanguanli",
"unicode": "e68d",
"unicode_decimal": 59021
},
{
"icon_id": "25735940",
"name": "微信取关",
"font_class": "weixinquguan",
"unicode": "e68c",
"unicode_decimal": 59020
},
{
"icon_id": "25698898",
"name": "积分",
"font_class": "jifen1",
"unicode": "e689",
"unicode_decimal": 59017
},
{
"icon_id": "5880283",
"name": "营销",
"font_class": "yingxiao",
"unicode": "e765",
"unicode_decimal": 59237
},
{
"icon_id": "672034",
"name": "收起",
"font_class": "shouqi1",
"unicode": "e6b8",
"unicode_decimal": 59064
},
{
"icon_id": "672036",
"name": "下拉",
"font_class": "xiala",
"unicode": "e6b9",
"unicode_decimal": 59065
},
{
"icon_id": "2523534",
"name": "储值账户",
"font_class": "chuzhizhanghu",
"unicode": "e682",
"unicode_decimal": 59010
},
{
"icon_id": "4192439",
"name": "门店报价单",
"font_class": "mendianbaojiadan",
"unicode": "e684",
"unicode_decimal": 59012
},
{
"icon_id": "7722415",
"name": "微盟",
"font_class": "weimeng",
"unicode": "e6e4",
"unicode_decimal": 59108
},
{
"icon_id": "15933094",
"name": "微信",
"font_class": "weixin1",
"unicode": "e685",
"unicode_decimal": 59013
},
{
"icon_id": "18480966",
"name": "01_卡券管理",
"font_class": "01_kaquanguanli",
"unicode": "e686",
"unicode_decimal": 59014
},
{
"icon_id": "1046178",
"name": "成功",
"font_class": "chenggong",
......@@ -496,6 +573,13 @@
"unicode_decimal": 58947
},
{
"icon_id": "25750336",
"name": "订单",
"font_class": "dingdan-copy",
"unicode": "eb5a",
"unicode_decimal": 60250
},
{
"icon_id": "10094849",
"name": "订单",
"font_class": "dingdan",
......
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