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

src/api/confirmOrder.js

+import { request } from '../utils/request';
+
+// 创建临时订单-立即抢购时调用
+export function groupBuyConfirm(data) {
+  return request({
+    url: '/sgyrdd/previewOrder/groupBuy/confirm',
+    method: 'POST',
+    data,
+  });
+}

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>
     <wd-popup
       v-model="showpopup"
       position="bottom"
@@ -245,7 +256,6 @@ const currentLatitudeAndLongitude = ref({});
 const shopId = ref('');
 const showpopup = ref(false);
 const prodSkusInfo = ref({});
-const showDetail = ref(false);
 // 商品优惠券
 const productCoupons = ref([]);
 onLoad((options) => {
@@ -265,6 +275,11 @@ function alert() {
     show.value = true;
   }
 }
+function back() {
+  xma.navigateBack({
+    delta: 1,
+  });
+}
 /**
  * 跳转支付
  */
@@ -414,6 +429,59 @@ page {
   position: relative;
   padding-bottom: 110 * 2rpx;
   margin: 0 auto;
+  .search {
+    width: 710rpx;
+    height: 80rpx;
+    // background: rgba(255, 255, 255, 0.8);
+    border-radius: 16rpx 16rpx 16rpx 16rpx;
+    opacity: 0.8;
+    margin: 0 auto;
+    margin-top: 44rpx;
+    display: flex;
+    align-items: center;
+    padding-left: 20rpx;
+    box-sizing: border-box;
+    position: absolute;
+    top: 0;
+    z-index: 99;
+    .arrow {
+      width: 15rpx;
+      height: 24rpx;
+    }
+    .icon {
+      font-size: 28rpx;
+    }
+    .searchBox {
+      width: 129 * 2rpx;
+      height: 26 * 2rpx;
+      background: rgba(243, 243, 243, 0.4);
+      border-radius: 28rpx 28rpx 28rpx 28rpx;
+      display: flex;
+      align-items: center;
+      padding-left: 20rpx;
+      margin-left: 20rpx;
+      .magnifyingGlass {
+        width: 26rpx;
+        height: 26rpx;
+      }
+      .text {
+        margin-left: 10rpx;
+        font-size: 24rpx;
+      }
+    }
+    .icon-box {
+      display: flex;
+      align-content: center;
+      margin-left: 86rpx;
+      .icon {
+        font-size: 40rpx;
+        color: #fff;
+      }
+      .icon-fenxiang {
+        margin-left: 20rpx;
+      }
+    }
+  }
   .title-box {
     display: flex;
     align-items: center;

src/pages/shop/confirmOrder.vue

@@ -79,12 +79,23 @@
 
 <script setup>
 import Header from '@/pages/order/components/Header/index.vue';
+import { groupBuyConfirm } from '@/api/confirmOrder';
 const selectType = ref('wx');
-
+const skuId = ref('');
+const prodId = ref('');
+onLoad((options) => {
+  const { prodId, skuId } = options;
+  prodId.value = prodId;
+  skuId.value = skuId;
+  groupBuyConfirmFn(prodId, skuId);
+});
 function radioChange(evt) {
   const { value } = evt.detail;
   selectType.value = value;
 }
+function groupBuyConfirmFn(prodId, skuId) {
+  groupBuyConfirm({ prodId, skuId }).then((res) => {});
+}
 function submitOrder() {
   // TODO: 跳转到确认订单页面，并��带所选的支付方式
   xma.redirectTo({

src/pages/shop/shop.vue

@@ -4,14 +4,14 @@
     <!-- 搜索 -->
     <view class="search">
       <wd-icon color="#fff" name="thin-arrow-left" class="icon" @tap="back"></wd-icon>
-      <view class="searchBox">
+      <!-- <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> -->
+      <!-- <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
@@ -315,7 +315,7 @@ const commentTotal = ref(0);
 // 周边推荐类型列表
 const recommendedTypesOfPeripherals = ref([]);
 // 商户id
-const shopId = ref('1626126617850544129');
+const shopId = ref('');
 const tagList2 = ref([{ name: '免费停车', id: 1 }]);
 // 周边推荐-商家列表
 const recommendedListOfPeripherals = ref([]);
@@ -325,6 +325,7 @@ onLoad((options) => {
     peripheryRecomFn();
   });
   groupBuyListFn(options.shopId);
+  shopId.value = options.shopId;
   couponShopListFn(options.shopId);
   getEvaluationPageFn();
 });
@@ -680,7 +681,7 @@ page {
     .icon-box {
       display: flex;
       align-content: center;
-      margin-left: 86rpx;
+      margin-left: auto;
       .icon {
         font-size: 40rpx;
         color: #fff;