Merge branch 'dev_v3' of http://git.dgtis.com/armg/wxapp_shuibei into dev_v3

api/functions.js

@@ -43,6 +43,10 @@ export function recyclDetectionReportAPI(orderNo) {
 export function depositCreateAPI(data) {
   return request.post(`postal-deposit/create`, data);
 }
+// 邮费支付成功回调
+export function postalDepositCallbackAPI(params) {
+  return request.get(`postal-deposit/postage/callback`, params);
+}
 // 分页查询邮寄存金记录
 export function depositPageAPI(params) {
   return request.get(`postal-deposit/page`, params);
@@ -76,4 +80,4 @@ export function svipBuy(data) {
 // 约价回收定金支付成功回调
 export function recyclePreOrderSuccessAPI(params) {
   return request.get("recycle/deposit/callback", params);
-}
+}

pages/webview/WxPay.vue

@@ -56,7 +56,10 @@ import { useAppStore } from "@/stores/app";
 import { getUserOpenId } from "@/api/user";
 import { Calc } from "@/utils/util";
 import { goldPrincipalCompleteOrder } from "@/api/payment";
-import { recyclePreOrderSuccessAPI } from "@/api/functions";
+import {
+  recyclePreOrderSuccessAPI,
+  postalDepositCallbackAPI,
+} from "@/api/functions";
 import WechatPayment from "@/components/payment/WechatPayment.vue";
 
 // 状态管理
@@ -76,7 +79,9 @@ const errorMsg = ref("");
 
 onLoad(async (options) => {
   try {
+    console.log("options", options);
     amount.value = Number(options.amount) || 0.01;
+    // console.log("amount", amount.value);
     description.value = decodeURIComponent(options.description || "");
     orderPrefix.value = options.orderPrefix || "H5";
     orderNo.value = options.orderNo || "";
@@ -97,6 +102,7 @@ onLoad(async (options) => {
       description: description.value,
       orderNo: orderNo.value,
     };
+    console.log("orderInfo", Calc.div(1, 100).truncate().valueOf());
     loading.value = false;
   } catch (err) {
     loading.value = false;
@@ -169,7 +175,13 @@ const processOrderBizChange = async (payStatusRes) => {
       case "recyle":
         await recyclePreOrderSuccessAPI({
           orderNo: payStatusRes.outTradeNo,
-          payType: "routine",
+          payType: "weixin",
+        });
+        break;
+      case "youji":
+        await postalDepositCallbackAPI({
+          orderNo: payStatusRes.outTradeNo,
+          payType: "weixin",
         });
         break;
       case "tl":
@@ -196,13 +208,14 @@ const goBackToWebview = () => {
   try {
     if (finalUrl.includes("%")) {
       finalUrl = decodeURIComponent(finalUrl);
+      console.log("finalUrl", finalUrl);
     }
   } catch (e) {
     console.warn("URL解码失败，使用原始URL：", e);
   }
-
+  // return console.log("goBackToWebview", finalUrl);
   uni.redirectTo({
-    url: `/pages/webview/index?path=${returnUrl.value}`,
+    url: `/pages/webview/index?path=${finalUrl}`,
   });
 };
 </script>