合并

MrShi

18 小时以前 e4f9739d74323aacf09d139700f22a383910ee97

 mini-program/pages/index/index.vue

@@ -10,7 +10,7 @@
            </view>
         </view>
         <view class="search" @click="jumpSearch">
            <u-search placeholder="请输入商   品名称搜索" disabled height="36" searchIconColor="#999999" borderColor="#eeeeee"
            <u-search placeholder="请输入商品名称搜索" disabled height="36" searchIconColor="#999999" borderColor="#eeeeee"
               bgColor="rgba(255,255,255,0.9)" :showAction="false" />
         </view>
         <view class="banner">
@@ -118,16 +118,20 @@
                     </view>
                  </view>
                  <view class="commodity-item-shou">
                     <text>已售{{item.saleNum + item.realSaleNum}}</text>
<<<<<<< HEAD
                     <text>已售{{item.shou}}</text>
=======
                     <text>已售{{(item.saleNum||0) + (item.realSaleNum||0)}}</text>
>>>>>>> 7b09a9950f13521190a4aef9bbc2a6163445566c
                     <view class="commodity-item-shou-add" @click.stop="addCard(item)">+</view>
                  </view>
               </view>
            </view>
         </view>
      </view>
      <view class="dingwei" v-if="isShow">
      <view class="dingwei" v-if="!position">
         <view class="dingwei-left">
            <text>未授权定位</text>
            <text>未获取定位信息</text>
            <text>我们无法获得您当前位置信息为您推荐附近经销商</text>
         </view>
         <view class="dingwei-btn" @click="goToAppSetting">开启定位</view>
@@ -276,6 +280,7 @@
               if (res.code === 200) {
                  res.data.records.forEach(item => {
                     item.minPrice = item.minPrice.toFixed(2).split('.')
                     item.shou = (item.salenum || 0) + (item.realSaleNum || 0)
                  })
                  this.goodsList.push(...res.data.records)
                  this.page++
@@ -564,9 +569,9 @@
                  display: flex;
                  align-items: center;
                  justify-content: center;

                  image {
                     width: 100%;
                      width: 100%;
                     height: 330rpx;
                  }
               }

@@ -576,6 +581,11 @@
                  box-sizing: border-box;

                  .commodity-item-box-title {
                     width: 100%;
                     display: -webkit-box;
                     -webkit-box-orient: vertical;
                     -webkit-line-clamp: 2;
                     overflow: hidden;
                     font-weight: 600;
                     font-size: 30rpx;
                     color: #222222;