Skip to content

M
marketing
Commit 3ccb3902 by chenxin
Options

fix:build

parent 095ada6d
Showing with 25 additions and 24 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/fonts/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.77345158ae0f15e3a77e9725aac624a2.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.36.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.10.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.2.16.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.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.42.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.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.2.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.5.js></script><script type=text/javascript src=/marketing/static/js/manifest.f43d286b8267349b2dd1.js></script><script type=text/javascript src=/marketing/static/js/vendor.cbb380c2053ab598e892.js></script><script type=text/javascript src=/marketing/static/js/main.9be40b8568322326f793.js></script></body></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/fonts/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.81025bae0cf8bb006d1d42f1c3e41956.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.36.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.10.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.2.16.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.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.42.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.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.2.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.5.js></script><script type=text/javascript src=/marketing/static/js/manifest.5b086491a8197cda0995.js></script><script type=text/javascript src=/marketing/static/js/vendor.cbb380c2053ab598e892.js></script><script type=text/javascript src=/marketing/static/js/main.9be40b8568322326f793.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/manifest.f43d286b8267349b2dd1.js → dist/static/js/manifest.5b086491a8197cda0995.js
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(t,a,c){for(var i,u,f,d=0,s=[];d<t.length;d++)u=t[d],n[u]&&s.push(n[u][0]),n[u]=0;for(i in a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(r&&r(t,a,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)f=o(o.s=c[d]);return f};var t={},n={13:0};function o(r){if(t[r])return t[r].exports;var n=t[r]={i:r,l:!1,exports:{}};return e[r].call(n.exports,n,n.exports,o),n.l=!0,n.exports}o.e=function(e){var r=n[e];if(0===r)return new Promise(function(e){e()});if(r)return r[2];var t=new Promise(function(t,o){r=n[e]=[t,o]});r[2]=t;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:"card",1:"game",2:"wechat",3:"message",4:"ewash",5:"evaluation",6:"ecm",7:"activity",8:"recharge",9:"msg",10:"calllog"}[e]||e)+"."+{0:"720bcd87f8823e1ff27d",1:"eb4aae562903a44abebc",2:"a1e67b61b2c83b1882ba",3:"30063e940a03d39ae4e5",4:"17d5d8e8e5023c0ef4dd",5:"2232513857658504ca73",6:"129e26b0d6d8c96ce121",7:"520a54176361c7b4f5f4",8:"1ff302476a871dc141c7",9:"ed6ba5a1645f90d782a1",10:"b15028a3ecc7d7b67d9f"}[e]+".js";var i=setTimeout(u,12e4);function u(){c.onerror=c.onload=null,clearTimeout(i);var r=n[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return c.onerror=c.onload=u,a.appendChild(c),t},o.m=e,o.c=t,o.d=function(e,r,t){o.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},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}}([]); !function(e){var r=window.webpackJsonp;window.webpackJsonp=function(t,a,c){for(var i,f,u,d=0,s=[];d<t.length;d++)f=t[d],n[f]&&s.push(n[f][0]),n[f]=0;for(i in a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(r&&r(t,a,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[d]);return u};var t={},n={13:0};function o(r){if(t[r])return t[r].exports;var n=t[r]={i:r,l:!1,exports:{}};return e[r].call(n.exports,n,n.exports,o),n.l=!0,n.exports}o.e=function(e){var r=n[e];if(0===r)return new Promise(function(e){e()});if(r)return r[2];var t=new Promise(function(t,o){r=n[e]=[t,o]});r[2]=t;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:"card",1:"game",2:"wechat",3:"message",4:"ewash",5:"evaluation",6:"ecm",7:"activity",8:"recharge",9:"msg",10:"calllog"}[e]||e)+"."+{0:"8eba6b26b0242f08524a",1:"008880892743df0f58e3",2:"a1e67b61b2c83b1882ba",3:"817c2fce5d629049941d",4:"17d5d8e8e5023c0ef4dd",5:"2232513857658504ca73",6:"129e26b0d6d8c96ce121",7:"520a54176361c7b4f5f4",8:"1ff302476a871dc141c7",9:"ed6ba5a1645f90d782a1",10:"b15028a3ecc7d7b67d9f"}[e]+".js";var i=setTimeout(f,12e4);function f(){c.onerror=c.onload=null,clearTimeout(i);var r=n[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return c.onerror=c.onload=f,a.appendChild(c),t},o.m=e,o.c=t,o.d=function(e,r,t){o.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},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 \ No newline at end of file
src/views/card/give-list.vue
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</el-table-column> </el-table-column>
<el-table-column :show-overflow-tooltip="true" min-width="120" header-align="left" align="left" prop="memberId" label="领取会员"> <el-table-column :show-overflow-tooltip="true" min-width="120" header-align="left" align="left" prop="memberId" label="领取会员">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="scope.row.giveStatus === 1"> <template v-if="scope.row.giveStatus === 1 && scope.row.giveStatus === 2">
<a v-if="scope.row.friendMemberId" :href="'/member/#/wechatmemberDetail?memberId=' + scope.row.friendMemberId" target="_blank"> <a v-if="scope.row.friendMemberId" :href="'/member/#/wechatmemberDetail?memberId=' + scope.row.friendMemberId" target="_blank">
<img class="vertical-middle table__avatar--40" :src="scope.row.friendImageUrl || defaultAvatar" width="60" height="60" /> <img class="vertical-middle table__avatar--40" :src="scope.row.friendImageUrl || defaultAvatar" width="60" height="60" />
<div class="inline-block vertical-middle"> <div class="inline-block vertical-middle">
...@@ -55,14 +55,15 @@ ...@@ -55,14 +55,15 @@
<p class="fz13 gray">{{ scope.row.friendPhoneNumber || '--' }}</p> <p class="fz13 gray">{{ scope.row.friendPhoneNumber || '--' }}</p>
</div> </div>
</a> </a>
<span v-else>游客openid：{{ scope.row.friendOpenId || '--' }}</span> <span v-else-if="scope.row.friendOpenId">游客openid：{{ scope.row.friendOpenId || '--' }}</span>
<span v-else>--</span>
</template> </template>
<span v-else>--</span> <span v-else>--</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :show-overflow-tooltip="true" width="100" align="left" prop="receiveTime" label="领取时间"> <el-table-column :show-overflow-tooltip="true" width="100" align="left" prop="receiveTime" label="领取时间">
<template slot-scope="scope"> <template slot-scope="scope">
<p v-if="scope.row.giveStatus === 1" class="cell-time"> <p v-if="scope.row.giveStatus === 1 && scope.row.giveStatus === 2" class="cell-time">
{{ formatDateTimeByType(scope.row.receiveTime, 'yyyy-MM-dd-HH-mm', true).y }}<br /> {{ formatDateTimeByType(scope.row.receiveTime, 'yyyy-MM-dd-HH-mm', true).y }}<br />
<span>{{ formatDateTimeByType(scope.row.receiveTime, 'yyyy-MM-dd-HH-mm', true).h }}</span> <span>{{ formatDateTimeByType(scope.row.receiveTime, 'yyyy-MM-dd-HH-mm', true).h }}</span>
</p> </p>
...@@ -71,7 +72,7 @@ ...@@ -71,7 +72,7 @@
</el-table-column> </el-table-column>
<el-table-column :show-overflow-tooltip="true" min-width="120" align="left" prop="friendCardCode" label="受赠卡券代码"> <el-table-column :show-overflow-tooltip="true" min-width="120" align="left" prop="friendCardCode" label="受赠卡券代码">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.giveStatus === 1">{{ scope.row.friendCardCode }}</span> <span v-if="scope.row.giveStatus === 1 && scope.row.giveStatus === 2">{{ scope.row.friendCardCode }}</span>
<span v-else>--</span> <span v-else>--</span>
</template> </template>
</el-table-column> </el-table-column>
......
src/views/game/ptyx/form.vue
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<dm-upload-avatar :model.sync="form.logoImg" label="上传图片" width="80" height="80" tips="请上传高度为85px的PNG透明背景图片" :disabled="isInfo"></dm-upload-avatar> <dm-upload-avatar :model.sync="form.logoImg" label="上传图片" width="80" height="80" tips="请上传高度为85px的PNG透明背景图片" :disabled="isInfo"></dm-upload-avatar>
</el-form-item> </el-form-item>
<el-form-item label="选择拼图" prop="puzzleImg" class="width50 is-required"> <el-form-item label="选择拼图" prop="puzzleImg" class="width50 is-required">
<dm-upload-avatar width="128" height="170" :limit="{ type: true, width: 510, height: 680 }" :model.sync="form.puzzleImg" label="上传图片" tips="图片尺寸：510px*680px" :disabled="isInfo"></dm-upload-avatar> <dm-upload-avatar width="128" height="170" :limit="{ type: true, width: 510, height: 680 }" :model.sync="form.puzzleImg" label="上传图片" tips="图片尺寸：510px*680px * 请避免上传分割后出现同样图块的图片" :disabled="isInfo"></dm-upload-avatar>
</el-form-item> </el-form-item>
<el-form-item label="预设风格"> <el-form-item label="预设风格">
<el-radio-group v-model="form.skinType" @change="changeDefaultSkin"> <el-radio-group v-model="form.skinType" @change="changeDefaultSkin">
......
src/views/message/detail.vue
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<el-button icon="iconfont icon-icon_yunxiazai fz14" type="primary" class="fr" @click="exportExcel"> 下载Excel</el-button> <el-button icon="iconfont icon-icon_yunxiazai fz14" type="primary" class="fr" @click="exportExcel"> 下载Excel</el-button>
</div> </div>
<el-table tooltipEffect="light" :data="messageList" style="width: 100%" v-loading="messageLoading"> <el-table tooltipEffect="light" :data="messageList" style="width: 100%" v-loading="messageLoading">
<el-table-column min-width="150" align="left" label="会员信息"> <el-table-column :min-width="150" align="left" label="会员信息">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="sms-table_info"> <div class="sms-table_info">
<img class="table__avatar--40 vertical-middle" :src="filterAvatar(scope.row.thirdImgUrl)" alt="" srcset="" /> <img class="table__avatar--40 vertical-middle" :src="filterAvatar(scope.row.thirdImgUrl)" alt="" srcset="" />
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<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>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :min-width="100" align="left" label="上报时间" prop="backTime"> <el-table-column :min-width="120" align="left" label="上报时间" prop="backTime">
<template slot-scope="scope"> <template slot-scope="scope">
<p class="cell-time"> <p class="cell-time">
{{ formatDateTimeByType(scope.row.backTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}<br /><span>{{ formatDateTimeByType(scope.row.backTime, 'yyyy-MM-dd-HH-mm-ss', true).h }}</span> {{ formatDateTimeByType(scope.row.backTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}<br /><span>{{ formatDateTimeByType(scope.row.backTime, 'yyyy-MM-dd-HH-mm-ss', true).h }}</span>
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
</el-table-column> </el-table-column>
<el-table-column :show-overflow-tooltip="false" :min-width="150" align="left" label="短信内容" prop="remark"> <el-table-column :show-overflow-tooltip="false" :min-width="150" align="left" label="短信内容" prop="remark">
<template slot-scope="scope"> <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 :open-delay="300" class="item" trigger="hover" width="300" v-if="scope.row.remark.length > 10" :content="scope.row.remark" placement="top-start">
<span slot="reference" class="ellipsis">{{ scope.row.remark }}</span> <span slot="reference" class="ellipsis">{{ scope.row.remark }}</span>
</el-popover> </el-popover>
<span v-else>{{ scope.row.remark }}</span> <span v-else>{{ scope.row.remark }}</span>
...@@ -122,27 +122,27 @@ export default { ...@@ -122,27 +122,27 @@ export default {
messageList: [], messageList: [],
messageLoading: false, messageLoading: false,
messageHeader: [ messageHeader: [
{ label: '手机号码', prop: 'telephone', width: '120', align: 'left' }, { label: '手机号码', prop: 'telephone', minWidth: '100', align: 'left' },
{ {
label: '发送状态', label: '发送状态',
prop: 'sendStatus', prop: 'sendStatus',
width: '80', minWidth: '80',
align: 'left', align: 'left',
formatter: function(row) { formatter: function(row) {
return row.sendStatus === 0 ? '成功' : row.sendStatus === 1 ? '未发送' : '失败'; return row.sendStatus === 0 ? '成功' : row.sendStatus === 1 ? '未发送' : '失败';
} }
},
{
label: '回执状态',
prop: 'backStatus',
width: '80',
align: 'left',
formatter: function(row) {
// eslint-disable-next-line
return row.backStatus === 0 && row.backTime === null ? '--' : (row.backStatus ? '接收成功' : '接收失败')
}
} }
// { // {
// label: '回执状态',
// prop: 'backStatus',
// width: '80',
// align: 'left',
// formatter: function(row) {
// // eslint-disable-next-line
// return row.backStatus === 0 && row.backTime === null ? '--' : (row.backStatus ? '接收成功' : '接收失败')
// }
// }
// {
// label: '上报时间', // label: '上报时间',
// prop: 'backTime', // prop: 'backTime',
// minWidth: '100', // minWidth: '100',
......
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