Merge branch 'feature/商品商城优化' into dev

This commit is contained in:
mengxiaolong
2020-09-08 15:18:00 +08:00

View File

@@ -42,9 +42,6 @@
<span @click.stop="enterProtocol">国富客户权益卡简介</span>
</van-radio>
</van-radio-group>
<van-button v-if="isWeixin" :disabled="!isCanCheck1 || !isCanCheck2" class="btn-bottom" type="danger" @click="check" v-no-more-click="1000"
>查看</van-button
>
</div>
</div>
</div>
@@ -52,7 +49,9 @@
<div v-else>
<img id="detailImg" v-if="detailImg" :src="$assetsUrl + detailImg" />
</div>
<van-button class="bottom-btn" v-if="isWeixin && bottomBtnShow" type="danger" @click="forward" v-no-more-click="1000">查看</van-button>
<van-button class="bottom-btn" :disabled="!isCanCheck1 || !isCanCheck2" v-if="isWeixin && bottomBtnShow" type="danger" @click="check" v-no-more-click="1000"
>查看</van-button
>
<van-button class="bottom-btn" v-if="!isWeixin && bottomBtnShow" type="danger" @click="forward" v-no-more-click="1000">一键转发</van-button>
<!-- <van-popup v-model="pdfPop" closeable position="bottom">
<div style="height:80%">