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

src/Components/assistingAgriculture/index/ScenicSpots.vue

@@ -3,32 +3,22 @@
     <view class="date">景点</view>
     <ul class="ul">
       <li
-        v-for="(item, index) in items"
+        v-for="(item, index) in placeList"
         :key="index"
         :class="{ active: selectedItem === index }"
         @tap="selectItem(index)"
       >
-        {{ item }}
+        {{ item.brief }}
       </li>
     </ul>
   </view>
 </template>
 
 <script setup>
-import { defineProps } from 'vue';
-const items = reactive([
-  '智能排序',
-  '距离优先',
-  '好评优先',
-  '销量优先',
-  '低价优先',
-  '低价优先',
-  '距离优先',
-  '好评优先',
-  '销量优先',
-  '低价优先',
-  '距离优先',
-]);
+import { defineProps, onMounted } from 'vue';
+import { getTour } from '@/api/assistingAgriculture/village';
+const placeList = ref([]);
+const emit = defineEmits(['sortParams']);
 const selectedItem = ref(null);
 const props = defineProps({
   width: {
@@ -36,15 +26,24 @@ const props = defineProps({
     default: '100%',
   },
 });
-const selectItem = (selectItem) => {
-  selectedItem.value = selectItem;
+onMounted(async () => {
+  getTourList();
+});
+const selectItem = (index, item) => {
+  selectedItem.value = index;
+  emit('sortParams', item);
+};
+// 查询景点
+const getTourList = () => {
+  getTour({ prodId: 0 }).then((res) => {
+    placeList.value = res.data;
+  });
 };
 </script>
 
 <style lang="scss" scoped>
 .sort {
   width: 710rpx;
-  height: 192rpx;
   position: absolute;
   top: 100%;
   // width: 100%;
@@ -78,7 +77,6 @@ const selectItem = (selectItem) => {
     flex-flow: wrap;
     li {
       width: 154rpx;
-      height: 20rpx;
       border-radius: 8rpx;
       flex-direction: column;
       justify-content: center;
@@ -87,10 +85,10 @@ const selectItem = (selectItem) => {
       margin-left: 20rpx;
       background: #f3f3f3;
       font-size: 24rpx;
-      line-height: 20rpx;
       text-align: center;
       list-style-type: none;
       margin-top: 20rpx;
+      display: flex;
     }
     .active {
       color: #fa5151;

src/Components/assistingAgriculture/index/Sort.vue

@@ -7,7 +7,7 @@
         :class="{ active: selectedItem === index }"
         @tap="selectItem(index)"
       >
-        {{ item }}
+        {{ item.name }}
       </li>
     </ul>
   </view>
@@ -15,7 +15,14 @@
 
 <script setup>
 import { defineProps } from 'vue';
-const items = reactive(['智能排序', '距离优先', '好评优先', '销量优先', '低价优先', '低价优先']);
+const items = ref([
+  { name: '距离优先', sortModel: 1 },
+  { name: '好评优先', sortModel: 2 },
+  { name: '销量优先', sortModel: 3 },
+  { name: '低价优先', sortModel: 4 },
+  { name: '高价优先', sortModel: 5 },
+]);
+const emit = defineEmits(['sortParams']);
 const selectedItem = ref(null);
 const props = defineProps({
   width: {
@@ -23,8 +30,9 @@ const props = defineProps({
     default: '100%',
   },
 });
-const selectItem = (selectItem) => {
-  selectedItem.value = selectItem;
+const selectItem = (index, item) => {
+  selectedItem.value = index;
+  emit('sortParams', item);
 };
 </script>
 

src/api/assistingAgriculture/shop.js

@@ -40,3 +40,27 @@ export function znsgyOrderCreate(data) {
     data,
   });
 }
+// 筑农首页-查询用户默认收货地址
+export function useraddrDefaultUserAddr(data) {
+  return request({
+    url: `/sgyrdd/useraddr/defaultUserAddr`,
+    method: 'GET',
+    data,
+  });
+}
+// 筑农首页-修改临时订单
+export function previewOrderBasketUpdate(data) {
+  return request({
+    url: `/sgyrdd/previewOrder/basket/update`,
+    method: 'POST',
+    data,
+  });
+}
+// 筑农首页-3、订单详情
+export function sgyOrderOrderInfo(data) {
+  return request({
+    url: `/sgyrdd/sgyOrder/orderInfo`,
+    method: 'GET',
+    data,
+  });
+}

src/api/assistingAgriculture/village.js

+import { request } from '../../utils/request';
+
+// 查询景点
+export function getTour(data) {
+  return request({
+    url: `/sgyrdd/znprod/tour/list`,
+    method: 'GET',
+    data,
+  });
+}
+// 查询热门路线
+export function getPopularList(data) {
+  return request({
+    url: `/sgyrdd/prod/popular`,
+    method: 'GET',
+    data,
+  });
+}
+// 查询商品列表
+export function getProdList(data) {
+  return request({
+    url: `/sgyrdd/prod/prodList`,
+    method: 'GET',
+    data,
+  });
+}

src/pages/assistingAgriculture/RuralTravel/RuralTravel.vue

@@ -55,17 +55,13 @@
           :scroll-with-animation="true"
           @scroll="scroll"
         >
-          <view class="foodCard" v-for="(item, index) in 5" :key="index">
+          <view class="foodCard" v-for="(item, index) in popularRouterData" :key="index">
             <!--            <img-->
             <!--              class="img-icon"-->
             <!--              src="/static/assistingAgriculture/rural/icon.png"-->
             <!--              style="width: 118rpx; height: 32rpx"-->
             <!--            />-->
-            <image
-              class="test5"
-              src="/static/assistingAgriculture/rural/img4.png"
-              mode="widthFix"
-            />
+            <image class="test5" :src="item.imgUrl" mode="widthFix" />
           </view>
         </scroll-view>
         <!--        列表-->
@@ -114,7 +110,7 @@
               ></wd-icon>
             </view>
           </view>
-          <Sort v-show="rotate" />
+          <Sort v-show="rotate" @sortParams="sortParams" />
           <DepartureDate v-show="rotate2" />
           <ScenicSpots v-show="rotate3" />
           <Screen v-show="rotate4" />
@@ -128,8 +124,8 @@
           >
             <img class="card-img" :src="item.img" style="width: 248rpx; height: 240rpx" />
             <view class="detail-text">
-              <text class="detail-title">{{ item.title }}</text>
-              <text class="give">{{ item.give }}</text>
+              <text class="detail-title">{{ item.prodName }}</text>
+              <text class="give">{{ item.prodName }}</text>
               <view class="tag">
                 <wd-tag
                   bg-color="#EEEEEE"
@@ -141,11 +137,11 @@
                 </wd-tag>
               </view>
               <view class="detail-score">
-                <text class="score">{{ item.score }}分</text>
-                <text class="num">月销{{ item.num }}</text>
+                <text class="score">{{ item.deliveryAmount }}分</text>
+                <text class="num">月销{{ item.deliveryAmount }}</text>
               </view>
               <view class="venue">
-                <text class="place">{{ item.place }}</text>
+                <text class="place">{{ item.prodName }}</text>
                 <text class="price">￥{{ item.price }}</text>
               </view>
             </view>
@@ -162,53 +158,24 @@ 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';
-
+import { getPopularList, getProdList, getTour } from '@/api/assistingAgriculture/village';
+import { getPresaleList } from '@/api/assistingAgriculture/building';
+import { onMounted } from 'vue';
+onMounted(async () => {
+  getProd();
+  getPopular();
+});
 const rotate = ref(false);
 const rotate2 = ref(false);
 const rotate3 = ref(false);
 const rotate4 = ref(false);
-const cardList = ref([
-  {
-    img: '/static/assistingAgriculture/rural/img2.png',
-    title: '红枫湖+青岩古镇+云漫湖+云顶高坡景区一日游',
-    give: '赠价值59元特产伴手礼一份',
-    tag: ['可定明日', '无购物', '含保险'],
-    score: '4.9',
-    num: '2000',
-    place: '云岩出发',
-    price: '299.00',
-  },
-  {
-    img: '/static/assistingAgriculture/rural/img2.png',
-    title: '红枫湖+青岩古镇+云漫湖+云顶高坡景区一日游',
-    give: '赠价值59元特产伴手礼一份',
-    tag: ['可定明日', '无购物', '含保险'],
-    score: '4.9',
-    num: '2000',
-    place: '云岩出发',
-    price: '299.00',
-  },
-  {
-    img: '/static/assistingAgriculture/rural/img2.png',
-    title: '红枫湖+青岩古镇+云漫湖+云顶高坡景区一日游',
-    give: '赠价值59元特产伴手礼一份',
-    tag: ['可定明日', '无购物', '含保险'],
-    score: '4.9',
-    num: '2000',
-    place: '云岩出发',
-    price: '299.00',
-  },
-  {
-    img: '/static/assistingAgriculture/rural/img2.png',
-    title: '红枫湖+青岩古镇+云漫湖+云顶高坡景区一日游',
-    give: '赠价值59元特产伴手礼一份',
-    tag: ['可定明日', '无购物', '含保险'],
-    score: '4.9',
-    num: '2000',
-    place: '云岩出发',
-    price: '299.00',
-  },
-]);
+const cardList = ref([]);
+const popularRouterData = ref([]);
+const params = ref({
+  current: 1,
+  size: 10,
+});
+const sortType = ref(null);
 const locationFiltering = (index) => {
   switch (index) {
     case 0:
@@ -237,6 +204,25 @@ const locationFiltering = (index) => {
       break;
   }
 };
+// 查询热门路线
+const getPopular = () => {
+  getPopularList({ current: 1, size: 10 }).then((res) => {
+    res.data.records.forEach((item) => {
+      item.imgUrl = import.meta.env.VITE_APP_IMG_URL + item.pic;
+    });
+    popularRouterData.value = res.data.records;
+  });
+};
+// 查询列表
+const getProd = () => {
+  getProdList({ current: 1, size: 10 }).then((res) => {
+    res.data.records.forEach((item) => {
+      item.img = import.meta.env.VITE_APP_IMG_URL + item.pic;
+    });
+    cardList.value = res.data.records;
+    console.log(res, 222);
+  });
+};
 function toRouteDetails() {
   // TODO: 跳转到线路详情
   xma.navigateTo({
@@ -312,6 +298,7 @@ page {
   background: #ffffff;
   margin-top: 20rpx;
   margin-left: 20rpx;
+  padding-bottom: 30rpx;
 }
 .scroll-x {
   width: 100%;
@@ -482,4 +469,7 @@ page {
   width: 56rpx;
   height: 56rpx;
 }
+.detail-score {
+  margin-top: 90rpx;
+}
 </style>

src/pages/assistingAgriculture/index/building.vue

@@ -63,6 +63,7 @@
         color="#ABAAAA"
         style="position: relative; float: right; top: -42rpx"
       ></wd-icon>
+      <view class="buy-img">
         <view class="hot-img" v-for="(item, index) in hotImgList" :key="index">
           <img
             class="rice"
@@ -72,6 +73,7 @@
           />
         </view>
       </view>
+    </view>
     <!--    tabs-->
     <scroll-view class="tabs" show-scrollbar="false" scroll-x :scroll-with-animation="true">
       <text
@@ -98,7 +100,11 @@
           :key="index"
           style="margin-left: 20rpx"
         >
-          <img @tap="toDetail(item)" :src="item.imgUrl" style="width: 330rpx; height: 330rpx" />
+          <img
+            @tap="toDetail(item)"
+            :src="item.imgUrl"
+            style="width: 330rpx; height: 330rpx; border-radius: 16rpx"
+          />
           <view class="detail-title">{{ whh }}</view>
           <view class="price-page">
             <text class="price">￥{{ item.price }}</text>
@@ -249,18 +255,19 @@ page {
 }
 .hot-sale {
   width: 710rpx;
-  height: 532rpx;
+  //height: 532rpx;
   border-radius: 16rpx;
   background: #ffffff;
   margin: 20rpx;
 }
 .top-title {
-  top: 5px;
+  top: 20rpx;
   position: relative;
   margin: 25rpx;
   display: flex;
   justify-content: space-between;
   align-items: center;
+  padding-bottom: 10rpx;
 }
 .left-title {
   font-family: Source Han Sans;
@@ -444,7 +451,9 @@ page {
 img.rice {
   border-radius: 16rpx 16rpx 16rpx 16rpx;
   margin-left: 20rpx;
-  margin-top: -40rpx;
-  padding-bottom: 40rpx;
+}
+.buy-img {
+  position: relative;
+  top: -20rpx;
 }
 </style>

src/pages/assistingAgriculture/index/index.vue

@@ -43,7 +43,10 @@
               :key="index"
               @click="toDetail(item)"
             >
-              <img :src="item.commodityImg" style="width: 216rpx; height: 176rpx" />
+              <img
+                :src="item.commodityImg"
+                style="width: 216rpx; height: 176rpx; border-radius: 16rpx"
+              />
               <view class="detail-title">{{ item.prodName }}</view>
               <view class="jiage-page">
                 <text class="jiage">￥{{ item.price }}</text>

src/pages/assistingAgriculture/index/presale.vue

@@ -48,7 +48,11 @@
         </scroll-view>
       </view>
       <view class="tab-list" v-for="(item, index) in buyList" :key="index" @tap="toDetail(item)">
-        <img class="buy-list" :src="item.img" style="width: 670rpx; height: 670rpx" />
+        <img
+          class="buy-list"
+          :src="item.img"
+          style="width: 670rpx; height: 670rpx; border-radius: 16rpx"
+        />
         <view>
           <text class="retail-price">零售价：￥{{ item.oriPrice }}/盒</text>
           <text class="presale-price">预售价：￥{{ item.price }}/盒</text>
@@ -83,7 +87,7 @@
                 z-index: 10;
                 margin-left: 18rpx;
                 top: -70rpx;
-                left: -14rpx;
+                left: -19rpx;
               "
             />
             <image
@@ -148,7 +152,6 @@ const params = {
 const tabsList = ref([]);
 onMounted(async () => {
   getPresale();
-  // getPresaleProd();
   presaleSortList();
 });
 // 预售板块轮播图
@@ -332,7 +335,7 @@ page {
   height: 730rpx;
   margin-top: -64rpx;
   margin-left: 20rpx;
-  border-radius: 0px 0px 8px 8px;
+  border-radius: 16rpx;
   background: #ffffff;
   margin-top: 6rpx;
 }

src/pages/packageDetails/packageDetails.vue

@@ -234,7 +234,7 @@
     <!-- 底部 -->
     <view class="bottom-operation-bar">
       <view class="start" @click="collectionFn">
-        <image v-if="shopInfo.isCollect === 0" src="@/static/shop/start.png"></image>
+        <wd-icon v-if="shopInfo.isCollect === 0" name="star" size="22px"></wd-icon>
         <wd-icon v-else color="red" name="star-on" size="22px"></wd-icon>
         {{ shopInfo.privateIntFcount || 0 }}
       </view>
@@ -1014,6 +1014,7 @@ page {
     padding: 20rpx 20rpx 96rpx 42rpx;
     position: fixed;
     justify-content: space-between;
+    align-items: center;
     bottom: 0;
     .start {
       font-size: 11 * 2rpx;
@@ -1033,7 +1034,7 @@ page {
       background: #fa5151;
       box-sizing: border-box;
       padding: 20rpx 208rpx;
-      max-height: 72rpx;
+      height: 72rpx;
     }
   }
 }

src/pages/shop/confirmOrder.vue

@@ -231,6 +231,10 @@ function groupBuyConfirmFn(prodId, skuId) {
         res.data.orderItems[0].pic = imgUrl + res.data.orderItems[0].pic;
         orderInfo.value = res.data;
         resolve(res.data.shopId);
+      }else {
+        wx.showToast({
+          title:res.msg
+        })
       }
     });
   });