From e5f21e8972f2870d5fa5dbf9e947b285fc4660fb Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期日, 25 六月 2023 08:53:39 +0800
Subject: [PATCH] no message

---
 uniapp/pages/goods/goodsDetail.vue |  105 +++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 79 insertions(+), 26 deletions(-)

diff --git a/uniapp/pages/goods/goodsDetail.vue b/uniapp/pages/goods/goodsDetail.vue
index 65d6aa6..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>
-          鎮ㄥ凡缁忔槸鏈�楂樼瓑绾�,蹇幓閭�璇峰ソ鍙嬭禋浣i噾鍚�!
-        </view>
+	
+			<view class="left-info" v-if="user.level != 3">
+			  鐜板湪鍗囩骇鎴愪负{{pageInfo.topLevelName}},绔嬪嵆璧歿{pageInfo.topFanli}}鍏�
+			</view>
+			<view class="left-info" v-else>
+			  鎮ㄥ凡缁忔槸鏈�楂樼瓑绾�,蹇幓閭�璇峰ソ鍙嬭禋浣i噾鍚�!
+			</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}}
@@ -225,14 +223,39 @@
             </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">
               璐拱杩�
             </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 -->
@@ -263,6 +286,7 @@
   import pddEmpower from '../../components/pddempower.vue'
   import inviteCodeModel from '../../components/inviteCode.vue'
   import inviterModel from '../../components/inviterModel.vue'
+   
   export default {
     components: {
       empowerModel,
@@ -295,7 +319,8 @@
         showtar: false,
         platform: '',
         inviteCodeShow: false,
-        inviterShow: false
+        inviterShow: false,
+		frompage:'',
       };
     },
     onPageScroll(e) {
@@ -305,6 +330,17 @@
       if (this.memberId) {
         this.updataUser()
       }
+	  
+	  if(!getApp().globalData.hasinit)
+	  {
+		  console.log("鍒濆鍖�")
+	  	getApp().getAppInfo();
+	  }
+	  //console.log("2222222222222222-"+getApp().globalData.hasbcinit);
+	  if(!getApp().globalData.hasbcinit)
+	  {
+		  getApp().bcInit();
+	  }
     },
     onLoad(options) {
       this.appinfo = utils.getCacheSync('appInfo')
@@ -312,6 +348,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';
@@ -501,6 +541,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
@@ -553,10 +594,22 @@
           goodsId: this.optionsInfo.goodsId,
           type: 0
         }).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
+		 
           if (plus.runtime.isApplicationExist({
               pname: 'com.taobao.taobao',
               action: 'taobao://'
@@ -954,7 +1007,7 @@
         border-radius: 5rpx;
         padding: 0 20rpx;
         margin-bottom: 20rpx;
-
+		
         .left-info {
           font-size: 24rpx;
           font-weight: 500;

--
Gitblit v1.9.3