Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev

src/components/CompoentsOrder/complete/index.jsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from "react";
 import Taro, { useDidShow } from "@tarojs/taro";
-import { getOrderSub, getQrcode } from "@/services/payOrder";
+import { getOrderSub } from "@/services/payOrder";
 import formatTime from "@/utils/formatTime";
 import image from "@/assets/icons/ProCard/8kb.jpg";
 import food from "@/assets/icons/ProCard/food.png";

src/services/miniapp.js

@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+
+/**
+* 获取小程序码
+* @param {*} id
+* @returns 
+*/
+export const getQrcode = (id) => request(`/qrcode/${id}`)

src/services/payOrder.js

@@ -32,13 +32,6 @@ export const payOrder = (id) => request(`/order/${id}/pay`, { method: 'post' })
 */
 export const refund = (id, data) => request(`/order/${id}/refund`, { method: 'delete', data })
 
-/**
-* 获取子订单列表
-* @param {*} id
-* @returns 
-*/
-export const getQrcode = (id) => request(`/qrcode/${id}`)
-
 /**
 * 获取待支付/待核销/退款数量
 * @param {*} id

src/utils/hooks/useRouter.js

@@ -1,22 +1,43 @@
 import Taro, { useRouter } from '@tarojs/taro'
 import { parseQueryString } from '@/utils'
 import { useModel } from '@/store'
+import { useEffect, useRef, useState } from 'react'
+import { getQrcode } from '@/services/miniapp'
 
 export default () => {
   const router = useRouter()
+  const routerRef = useRef()
   const { qrCode } = useModel('person')
 
-  // 扫码进入的
-  if (router?.params?.scene) {
-    if (qrCode) {
-      const qrParams = parseQueryString(qrCode) || {}
-      router.params = {
-        ...router.params || {},
-        ...qrParams,
-        parseQRFinished: true, 
+  const [toggleRefresh, setToggleRefresh] = useState()
+  
+  routerRef.current = router
+  const scene = router?.params?.scene
+
+  useEffect(() => {
+    // 扫码进入
+    if (scene) {
+      if (qrCode) {
+        const qrParams = parseQueryString(qrCode) || {}
+        routerRef.current.params = {
+          ...routerRef.current.params || {},
+          ...qrParams,
+          parseQRFinished: true, 
+        }
+        setToggleRefresh(Math.random().toString())
+      } else {
+        getQrcode(scene).then((res) => {
+          const qrParams = parseQueryString(res.scene) || {}
+          routerRef.current.params = {
+            ...routerRef.current.params || {},
+            ...qrParams,
+            parseQRFinished: true, 
+          }
+          setToggleRefresh(Math.random().toString())
+        })
       }
     }
-  }
+  }, [qrCode, scene])
 
-  return router
+  return routerRef.current
 }