Skip to content

M
memberTag-web
Commit 6569112b by caoyanzhi
Options

Merge branch 'feature/4月-会员通' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/css/app.0e698a68616c6359a4392d94015cff41.css
#	dist/static/js/manifest.19a596b97ad6a8421ff3.js
parents c8443988 f4126208
Showing with 78 additions and 13 deletions
dist/index.html
<<<<<<< HEAD
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./static/img/favicon.ico><title>金华达摩</title><link rel=stylesheet href=//at.alicdn.com/t/font_688955_99jmfacmlpp.css><link rel=stylesheet href=//at.alicdn.com/t/font_3276801_mkhlaisq2aq.css><script src=//at.alicdn.com/t/font_3276801_w3vkjjmzzz.js></script><link rel="shortcut icon" href=./favicon.ico><link href=./static/css/app.6a33aa07db91ba0f16e3a9a38251bd4a.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
=======
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./static/img/favicon.ico><title></title><link rel="shortcut icon" href=./favicon.ico><link href=./static/css/app.0e698a68616c6359a4392d94015cff41.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
>>>>>>> feature/4月-会员通
var src = '/component/static/import-component.js?timestrap='+ new Date().getTime();
var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
document.write('<script src="//'+ host + src +'"><\/script>')
})()</script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.e1bf2c02caf99df5c133.js></script><script type=text/javascript src=./static/js/vendor.ecce21da6a46da8c2fc4.js></script><script type=text/javascript src=./static/js/app.480d36e13e2a23cc38c1.js></script></body></html>
\ No newline at end of file
<<<<<<< HEAD
})()</script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.e1bf2c02caf99df5c133.js></script><script type=text/javascript src=./static/js/vendor.ecce21da6a46da8c2fc4.js></script><script type=text/javascript src=./static/js/app.480d36e13e2a23cc38c1.js></script></body></html>
=======
})()</script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.19a596b97ad6a8421ff3.js></script><script type=text/javascript src=./static/js/vendor.313c008bac1be397035b.js></script><script type=text/javascript src=./static/js/app.d92cf3a9903c1758ee4e.js></script></body></html>
>>>>>>> feature/4月-会员通
dist/static/css/app.0e698a68616c6359a4392d94015cff41.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.19a596b97ad6a8421ff3.js 0 → 100644
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var o,b,d,i=0,u=[];i<a.length;i++)b=a[i],f[b]&&u.push(f[b][0]),f[b]=0;for(o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(c&&c(a,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)d=n(n.s=t[i]);return d};var a={},f={38:0};function n(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,n){c=f[e]=[a,n]});c[2]=a;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"3d6b3678ede5d06f0db5",1:"a5b1143fb090193afa6f",2:"d20a94c45ea0ffc03fa2",3:"87970c099302f16e1c4f",4:"3b5e93f891a2664a3083",5:"681efcc79cdcb40ef10c",6:"614a113d4b0cc0a6d940",7:"cbfb1c1422fe6c812024",8:"891bbc4365b8362d5195",9:"7cc1b38988e254182ad8",10:"1cbc7e505ef918253196",11:"cfa61640d1a3d8d26b48",12:"4863cb2833a59b3a1e0d",13:"e8f8c393892893457237",14:"f9349ebf084cac90f55f",15:"16c6ab7eb3de19d1bc9c",16:"24a6f93e8f2baa075f01",17:"06d390348833f9865c60",18:"810924567b628c1681d3",19:"1724cc09329c6b0010d9",20:"b2ba64154f555459cc42",21:"9c7b0847654fea50f3ce",22:"dba59337a67c226dbcc1",23:"c57ea129b88962170b25",24:"ee5a8baed163b78150c1",25:"671fe3ab75a6a1f46b4a",26:"4e9ca5fbfba7a6c103a5",27:"59d10aebc645ea748009",28:"c1335f07037eb9226047",29:"14f81ba933c5f226b3e1",30:"350069af55dec9c745a7",31:"9817b996a74aa8f2d753",32:"b15c54d9011e4e52be3c",33:"4f76bdffa1b0785f24fd",34:"37903af596b5b2dad1d1",35:"f3351db076629ee66ed9"}[e]+".js";var o=setTimeout(b,12e4);function b(){t.onerror=t.onload=null,clearTimeout(o);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=b,r.appendChild(t),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/view/manualTag/manual-tag-value-edit-info.vue
......@@ -115,6 +115,29 @@
</el-popover>
</div>
</template>
<!-- 状态 -->
<template v-if="item.code == 'status'">
<template v-if="!Array.isArray(scope.row.memberSources) || scope.row.memberSources.filter(el => el.highlight != 0).length == 0">--</template>
<template v-else>
<!-- 1100：公众号 1600：小程序 1700：企业微信 1303：微盟 1302：天猫会员通 -->
<span class="channel-box" v-for="channel in scope.row.memberSources" :key="channel.parentSourceCode">
<template v-if="channel.highlight == 1">
<img class="channel-icon" v-if="channel.parentSourceCode == 1100" src="../../../static/img/channel-icon/weixin-1.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1600" src="../../../static/img/channel-icon/xiaochengxu-1.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1700" src="../../../static/img/channel-icon/qiyeweixin-1.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1303" src="../../../static/img/channel-icon/weimen-1.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1302" src="../../../static/img/channel-icon/tianmao-1.png" alt="">
</template>
<template v-if="channel.highlight == 2">
<img class="channel-icon" v-if="channel.parentSourceCode == 1100" src="../../../static/img/channel-icon/weixin-2.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1600" src="../../../static/img/channel-icon/xiaochengxu-2.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1700" src="../../../static/img/channel-icon/qiyeweixin-2.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1303" src="../../../static/img/channel-icon/weimen-2.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1302" src="../../../static/img/channel-icon/tianmao-2.png" alt="">
</template>
</span>
</template>
</template>
<!-- 手机号 -->
<template v-if="item.code === 'phoneNumber'">
<span>{{scope.row.phoneNumber}}</span>
......@@ -626,6 +649,17 @@ export default {
};
</script>
<style lang="scss" scoped>
.channel-box {
display: inline-block;
+.channel-box {
margin-left: 6px;
}
.channel-icon {
width: 20px;
height: 20px;
vertical-align: middle;
}
}
.manualTagDetail-wrap__head {
font-size: 14px;
border-bottom: 1px solid #ebeef5;
......
src/view/memberGroup/memberGroupDetail.vue
......@@ -50,6 +50,7 @@
: 'custom'
"
:prop="item.code"
:min-width="item.code == 'status' ? '200px' : '150px'"
v-for="item in selectedFields" :key="item.code"
:fixed="item.code == 'name' ? true : false"
:label="item.name">
......@@ -122,16 +123,26 @@
</template>
<!-- 状态 -->
<template v-if="item.code == 'status'">
<span
:title="scope.row.wxStatus == 0 ? '未使用小程序' : scope.row.wxStatus == 1 ? '已使用小程序' : ''"
class="channelicon"
:class="scope.row.wxStatus == 0 ? 'xcxicongray' : scope.row.wxStatus == 1 ? 'xcxicon' : ''"
></span>
<span
:title="scope.row.status == 0 ? '取消关注公众号' : scope.row.status == 1 ? '已关注公众号' : '未关注公众号'"
class="channelicon"
:class="scope.row.status == 0 ? 'gzhiconcanclegray' : scope.row.status == 1 ? 'gzhicon' : 'gzhicongray'"
></span>
<template v-if="!Array.isArray(scope.row.memberSources) || scope.row.memberSources.filter(el => el.highlight != 0).length == 0">--</template>
<template v-else>
<!-- 1100：公众号 1600：小程序 1700：企业微信 1303：微盟 1302：天猫会员通 -->
<span class="channel-box" v-for="channel in scope.row.memberSources" :key="channel.parentSourceCode">
<template v-if="channel.highlight == 1">
<img class="channel-icon" v-if="channel.parentSourceCode == 1100" src="../../../static/img/channel-icon/weixin-1.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1600" src="../../../static/img/channel-icon/xiaochengxu-1.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1700" src="../../../static/img/channel-icon/qiyeweixin-1.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1303" src="../../../static/img/channel-icon/weimen-1.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1302" src="../../../static/img/channel-icon/tianmao-1.png" alt="">
</template>
<template v-if="channel.highlight == 2">
<img class="channel-icon" v-if="channel.parentSourceCode == 1100" src="../../../static/img/channel-icon/weixin-2.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1600" src="../../../static/img/channel-icon/xiaochengxu-2.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1700" src="../../../static/img/channel-icon/qiyeweixin-2.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1303" src="../../../static/img/channel-icon/weimen-2.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1302" src="../../../static/img/channel-icon/tianmao-2.png" alt="">
</template>
</span>
</template>
</template>
<!-- 关联渠道 -->
<template v-if="item.code == 'channel'">
......@@ -252,7 +263,7 @@
</template>
</template>
</el-table-column>
<el-table-column label-class-name="table-header__handle">
<el-table-column label-class-name="table-header__handle" min-width="130px">
<template slot="header">
<span>操作</span>
<i class="el-icon-setting" @click="showDefined"></i>
......@@ -716,6 +727,17 @@ export default {
};
</script>
<style lang="scss" scoped>
.channel-box {
display: inline-block;
+.channel-box {
margin-left: 6px;
}
.channel-icon {
width: 20px;
height: 20px;
vertical-align: middle;
}
}
.memberGroupDetail-wrap__head {
font-size: 14px;
border-bottom: 1px solid #ebeef5;
......
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