Skip to content

M
memberTag-web
Commit f18f9204 by xiaohai
Options

Merge branch 'dev' of http://115.159.76.241/memberTag/memberTag-web into dev

parents c6798b12 22247c12
Showing with 45 additions and 11 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.4f9b8222fc411790cab534532d99da84.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.c4eef6db52ad1110557d.js></script><script type=text/javascript src=./static/js/vendor.8dd99a3693e456916252.js></script><script type=text/javascript src=./static/js/app.247769845a047a4f99e4.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.987dc83deb5147a3ea0e808a959b2d38.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.abb6fd931669bd9d44e2.js></script><script type=text/javascript src=./static/js/vendor.8dd99a3693e456916252.js></script><script type=text/javascript src=./static/js/app.247769845a047a4f99e4.js></script></body></html>
\ No newline at end of file
dist/static/css/app.4f9b8222fc411790cab534532d99da84.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.4f9b8222fc411790cab534532d99da84.css.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.987dc83deb5147a3ea0e808a959b2d38.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.987dc83deb5147a3ea0e808a959b2d38.css.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/6.10e9d14bf9b8e9592d9c.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.f74e3fc2dea8f9d64ab0.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.4df69538b7ef781394e3.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.d228943b23a8d17346ac.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/manifest.c4eef6db52ad1110557d.js → dist/static/js/manifest.abb6fd931669bd9d44e2.js
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,f,o){for(var a,b,d,i=0,u=[];i<r.length;i++)b=r[i],t[b]&&u.push(t[b][0]),t[b]=0;for(a in f)Object.prototype.hasOwnProperty.call(f,a)&&(e[a]=f[a]);for(n&&n(r,f,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)d=c(c.s=o[i]);return d};var r={},t={27:0};function c(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,c),t.l=!0,t.exports}c.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,c){n=t[e]=[r,c]});n[2]=r;var f=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,c.nc&&o.setAttribute("nonce",c.nc),o.src=c.p+"static/js/"+e+"."+{0:"8895abfb40621c3b6b09",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"42e753f15963ec1ffb08",6:"10e9d14bf9b8e9592d9c",7:"4df69538b7ef781394e3",8:"6ba34c45db84df9a923d",9:"f861be85fc538267e274",10:"c71c26ffe9e929740644",11:"e85b90356083e5b3e250",12:"f6e9faa54422908ebc04",13:"e758be86411be4766b96",14:"e3674474da8a18925ba8",15:"7d1ff03b792f26290716",16:"f4036a24000959bd38c8",17:"83e469d672229c638715",18:"6ed416399616407ccde9",19:"fc8e599e991ddaa6af91",20:"0bef46bf128efff99a1a",21:"409e1f4c416739f1cb0c",22:"04f2c04e10c125c291b0",23:"5275761a271b27e0ec1e",26:"52359959d210204efba3"}[e]+".js";var a=setTimeout(b,12e4);function b(){o.onerror=o.onload=null,clearTimeout(a);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=b,f.appendChild(o),r},c.m=e,c.c=r,c.d=function(e,n,r){c.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},c.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(n,"a",n),n},c.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},c.p="./",c.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.c4eef6db52ad1110557d.js.map
\ No newline at end of file
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,f,o){for(var a,d,b,i=0,u=[];i<r.length;i++)d=r[i],t[d]&&u.push(t[d][0]),t[d]=0;for(a in f)Object.prototype.hasOwnProperty.call(f,a)&&(e[a]=f[a]);for(n&&n(r,f,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)b=c(c.s=o[i]);return b};var r={},t={27:0};function c(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,c),t.l=!0,t.exports}c.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,c){n=t[e]=[r,c]});n[2]=r;var f=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,c.nc&&o.setAttribute("nonce",c.nc),o.src=c.p+"static/js/"+e+"."+{0:"8895abfb40621c3b6b09",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"42e753f15963ec1ffb08",6:"f74e3fc2dea8f9d64ab0",7:"d228943b23a8d17346ac",8:"6ba34c45db84df9a923d",9:"f861be85fc538267e274",10:"c71c26ffe9e929740644",11:"e85b90356083e5b3e250",12:"f6e9faa54422908ebc04",13:"e758be86411be4766b96",14:"e3674474da8a18925ba8",15:"7d1ff03b792f26290716",16:"f4036a24000959bd38c8",17:"83e469d672229c638715",18:"6ed416399616407ccde9",19:"fc8e599e991ddaa6af91",20:"0bef46bf128efff99a1a",21:"409e1f4c416739f1cb0c",22:"04f2c04e10c125c291b0",23:"5275761a271b27e0ec1e",26:"52359959d210204efba3"}[e]+".js";var a=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(a);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=d,f.appendChild(o),r},c.m=e,c.c=r,c.d=function(e,n,r){c.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},c.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(n,"a",n),n},c.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},c.p="./",c.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.abb6fd931669bd9d44e2.js.map
\ No newline at end of file
src/components/tagShortDetail.vue
......@@ -564,6 +564,12 @@
tagShortId: String,
fromFlag: String, // memberGroup: 会员分组-我的标签列表用; mytag: 我的标签列表用
tabActive: String, // tab 名字.我的标签列表/暂存架
rowItemData: {// 当前选择的数据
type: Object,
default() {
return {}
}
},
},
data() {
return {
......@@ -814,6 +820,8 @@
inputSearch: '', // 输入搜索
},
rowData: {},
baseUrl: '',// url
}
......@@ -838,6 +846,7 @@
that.$emit('hideTag')
that.$emit('update:tagShortId','');
that.templateData = []
that.rowData = {}
},
/**
......@@ -2351,6 +2360,11 @@
const resData = res.data
if (resData.errorCode == 1) {
if (!resData.result || resData.result.tagParams == '[]') {
console.log("传入的 rowItemData:",that.rowData)
// if (!!Object.keys(that.rowData).length) {
// resolve(JSON.parse(that.rowData.tagParams).template);
// return false;
// }
reject(new Error('返回数据为空'));
return false;
}
......@@ -2431,15 +2445,21 @@
fromFlag: function(newVal) {
const that = this;
console.log('fromFlag:',newVal)
},
rowItemData: function(newVal) {
const that = this;
console.log('rowItemData:',newVal)
that.rowData = newVal
}
},
mounted() {
const that = this;
that.tagShortVisible = that.showTagDetail;
console.log("传入的 tagId:",that.tagShortId)
console.log("传入的 tagId:",that.tagShortId,that.rowItemData)
// that.getcityData();
document.getElementById("app").style.zIndex = 1;
// that.getTagData(that.tagShortId)
that.rowData = that.rowItemData
},
updated() {
// console.log('updated')
......@@ -2608,6 +2628,8 @@
&.city-slected-opyions {
font-size: 0;
max-height: 380px;
overflow-y: auto;
.el-tag {
margin: 0 10px 10px 0;
......
src/components/tagTemporary.vue
......@@ -121,7 +121,10 @@
handleSelectChange(val) {
const that = this
console.log(val);
that.selectTag = val;
setTimeout(function(){
that.selectTag = val;
},10)
},
/**
......@@ -130,7 +133,10 @@
handleSelectAll(val) {
const that = this
console.log(val);
that.selectTag = val;
setTimeout(function(){
that.selectTag = val;
},10)
},
/**
......@@ -145,7 +151,7 @@
selectStatus: status
}
getRequest('/member-tag-value/update.json',para)
postRequest('/member-tag-value/update.json',para)
.then((res) => {
// console.log(res,res.data,res.data.errorCode)
var resData = res.data
......@@ -174,7 +180,9 @@
handleSelectRow(val,row) {
const that = this
console.log(val,row);
that.selectTag = val;
setTimeout(function(){
that.selectTag = val;
},10)
let status = 1;
if (!!val.length) {
let idArr = val.map(item=>item.tagId);
......
src/view/memberGroup/memberGroupEdit.vue
......@@ -79,6 +79,7 @@
:showTagDetail="showTagDetail"
:tagShortId.sync="tagShortDetailId"
:tabActive="tabActiveName"
:rowItemData="rowItemData"
@hideTag="handleHideTag"
@returnTagData="returnTagData" >
</tagShortDetail>
......@@ -202,6 +203,7 @@
// },
],
rowItemData: {}, //选择的标签的数据
showTagDetail: false, // 标签详情缩小版显示/隐藏
tagShortDetailId: '', // 标签详情缩写版 id
fromFlag: 'memberGroup', // 参数--来源标志
......@@ -230,7 +232,7 @@
path: ''
}
];
}
}
},
methods: {
/**
......@@ -324,6 +326,8 @@
const that = this
that.showTagDetail = true;
that.tagShortDetailId = item.tagId;
console.log(item)
that.rowItemData = item;
},
/**
......
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