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

src/pages/assistingAgriculture/detail/detail.vue

@@ -96,7 +96,7 @@
         <!--        </view>-->
         <view class="btn">
           <wd-button type="warning" size="small" style="margin-right: 10rpx">加入购物车</wd-button>
-          <wd-button type="error" size="small">立即购买</wd-button>
+          <wd-button type="error" size="small" @tap="toSettle">立即购买</wd-button>
         </view>
       </view>
     </view>
@@ -142,9 +142,18 @@ function toCart() {
     url: '/pages/assistingAgriculture/cart/cart',
   });
 }
+function toSettle() {
+  // TODO: 跳转到结算页面
+  xma.navigateTo({
+    url: '/pages/assistingAgriculture/cart/ConfirmOrder',
+  });
+}
 </script>
 
 <style lang="scss" scoped>
+page {
+  background-color: #f3f3f3;
+}
 .container {
   position: relative;
   left: 0rpx;
@@ -306,12 +315,13 @@ function toCart() {
 }
 .detail-info {
   width: 750rpx;
-  height: 1168px;
   border-radius: 16rpx;
   background: #ffffff;
   margin-top: 20rpx;
   position: relative;
   z-index: 9;
+  top: -8rpx;
+  padding-bottom: 120rpx;
 }
 .info-title {
   width: 64rpx;
@@ -330,7 +340,6 @@ function toCart() {
 }
 .info-img {
   width: 710rpx;
-  height: 1168rpx;
   border-radius: 16rpx;
   position: relative;
   margin-top: 40rpx;

src/pages/assistingAgriculture/index/index.vue

@@ -37,105 +37,14 @@
           </view>
         </view>
       </view>
-      <view class="product-page">
-        <view>
-          <view class="page-title">特色美食</view>
-          <img src="/static/assistingAgriculture/assets/mainPicture.png" class="main-img" />
-          <view style="display: flex; flex-direction: row">
-            <view class="detail-border">
-              <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>
-                /份
-              </view>
-              <view class="yushou">预售</view>
-            </view>
-            <view class="detail-border">
-              <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>
-                /份
-              </view>
-              <view class="yushou">预售</view>
-            </view>
-            <view class="detail-border">
-              <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>
-                /份
-              </view>
-              <view class="yushou">预售</view>
-            </view>
-          </view>
-        </view>
-      </view>
-      <view class="product-page" @tap="toDetail">
-        <view>
-          <view class="page-title">农货预售</view>
-          <img src="/static/assistingAgriculture/assets/img4.png" class="main-img" />
-          <view style="display: flex; flex-direction: row">
-            <view class="detail-border">
-              <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>
-                /份
-              </view>
-              <view class="yushou">预售</view>
-            </view>
-            <view class="detail-border">
-              <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>
-                /份
-              </view>
-              <view class="yushou">预售</view>
-            </view>
-            <view class="detail-border">
-              <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>
-                /份
-              </view>
-              <view class="yushou">预售</view>
-            </view>
-          </view>
-        </view>
-      </view>
       <view class="product-page" v-for="(item, index) in list" :key="index">
         <view>
-          <view class="page-title">{{ item.text }}</view>
+          <view class="page-title">{{ item.categoryName }}</view>
           <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/assistingAgriculture/assets/detailedMapOne.png"
-                style="width: 216rpx; height: 176rpx"
-              />
-              <view class="detail-title">{{ item.text }}</view>
+            <view class="detail-border" v-for="(item, index) in item.commodityList" :key="index">
+              <img :src="item.commodityImg" style="width: 216rpx; height: 176rpx" />
+              <view class="detail-title">{{ item.prodName }}</view>
               <view class="jiage-page">
                 <text class="jiage">￥{{ item.price }}</text>
                 /份
@@ -157,14 +66,7 @@ import {
   getStrictSelection,
 } from '../../../api/assistingAgriculture/building';
 import { onMounted } from 'vue';
-const list = ref([
-  // // { 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 list = ref([]);
 const detailList = ref([
   {
     img: '/static/assistingAgriculture/assets/detailedMapOne.png',
@@ -191,19 +93,24 @@ onMounted(async () => {
 // 获取筑农专区分类;
 const getList = () => {
   getSortList().then((res) => {
-    console.log(res, 111);
     res.data.forEach((item) => {
-      item.icon = import.meta.env.VITE_APP_IMG_URL + item.icon;
-      item.pic = import.meta.env.VITE_APP_IMG_URL + item.pic;
+      item.icon = import.meta.env.VITE_APP_IMG_URL + item.pic;
     });
-    sortList.value = res.data;
-    console.log(list.value, 111);
+    sortList.value = res.data.splice(0, 4);
   });
 };
 // 筑农严选首页-分类预售商品列表
 const getPresaleCategoryList = () => {
   getPresaleCategory().then((res) => {
-    console.log(res, 222);
+    res.data.forEach((item) => {
+      item.img = import.meta.env.VITE_APP_IMG_URL + item.pic;
+      item.commodityList = item.prodSimples;
+      item.commodityList.forEach((item) => {
+        item.commodityImg = import.meta.env.VITE_APP_IMG_URL + item.pic;
+        console.log(item.commodityImg, 111);
+      });
+    });
+    list.value = res.data;
   });
 };
 // 筑农严选分类
@@ -340,7 +247,6 @@ page {
   text-overflow: ellipsis;
 }
 .jiage-page {
-  width: 96rpx;
   height: 28rpx;
   margin-top: 20rpx;
   font-size: 24rpx;

src/pages/assistingAgriculture/index/presale.vue

@@ -41,7 +41,7 @@
           </text>
         </scroll-view>
       </view>
-      <view class="tab-list" v-for="(item, index) in buyList" :key="index">
+      <view class="tab-list" v-for="(item, index) in buyList" :key="index" @tap="toDetail">
         <img class="buy-list" :src="item.img" style="width: 670rpx; height: 670rpx" />
         <view>
           <text class="retail-price">零售价：￥{{ item.price }}/盒</text>
@@ -65,12 +65,7 @@
     </view>
     <view class="waterfall">
       <view class="wt-left wt-list">
-        <view
-          class="wt-item"
-          v-for="(good, index) in LeftList"
-          :key="index"
-          @click="ToDetail(good.id)"
-        >
+        <view class="wt-item" v-for="(good, index) in LeftList" :key="index" @tap="toDetail">
           <view class="item-img">
             <image :src="good.image" mode="widthFix"></image>
             <image
@@ -105,12 +100,7 @@
       </view>
 
       <view class="vt-right wt-list">
-        <view
-          class="wt-item"
-          v-for="(good, index) in RightList"
-          :key="index"
-          @click="ToDetail(good.id)"
-        >
+        <view class="wt-item" v-for="(good, index) in RightList" :key="index" @tap="toDetail">
           <view class="item-img">
             <image :src="good.image" mode="widthFix"></image>
             <image

src/pages/order/remark.vue

@@ -24,19 +24,19 @@
           prop="evaluation"
           v-model="formdata.evaluation"
           placeholder="亲，分享您的看法，给其他人一个参考哦！"
-          :rules="[{ required: true, message: '请填写你的评价' }]"
         />
         <text class="textarea">上传图片/视频</text>
-        <wd-upload
-          prop="images"
-          class="wdUpload"
-          multiple
-          :action="action"
-          @change="handleFile"
-          :file-list="fileList"
-          :before-remove="beforeRemove"
-          :header="headers"
-        ></wd-upload>
+        <view class="wdUpload" prop="images">
+          <wd-upload
+            multiple
+            :action="action"
+            @change="handleFile"
+            :file-list="formdata.images"
+            :before-remove="beforeRemove"
+            :header="headers"
+          ></wd-upload>
+        </view>
+
         <wd-cell title="匿名评价" prop="isAnonymous" class="itemSwichval">
           <wd-switch
             size="48rpx"
@@ -94,12 +94,7 @@ const formdata = reactive<{
   isAnonymous: 0,
   merchantServices: 0,
 });
-const rules = {
-  // evaluation: [
-  //   { required: true, message: '请填写你的评价' },
-  //   { type: 'array', min: 1, message: '请上传图片/视频' },
-  // ],
-};
+const rules = {};
 /**
  * 显示推荐菜
  */
@@ -125,6 +120,7 @@ const handlemerchant = (item: { value: number }) => {
  */
 const fileList = ref<any[]>([]);
 function handleFile({ fileList: files }) {
+  console.log('fileList', formdata.images);
   fileList.value = files;
 }
 /**
@@ -154,7 +150,7 @@ const deleteImg = () => {
 const handleSubmit = async () => {
   await evaluation({
     ...formdata,
-    images: proImage(),
+    // images: proImage(),
   });
   xma.showToast({
     title: '评价成功',

src/pages/storeEntry/index.vue

@@ -9,39 +9,36 @@
           <!-- 列表头部 -->
           <view class="titlecon">
             <span>{{ item.shopName }}</span>
-            <span>未通过</span>
+            <span>{{ item.shopStatus }}</span>
           </view>
           <!-- 列表详细 -->
           <view class="delbox">
             <view class="listPic">
-              <img
-                src="https://www.gywb.cn/upload/web/dataset/2024/08/01/2282c5c7e93b42c88dcfc606440f9716.jpg"
-                alt=""
-              />
+              <img :src="item.shopLogo" />
             </view>
 
             <view class="deltxt">
               <ul>
                 <li>
                   <span>申请时间：</span>
-                  <span>2024-08-02 16：21：19</span>
+                  <span>{{ item.createTime }}</span>
                 </li>
                 <li>
                   <span>签约时间：</span>
-                  <span>2024-08-02 ~ 2024-08-02</span>
+                  <span>{{ item.contractStartTime }} ~ {{ item.contractEndTime }}</span>
                 </li>
                 <li>
                   <span>地址:</span>
-                  <span>贵州省贵阳市南明区彭家湾花果园项目M区3栋1单元25层5号房</span>
+                  <span>{{ item.shopAddress }}</span>
                 </li>
               </ul>
             </view>
           </view>
         </view>
       </view>
-      <view class="shbox">审核被拒可点击修改重新提交</view>
+      <view class="shbox" v-if="list.length > 0">审核被拒可点击修改重新提交</view>
     </view>
-    <view class="butCon"><button class="butXz">主要按钮</button></view>
+    <view class="butCon"><button class="butXz" @click="shopGto">申请入驻</button></view>
   </view>
 </template>
 
@@ -50,9 +47,18 @@ import Header from '@/pages/order/components/Header/index.vue';
 import { shopList } from '@/api/storeEntry';
 const list = ref([]);
 const getList = async () => {
-  const res = await shopList();
-  list.value = res.data;
+  const { data: res } = await shopList();
   console.log(res);
+  if (res.length > 0) {
+    list.value = res;
+  } else {
+    // shopGto();
+  }
+};
+const shopGto = () => {
+  xma.redirectTo({
+    url: `/pages/storeEntry/detail`,
+  });
 };
 getList();
 </script>
@@ -63,7 +69,8 @@ getList();
   width: 375 * 2rpx;
   margin: 0 auto;
   background: #f1f1f1;
-  padding-bottom: 80px;
+  padding-bottom: 160rpx;
+  min-height: calc(100vh - 160rpx);
 
   .content {
     padding-top: 88rpx;