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

src/pages/assistingAgriculture/index/building.vue

@@ -155,6 +155,7 @@ import fab from '../../../components/fab/fab.vue';
 import {
   getGoodSaleProdList,
   getPlatformProdList,
+  getPresaleList,
 } from '../../../api/assistingAgriculture/building';
 import { getshoppingCartList } from '@/api/packageDetail';
 import { onMounted, ref } from 'vue';
@@ -167,13 +168,11 @@ const light = ref(0);
 const hotImgList = ref([]);
 const testData = ref([]);
 const subscript = ref(0);
-let sortData;
+// 轮播图数据
+let lunboData;
+
 // 轮播图
-const swiperList = ref([
-  '../../../static/assistingAgriculture/assets/village.png',
-  '../../../static/assistingAgriculture/assets/village.png',
-  '../../../static/assistingAgriculture/assets/village.png',
-]);
+const swiperList = ref([]);
 // 分类列表数据
 const detailList = ref([]);
 const whh = ref({});
@@ -190,11 +189,23 @@ const params1 = {
 const filteredProdList = ref([]);
 
 onMounted(async () => {
+  getPresale();
   getGoodSaleProd();
   platformProdList();
   getshoppingCartListFn();
 });
-
+// 筑农板块轮播图
+const getPresale = () => {
+  getPresaleList({ place: 'znyx' }).then((res) => {
+    res.data.forEach((item) => {
+      item.imgUrl = import.meta.env.VITE_APP_IMG_URL + item.imgUrl;
+    });
+    lunboData = res.data;
+    swiperList.value = res.data.map((item) => {
+      return item.imgUrl;
+    });
+  });
+};
 // 搜索
 const toSearch = () => {
   xma.navigateTo({ url: '/pages/assistingAgriculture/searchPage/searchPage?prodTypes=7' });
@@ -282,8 +293,6 @@ page {
 .container {
   position: relative;
   left: 0rpx;
-  top: -45rpx;
-  opacity: 1;
 }
 .top {
   width: 750rpx;

src/pages/index/loading.vue

@@ -10,8 +10,8 @@ import { getTokenUser } from '../../api/index';
 import { getToken } from '../../utils/auth';
 
 onLoad(async (options) => {
-  // await signIn();
-  if (!getToken()) await signIn2();
+  await signIn();
+  // if (!getToken()) await signIn2();
   const { type } = options;
   switch (type) {
     case '0':

src/pages/order/order.vue

@@ -41,7 +41,9 @@
                       {{ iconList[item.orderType].text }}
                     </text>
                     <!-- <image src="@/static/order/shop.png" /> -->
-                    <view class="title">{{ item.shopName }}</view>
+                    <view class="title">
+                      {{ item.shopName }}
+                    </view>
                   </view>
                   <view class="right">
                     <span class="status">{{ stateList[item.orderType][item.status].label }}</span>
@@ -798,6 +800,10 @@ page {
           color: #333;
           font-size: 32rpx;
           font-family: PingFang SC;
+          width: 420rpx;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
         }
       }