Commit ab849b83 by damodmg

Merge branch 'dev' into 'master'

会员详情字段修改

See merge request !50
parents 5041613f 92e5a4af
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.09fb6a01ac26639bc669ed3a1f28b8ff.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/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/aside-menu.2.0.05.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-linkage.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bf93010d9b9b1322a27b.js></script><script type=text/javascript src=./static/js/app.1c5da674d3974e960e05.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.86eb04947c1c826ffe1c17e3af0412c2.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/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/aside-menu.2.0.05.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-linkage.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bf93010d9b9b1322a27b.js></script><script type=text/javascript src=./static/js/app.004002929420cab45e15.js></script></body></html>
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -12,13 +12,13 @@
<div class="fr">
<img title="已取消关注公众号" v-if="memberInfo.status == 0" src="../../static/img/status@gzhcanclegray.png" style="margin-right:5px" />
<img title="已关注公众号" v-else-if="memberInfo.status == 1" src="../../static/img/status@gzh.png" style="margin-right:5px" />
<img title="未关注公众号" v-else src="../../static/img/status@gzhgray.png" style="margin-right:5px" />
<img title="使用过小程序" v-if="memberInfo.usedMiniProgram" src="../../static/img/status@xcx.png" style="margin-right:5px" />
<img title="未使用小程序" v-else src="../../static/img/status@xcxgray.png" style="margin-right:5px" />
<img title="已绑定手机号" v-if="memberInfo.bindPhone" src="../../static/img/phone_icon.png" style="margin-right:5px" />
<img title="未绑定手机号" v-else src="../../static/img/phone_icon_gray.png" style="margin-right:5px" />
<img title="已认证" v-if="memberInfo.authStatus" src="../../static/img/member_icon.png" style="margin-right:5px" />
<img title="未认证" v-else src="../../static/img/member_icon_gray.png" style="margin-right:5px" />
<img title="未关注公众号" v-else-if="memberInfo.status == 2" src="../../static/img/status@gzhgray.png" style="margin-right:5px" />
<img title="使用过小程序" v-if="memberInfo.wxStatus === 1" src="../../static/img/status@xcx.png" style="margin-right:5px" />
<img title="未使用小程序" v-if="memberInfo.wxStatus === 0" src="../../static/img/status@xcxgray.png" style="margin-right:5px" />
<img title="已绑定手机号" v-if="memberInfo.phoneStatus === 1" src="../../static/img/phone_icon.png" style="margin-right:5px" />
<img title="未绑定手机号" v-if="memberInfo.phoneStatus === 0" src="../../static/img/phone_icon_gray.png" style="margin-right:5px" />
<img title="已认证" v-if="memberInfo.authStatus === 1" src="../../static/img/member_icon.png" style="margin-right:5px" />
<img title="未认证" v-if="memberInfo.authStatus === 0" src="../../static/img/member_icon_gray.png" style="margin-right:5px" />
</div>
</div>
<p class="member-detal-info">
......@@ -37,7 +37,7 @@
<p>消费次数</p>
</div>
<div class="singelinfo-costitem">
<p class="no-wrap">{{ memberInfo.lastCostTime || '--' }}</p>
<p class="no-wrap">{{ memberInfo.lastCost || 0 }}</p>
<p>最近消费</p>
</div>
</div>
......@@ -46,7 +46,7 @@
<div class="singelinfo-jl">
<a class="singelinfo-jlitem">消费记录 ({{ memberInfo.numOfSale }})</a>
<a class="singelinfo-jlitem">营销记录 ({{ memberInfo.numOfmarket }})</a>
<a class="singelinfo-jlitem">卡券记录 ({{ memberInfo.numOfCard }})</a>
<a class="singelinfo-jlitem">卡券记录 ({{ memberInfo.couponCount }})</a>
</div>
</div>
<div slot="reference" style="width:200px;">
......
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