Merge remote-tracking branch 'origin/master'

src/pages.json

@@ -10,21 +10,21 @@
 			"path": "pages/index/loading",
 			"style": {
 				"navigationBarTitleText": "加载",
-				"navigationStyle":"custom"
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/assistingAgriculture/searchPage/searchPage",
 			"style": {
 				"navigationBarTitleText": "搜索",
-				"navigationStyle":"custom"
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "小程序平台",
-				"navigationStyle":"custom",
+				"navigationStyle": "custom",
 				"enablePullDownRefresh": true
 			}
 		},
@@ -162,7 +162,7 @@
 			"style": {
 				"navigationBarTitleText": "商店首页",
 				"navigationBarBackgroundColor": "#ffffff",
-				"navigationStyle":""
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -188,7 +188,7 @@
 			"style": {
 				"navigationBarTitleText": "用户相册",
 				"navigationBarBackgroundColor": "#ffffff",
-				"navigationStyle":""
+				"navigationStyle": ""
 			}
 		},
 		{
@@ -196,7 +196,7 @@
 			"style": {
 				"navigationBarTitleText": "购物车",
 				"navigationBarBackgroundColor": "#ffffff",
-				"navigationStyle":""
+				"navigationStyle": ""
 			}
 		},
 		{
@@ -204,7 +204,7 @@
 			"style": {
 				"navigationBarTitleText": "确认订单",
 				"navigationBarBackgroundColor": "#ffffff",
-				"navigationStyle":""
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -214,13 +214,12 @@
 				"enablePullDownRefresh": true,
 			}
 		},
-
 		{
 			"path": "pages/assistingAgriculture/reviewDetails/reviewDetails",
 			"style": {
 				"navigationBarTitleText": "点评详情",
 				"navigationBarBackgroundColor": "#ffffff",
-				"navigationStyle":""
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -228,7 +227,7 @@
 			"style": {
 				"navigationBarTitleText": "景点详情",
 				"navigationBarBackgroundColor": "#ffffff",
-				"navigationStyle":"",
+				"navigationStyle": "custom",
 				"onReachBottomDistance": 50
 			}
 		},
@@ -267,4 +266,4 @@
 	"globalStyle": {
 		"navigationStyle": "custom"
 	}
-}
+}
\ No newline at end of file

src/pages/assistingAgriculture/RuralTravel/specialOfferZoneList.vue

 <template>
   <view class="special-offer-zone-list-page">
-    <view class="search">
-      <wd-icon color="#fff" name="thin-arrow-left" class="icon" @tap="back"></wd-icon>
-    </view>
+    <search
+      style="position: fixed; top: 0; z-index: 99; width: 100%"
+      :type="2"
+      title="特价专区"
+      showTitles="true"
+      :backgroundBox="backIconColor"
+    >
+      <view
+        v-if="backIconColor === 'white'"
+        :style="{ color: textColor }"
+        style="width: 100%; text-align: center; font-size: 36rpx"
+      >
+        特价专区
+      </view>
+    </search>
     <view class="swiper">
       <wd-swiper
         customClass="swiper-custom"
@@ -124,6 +136,8 @@ const imgUrl = import.meta.env.VITE_APP_IMG_URL;
 const rotate2 = ref(false);
 const rotate3 = ref(false);
 const rotate4 = ref(false);
