src/config/index.ts

@@ -11,10 +11,10 @@ const mapEnvVersion = {
   // develop: 'http://192.168.0.11:8081', // 王
   // develop: 'http://192.168.1.21:8080', // 田
   // develop: 'http://74949mkfh190.vicp.fun', // 付
-  develop: 'http://47.109.84.152:8081', // 测试代理
+  // develop: 'http://47.109.84.152:8081', // 测试代理
   // develop: 'https://5ed0f7cc.r9.vip.cpolar.cn',
   // develop: 'https://25740642.r3.cpolar.top',
-  // develop: 'https://smqjh.api.zswlgz.com',
+  develop: 'https://smqjh.api.zswlgz.com',
   /**
    * 体验版
    */

src/store/address.ts

@@ -67,6 +67,9 @@ export const useAddressStore = defineStore('address', {
           console.log('位置获取成功', res)
           this.Location.latitude = res.latitude
           this.Location.longitude = res.longitude
+          // this.Location.latitude = 26.5919
+          // this.Location.longitude = 106.621
+
           // #ifndef MP-WEIXIN
           uni.hideLoading()
           // #endif

src/subPack-common/threePay/index.vue

@@ -133,9 +133,12 @@ onHide(() => {
 })
 
 // 页面卸载时清理，下次进入重新开始
-onUnload(() => {
+onUnload(async () => {
   stopCountdown()
   endTimestamp = null
+  await useUserStore().$reset()
+  useSmqjhCartStore().$reset()
+  useAddressStore().$reset()
 })
 </script>
 

src/subPack-film/submit-order/index.vue

@@ -89,38 +89,61 @@ function next() {
 
 async function pay() {
   loading.value = true
-  console.log(info.value.chooseSeatList)
-  query.value.fastTicket = isWithin45Minutes(new Date(), info.value.showTime)
-  query.value.movieOrderItems = info.value.chooseSeatList.map((item: any) => {
-    if (isWithin45Minutes(new Date(), info.value.showTime)) { // 如果在45分钟内，快速出票
-      return {
-        name: item.seatName,
-        price: item.fastPrice,
+  try {
+    query.value.fastTicket = isWithin45Minutes(new Date(), info.value.showTime)
+    query.value.movieOrderItems = info.value.chooseSeatList.map((item: any) => {
+      if (isWithin45Minutes(new Date(), info.value.showTime)) { // 如果在45分钟内，快速出票
+        return {
+          name: item.seatName,
+          price: item.fastPrice,
+        }
+      }
+      else {
+        return {
+          name: item.seatName,
+          price: item.ticketPrice,
+        }
+      }
+    })
+    const { data: orderNumber } = await Apis.film.addFilmOrder({ data: query.value })
+    const payMent = await useUserStore().getPayMent(orderNumber)
+    if (payMent.payType !== 'point') {
+      try {
+        // // #ifdef MP-WEIXIN
+        // const res = await useUserStore().handleCommonPayMent(orderNumber)
+        // await useUserStore().getWxCommonPayment(res)
+        // await useUserStore().paySuccess('film-order', 'subPack-film/index/index')
+        // // #endif
+        // // #ifdef H5
+        // useUserStore().handleCommonWechatPay(orderNumber)
+        // await handleH5PayResult(orderNumber)
+        // // #endif
+        useGlobalToast().show('暂不支持微信支付')
+      }
+      catch {
+        await useUserStore().payError('film-order', 'subPack-film/index/index')
       }
     }
     else {
-      return {
-        name: item.seatName,
-        price: item.ticketPrice,
-      }
+      await useUserStore().handleCommonPayMent(orderNumber)
+      await useUserStore().paySuccess('film-order', 'subPack-film/index/index')
     }
-  })
-  const { data: orderNumber } = await Apis.film.addFilmOrder({ data: query.value })
-  const res = await useUserStore().handleCommonPayMent(orderNumber)
-  loading.value = false
-  if (res.payType !== 1) {
-    // await getWxCommonPayment(res)
-    uni.showToast({
-      title: '当前只支持积分支付',
-      icon: 'none',
-      duration: 2000,
-    })
   }
-  else {
-    await useUserStore().paySuccess('film-order', 'subPack-film/index/index')
+  catch (error) {
+    console.error('支付失败:', error)
+  }
+  finally {
+    loading.value = false
   }
 }
-
+// async function handleH5PayResult(orderNumber: string) {
+//   const isPaySuccess = await useUserStore().pollOrderPaySuccess(orderNumber)
+//   if (isPaySuccess) {
+//     await useUserStore().paySuccess('film-order', 'subPack-film/index/index')
+//     return
+//   }
+//   useGlobalToast().show({ msg: '暂未查询到支付成功，请稍后在订单列表查看' })
+// }
 function call() {
   uni.makePhoneCall({
     phoneNumber: info.value.phone,

src/subPack-smqjh/components/film-orderList/film-orderList.vue

@@ -10,12 +10,19 @@ const _emit = defineEmits<{
 }>()
 
 async function handlePay(orderNumber: string) {
-  const res = await useUserStore().handleCommonPayMent(orderNumber)
-  if (res.payType !== 1) {
-    // await useUserStore().getWxCommonPayment(res, 1)
-    useGlobalToast().show('当前只支持积分支付')
+  const payMent = await useUserStore().getPayMent(orderNumber)
+  if (payMent?.payType !== 'point' && payMent) {
+    // // #ifdef MP-WEIXIN
+    // const res = await useUserStore().handleCommonPayMent(orderNumber)
+    // await useUserStore().getWxCommonPayment(res)
+    // _emit('refresh')
+    // // #endif
+    // // #ifdef H5
+    // useUserStore().handleCommonWechatPay(orderNumber)
+    // // #endif
   }
   else {
+    await useUserStore().handleCommonPayMent(orderNumber)
     _emit('refresh')
   }
 }

src/subPack-smqjh/components/xsb-orderList/xsb-orderList.vue

@@ -25,7 +25,6 @@ async function handlePay(orderNumber: string) {
   if (payMent?.payType !== 'point' && payMent) {
     // #ifdef MP-WEIXIN
     const res = await useUserStore().handleCommonPayMent(orderNumber)
-
     await useUserStore().getWxCommonPayment(res)
     _emit('refresh')
     // #endif