Skip to content

M
marketing
Commit 84e72b88 by caoyanzhi
Options

Merge branch 'master' into feature/3月迭代-菜单 

# Conflicts:
#	src/views/ecm/form.vue
parents 5cc46ea8 e0b9edf9
Showing with 13 additions and 10 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=//at.alicdn.com/t/font_2996579_93aeeozj35q.css><link href=/marketing/static/css/main.0a6bb9ff06da93a32b6a9cfdfdf7bb07.css rel=stylesheet></head><body><div id=app></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>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=//at.alicdn.com/t/font_2996579_93aeeozj35q.css><link href=/marketing/static/css/main.42ee5e731a075e86b033aebb25cdd13c.css rel=stylesheet></head><body><div id=app></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.6.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.d1d30d5342864900c8f1.js></script><script type=text/javascript src=/marketing/static/js/vendor.1c03aae9e4acbbf086ce.js></script><script type=text/javascript src=/marketing/static/js/main.0db1b12c591db0caa4cc.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.6.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.2819f29c54a853a688ed.js></script><script type=text/javascript src=/marketing/static/js/vendor.1c03aae9e4acbbf086ce.js></script><script type=text/javascript src=/marketing/static/js/main.0db1b12c591db0caa4cc.js></script></body></html>
\ No newline at end of file
dist/static/js/manifest.d1d30d5342864900c8f1.js → dist/static/js/manifest.2819f29c54a853a688ed.js
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,o){for(var f,i,u,s=0,d=[];s<r.length;s++)i=r[s],t[i]&&d.push(t[i][0]),t[i]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,o);d.length;)d.shift()();if(o)for(s=0;s<o.length;s++)u=a(a.s=o[s]);return u};var r={},t={17:0};function a(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,a){n=t[e]=[r,a]});n[2]=r;var c=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,a.nc&&o.setAttribute("nonce",a.nc),o.src=a.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"ecm",4:"message",5:"ewash",6:"scan",7:"evaluation",8:"recharge",9:"activity",10:"signIn",11:"cdKey",12:"popup",13:"msg",14:"calllog"}[e]||e)+"."+{0:"f37316b56c14667202b3",1:"ef36ec426b8cc94f118a",2:"9cf200a6d8fb373f4c1d",3:"1a68ef3d62e9a09c7282",4:"e9b4bbfeea4a3ccd76e0",5:"2c2121ada4f3863521e4",6:"5e57fe1beb143ec5df5f",7:"7f6636ae60d3eda39960",8:"13fde4a11cf179885420",9:"7df670599b2f4e2eb861",10:"abe49fffc2f372f23708",11:"5a996f4f6d9fab0ca84c",12:"904b5a302f41c02f8b89",13:"5fced6e9caaad4365e60",14:"2c3686115829ba023ea1"}[e]+".js";var f=setTimeout(i,12e4);function i(){o.onerror=o.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=i,c.appendChild(o),r},a.m=e,a.c=r,a.d=function(e,n,r){a.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},a.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(n,"a",n),n},a.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},a.p="/marketing/",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,c){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(n&&n(r,o,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=a(a.s=c[d]);return u};var r={},t={17:0};function a(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,a){n=t[e]=[r,a]});n[2]=r;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:"ecm",4:"message",5:"ewash",6:"scan",7:"evaluation",8:"recharge",9:"activity",10:"signIn",11:"cdKey",12:"popup",13:"msg",14:"calllog"}[e]||e)+"."+{0:"1971ddfa9b81a96d23e4",1:"ef36ec426b8cc94f118a",2:"9cf200a6d8fb373f4c1d",3:"ba63bb58d51729e84928",4:"e9b4bbfeea4a3ccd76e0",5:"2c2121ada4f3863521e4",6:"5e57fe1beb143ec5df5f",7:"7f6636ae60d3eda39960",8:"13fde4a11cf179885420",9:"7df670599b2f4e2eb861",10:"abe49fffc2f372f23708",11:"5a996f4f6d9fab0ca84c",12:"904b5a302f41c02f8b89",13:"5fced6e9caaad4365e60",14:"2c3686115829ba023ea1"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,o.appendChild(c),r},a.m=e,a.c=r,a.d=function(e,n,r){a.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},a.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(n,"a",n),n},a.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},a.p="/marketing/",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/views/card/form.vue
......@@ -14,22 +14,22 @@
</el-select>
</el-form-item>
<el-form-item label="展示适用渠道文案" prop="channelTip">
<dm-input v-model="form.channelTip" class="w400" placeholder="请输入小程序端展示的适用渠道文案" :byteType="1" :maxlength="18"></dm-input>
<dm-input v-model="form.channelTip" class="w400" placeholder="请输入小程序端展示的适用渠道文案" :byteType="0" :maxlength="18"></dm-input>
<el-popover placement="right" width="360" trigger="hover">
<img :src="require('@/assets/img/coupon-preview.png')" alt="" style="display:block" />
<el-button slot="reference" type="text" class="ml10">查看示例</el-button>
</el-popover>
</el-form-item>
<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="0" :maxlength="30"></dm-input>
</el-form-item>
<el-form-item prop="subName" label="备注名">
<dm-input v-model="form.subName" class="w400" placeholder="请输入备注名称" :disabled="isEdit || isInfo" :byteType="1" :maxlength="15"></dm-input>
<dm-input v-model="form.subName" class="w400" placeholder="请输入备注名称" :disabled="isEdit || isInfo" :byteType="0" :maxlength="15"></dm-input>
</el-form-item>
<el-form-item prop="subTitle" label="卡券副标题">
<dm-input v-model="form.subTitle" class="w400" placeholder="请输入卡券副标题" :disabled="isEdit || isInfo" :byteType="1" :maxlength="18"></dm-input>
<dm-input v-model="form.subTitle" class="w400" placeholder="请输入卡券副标题" :disabled="isEdit || isInfo" :byteType="0" :maxlength="18"></dm-input>
</el-form-item>
<el-form-item prop="erpDemoCode" label="demo券号">
......
src/views/ecm/form.vue
......@@ -343,11 +343,14 @@
<!-- 有效时间 -->
<section class="dm-form__wrap" v-if="form.effectType == 0 || form.effectType == 1">
<h3 class="dm-title__label border-bottom">
<h3 class="dm-title__label border-bottom" v-if="form.consum_type == 2">
有效时间
<i class="dm-title__label--icon iconfont icon-xinxixianshi"></i>
<span class="gray fz13">活动持续时间最长为31天</span>
</h3>
<h3 class="dm-title__label border-bottom" v-else>
有效时间
</h3>
<el-form-item label="有效时间" prop="endDate" :show-message="showMessage" v-if="form.consum_type == 1">
<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>
......
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