始宁农业小程序：瀑布流加载优化

htmldev/shiningWxMini/components/business-detail-large/index.wxml

@@ -39,7 +39,6 @@
   actions="{{ actions }}"
   cancel-text="取消"
   description="{{shopDetail.shop_phone}}可能是一个电话号码，你可以"
-  close-on-click-overlay="{{false}}"
   bind:cancel="hideActionSheet"
   bind:select="onSelect"
 />

htmldev/shiningWxMini/pages/goodsDetail/goodsDetail.js

@@ -21,12 +21,12 @@ Page({
         value: '2'
       }
     ],
-    active: '1',
+    active: '2',
     objProductDetail: {
       product_rotation_img_list: [],
       product_detail_img_list: []
     },
-    objShopDetail: { shop_address: {} },
+    shopDetail: { shop_address: {} },
     booLock: false
   },
 
@@ -118,11 +118,12 @@ Page({
   async fetchShopDetail() {
     try {
       const { status, data, msg } = await getShopDetail(this.data.searchForm.shop_id)
+
       if (status) {
         this.setData({
-          objShopDetail: {
+          shopDetail: {
             ...data,
-            shop_address: shop_address ? JSON.parse(data.shop_address) : {}
+            shop_address: data.shop_address ? JSON.parse(data.shop_address) : {}
           }
         })
       } else {

htmldev/shiningWxMini/pages/goodsDetail/goodsDetail.scss

@@ -70,7 +70,7 @@
 .goods-info {
   display: flex;
   flex-direction: column;
-  padding: 44rpx 0 276rpx 46rpx;
+  padding: 44rpx 0 0 46rpx;
 
   .introduce {
     width: 636rpx;
@@ -212,3 +212,10 @@
     background-color: rgba(145, 179, 121, 1);
   }
 }
+
+.banner-box {
+  .banner {
+    display: block;
+    width: 100%;
+  }
+}

htmldev/shiningWxMini/pages/goodsDetail/goodsDetail.wxml

@@ -24,7 +24,7 @@
     class="name"
     user-select>{{objProductDetail.product_title}}</text>
   <view class="unit-price">
-    <text class="price">¥{{tools.fen2Yuan(objProductDetail.product_price)}}</text>
+    <text class="price">¥{{tools.fen2Yuan(objProductDetail.product_all_price)}}</text>
     <text class="unit">/ {{objProductDetail.product_unit}}</text>
   </view>
 </view>
@@ -37,11 +37,29 @@
   class="goods-info"
   hidden="{{active === '2'}}">
   <text class="introduce" user-select>{{objProductDetail.product_desc}}</text>
-  <block wx:if="{{false}}">
-    <view class="subtitle">预计上架时间</view>
+  <block>
+    <view class="subtitle">货号</view>
+    <view
+      class="date">{{objProductDetail.product_code}}
+    </view>
+  </block>
+  <block>
+    <view class="subtitle">规格</view>
+    <view
+      class="date">{{objProductDetail.product_spec}}
+    </view>
+  </block>
+  <block>
+    <view class="subtitle">{{objProductDetail.product_sale_at === 0 ? '预计' : ''}}上架时间</view>
     <view
       class="date">
-      {{objProductDetail.product_sale_at === 0 ? '预售' : tools.formatTs(objProductDetail.product_sale_at, 'YYYY-MM-DD hh:mm')}}
+      {{objProductDetail.product_sale_at === 0 ? '预售' : tools.formatTs(objProductDetail.product_sale_at * 1000, 'YYYY-MM-DD hh:mm')}}
+    </view>
+  </block>
+  <block>
+    <view class="subtitle">库存</view>
+    <view
+      class="date">{{objProductDetail.product_count}} {{objProductDetail.product_unit}}
     </view>
   </block>
   <!-- 暂时不做 -->
@@ -71,10 +89,20 @@
     </scroll-view>
   </block>
 </view>
+<view
+  class="banner-box"
+  hidden="{{active === '2'}}">
+  <image
+    class="banner"
+    src="{{item}}"
+    wx:for="{{objProductDetail.product_detail_img_list}}"
+    wx:key="index"></image>
+</view>
+
 <view
   hidden="{{active === '1'}}">
   <business-detail-large
-    shopDetail="{{objShopDetail}}"/>
+    shopDetail="{{shopDetail}}"/>
 </view>
 
 <view