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

.env.development

@@ -5,7 +5,7 @@ VITE_APP_ENV = 'development'
 VITE_APP_BASE_URL = '/api'
 
 # 照片url路径 （开发环境）
-VITE_APP_IMG_URL = 'http://file.rhhzkj.com:8080'
+# VITE_APP_IMG_URL = 'http://file.rhhzkj.com:8080'
 
 # 照片url路径（正式环境）
-# VITE_APP_IMG_URL = 'https://file.rddyz.com' 
+VITE_APP_IMG_URL = 'https://file.rddyz.com' 

src/pages/index/foodClassification.vue

@@ -55,7 +55,7 @@
         </view>
       </scroll-view>
     </view>
-    <view class="bootom">
+    <view class="bootom" :style="{ top }">
       <view class="bootom-top">
         <view class="option" @tap="locationFiltering(0)">
           <text :class="{ rotate: rotate }">全部{{ categoryNames }}</text>
@@ -130,6 +130,7 @@ import fab from '../../components/fab/fab.vue';
 import Sort from '../../components/index/Sort.vue';
 import { getByParentId, merchantList, prodSpecial } from '../../api/index';
 
+const top = ref(null);
 const backIconColor = ref('white');
 const textColor = ref('#ffffff');
 const backgroundBox = ref('');
@@ -162,11 +163,20 @@ onLoad((option) => {
   params.value.categoryIds = [parentId];
   pics.value = pic;
   query(parentId);
+  getTop();
   prodSpecialFn();
   getLocationFn().then((res) => {
     getMerchantList();
   });
 });
+// 获取位置板块贴合高度
+const getTop = () => {
+  xma.xh.getMenuButtonBoundingClientRect({
+    success(res) {
+      top.value = (res.top + res.bottom) / 2 + 25 + 'px';
+    },
+  });
+};
 // distance参数来源
 const nearby = (distance) => {
   console.log('distance', distance);

src/pages/index/loading.vue

@@ -10,8 +10,8 @@ import { getTokenUser } from '../../api/index';
 import { getToken } from '../../utils/auth';
 
 onLoad(async (options) => {
-  await signIn();
-  // if (!getToken()) await signIn2();
+  // await signIn();
+  if (!getToken()) await signIn2();
   const { type } = options;
   switch (type) {
     case '0':

src/pages/packageDetails/packageDetails.vue

@@ -168,6 +168,18 @@
           </view>
         </view>
       </view>
+      <view
+        style="
+          width: 100%;
+          text-align: center;
+          font-size: 24rpx;
+          background: #fdfdfd;
+          color: #888989;
+        "
+        v-if="productCombination.length === 0"
+      >
+        没有更多啦~
+      </view>
     </view>
     <view class="rich-text-card">
       <text class="title">商品详情</text>

src/pages/shop/shop.vue

@@ -497,7 +497,6 @@ function getLocationFn() {
       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) {
@@ -552,6 +551,7 @@ const getStoreInformationFn = (id) => {
         if (res.data.shop.labels && res.data.shop.labels !== '') {
           shopInfo.value.tagList = res.data.shop.labels.split(',');
         }
+        shopSwiperList.value.push(imgUrl + res.data.shop.shopLogo);
         const { lat, lon } = res.data.shop.location;
         shopLocation.value.lat = lat;
         shopLocation.value.lon = lon;
@@ -915,8 +915,9 @@ page {
             }
           }
           .shop-business-hours {
+            white-space: nowrap;
             texe {
-              font-size: 8 * 2rpx;
+              font-size: 11 * 2rpx;
               color: #767676;
             }
           }

src/pages/storeEntry/detail.vue

@@ -161,6 +161,9 @@
               label-width="100px"
               v-model="formData.intro"
               prop="intro"
+			  auto-height
+			  show-word-limit
+			  :maxlength="120"
             />
 
             <wd-button type="error" width="80%" class="submitBTN" @tap="submitData">提交</wd-button>

vite.config.ts

@@ -41,8 +41,8 @@ export default defineConfig({
     // 代理配置
     proxy: {
       '/api': {
-        target: 'http://test.rhhzkj.com:8080',
-        // target: 'https://api.rddyz.com',
+        // target: 'http://test.rhhzkj.com:8080',
+        target: 'https://api.rddyz.com',
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/api/, ''),
       },