Skip to content

M
marketing
Commit 36792122 by crushh
Options

Merge branch 'bugfix/智能营销' into feature/ai营销二期

parents 90e96178 ec7ca28b
Showing with 9 additions and 9 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></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=//at.alicdn.com/t/font_3229694_vfjtu9hqyrc.css><script src=//at.alicdn.com/t/font_3229694_vfjtu9hqyrc.js></script><link rel=stylesheet href=//at.alicdn.com/t/font_2996579_875h3lycepk.css><script src=//at.alicdn.com/t/font_2996579_875h3lycepk.js></script><link src=//at.alicdn.com/t/font_2859043_udehp133w1.css><script src=//at.alicdn.com/t/font_2859043_udehp133w1.js></script><link href=/marketing/static/css/main.f8f5ecde9b26cb7ef691374ff7cb9dcb.css rel=stylesheet></head><body><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
<!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></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=//at.alicdn.com/t/font_3229694_vfjtu9hqyrc.css><script src=//at.alicdn.com/t/font_3229694_vfjtu9hqyrc.js></script><link rel=stylesheet href=//at.alicdn.com/t/font_2996579_875h3lycepk.css><script src=//at.alicdn.com/t/font_2996579_875h3lycepk.js></script><link src=//at.alicdn.com/t/font_2859043_udehp133w1.css><script src=//at.alicdn.com/t/font_2859043_udehp133w1.js></script><link href=/marketing/static/css/main.924f23b3052e658e0fab00d09cff5a62.css rel=stylesheet></head><body><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
var src = '/component/static/import-component.js?timestrap=' + new Date().getTime();
var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
document.write('<script src="//' + host + src + '"><\/script>');
})();</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js></script><script type=text/javascript src=/marketing/static/js/manifest.53e6f71d69447f0b4bd9.js></script><script type=text/javascript src=/marketing/static/js/vendor.01ae7be260c6c1f9c444.js></script><script type=text/javascript src=/marketing/static/js/main.9acfce68c8113152ea24.js></script></body></html>
\ No newline at end of file
})();</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js></script><script type=text/javascript src=/marketing/static/js/manifest.a9be76007ffba2d1dcad.js></script><script type=text/javascript src=/marketing/static/js/vendor.01ae7be260c6c1f9c444.js></script><script type=text/javascript src=/marketing/static/js/main.9acfce68c8113152ea24.js></script></body></html>
\ No newline at end of file
dist/static/js/14.143c0be9f19ec178a447.js → dist/static/js/14.7014b11e785523a1e7b1.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.53e6f71d69447f0b4bd9.js → dist/static/js/manifest.a9be76007ffba2d1dcad.js
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,t,o){for(var f,i,d,u=0,s=[];u<c.length;u++)i=c[u],n[i]&&s.push(n[i][0]),n[i]=0;for(f in t)Object.prototype.hasOwnProperty.call(t,f)&&(e[f]=t[f]);for(a&&a(c,t,o);s.length;)s.shift()();if(o)for(u=0;u<o.length;u++)d=r(r.s=o[u]);return d};var c={},n={24:0};function r(a){if(c[a])return c[a].exports;var n=c[a]={i:a,l:!1,exports:{}};return e[a].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var a=n[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,r){a=n[e]=[c,r]});a[2]=c;var t=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,r.nc&&o.setAttribute("nonce",r.nc),o.src=r.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"ecm",4:"message",5:"ewash",6:"scan",7:"recharge",8:"activity",9:"signIn",10:"evaluation",11:"cdKey",12:"popup",13:"msg",15:"calllog"}[e]||e)+"."+{0:"b27c04f1a6fe4d0a2ca7",1:"2909f5d6a9500f300515",2:"5a7e6c9a558f266c7762",3:"9a1479b39a5f2b76eb21",4:"d72f637d24da77ed048e",5:"c4f67e1455b0cb8d5c67",6:"118cffd4fc4aec6165ca",7:"9e42d52d3a78982be900",8:"2e260bf5fbda1c669e63",9:"fe11d8b6fea8a8e19249",10:"aad29bee8fefe6738f4a",11:"15f7f07e91c2a734adea",12:"c0f00296722b2252e8de",13:"fcdcee9f6a8e702a7712",14:"143c0be9f19ec178a447",15:"1b70e4a5b86af7a9c7c2",16:"8345d5ccc013fd91f25a",17:"144808f0b695ccee7290",18:"66382e496f1b67736cea",19:"70ff0ed87fe8f7a5dccc",20:"ea12582187b9b8bce5bf",21:"aa8e6385233bc42c7712"}[e]+".js";var f=setTimeout(i,12e4);function i(){o.onerror=o.onload=null,clearTimeout(f);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return o.onerror=o.onload=i,t.appendChild(o),c},r.m=e,r.c=c,r.d=function(e,a,c){r.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},r.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(a,"a",a),a},r.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},r.p="/marketing/",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,t,o){for(var f,i,u,d=0,s=[];d<c.length;d++)i=c[d],n[i]&&s.push(n[i][0]),n[i]=0;for(f in t)Object.prototype.hasOwnProperty.call(t,f)&&(e[f]=t[f]);for(a&&a(c,t,o);s.length;)s.shift()();if(o)for(d=0;d<o.length;d++)u=r(r.s=o[d]);return u};var c={},n={24:0};function r(a){if(c[a])return c[a].exports;var n=c[a]={i:a,l:!1,exports:{}};return e[a].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var a=n[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,r){a=n[e]=[c,r]});a[2]=c;var t=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,r.nc&&o.setAttribute("nonce",r.nc),o.src=r.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"ecm",4:"message",5:"ewash",6:"scan",7:"recharge",8:"activity",9:"signIn",10:"evaluation",11:"cdKey",12:"popup",13:"msg",15:"calllog"}[e]||e)+"."+{0:"0a523fb330068f83519a",1:"2909f5d6a9500f300515",2:"5a7e6c9a558f266c7762",3:"9a1479b39a5f2b76eb21",4:"6b37c233dee7f9d4cd99",5:"c4f67e1455b0cb8d5c67",6:"118cffd4fc4aec6165ca",7:"9e42d52d3a78982be900",8:"2e260bf5fbda1c669e63",9:"fe11d8b6fea8a8e19249",10:"aad29bee8fefe6738f4a",11:"15f7f07e91c2a734adea",12:"c0f00296722b2252e8de",13:"fcdcee9f6a8e702a7712",14:"7014b11e785523a1e7b1",15:"1b70e4a5b86af7a9c7c2",16:"8345d5ccc013fd91f25a",17:"144808f0b695ccee7290",18:"66382e496f1b67736cea",19:"70ff0ed87fe8f7a5dccc",20:"ea12582187b9b8bce5bf",21:"aa8e6385233bc42c7712"}[e]+".js";var f=setTimeout(i,12e4);function i(){o.onerror=o.onload=null,clearTimeout(f);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return o.onerror=o.onload=i,t.appendChild(o),c},r.m=e,r.c=c,r.d=function(e,a,c){r.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},r.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(a,"a",a),a},r.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},r.p="/marketing/",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/views/card/record-get.vue
......@@ -41,13 +41,13 @@
</el-table-column>
<el-table-column :show-overflow-tooltip="true" min-width="140" header-align="left" align="left" prop="clerkId" label="会员信息">
<template slot-scope="scope">
<div class="member-block" @click="toPage('/customerDetail?memberId=' + scope.row.memberId, 'member')">
<a class="member-block" :href="'/member/#/wechatmemberDetail?memberId=' + scope.row.memberId" target="_blank">
<img class="vertical-middle table__avatar--40" :src="scope.row.thirdimgurl || defaultAvatar" width="60" height="60" />
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{ scope.row.thirdName || scope.row.memberName || '--' }}</p>
<p class="gray">{{ scope.row.phoneNum || '--' }}</p>
</div>
</div>
</a>
</template>
</el-table-column>
<el-table-column width="120" align="left" prop="receiveTime" label="卡券类型">
......@@ -132,7 +132,6 @@ import filterAvater from '@/mixins/filterAvater.js';
export default {
name: 'record-get',
mixins: [tableMethods, filterAvater],
inject: ['toPage'],
components: {
cardOrder,
cardSelectFilter
......
src/views/ecm/form.js
......@@ -207,6 +207,7 @@ export default {
case 'brithday_day':
if (!this.form.brithday_day) {
this.form.brithday_type = 1;
this.form.brithday_day = 1;
}
this.form.attention_day = 0;
this.form.lastCost_day = 0;
......
src/views/ecm/form.vue
......@@ -351,7 +351,7 @@
<dm-sub-title type="line" v-else>
有效时间
</dm-sub-title>
<el-form-item label="有效时间" prop="endDate" :show-message="showMessage" v-if="form.consum_type == 1">
<el-form-item label="有效时间" prop="endDate" :show-message="showMessage" v-if="form.consum_type == 1" class="mt20">
<el-radio :disabled="isEdit && onlineStatus != 0 && form.expireType == 1" v-model="form.expireType" :label="0">长期有效</el-radio>
<el-radio :disabled="isEdit && onlineStatus != 0 && form.expireType == 0" v-model="form.expireType" :label="1">固定期限</el-radio>
<template v-if="form.effectType == 1">
......
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