From 4ac3c2382e0733685f7612f8e9ca4e85d15c1411 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期日, 25 六月 2023 08:55:00 +0800
Subject: [PATCH] Merge branch 'hotfix/苹果审核修改'
---
uniapp/pages/goods/goodsDetail.vue | 68 ++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 24 deletions(-)
diff --git a/uniapp/pages/goods/goodsDetail.vue b/uniapp/pages/goods/goodsDetail.vue
index b06bed0..f635732 100644
--- a/uniapp/pages/goods/goodsDetail.vue
+++ b/uniapp/pages/goods/goodsDetail.vue
@@ -75,25 +75,26 @@
</view>
</view>
<view class="vip-info-container rowCenBet" v-if="!showtar || platform!='iOS'">
- <view class="left-info" v-if="user.level != 3">
- 鐜板湪鍗囩骇鎴愪负{{pageInfo.topLevelName}},绔嬪嵆璧歿{pageInfo.topFanli}}鍏�
- </view>
- <view class="left-info" v-else>
- 鎮ㄥ凡缁忔槸鏈�楂樼瓑绾�,蹇幓閭�璇峰ソ鍙嬭禋浣ｉ噾鍚�!
- </view>
+
+ <view class="left-info" v-if="user.level != 3">
+ 鐜板湪鍗囩骇鎴愪负{{pageInfo.topLevelName}},绔嬪嵆璧歿{pageInfo.topFanli}}鍏�
+ </view>
+ <view class="left-info" v-else>
+ 鎮ㄥ凡缁忔槸鏈�楂樼瓑绾�,蹇幓閭�璇峰ソ鍙嬭禋浣ｉ噾鍚�!
+ </view>
- <view class="rt-btn rowCenCen" @tap="golevelRules()" v-if="user.level != 3">
- <image class="vipimg" src="../../static/images/goods/vip.png" mode="aspectFill"></image>
- <view class="level-txt">
- 绔嬪嵆鍗囩骇
- </view>
- </view>
- <view class="rt-btn rowCenCen" @tap="golevelRules()" v-else>
- <image class="vipimg" src="../../static/images/goods/vip.png" mode="aspectFill"></image>
- <view class="level-txt">
- 绔嬪嵆鏌ョ湅
- </view>
- </view>
+ <view class="rt-btn rowCenCen" @tap="golevelRules()" v-if="user.level != 3">
+ <image class="vipimg" src="../../static/images/goods/vip.png" mode="aspectFill"></image>
+ <view class="level-txt">
+ 绔嬪嵆鍗囩骇
+ </view>
+ </view>
+ <view class="rt-btn rowCenCen" @tap="golevelRules()" v-else>
+ <image class="vipimg" src="../../static/images/goods/vip.png" mode="aspectFill"></image>
+ <view class="level-txt">
+ 绔嬪嵆鏌ョ湅
+ </view>
+ </view>
</view>
<view class="quanWrap" v-if="optionsInfo.couponPrice>0 || pageInfo.couponPrice>0">
<image src="../../static/images/goods/qbg.png" mode='aspectFit' class="quanBg"></image>
@@ -186,10 +187,7 @@
<image class="detailpic" :src="items" mode="widthFix"></image>
</block>
</view>
-
</view>
-
-
<view class="bottombox">
</view>
<view class="footerWrap rowSta">
@@ -215,7 +213,7 @@
</view>
</view>
- <view class="right-container rowCen borderBox">
+ <!-- <view class="right-container rowCen borderBox" v-if="!showtar || platform!='iOS'">
<view class="leftsharebox btnbox colCenCen" @tap="goPath()">
<view class="priceText">
锟{optionsInfo.fanli}}
@@ -235,7 +233,29 @@
璐拱杩�
</view>
</view>
- </view>
+ </view> -->
+
+ <view class="right-container rowCen borderBox">
+ <view class="leftsharebox btnbox colCenCen" style="background: #ffb030;" @tap="goPath()">
+ <view class="priceText">
+ 锟{optionsInfo.fanli}}
+ </view>
+ <view class="texttips">
+ 鍒嗕韩璧�
+ </view>
+ </view>
+ <view class="rightbackbox btnbox colCenCen" style="background: #fe0350;" @tap="getCouponUrl()">
+ <view v-if="frompage=='freebuy'" class="priceText">
+ 锟{optionsInfo.actualPrice}}
+ </view>
+ <view v-else class="priceText">
+ 锟{optionsInfo.fanli}}
+ </view>
+ <view class="texttips">
+ 璐拱杩�
+ </view>
+ </view>
+ </view>
</view>
</view>
<!-- taobao -->
@@ -987,7 +1007,7 @@
border-radius: 5rpx;
padding: 0 20rpx;
margin-bottom: 20rpx;
-
+
.left-info {
font-size: 24rpx;
font-weight: 500;
--
Gitblit v1.9.3