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

src/pages/order/detail.vue

 <template>
   <view class="container">
-    <Header title="订单详情"></Header>
+    <!-- <Header title="订单详情"></Header> -->
+    <Search title="订单详情" backgroundBox="white" :showTitle="true"></Search>
     <view class="content" v-if="orderDetail">
       <!-- 使用状态 -->
       <view class="status">
@@ -405,7 +406,6 @@ page {
   margin: 0 auto;
 
   .content {
-    padding-top: 44px;
     display: flex;
     flex-direction: column;
     gap: 20rpx;

src/pages/order/order.vue

 <template>
   <view class="container">
     <!--    顶部搜索框-->
-    <view class="top">
-      <wd-icon
-        class="icon"
-        name="thin-arrow-left"
-        color="#000"
-        size="32rpx"
-        @click="handleBack"
-      ></wd-icon>
+    <Search backgroundBox="#f3f3f3">
       <view class="searchBox">
         <view class="search">
           <wd-icon name="search" size="30rpx" color="#999"></wd-icon>
@@ -31,7 +24,8 @@
           @tap="handleClear"
         ></wd-icon>
       </view>
-    </view>
+    </Search>
+
     <view class="tabs" v-if="orderDic">
       <wd-tabs v-model="tab" animated :lineWidth="38" :lineHeight="3" @change="handleChange" sticky>
         <block v-for="item in tabs" :key="item.value">
@@ -549,14 +543,31 @@ function callShopPhone(phoneNumber) {
 }
 
 /**
- * 再来一单
+ * 再来一单 商品类型，0-普通商品，5-团购，6-套餐，7-预售，8-售券
  */
 const anotherOrder = (item) => {
   // 清空查询待付款状态
   pendingPaymentOrder.value = null;
+
+  switch (item.prodType) {
+    case 5:
       xma.navigateTo({
-    url: `/pages/shop/confirmOrder?prodId=${item.orderItems[0].prodId}&skuId=${item.orderItems[0].skuId}`,
+        url: `/pages/packageDetails/packageDetails?prodId=${item.orderItems[0].prodId}`,
       });
+      break;
+    case 7:
+      xma.redirectTo({
+        url: `/pages/assistingAgriculture/detail/detail?prodId=${item.orderItems[0].prodId}`,
+      });
+      break;
+    case 10:
+      xma.redirectTo({
+        url: `/pages/assistingAgriculture/RouteDetails/RouteDetails?prodId=${item.orderItems[0].prodId}&shopId=${item.shopId}`,
+      });
+      break;
+    default:
+      break;
+  }
 };
 
 /**
@@ -566,7 +577,7 @@ const handleQrcode = (item) => {
   // 清空查询待付款状态
   pendingPaymentOrder.value = null;
   xma.navigateTo({
-    url: `/pages/order/ticketCode?orderNumber=${item.orderNumber}`,
+    url: `/pages/order/ticketCode?orderNumber=${item.orderNumber}&shopName=${item.shopName}`,
   });
 };
 
@@ -579,6 +590,9 @@ const handleRemark = (item) => {
   });
 };
 
+/**
+ * 售后详情
+ */
 const handleAfterSales = (item) => {
   xma.navigateTo({
     url: `/pages/order/afterSales?orderNumber=${item.orderNumber}`,
@@ -665,7 +679,7 @@ page {
   margin: 0 auto;
 
   .tabs {
-    padding-top: 108rpx;
+    // padding-top: 20rpx;
 
     &:deep(.wd-tabs) {
       background-color: #f5f5f5;
@@ -693,8 +707,8 @@ page {
   align-items: center;
   padding: 0 30rpx;
   gap: 14rpx;
-
-  .searchBox {
+}
+.searchBox {
   width: 492rpx;
   height: 66rpx;
   background: #f3f3f3;
@@ -703,6 +717,7 @@ page {
   justify-content: space-between;
   align-items: center;
   padding: 0rpx 28rpx;
+  margin-left: 40rpx;
 
   background-color: #fff;
 
@@ -720,7 +735,6 @@ page {
       font-size: 28rpx;
     }
   }
-  }
 }
 
 .content {

src/pages/order/refund.vue

 <template>
   <view class="container">
-    <Header title="售后/退款"></Header>
+    <!-- <Header title="售后/退款"></Header> -->
+    <Search title="售后/退款" backgroundBox="white" :type="2"></Search>
     <view class="content" v-if="orderDetail">
       <view class="content-box">
         <view class="content-item">
@@ -243,7 +244,7 @@ page {
   margin: 0 auto;
 
   .content {
-    padding: 108rpx 10rpx 0;
+    padding: 20rpx 10rpx 0;
     display: flex;
     flex-direction: column;
     gap: 60rpx;

src/pages/order/ticketCode.vue

 <template>
   <view class="container">
-    <Header title="查看券码"></Header>
+    <!-- <Header title="查看券码"></Header> -->
+    <Search title="查看券码" backgroundBox="white" :showTitle="true"></Search>
     <view class="content" v-if="orderDetail">
       <!-- 使用状态 -->
       <view class="status">
-        <view class="status-text">{{ orderDetail.orderItems[0].prodName }}</view>
-        <view class="detail">有效期：{{ orderDetail.orderStore.receiverTime }}</view>
+        <view class="status-text">{{ shopName }}</view>
+        <view class="detail">有效期：{{ orderDetail.orderStore.writeOffEnd }}</view>
       </view>
 
       <!-- 券码信息 -->
@@ -32,8 +33,9 @@ import Header from './components/Header/index.vue';
 import { getOrderDetail } from '@/api/order';
 import QRCode from 'qrcode';
 
+const shopName = ref('商家名称');
 onLoad((options) => {
-  console.log(options);
+  shopName.value = options.shopName;
   getOrderDetailFn(options.orderNumber);
 });
 
@@ -76,7 +78,6 @@ page {
   margin: 0 auto;
 
   .content {
-    padding-top: 44px;
     display: flex;
     flex-direction: column;
     gap: 20rpx;

src/pages/packageDetails/packageDetails.vue

 <template>
   <view class="package-details">
-    <view class="search">
-      <wd-icon color="#fff" name="thin-arrow-left" class="icon" @tap="back"></wd-icon>
-      <!-- <view class="searchBox">
-        <image class="magnifyingGlass" src="@/static/shop/search.png" mode="aspectFill" />
-        <input type="text" :value="test" class="text" />
-      </view> -->
-      <!-- <view class="icon-box">
-        <i class="iconfont icon icon-shoucang"></i>
-        <i class="iconfont icon icon-fenxiang"></i>
-      </view> -->
-    </view>
+    <search
+      style="position: fixed; top: 0; z-index: 99; width: 100%"
+      :type="2"
+      title=""
+      :backgroundBox="backIconColor"
+    ></search>
     <wd-popup
       v-model="showpopup"
       position="bottom"
@@ -267,9 +262,17 @@ const show = ref(false);
 const shopLocation = ref({});
 const shopId = ref('');
 const showpopup = ref(false);
+const backIconColor = ref('');
 const prodSkusInfo = ref({});
 // 商品优惠券
 const productCoupons = ref([]);
+onPageScroll((e) => {
+  if (e.scrollTop > 20) {
+    backIconColor.value = 'white';
+  } else {
+    backIconColor.value = '';
+  }
+});
 onLoad((options) => {
   const { prodId } = options;
   myProdId.value = prodId;

src/pages/shop/confirmOrder.vue

@@ -82,7 +82,13 @@
         <wd-status-tip v-if="orderInfo.shopCoupon.length === 0" image="content" tip="暂无优惠券" />
       </view>
     </wd-popup>
-    <Header title="确认订单"></Header>
+    <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>
@@ -226,7 +232,7 @@ function alert() {
 }
 function groupBuyConfirmFn(prodId, skuId) {
   return new Promise((resolve, reject) => {
-    groupBuyConfirm({ prodId, skuId,orderType:'store' }).then((res) => {
+    groupBuyConfirm({ prodId, skuId, orderType: 'store' }).then((res) => {
       if (res.code === 0) {
         res.data.orderItems[0].pic = imgUrl + res.data.orderItems[0].pic;
         orderInfo.value = res.data;

src/pages/shop/paymentSuccessful.vue

 <template>
   <!-- 支付成功页面 -->
   <view class="container">
-    <Header :showBack="false" title=""></Header>
+    <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">

src/pages/shop/shop.vue

@@ -2,7 +2,7 @@
   <!-- 店铺详情页面 -->
   <view class="shop-pages">
     <search
-      style="position: fixed; top: 0; z-index: 99"
+      style="position: fixed; top: 0; z-index: 99; width: 100%"
       :type="2"
       title=""
       :backgroundBox="backIconColor"

src/pages/ticket/detail.vue

 <template>
   <view class="container">
-    <Header :title="shopDetail.shopName"></Header>
-
+    <!-- <Header :title="shopDetail.shopName"></Header> -->
+    <Search :title="shopDetail.shopName" backgroundBox="white" :showTitle="true"></Search>
     <view class="content">
       <view class="shop">
         <image :src="fileDomain + shopDetail.shopLogo" class="logo" mode="aspectFill"></image>
@@ -342,7 +342,7 @@ page {
   .content {
     display: flex;
     flex-direction: column;
-    padding: 100rpx 26rpx 26rpx;
+    padding: 20rpx 26rpx 26rpx;
     gap: 26rpx;
 
     .shop {

src/pages/ticket/ticket.vue

 <template>
   <view class="container">
-    <Header title="我的券"></Header>
+    <!-- <Header title="我的券"></Header> -->
+    <Search title="我的券" backgroundBox="white" :showTitle="true"></Search>
     <view class="tab">
       <view
         :class="currentTab == index ? 'tab-select' : 'tab-item'"
@@ -308,7 +309,7 @@ page {
   .content {
     display: flex;
     flex-direction: column;
-    padding: 202rpx 26rpx 26rpx;
+    padding: 100rpx 26rpx 26rpx;
     gap: 36rpx;
 
     .card {