Merge remote-tracking branch 'origin/master'

src/pages/assistingAgriculture/RouteDetails/RouteDetails.vue

@@ -304,7 +304,7 @@
                   />
                   <br />
                 </template>
-                <span v-html="v.activityDescribes"></span>
+                <span class="desc" v-html="v.activityDescribes"></span>
               </div>
               <p>
                 <img class="icon" src="/static/assistingAgriculture/routeDetails/clock.png" />
@@ -1059,6 +1059,21 @@ uni-page-body {
           font-weight: normal;
           line-height: normal;
           color: #3d3d3d;
+          .desc {
+            img {
+              max-width: 100%;
+              object-fit: cover;
+              height: auto;
+              margin-top: 20rpx;
+            }
+            p {
+              font-size: 24rpx;
+            }
+            li {
+              font-size: 24rpx;
+              margin-top: 8rpx;
+            }
+          }
         }
         .icon {
           height: 32rpx;

src/pages/assistingAgriculture/detail/detail.vue

@@ -497,8 +497,19 @@ page {
     padding: 20rpx;
     .desc {
       padding-bottom: 20rpx;
+
       img {
-        width: 100%;
+        max-width: 100%;
+        object-fit: cover;
+        height: auto;
+        margin-top: 20rpx;
+      }
+      p {
+        font-size: 24rpx;
+      }
+      li {
+        font-size: 24rpx;
+        margin-top: 8rpx;
       }
     }
   }

src/pages/index/index.vue

@@ -68,7 +68,7 @@
       @change="onChange"
       customClass="guiyang"
       height="136rpx"
-      imageMode="aspectFit"
+      imageMode="scaleToFill"
     ></wd-swiper>
     <!-- 附近人气美食 -->
     <view class="nearby">

src/pages/order/order.vue

@@ -196,8 +196,8 @@ const fileDomain = import.meta.env.VITE_APP_IMG_URL;
 const stateList = ref({});
 const orderDic = ref();
 onLoad(async (options) => {
-  // await signIn();
-  if (!getToken()) await signIn2();
+  await signIn();
+  // if (!getToken()) await signIn2();
   if (!getOrderDic()) await orderStatus();
   orderDic.value = getOrderDic();
   orderDic.value.baseOrder[0].value = 'all';

src/pages/packageDetails/packageDetails.vue

@@ -998,10 +998,10 @@ page {
       margin-top: 20rpx;
     }
     p {
-      font-size: 22rpx;
+      font-size: 24rpx;
     }
     li {
-      font-size: 22rpx;
+      font-size: 24rpx;
       margin-top: 8rpx;
     }
     .rich-more-btn {

src/pages/ticket/ticket.vue

@@ -131,8 +131,8 @@ const fileDomain = import.meta.env.VITE_APP_IMG_URL;
 
 const contentHeight = ref('88rpx');
 onLoad(async () => {
-  // await signIn();
-  if (!getToken()) await signIn2();
+  await signIn();
+  // if (!getToken()) await signIn2();
   xma.xh.getMenuButtonBoundingClientRect({
     success(res) {
       contentHeight.value = res.bottom * 2 + 10 + 'rpx'; // 左边界坐标，单位：px