Merge branch 'feature/1.1.3版本开发' into develop

zhaojs

2023-06-28 9ea0383c303620cd019d0776ecbb47f52bcef805

 uniapp/pages/goods/goodsDetail.vue

@@ -28,8 +28,8 @@
        <view class="pagetopBar-container colCen">
          <view class="topbarbox"></view>
        </view>
        <view class="currentbox rowCenCen" v-if="optionsInfo.imageList || pageInfo.showImgs">
          <view>{{currentIndex+1}}/{{pageType=='jd'?optionsInfo.imgs.length:pageInfo.showImgs.length}}</view>
        <view class="currentbox rowCenCen" v-if="pageInfo.imgs&&pageInfo.imgs.length>0">
          <view>{{currentIndex+1}}/{{pageInfo.imgs.length}}</view>
        </view>
      </view>
    </view>
@@ -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 -->
@@ -297,6 +320,7 @@
        platform: '',
        inviteCodeShow: false,
        inviterShow: false,
      frompage:'',
      };
    },
    onPageScroll(e) {
@@ -309,10 +333,8 @@
     
     if(!getApp().globalData.hasinit)
     {
        console.log("初始化")
        getApp().getAppInfo();
     }
     //console.log("2222222222222222-"+getApp().globalData.hasbcinit);
     if(!getApp().globalData.hasbcinit)
     {
        getApp().bcInit();
@@ -324,13 +346,28 @@
      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';
        this.faction = this.optionsInfo.faction ? this.optionsInfo.faction : 't';
      } else {
        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';
@@ -369,6 +406,10 @@
      } else if (this.pageType == 'wph') {

      }
     else if(this.pageType=='dy')
     {
        //this.optionsInfo.imgs=[]
     }
    },
    methods: {
      closeMdl() {
@@ -378,11 +419,15 @@
      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)
          }).then(e => {
            console.log(e);
            var res = e.data.detailPics;
            this.JdDetails = that.JdDetails.concat(res)
            that.$forceUpdate()
@@ -392,19 +437,16 @@
          this.$u.api.getGoodsDetail({
            goodsId: this.optionsInfo.goodsId
          }).then(e => {
            console.log(e)
            if (e.code != 0) return that.$alert(e.msg)
            var res = e.data.info;
            this.pageInfo = res
            this.pageInfo.showImgs = []
            console.log(this.pageInfo)
            this.pageInfo.imgs.map(items => {
              var a = {}
              a.url = items
              this.pageInfo.showImgs.push(a)
            })
            this.optionsInfo = res
            console.log(this.pageInfo);
          }).catch(function(err) {})
        } else if (this.faction == 'p') {
          var that = this;
@@ -428,13 +470,14 @@
              a.url = items
              this.pageInfo.showImgs.push(a)
            })
            console.log(this.pageInfo);
          })
        }else if(this.faction == 'd'){
         console.log(this.optionsInfo.goodsId);
         var that = this;
         this.$u.api.getDyGoodsDetail({
           goodsId: this.optionsInfo.goodsId
         }).then(e => {
            console.log(e);
           var res = e.data.info;
           this.pageInfo = res
           that.optionsInfo.imgs = that.pageInfo.imgs;
@@ -513,6 +556,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
@@ -550,12 +594,10 @@
      },
      
      updataUser() {
        console.log('更新')
        var that = this;
        this.$u.api.getUserInfo({}).then(e => {
          utils.setCache('userInfo', e.data.userinfo)
          that.user = e.data.userinfo;
          console.log(that.user)
        }).catch(function(err) {})
      },

@@ -565,8 +607,17 @@
          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
@@ -968,7 +1019,7 @@
        border-radius: 5rpx;
        padding: 0 20rpx;
        margin-bottom: 20rpx;

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