From 256135f15bad327b1d08a4093702762f2765ebac Mon Sep 17 00:00:00 2001
From: bobobobo <1055026847@qq.com>
Date: Thu, 29 Jan 2026 00:57:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E8=A6=81=E4=B8=80=E4=B8=AA=E6=99=AE?=
 =?UTF-8?q?=E9=80=9A=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E8=B7=9F=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                 |   4 +--
 api/mall.js                          |   9 ++++++
 manifest.json                        |   4 +--
 pages/mall/confirm-order.vue         |  44 +++++++++++++++++++++++----
 pages/mall/styles/confirm-order.scss |   4 +++
 static/images/public/pingtuan.png    | Bin 0 -> 1335 bytes
 6 files changed, 55 insertions(+), 10 deletions(-)
 create mode 100644 static/images/public/pingtuan.png

diff --git a/.env b/.env
index ba95087..2738c31 100644
--- a/.env
+++ b/.env
@@ -1,6 +1,6 @@
 # API
-VITE_SYSTEM_URL = "http://ea252b67.natappfree.cc"
-# VITE_SYSTEM_URL = "https://dev.cqjcteach.cn/prod-api"
+# VITE_SYSTEM_URL = "http://ea252b67.natappfree.cc"
+VITE_SYSTEM_URL = "https://dev.cqjcteach.cn/prod-api"
 
 # 第三方客户 channelId
 VITE_CHANNEL_ID = "7b81ec142eca42baa045820793b821bb"
diff --git a/api/mall.js b/api/mall.js
index c5b8de1..eb8ef8e 100644
--- a/api/mall.js
+++ b/api/mall.js
@@ -53,6 +53,15 @@ export const addOrder = data => {
   })
 }
 
