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

src/Components/assistingAgriculture/index/Search.vue

@@ -6,7 +6,7 @@
     <view class="searchBox">
       <image
         class="magnifyingGlass"
-        src="../../static/assets/magnifyingGlass.png"
+        src="/static/assistingAgriculture/assets/magnifyingGlass.png"
         mode="aspectFit|aspectFill|widthFix"
       />
       <input

src/main.ts

+import './.rexma/lib';
 import { createSSRApp } from 'vue';
 import App from './App.vue';
 import store from './store';

src/pages/assistingAgriculture/RuralTravel/RuralTravel.vue

@@ -5,12 +5,16 @@
         <Search
           background="rgba(255, 255, 255, 0.8)"
           backIcon="black"
-          iconSrc="/static/assets/left.png"
+          iconSrc="/static/assistingAgriculture/assets/left.png"
           placeholderText="请输入要搜索的关键词"
         ></Search>
       </view>
       <view class="bac-img">
-        <img class="bac" src="/static/rural/bacImg.png" style="width: 750rpx; height: 440rpx" />
+        <img
+          class="bac"
+          src="/static/assistingAgriculture/rural/bacImg.png"
+          style="width: 750rpx; height: 440rpx"
+        />
       </view>
       <!--      热门-->
       <view style="display: flex; flex-direction: row">
@@ -18,19 +22,27 @@
           <text class="left-title">特价专区</text>
           <img
             class="special-icon"
-            src="/static/rural/specialOffer.png"
+            src="/static/assistingAgriculture/rural/specialOffer.png"
             style="width: 29rpx; height: 25rpx"
           />
-          <img class="spe-img" src="/static/rural/img7.png" style="width: 306rpx; height: 204rpx" />
+          <img
+            class="spe-img"
+            src="/static/assistingAgriculture/rural/img7.png"
+            style="width: 306rpx; height: 204rpx"
+          />
         </view>
         <view class="right-offer">
           <text class="left-title">日游直播</text>
           <img
             class="special-icon"
-            src="/static/rural/dayTOur.png"
+            src="/static/assistingAgriculture/rural/dayTOur.png"
             style="width: 32rpx; height: 32rpx"
           />
-          <img class="spe-img" src="/static/rural/img5.png" style="width: 306rpx; height: 204rpx" />
+          <img
+            class="spe-img"
+            src="/static/assistingAgriculture/rural/img5.png"
+            style="width: 306rpx; height: 204rpx"
+          />
         </view>
       </view>
       <view class="hot-way">
@@ -46,10 +58,14 @@
           <view class="foodCard" v-for="(item, index) in 5" :key="index">
             <!--            <img-->
             <!--              class="img-icon"-->
-            <!--              src="/static/rural/icon.png"-->
+            <!--              src="/static/assistingAgriculture/rural/icon.png"-->
             <!--              style="width: 118rpx; height: 32rpx"-->
             <!--            />-->
-            <image class="test5" src="/static/rural/img4.png" mode="widthFix" />
+            <image
+              class="test5"
+              src="/static/assistingAgriculture/rural/img4.png"
+              mode="widthFix"
+            />
           </view>
         </scroll-view>
         <!--        列表-->
@@ -141,11 +157,11 @@
 </template>
 
 <script setup lang="ts">
-import Search from '../../components/index/Search.vue';
-import Sort from '../../components/index/Sort.vue';
-import DepartureDate from '../../components/index/DepartureDate.vue';
-import ScenicSpots from '../../components/index/ScenicSpots.vue';
-import Screen from '../../components/index/Screen.vue';
+import Search from '../../../components/assistingAgriculture/index/Search.vue';
+import Sort from '../../../components/assistingAgriculture/index/Sort.vue';
+import DepartureDate from '../../../components/assistingAgriculture/index/DepartureDate.vue';
+import ScenicSpots from '../../../components/assistingAgriculture/index/ScenicSpots.vue';
+import Screen from '../../../components/assistingAgriculture/index/Screen.vue';
 
 const rotate = ref(false);
 const rotate2 = ref(false);
