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

src/api/assistingAgriculture/building.js

 import { request } from '../../utils/request';
 
-// 获取指定类型轮播图
+// 筑农专区分类
 export function getSortList(data) {
   return request({
     url: `/sgyrdd/category/znList`,
@@ -9,6 +9,24 @@ export function getSortList(data) {
   });
 }
 
+// 预售板块轮播图
+export function getPresaleList(data) {
+  return request({
+    url: `/sgyrdd/carousel/presaleList`,
+    method: 'GET',
+    data,
+  });
+}
+
+// 筑农严选分类
+export function getStrictSelection(data) {
+  return request({
+    url: `/sgyrdd/category/getZnyx`,
+    method: 'GET',
+    data,
+  });
+}
+
 // 筑农严选首页-分类预售商品列表
 export function getPresaleCategory(data) {
   return request({
@@ -18,28 +36,28 @@ export function getPresaleCategory(data) {
   });
 }
 
-// 预售板块轮播图
-export function getPresaleList(data) {
+// 筑农严选首页-好货特卖商品列表
+export function getGoodSaleProdList(data) {
   return request({
-    url: `/sgyrdd/carousel/presaleList`,
+    url: `/sgyrdd/znprod/getGoodSaleProdList`,
     method: 'GET',
     data,
   });
 }
 
-// 筑农严选分类
-export function getStrictSelection(data) {
+// 筑农严选首页-分类查询商品列表
+export function getPlatformProdList(data) {
   return request({
-    url: `/sgyrdd/category/getZnyx`,
+    url: `/sgyrdd/znprod/getPlatformProdList`,
     method: 'GET',
     data,
   });
 }
 
-// 筑农预售分类
-export function getBuindingSort(data) {
+// 筑农首页-分类查询商品列表
+export function getPresaleProdList(data) {
   return request({
-    url: `/sgyrdd/category/presaleList`,
+    url: `/sgyrdd/znprod/getPresaleProdList`,
     method: 'GET',
     data,
   });

src/pages/assistingAgriculture/index/building.vue

@@ -46,7 +46,7 @@
     <view class="hot-sale">
       <view class="top-title">
         <text class="left-title">好货热卖</text>
-        <text class="right-title">更多</text>
+        <text class="right-title" @tap="toPresale">更多</text>
       </view>
       <wd-icon
         name="arrow-right"

src/pages/assistingAgriculture/index/index.vue

@@ -8,21 +8,16 @@
         placeholderText="请输入要搜索的内容"
       ></Search>
       <view>
-        <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"
-        />
+        <wd-swiper
+          :list="swiperList"
+          autoplay
+          v-model:current="current"
+          @click="handleClick"
+          @change="onChange"
+          customClass="guiyang"
+          height="220"
+          imageMode="aspectFill"
+        ></wd-swiper>
       </view>
       <view class="sort">
         <view style="display: flex; flex-direction: row">
@@ -62,11 +57,19 @@
 import Search from '../../../components/assistingAgriculture/index/Search.vue';
 import {
   getPresaleCategory,
+  getPresaleList,
   getSortList,
   getStrictSelection,
 } from '../../../api/assistingAgriculture/building';
-import { onMounted } from 'vue';
+import { onMounted, ref } from 'vue';
+import { groupImgList } from '@/api';
+
 const list = ref([]);
+const sortList = ref([]);
+const swiperList = ref([]);
+const current = ref(0);
+// 轮播图数据
+let lunboData;
 const detailList = ref([
   {
     img: '/static/assistingAgriculture/assets/detailedMapOne.png',
@@ -84,11 +87,11 @@ const detailList = ref([
     text: '麻辣鱼豆腐',
   },
 ]);
-const sortList = ref([]);
 onMounted(async () => {
   getList();
   getPresaleCategoryList();
   getStrictSelectionList();
+  getPresale();
 });
 // 获取筑农专区分类;
 const getList = () => {
@@ -107,7 +110,6 @@ const getPresaleCategoryList = () => {
       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;
@@ -115,23 +117,40 @@ const getPresaleCategoryList = () => {
 };
 // 筑农严选分类
 const getStrictSelectionList = () => {
-  getStrictSelection().then((res) => {
-    console.log(res, 333);
+  getStrictSelection().then((res) => {});
+};
+// 预售板块轮播图
+const getPresale = () => {
+  getPresaleList({ place: 'index_top' }).then((res) => {
+    console.log(res, 111);
+    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 onChange = (e) => {
+  // console.log(e);
+};
 function toBuilding(index) {
   if (index === 0) {
     // TODO: 跳转到筑农严选
     xma.navigateTo({
       url: '/pages/assistingAgriculture/index/building',
     });
+  } else if (index === 1) {
+    console.log(111);
   } else if (index === 2) {
     // TODO: 跳转到乡村旅居
     xma.navigateTo({
       url: '/pages/assistingAgriculture/RuralTravel/RuralTravel',
     });
+  } else if (index === 3) {
+    console.log(222);
   }
-  console.log(index, 121);
 }
 // 跳转详情页
 function toDetail() {
@@ -157,15 +176,6 @@ page {
 .img1 {
   display: flex;
 }
-.img2 {
-  display: flex;
-  margin-top: -31rpx;
-}
-.img3 {
-  display: flex;
-  margin-top: -120rpx;
-  margin-left: 462rpx;
-}
 .bottom-image {
   position: relative;
   top: -40rpx;
@@ -273,8 +283,8 @@ page {
   color: #fa5151;
 }
 ::v-deep .icon {
-  width: 40rpx;
-  height: 40rpx;
-  margin-left: 40rpx;
+  width: 40 rpx;
+  height: 40 rpx;
+  margin-left: 40 rpx;
 }
 </style>

src/pages/assistingAgriculture/index/presale.vue

@@ -10,13 +10,14 @@
     </view>
     <view class="nav">
       <wd-swiper
-        class="main-img"
         :list="swiperList"
         autoplay
         v-model:current="current"
         @click="handleClick"
         @change="onChange"
-        height="188"
+        customClass="guiyang"
+        height="220"
+        imageMode="aspectFill"
       ></wd-swiper>
     </view>
     <view class="sort">
@@ -143,12 +144,11 @@
 <script setup>
 import Search from '../../../components/assistingAgriculture/index/Search.vue';
 import { ref, onMounted } from 'vue';
-import {
-  getBuindingSort,
-  getPresaleList,
-  getStrictSelection,
-} from '../../../api/assistingAgriculture/building';
+import { getPresaleList } from '../../../api/assistingAgriculture/building';
+const swiperList = ref([]);
 const current = ref(0);
+// 轮播图数据
+let lunboData;
 const light = ref(0);
 const sortList = ref([
   { img: '/static/assistingAgriculture/presale/bacImg.png', price: '25', text: '应季好物' },
@@ -157,11 +157,6 @@ const sortList = ref([
   { img: '/static/assistingAgriculture/presale/img4.png', price: '25', text: '预选蔬菜' },
   { img: '/static/assistingAgriculture/presale/img5.png', price: '25', text: '心选水果' },
 ]);
-const swiperList = ref([
-  '../../../static/assistingAgriculture/presale/img.png',
-  '../../../static/assistingAgriculture/presale/img.png',
-  '../../../static/assistingAgriculture/presale/img.png',
-]);
 const tabsData = ref([
   { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '全部' },
   { img: '/static/assistingAgriculture/assets/presale.png', text: '分类1' },
@@ -235,18 +230,18 @@ const goodList = ref([
 ]);
 onMounted(async () => {
   getPresale();
-  getBuindingSortList();
 });
 // 预售板块轮播图
 const getPresale = () => {
-  getPresaleList({ place: 3 }).then((res) => {
+  getPresaleList({ place: 'presale' }).then((res) => {
     console.log(res, 111);
-  });
-};
-// 筑农预售分类
-const getBuindingSortList = () => {
-  getBuindingSort({ level: 3 }).then((res) => {
-    console.log(res, 222);
+    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;
+    });
   });
 };
 // 左侧数据列表

src/pages/order/remark.vue

@@ -7,6 +7,7 @@
         <view class="itemPicker">
           <view class="item01">
             <text class="label">评分</text>
+            <!-- 评分 -->
             <wd-rate
               prop="merchantServices"
               v-model="formdata.merchantServices"
@@ -20,23 +21,25 @@
             <text>{{ merList[formdata.merchantServices] }}</text>
           </view>
         </view>
+        <!-- 内容描述 -->
         <wd-textarea
           prop="evaluation"
           v-model="formdata.evaluation"
           placeholder="亲，分享您的看法，给其他人一个参考哦！"
         />
         <text class="textarea">上传图片/视频</text>
+        <!-- 图片上传 -->
         <view class="wdUpload" prop="images">
           <wd-upload
             multiple
             :action="action"
             @change="handleFile"
-            :file-list="formdata.images"
+            :file-list="fList"
             :before-remove="beforeRemove"
             :header="headers"
           ></wd-upload>
         </view>
-
+        <!-- 匿名评价 -->
         <wd-cell title="匿名评价" prop="isAnonymous" class="itemSwichval">
           <wd-switch
             size="48rpx"
@@ -63,7 +66,8 @@
 import Header from './components/Header/index.vue';
 import { getToken } from '@/utils/auth';
 import { evaluation } from '@/api/order';
-
+import { useToast } from 'wot-design-uni';
+const uToast = useToast();
 const form = ref();
 const token = getToken();
 // 上传图片地址
@@ -74,7 +78,6 @@ const headers = ref();
  */
 const shopname = ref<string>('');
 onLoad((options) => {
-  console.log(options);
   shopname.value = options?.shopName;
   formdata.orderNumber = options?.orderNumber;
   headers.value = { Authorization: 'Bearer ' + token };
@@ -83,18 +86,40 @@ onLoad((options) => {
 const formdata = reactive<{
   orderNumber: string;
   evaluation: string;
-  images: string;
+  images: string[];
   isAnonymous: number;
-
+  descriptionMatches: number;
   merchantServices: number;
 }>({
   orderNumber: '',
   evaluation: '',
-  images: '',
+  images: [],
   isAnonymous: 0,
+  descriptionMatches: 0,
   merchantServices: 0,
 });
-const rules = {};
+
+/**
+ * 表单验证规则
+ */
+const rules = {
+  images: [
+    {
+      required: true,
+      message: '请上传图片',
+      validator: (value: any) => {
+        if (value) {
+          console.log('123456');
+        } else {
+          console.log('963852');
+        }
+      },
+    },
+  ],
+  evaluation: [{ required: true, message: '请填写评价内容' }],
+  merchantServices: [{ required: true, message: '请选择商家服务评分' }],
+};
+
 /**
  * 显示推荐菜
  */
@@ -118,16 +143,15 @@ const handlemerchant = (item: { value: number }) => {
 /**
  * 图片上传
  */
-const fileList = ref<any[]>([]);
+const fList = ref<any[]>([]);
 function handleFile({ fileList: files }) {
-  console.log('fileList', formdata.images);
-  fileList.value = files;
+  fList.value = files;
 }
 /**
  * 图片地址处理
  */
 const proImage = () => {
-  const data = fileList.value.map((item) => {
+  const data = fList.value.map((item) => {
     return JSON.parse(item.response).data.url;
   });
   return data.join(',');
@@ -135,34 +159,41 @@ const proImage = () => {
 
 const overshow = ref<boolean>(false);
 const resolves = ref();
-const beforeRemove = ({ file, fileList, resolve }) => {
+const beforeRemove = ({ resolve }) => {
   overshow.value = true;
   resolves.value = resolve;
 };
 const deleteImg = () => {
-  console.log(resolves.value(true));
+  resolves.value(true);
   overshow.value = false;
 };
 /**
  * Release提交
  */
-
 const handleSubmit = async () => {
   await evaluation({
     ...formdata,
-    // images: proImage(),
-  });
-  xma.showToast({
-    title: '评价成功',
-    duration: 1000,
-    icon: 'none',
+    images: proImage(),
   });
+  uToast.success('评价成功');
   xma.redirectTo({
     url: `/pages/order/order?status=not_eval`,
   });
-
-  console.log(formdata);
 };
+
+// const handleSubmit = async () => {
+//   console.log(form.value.validate());
+//   form.value
+//     .validate()
+//     .then(({ valid, errors }) => {
+//       if (valid) {
+//         uToast.info({ msg: '校验通过' });
+//       }
+//     })
+//     .catch((error: any) => {
+//       console.log(error, 'error');
+//     });
+// };
 </script>
 <style lang="scss" scoped>
 .container {
@@ -207,6 +238,9 @@ const handleSubmit = async () => {
     margin-top: 25rpx;
     margin-bottom: 172rpx;
     padding: 20rpx;
+    :deep(.wd-textarea) {
+      padding: 0 30rpx;
+    }
 
     .itemPicker {
       display: flex;

src/pages/storeEntry/index.vue

@@ -5,16 +5,21 @@
     <view class="content">
       <!-- 列表 -->
       <view class="listcon">
-        <view class="pubList" v-for="item in list" :key="item.id">
+        <view
+          class="pubList"
+          v-for="item in list"
+          :key="item.shopId"
+          @click="item.shopStatus != [1, 2, 3] ? shopGto(item.shopId) : ''"
+        >
           <!-- 列表头部 -->
           <view class="titlecon">
             <span>{{ item.shopName }}</span>
-            <span>{{ item.shopStatus }}</span>
+            <span>{{ shopStatus[item.shopStatus] }}</span>
           </view>
           <!-- 列表详细 -->
           <view class="delbox">
             <view class="listPic">
-              <img :src="item.shopLogo" />
+              <img :src="itemUrl + item.shopLogo" />
             </view>
 
             <view class="deltxt">
@@ -38,13 +43,22 @@
       </view>
       <view class="shbox" v-if="list.length > 0">审核被拒可点击修改重新提交</view>
     </view>
-    <view class="butCon"><button class="butXz" @click="shopGto">申请入驻</button></view>
+    <view class="butCon"><button class="butXz" @click="shopGto()">申请入驻</button></view>
   </view>
 </template>
 
 <script setup>
 import Header from '@/pages/order/components/Header/index.vue';
 import { shopList } from '@/api/storeEntry';
+const itemUrl = import.meta.env.VITE_APP_IMG_URL;
+const shopStatus = reactive({
+  0: '停业中',
+  1: '营业中',
+  2: '平台下线',
+  3: '平台下线待审核',
+  4: '开店申请中',
+  5: '开店申请待审核',
+});
 const list = ref([]);
 const getList = async () => {
   const { data: res } = await shopList();
@@ -52,12 +66,12 @@ const getList = async () => {
   if (res.length > 0) {
     list.value = res;
   } else {
-    // shopGto();
+    shopGto();
   }
 };
-const shopGto = () => {
+const shopGto = (item) => {
   xma.redirectTo({
-    url: `/pages/storeEntry/detail`,
+    url: `/pages/storeEntry/detail${item ? `?id=${item}` : ''}`,
   });
 };
 getList();