Skip to content

M
marketing
Commit 6c2f929d by chenxin
Options

fix： 游戏导出50w条；暂时隐藏card和ecm的商品折扣

parent 4403df94
Showing with 31 additions and 18 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.b136f0b95d3bf547c4bf4db009f7f75b.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.12.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.22.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.20.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.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=/marketing/static/js/manifest.00175e428b0a0d426fad.js></script><script type=text/javascript src=/marketing/static/js/vendor.b30a466c3b2d11195801.js></script><script type=text/javascript src=/marketing/static/js/main.70cfcf22394282434e0e.js></script></body></html>
\ No newline at end of file
<!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.5ed283bf21f824d7cdfd3b36586748c7.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.12.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.22.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.20.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.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=/marketing/static/js/manifest.240fc73015d616143c65.js></script><script type=text/javascript src=/marketing/static/js/vendor.b30a466c3b2d11195801.js></script><script type=text/javascript src=/marketing/static/js/main.133e2e74fb81d7e42873.js></script></body></html>
\ No newline at end of file
dist/static/js/ecm.491243074338b011232f.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.c3eb19008beaa594558f.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.00175e428b0a0d426fad.js → dist/static/js/manifest.240fc73015d616143c65.js
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(t,o,c){for(var f,i,u,d=0,s=[];d<t.length;d++)i=t[d],n[i]&&s.push(n[i][0]),n[i]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(r&&r(t,o,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=a(a.s=c[d]);return u};var t={},n={14:0};function a(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,a),n.l=!0,n.exports}a.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,a){r=n[e]=[t,a]});r[2]=t;var o=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,a.nc&&c.setAttribute("nonce",a.nc),c.src=a.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"message",4:"ewash",5:"ecm",6:"evaluation",7:"activity",8:"cdKey",9:"recharge",10:"msg",11:"calllog"}[e]||e)+"."+{0:"372e2a3b419dff342412",1:"41debb1302c4780af777",2:"2d264b414d0a06c05e42",3:"09ad5a1095e8730e681b",4:"391130c8f773cb8775d6",5:"c3eb19008beaa594558f",6:"6178547f1a240cc6cd6a",7:"30064054278e2973a877",8:"7486f6b5d8e5355dc39d",9:"d0c7fdeaae259a8befad",10:"98da8a6dab5340ff1ff4",11:"07f9326e2a68fd201646"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var r=n[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return c.onerror=c.onload=i,o.appendChild(c),t},a.m=e,a.c=t,a.d=function(e,r,t){a.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},a.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(r,"a",r),r},a.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},a.p="/marketing/",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(t,o,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 o)Object.prototype.hasOwnProperty.call(o,i)&&(e[i]=o[i]);for(r&&r(t,o,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=a(a.s=c[d]);return u};var t={},n={14:0};function a(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,a),n.l=!0,n.exports}a.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,a){r=n[e]=[t,a]});r[2]=t;var o=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,a.nc&&c.setAttribute("nonce",a.nc),c.src=a.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"message",4:"ewash",5:"ecm",6:"evaluation",7:"activity",8:"cdKey",9:"recharge",10:"msg",11:"calllog"}[e]||e)+"."+{0:"dd3ac859900ae743db61",1:"41debb1302c4780af777",2:"2d264b414d0a06c05e42",3:"09ad5a1095e8730e681b",4:"391130c8f773cb8775d6",5:"491243074338b011232f",6:"6178547f1a240cc6cd6a",7:"30064054278e2973a877",8:"b887a9e6b988aa2fd816",9:"d0c7fdeaae259a8befad",10:"98da8a6dab5340ff1ff4",11:"07f9326e2a68fd201646"}[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,o.appendChild(c),t},a.m=e,a.c=t,a.d=function(e,r,t){a.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},a.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(r,"a",r),r},a.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},a.p="/marketing/",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/config/index.js
......@@ -6,4 +6,4 @@ export default {
// http://192.168.1.154:86/
};
export const maxCanExportcount = 1000000; // 可导出数据数据最大total值
export const maxCanExportcount = 500000; // 可导出数据数据最大total值
src/views/card/form.vue
......@@ -165,9 +165,9 @@
</el-radio>
</div>
<!-- 只有线下门店展示适用商品折扣 -->
<div v-if="form.cardApplyChannel.indexOf('offlineStore') !== -1">
<!-- 1: 大于等于 2:大于 3: 等于 4: 小于 5: 小于等于 -->
<!-- <div v-if="form.cardApplyChannel.indexOf('offlineStore') !== -1">
<el-checkbox v-model="discount_limit.flag" :disabled="isEdit || isInfo">适用商品折扣</el-checkbox>
<!-- 1: 大于等于 2:大于 3: 等于 4: 小于 5: 小于等于 -->
<div v-if="discount_limit.flag" class="inline-block">
<el-select :disabled="isEdit || isInfo" v-model="discount_limit.type" class="w100 ml10">
<el-option label="大于等于" :value="1"></el-option>
......@@ -179,7 +179,7 @@
<el-input-number controls-position="right" :disabled="isEdit || isInfo" v-model="discount_limit.count" :precision="2" :min="0" :max="10" class="w150"></el-input-number>&nbsp;&nbsp;折
</div>
<span class="fz12 gray ml5">* 仅支持第三方api接口核销卡券时使用</span>
</div>
</div> -->
<div>
<el-checkbox v-model="only" :disabled="isEdit || isInfo">不与其它优惠共享</el-checkbox>
<span class="fz12 gray ml5">* 仅用于微信原生卡券详情展示，无实际业务逻辑</span>
......
src/views/cdkey/list.vue
......@@ -60,11 +60,24 @@
</el-table-column>
</el-table>
<dm-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"></dm-pagination>
<el-dialog title="生成链接" :visible.sync="codeVisible" width="500px">
<div class="text-center pt20">
<img :src="qrUrl" width="192" height="192" />
<div style="margin-top:11px;color:#606266;padding-bottom:50px;">- 兑换码链接二维码 -</div>
</div>
<el-dialog title="页面链接" :visible.sync="codeVisible" width="500px">
<el-tabs v-model="activeName">
<el-tab-pane label="页面链接" name="url">
<div style="padding: 30px 0;">
<el-input :value="qr.linkUrl" disabled style="display:inline-block;width:400px;" />
<el-button v-clipboard:text="qr.linkUrl" type="text">复制</el-button>
</div>
</el-tab-pane>
<el-tab-pane label="小程序二维码" name="qrUrl">
<div class="text-center pt20">
<img :src="qr.imgUrl" class="pt10" width="192" height="192" />
<div style="margin-top:11px;color:#606266;padding-bottom:30px;">- 兑换码链接二维码 -</div>
</div>
</el-tab-pane>
</el-tabs>
<span slot="footer" class="dialog-footer">
<el-button @click="codeVisible = false">关闭 </el-button>
</span>
</el-dialog>
<vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="tableList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
</section>
......@@ -98,7 +111,8 @@ export default {
},
dateTime: ['', ''],
total: 0,
qrUrl: '',
qr: {}, // 兑换链接弹出内容
activeName: 'url',
codeVisible: false,
// 导出
projectName: 'marketing', // 当前项目名
......@@ -116,7 +130,7 @@ export default {
formatDateTimeByType,
getCdkeyWxaQrCodeImage() {
getCdkeyWxaQrCodeImage().then(res => {
this.qrUrl = res.result;
this.qr = res.result || {};
});
},
async getTableList() {
......
src/views/ecm/form.vue
......@@ -92,10 +92,9 @@
</div>
</div>
</el-form-item>
<el-form-item>
<!-- <el-form-item>
<div class="no_label_form_label">
<el-checkbox class="el-form-item__label align-left" v-model="discount_limit.flag" :disabled="!isAdd">适用商品折扣</el-checkbox>
<!-- 1: 大于等于 2:大于 3: 等于 4: 小于 5: 小于等于 -->
<div>
<div v-if="discount_limit.flag" class="inline-block">
<el-select :disabled="!isAdd" v-model="discount_limit.type" class="w150">
......@@ -111,7 +110,7 @@
<div v-if="discount_limit.flag" class="fz12 gray">* 商品折扣=订单实付/订单总金额</div>
</div>
</div>
</el-form-item>
</el-form-item> -->
<el-form-item>
<div class="no_label_form_label">
<el-checkbox class="el-form-item__label align-left" :disabled="!isAdd" v-model="consumeChecked.cost">消费金额</el-checkbox>
......
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