Commit 501a973d by huaying

Merge branch 'feature/6月迭代-抖音' into test

parents 9405adb8 9cd65180
......@@ -390,14 +390,14 @@
<span class="score-detail-label">
不可用积分
<el-tooltip content="不可用原因:积分为冻结/预扣状态,详情可查看客户日志" placement="top">
<i class="iconfont icon-QuestionCircleOutlined" style="font-size: 12px;color: #909399"/>
<i class="iconfont icon-QuestionCircleOutlined" style="font-size: 14px;color: #606266"/>
</el-tooltip>
</span>
<span class="score-detail-value">{{ memberInfo.invalidIntegral ? memberInfo.invalidIntegral : 0 }}</span>
</p>
</div>
</div>
<i class="el-icon-arrow-right"></i>
<i class="el-icon-arrow-right" style="font-size: 16px;color: #909399"></i>
</div>
<div class="cards-box">
<div class="card-item" @click="goLink('/cardvoucher')">
......@@ -406,7 +406,7 @@
<i class="iconfont icon-01_kaquanguanli"></i>
</div>
</icon-label-value>
<i class="el-icon-arrow-right"></i>
<i class="el-icon-arrow-right" style="font-size: 16px;color: #909399"></i>
</div>
<div :class="['balance-item', { 'has-balance': memberInfo.storedValueFlag }]" @click="goStoreValue">
<icon-label-value label="储值余额" :value="memberInfo.storedValue ? memberInfo.storedValue : 0">
......@@ -414,7 +414,7 @@
<i class="iconfont icon-chuzhizhanghu"></i>
</div>
</icon-label-value>
<i v-if="memberInfo.storedValueFlag" class="el-icon-arrow-right"></i>
<i v-if="memberInfo.storedValueFlag" class="el-icon-arrow-right" style="font-size: 16px;color: #909399"></i>
</div>
</div>
</div>
......@@ -427,7 +427,7 @@
<i :class="['iconfont', item.icon]"></i>
</div>
</icon-label-value>
<i class="el-icon-arrow-right"></i>
<i class="el-icon-arrow-right" style="font-size: 16px;color: #909399"></i>
</div>
<div v-else :key="index" class="order-item" @click="goLink(item.path)">
<div class="order-item-label">{{ item.label }}</div>
......@@ -451,7 +451,7 @@
<div class="label">
{{ item.label }}
<el-tooltip v-if="item.key == 'numOfMarket'" content="只统计近半年的数据" placement="top">
<i class="iconfont icon-QuestionCircleOutlined" style="color: #909399" />
<i class="iconfont icon-QuestionCircleOutlined" style="font-size: 14px;color: #606266" />
</el-tooltip>
</div>
<div class="num">
......@@ -474,7 +474,7 @@
</div>
</div>
</div>
<div class="el-icon-arrow-right" />
<div class="el-icon-arrow-right" style="font-size: 16px;color: #909399"/>
</li>
</ul>
</div>
......
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