Merge branch 'release/v1.1.3发布'

zhaojs

2023-06-30 ba3d748f9eb65a66fca9bd74fc7796b90a0a70ae

 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 -->
@@ -335,9 +355,19 @@
        this.pageType = this.optionsInfo.sourceType ? this.optionsInfo.sourceType : 'tb';
        this.faction = this.optionsInfo.faction ? this.optionsInfo.faction : 't';
      } else {
        console.log(options);
        this.optionsInfo = JSON.parse(options.info);
        this.pageInfo = JSON.parse(options.info);
      console.log(options);
      if(options.sourcefrom)
      {
         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';
@@ -389,6 +419,11 @@
      getPageInfo(e) {
        var that = this;
        if (this.faction == 'j') {
         var loinf={
            goodsId: this.optionsInfo.goodsId,
            goods: JSON.stringify(this.optionsInfo)
          }
         console.log(loinf)
          this.$u.api.getJdsDetail({
            goodsId: this.optionsInfo.goodsId,
            goods: JSON.stringify(this.optionsInfo)
@@ -984,7 +1019,7 @@
        border-radius: 5rpx;
        padding: 0 20rpx;
        margin-bottom: 20rpx;

		
        .left-info {
          font-size: 24rpx;
          font-weight: 500;