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

.env.production

@@ -5,4 +5,4 @@ VITE_APP_ENV = 'production'
 VITE_APP_BASE_URL = 'http://test.rhhzkj.com:8080'
 
 # 照片url路径
-VITE_APP_IMG_URL = 'https://file.rddyz.com'
\ No newline at end of file
+VITE_APP_IMG_URL = 'http://file.rhhzkj.com:8080'
\ No newline at end of file

package-lock.json

@@ -27,7 +27,7 @@
         "qrcode": "^1.5.3",
         "vue": "^3.3.11",
         "vue-i18n": "^9.1.9",
-        "wot-design-uni": "^1.2.26"
+        "wot-design-uni": "^1.3.7"
       },
       "devDependencies": {
         "@dcloudio/types": "^3.3.2",
@@ -16271,9 +16271,9 @@
       }
     },
     "node_modules/wot-design-uni": {
-      "version": "1.2.26",
-      "resolved": "https://registry.npmmirror.com/wot-design-uni/-/wot-design-uni-1.2.26.tgz",
-      "integrity": "sha512-y2YL1lHobRWAJ+22E9G9lNLLIChQ8JY9loOt30PRQJ/izvd5qc+2+BqXCKlFquk2y+2qA75TEfJ/MsaESnYExA==",
+      "version": "1.3.7",
+      "resolved": "https://registry.npmmirror.com/wot-design-uni/-/wot-design-uni-1.3.7.tgz",
+      "integrity": "sha512-6saE25F/TiefYUJrtCpDYgNZTZ2W9llTNufSHZ8EMeX5JXyRTDdsDPYBVv367AxrSQsXCjZacG0RWIk2MIEdQA==",
       "engines": {
         "HBuilderX": "^3.8.7"
       },

src/Components/index/FoodDetails.vue

@@ -9,11 +9,11 @@
         <text class="three-text">销量{{ item.monthSoldNum }}</text>
         <text class="four-text">1.2km</text>
       </view>
-      <view class="threeBox">
-        <image class="img2" :src="item.evaluationVos[0]?.avatar" mode="aspectFill" />
-        <text class="one-text">“{{ item.evaluationVos[0]?.evaluation }}”</text>
+      <view class="threeBox" v-if="item.evaluationVos.length === 0">
+        <image class="img2" :src="item.evaluationVos[0].avatar" mode="aspectFill" />
+        <text class="one-text">“{{ item.evaluationVos[0].evaluation }}”</text>
       </view>
-      <view class="labelBox">
+      <view class="labelBox" v-if="item.labels">
         <view v-for="(item, index) in item.labels" :key="index">{{ item }}</view>
       </view>
       <view class="groupPurchasePrice" v-for="(item, index) in item.simpleProds" :key="index">
@@ -171,6 +171,9 @@ const toShop = (id) => {
         margin-left: 4rpx;
         font-size: 22rpx;
         color: #3d3d3d;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
       }
     }
   }

src/assets/iconfont/iconfont.css

 @font-face {
-    font-family: "iconfont"; /* Project id 4633414 */
-    src: url('//at.alicdn.com/t/c/font_4633414_jhlymbmljta.woff2?t=1722933863144') format('woff2'),
-         url('//at.alicdn.com/t/c/font_4633414_jhlymbmljta.woff?t=1722933863144') format('woff'),
-         url('//at.alicdn.com/t/c/font_4633414_jhlymbmljta.ttf?t=1722933863144') format('truetype');
-  }
-  
-  .iconfont {
-    font-family: "iconfont" !important;
-    font-size: 16px;
-    font-style: normal;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-  }
-  
-  .icon-gengduo:before {
-    content: "\e633";
-  }
-  
-  .icon-lianhe40:before {
-    content: "\e866";
-  }
-  
-  .icon-shuangxiajiantou:before {
-    content: "\e660";
-  }
-  
-  .icon-dianzan:before {
-    content: "\e602";
-  }
-  
-  .icon-dianzan_kuai:before {
-    content: "\ec8c";
-  }
-  
-  .icon-xiai:before {
-    content: "\e601";
-  }
-  
-  .icon-tongzhi:before {
-    content: "\e60d";
-  }
-  
-  .icon-fenxiang:before {
-    content: "\e639";
-  }
-  
-  .icon-shuangshangjiantou-:before {
-    content: "\e600";
-  }
-  
-  .icon-jinggao:before {
-    content: "\e716";
-  }
-  
-  .icon-rs-countdown:before {
-    content: "\e614";
-  }
-  
-  .icon-naozhong:before {
-    content: "\e666";
-  }
-  
-  .icon-ic_business_refund24px:before {
-    content: "\e619";
-  }
-  
-  .icon-shoucang:before {
-    content: "\e606";
-  }
-  
-  .icon-pinglun:before {
-    content: "\e618";
-  }
-  
-  .icon-aixin:before {
-    content: "\e622";
-  }
-  
\ No newline at end of file
+  font-family: "iconfont"; /* Project id 4633414 */
+  src: url('iconfont.woff2?t=1722996380945') format('woff2'),
+       url('iconfont.woff?t=1722996380945') format('woff'),
+       url('iconfont.ttf?t=1722996380945') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-gengduo:before {
+  content: "\e633";
+}
+
+.icon-lianhe40:before {
+  content: "\e866";
+}
+
+.icon-shuangxiajiantou:before {
+  content: "\e660";
+}
+
+.icon-dianzan:before {
+  content: "\e602";
+}
+
+.icon-dianzan_kuai:before {
+  content: "\ec8c";
+}
+
+.icon-xiai:before {
+  content: "\e601";
+}
+
+.icon-tongzhi:before {
+  content: "\e60d";
+}
+
+.icon-fenxiang:before {
+  content: "\e639";
+}
+
+.icon-shuangshangjiantou-:before {
+  content: "\e600";
+}
+
+.icon-jinggao:before {
+  content: "\e716";
+}
+
+.icon-rs-countdown:before {
+  content: "\e614";
+}
+
+.icon-naozhong:before {
+  content: "\e666";
+}
+
+.icon-ic_business_refund24px:before {
+  content: "\e619";
+}
+
+.icon-shoucang:before {
+  content: "\e606";
+}
+
+.icon-pinglun:before {
+  content: "\e618";
+}
+
+.icon-aixin:before {
+  content: "\e622";
+}
+

