Skip to content

M
memberTag-web
Commit b669c43e by 无尘
Options

add: 增加标签详情状态判断

parent 88498e39
Showing with 70 additions and 39 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.3ca3de078a431b04c1722b313f11502b.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.41b681af95e1f2a66e81.js></script><script type=text/javascript src=./static/js/vendor.4ac54fd03099c45beefc.js></script><script type=text/javascript src=./static/js/app.093271d4650febf1f6d5.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.c940ebe44baf3de45aa0a40915e1796f.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.4ae23e3583302929494a.js></script><script type=text/javascript src=./static/js/vendor.4ac54fd03099c45beefc.js></script><script type=text/javascript src=./static/js/app.13188b5eb28255af8cd5.js></script></body></html>
\ No newline at end of file
dist/static/js/13.f31d7a2959c9f924b85f.js → dist/static/js/14.9e2a6743137628654ca9.js
webpackJsonp([13],{NIJk:function(t,a){},twLH:function(t,a,n){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var e=n("3Xzz"),i=n("BdFv"),s=(n("Mk6G"),n("3E4D"),n("Ch4/"),n("PI0u"),n("P9l9"),{name:"myTagLib",data:function(){return{navpath:[{name:"首页",path:""},{name:"会员标签",path:""},{name:"我的标签库",path:""}],tagCategory:"myTagList"}},methods:{toAddMyTagLib:function(){}},mounted:function(){},components:{navCrumb:e.a,tagLib:i.a}}),r={render:function(){var t=this.$createElement,a=this._self._c||t;return a("div",{staticClass:"myTagLib-wrap common-wrap"},[a("nav-crumb",{attrs:{navpath:this.navpath}}),this._v(" "),a("div",{staticClass:"right-content"},[a("div",{staticClass:"right-box"},[a("tag-lib",{attrs:{tagCategory:this.tagCategory}})],1)]),this._v(" "),a("vue-gic-footer")],1)},staticRenderFns:[]};var o=n("VU/8")(s,r,!1,function(t){n("NIJk")},"data-v-a886157a",null);a.default=o.exports}});
//# sourceMappingURL=13.f31d7a2959c9f924b85f.js.map
\ No newline at end of file
webpackJsonp([14],{NIJk:function(t,a){},twLH:function(t,a,n){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var e=n("3Xzz"),i=n("BdFv"),s=(n("Mk6G"),n("3E4D"),n("Ch4/"),n("PI0u"),n("P9l9"),{name:"myTagLib",data:function(){return{navpath:[{name:"首页",path:""},{name:"会员标签",path:""},{name:"我的标签库",path:""}],tagCategory:"myTagList"}},methods:{toAddMyTagLib:function(){}},mounted:function(){},components:{navCrumb:e.a,tagLib:i.a}}),r={render:function(){var t=this.$createElement,a=this._self._c||t;return a("div",{staticClass:"myTagLib-wrap common-wrap"},[a("nav-crumb",{attrs:{navpath:this.navpath}}),this._v(" "),a("div",{staticClass:"right-content"},[a("div",{staticClass:"right-box"},[a("tag-lib",{attrs:{tagCategory:this.tagCategory}})],1)]),this._v(" "),a("vue-gic-footer")],1)},staticRenderFns:[]};var o=n("VU/8")(s,r,!1,function(t){n("NIJk")},"data-v-a886157a",null);a.default=o.exports}});
//# sourceMappingURL=14.9e2a6743137628654ca9.js.map
\ No newline at end of file
dist/static/js/6.5c537d70c4daab4938f8.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/6.eb1405e264b659b38447.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/7.0aec59e2011d200c04c3.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/7.3c2898200fb3dc934f78.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/8.745680b2aeb6a7fd61ad.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/8.88ccc9bd21eeec867f16.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.41b681af95e1f2a66e81.js → dist/static/js/manifest.4ae23e3583302929494a.js
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(n,o,f){for(var a,d,i,u=0,b=[];u<n.length;u++)d=n[u],r[d]&&b.push(r[d][0]),r[d]=0;for(a in o)Object.prototype.hasOwnProperty.call(o,a)&&(e[a]=o[a]);for(c&&c(n,o,f);b.length;)b.shift()();if(f)for(u=0;u<f.length;u++)i=t(t.s=f[u]);return i};var n={},r={26: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 o=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:"54e2fcd34d9735921821",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"1a256372cf611e55ba61",6:"5c537d70c4daab4938f8",7:"0aec59e2011d200c04c3",8:"88ccc9bd21eeec867f16",9:"13bfcb94c19bc4aad614",10:"c71c26ffe9e929740644",11:"e85b90356083e5b3e250",12:"efe5e750726bc1eaf8fb",13:"f31d7a2959c9f924b85f",14:"dcdc82940d580456b970",15:"5966245d2668ef56829e",16:"f4036a24000959bd38c8",17:"83e469d672229c638715",18:"129d150ebd1fce6ee6e0",19:"4f681127cc3b6c7e3765",20:"e9481aadfbdf4369b210",21:"6c5db9df3cbb982e0364",22:"e91d8f3111c8c501ab9d",25:"9ceafa4ee79176c87d81"}[e]+".js";var a=setTimeout(d,12e4);function d(){f.onerror=f.onload=null,clearTimeout(a);var c=r[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return f.onerror=f.onload=d,o.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}}([]);
//# sourceMappingURL=manifest.41b681af95e1f2a66e81.js.map
\ No newline at end of file
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(n,o,a){for(var f,d,i,u=0,b=[];u<n.length;u++)d=n[u],r[d]&&b.push(r[d][0]),r[d]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(c&&c(n,o,a);b.length;)b.shift()();if(a)for(u=0;u<a.length;u++)i=t(t.s=a[u]);return i};var n={},r={26: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 o=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,t.nc&&a.setAttribute("nonce",t.nc),a.src=t.p+"static/js/"+e+"."+{0:"54e2fcd34d9735921821",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"1a256372cf611e55ba61",6:"eb1405e264b659b38447",7:"3c2898200fb3dc934f78",8:"745680b2aeb6a7fd61ad",9:"13bfcb94c19bc4aad614",10:"c71c26ffe9e929740644",11:"e85b90356083e5b3e250",12:"cd5795695183c2acddb4",13:"e29aa5893a93a16c34bc",14:"9e2a6743137628654ca9",15:"a5f8fe67451ebd4858dc",16:"f4036a24000959bd38c8",17:"83e469d672229c638715",18:"129d150ebd1fce6ee6e0",19:"4f681127cc3b6c7e3765",20:"7276b34cf6271ef66d17",21:"6c5db9df3cbb982e0364",22:"e91d8f3111c8c501ab9d",25:"9ceafa4ee79176c87d81"}[e]+".js";var f=setTimeout(d,12e4);function d(){a.onerror=a.onload=null,clearTimeout(f);var c=r[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return a.onerror=a.onload=d,o.appendChild(a),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}}([]);
//# sourceMappingURL=manifest.4ae23e3583302929494a.js.map
\ No newline at end of file
src/components/tagShortDetail.vue
......@@ -2045,6 +2045,11 @@
that[resData.result.templateCode][key] = resData.result[key]
}
// 如果是城市
if (resData.result.templateCode === 'tag010') {
that.getcityData()
}
// 如果是给了 计算属性值
if (!!that.postCompute) {
that[resData.result.templateCode].postCompute = that.postCompute;
......@@ -2070,7 +2075,8 @@
that.templateData.push(that[resData.result.templateCode])
// 获取已存数据
that.getExistData(that.tagData.tagId);
let tempExist = that.getExistData(that.tagData.tagId);
console.log("获取已存数据:",tempExist)
if (resData.result.templateCode === 'tag009' || resData.result.templateCode === 'tag010') {
that.searchFlag = true;
......@@ -2141,33 +2147,33 @@
*/
async getExistData(tagId) {
const that = this
const para = {
tagId: tagId
}
getRequest('/member-tag-value/findOne.json',para)
.then((res) => {
// console.log(res,res.data,res.data.errorCode)
const resData = res.data
if (resData.errorCode == 1) {
if (!resData.result || resData.result.tagParams == '[]') {
return false;
}
that.templateData = JSON.parse(resData.result.tagParams).template
return;
return new Promise(function(resolve,reject){
const para = {
tagId: tagId
}
errMsg.errorMsg(resData)
})
.catch(function (error) {
console.log(error);
that.$message.error({
duration: 1000,
message: error.message
getRequest('/member-tag-value/findOne.json',para)
.then((res) => {
// console.log(res,res.data,res.data.errorCode)
const resData = res.data
if (resData.errorCode == 1) {
if (!resData.result || resData.result.tagParams == '[]') {
reject(new Error(resData.message));
return false;
}
// that.templateData = JSON.parse(resData.result.tagParams).template
resolve(JSON.parse(resData.result.tagParams).template);
return;
}else {
reject(new Error(resData.message));
}
})
});
.catch(function (error) {
console.log(error);
reject(new Error(error.message));
});
})
},
/**
......@@ -2202,8 +2208,6 @@
that.checkTagTemplate(templateObj.templateContent)
}
that.getcityData()
return;
}
......
src/view/manualTag/manualTagList.vue
......@@ -53,7 +53,7 @@
<el-table-column
label="操作">
<template slot-scope="scope">
<router-link :to="{path:'/myTagDetail',query:{tagId:scope.row.tagId,form:'notMyTag'}}" class="edit-btn el-button--text">详情</router-link>
<router-link :to="{path:'/myTagDetail',query:{tagId:scope.row.tagId,addFlag:scope.row.isAdd,form:'notMyTag'}}" class="edit-btn el-button--text">详情</router-link>
<router-link :to="{path:'/manualTagEdit',query:{tagId:scope.row.tagId}}" class="edit-btn el-button--text p-l-20">编辑</router-link>
<el-button
type="text"
......
src/view/myTag/myTagDetail.vue
......@@ -465,8 +465,19 @@
<!-- <checkbox-option-async ></checkbox-option-async> -->
<div class="myTagDetail-wrap__btn">
<el-button type="primary" v-if="tagFlag" @click="addTemporary">添加到暂存架</el-button>
<el-button type="primary" v-if="!tagFlag" @click="addMytag">添加至我的标签库</el-button>
<el-button
type="primary"
v-if="tagFlag"
@click="addTemporary">
{{!!addTempFlag? '更新标签选项':'添加到暂存架'}}
</el-button>
<el-button
type="primary"
v-if="!tagFlag"
:disabled="!!addFlag? true: false"
@click="addMytag">
{{!!addFlag? '已添加至我的标签库':'添加至我的标签库'}}
</el-button>
</div>
</div>
</div>
......@@ -505,8 +516,10 @@ import qs from 'qs';
tagId: '', // 获取当前标签的 id
tagFlag: false, // 判断是否添加暂存架还是添加我的标签库的标志,true: 暂存库,false: 我的标签
addFlag: false, // 是否添加到我的标签库
templateCode: '', // 当前模板 code
addTempFlag: false, // 是否已经添加到暂存架
searchFlag: false, // 搜索框默认不显示
......@@ -1966,6 +1979,11 @@ import qs from 'qs';
that[resData.result.templateCode][key] = resData.result[key]
}
// 如果是城市
if (resData.result.templateCode === 'tag010') {
that.getcityData()
}
// 如果是给了 计算属性值
if (!!that.postCompute) {
that[resData.result.templateCode].postCompute = that.postCompute;
......@@ -2070,8 +2088,11 @@ import qs from 'qs';
const resData = res.data
if (resData.errorCode == 1) {
if (!resData.result || resData.result.tagParams == '[]') {
that.addTempFlag = false;
return false;
}
// 查看该标签是否在暂存架中
that.addTempFlag = true;
that.templateData = JSON.parse(resData.result.tagParams).template
return;
}
......@@ -2135,7 +2156,7 @@ import qs from 'qs';
message: error.message
})
});
}
},
},
watch:{
......@@ -2157,8 +2178,14 @@ import qs from 'qs';
that.tagId = that.$route.query.tagId
that.tagShortId = that.$route.query.tagId
that.getTagData(that.tagId)
document.getElementById("app").style.zIndex = 1;
}
// 是否有添加我的标签库标志
that.addFlag = !!that.$route.query.addFlag? true : false;
},
components: {
navCrumb,
......
src/view/platformTag/platformTagList.vue
......@@ -51,7 +51,7 @@
<el-table-column
label="操作">
<template slot-scope="scope">
<router-link :to="{path:'/myTagDetail',query:{tagId:scope.row.tagId,form:'notMyTag'}}" class="edit-btn el-button--text">详情</router-link>
<router-link :to="{path:'/myTagDetail',query:{tagId:scope.row.tagId,addFlag:scope.row.isAdd,form:'notMyTag'}}" class="edit-btn el-button--text">详情</router-link>
<el-button
type="text"
size="small"
......
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