+const textColor = ref('#ffffff');
+const backIconColor = ref('white');
 const current = ref(0);
 const isLoadReachBottom = ref(null);
 const params = ref({
@@ -132,6 +146,15 @@ const params = ref({
   isEnd: false,
 });
 const shopSwiperList = ref([]);
+onPageScroll((e) => {
+  if (e.scrollTop > 20) {
+    backIconColor.value = 'white';
+    textColor.value = 'black';
+  } else {
+    backIconColor.value = '';
+    textColor.value = 'white';
+  }
+});
 const locationFiltering = (index) => {
   const rotates = [rotate, rotate2, rotate3, rotate4];
   rotates.forEach((rotate, i) => {

src/pages/assistingAgriculture/cart/ConfirmOrder.vue

 <template>
+  <search style="z-index: 99; width: 100%" :type="2" backgroundBox="#fff">
+    <view style="width: 100%; text-align: center; font-size: 36rpx; font-weight: bold">
+      确认订单
+    </view>
+  </search>
   <view class="confirm-order">
     <wd-popup
       v-model="showpopup"

src/pages/assistingAgriculture/reviewDetails/reviewDetails.vue

 <template>
   <!-- 点评详情页面 -->
+  <search style="z-index: 99; width: 100%" :type="2" backgroundBox="#fff">
+    <view style="width: 100%; text-align: center; font-size: 36rpx; font-weight: bold">
+      点评详情
+    </view>
+  </search>
   <view class="review-details-pages">
     <view class="swiper-list">
       <wd-swiper

src/pages/assistingAgriculture/reviewDetails/scenicSpotDetails.vue

 <template>
   <!-- 点评详情页面 -->
+  <!-- 点评详情页面 -->
+  <search style="z-index: 99; width: 100%" :type="2" backgroundBox="#fff">
+    <view style="width: 100%; text-align: center; font-size: 36rpx; font-weight: bold">
+      点评详情
+    </view>
+  </search>
   <view class="review-details-pages">
     <view class="list">
       <view class="item" v-for="(item, index) in list" :key="index">

src/pages/assistingAgriculture/shop/index.vue

 <template>
+  <search style="z-index: 99; width: 100%" :type="2" backgroundBox="#fff">
+    <view style="width: 100%; text-align: center; font-size: 36rpx; font-weight: bold">
+      确认订单
+    </view>
+  </search>
   <view class="page">
     <view class="banner">
       <wd-swiper :list="shopImgList" height="236rpx" autoplay></wd-swiper>
@@ -249,20 +254,20 @@ uni-page-body {
 .page {
   height: 100%;
   background-color: #f6f6f6;
-  padding: 20rpx;
   box-sizing: border-box;
   display: flex;
   flex-direction: column;
 }
 .banner {
   width: 710rpx;
-  height: 236rpx;
+  padding: 20rpx;
   margin-bottom: 20rpx;
   :deep(.wd-swiper__track) {
     border-radius: 0;
   }
 }
 .commodity-wrap {
+  padding: 20rpx;
   height: 40rpx;
   flex-grow: 1;
   background-color: #fff;

src/pages/order/order.vue

@@ -556,12 +556,12 @@ const anotherOrder = (item) => {
       });
       break;
     case 7:
-      xma.redirectTo({
+      xma.navigateTo({
         url: `/pages/assistingAgriculture/detail/detail?prodId=${item.orderItems[0].prodId}`,
       });
       break;
     case 10:
-      xma.redirectTo({
+      xma.navigateTo({
         url: `/pages/assistingAgriculture/RouteDetails/RouteDetails?prodId=${item.orderItems[0].prodId}&shopId=${item.shopId}`,
       });
       break;

src/pages/order/refund.vue

 <template>
   <view class="container">
     <!-- <Header title="售后/退款"></Header> -->
-    <Search title="售后/退款" backgroundBox="white" :type="2"></Search>
+    <Search title="售后/退款" backgroundBox="white" :showTitle="true"></Search>
     <view class="content" v-if="orderDetail">
       <view class="content-box">
         <view class="content-item">

src/pages/shop/confirmOrder.vue

 <template>
   <!-- 确认订单页面 -->
+  <search
+    title="确认订单"
+    :showTitle="true"
+    style="z-index: 99; width: 100%"
+    :type="2"
+    backgroundBox="#fff"
+  ></search>
   <view class="confirm-order-pages">
     <wd-popup
       v-model="showpopup"
@@ -82,13 +89,6 @@
         <wd-status-tip v-if="orderInfo.shopCoupon.length === 0" image="content" tip="暂无优惠券" />
       </view>
     </wd-popup>
-    <search
-      style="position: fixed; top: 0; z-index: 99; width: 100%"
-      :type="2"
-      backgroundBox="#fff"
-    >
-      <view style="width: 100%; text-align: center; font-size: 36rpx">确认订单</view>
-    </search>
     <!-- 商品卡 -->
     <view class="order-detail-card">
       <view class="title">{{ orderInfo.shopName }}</view>

src/pages/shop/paymentSuccessful.vue

 <template>
   <!-- 支付成功页面 -->
+  <search style="z-index: 99; width: 100%" :type="2" backgroundBox="#fff">
+    <view style="width: 100%; text-align: center; font-size: 36rpx; font-weight: bold">
+      确认订单
+    </view>
+  </search>
   <view class="container">
-    <search
-      style="position: fixed; top: 0; z-index: 99; width: 100%"
-      :type="2"
-      backgroundBox="#fff"
-    >
-      <view style="width: 100%; text-align: center; font-size: 36rpx">确认订单</view>
-    </search>
     <view class="content">
       <!-- 使用状态 -->
       <view class="status">