src/assets/iconfont/iconfont.json

+{
+  "id": "4633414",
+  "name": "驻场",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "10715420",
+      "name": "更多",
+      "font_class": "gengduo",
+      "unicode": "e633",
+      "unicode_decimal": 58931
+    },
+    {
+      "icon_id": "14542055",
+      "name": "已领取",
+      "font_class": "lianhe40",
+      "unicode": "e866",
+      "unicode_decimal": 59494
+    },
+    {
+      "icon_id": "5501759",
+      "name": "双下箭头",
+      "font_class": "shuangxiajiantou",
+      "unicode": "e660",
+      "unicode_decimal": 58976
+    },
+    {
+      "icon_id": "77697",
+      "name": "点赞",
+      "font_class": "dianzan",
+      "unicode": "e602",
+      "unicode_decimal": 58882
+    },
+    {
+      "icon_id": "6380878",
+      "name": "点赞_块",
+      "font_class": "dianzan_kuai",
+      "unicode": "ec8c",
+      "unicode_decimal": 60556
+    },
+    {
+      "icon_id": "5028",
+      "name": "喜爱",
+      "font_class": "xiai",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    },
+    {
+      "icon_id": "5643534",
+      "name": "通知",
+      "font_class": "tongzhi",
+      "unicode": "e60d",
+      "unicode_decimal": 58893
+    },
+    {
+      "icon_id": "11391522",
+      "name": "分享",
+      "font_class": "fenxiang",
+      "unicode": "e639",
+      "unicode_decimal": 58937
+    },
+    {
+      "icon_id": "22652637",
+      "name": "双上箭头-01",
+      "font_class": "shuangshangjiantou-",
+      "unicode": "e600",
+      "unicode_decimal": 58880
+    },
+    {
+      "icon_id": "4266166",
+      "name": "警告",
+      "font_class": "jinggao",
+      "unicode": "e716",
+      "unicode_decimal": 59158
+    },
+    {
+      "icon_id": "6304017",
+      "name": "倒计时",
+      "font_class": "rs-countdown",
+      "unicode": "e614",
+      "unicode_decimal": 58900
+    },
+    {
+      "icon_id": "11737375",
+      "name": "闹钟",
+      "font_class": "naozhong",
+      "unicode": "e666",
+      "unicode_decimal": 58982
+    },
+    {
+      "icon_id": "15053956",
+      "name": "退钱",
+      "font_class": "ic_business_refund24px",
+      "unicode": "e619",
+      "unicode_decimal": 58905
+    },
+    {
+      "icon_id": "5849192",
+      "name": "收藏",
+      "font_class": "shoucang",
+      "unicode": "e606",
+      "unicode_decimal": 58886
+    },
+    {
+      "icon_id": "13053964",
+      "name": "评论",
+      "font_class": "pinglun",
+      "unicode": "e618",
+      "unicode_decimal": 58904
+    },
+    {
+      "icon_id": "19877102",
+      "name": "爱心",
+      "font_class": "aixin",
+      "unicode": "e622",
+      "unicode_decimal": 58914
+    }
+  ]
+}

src/pages/assistingAgriculture/RouteDetails/timeLine.vue