@@ -153,7 +169,7 @@ const rotate3 = ref(false);
 const rotate4 = ref(false);
 const cardList = ref([
   {
-    img: '/static/rural/img2.png',
+    img: '/static/assistingAgriculture/rural/img2.png',
     title: '红枫湖+青岩古镇+云漫湖+云顶高坡景区一日游',
     give: '赠价值59元特产伴手礼一份',
     tag: ['可定明日', '无购物', '含保险'],
@@ -163,7 +179,7 @@ const cardList = ref([
     price: '299.00',
   },
   {
-    img: '/static/rural/img2.png',
+    img: '/static/assistingAgriculture/rural/img2.png',
     title: '红枫湖+青岩古镇+云漫湖+云顶高坡景区一日游',
     give: '赠价值59元特产伴手礼一份',
     tag: ['可定明日', '无购物', '含保险'],
@@ -173,7 +189,7 @@ const cardList = ref([
     price: '299.00',
   },
   {
-    img: '/static/rural/img2.png',
+    img: '/static/assistingAgriculture/rural/img2.png',
     title: '红枫湖+青岩古镇+云漫湖+云顶高坡景区一日游',
     give: '赠价值59元特产伴手礼一份',
     tag: ['可定明日', '无购物', '含保险'],
@@ -183,7 +199,7 @@ const cardList = ref([
     price: '299.00',
   },
   {
-    img: '/static/rural/img2.png',
+    img: '/static/assistingAgriculture/rural/img2.png',
     title: '红枫湖+青岩古镇+云漫湖+云顶高坡景区一日游',
     give: '赠价值59元特产伴手礼一份',
     tag: ['可定明日', '无购物', '含保险'],
@@ -224,7 +240,7 @@ const locationFiltering = (index) => {
 function toRouteDetails() {
   // TODO: 跳转到线路详情
   xma.navigateTo({
-    url: '/pages/RouteDetails/RouteDetails',
+    url: '/pages/assistingAgriculture/RouteDetails/RouteDetails',
   });
 }
 </script>

src/pages/assistingAgriculture/album/card.vue

 <template>
   <div class="card">
     <div class="img-wrap">
-      <wd-img v-for="v in 3" :key="v" :src="`/src/static/comment/${v}.png`" enable-preview />
+      <wd-img
+        v-for="v in 3"
+        :key="v"
+        :src="`/src/static/assistingAgriculture/comment/${v}.png`"
+        enable-preview
+      />
     </div>
     <div class="text">
       跟团游行程紧凑有序，充分利用了时间，让游客...跟团游行程紧凑有序，充分利用了时间，让游客...跟团游行程紧凑有序，充分利用了时间，让游客...跟团游行程紧凑有序，充分利用了时间，让游客...跟团游行程紧凑有序，充分利用了时间，让游客...跟团游行程紧凑有序，充分利用了时间，让游客...跟团游行程紧凑有序，充分利用了时间，让游客...跟团游行程紧凑有序，充分利用了时间，让游客...
     </div>
     <div class="user-info flex-between">
       <div class="info flex-align-center">
-        <img src="/src/static/comment/1.png" alt="" />
+        <img src="/src/static/assistingAgriculture/comment/1.png" alt="" />
         <p>不爱吃鱼的不爱吃鱼的不爱吃鱼的不爱吃鱼的不爱吃鱼的</p>
       </div>
       <div class="like">

src/pages/assistingAgriculture/cart/ConfirmOrder.vue

@@ -6,9 +6,17 @@
         <view class="hypotenuse-view"></view>
       </view>
       <view class="location">
-        <img class="location-pic" src="/src/static/assets/location.png" alt="" />
+        <img
+          class="location-pic"
+          src="/src/static/assistingAgriculture/assets/location.png"
+          alt=""
+        />
         <view class="location-text">贵州省贵阳市南明区花果园中环广场3号楼 1718</view>
-        <img class="location-icon" src="/src/static/assets/right-arrow.png" alt="" />
+        <img
+          class="location-icon"
+          src="/src/static/assistingAgriculture/assets/right-arrow.png"
+          alt=""
+        />
         <view class="customer-information">
           <view class="customer-name">张三</view>
           <view class="customer-phone">187****5632</view>
@@ -18,14 +26,22 @@
         <text class="send-time">立即送出</text>
         <view class="estimated-time">大约13:45送达</view>
         <view class="estimated-icon"></view>
-        <img class="estimated-icon" src="/src/static/assets/right-arrow.png" alt="" />
+        <img
+          class="estimated-icon"
+          src="/src/static/assistingAgriculture/assets/right-arrow.png"
+          alt=""
+        />
       </view>
     </view>
     <view class="commordity-information-view">
       <view class="trade-name">杨家黄焖鸡</view>
       <view class="commordity-content">
         <view class="commordity-details">
-          <img class="commodity-picture" src="/src/static/assets/img1.png" alt="" />
+          <img
+            class="commodity-picture"
+            src="/src/static/assistingAgriculture/assets/img1.png"
+            alt=""
+          />
           <view class="commodity-name">招牌黄焖鸡+米饭（土豆+生菜）</view>
           <view class="price-information">
             <text class="price-symbol">￥</text>
@@ -35,7 +51,11 @@
           <view class="label">约1000克</view>
         </view>
         <view class="commordity-details">
-          <img class="commodity-picture" src="/src/static/assets/img1.png" alt="" />
+          <img
+            class="commodity-picture"
+            src="/src/static/assistingAgriculture/assets/img1.png"
+            alt=""
+          />
           <view class="commodity-name">招牌黄焖鸡+米饭（土豆+生菜）</view>
           <view class="price-information">
             <text class="price-symbol">￥</text>
@@ -50,7 +70,11 @@
           <view class="discount-coupon">卷</view>
           <view class="discount-coupon-text">商家优惠券</view>
           <view class="discount-coupon-price">￥0</view>
-          <img class="discount-coupon-icon" src="/src/static/assets/right-arrow.png" alt="" />
+          <img
+            class="discount-coupon-icon"
+            src="/src/static/assistingAgriculture/assets/right-arrow.png"
+            alt=""
+          />
         </view>
       </view>
       <view class="freight-view">

src/pages/assistingAgriculture/cart/cart(old).vue

@@ -10,7 +10,7 @@
 
         <view class="commodity-information">
           <view class="commodity-checkbox"></view>
-          <img class="commodity-picture" src="/src/static/assets/fruit.png" alt="" />
+          <img class="commodity-picture" src="/src/static/assistingAgriculture/assets/fruit.png" alt="" />
           <view class="commodity-name">招牌黄焖鸡+米饭（土豆+生菜）</view>
           <view class="label">约1000克</view>
           <view class="price-information">
@@ -34,7 +34,7 @@
 
         <view class="commodity-information">
           <view class="commodity-checkbox"></view>
-          <img class="commodity-picture" src="/src/static/assets/fruit.png" alt="" />
+          <img class="commodity-picture" src="/src/static/assistingAgriculture/assets/fruit.png" alt="" />
           <view class="commodity-name">招牌黄焖鸡+米饭（土豆+生菜）</view>
           <view class="label">约1000克</view>
           <view class="price-information">
@@ -51,7 +51,7 @@
       </view>
       <view class="commodity-information">
         <view class="commodity-checkbox"></view>
-        <img class="commodity-picture" src="/src/static/assets/fruit.png" alt="" />
+        <img class="commodity-picture" src="/src/static/assistingAgriculture/assets/fruit.png" alt="" />
         <view class="commodity-name">招牌黄焖鸡+米饭（土豆+生菜）</view>
         <view class="label">约1000克</view>
         <view class="price-information">

src/pages/assistingAgriculture/cart/cart.vue

@@ -143,7 +143,7 @@ const changeCheckedAll = () => {
 function toSettle() {
   // TODO: 跳转到结算页面
   xma.navigateTo({
-    url: '/pages/cart/ConfirmOrder',
+    url: '/pages/assistingAgriculture/cart/ConfirmOrder',
   });
 }
 </script>

src/pages/assistingAgriculture/detail/detail.vue

@@ -6,23 +6,27 @@
         <Search
           background="rgba(255, 255, 255, 0.8)"
           backIcon="black"
-          iconSrc="/static/assets/blackLeft.png"
+          iconSrc="/static/assistingAgriculture/assets/blackLeft.png"
           placeholderText="请输入要搜索的内容"
         ></Search>
       </view>
     </view>
     <!--    图片-->
     <view class="nav">
-      <img class="main-img" src="/static/detail/img2.png" style="width: 750rpx; height: 668rpx" />
+      <img
+        class="main-img"
+        src="/static/assistingAgriculture/detail/img2.png"
+        style="width: 750rpx; height: 668rpx"
+      />
       <view class="pre-icon">
         <img
           class="left-icon"
-          src="/static/detail/img4.png"
+          src="/static/assistingAgriculture/detail/img4.png"
           style="width: 248rpx; height: 100rpx; position: relative"
         />
         <img
           class="right-icon"
-          src="/static/detail/img3.png"
+          src="/static/assistingAgriculture/detail/img3.png"
           style="width: 546rpx; height: 62rpx"
         />
       </view>
@@ -38,7 +42,7 @@
         这是商品简介这是商品简介这是商品简介这是商品简介这是商品 简介这是商品简介这是商品简介
       </view>
       <view>
-        <img class="share-img" src="/static/detail/share.png" />
+        <img class="share-img" src="/static/assistingAgriculture/detail/share.png" />
         <text class="share-text" @click="share">分享</text>
       </view>
     </view>
@@ -52,24 +56,33 @@
     <!--    详情图-->
     <view class="detail-info">
       <text class="info-title">详情</text>
-      <img class="info-img" src="/static/detail/detail-img.png" />
-      <img class="info-img" src="/static/detail/detail-img.png" />
+      <img class="info-img" src="/static/assistingAgriculture/detail/detail-img.png" />
+      <img class="info-img" src="/static/assistingAgriculture/detail/detail-img.png" />
     </view>
     <!--    底部-->
     <view class="detail-bottom">
       <view class="sort">
         <view class="bottom" style="display: flex; flex-direction: row">
           <view class="borderClass" @tap="toStore">
-            <img src="/static/detail/img7.png" style="width: 40rpx; height: 40rpx" />
+            <img
+              src="/static/assistingAgriculture/detail/img7.png"
+              style="width: 40rpx; height: 40rpx"
+            />
             <view class="sort-text">店铺</view>
           </view>
           <view class="borderClass">
-            <img src="/static/detail/img8.png" style="width: 40rpx; height: 40rpx" />
+            <img
+              src="/static/assistingAgriculture/detail/img8.png"
+              style="width: 40rpx; height: 40rpx"
+            />
             <view class="sort-text">客服</view>
           </view>
           <view class="borderClass" @tap="toCart">
             <wd-badge modelValue="4">
-              <img src="/static/detail/car.png" style="width: 40rpx; height: 40rpx" />
+              <img
+                src="/static/assistingAgriculture/detail/car.png"
+                style="width: 40rpx; height: 40rpx"
+              />
             </wd-badge>
             <view class="sort-text">购物车</view>
           </view>
@@ -91,21 +104,21 @@
 </template>
 
 <script setup>
-import Search from '../../components/index/Search.vue';
+import Search from '../../../components/assistingAgriculture/index/Search.vue';
 import { ref } from 'vue';
 import { onShow } from '@dcloudio/uni-app';
 
 // 图片
 const swiperList = ref([
-  '../../static/detail/img2.png',
-  '../../static/detail/img2.png',
-  '../../static/detail/img2.png',
+  '../../static/assistingAgriculture/detail/img2.png',
+  '../../static/assistingAgriculture/detail/img2.png',
+  '../../static/assistingAgriculture/detail/img2.png',
 ]);
 // 底部
 const storeList = ref([
-  { img: '/static/detail/img7.png', text: '店铺' },
-  { img: '/static/detail/img8.png', text: '客服' },
-  { img: '/static/detail/img6.png', text: '购物车' },
+  { img: '/static/assistingAgriculture/detail/img7.png', text: '店铺' },
+  { img: '/static/assistingAgriculture/detail/img8.png', text: '客服' },
+  { img: '/static/assistingAgriculture/detail/img6.png', text: '购物车' },
 ]);
 // 进入页面回到顶部
 onShow(() => {
@@ -120,13 +133,13 @@ const share = () => {
 function toStore() {
   // TODO: 跳转到筑农严选
   xma.navigateTo({
-    url: '/pages/shop/index',
+    url: '/pages/assistingAgriculture/shop/index',
   });
 }
 function toCart() {
   // TODO: 跳转到购物车
   xma.navigateTo({
-    url: '/pages/cart/cart',
+    url: '/pages/assistingAgriculture/cart/cart',
   });
 }
 </script>

src/pages/assistingAgriculture/index/building.vue

@@ -5,7 +5,7 @@
       <Search
         background="rgba(255, 255, 255, 0.8)"
         backIcon="black"
-        iconSrc="/static/assets/blackLeft.png"
+        iconSrc="/static/assistingAgriculture/assets/blackLeft.png"
         placeholderText="请输入要搜索的内容"
       ></Search>
     </view>
@@ -24,19 +24,19 @@
       <view class="nav-img">
         <img
           class="culture"
-          src="/static/assets/culture.png"
+          src="/static/assistingAgriculture/assets/culture.png"
           style="width: 366rpx; height: 362rpx"
         />
         <view class="right-img">
           <img
             class="delicacy"
-            src="/static/assets/delicacy.png"
+            src="/static/assistingAgriculture/assets/delicacy.png"
             style="height: 176rpx; margin-left: 8rpx"
           />
           <img
             @tap="toPresale"
             class="fresh"
-            src="/static/assets/fresh.png"
+            src="/static/assistingAgriculture/assets/fresh.png"
             style="height: 176rpx; margin-left: 8rpx"
           />
         </view>
@@ -57,13 +57,13 @@
       <img
         @tap="toDetail"
         class="rice"
-        src="/static/assets/rice.png"
+        src="/static/assistingAgriculture/assets/rice.png"
         style="width: 670rpx; height: 236rpx"
       />
       <img
         @tap="toDetail"
         class="potato"
-        src="/static/assets/potato.png"
+        src="/static/assistingAgriculture/assets/potato.png"
         style="width: 650rpx; height: 236rpx; margin-left: 20rpx; margin-top: -20rpx"
       />
     </view>
@@ -83,7 +83,7 @@
     <view class="tabs-list">
       <img
         class="fruit-img"
-        src="/static/assets/fruit4.png"
+        src="/static/assistingAgriculture/assets/fruit4.png"
         style="width: 670rpx; height: 236rpx"
       />
       <view class="sort-list">
@@ -93,45 +93,57 @@
           <view class="price-page">
             <text class="price">￥{{ item.price }}</text>
           </view>
-          <img class="presale" src="/static/assets/car.png" style="width: 40rpx; height: 40rpx" />
+          <img
+            class="presale"
+            src="/static/assistingAgriculture/assets/car.png"
+            style="width: 40rpx; height: 40rpx"
+          />
         </view>
       </view>
     </view>
     <!-- 购物车悬浮按钮 -->
     <view class="cart-floating" @tap="toCart">
       <wd-badge modelValue="4">
-        <img class="shop-car" src="/static/presale/cart.png" style="width: 40rpx; height: 40rpx" />
+        <img
+          class="shop-car"
+          src="/static/assistingAgriculture/presale/cart.png"
+          style="width: 40rpx; height: 40rpx"
+        />
       </wd-badge>
     </view>
   </view>
 </template>
 
 <script setup>
-import Search from '../../components/index/Search.vue';
+import Search from '../../../components/assistingAgriculture/index/Search.vue';
 const current = ref(0);
 const light = ref(0);
 // 轮播图
 const swiperList = ref([
-  '../../static/assets/village.png',
-  '../../static/assets/village.png',
-  '../../static/assets/village.png',
+  '../../../static/assistingAgriculture/assets/village.png',
+  '../../../static/assistingAgriculture/assets/village.png',
+  '../../../static/assistingAgriculture/assets/village.png',
 ]);
 // 分类列表数据
 const tabsData = ref([
-  { img: '/static/assets/mainPicture.png', text: '水果生鲜' },
-  { img: '/static/assets/presale.png', text: '米面粮油' },
-  { img: '/static/assets/mainPicture.png', text: '农家干货' },
-  { img: '/static/assets/mainPicture.png', text: '鲜货预售' },
-  { img: '/static/assets/mainPicture.png', text: '水果生鲜' },
-  { img: '/static/assets/mainPicture.png', text: '米面粮油' },
-  { img: '/static/assets/mainPicture.png', text: '农家干货' },
-  { img: '/static/assets/mainPicture.png', text: '鲜货预售' },
+  { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '水果生鲜' },
+  { img: '/static/assistingAgriculture/assets/presale.png', text: '米面粮油' },
+  { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '农家干货' },
+  { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '鲜货预售' },
+  { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '水果生鲜' },
+  { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '米面粮油' },
+  { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '农家干货' },
+  { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '鲜货预售' },
 ]);
 const detailList = ref([
-  { img: '/static/assets/fruit.png', price: '2555', text: '这是草莓这是草莓' },
-  { img: '/static/assets/fruit1.png', price: '2555', text: '这是草莓这是草莓' },
-  { img: '/static/assets/fruit2.png', price: '2555', text: '麻辣鱼豆腐' },
-  { img: '/static/assets/fruit3.png', price: '2555', text: '麻辣鱼豆腐' },
+  { img: '/static/assistingAgriculture/assets/fruit.png', price: '2555', text: '这是草莓这是草莓' },
+  {
+    img: '/static/assistingAgriculture/assets/fruit1.png',
+    price: '2555',
+    text: '这是草莓这是草莓',
+  },
+  { img: '/static/assistingAgriculture/assets/fruit2.png', price: '2555', text: '麻辣鱼豆腐' },
+  { img: '/static/assistingAgriculture/assets/fruit3.png', price: '2555', text: '麻辣鱼豆腐' },
 ]);
 const choice = (index) => {
   light.value = index;
@@ -145,19 +157,19 @@ function onChange(e) {
 function toPresale() {
   // TODO: 跳转到预售
   xma.navigateTo({
-    url: '/pages/index/presale',
+    url: '/pages/assistingAgriculture/index/presale',
   });
 }
 function toDetail() {
   // TODO: 跳转到详情页
   xma.navigateTo({
-    url: '/pages/detail/detail',
+    url: '/pages/assistingAgriculture/detail/detail',
   });
 }
 function toCart() {
   // TODO: 跳转到购物车
   xma.navigateTo({
-    url: '/pages/cart/cart',
+    url: '/pages/assistingAgriculture/cart/cart',
   });
 }
 </script>
@@ -257,7 +269,7 @@ page {
       content: '';
       width: 40rpx;
       height: 12rpx;
-      background: url('../../static/assets/selected.png') no-repeat;
+      background: url('../../static/assistingAgriculture/assets/selected.png') no-repeat;
       background-size: 100% 100%;
       position: absolute;
       bottom: -16rpx;

src/pages/assistingAgriculture/index/index.vue

@@ -4,30 +4,54 @@
       <Search
         background="rgba(255, 255, 255, 0.8)"
         backIcon="black"
-        iconSrc="/static/assets/return.png"
+        iconSrc="/static/assistingAgriculture/assets/return.png"
         placeholderText="请输入要搜索的内容"
       ></Search>
       <view>
-        <img class="img1" src="/static/assets/bacImg.png" style="width: 750rpx; height: 440rpx" />
-        <img class="img2" src="/static/assets/bottom.png" style="width: 750rpx; height: 32rpx" />
-        <img class="img3" src="/static/assets/right.png" style="width: 288rpx; height: 124rpx" />
+        <img
+          class="img1"
+          src="/static/assistingAgriculture/assets/bacImg.png"
+          style="width: 750rpx; height: 440rpx"
+        />
+        <img
+          class="img2"
+          src="/static/assistingAgriculture/assets/bottom.png"
+          style="width: 750rpx; height: 32rpx"
+        />
+        <img
+          class="img3"
+          src="/static/assistingAgriculture/assets/right.png"
+          style="width: 288rpx; height: 124rpx"
+        />
       </view>
       <view class="sort">
         <view style="display: flex; flex-direction: row">
           <view class="borderClass" @tap="toBuilding">
-            <img src="/static/assets/buildingAgriculture.png" style="width: 96rpx; height: 96rpx" />
+            <img
+              src="/static/assistingAgriculture/assets/buildingAgriculture.png"
+              style="width: 96rpx; height: 96rpx"
+            />
             <view class="sort-text">筑农严选</view>
           </view>
           <view class="borderClass">
-            <img src="/static/assets/adoption.png" style="width: 96rpx; height: 96rpx" />
+            <img
+              src="/static/assistingAgriculture/assets/adoption.png"
+              style="width: 96rpx; height: 96rpx"
+            />
             <view class="sort-text">认养农业</view>
           </view>
           <view class="borderClass" @tap="toRuralTravel">
-            <img src="/static/assets/rural.png" style="width: 96rpx; height: 96rpx" />
+            <img
+              src="/static/assistingAgriculture/assets/rural.png"
+              style="width: 96rpx; height: 96rpx"
+            />
             <view class="sort-text">乡村旅居</view>
           </view>
           <view class="borderClass">
-            <img src="/static/assets/buildingAgriculture.png" style="width: 96rpx; height: 96rpx" />
+            <img
+              src="/static/assistingAgriculture/assets/buildingAgriculture.png"
+              style="width: 96rpx; height: 96rpx"
+            />
             <view class="sort-text">特色农庄</view>
           </view>
         </view>
@@ -46,10 +70,13 @@
       <view class="product-page">
         <view>
           <view class="page-title">特色美食</view>
-          <img src="/static/assets/mainPicture.png" class="main-img" />
+          <img src="/static/assistingAgriculture/assets/mainPicture.png" class="main-img" />
           <view style="display: flex; flex-direction: row">
             <view class="detail-border">
-              <img src="/static/assets/detailedMapOne.png" style="width: 216rpx; height: 176rpx" />
+              <img
+                src="/static/assistingAgriculture/assets/detailedMapOne.png"
+                style="width: 216rpx; height: 176rpx"
+              />
               <view class="detail-title">干辣椒炒肉</view>
               <view class="jiage-page">
                 <text class="jiage">￥25</text>
@@ -58,7 +85,10 @@
               <view class="yushou">预售</view>
             </view>
             <view class="detail-border">
-              <img src="/static/assets/detailedMapOne.png" style="width: 216rpx; height: 176rpx" />
+              <img
+                src="/static/assistingAgriculture/assets/detailedMapOne.png"
+                style="width: 216rpx; height: 176rpx"
+              />
               <view class="detail-title">贵阳辣子鸡</view>
               <view class="jiage-page">
                 <text class="jiage">￥25</text>
@@ -67,7 +97,10 @@
               <view class="yushou">预售</view>
             </view>
             <view class="detail-border">
-              <img src="/static/assets/detailedMapOne.png" style="width: 216rpx; height: 176rpx" />
+              <img
+                src="/static/assistingAgriculture/assets/detailedMapOne.png"
+                style="width: 216rpx; height: 176rpx"
+              />
               <view class="detail-title">麻辣鱼豆腐</view>
               <view class="jiage-page">
                 <text class="jiage">￥25</text>
@@ -81,10 +114,13 @@
       <view class="product-page" @tap="toDetail">
         <view>
           <view class="page-title">农货预售</view>
-          <img src="/static/assets/img4.png" class="main-img" />
+          <img src="/static/assistingAgriculture/assets/img4.png" class="main-img" />
           <view style="display: flex; flex-direction: row">
             <view class="detail-border">
-              <img src="/static/assets/img1.png" style="width: 216rpx; height: 176rpx" />
+              <img
+                src="/static/assistingAgriculture/assets/img1.png"
+                style="width: 216rpx; height: 176rpx"
+              />
               <view class="detail-title">这是农村种的土豆</view>
               <view class="jiage-page">
                 <text class="jiage">￥25</text>
@@ -93,7 +129,10 @@
               <view class="yushou">预售</view>
             </view>
             <view class="detail-border">
-              <img src="/static/assets/img2.png" style="width: 216rpx; height: 176rpx" />
+              <img
+                src="/static/assistingAgriculture/assets/img2.png"
+                style="width: 216rpx; height: 176rpx"
+              />
               <view class="detail-title">这是农村玉米</view>
               <view class="jiage-page">
                 <text class="jiage">￥25</text>
@@ -102,7 +141,10 @@
               <view class="yushou">预售</view>
             </view>
             <view class="detail-border">
-              <img src="/static/assets/img3.png" style="width: 216rpx; height: 176rpx" />
+              <img
+                src="/static/assistingAgriculture/assets/img3.png"
+                style="width: 216rpx; height: 176rpx"
+              />
               <view class="detail-title">这是农村中的猕猴桃</view>
               <view class="jiage-page">
                 <text class="jiage">￥25</text>
@@ -119,7 +161,10 @@
           <img :src="item.img" class="main-img" />
           <view style="display: flex; flex-direction: row">
             <view class="detail-border" v-for="(item, index) in detailList" :key="index">
-              <img src="/static/assets/detailedMapOne.png" style="width: 216rpx; height: 176rpx" />
+              <img
+                src="/static/assistingAgriculture/assets/detailedMapOne.png"
+                style="width: 216rpx; height: 176rpx"
+              />
               <view class="detail-title">{{ item.text }}</view>
               <view class="jiage-page">
                 <text class="jiage">￥{{ item.price }}</text>
@@ -135,44 +180,64 @@
 </template>
 
 <script setup lang="ts">
-import Search from '../../components/index/Search.vue';
+import Search from '../../../components/assistingAgriculture/index/Search.vue';
 
 const list = ref([
-  // { img: '/static/assets/mainPicture.png', text: '特色美食' },
-  // { img: '/static/assets/presale.png', text: '农货预售' },
-  { img: '/static/assets/mainPicture.png', text: '乡村非遗' },
-  { img: '/static/assets/mainPicture.png', text: '认养农业' },
-  { img: '/static/assets/mainPicture.png', text: '乡村旅居' },
-  { img: '/static/assets/mainPicture.png', text: '特色农庄' },
+  // { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '特色美食' },
+  // { img: '/static/assistingAgriculture/assets/presale.png', text: '农货预售' },
+  { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '乡村非遗' },
+  { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '认养农业' },
+  { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '乡村旅居' },
+  { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '特色农庄' },
 ]);
 const detailList = ref([
-  { img: '/static/assets/detailedMapOne.png', price: '25', text: '干辣椒炒肉干辣椒炒肉' },
-  { img: '/static/assets/detailedMapTwo.png', price: '25', text: '贵阳辣子鸡' },
-  { img: '/static/assets/detailedMapThree.png', price: '25', text: '麻辣鱼豆腐' },
+  {
+    img: '/static/assistingAgriculture/assets/detailedMapOne.png',
+    price: '25',
+    text: '干辣椒炒肉干辣椒炒肉',
+  },
+  {
+    img: '/static/assistingAgriculture/assets/detailedMapTwo.png',
+    price: '25',
+    text: '贵阳辣子鸡',
+  },
+  {
+    img: '/static/assistingAgriculture/assets/detailedMapThree.png',
+    price: '25',
+    text: '麻辣鱼豆腐',
+  },
 ]);
 const sortList = ref([
-  { img: '/static/assets/buildingAgriculture.png', price: '25', text: '筑农严选' },
-  { img: '/static/assets/adoption.png', price: '25', text: '认养农业' },
-  { img: '/static/assets/rural.png', price: '25', text: '乡村旅居' },
-  { img: '/static/assets/buildingAgriculture.png', price: '25', text: '特色农庄' },
+  {
+    img: '/static/assistingAgriculture/assets/buildingAgriculture.png',
+    price: '25',
+    text: '筑农严选',
+  },
+  { img: '/static/assistingAgriculture/assets/adoption.png', price: '25', text: '认养农业' },
+  { img: '/static/assistingAgriculture/assets/rural.png', price: '25', text: '乡村旅居' },
+  {
+    img: '/static/assistingAgriculture/assets/buildingAgriculture.png',
+    price: '25',
+    text: '特色农庄',
+  },
 ]);
 function toBuilding() {
   // TODO: 跳转到筑农严选
   xma.navigateTo({
-    url: '/pages/index/building',
+    url: '/pages/assistingAgriculture/index/building',
   });
 }
 function toRuralTravel() {
   // TODO: 跳转到乡村旅居
   xma.navigateTo({
-    url: '/pages/RuralTravel/RuralTravel',
+    url: '/pages/assistingAgriculture/RuralTravel/RuralTravel',
   });
 }
 // 跳转详情页
 function toDetail() {
   // TODO: 跳转到详情页
   xma.navigateTo({
-    url: '/pages/detail/detail',
+    url: '/pages/assistingAgriculture/detail/detail',
   });
 }
 </script>

src/pages/assistingAgriculture/index/presale.vue

@@ -4,7 +4,7 @@
       <Search
         background="rgba(255, 255, 255, 0.8)"
         backIcon="black"
-        iconSrc="/static/assets/left.png"
+        iconSrc="/static/assistingAgriculture/assets/left.png"
         placeholderText="输入商品名称"
       ></Search>
     </view>
@@ -50,7 +50,7 @@
         <view>
           <img
             class="buy-img"
-            src="/static/presale/img6.png"
+            src="/static/assistingAgriculture/presale/img6.png"
             style="
               position: sticky;
               width: 284rpx;
@@ -75,7 +75,7 @@
             <image :src="good.image" mode="widthFix"></image>
             <image
               class="presale-img"
-              src="/static/presale/presale.png"
+              src="/static/assistingAgriculture/presale/presale.png"
               style="
                 width: 132rpx;
                 height: 64rpx;
@@ -87,7 +87,7 @@
             />
             <image
               class="preview-img"
-              src="/static/presale/preview.png"
+              src="/static/assistingAgriculture/presale/preview.png"
               style="width: 264rpx; height: 40rpx; z-index: 9; top: -70rpx"
             />
             <text class="pre-text">预计9月15日发货</text>
@@ -115,12 +115,12 @@
             <image :src="good.image" mode="widthFix"></image>
             <image
               class="presale-img"
-              src="/static/presale/presale.png"
+              src="/static/assistingAgriculture/presale/presale.png"
               style="width: 132rpx; height: 64rpx; z-index: 10; top: -70rpx"
             />
             <image
               class="preview-img"
-              src="/static/presale/preview.png"
+              src="/static/assistingAgriculture/presale/preview.png"
               style="width: 264rpx; height: 40rpx; z-index: 9; top: -66rpx"
             />
             <text class="pre-text">预计9月15日发货</text>
@@ -141,51 +141,55 @@
   <!-- 购物车悬浮按钮 -->
   <view class="cart-floating" @tap="toCart">
     <wd-badge modelValue="4">
-      <img class="shop-car" src="/static/presale/cart.png" style="width: 40rpx; height: 40rpx" />
+      <img
+        class="shop-car"
+        src="/static/assistingAgriculture/presale/cart.png"
+        style="width: 40rpx; height: 40rpx"
+      />
     </wd-badge>
   </view>
 </template>
 
 <script setup>
-import Search from '../../components/index/Search.vue';
+import Search from '../../../components/assistingAgriculture/index/Search.vue';
 import { ref } from 'vue';
 const current = ref(0);
 const light = ref(0);
 const sortList = ref([
-  { img: '/static/presale/bacImg.png', price: '25', text: '应季好物' },
-  { img: '/static/presale/img2.png', price: '25', text: '猪肉蛋禽' },
-  { img: '/static/presale/img3.png', price: '25', text: '米面粮油' },
-  { img: '/static/presale/img4.png', price: '25', text: '预选蔬菜' },
-  { img: '/static/presale/img5.png', price: '25', text: '心选水果' },
+  { img: '/static/assistingAgriculture/presale/bacImg.png', price: '25', text: '应季好物' },
+  { img: '/static/assistingAgriculture/presale/img2.png', price: '25', text: '猪肉蛋禽' },
+  { img: '/static/assistingAgriculture/presale/img3.png', price: '25', text: '米面粮油' },
+  { img: '/static/assistingAgriculture/presale/img4.png', price: '25', text: '预选蔬菜' },
+  { img: '/static/assistingAgriculture/presale/img5.png', price: '25', text: '心选水果' },
 ]);
 const swiperList = ref([
-  '../../static/presale/img.png',
-  '../../static/presale/img.png',
-  '../../static/presale/img.png',
+  '../../../static/assistingAgriculture/presale/img.png',
+  '../../../static/assistingAgriculture/presale/img.png',
+  '../../../static/assistingAgriculture/presale/img.png',
 ]);
 const tabsData = ref([
-  { img: '/static/assets/mainPicture.png', text: '全部' },
-  { img: '/static/assets/presale.png', text: '分类1' },
-  { img: '/static/assets/presale.png', text: '分类2' },
-  { img: '/static/assets/presale.png', text: '分类3' },
-  { img: '/static/assets/presale.png', text: '分类4' },
-  { img: '/static/assets/presale.png', text: '分类5' },
-  { img: '/static/assets/presale.png', text: '分类6' },
-  { img: '/static/assets/presale.png', text: '分类7' },
-  { img: '/static/assets/presale.png', text: '分类8' },
+  { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '全部' },
+  { img: '/static/assistingAgriculture/assets/presale.png', text: '分类1' },
+  { img: '/static/assistingAgriculture/assets/presale.png', text: '分类2' },
+  { img: '/static/assistingAgriculture/assets/presale.png', text: '分类3' },
+  { img: '/static/assistingAgriculture/assets/presale.png', text: '分类4' },
+  { img: '/static/assistingAgriculture/assets/presale.png', text: '分类5' },
+  { img: '/static/assistingAgriculture/assets/presale.png', text: '分类6' },
+  { img: '/static/assistingAgriculture/assets/presale.png', text: '分类7' },
+  { img: '/static/assistingAgriculture/assets/presale.png', text: '分类8' },
 ]);
 const buyList = ref([
-  { img: '/static/presale/buy.png', price: '29.9', text: '应季好物' },
-  { img: '/static/presale/buy.png', price: '29.9', text: '猪肉蛋禽' },
-  { img: '/static/presale/buy.png', price: '29.9', text: '米面粮油' },
+  { img: '/static/assistingAgriculture/presale/buy.png', price: '29.9', text: '应季好物' },
+  { img: '/static/assistingAgriculture/presale/buy.png', price: '29.9', text: '猪肉蛋禽' },
+  { img: '/static/assistingAgriculture/presale/buy.png', price: '29.9', text: '米面粮油' },
 ]);
 const shopList = ref([
-  { img: '/static/presale/img7.png', price: '29.9', text: '应季好物' },
-  { img: '/static/presale/img7.png', price: '29.9', text: '应季好物' },
-  { img: '/static/presale/img7.png', price: '29.9', text: '应季好物' },
-  { img: '/static/presale/img7.png', price: '29.9', text: '应季好物' },
-  { img: '/static/presale/img7.png', price: '29.9', text: '应季好物' },
-  { img: '/static/presale/img7.png', price: '29.9', text: '应季好物' },
+  { img: '/static/assistingAgriculture/presale/img7.png', price: '29.9', text: '应季好物' },
+  { img: '/static/assistingAgriculture/presale/img7.png', price: '29.9', text: '应季好物' },
+  { img: '/static/assistingAgriculture/presale/img7.png', price: '29.9', text: '应季好物' },
+  { img: '/static/assistingAgriculture/presale/img7.png', price: '29.9', text: '应季好物' },
+  { img: '/static/assistingAgriculture/presale/img7.png', price: '29.9', text: '应季好物' },
+  { img: '/static/assistingAgriculture/presale/img7.png', price: '29.9', text: '应季好物' },
 ]);
 // 声明需要的数据
 const data = reactive({
@@ -201,35 +205,35 @@ const goodList = ref([
   {
     id: 1,
     name: '这是一个商品',
-    image: '/static/presale/buy.png',
+    image: '/static/assistingAgriculture/presale/buy.png',
     introduction: '商品简介商品简介',
     price: 69.9,
   },
   {
     id: 2,
     name: '商品二',
-    image: '/static/presale/img7.png',
+    image: '/static/assistingAgriculture/presale/img7.png',
     introduction: '商品简介商品简介',
     price: 69.9,
   },
   {
     id: 3,
     name: '商品三',
-    image: '/static/assets/fruit.png',
+    image: '/static/assistingAgriculture/assets/fruit.png',
     introduction: '商品简介商品简介',
     price: 69.9,
   },
   {
     id: 4,
     name: '商品四',
-    image: '/static/presale/buy.png',
+    image: '/static/assistingAgriculture/presale/buy.png',
     introduction: '商品简介商品简介',
     price: 69.9,
   },
   {
     id: 5,
     name: '商品五',
-    image: '/static/presale/buy.png',
+    image: '/static/assistingAgriculture/presale/buy.png',
     introduction: '商品简介商品简介',
     price: 69.9,
   },
@@ -264,13 +268,13 @@ const choice = (index) => {
 function toCart() {
   // TODO: 跳转到筑农严选
   xma.navigateTo({
-    url: '/pages/cart/cart',
+    url: '/pages/assistingAgriculture/cart/cart',
   });
 }
 function toDetail() {
   // TODO: 跳转到筑农严选
   xma.navigateTo({
-    url: '/pages/detail/detail',
+    url: '/pages/assistingAgriculture/detail/detail',
   });
 }
 </script>

src/pages/assistingAgriculture/reviewDetails/reviewDetails.vue

@@ -22,7 +22,10 @@
     <view class="revuew-content">
       <view class="user-info">
         <view class="info-content">
-          <image src="@/static/reviewDetails/avatar.png" mode="aspectFill"></image>
+          <image
+            src="@/static/assistingAgriculture/reviewDetails/avatar.png"
+            mode="aspectFill"
+          ></image>
           <view class="text-box">
             <text class="user-name">不爱吃鱼的小猫咪</text>
             <text class="fb-time">2024-08-03</text>
@@ -39,7 +42,7 @@
       </text>
     </view>
     <view class="scenic-spot">
-      <image src="@/static/reviewDetails/fj.png" mode="aspectFill"></image>
+      <image src="@/static/assistingAgriculture/reviewDetails/fj.png" mode="aspectFill"></image>
       <view class="scenic-area-details">
         <text class="scenic-name">红枫湖+青岩古镇+云漫湖</text>
         <text class="scenic-type">自然风景</text>

src/pages/assistingAgriculture/shop/index.vue

@@ -87,7 +87,7 @@ const activeFilter = ref(false);
 function toCart() {
   // TODO: 跳转到购物车
   xma.navigateTo({
-    url: '/pages/cart/cart',
+    url: '/pages/assistingAgriculture/cart/cart',
   });
 }
 </script>

src/pages/storeEntry/detail.vue

@@ -5,45 +5,117 @@
       <view class="formmain">
         <wd-form ref="form" :model="formData" :rules="rules">
           <wd-cell-group border>
-            <wd-picker label="店铺类型" placeholder="请选择店铺类型" label-width="100px" prop="promotion"
-              v-model="formData.promotion" :columns="promotionlist" />
-            <wd-input label="店铺名称" label-width="100px" prop="xm" clearable v-model="formData.xm"
-              placeholder="请输入店铺名称" />
-            <wd-input label="联系电话" label-width="100px" prop="sjh" clearable v-model="formData.sjh"
-              placeholder="请输入联系电话" />
-            <wd-input label="所在地区" label-width="100px" v-model="formData.szdq" prop="szdq" readonly
-              placeholder="请选择所在地区" @click="getLocationFn" />
-            <wd-input label="详细地址" label-width="100px" prop="xxdz" clearable v-model="formData.xm"
-              placeholder="请输入详细地址" />
-            <wd-input label="小区/学校" label-width="100px" v-model="formData.szdq" prop="szdq" readonly placeholder="请选择"
-              @click="getLocationFn" />
+            <wd-picker
+              label="店铺类型"
+              placeholder="请选择店铺类型"
+              label-width="100px"
+              prop="promotion"
+              v-model="formData.promotion"
+              :columns="promotionlist"
+            />
+            <wd-input
+              label="店铺名称"
+              label-width="100px"
+              prop="xm"
+              clearable
+              v-model="formData.xm"
+              placeholder="请输入店铺名称"
+            />
+            <wd-input
+              label="联系电话"
+              label-width="100px"
+              prop="sjh"
+              clearable
+              v-model="formData.sjh"
+              placeholder="请输入联系电话"
+            />
+            <wd-input
+              label="所在地区"
+              label-width="100px"
+              v-model="formData.szdq"
+              prop="szdq"
+              readonly
+              placeholder="请选择所在地区"
+              @click="getLocationFn"
+            />
+            <wd-input
+              label="详细地址"
+              label-width="100px"
+              prop="xxdz"
+              clearable
+              v-model="formData.xm"
+              placeholder="请输入详细地址"
+            />
+            <wd-input
+              label="小区/学校"
+              label-width="100px"
+              v-model="formData.szdq"
+              prop="szdq"
+              readonly
+              placeholder="请选择"
+              @click="getLocationFn"
+            />
             <view class="flex">
-
               <view class="logo">LOGO/门头照</view>
-              <wd-upload :file-list="fileList1" image-mode="aspectFill" :action="action" @change="handleChange1"
-                :limit="1" class="img1"></wd-upload>
+              <wd-upload
+                :file-list="fileList1"
+                image-mode="aspectFill"
+                :action="action"
+                @change="handleChange1"
+                :limit="1"
+                class="img1"
+              ></wd-upload>
             </view>
             <view class="flex">
               <view class="logo">营业执照</view>
-              <wd-upload :file-list="fileList1" image-mode="aspectFill" :action="action" @change="handleChange1"
-                :limit="1" class="img1"></wd-upload>
+              <wd-upload
+                :file-list="fileList1"
+                image-mode="aspectFill"
+                :action="action"
+                @change="handleChange1"
+                :limit="1"
+                class="img1"
+              ></wd-upload>
             </view>
             <view class="flex">
               <view class="logo">身份证照</view>
-              <wd-upload :file-list="fileList1" image-mode="aspectFill" :action="action" @change="handleChange1"
-                :limit="1" class="img1"></wd-upload>
-              <wd-upload :file-list="fileList1" image-mode="aspectFill" :action="action" @change="handleChange1"
-                :limit="1" class="img1"></wd-upload>
+              <wd-upload
+                :file-list="fileList1"
+                image-mode="aspectFill"
+                :action="action"
+                @change="handleChange1"
+                :limit="1"
+                class="img1"
+              ></wd-upload>
+              <wd-upload
+                :file-list="fileList1"
+                image-mode="aspectFill"
+                :action="action"
+                @change="handleChange1"
+                :limit="1"
+                class="img1"
+              ></wd-upload>
             </view>
             <view class="flex">
               <view class="logo">店铺分类</view>
               <view class="text" @click="showclass">请选择</view>
             </view>
-            <wd-textarea placeholder="请填写评价" label="店铺介绍" label-width="100px" v-model="formData.szdq" prop="szdq" />
+            <wd-textarea
+              placeholder="请填写评价"
+              label="店铺介绍"
+              label-width="100px"
+              v-model="formData.szdq"
+              prop="szdq"
+            />
 
             <button type="primary" style="width: 80%">提交</button>
           </wd-cell-group>
-          <wd-popup v-model="show" position="bottom" custom-style="height:300px;overflow:auto;" @close="handleClose">
+          <wd-popup
+            v-model="show"
+            position="bottom"
+            custom-style="height:300px;overflow:auto;"
+            @close="handleClose"
+          >
             <view class="hcontent">
               <view class="flex1">
                 <view class="text">取消</view>
@@ -231,7 +303,8 @@ page {
   .flex {
     display: flex;
     align-items: flex-start;
-    padding: var(--wot-input-cell-padding, 10px) var(--wot-input-padding, var(--wot-size-side-padding, 15px));
+    padding: var(--wot-input-cell-padding, 10px)
+      var(--wot-input-padding, var(--wot-size-side-padding, 15px));
     background-color: var(--wot-input-cell-bg, var(--wot-color-white, rgb(255, 255, 255)));
 
     .text {