Merge branch 'v2' of http://47.96.225.205:8888/r/hmy_farmer-main into v2

陶杰

2024-09-08 2ddf143b4b497508b528b3a7bd766f628e9a2c26

 sub_pages/customer/trade/detail.vue

@@ -9,17 +9,25 @@
               <swiper-item v-if="dto.video">

                  <video :src="dto.video" class="top-img" :auto-pause-if-navigate="true"

                     style="display: block;margin: 0 auto;"></video>



                  <view class="index-tag">

                     1/{{(dto.video&&1||0)+(dto.cover&&1||0)+(dto.bannerList&&dto.bannerList.length||0)}}

                  </view>

               </swiper-item>

               <swiper-item v-for="(url, index) in dto.bannerList" :key="index">

                  <image class="top-img" :lazy-load="true" mode="scaleToFill" @click="previewImg(url)"

                     :src="url">

                  <image class="top-img" :lazy-load="true" mode="scaleToFill" @click="previewImg(url)" :src="url">

                  </image>

                  <view class="index-tag">

                     {{index+1+(dto.video&&1)}}/{{(dto.video&&1||0)+(dto.cover&&1||0)+(dto.bannerList&&dto.bannerList.length||0)}}

                  </view>

               </swiper-item>



               <swiper-item>

                  <image :src="dto.cover" :lazy-load="true" @click="previewImg(dto.cover)" class="top-img" mode="scaleToFill">

                  <image :src="dto.cover" :lazy-load="true" @click="previewImg(dto.cover)" class="top-img"

                     mode="scaleToFill">

                  </image>

                  <view class="index-tag">

                     {{(dto.bannerList&&dto.bannerList.length||0)+1+(dto.video&&1||0)}}/{{(dto.video&&1||0)+(dto.cover&&1||0)+(dto.bannerList&&dto.bannerList.length||0)}}

                  </view>

               </swiper-item>





@@ -49,8 +57,17 @@
               {{ dto.name || '-' }}

            </view>

         </view>



         <view class="tags" v-if="dto.tags||false">

            <!-- <view class="tag red">限时抢购</view> -->

            <!-- <view class="tag green">品质严选</view> -->

            <view class="tag red" v-for="(tag,k) of dto.tagArr" :class="[k===0?'red':'green']" :key="tag">{{

              tag

            }}

            </view>

         </view>

         <view class="desc m-t-12">

            <view class="m-r-15">已售:{{ dto.sales || 0 }}</view>

            <view class="m-r-15">已售:{{ ((dto.sales||0) +(dto.realSales||0)) || 0 }}</view>

            <view class="m-r-15">剩余:{{ dto.stock || 0 }}</view>

            <view class=" ">{{ dto.unit || '-' }}</view>

         </view>

@@ -202,7 +219,7 @@
         }

         this.refreshShopNum()

      },

      onLoad(options) {

      async onLoad(options) {

         console.log('trade detail options', options)

         this.id = options.id || ''



@@ -212,22 +229,24 @@
            let tmp = this

            tmp.sharePartnerUserId = options.partnerUserId

            //合伙人绑定的，判断当前用户，是否有登录,登录没绑定，没登录先缓存合伙人id，等注册和登录时候再弄

            setTimeout(() => {

               //并且当前用户没有绑定

               if (tmp.currentInfo.id && tmp.currentInfo.customerDTO.partnerId) {

                  return

               }

               if (tmp.currentInfo.id) {

                  tmp.bindPartnerUser(options.partnerUserId, '')

               } else {

                  tmp.sharePartnerUserId = options.partnerUserId

                  //没有登录到话设置到缓存

                  if (tmp.sharePartnerUserId) {

                     tmp.$storage.setItem('cache_sharePartnerUserId', tmp.sharePartnerUserId)

                  }

               }

            // setTimeout(() => {

            //并且当前用户没有绑定

            if (tmp.currentInfo.id && tmp.currentInfo.customerDTO.partnerId) {

					
            }else{
               if (tmp.currentInfo.id) {
                  await tmp.bindPartnerUser(options.partnerUserId, '')
               } else {
                  tmp.sharePartnerUserId = options.partnerUserId
                  //没有登录到话设置到缓存
                  if (tmp.sharePartnerUserId) {
                     tmp.$storage.setItem('cache_sharePartnerUserId', tmp.sharePartnerUserId)
                  }
               }
            }

					


            }, 1000)

            // }, 1000)

         }

         // #endif

         if (this.id) {

@@ -441,6 +460,11 @@
               if (!this.dto.bannerList) {

                  this.dto.bannerList = []

               }

               if (this.dto.tags) {

                  this.dto.tagArr = this.dto.tags.split(",") || []

               } else {

                  this.dto.tagArr = []

               }

            }



            this.$message.hideLoading()

@@ -529,6 +553,19 @@
         swiper-item {

            background-color: #fff;

            border-radius: 8rpx;

            position: relative;



            .index-tag {

               position: absolute;

               color: #fff;

               font-size: 22rpx;

               right: 10rpx;

               bottom: 10rpx;

               padding: 10rpx 20rpx;

               text-align: center;

               background-color: #545454;

               border-radius: 30rpx;

            }

         }

      }



@@ -551,6 +588,31 @@
         padding: 46rpx 30rpx;

         border-radius: 40rpx 40rpx 0rpx 0rpx;



         .tags {

            margin-top: 12rpx;

            display: flex;



            .tag {
               // min-width: 60rpx;
               padding-left: 10rpx;
               padding-right: 10rpx;
               line-height: 30rpx;
               background: #FEE6E6;
               border-radius: 10rpx;
               font-size: 18rpx;
               color: #CD1212;
               margin-right: 6rpx;
               text-align: center;
            }
				
            .tag.green {
               color: rgba(110, 159, 102, 1);
               background: rgba(202, 229, 214, 1);
               border-radius: 10rpx;
               // opacity: 0.57;
            }

         }



         .title {

            font-weight: 600;

            font-size: 36rpx;