Merge branch 'master' of http://gitlab.platform.xinhuaapp.com/pengjiani/groupPurchase-miniapp

src/pages/assistingAgriculture/index/building.vue

@@ -133,6 +133,7 @@
           />
         </view>
       </view>
+      <wd-status-tip image="content" tip="暂无数据" v-if="testData.length === 0" />
     </view>
     <!-- 购物车悬浮按钮 -->
     <!--<view class="cart-floating" @tap="toCart">
@@ -219,12 +220,23 @@ const getGoodSaleProd = () => {
 };
 // 筑农严选首页-分类查询商品列表
 const platformProdList = () => {
+  xma.showLoading({
+    title: '加载中',
+  });
   getPlatformProdList({ categoryId: router.query.categoryId }).then((res) => {
+    xma.hideLoading();
     detailList.value = res.data;
     choice(0, '3272');
   });
 };
 const choice = (index, item) => {
+  xma.showLoading({
+    title: '加载中',
+  });
+  getPlatformProdList({ categoryId: router.query.categoryId }).then((res) => {
+    xma.hideLoading();
+    detailList.value = res.data;
+  });
   testData.value = detailList.value[index].prodList;
   testData.value.forEach((item) => {
     item.imgUrl = import.meta.env.VITE_APP_IMG_URL + item.pic;
@@ -406,7 +418,7 @@ page {
   font-weight: 500;
   line-height: 28rpx;
   letter-spacing: 0em;
-  margin-left: 48rpx;
+  margin-left: 20rpx;
   color: #3d3d3d;
   width: 190rpx;
   white-space: nowrap;
@@ -420,7 +432,7 @@ page {
   font-size: 24rpx;
   font-weight: 500;
   color: #abaaaa;
-  margin-left: 40rpx;
+  margin-left: 20rpx;
 }
 .price {
   font-size: 24rpx;

src/pages/assistingAgriculture/index/presale.vue

@@ -83,9 +83,7 @@
         />
       </view>
     </view>
-    <view class="user flex-center" v-if="buyList.length === 0">
-      <wd-status-tip image="content" tip="暂无数据" />
-    </view>
+    <wd-status-tip image="content" tip="暂无数据" v-if="buyList.length === 0" />
   </view>
   <view class="waterfall">
     <view class="wt-left wt-list">

src/pages/index/index.vue

@@ -215,7 +215,7 @@ const cardData2 = ref([]);
 const shopCardData = ref({});
 const current = ref(0);
 const swiperList = ref(['../../static/index/guiyang.png', '../../static/index/guiyang.png']);
-const listParams = {
+let listParams = {
   current: 1,
   size: 10,
   lon: 106.68650025025502,
@@ -344,7 +344,12 @@ const recommendedClassification = () => {
 };
 // 重置数据
 const reset = () => {
-  listParams.current = 1;
+  listParams = {
+    current: 1,
+    size: 10,
+    lon: 106.68650025025502,
+    lat: 26.567192352601154,
+  };
   shopCardData.value = {};
   cardData.value = [];
   cardData1.value = [];