Skip to content

M
memberTag-web
Commit 1c8c33fc by caoyanzhi
Options

Merge branch 'master' into dev-dingdang 

# Conflicts:
#	dist/index.html
#	dist/static/js/0.3bfb39565f2fd8de6bab.js
parents 436312c2 09ef7931
Showing with 28 additions and 10 deletions
dist/index.html 0 → 100644
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-会员标签</title><link href=./static/css/app.bd110fa11982e0fd2c0517fc5091a0f9.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/header.2.0.20.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.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.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.02.js></script><script type=text/javascript src=./static/js/manifest.9d8a81bcdfdd50c3bfe5.js></script><script type=text/javascript src=./static/js/vendor.eb4fd5c01c3b98d7fcea.js></script><script type=text/javascript src=./static/js/app.ac38989781d0bf4dd709.js></script></body></html>
\ No newline at end of file
dist/static/css/app.bd110fa11982e0fd2c0517fc5091a0f9.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.3bfb39565f2fd8de6bab.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.ac38989781d0bf4dd709.js 0 → 100644
webpackJsonp([31],{0:function(e,t,a){a("j1ja"),e.exports=a("NHnr")},"4qCZ":function(e,t){},"5reh":function(e,t,a){"use strict";a.d(t,"a",function(){return n}),a.d(t,"b",function(){return o}),a.d(t,"d",function(){return r}),a.d(t,"c",function(){return m});var n="login",o="logout",r="title",m="show"},"5tgt":function(e,t,a){e.exports=function(e,t){return function(n){a("Vna/")("./"+e+"/"+t+".vue").then(function(e){n(e)})}}},NHnr:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=a("//Fk"),o=a.n(n),r=a("hKoQ"),m=a.n(r),u={render:function(){var e=this.$createElement,t=this._self._c||e;return t("div",{attrs:{id:"app"}},[t("transition",{attrs:{name:"fade",mode:"out-in"}},[t("router-view")],1)],1)},staticRenderFns:[]};var i,l=a("VU/8")({name:"App",data:function(){return{}}},u,!1,function(e){a("zjHD")},null,null).exports,p=a("pRNm"),s=a.n(p),c=a("5tgt"),g=a.n(c),f=function(e){a.e(1).then(a.bind(null,"EE2z")).then(function(t){e(t)})},T=[{path:"/",name:"index",redirect:"member-tag",component:g()("index","index"),children:[{path:"/member-tag",name:"会员标签",component:g()("platformTag","member-tag"),meta:{title:"会员标签"}},{path:"/platformTagList",component:g()("platformTag","platformTagList"),name:"平台标签列表",meta:{title:"会员标签-平台标签列表"}},{path:"/platformTagDetail",component:g()("platformTag","platformTagDetail"),name:"平台标签详情",meta:{title:"会员标签-平台标签详情"}},{path:"/manualTagLib",component:g()("manualTag","manualTagLib"),name:"手工标签库",meta:{title:"会员标签-手工标签库"}},{path:"/manualTagList",component:g()("manualTag","manualTagList"),name:"手工标签列表",meta:{title:"会员标签-手工标签列表"}},{path:"/manualTagEdit",component:g()("manualTag","manualTagEdit"),name:"编辑手工标签",meta:{title:"会员标签-编辑手工标签"}},{path:"/manualTagDetail",component:g()("manualTag","manualTagDetail"),name:"手工标签详情",meta:{title:"会员标签-手工标签详情"}},{path:"/myTagLib",component:g()("myTag","myTagLib"),name:"会员标签",meta:{title:"会员标签"}},{path:"/myTagList",component:g()("myTag","myTagList"),name:"我的标签库列表",meta:{title:"会员标签-我的标签库列表"}},{path:"/myTagDetail",component:g()("myTag","myTagDetail"),name:"标签详情",meta:{title:"会员标签-标签详情"}}]},{path:"/memberGroupList",name:"memberGroupListIndex",redirect:"memberGroupList",component:g()("memberGroup","index"),children:[{path:"/memberGroupList",component:g()("memberGroup","memberGroupList"),name:"会员分组",meta:{title:"会员标签-会员分组"}},{path:"/memberGroupDetail",component:g()("memberGroup","memberGroupDetail"),name:"分组详情",meta:{title:"会员标签-分组详情"}},{path:"/memberGroupEdit",component:g()("memberGroup","memberGroupEdit"),name:"编辑分组",meta:{title:"会员标签-编辑分组"}}]},{path:"/403",name:"无权访问",component:f},{path:"/404",name:"error404",component:f},{path:"/500",name:"error500",component:f},{path:"*",redirect:"/404",hidden:!0}],d=new s.a({routes:T,scrollBehavior:function(){return{y:0}}}),v=a("zL8q"),b=a("Rf8U"),h=a.n(b),G=a("mtWM"),L=a.n(G),y=a("bOdI"),x=a.n(y),w=a("SJI6"),k=a.n(w),V=a("lRwf"),D=a.n(V),j=a("5reh");D.a.use(k.a);var P=new k.a.Store({state:{user:{},token:null,title:"",show:!1,tagRealName:""},mutations:(i={},x()(i,j.a,function(e,t){sessionStorage.token=t,e.token=t}),x()(i,j.b,function(e){sessionStorage.removeItem("token"),e.token=null}),x()(i,j.d,function(e,t){e.title=t}),x()(i,j.c,function(e,t){e.show=t}),x()(i,"modiftTagName",function(e,t){e.tagRealName=t}),i)}),E=(a("Xcu2"),a("4qCZ"),a("uKUT"),a("GqmT")),N=a.n(E);m.a.polyfill(),Vue.use(N.a),Vue.config.devtools=!0,Vue.use(h.a,L.a),Vue.axios.defaults.withCredentials=!0,Vue.axios.interceptors.request.use(function(e){return e},function(e){return o.a.reject(e)}),Vue.axios.interceptors.response.use(function(e){return 200==e.status&&e.data.errorCode,e},function(e){if(e.response)switch(e.response.status){case 401:window.location.href=window.location.origin+"/gic-web/#/";case 500:v.Message.error("服务器500")}return o.a.reject(e.response.data)}),new Vue({el:"#app",router:d,store:P,components:{App:l},template:"<App/>"}),console.log(Vue.config)},SJI6:function(e,t){e.exports=Vuex},"Vna/":function(e,t,a){var n={"./errorPage/401.vue":["4KSJ",9],"./errorPage/403.vue":["aM+6",6],"./errorPage/404.vue":["PRsh",7],"./errorPage/500.vue":["/HCr",8],"./errorPage/index.vue":["EE2z",1],"./index/index.vue":["YPWR",12],"./linktools/linktools.vue":["Lc2x",0,22],"./linktools/linktoolsold.vue":["/8lq",0,13],"./linktools/linktoolspage.vue":["HLON",0,17],"./login/login.vue":["6Qob",0,24],"./manualTag/manualTagDetail.vue":["Tl/4",0,15],"./manualTag/manualTagEdit.vue":["308P",0,2],"./manualTag/manualTagLib.vue":["q490",0,25],"./manualTag/manualTagList.vue":["f0o3",0,20],"./memberGroup/edit-tag.vue":["jkVl",0],"./memberGroup/group-list.vue":["SJ7l",0,19],"./memberGroup/index.vue":["Gy5W",18],"./memberGroup/memberGroupDetail.vue":["+/ey",0,4],"./memberGroup/memberGroupEdit.vue":["q0vu",0,11],"./memberGroup/memberGroupList.vue":["oVck",0,3],"./memberGroup/recommend-table.vue":["9ZvA",29],"./memberGroup/tags-group-list.vue":["vcge",0],"./memberGroup/tags-group.vue":["wx1P",0],"./myTag/myTagDetail.vue":["ijla",0,14],"./myTag/myTagLib.vue":["twLH",0,26],"./myTag/myTagList.vue":["NJTp",0,21],"./platformTag/add-tag.vue":["tKpj",28],"./platformTag/member-tag.vue":["bytj",0,5],"./platformTag/platformTagDetail.vue":["KN59",0,10],"./platformTag/platformTagLib.vue":["puJc",0,27],"./platformTag/platformTagList.vue":["G/on",0,16],"./platformTag/second-tag.vue":["CUHN",0],"./platformTag/tag-container.vue":["Gndl",0],"./platformTag/tag-type.vue":["iHP3",0,23]};function o(e){var t=n[e];return t?Promise.all(t.slice(1).map(a.e)).then(function(){return a(t[0])}):Promise.reject(new Error("Cannot find module '"+e+"'."))}o.keys=function(){return Object.keys(n)},o.id="Vna/",e.exports=o},Xcu2:function(e,t){},lRwf:function(e,t){e.exports=Vue},pRNm:function(e,t){e.exports=VueRouter},uKUT:function(e,t){},zjHD:function(e,t){}},[0]);
\ No newline at end of file
dist/static/js/manifest.9d8a81bcdfdd50c3bfe5.js 0 → 100644
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(n,t,a){for(var o,b,d,i=0,u=[];i<n.length;i++)b=n[i],r[b]&&u.push(r[b][0]),r[b]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(c&&c(n,t,a);u.length;)u.shift()();if(a)for(i=0;i<a.length;i++)d=f(f.s=a[i]);return d};var n={},r={33:0};function f(c){if(n[c])return n[c].exports;var r=n[c]={i:c,l:!1,exports:{}};return e[c].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.e=function(e){var c=r[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var n=new Promise(function(n,f){c=r[e]=[n,f]});c[2]=n;var t=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,f.nc&&a.setAttribute("nonce",f.nc),a.src=f.p+"static/js/"+e+"."+{0:"3bfb39565f2fd8de6bab",1:"1a66f3452cb905b67755",2:"01784f338bb843f827f5",3:"a1d23b8276ed0dc5689a",4:"0ff99a178c326145ff97",5:"5a523b4d63b337052d7b",6:"31eb51419dea97959645",7:"f169140cbd6ad9f5611c",8:"fe61efcd1ccfc3412252",9:"ea583eedf0e8e01807bd",10:"49dc4ce10dca172e66e9",11:"089121d042e2ea4d5934",12:"ff49b3face62ef7aef5f",13:"5ff52df0201b9234fa89",14:"698cfa21b2f783438c71",15:"d92460353eb3e0bb9bf6",16:"77043b18784ab0e7f74a",17:"b43a253e53779917cbec",18:"9022ea0326694df97cda",19:"b15734a344b3a216e067",20:"0fef167461d750bfe493",21:"9552d108595ed6cf8df5",22:"61bb63c1296b6c9972a5",23:"c24a9f56d0040598512c",24:"590887b93345814f00ef",25:"fbc9d87dd52c837c39be",26:"c5f9e5a4bc2c63938b70",27:"2c48b10d124016d57c0b",28:"3493abb67f82d7dbc1cb",29:"a847856eb9171d0ce268",32:"a9aaa6e5d01423c1a780"}[e]+".js";var o=setTimeout(b,12e4);function b(){a.onerror=a.onload=null,clearTimeout(o);var c=r[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return a.onerror=a.onload=b,t.appendChild(a),n},f.m=e,f.c=n,f.d=function(e,c,n){f.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:n})},f.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(c,"a",c),c},f.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},f.p="./",f.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/selected-tags-list.vue
......@@ -3,11 +3,10 @@
<div v-for="(tags, index) in tagsListFilter" :key="tags" :style="`width: ${100 / tagsList.length}%`" class="tag-group">
<ul class="tag-list">
<li class="tag-item" v-for="tag in tags" :key="tag.tagId">
<span>{{ tag.tagName }}</span>
<el-tooltip>
<span class="tags-item__name">【选择:{{ getTagVal(tag) }}】</span>
<div slot="content" style="max-width: 350px; font-size: 14px;">
<span>【选择:{{ getTagVal(tag) }}】</span>
<span class="tags-item__name">{{ tag.tagName }}【选择:{{ getTagVal(tag) }}】</span>
<div slot="content" style="max-width: 400px; font-size: 14px;">
{{ tag.tagName }}【选择:{{ getTagVal(tag) }}】
</div>
</el-tooltip>
</li>
......@@ -67,23 +66,20 @@ export default {
min-height: 120px;
.tag-item {
padding: 5px 10px;
max-width: 100%;
background: #f3f6f9;
border-radius: 2px;
font-size: 14px;
color: #606266;
span {
display: inline-block;
vertical-align: middle;
}
i {
color: #999;
padding-left: 10px;
}
.tags-item__name {
max-width: 200px;
display: inline-block;
max-width: 100%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
......
src/view/memberGroup/memberGroupDetail.vue
......@@ -225,6 +225,22 @@
<template v-if="item.code == 'lastCost'">
{{ scope.row.lastCost }}
</template>
<!-- 最高单笔（应收） -->
<template v-if="item.code === 'highCost'">
<span>{{scope.row.highCost}}</span>
</template>
<!-- 消费总额（实付） -->
<template v-if="item.code === 'costFeePaid'">
<span>{{scope.row.costFeePaid}}</span>
</template>
<!-- 最近消费（实付） -->
<template v-if="item.code === 'lastCostPaid'">
<span>{{scope.row.lastCostPaid}}</span>
</template>
<!-- 最高单笔（实付） -->
<template v-if="item.code === 'highCostPaid'">
<span>{{scope.row.highCostPaid}}</span>
</template>
</template>
</el-table-column>
</div>
......
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