From cf1973556ff35a0798436aa63d90f2cc8a2f53ba Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 06 七月 2023 15:25:15 +0800
Subject: [PATCH] no message

---
 uniapp/pages/goods/goodsDetail.vue |  145 +++++++++++++++++++++++++++++++++++++----------
 1 files changed, 113 insertions(+), 32 deletions(-)

diff --git a/uniapp/pages/goods/goodsDetail.vue b/uniapp/pages/goods/goodsDetail.vue
index 058a56d..2d1c6e3 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">
@@ -214,8 +212,10 @@
             </view>
           </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 +235,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 -->
@@ -256,6 +278,12 @@
     <u-popup v-model="inviterShow" mode="center" border-radius="32" v-if="inviterShow" :mask-close-able='true'>
       <inviter-model ref='invitermodel' @rewrite='rewriteCode' @setInvite='setCodebtn'></inviter-model>
     </u-popup>
+	<uni-popup ref="popup_pddtip" type="center">
+		<view class="pdd_pop_contant">
+			<view class="pdd_pop_title">姣斾环璁㈠崟</view>
+			<view class="pdd_pop_text">鏈鑷喘娑夊強姣斾环琛屼负锛岃嚜璐敹鐩婁负0锛屽缓璁厛鏀惰棌璇ュ晢鍝侊紝2灏忔椂鍊欓�氳繃澶ц繑瀹榓pp璐拱锛屽彲姝e父鑾峰彇瀵瑰簲鏀剁泭銆�</view>
+		</view>
+	</uni-popup>
   </view>
 </template>
 
@@ -301,6 +329,7 @@
         inviteCodeShow: false,
         inviterShow: false,
 		frompage:'',
+		isshowpdd:false
       };
     },
     onPageScroll(e) {
@@ -320,6 +349,12 @@
 		  getApp().bcInit();
 	  }
     },
+	 onReady(){
+		 if(this.isshowpdd)
+		 {
+			this.$refs.popup_pddtip.open();
+		 }
+	},
     onLoad(options) {
       this.appinfo = utils.getCacheSync('appInfo')
       // #ifdef APP-PLUS
@@ -331,19 +366,36 @@
 		  this.frompage=options.frompage;
 	  }
       if (options.id) {
-		
         this.optionsInfo.goodsId = options.id
         this.pageType = this.optionsInfo.sourceType ? this.optionsInfo.sourceType : 'tb';
         this.faction = this.optionsInfo.faction ? this.optionsInfo.faction : 't';
       } else {
-        this.optionsInfo = JSON.parse(options.info);
-		console.log(this.optionsInfo);
-        this.pageInfo = JSON.parse(options.info);
+		console.log(options);
+		if(options.sourcefrom)
+		{
+			console.log(decodeURIComponent(options.info));
+			this.optionsInfo = JSON.parse(decodeURIComponent(options.info));
+			this.pageInfo = JSON.parse(decodeURIComponent(options.info));
+			console.log(this.optionsInfo)
+		}
+		else
+		{
+			this.optionsInfo = JSON.parse(options.info);
+			this.pageInfo = JSON.parse(options.info);
+		}
+        
         this.pageType = this.optionsInfo.sourceType;
         if (!this.optionsInfo.faction) {
           if (this.pageType == 'tb' || this.pageType == 'tm' || this.pageType == 'tmshop') this.faction = 't';
           if (this.pageType == 'jd') this.faction = 'j';
-          if (this.pageType == 'pdd') this.faction = 'p';
+          if (this.pageType == 'pdd') 
+		  {
+			  this.faction = 'p';
+			  if(options.proform&&options.proform=="clipboard")
+			  {//鏉ヨ嚜鍓创鏉�
+				  this.isshowpdd=true;
+			  }
+		  }
           if (this.pageType == 'wph') this.faction = 'w';
 		   if (this.pageType == 'dy') this.faction = 'd';
         } else {
@@ -394,6 +446,7 @@
             goodsId: this.optionsInfo.goodsId,
             goods: JSON.stringify(this.optionsInfo)
           }).then(e => {
+			  console.log(e)
             var res = e.data.detailPics;
             this.JdDetails = that.JdDetails.concat(res)
             that.$forceUpdate()
@@ -522,7 +575,6 @@
             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
@@ -576,10 +628,11 @@
           if (e.code != 0) return that.$alert(e.msg)
 		  if(that.frompage=='freebuy')
 		  {//0鍏冭喘鐨勮褰曞晢鍝乮d
-		  console.log(e.data.info.itemId);
+		    console.log(e.data.info.itemId);
 		  	this.$u.api.updateFirstFreeBrowse({
 		  		goodsid:that.optionsInfo.goodsId,
-		  		new_goodsId:e.data.info.itemId
+		  		new_goodsId:e.data.info.itemId,
+				plateform:'tb'
 		  	}).then(e=>{
 		  		
 		  	});
@@ -701,6 +754,16 @@
 	    }).then(e => {
 	      var res = e.data.info;
 		  console.log(res)
+		  if(that.frompage=='freebuy')
+		  {//0鍏冭喘鐨勮褰曞晢鍝乮d
+		  	this.$u.api.updateFirstFreeBrowse({
+		  		goodsid:that.optionsInfo.goodsId,
+		  		new_goodsId:that.optionsInfo.goodsId,
+				plateform:'dy'
+		  	}).then(e=>{
+		  		
+		  	});
+		  }
 	      // #ifdef APP-PLUS
 	      plus.runtime.openURL(res.dy_deeplink, e => {
 	        uni.navigateTo({
@@ -814,6 +877,24 @@
   }
 </style>
 <style lang="scss" scoped>
+	.pdd_pop_contant{
+		background-color: rgb(255, 255, 255);
+		    padding: 40rpx;
+		    width: 80%;
+			margin:0 auto;
+		    border-radius: 20rpx;
+		.pdd_pop_title
+		{
+			text-align: center;
+			margin-bottom: 30rpx;
+			font-size: 18px;
+		}
+		.pdd_pop_text
+		{
+			margin-bottom: 30rpx;
+			color: #868080;
+		}
+	}
   .container {
     .flexbox {
       position: fixed;
@@ -985,7 +1066,7 @@
         border-radius: 5rpx;
         padding: 0 20rpx;
         margin-bottom: 20rpx;
-
+		
         .left-info {
           font-size: 24rpx;
           font-weight: 500;

--
Gitblit v1.9.3