Merge branch 'hotfix/苹果审核修改'

zhaojs

2023-06-25 4ac3c2382e0733685f7612f8e9ca4e85d15c1411

 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}}
@@ -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,
@@ -296,6 +320,7 @@
        platform: '',
        inviteCodeShow: 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元购的记录商品id
        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;