+/** 创建普通订单接口 */
+export const createOrder = data => {
+  return http({
+    url: '/api/service/order/normal',
+    method: 'post',
+    data
+  })
+}
+
 /** 我的拼团列表 */
 export const getMyGroupList = data => {
   return http({
diff --git a/manifest.json b/manifest.json
index d09a61d..4fb33f4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "密谈IM",
     "appid" : "__UNI__9EFDC69",
     "description" : "",
-    "versionName" : "1.1.1",
-    "versionCode" : 110,
+    "versionName" : "1.1.2",
+    "versionCode" : 111,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/mall/confirm-order.vue b/pages/mall/confirm-order.vue
index 72d059d..830654b 100644
--- a/pages/mall/confirm-order.vue
+++ b/pages/mall/confirm-order.vue
@@ -1,6 +1,6 @@
 <script setup>
   import { onLoad, onShow } from '@dcloudio/uni-app'
-  import { getProductDetail, addOrder } from '@/api/mall'
+  import { getProductDetail, addOrder, createOrder } from '@/api/mall'
   import { reactive, ref } from 'vue'
   import { formatRMB } from '@/utils'
   import { getUserAddress } from '@/api'
@@ -30,7 +30,9 @@
     /** 默认地址 */
     address: '',
     /** 可选数量 */
-    maxNum: 1
+    maxNum: 1,
+    /** 是否发起拼团 */
+    startGroup: true
   })
   /** 顶部地址信息 */
   const topRessData = reactive({
@@ -140,10 +142,17 @@
       skuId: formData.spec
     }
     tixian.value.close()
-    const res = await addOrder(data)
-    await refreshUserInfo()
-    await showToast('订单提交成功', 'success')
-    navigateTo('/pages/shop-together/detail', { id: res.data.groupId })
+    if (formData.startGroup) {
+      const res = await addOrder(data)
+      await refreshUserInfo()
+      await showToast('订单提交成功', 'success')
+      navigateTo('/pages/shop-together/detail', { id: res.data.groupId })
+    } else {
+      const res = await createOrder(data)
+      await refreshUserInfo()
+      await showToast('订单提交成功', 'success')
+      navigateBack()
+    }
   }
 
   onShow(() => {
@@ -256,6 +265,29 @@
           ></image>
         </view>
       </view>
+
+      <view
+        class="pay-way-item"
+        @click="formData.startGroup = !formData.startGroup"
+      >
+        <view class="icon">
+          <image
+            src="/static/images/public/pingtuan.png"
+            mode="aspectFit"
+            class="left-icon"
+          ></image>
+          <text>发起拼团</text>
+        </view>
+
+        <view class="check">
+          <image
+            v-show="formData.startGroup"
+            src="/static/images/public/check-to-confirm.png"
+            mode="aspectFit"
+            class="check-icon"
+          ></image>
+        </view>
+      </view>
     </view>
 
     <!-- 底部按钮 -->
diff --git a/pages/mall/styles/confirm-order.scss b/pages/mall/styles/confirm-order.scss
index 5cfe7b4..48ad548 100644
--- a/pages/mall/styles/confirm-order.scss
+++ b/pages/mall/styles/confirm-order.scss
@@ -126,6 +126,10 @@
     border-radius: 32rpx;
     background: #ffffff;
     margin-bottom: 110rpx;
+    .pay-way-item + .pay-way-item {
+      border-top: 2rpx solid #e6e6e6;
+      box-sizing: border-box;
+    }
     .pay-way-item {
       padding: 32rpx;
       display: flex;
diff --git a/static/images/public/pingtuan.png b/static/images/public/pingtuan.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ef3c865b8cfe9816caebe64cab10b0098916dcf
GIT binary patch
literal 1335
zcmV-71<3k|P)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}000E+Nkl<ZcmeE~
zT}~u75XZ|6xdZSLILU$(R>~<@ju0{XJn+0kIRfk{A}x^^PQv76mpg<R=l}DxTW$Bp
zbk7V(k<#kIcDX+OE|<$a6!sr`{s;WWp9ja#mxqH>+FftpRuKl!mxrTk==R~zLyLX)
z3^{X;wD4}f9X{Xwb#(Xpw}VgHE?^_T00jVmocSr#3&h#6dH=~fcNf4v96quGw!t$B
zFhGeWKmo9UKQq9aow5Tg8k;ua84Q?+0Ca6MM>uEEi#?}kA6*Ys8w8lB5|N=sN69JT
z1OXpI^wt8_p?SpM5M$fO;DZ!dXQLNzx$4t(Ms_x@gIW6QG}#H5oMqLWnr}3L&pyzt
zfH}DXa(3p;-L&F%?%ur3t?OaFYfgOU{RIJ2xAC?DRyDY5NM;OyefoU<{kj26KqtR^
zzua5+vrHuny%x#5KwSn#+aC_1D=ylm8i31{ZJxJs#^L$x*O&R;t3Sz{&R8Tn=yi!?
zbLlYT^Faeg1F$nUO*J<d$yx0ho<$4Zd`O`oJBUsjmIh!6HdZCx>eY6$rI6V&0MQ}2
zS&fbH%*apC(iO*xpNgr*bJ0C1@cH~@7Ix6Nz=LmnkGEsXo&<0$Dw$Y0bT;3AUEV`D
zhg&Rc##o@A1nMjK39<FGk*+?z+#`=(<k7<GB&AnaU`?Q?_01Q>hx)jsf2!>aUt_WK
zaJ9lyq^ANs<)VoTM}~1l`eMUoozJ+BT$Z8<U|ag`bm+4h=M)ijPe}*0rbQ3{Y_7=r
zu*J^V&zfKH)aiY*v`7K39QNwJ`(%bG1-vO59Y(3nL~rs^2BYB$aGu;zptTji!Y}8{
zO+NlOfjDrC6Uw$TnHw>9-M5fRrl$g|{`yztO11P1fLG<IXZ0K+@7#rHA%UVLRh2M~
ze9D>Tytls-zIc7_{;P%Hn4Su7ohiPx5soNJE0C*Oh$^AOr3&G1CS|lKY3NVRe}u(F
zek^0mN1k`S`-;X$MipSL(rm6V6tE8}QJykpR&dHI8K=9SD;bLEMdTSrVvGW1FY;Vg
zwwTYUj;%;0y;Y&N_9p?Ei0C@DlHzV@fz!yN)tEA8q28CWX4Y-fnokOtoNLOA<`9t>
z<<ZKyg3e8yl>pX(3LhtRfzkca0Vy(Cw?)A%mrr$e0yu7EU0`hA`{mc5v+b=JjF|DQ
zQg%a=0A?%29drT2IxP9>)efCeML1NJ-B6X#n2vU<#8hb|fZ^(+ySvQjQ0juXgs#du
z9Dzl!lsv!g;~Yl=sM@WXYy)sukycidNxA@q07hvFlaeR0@Ko~F{=5o0>;9BBbFl_s
z1or+}wjVxibNJtw{<$Y$&y*_UX#p=DV7tqdu4?3ld=++KXa!7^+4cY?|0B>b4U#G9
z>bjbWE^@SqaylTrz>soRqgKF7vF%>JaOuA%;gj_0^4SR(h4QCQdwL+SdkVj*`^@$N
zW?SA1G?C?FsShl3y?_w_G+$R3Wc(IH&f;T;?X`fT5e%wEpX?O4N*6Z!ayI&p?O?zt
z#AxG0<3Tr~<eIN8AZ+k`jLoJ%H)j;!Xa*<b8%{&{Q>4N#h$xV^0%($9cckYg`q0Nl
zE;eMm5#VSTr&qe7iPS_O0K+06@{(~N=JXFj(kkk1+HM87%_)n3#^hz2oi5(a0e3mt
t75`rV00960P;Rlk00006Nkl<Z0|2t8m3JR`JX!z%002ovPDHLkV1h`$iX#93

literal 0
HcmV?d00001