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

.env.development

@@ -5,7 +5,7 @@ VITE_APP_ENV = 'development'
 VITE_APP_BASE_URL = '/api'
 
 # 照片url路径 （开发环境）
-# VITE_APP_IMG_URL = 'http://file.rhhzkj.com:8080'
+VITE_APP_IMG_URL = 'http://file.rhhzkj.com:8080'
 
 # 照片url路径（正式环境）
-VITE_APP_IMG_URL = 'https://file.rddyz.com' 
+# VITE_APP_IMG_URL = 'https://file.rddyz.com' 

src/Components/index/ShopCard.vue

@@ -159,6 +159,7 @@ const topFoodDetails = (id) => {
           margin-top: 10rpx;
           display: flex;
           align-items: center;
+          flex-wrap: wrap;
           view {
             margin-right: 8rpx;
             display: inline-block;
@@ -168,6 +169,8 @@ const topFoodDetails = (id) => {
             font-size: 18rpx;
             color: #767676;
             background: linear-gradient(90deg, #fcdbdb 0%, rgba(255, 255, 255, 0) 98%);
+            margin-bottom: 5rpx;
+            flex-shrink: 0;
           }
         }
       }

src/pages/assistingAgriculture/index/building.vue

@@ -258,7 +258,7 @@ const choice = (index, item) => {
 // 跳转预售
 const toPresale = () => {
   xma.navigateTo({
-    url: `/pages/assistingAgriculture/index/presale?categoryId=3273`,
+    url: `/pages/assistingAgriculture/index/presale?categoryId=9`,
   });
 };
 // 处理content
@@ -290,10 +290,6 @@ function toCart() {
 page {
   background: #f3f3f3;
 }
-.container {
-  position: relative;
-  left: 0rpx;
-}
 .top {
   width: 750rpx;
   height: 128rpx;

src/pages/assistingAgriculture/index/index.vue

@@ -34,9 +34,13 @@
           height="220"
           imageMode="aspectFill"
         ></wd-swiper>
+        <view class="env">
+          <text class="env-info">贵阳市农业农村局 贵阳日报传媒集团联合打造</text>
+        </view>
       </view>
       <view class="sort">
         <view style="display: flex; flex-direction: row">
+          <scroll-view class="box-red" scroll-x="true" @scroll="scroll">
             <view
               class="borderClass"
               @click="toBuilding(item)"
@@ -46,6 +50,7 @@
               <image mode="aspectFill" :src="item.icon" style="width: 96rpx; height: 96rpx" />
               <view class="sort-text">{{ item.categoryName }}</view>
             </view>
+          </scroll-view>
         </view>
       </view>
       <view class="product-page" v-for="(item, index) in list" :key="index">
@@ -109,7 +114,7 @@ const getList = () => {
     res.data.forEach((item) => {
       item.icon = import.meta.env.VITE_APP_IMG_URL + item.pic;
     });
-    sortList.value = res.data.splice(0, 4);
+    sortList.value = res.data;
   });
 };
 // 筑农严选首页-分类预售商品列表
@@ -145,12 +150,12 @@ const onChange = (e) => {
   // console.log(e);
 };
 const toBuilding = (item) => {
-  if (item.categoryName === '筑农严选') {
+  if (item.categoryId === '10') {
     // 跳转到筑农严选
     xma.navigateTo({
       url: `/pages/assistingAgriculture/index/building?categoryId=${item.categoryId}`,
     });
-  } else if (item.categoryName === '乡村旅居') {
+  } else if (item.categoryId === '8') {
     // 跳转到乡村旅居
     xma.navigateTo({
       url: `/pages/assistingAgriculture/RuralTravel/RuralTravel?categoryId=${item.categoryId}`,
@@ -205,11 +210,23 @@ page {
   height: 186rpx;
   background: linear-gradient(180deg, #82ce8b -39%, #ffffff 36%);
 }
+.box-red {
+  white-space: nowrap;
+  width: 100%;
+  ::-webkit-scrollbar {
+    display: none;
+    width: 0;
+    height: 0;
+    color: transparent;
+  }
+  background-color: transparent;
+}
 .borderClass {
   width: 96rpx;
   height: 96rpx;
-  margin-left: 75rpx;
+  margin: 0 36rpx;
   margin-top: 22rpx;
+  display: inline-block;
 }
 .sort-text {
   font-size: 24rpx;
@@ -315,4 +332,17 @@ page {
     color: #ffffff;
   }
 }
+.env {
+  width: 750rpx;
+  height: 48rpx;
+  background: linear-gradient(94deg, #82ce8b 0%, rgba(255, 255, 255, 0) 97%);
+  position: absolute;
+  margin-top: -60rpx;
+  z-index: 999;
+  .env-info {
+    font-size: 28rpx;
+    color: #ffffff;
+    margin-left: 20rpx;
+  }
+}
 </style>

src/pages/assistingAgriculture/index/presale.vue

@@ -35,7 +35,7 @@
     <view style="display: flex; flex-direction: row">
       <view
         class="borderClass"
-        @tap="chooseTab(index, item.categoryId)"
+        @tap="chooseBTab(index, item.categoryId)"
         v-for="(item, index) in sortList"
         :key="index"
       >
@@ -45,19 +45,19 @@
     </view>
   </view>
   <view>
-    <view>
-      <scroll-view class="tabs" show-scrollbar="false" scroll-x :scroll-with-animation="true">
-        <text
-          @tap="chooseBTab(index, item.categoryId)"
-          v-for="(item, index) in tabsData"
-          :key="index"
-          class="text"
-          :class="light === index ? 'light' : ''"
-        >
-          {{ item.categoryName }}
-        </text>
-      </scroll-view>
-    </view>
+    <!--    <view>-->
+    <!--      <scroll-view class="tabs" show-scrollbar="false" scroll-x :scroll-with-animation="true">-->
+    <!--        <text-->
+    <!--          @tap="chooseBTab(index, item.categoryId)"-->
+    <!--          v-for="(item, index) in tabsData"-->
+    <!--          :key="index"-->
+    <!--          class="text"-->
+    <!--          :class="light === index ? 'light' : ''"-->
+    <!--        >-->
+    <!--          {{ item.categoryName }}-->
+    <!--        </text>-->
+    <!--      </scroll-view>-->
+    <!--    </view>-->
     <view class="tab-list" v-for="(item, index) in buyList" :key="index" @tap="toDetail(item)">
       <img
         class="buy-list"
@@ -163,6 +163,7 @@ onMounted(async () => {
   getPresale();
   presaleSortList();
   getshoppingCartListFn();
+  chooseBTab(0, '3444');
 });
 // 搜索
 const toSearch = () => {
@@ -224,7 +225,7 @@ const chooseBTab = (index, categoryId) => {
     });
     buyList.value = res.data.records;
   });
-  light.value = index;
+  // light.value = index;
 };
 
 // 筑农首页-分类查询商品列表

src/pages/index/listFood.vue

@@ -7,9 +7,9 @@
       :title="title"
       :showTitle="true"
     ></search>
-    <view class="head">
+    <!-- <view class="head"> -->
     <view class="top" :style="{ backgroundImage: topBg }"></view>
-      <view class="bootom">
+    <view class="bootom" :style="{ top }">
       <view class="bootom-top">
         <view class="option" @tap="locationFiltering(0)">
           <text :class="{ rotate: rotate }">全部烧烤烤肉</text>
@@ -64,7 +64,7 @@
       <!-- 排序筛选 -->
       <Sort v-show="rotate3" @sortParams="sortParams" />
     </view>
-    </view>
+    <!-- </view> -->
     <FoodDetails :cardData="cardData" />
     <wd-status-tip image="content" tip="暂无内容" v-if="cardData.length === 0" />
     <view
@@ -98,6 +98,7 @@ const cardData = ref([]);
 const backgroundBox = ref('');
 const backIcon = ref('white');
 const title = ref('');
+const top = ref(null);
 let total;
 const paramsId = {
   parentId: null,
@@ -116,11 +117,20 @@ onLoad((options) => {
   const { categoryId, place } = options;
   paramsId.parentId = categoryId;
   getByParentIdData();
+  getTop();
   getByType({ place }).then((res) => {
     topBg.value = `url(${import.meta.env.VITE_APP_IMG_URL + res.data[0].imgUrl})`;
   });
 });
 
+// 获取位置板块贴合高度
+const getTop = () => {
+  xma.xh.getMenuButtonBoundingClientRect({
+    success(res) {
+      top.value = (res.top + res.bottom) / 2 + 25 + 'px';
+    },
+  });
+};
 const refresh = () => {
   delete listParams.distance;
   delete listParams.area;
@@ -272,11 +282,11 @@ onPullDownRefresh(() => {
 page {
   background: #f3f3f3;
 }
-.head {
-  width: 100%;
-  margin-bottom: 10rpx;
-  // height: 480rpx;
-  .top {
+// .head {
+//   width: 100%;
+//   margin-bottom: 10rpx;
+// height: 480rpx;
+.top {
   height: 356rpx;
   // background: url('../../static/index/taste.png');
   background-size: 100% 100%;
@@ -286,8 +296,8 @@ page {
     margin-left: 40rpx;
     color: white;
   }
-  }
-  .bootom {
+}
+.bootom {
   // height: 124rpx;
   height: 80rpx;
   display: flex;
@@ -295,7 +305,10 @@ page {
   justify-content: space-around;
   border-radius: 6rpx;
   background: #ffffff;
-    position: relative;
+  position: sticky;
+  margin-bottom: 10rpx;
+  z-index: 9999;
+  // top: 100px;
   .bootom-top {
     display: flex;
     align-items: center;
@@ -341,6 +354,6 @@ page {
       background: #ffdcbb;
     }
   }
-  }
 }
+// }
 </style>

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':
@@ -21,11 +21,11 @@ onLoad(async (options) => {
       xma.reLaunch({ url: '/pages/index/index' });
       break;
     case '2':
-      xma.reLaunch({ url: '/pages/assistingAgriculture/RuralTravel/RuralTravel?categoryId=3268' });
+      xma.reLaunch({ url: '/pages/assistingAgriculture/RuralTravel/RuralTravel?categoryId=8' });
       break;
     case '3':
       xma.reLaunch({
-        url: '/pages/assistingAgriculture/index/building?categoryId=3266',
+        url: '/pages/assistingAgriculture/index/building?categoryId=10',
       });
       break;
     default:

vite.config.ts

@@ -41,8 +41,8 @@ export default defineConfig({
     // 代理配置
     proxy: {
       '/api': {
-        // target: 'http://test.rhhzkj.com:8080',
-        target: 'https://api.rddyz.com',
+        target: 'http://test.rhhzkj.com:8080',
+        // target: 'https://api.rddyz.com',
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/api/, ''),
       },