Skip to content

M
memberTag-web
Commit 279aaca9 by chenxin
Options

Merge branch 'feature/卡券选择器' into 'master' 

Feature/卡券选择器

See merge request !16
parents cdc0275e 868900ff
Showing with 28 additions and 15 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-会员标签</title><link href=./static/css/app.0ed14b61a9887000dc74d8f299473472.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/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/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.40.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.64.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.2.13.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/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.187f58381265810a8e87.js></script><script type=text/javascript src=./static/js/vendor.ef3a75f3bbf430dacbb6.js></script><script type=text/javascript src=./static/js/app.75184f1dbb4afaf5e201.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-会员标签</title><link href=./static/css/app.23051ce086c6cca422888f666d646b0e.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/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/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.40.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.65.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.2.20.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/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.dafa28f82cb05dbbfd20.js></script><script type=text/javascript src=./static/js/vendor.ef3a75f3bbf430dacbb6.js></script><script type=text/javascript src=./static/js/app.75184f1dbb4afaf5e201.js></script></body></html>
\ No newline at end of file
dist/static/js/0.99dc517641ea57a78cdd.js → dist/static/js/0.02f99d3a0bc784295d24.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.187f58381265810a8e87.js → dist/static/js/manifest.dafa28f82cb05dbbfd20.js
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var o,d,b,i=0,u=[];i<a.length;i++)d=a[i],f[d]&&u.push(f[d][0]),f[d]=0;for(o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(c&&c(a,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var a={},f={35:0};function n(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,n){c=f[e]=[a,n]});c[2]=a;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"99dc517641ea57a78cdd",1:"8c70f0cb13618f18a13c",2:"8e54e863fa59b8a90b83",3:"4931078e8dee7ab3e4fe",4:"ecd6205873166f1df1af",5:"3d976675aae325af5173",6:"c562bf872d39a4dcc4c7",7:"b2dc0cfbf5e2155d58fd",8:"cc3d308cb216a2cc8825",9:"e611ead9d5f383177972",10:"4d21b3886413df436f13",11:"1f03e3ab23d0dc69df7a",12:"2c8b2a5bf5a744e3db15",13:"cf60e659a31b615c5ce4",14:"e1a80e4a4532c4e8be53",15:"dfc5a96030093c1ed00b",16:"0d04608b2f40775007aa",17:"793285aebe33c6cfc9d0",18:"b56c9a4ae3fb5c2ff116",19:"4ed3c0524c55a7705ec5",20:"ff4bd7e2a636521cba02",21:"28e4332ef636a22426ab",22:"a30b9dbfe469da4a5830",23:"cc37b778686574aec82d",24:"996db5330fea43229fdf",25:"30f87ad2f1079650b1bc",26:"a2c10f5bafd0a7aeddd8",27:"c12eb8f712389d519826",28:"902a4f428b0383037593",29:"82810bb45021ba93543e",30:"a24f03c1e1e1adb42779",31:"4368b6f52dbc4175ffdc",32:"4810ffec77506f40440c"}[e]+".js";var o=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(o);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var o,d,b,i=0,u=[];i<a.length;i++)d=a[i],f[d]&&u.push(f[d][0]),f[d]=0;for(o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(c&&c(a,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var a={},f={35:0};function n(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,n){c=f[e]=[a,n]});c[2]=a;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"02f99d3a0bc784295d24",1:"8c70f0cb13618f18a13c",2:"8e54e863fa59b8a90b83",3:"4931078e8dee7ab3e4fe",4:"ecd6205873166f1df1af",5:"3d976675aae325af5173",6:"c562bf872d39a4dcc4c7",7:"b2dc0cfbf5e2155d58fd",8:"cc3d308cb216a2cc8825",9:"e611ead9d5f383177972",10:"4d21b3886413df436f13",11:"1f03e3ab23d0dc69df7a",12:"2c8b2a5bf5a744e3db15",13:"cf60e659a31b615c5ce4",14:"e1a80e4a4532c4e8be53",15:"dfc5a96030093c1ed00b",16:"0d04608b2f40775007aa",17:"793285aebe33c6cfc9d0",18:"b56c9a4ae3fb5c2ff116",19:"4ed3c0524c55a7705ec5",20:"ff4bd7e2a636521cba02",21:"28e4332ef636a22426ab",22:"a30b9dbfe469da4a5830",23:"cc37b778686574aec82d",24:"996db5330fea43229fdf",25:"30f87ad2f1079650b1bc",26:"a2c10f5bafd0a7aeddd8",27:"c12eb8f712389d519826",28:"902a4f428b0383037593",29:"82810bb45021ba93543e",30:"a24f03c1e1e1adb42779",31:"4368b6f52dbc4175ffdc",32:"4810ffec77506f40440c"}[e]+".js";var o=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(o);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
index.html
......@@ -23,12 +23,12 @@
<script src="//web-1251519181.file.myqcloud.com/components/track.1.0.4.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/header.2.0.40.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/store-new.2.0.64.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/store-new.2.0.65.js"></script>
<!-- <script src="//web-1251519181.file.myqcloud.com/components/datepicker.2.0.00.js"></script> -->
<script src="//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/card.2.0.11.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/selector.1.2.13.js"></script>
<!-- <script src="//web-1251519181.file.myqcloud.com/components/card.2.0.18.js"></script> --><!-- 卡券选择器其实并没有用到 -->
<script src="//web-1251519181.file.myqcloud.com/components/selector.1.2.20.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/pagination.1.0.8.js"></script>
</body>
......
src/components/card/card.vue
......@@ -46,6 +46,7 @@
<!-- <el-button @click="refresh">刷新列表</el-button> -->
</div>
</div>
<div style="font-size:12px;color:#909399;line-height:30px;">* 仅能选择卡券模板投放期限有效的卡券</div>
<div class="pic-list-box">
<!-- @selection-change="handleSelectionChange" -->
<el-table
......@@ -65,14 +66,26 @@
<!-- <template slot-scope="scope"> -->
<!-- <el-radio class="radio-style" :label="scope.row.coupCardId" v-model="radio" :disabled="scope.row.disabled"></el-radio> -->
<!-- </template> -->
<el-table-column :show-overflow-tooltip="true" min-width="100" align="left" prop="cardName" label="卡券名称"></el-table-column>
<el-table-column :show-overflow-tooltip="true" min-width="100" align="left" prop="subName" label="备注名"></el-table-column>
<el-table-column prop="" label="有效期" min-width="130" :show-overflow-tooltip="false">
<template slot-scope="scope">
<div v-if="scope.row.cardEffectiveMode == 0">固定日期：<br>{{ formateDateTimeByType(scope.row.beginDate, 'yyyy-MM-dd') + '至' + formateDateTimeByType(scope.row.endDate, 'yyyy-MM-dd') }}</div>
<div v-if="scope.row.cardEffectiveMode == 1">领取后{{ (scope.row.startDay === 0 ? '当' : scope.row.startDay) + '天，有效天数' + scope.row.limitDay }}天</div>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" width="140" align="left" prop="cardName" label="卡券名称">
<template slot-scope="scope">
<p style="line-height:22px;">{{ scope.row.cardName }}</p>
<p style="line-height:20px;color:#909399;font-size:13px;">{{ scope.row.subName }}</p>
</template>
</el-table-column>
<el-table-column min-width="120" align="left" prop="createTime" label="卡券模板投放期限">
<template slot-scope="scope">
<span v-if="scope.row.putEffectiveMode == 0">
固定日期：{{ formateDateTimeByType(scope.row.putBeginDate, 'yyyy-MM-dd') }} 至 {{ formateDateTimeByType(scope.row.putEndDate, 'yyyy-MM-dd') }}
</span>
<span v-else>长期有效</span>
</template>
</el-table-column>
<el-table-column prop="" label="用户使用有效期" :min-width="120">
<template slot-scope="scope">
<div v-if="scope.row.cardEffectiveMode == 0">固定日期：{{ formateDateTimeByType(scope.row.beginDate, 'yyyy-MM-dd') + '至' + formateDateTimeByType(scope.row.endDate, 'yyyy-MM-dd') }}</div>
<div v-if="scope.row.cardEffectiveMode == 1">领取后第{{ (scope.row.startDay === 0 ? '当' : scope.row.startDay) }}天生效，有效期{{ scope.row.limitDay }}天</div>
</template>
</el-table-column>
<el-table-column prop="cardLimit" :show-overflow-tooltip="false" label="领取限制" min-width="100">
<template slot-scope="scope">
{{ scope.row.cardLimit }}张/人
......
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