From 69ea24e8fdfb41fc48c3fdb8c444645c13b1bbc4 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期六, 10 六月 2023 13:56:17 +0800
Subject: [PATCH] Merge branch 'release/1.1.2发布'
---
uniapp/pages/goods/goodsDetail.vue | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/uniapp/pages/goods/goodsDetail.vue b/uniapp/pages/goods/goodsDetail.vue
index c0ac99a..b06bed0 100644
--- a/uniapp/pages/goods/goodsDetail.vue
+++ b/uniapp/pages/goods/goodsDetail.vue
@@ -225,7 +225,10 @@
</view>
</view>
<view class="rightbackbox btnbox colCenCen" @tap="getCouponUrl()">
- <view class="priceText">
+ <view v-if="frompage=='freebuy'" class="priceText">
+ 锟{optionsInfo.actualPrice}}
+ </view>
+ <view v-else class="priceText">
锟{optionsInfo.fanli}}
</view>
<view class="texttips">
@@ -296,7 +299,8 @@
showtar: false,
platform: '',
inviteCodeShow: false,
- inviterShow: false
+ inviterShow: false,
+ frompage:'',
};
},
onPageScroll(e) {
@@ -312,6 +316,7 @@
console.log("鍒濆鍖�")
getApp().getAppInfo();
}
+ //console.log("2222222222222222-"+getApp().globalData.hasbcinit);
if(!getApp().globalData.hasbcinit)
{
getApp().bcInit();
@@ -323,6 +328,10 @@
this.showtar = getApp().globalData.ifwt == 1 ? false : true;
this.platform = plus.os.name
// #endif
+ if(options.frompage)
+ {
+ this.frompage=options.frompage;
+ }
if (options.id) {
this.optionsInfo.goodsId = options.id
this.pageType = this.optionsInfo.sourceType ? this.optionsInfo.sourceType : 'tb';
@@ -512,6 +521,7 @@
console.log(this.pageType)
if (this.pageType == 'tb' || this.pageType == 'tmshop' || this.pageType == 'tm') {
if (this.user.tb_account) {
+
this.getTbsrc()
} else {
this.empowerModel = true
@@ -566,6 +576,16 @@
}).then(e => {
console.log(e)
if (e.code != 0) return that.$alert(e.msg)
+ if(that.frompage=='freebuy')
+ {//0鍏冭喘鐨勮褰曞晢鍝乮d
+ console.log(e.data.info.itemId);
+ this.$u.api.updateFirstFreeBrowse({
+ goodsid:that.optionsInfo.goodsId,
+ new_goodsId:e.data.info.itemId
+ }).then(e=>{
+
+ });
+ }
var res = e.data.info;
var tburl = res.shortUrl
// #ifdef APP-PLUS
--
Gitblit v1.9.3