+<template>
+  <div class="time-line">
+    <div class="date">
+      <span>{{ props.date }}</span>
+    </div>
+    <div class="content-wrap">
+      <slot></slot>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { defineProps } from 'vue';
+const props = defineProps({
+  date: {
+    type: String,
+    default: '7:00',
+  },
+});
+</script>
+
+<style lang="scss" scoped>
+.time-line {
+  display: flex;
+  .date {
+    flex: 0 0 120rpx;
+    text-align: center;
+    margin-right: 20rpx;
+    color: #767676;
+    position: relative;
+    &::after {
+      content: '';
+      display: block;
+      height: 100%;
+      width: 0;
+      border-right: 2rpx dashed #767676;
+      position: absolute;
+      left: 50%;
+      top: 0;
+      transform: translateX(-2rpx);
+    }
+    span {
+      z-index: 1;
+      position: relative;
+      display: inline-block;
+      padding: 10rpx;
+      background-color: #fff;
+    }
+  }
+  .content-wrap {
+    flex: 1;
+    padding: 10rpx 0 50rpx;
+    display: flex;
+    flex-direction: column;
+    gap: 12rpx;
+  }
+}
+</style>

src/pages/index/index.vue

@@ -61,7 +61,7 @@
       @change="onChange"
       customClass="guiyang"
       height="68"
-      imageMode="scaleToFill"
+      imageMode="aspectFill"
     ></wd-swiper>
     <!-- 附近人气美食 -->
     <view class="nearby">
@@ -632,13 +632,13 @@ page {
   }
   .nearby {
     width: 710rpx;
-    height: 380rpx;
+    max-height: 380rpx;
     border-radius: 16rpx;
     background: #ffffff;
     margin: 0 auto;
     box-sizing: border-box;
     overflow: hidden;
-    padding-top: 20rpx;
+    padding: 20rpx 0;
     .nearby-top {
       display: flex;
       justify-content: space-between;

src/pages/packageDetails/packageDetails.vue

@@ -141,15 +141,15 @@
         <view class="bz">
           <text class="yh-name">保障：</text>
           <view class="icon-box">
-            <i class="iconfont icon icon-jinggao" />
+            <i class="iconfont icon icon-rs-countdown" />
             过期退
           </view>
-          <view class="icon-box">
-            <i class="iconfont icon icon-jinggao" />
+          <view style="margin-left: 64rpx" class="icon-box">
+            <i class="iconfont icon icon-ic_business_refund24px" />
             随时退
           </view>
-          <view class="icon-box">
-            <i class="iconfont icon icon-jinggao" />
+          <view style="margin-left: 64rpx" class="icon-box">
+            <i class="iconfont icon icon-naozhong" />
             随时用
           </view>
           <i @click="alert" class="iconfont jg icon-jinggao" />
@@ -855,10 +855,10 @@ page {
           align-items: center;
           font-size: 11 * 2rpx;
           color: #abaaaa;
-
           .icon {
-            font-size: 46rpx;
+            font-size: 38rpx;
             font-weight: bold;
+            font-weight: 300;
             color: #fa5151;
           }
         }

src/pages/shop/shop.vue

@@ -45,7 +45,14 @@
                 <text class="tj">推荐</text>
               </view>
               <view class="score-icon">
-                <myRate :score="shopInfo.grade" />
+                <wd-rate
+                  color="#fff"
+                  readonly
+                  v-model="shopInfo.grade"
+                  size="22rpx"
+                  space="8rpx"
+                  :active-color="['#FA5151']"
+                />
               </view>
             </view>
             <view class="shop-business-hours">
@@ -172,7 +179,14 @@
                   <text>{{ item.nickName }}</text>
                   <view class="u-pf">
                     <text>{{ item.descriptionMatches }}分</text>
-                    <myRate color="#FA5151" :score="item.descriptionMatches" />
+                    <wd-rate
+                      color="#fff"
+                      readonly
+                      v-model="item.descriptionMatches"
+                      size="18rpx"
+                      space="8rpx"
+                      :active-color="['#FA5151']"
+                    />
                   </view>
                 </view>
               </view>
@@ -299,7 +313,6 @@ import {
   addImgUrlPrefix,
   navigationSelect,
 } from '@/utils/common';
-import myRate from '@/Components/Rating/Rating.vue';
 const imgUrl = import.meta.env.VITE_APP_IMG_URL;
 const current = ref(0);
 const old = reactive({ scrollTop: 0 });
@@ -308,8 +321,6 @@ const activeId = ref(1);
 const shopInfo = ref({});
 // 店铺轮播图
 const shopSwiperList = ref([]);
-// 当前位置的经纬度-// 店铺的经纬度
-const currentLatitudeAndLongitude = ref({ latitude: 0, longitude: 0 });
 // 店铺经纬度
 const shopLocation = ref({ lat: 0, lon: 0 });
 // 团购商品列表

src/utils/tool.js

@@ -16,3 +16,20 @@ export function timeConversion(diffInMilliseconds) {
     return `${days}天${hours}小时${minutes}分钟`;
   }
 }
+
+export function getLocation() {
+  return new Promise((resolve, reject) => {
+    xma.getLocation({
+      type: 'wgs84',
+      isHighAccuracy: true,
+      success: function (res) {
+        // 经纬度
+        console.log('res.latitude, res.longitude', res.latitude, res.longitude);
+        resolve({ lat: res.latitude, lon: res.longitude });
+      },
+      fail: function (err) {
+        return err;
+      },
+    });
+  });
+}