Skip to content

M
memberTag-web
Commit 23e75e91 by member
Options

Merge branch 'master' of 115.159.76.241:memberTag/memberTag-web

parents 441e3557 e0810844
Showing with 16 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.f05053e18170d845f8f4280b2c0ca1a1.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.35.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.55.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.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.file.myqcloud.com/components/selector.1.1.95.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script type=text/javascript src=./static/js/manifest.95e8dcdff7d649b71234.js></script><script type=text/javascript src=./static/js/vendor.4aa38b9b9bf3652c83db.js></script><script type=text/javascript src=./static/js/app.874fe4e33ce7ce37428d.js></script></body></html>
\ No newline at end of file
<<<<<<< HEAD
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-会员标签</title><link href=./static/css/app.f316ee18d54228024c84577007cffc3f.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.30.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.51.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.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.file.myqcloud.com/components/selector.1.1.95.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script type=text/javascript src=./static/js/manifest.9c6a6ddd5d09b5c2c391.js></script><script type=text/javascript src=./static/js/vendor.0f3101bbd902a62a341f.js></script><script type=text/javascript src=./static/js/app.e65aecd48d5decc618c0.js></script></body></html>
=======
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-会员标签</title><link href=./static/css/app.f05053e18170d845f8f4280b2c0ca1a1.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.35.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.55.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.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.file.myqcloud.com/components/selector.1.1.95.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script type=text/javascript src=./static/js/manifest.95e8dcdff7d649b71234.js></script><script type=text/javascript src=./static/js/vendor.4aa38b9b9bf3652c83db.js></script><script type=text/javascript src=./static/js/app.874fe4e33ce7ce37428d.js></script></body></html>
>>>>>>> ff0a1ca0c8978ec238590a893997259d378625a0
dist/static/css/app.f316ee18d54228024c84577007cffc3f.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.139cf54b0e57deac64b2.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.9c6a6ddd5d09b5c2c391.js 0 → 100644
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,t,f){for(var o,b,d,i=0,u=[];i<c.length;i++)b=c[i],n[b]&&u.push(n[b][0]),n[b]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(a&&a(c,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)d=r(r.s=f[i]);return d};var c={},n={33:0};function r(a){if(c[a])return c[a].exports;var n=c[a]={i:a,l:!1,exports:{}};return e[a].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var a=n[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,r){a=n[e]=[c,r]});a[2]=c;var t=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,r.nc&&f.setAttribute("nonce",r.nc),f.src=r.p+"static/js/"+e+"."+{0:"139cf54b0e57deac64b2",1:"61b1089acf1f67b03444",2:"5e343e32ee8a08bab159",3:"7a41297efe7c69b7d347",4:"1fbdd3b94b6fc5352ed7",5:"05114d58872f47d9cfd3",6:"eb0c19b6641d475aa0be",7:"1f821bfa52062e2c8cba",8:"267d255325e75564cea2",9:"7759d70d55555cd31757",10:"0bbcacae5b32a4086d82",11:"9a67c7c06054c37c834f",12:"01abe52ae21652d7b5ce",13:"c09300e1b0e8e2ffc370",14:"87ce37177c51c2fc40b8",15:"fd20a775a09d1b3668a4",16:"26f4050a398d6b70a8cc",17:"415f6139cd0ea56392d3",18:"fbc4eb134188160a18d3",19:"832d3ea87c380e19b5b4",20:"8160567d4c53561f5db5",21:"77f8fcb12b6eba290968",22:"0cd7be078f2b7c1b401e",23:"2ef2a61a6c75872af842",24:"b5215679a2bf5fea8200",25:"1fae8f2ebb6070ceae55",26:"42865dcf880ea388a1ae",27:"0c7a89b22a1e2d2bb1ca",28:"65f9cd1e111abd5e5d6d",29:"ed4b43f3d8456f7bd36e",30:"f568e2db5a1da8db5a6f"}[e]+".js";var o=setTimeout(b,12e4);function b(){f.onerror=f.onload=null,clearTimeout(o);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=b,t.appendChild(f),c},r.m=e,r.c=c,r.d=function(e,a,c){r.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},r.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(a,"a",a),a},r.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},r.p="./",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
package.json
......@@ -74,7 +74,7 @@
"vue-axios": "^2.1.1",
"vue-loader": "^13.3.0",
"vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.5.2",
"vue-template-compiler": "^2.6.11",
"vuedraggable": "^2.16.0",
"vuex": "^3.0.1",
"webpack": "^3.6.0",
......
src/view/memberGroup/memberGroupDetail.vue
......@@ -49,8 +49,7 @@
"
:prop="item.code"
:fixed="item.code == 'name' ? true : false"
:label="item.name"
>
:label="item.name">
<template slot-scope="scope">
<!-- 基本信息 -->
<template v-if="item.code == 'name'">
......@@ -563,7 +562,9 @@ export default {
that.selectedFields.push(ele);
}
});
console.log(that.selectedFields)
}
that.loading = false;
})
.catch(e => {
......@@ -646,12 +647,6 @@ export default {
// showMsg.showmsg('保存成功','success')
that.memberFields = resData.result; // 保存所有自定义列表字段
that.getGroupDetail(resData.result);
// resData.result.forEach(function(ele,index){
// if (!!ele.check) {
// that.selectedUserDefined.push(ele.code)
// that.selectedFields.push(ele)
// }
// });
return;
}
errMsg.errorMsg(resData);
......
src/view/memberGroup/tags-group-list.vue
......@@ -66,6 +66,11 @@ export default {
components: {
tagsGroup
},
watch: {
selectedTagsData(newval) {
console.log(newval);
}
},
methods: {
// 拖拽标签
dragTag(data) {
......
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