修复bug

pages/store/home/index.vue

@@ -5,8 +5,7 @@
 
       <view class="head-menu">
         <view class="iconfont icon-xiangzuo" @click="goback" style="color: #fff;"></view>
-				<navigator :url="'/pages/store/list/index?mer_id='+id" hover-class="none"
+        <navigator :url="'/pages/store/list/index?mer_id='+id" hover-class="none" class="search iconfont icon-xiangyou">
-					class="search iconfont icon-xiangyou">
           <text class="iconfont icon-sousuo"></text>
           <text class="search-txt">搜索商品名称</text>
           <text class="search-btn">搜索</text>
@@ -32,15 +31,16 @@
             <view class="star">
               <u-rate readonly count="5" :value="score.star" size="12" activeColor="#FFBC21"
                 inactiveColor="transparent"></u-rate>
-							<text
+              <text style="color:#FFBC21;font-size: 12px;margin: 0 10rpx 0 4rpx;">{{ score.number.toFixed(1) }}</text>
-								style="color:#FFBC21;font-size: 12px;margin: 0 10rpx 0 4rpx;">{{ score.number.toFixed(1) }}</text>
             </view>
             <view class="shop-info-sale">月销{{store.sales}}+</view>
             <view v-if="store.services_type == 0" class="iconfont icon-kefu3" @click="goService"></view>
             <view v-else-if="store.services_type == 1" class="iconfont icon-kefu3" @click="call(1)"></view>
             <view v-else class="iconfont icon-kefu3" @click="call(0)"> </view>
           </view>
-					<view class="shop-info-runtime">营业时间 : 90:00－21:00</view>
+          <view class="shop-info-runtime" v-if="store.mer_info&&store.mer_info.mer_take_time">营业时间 :
+            {{ store.mer_info.mer_take_time[0] + ' - ' + store.mer_info.mer_take_time[1] }}</view>
+          <view class="shop-info-runtime" v-else>营业时间 : {{ '00:00 - 00:00' }}</view>
           <view class="shop-info-addr iconfont iconfont-xiangyou" @click="showMaoLocation">
             <text>{{store.mer_address}}</text>
             <u-icon name="arrow-right" :size="12" color="#fff"></u-icon>
@@ -95,8 +95,8 @@
           <!-- #ifdef H5 -->
           <view v-for="(item, index) in styleConfig" :key="index">
             <block v-if="item.name != 'headerSerch' && item.name != 'tabNav'">
-							<component :is="item.name" :index="index" :dataConfig="item" :merId="id"
+              <component :is="item.name" :index="index" :dataConfig="item" :merId="id" @detail="goGoodsDetail">
-								@detail="goGoodsDetail"></component>
+              </component>
             </block>
             </block>
           </view>
@@ -111,8 +111,8 @@
               <combination v-if="item.name == 'combination'" :merId="id" :dataConfig="item"></combination>
               <topic v-if="item.name == 'topic'" :merId="id" :dataConfig="item"></topic>
               <coupon v-if="item.name == 'coupon'" :merId="id" :dataConfig="item"></coupon>
-							<goodList v-if="item.name == 'goodList'" :merId="id" :dataConfig="item"
+              <goodList v-if="item.name == 'goodList'" :merId="id" :dataConfig="item" @detail="goGoodsDetail">
-								@detail="goGoodsDetail"></goodList>
+              </goodList>
               <guide v-if="item.name == 'guide'" :merId="id" :dataConfig="item"></guide>
               <liveBroadcast v-if="item.name == 'liveBroadcast'" :merId="id" :dataConfig="item">
               </liveBroadcast>
@@ -134,10 +134,9 @@
           <!-- 商品 -->
           <view v-if="goods.length" class="goods-wrap" id="goods" @touchmove="onTouchmove">
             <view v-if="isColumn" class="goods column">
-							<view v-for="item in goods" :key="item.product_id" class="item"
+              <view v-for="item in goods" :key="item.product_id" class="item" @click="goGoodsDetail(item)">
-								@click="goGoodsDetail(item)">
+                <view class="image" style="width: 180rpx;height: 180rpx;">
-								<view class="image">
+                  <image style="width: 100%;height: 100%;" :src="item.image" lazy-load></image>
-									<easy-loadimage mode="widthFix" :image-src="item.image"></easy-loadimage>
                   <view v-if="item.stock == 0" class="sell_out">已售罄</view>
                   <view v-if="item.border_pic" :style="{ backgroundImage: `url(${item.border_pic})` }"
                     class="border-picture"></view>
@@ -160,8 +159,7 @@
 
                   <view class="price">
                     <view class="price-num">
-											<text class="unit-price">¥{{ item.price }}</text><text
+                      <text class="unit-price">¥{{ item.price }}</text><text class="unit-name">/份</text>
-												class="unit-name">/份</text>
                     </view>
                     <view class="price-icon iconfont icon-gouwuche"></view>
                   </view>
@@ -1147,6 +1145,9 @@
         }, 500)
       }
     },
+    onPageScroll() {
+      uni.$emit('scroll');
+    },
     onPullDownRefresh() {
       // 模拟上拉刷新
       setTimeout(() => {
@@ -1648,8 +1649,8 @@
       .easy-loadimage,
       image,
       uni-image {
-				width: 345rpx;
+        width: 180rpx;
-				height: 345rpx;
+        height: 180rpx;
 
         image {
           display: block;
@@ -1696,9 +1697,17 @@
           display: flex;
           align-items: center;
           width: 100%;
-					margin-bottom: 28rpx;
+          // margin-bottom: 28rpx;
           font-size: 18rpx;
+          line-height: 26rpx;
+          max-height: 78rpx;
           color: #999999;
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          -webkit-line-clamp: 3;
+          /* 控制显示的行数 */
 
           .brand {
             &::after {
@@ -1862,7 +1871,7 @@
 
       .text {
         position: relative;
-				width: 450rpx;
+        width: 530rpx;
         min-width: 0;
         padding-top: 0;
         padding-right: 0;