Skip to content

M
memberTag-web
Commit 0ef15cc4 by caoyanzhi
Options

Merge branch 'master' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/css/app.7175421c8bab2e5ad16e1f5c689131a6.css
#	dist/static/js/0.c471b4387db33ca8253a.js
#	dist/static/js/0.f7fc9a6d18d25360f868.js
#	dist/static/js/0.fdb3db43970ff9d14210.js
#	dist/static/js/manifest.12ed59597c8ce6e1a115.js
parents 055e4494 e31acda2
Showing with 19 additions and 6 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.b38930b50d26143bb2a9738b8e84644e.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 src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/selector.1.1.80.js></script><script type=text/javascript src=./static/js/manifest.3703d4adb9856f521209.js></script><script type=text/javascript src=./static/js/vendor.6f08af5bfb79f8ce5297.js></script><script type=text/javascript src=./static/js/app.cfaedb9a69ecda6ddeb5.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.7175421c8bab2e5ad16e1f5c689131a6.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 src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/selector.1.1.84.js></script><script type=text/javascript src=./static/js/manifest.12ed59597c8ce6e1a115.js></script><script type=text/javascript src=./static/js/vendor.83081d6a93a866b5b8f1.js></script><script type=text/javascript src=./static/js/app.ee37679d65f0f7f94037.js></script></body></html>
\ No newline at end of file
dist/static/css/app.7175421c8bab2e5ad16e1f5c689131a6.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.fdb3db43970ff9d14210.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.ee37679d65f0f7f94037.js 0 → 100644
webpackJsonp([32],{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 i});var n="login",o="logout",r="title",i="show"},"5tgt":function(e,t,a){e.exports=function(e,t){return function(n){a("Vna/")("./"+e+"/"+t+".vue").then(function(e){n(e)})}}},GjDF:function(e,t){},NHnr:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=a("//Fk"),o=a.n(n),r=a("hKoQ"),i=a.n(r),u=a("Dd8w"),m=a.n(u),l=a("SJI6"),c=a.n(l),s={name:"App",data:function(){return{}},computed:m()({},Object(l.mapState)(["uniqueId"])),created:function(){this.baseUrl=window.location.origin.indexOf("localhost")>-1?"http://gicdev.demogic.com":window.location.origin,this._getUserInfo(),this.changeTab()},methods:{laout:function(){this.axios.get(this.baseUrl+"/api-auth/do-logout?requestProject=gic-member-tag-web")},_getUserInfo:function(){var e=this;this.axios.get(this.baseUrl+"/api-auth/get-login-user-info?requestProject=gic-member-tag-web").then(function(t){if(0==t.data.errorCode){var a=t.data.result&&t.data.result.userId;""===e.uniqueId&&e.$store.commit("changeUniqueId",a)}})},changeTab:function(){var e=this;document.addEventListener("visibilitychange",function(){"visible"===document.visibilityState&&e.axios.get(e.baseUrl+"/api-auth/get-login-user-info?requestProject=gic-member-tag-web").then(function(t){if(0==t.data.errorCode){var a=t.data.result&&t.data.result.userId;e.uniqueId!==a&&e.$confirm("当前登录账号已经发生变化，如果您在其他页面已经登录另一个账号，请退出重新登录！","登录账号变更提示",{confirmButtonText:"退出重新登录",cancelButtonText:"刷新页面",type:"error"}).then(function(){e.laout(),window.location.reload()}).catch(function(){e.laout(),window.location.reload()})}})})}}},p={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 g,d=a("VU/8")(s,p,!1,function(e){a("GjDF")},null,null).exports,f=a("pRNm"),b=a.n(f),h=a("5tgt"),v=a.n(h),T=function(e){a.e(1).then(a.bind(null,"EE2z")).then(function(t){e(t)})},w=[{path:"/",name:"index",redirect:"member-tag",component:v()("index","index"),children:[{path:"/member-tag",name:"会员标签",component:v()("platformTag","member-tag"),meta:{title:"会员标签"}},{path:"/platformTagList",component:v()("platformTag","platformTagList"),name:"平台标签列表",meta:{title:"会员标签-平台标签列表"}},{path:"/platformTagDetail",component:v()("platformTag","platformTagDetail"),name:"平台标签详情",meta:{title:"会员标签-平台标签详情"}},{path:"/manualTagLib",component:v()("manualTag","manualTagLib"),name:"手工标签库",meta:{title:"会员标签-手工标签库"}},{path:"/manualTagList",component:v()("manualTag","manualTagList"),name:"手工标签列表",meta:{title:"会员标签-手工标签列表"}},{path:"/manualTagValueEdit",component:v()("manualTag","manual-tag-value-edit"),name:"标签值设置",meta:{title:"会员标签-标签值设置"}},{path:"/manualTagDetail",component:v()("manualTag","manualTagDetail"),name:"手工标签详情",meta:{title:"会员标签-手工标签详情"}},{path:"/myTagLib",component:v()("myTag","myTagLib"),name:"会员标签",meta:{title:"会员标签"}},{path:"/myTagList",component:v()("myTag","myTagList"),name:"我的标签库列表",meta:{title:"会员标签-我的标签库列表"}},{path:"/myTagDetail",component:v()("myTag","myTagDetail"),name:"标签详情",meta:{title:"会员标签-标签详情"}}]},{path:"/memberGroupList",name:"memberGroupListIndex",redirect:"memberGroupList",component:v()("memberGroup","index"),children:[{path:"/memberGroupList",component:v()("memberGroup","memberGroupList"),name:"会员分组",meta:{title:"会员标签-会员分组"}},{path:"/memberGroupDetail",component:v()("memberGroup","memberGroupDetail"),name:"分组详情",meta:{title:"会员标签-分组详情"}},{path:"/memberGroupEdit",component:v()("memberGroup","memberGroupEdit"),name:"编辑分组",meta:{title:"会员标签-编辑分组"}}]},{path:"/403",name:"无权访问",component:T},{path:"/404",name:"error404",component:T},{path:"/500",name:"error500",component:T},{path:"*",redirect:"/404",hidden:!0}],G=new b.a({routes:w,scrollBehavior:function(){return{y:0}}}),x=a("zL8q"),y=a("Rf8U"),L=a.n(y),q=a("mtWM"),V=a.n(q),j=a("bOdI"),k=a.n(j),I=a("lRwf"),P=a.n(I),D=a("5reh");P.a.use(c.a);var U=new c.a.Store({state:{user:{},token:null,title:"",show:!1,tagRealName:"",uniqueId:""},mutations:(g={},k()(g,D.a,function(e,t){sessionStorage.token=t,e.token=t}),k()(g,D.b,function(e){sessionStorage.removeItem("token"),e.token=null}),k()(g,D.d,function(e,t){e.title=t}),k()(g,D.c,function(e,t){e.show=t}),k()(g,"modiftTagName",function(e,t){e.tagRealName=t}),k()(g,"changeUniqueId",function(e,t){e.uniqueId=t||""}),g)}),E=(a("Xcu2"),a("4qCZ"),a("uKUT"),a("GqmT")),N=a.n(E);i.a.polyfill(),Vue.use(N.a),Vue.config.devtools=!0,Vue.use(L.a,V.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:x.Message.error("服务器500")}return o.a.reject(e.response.data)}),new Vue({el:"#app",router:G,store:U,components:{App:d},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",13],"./linktools/linktools.vue":["Lc2x",0,22],"./linktools/linktoolsold.vue":["/8lq",0,14],"./linktools/linktoolspage.vue":["HLON",0,18],"./login/login.vue":["6Qob",0,24],"./manualTag/manual-tag-value-edit.vue":["umZJ",0,2],"./manualTag/manualTagDetail.vue":["Tl/4",0,16],"./manualTag/manualTagEdit.vue":["308P",0,12],"./manualTag/manualTagLib.vue":["q490",0,25],"./manualTag/manualTagList.vue":["f0o3",0,20],"./memberGroup/edit-tag.vue":["jkVl",0],"./memberGroup/group-list.vue":["SJ7l",0,28],"./memberGroup/index.vue":["Gy5W",19],"./memberGroup/memberGroupDetail.vue":["+/ey",0,5],"./memberGroup/memberGroupEdit.vue":["q0vu",0,11],"./memberGroup/memberGroupList.vue":["oVck",0,4],"./memberGroup/recommend-table.vue":["9ZvA",30],"./memberGroup/tags-group-list.vue":["vcge",0],"./memberGroup/tags-group.vue":["wx1P",0],"./myTag/myTagDetail.vue":["ijla",0,15],"./myTag/myTagLib.vue":["twLH",0,26],"./myTag/myTagList.vue":["NJTp",0,21],"./platformTag/add-tag.vue":["tKpj",29],"./platformTag/member-tag.vue":["bytj",0,3],"./platformTag/platformTagDetail.vue":["KN59",0,10],"./platformTag/platformTagLib.vue":["puJc",0,27],"./platformTag/platformTagList.vue":["G/on",0,17],"./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){}},[0]);
\ No newline at end of file
dist/static/js/manifest.12ed59597c8ce6e1a115.js 0 → 100644
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(n,a,f){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 a)Object.prototype.hasOwnProperty.call(a,o)&&(e[o]=a[o]);for(c&&c(n,a,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)d=t(t.s=f[i]);return d};var n={},r={33:0};function t(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,t),r.l=!0,r.exports}t.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,t){c=r[e]=[n,t]});c[2]=n;var a=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,t.nc&&f.setAttribute("nonce",t.nc),f.src=t.p+"static/js/"+e+"."+{0:"fdb3db43970ff9d14210",1:"1a66f3452cb905b67755",2:"b20964a6b4940244eed7",3:"9209f0041f7da282c7ef",4:"fe10700a0dc4396d6fb6",5:"8756e3a39cb4cea7cbab",6:"31eb51419dea97959645",7:"f169140cbd6ad9f5611c",8:"fe61efcd1ccfc3412252",9:"ea583eedf0e8e01807bd",10:"49dc4ce10dca172e66e9",11:"97c54692f1a8adbe99aa",12:"543f6c991cec8c913a41",13:"4cbb12cbf7a9b8c30ba8",14:"012b850d5f8cb0572383",15:"c0b9b2e643a3d7f2e4a1",16:"07a972b413b1bb61c0ea",17:"874e4520e26cc90eb0a8",18:"643011894ba40b8da49b",19:"308e228686726571bdcf",20:"0fef167461d750bfe493",21:"9552d108595ed6cf8df5",22:"61bb63c1296b6c9972a5",23:"c24a9f56d0040598512c",24:"590887b93345814f00ef",25:"fbc9d87dd52c837c39be",26:"c5f9e5a4bc2c63938b70",27:"2c48b10d124016d57c0b",28:"f5fc73b651e29d17f74d",29:"ed4b43f3d8456f7bd36e",30:"5d1cb1b10c82fdeede4d"}[e]+".js";var o=setTimeout(b,12e4);function b(){f.onerror=f.onload=null,clearTimeout(o);var c=r[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return f.onerror=f.onload=b,a.appendChild(f),n},t.m=e,t.c=n,t.d=function(e,c,n){t.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:n})},t.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(c,"a",c),c},t.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},t.p="./",t.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
index.html
......@@ -21,6 +21,6 @@
<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 src="//web-1251519181.cos.ap-shanghai.myqcloud.com/components/selector.1.1.80.js"></script>
<script src="//web-1251519181.cos.ap-shanghai.myqcloud.com/components/selector.1.1.84.js"></script>
</body>
</html>
src/App.vue
......@@ -28,6 +28,9 @@ export default {
},
methods: {
laout() {
this.axios.get(`${this.baseUrl}/api-auth/do-logout?requestProject=gic-member-tag-web`);
},
_getUserInfo() {
this.axios.get(`${this.baseUrl}/api-auth/get-login-user-info?requestProject=gic-member-tag-web`).then((res) => {
if (res.data.errorCode == 0) {
......@@ -47,13 +50,15 @@ export default {
const uId = res.data.result && res.data.result.userId;
// 两次的uId不等 表示账号有冲突
if (this.uniqueId !== uId) {
this.$confirm('出现窜号情况，请首先核对好是哪个商户再进行操作！', '提示', {
this.$confirm('当前登录账号已经发生变化，如果您在其他页面已经登录另一个账号，请退出重新登录！', '登录账号变更提示', {
confirmButtonText: '退出重新登录',
cancelButtonText: '刷新页面',
type: 'error'
}).then(() => {
this.$store.commit('changeUniqueId', uId);
this.laout();
window.location.reload();
}).catch(() => {
this.$store.commit('changeUniqueId', uId);
this.laout();
window.location.reload();
});
}
......
src/components/tag/tag-config-options.vue
......@@ -1420,7 +1420,10 @@ export default {
for (let i = 0; i < this.templateData.length; i++) {
if (this.templateData[i].templateCode === 'tag015') {
let templateDate = tagParams.template[0];
console.log(templateDate, 'syo');
// 最近 之后
this.templateData[i].radio = templateDate.radio; // 时段
this.templateData[i].timeSelect = templateDate.timeSelect;
if (this.templateData[i].radio == 1) {
if (templateDate.dateRangeValue && templateDate.dateRangeValue.length) {
this.templateData[i].dateRangeValue = templateDate.dateRangeValue;
......@@ -1536,6 +1539,7 @@ export default {
// 判断是那个时间段
// 固定时段
this.templateData[i].radio = templateDate.radio; // 时段
this.templateData[i].timeSelect = templateDate.timeSelect;
if (this.templateData[i].radio == 1) {
if (templateDate.dateRangeValue && templateDate.dateRangeValue.length) {
this.templateData[i].dateRangeValue = templateDate.dateRangeValue;
......
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