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

src/pages/assistingAgriculture/cart/ConfirmOrder.vue

@@ -256,7 +256,7 @@ const openZfType = () => {
 };
 function groupBuyConfirmFn(prodId, skuId) {
   return new Promise((resolve, reject) => {
-    groupBuyConfirm({ prodId, skuId }).then((res) => {
+    groupBuyConfirm({ prodId, skuId, orderType: 'logistics' }).then((res) => {
       if (res.code === 0) {
         orderInfo.value = res.data;
         resolve(res.data.shopId);
@@ -805,6 +805,7 @@ page {
           color: #77818f;
           box-sizing: border-box;
           border-radius: 12rpx;
+          z-index: 1;
         }
       }
       .xj-content {

src/pages/shop/confirmOrder.vue

@@ -226,7 +226,7 @@ function alert() {
 }
 function groupBuyConfirmFn(prodId, skuId) {
   return new Promise((resolve, reject) => {
-    groupBuyConfirm({ prodId, skuId }).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/shop.vue

 <template>
   <!-- 店铺详情页面 -->
   <view class="shop-pages">
+    <search
+      style="position: fixed; top: 0; z-index: 99"
+      :type="2"
+      title=""
+      :backgroundBox="backIconColor"
+    ></search>
     <!-- 搜索 -->
-    <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 style="color: red" class="iconfont icon icon-shoucang"></i>
-        <i style="color: red" class="iconfont icon icon-fenxiang"></i>
-      </view> -->
-    </view>
     <view class="swiper">
       <wd-swiper
         customClass="swiper-custom"
@@ -330,6 +325,7 @@ const shopLocation = ref({ lat: 0, lon: 0 });
 const listOfGroupBuyingProducts = ref([]);
 // 商家优惠券
 const merchantCoupons = ref({});
+const backIconColor = ref('');
 // 评论分页
 const params = ref({
   current: 1,
@@ -368,6 +364,13 @@ onLoad(async (options) => {
   // 获取位置并计算距离
   calculateDistance();
 });
+onPageScroll((e) => {
+  if (e.scrollTop > 20) {
+    backIconColor.value = 'white';
+  } else {
+    backIconColor.value = '';
+  }
+});
 function scrollToTop() {
   // 使用 scrollTo 方法滚动到顶部
   xma.pageScrollTo({
@@ -824,6 +827,7 @@ page {
   .content {
     width: 750rpx;
     position: relative;
+    z-index: 0;
     .shop-info {
       width: 750rpx;
       background-color: #fdfdfd;