fix

src/components/CompoentsOrder/complete/index.jsx

@@ -43,11 +43,6 @@ export default (props) => {
 
   const getList = () => {
     setHasNextPage(false);
-
-    // let params = {};
-
-    // if (type === 1) {
-    // }
     getOrderSub({
       pageNum,
       pageSize: 10,
@@ -84,11 +79,10 @@ export default (props) => {
     Taro.scanCode({
       onlyFromCamera: true,
       success: (res) => {
+        console.log(res,'-------------')
         if (res.path) {
-          getQrcode(res.result).then((result) => {
-            Taro.navigateTo({
-              url: `/${result.page}?${result.scene}`,
-            });
+          Taro.navigateTo({
+            url: `/${res.path}&validPackage=${item.packageId}`,
           });
         } else {
           Taro.showToast({

src/pages/PayOrder/index.jsx

@@ -9,7 +9,7 @@ import OrderMolded from "@/components/OrderMolded";
 import Popup from "@/components/Popup";
 import "./style.less";
 import Taro, { useDidShow } from "@tarojs/taro";
-import { getShopPackageDetail } from "@/services/home";
+import { getPackageDetail } from "@/services/home";
 import { saveOrder, getOrderSub, payOrder } from "@/services/payOrder";
 import formatTime from "@/utils/formatTime";
 
@@ -17,7 +17,7 @@ export default withLayout((props) => {
   const { router, person } = props;
   const { packageId, orderId } = props.router.params;
 
-  const [payInfo, setPayInfo] = useState()
+  const [payInfo, setPayInfo] = useState();
 
   const [showDialog, setShowDialog] = useState(false);
   // 是否已阅读协议
@@ -67,13 +67,16 @@ export default withLayout((props) => {
   };
 
   const requestPayment = (params) => {
-    console.log(params, 'requestPayment')
+    console.log(params, "requestPayment");
+    Taro.hideLoading()
     Taro.requestPayment({
       ...params,
       package: params.packageValue,
       success: () => {
-        console.log("success");
-        setPayInfo()
+        setPayInfo();
+        Taro.redirectTo({
+          url: "/pages/MineUserAll/AllOrder/index",
+        });
         Taro.showToast({
           title: "支付成功",
           icon: "none",
@@ -89,14 +92,18 @@ export default withLayout((props) => {
         });
       },
     });
-  }
+  };
 
   const onShowPay = (e) => {
     if (agreement) {
       if (payInfo) {
-        requestPayment(payInfo)
-        return
+        requestPayment(payInfo);
+        return;
       }
+      Taro.showLoading({
+        title: '支付中',
+      })
+
       if (packageId) {
         saveOrder(
           list.map((x) => {
@@ -107,14 +114,28 @@ export default withLayout((props) => {
             };
           })
         ).then((res) => {
-          setPayInfo(res)
-          requestPayment(res)
+          setPayInfo(res);
+          requestPayment(res);
+        }).catch(()=>{
+          Taro.hideLoading()
+          Taro.showToast({
+            title: "支付失败",
+            icon: "none",
+            duration: 2000,
+          });
         });
       }
       if (orderId) {
         payOrder(orderId).then((res) => {
-          setPayInfo(res)
-          requestPayment(res)
+          setPayInfo(res);
+          requestPayment(res);
+        }).catch(()=>{
+          Taro.hideLoading()
+          Taro.showToast({
+            title: "支付失败",
+            icon: "none",
+            duration: 2000,
+          });
         });
       }
     } else {
@@ -128,7 +149,7 @@ export default withLayout((props) => {
 
   useEffect(() => {
     if (packageId) {
-      getShopPackageDetail(packageId).then((res) => {
+      getPackageDetail(packageId).then((res) => {
         setList([res]);
       });
     }

src/pages/details/foodDetails/foodDetails.jsx

@@ -23,7 +23,14 @@ import useLike from "@/utils/hooks/useLike"
 
 export default withLayout((props) => {
   const { router, person } = props
-  const { id } = props.router.params
+  const { id, validPackage} = props.router.params
+  useEffect(()=>{
+    if(id&&validPackage){
+      Taro.navigateTo({
+        url: `/pages/TobeShop/index&id=${id}&validPackage=${validPackage}`,
+      });
+    }
+  },[id,validPackage])
   //商铺基础信息
   const [detail, setDetail] = useState({})
   //商铺套餐

src/services/home.js

@@ -60,6 +60,13 @@ export const getShopPackage = (id, params) => request(`/shop/${id}/package`, { p
 */
 export const getShopPackageDetail = (id) => request(`/taShopPackage/${id}`)
 
+/**
+* 套餐详情2
+* @param {*} id 
+* @returns 
+*/
+export const getPackageDetail = (id) => request(`/package/${id}`)
+
 /**
 * 获取套餐定位
 * @param {*} id 

src/utils/request.js

@@ -52,12 +52,12 @@ export default (url, options) => {
 
           if (!skipError) {
             Taro.showToast({
-              title: message,
+              title: message||'网络异常',
               icon: 'none',
             })
           }
 
-          reject(message.indexOf('java') > -1 ? '系统内部错误' : message)
+          reject(message?.indexOf('java') > -1 ? '系统内部错误' : message)
         }
       },