Merge branch 'develop' into test

src/pages/AppPay/AppPay.scss

-.AppPay{
-
+.AppPay {
+  .AppBackButton {
+    background-color: #fff;
+    margin: 24rpx 80rpx 0;
+  }
 }

src/pages/AppPay/AppPay.tsx

 import "./AppPay.scss";
 import Taro, { Component, useState, useCallback } from "@tarojs/taro";
-import { View, Button } from "@tarojs/components";
+import { View, Button, Navigator } from "@tarojs/components";
 import { rechargeFromAppOrder } from "@/api/account";
 import AES from "crypto-js/aes";
 import Utf8 from "crypto-js/enc-utf8";
@@ -8,6 +8,22 @@ import ECBmode from "crypto-js/mode-ecb";
 import PaddingPkcs7 from "crypto-js/pad-pkcs7";
 import AppBackButton from "../../components/AppBackButton/AppBackButton";
 
+type PageStateProps = {};
+type PageDispatchProps = {};
+
+type PageOwnProps = {};
+type PageState = {
+  errorMsg: string;
+  showBack: boolean;
+  showError: boolean;
+};
+
+type IProps = PageStateProps & PageOwnProps & PageDispatchProps;
+interface AppPay {
+  props: IProps;
+  state: PageState;
+}
+
 class AppPay extends Component {
   constructor(props) {
     super(props);
@@ -98,27 +114,38 @@ class AppPay extends Component {
         {showBack && (
           <View className="AppPay-info">
             支付成功
-            <Button
+            <Navigator
               className="AppBackButton"
-              open-type="launchApp"
-              app-parameter={errorMsg}
-              onError={this.goBackAppError}
+              target="miniProgram"
+              open-type="exit"
             >
-              返回App
-            </Button>
+              <Button
+                className="AppBackButton"
+                open-type="launchApp"
+                app-parameter={errorMsg}
+                onError={this.goBackAppError}
+              >
+                返回
+              </Button>
+            </Navigator>
           </View>
         )}
         {showError && (
           <View className="AppPay-info">
             支付失败
-            <Button
+            <Navigator
               className="AppBackButton"
-              open-type="launchApp"
-              app-parameter={errorMsg}
-              onError={this.goBackAppError}
+              target="miniProgram"
+              open-type="exit"
             >
-              返回App
-            </Button>
+              <Button
+                open-type="launchApp"
+                app-parameter={errorMsg}
+                onError={this.goBackAppError}
+              >
+                返回
+              </Button>
+            </Navigator>
           </View>
         )}
       </View>