Merge remote-tracking branch 'origin/master'

src/api/assistingAgriculture/shop.js

@@ -24,3 +24,19 @@ export function sgyBasketlist(data) {
     data,
   });
 }
+// 筑农首页-通过购物车创建临时订单
+export function sgyrddBasketConfirm(data) {
+  return request({
+    url: `/sgyrdd/previewOrder/basket/confirm`,
+    method: 'POST',
+    data,
+  });
+}
+// 筑农首页-提交订单并返回支付信息
+export function znsgyOrderCreate(data) {
+  return request({
+    url: `/sgyrdd/sgyOrder/create`,
+    method: 'POST',
+    data,
+  });
+}

src/pages/assistingAgriculture/cart/ConfirmOrder.vue

@@ -22,7 +22,7 @@
           <view class="customer-phone">187****5632</view>
         </view>
       </view>
-      <view class="estimated-time-view">
+      <!-- <view class="estimated-time-view">
         <text class="send-time">立即送出</text>
         <view class="estimated-time">大约13:45送达</view>
         <view class="estimated-icon"></view>
@@ -31,7 +31,7 @@
           src="/src/static/assistingAgriculture/assets/right-arrow.png"
           alt=""
         />
-      </view>
+      </view> -->
     </view>
     <view class="commordity-information-view">
       <view class="trade-name">杨家黄焖鸡</view>
@@ -89,6 +89,7 @@
             placeholder="请输入你的问题"
             maxlength="200"
             v-model="textInputs"
+            @input="inputRemake"
           ></textarea>
           <view class="current-word">{{ inputLength }}/{{ wordMax }}</view>
         </view>
@@ -106,17 +107,73 @@
       </view>
       <view class="total-discounts">总共优惠&ensp;￥0.00</view>
     </view>
-    <button class="submit-button">提交订单</button>
+    <button class="submit-button" @click="openZfType">提交订单</button>
+    <Payment ref="PaymentRef" @payment="payNow"></Payment>
   </view>
 </template>
 
 <script setup>
 import { ref, computed } from 'vue';
+import Payment from '@/pages/order/components/Payment/index.vue';
+import { sgyrddBasketConfirm, znsgyOrderCreate } from '@/api/assistingAgriculture/shop';
 const wordMax = ref(200);
 const textInputs = ref('');
+const basketIds = ref([]);
 const inputLength = computed(() => {
   return textInputs.value.length;
 });
+onLoad((options) => {
+  const { ids } = options;
+  basketIds.value = ids.split(',');
+  sgyrddBasketConfirmFn(basketIds.value);
+});
+
+const sgyrddBasketConfirmFn = (basketIds) => {
+  sgyrddBasketConfirm({ basketIds, orderType: 'logistics' }).then((res) => {
+    if (res.code === 0) {
+      console.log('11');
+    }
+  });
+};
+const inputRemake = (e) => {
+  const { value } = e.detail;
+  params.value.remark = value;
+};
+const params = ref({
+  id: '',
+  tradeType: '',
+  placeOrderWay: 'sgy',
+  basketIds: [],
+  remark: '',
+});
+const PaymentRef = ref(null);
+const openZfType = () => {
+  PaymentRef.value.open();
+};
+const payNow = async (data) => {
+  params.value.id = data.orderNumber;
+  params.value.tradeType = data.selectType;
+  params.value.basketIds = [];
+  const res = await znsgyOrderCreate(params);
+  const { paymentUrl, outTradeNo } = res.data.result;
+  // 修改列表待付款订单号
+  dataList.value[changeIndex.value].orderNumber = outTradeNo;
+  pendingPaymentOrder.value = outTradeNo;
+  window.location.href = paymentUrl;
+  // 设置一个延时器
+  const start = Date.now();
+  setTimeout(() => {
+    const end = Date.now();
+    if (end - start < 1200) {
+      // 如果 iframe 加载时间小于 1.2 秒，说明应用没有安装
+      xma.showToast({
+        title: '未安装App',
+        icon: 'error',
+      });
+      // 这里可以跳转到应用下载页面
+    }
+  }, 1000);
+};
 </script>
 
 <style lang="scss" scoped>
@@ -131,7 +188,7 @@ page {
 }
 .information-view {
   width: 710rpx;
-  height: 365rpx;
+  // height: 365rpx;
   border-radius: 16rpx;
   // display: flex;
   overflow: hidden;

src/pages/shop/shop.vue

@@ -844,6 +844,7 @@ page {
           display: flex;
           flex-direction: column;
           .shop-title {
+            max-width: 500rpx;
             font-size: 18 * 2rpx;
             font-weight: bold;
             color: #3d3d3d;