Merge remote-tracking branch 'origin/master'

src/views/his/merchantAppConfig/index.vue

@@ -318,6 +318,37 @@
               <el-input v-model="hfConfig.hfOnlineRefundNotifyUrl" placeholder="汇付分账回调地址"></el-input>
             </el-form-item>
           </div>
+
+          <!-- app官方支付配置 -->
+          <div v-else-if="form.merchantType === 'appPay'">
+            <el-form-item label="支付宝应用id" prop="aliAppId">
+              <el-input v-model="appPayConfig.aliAppId" placeholder="支付宝应用id"></el-input>
+            </el-form-item>
+            <el-form-item label="支付宝应用私钥" prop="aliPrivateKey">
+              <el-input v-model="appPayConfig.aliPrivateKey" placeholder="支付宝应用私钥"></el-input>
+            </el-form-item>
+            <el-form-item label="支付宝公钥" prop="aliPublicKey">
+              <el-input v-model="appPayConfig.aliPublicKey" placeholder="请输入支付宝公钥"></el-input>
+            </el-form-item>
+            <el-form-item label="支付宝回调地址" prop="aliNotifyUrl">
+              <el-input v-model="appPayConfig.aliNotifyUrl" placeholder="支付宝回调地址"></el-input>
+            </el-form-item>
+            <el-form-item label="微信appid" prop="wxAppAppId">
+              <el-input v-model="appPayConfig.wxAppAppId" placeholder="微信appid"></el-input>
+            </el-form-item>
+            <el-form-item label="微信商户号" prop="wxAppMchId">
+              <el-input v-model="appPayConfig.wxAppMchId" placeholder="微信商户号"></el-input>
+            </el-form-item>
+            <el-form-item label="微信Key" prop="wxAppMchKey">
+              <el-input v-model="appPayConfig.wxAppMchKey" placeholder="微信Key"></el-input>
+            </el-form-item>
+            <el-form-item label="微信回调地址" prop="wxAppNotifyUrl">
+              <el-input v-model="appPayConfig.wxAppNotifyUrl" placeholder="微信回调地址"></el-input>
+            </el-form-item>
+            <el-form-item label="微信商户api证书" prop="wxAppKeyPath">
+              <el-input v-model="appPayConfig.wxAppKeyPath" placeholder="微信商户api证书"></el-input>
+            </el-form-item>
+          </div>
         </div>
       </el-form>
 
@@ -379,6 +410,7 @@ export default {
       tzConfig: {}, // 台州银行配置
       wxConfig: {}, // 微信配置
       hfConfig: {}, // 汇付配置
+      appPayConfig: {}, // 汇付配置
       // 表单参数
       form: {
         id: null,
@@ -527,6 +559,9 @@ export default {
             case 'hf':
               configData = { ...this.hfConfig };
               break;
+            case 'appPay':
+              configData = { ...this.appPayConfig };
+              break;
           }
 
           // 正确处理多选应用ID转字符串
@@ -599,6 +634,9 @@ export default {
               case 'hf':
                 this.hfConfig = { ...configData };
                 break;
+              case "appPay":
+                this.appPayConfig = { ...configData };
+                break;
             }
           } catch (e) {
             console.error('解析配置详情失败:', e);

src/views/system/config/config.vue

@@ -728,6 +728,7 @@
               <el-radio label="tz">台州银行</el-radio>
               <el-radio label="wx">微信</el-radio>
               <el-radio label="hf">汇付</el-radio>
+              <el-radio label="appPay">跳转app支付</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="appId" prop="appId">
@@ -809,6 +810,33 @@
           <el-form-item v-if="form9.type=='hf'" label="汇付大额退款回调地址" prop="hfOnlineRefundNotifyUrl">
             <el-input v-model="form9.hfOnlineRefundNotifyUrl" label="汇付分账回调地址"></el-input>
           </el-form-item>
+          <el-form-item v-if="form9.type=='appPay'" label="支付宝应用id" prop="aliAppId">
+            <el-input v-model="form9.aliAppId" label="请输入支付宝应用id"></el-input>
+          </el-form-item>
+          <el-form-item v-if="form9.type=='appPay'" label="支付宝应用私钥" prop="aliPrivateKey">
+            <el-input v-model="form9.aliPrivateKey" label="请输入支付宝应用私钥"></el-input>
+          </el-form-item>
+          <el-form-item v-if="form9.type=='appPay'" label="支付宝公钥" prop="aliPublicKey">
+            <el-input v-model="form9.aliPublicKey" label="请输入支付宝公钥"></el-input>
+          </el-form-item>
+          <el-form-item v-if="form9.type=='appPay'" label="支付宝回调地址" prop="aliNotifyUrl">
+            <el-input v-model="form9.aliNotifyUrl" label="请输入支付宝回调地址"></el-input>
+          </el-form-item>
+          <el-form-item v-if="form9.type=='appPay'" label="微信appid" prop="wxAppAppId">
+            <el-input v-model="form9.wxAppAppId" label="请输入微信appid"></el-input>
+          </el-form-item>
+          <el-form-item v-if="form9.type=='appPay'" label="微信商户号" prop="wxAppMchId">
+            <el-input v-model="form9.wxAppMchId" label="请输入微信商户号"></el-input>
+          </el-form-item>
+          <el-form-item v-if="form9.type=='appPay'" label="微信Key" prop="wxAppMchKey">
+            <el-input v-model="form9.wxAppMchKey" label="请输入微信Key"></el-input>
+          </el-form-item>
+          <el-form-item v-if="form9.type=='appPay'" label="微信回调地址" prop="wxAppNotifyUrl">
+            <el-input v-model="form9.wxAppNotifyUrl" label="请输入微信回调地址"></el-input>
+          </el-form-item>
+          <el-form-item v-if="form9.type=='appPay'" label="微信商户api证书" prop="wxAppKeyPath">
+            <el-input v-model="form9.wxAppKeyPath" label="请输入微信商户api证书地址"></el-input>
+          </el-form-item>
           <div class="footer">
             <el-button type="primary" @click="submitForm9">提 交</el-button>
           </div>