app 红包配置

src/views/system/config/config.vue

@@ -2535,70 +2535,105 @@
               <el-radio label="1">商家转账到零钱(新)</el-radio>
             </el-radio-group>
           </el-form-item>
-
-          <!-- 公共字段 -->
           <el-form-item label="商户号" prop="mchId">
             <el-input v-model="form35.mchId" placeholder="请输入商户号"></el-input>
           </el-form-item>
-
+          <el-form-item label="商户密钥" prop="mchKey">
+            <el-input v-model="form35.mchKey" placeholder="请输入商户密钥" show-password></el-input>
+          </el-form-item>
+          <el-form-item label="p12证书路径" prop="keyPath">
+            <el-input v-model="form35.keyPath" placeholder="请输入p12证书路径"></el-input>
+          </el-form-item>
+          <el-form-item label="apiV3密钥" prop="apiV3Key">
+            <el-input v-model="form35.apiV3Key" placeholder="请输入apiV3密钥" show-password></el-input>
+          </el-form-item>
+          <el-form-item label="公钥ID" prop="publicKeyId">
+            <el-input v-model="form35.publicKeyId" placeholder="请输入公钥ID"></el-input>
+          </el-form-item>
+          <el-form-item label="公钥证书路径" prop="publicKeyPath">
+            <el-input v-model="form35.publicKeyPath" placeholder="请输入公钥证书路径"></el-input>
+          </el-form-item>
+          <el-form-item label="私钥路径" prop="privateKeyPath">
+            <el-input v-model="form35.privateKeyPath" placeholder="请输入私钥路径"></el-input>
+          </el-form-item>
+          <el-form-item label="证书路径" prop="privateCertPath">
+            <el-input v-model="form35.privateCertPath" placeholder="请输入证书路径"></el-input>
+          </el-form-item>
           <el-form-item label="回调地址" prop="notifyUrl">
             <el-input v-model="form35.notifyUrl" placeholder="请输入回调地址"></el-input>
           </el-form-item>
 
-          <!-- 旧版接口字段 -->
-          <template v-if="form35.isNew === '0'">
-            <el-form-item label="商户密钥" prop="mchKey">
-              <el-input v-model="form35.mchKey" placeholder="请输入商户密钥" show-password></el-input>
-            </el-form-item>
-            <el-form-item label="API证书(p12)" prop="keyPath">
-              <el-input v-model="form35.keyPath" placeholder="请输入p12证书路径">
-                <template #append>
-                  <el-button @click="handleSelectFile('keyPath')">选择文件</el-button>
-                </template>
-              </el-input>
-              <div class="form-tips">商户平台下载的apiclient_cert.p12证书</div>
-            </el-form-item>
-          </template>
 
-          <!-- 新版接口字段 -->
-          <template v-if="form35.isNew === '1'">
-            <el-form-item label="APIv3密钥" prop="apiV3Key">
-              <el-input v-model="form35.apiV3Key" placeholder="请输入APIv3密钥" show-password></el-input>
-              <div class="form-tips">商户平台API安全页面设置的APIv3密钥</div>
-            </el-form-item>
-
-            <el-form-item label="商户API证书" prop="privateCertPath">
-              <el-input v-model="form35.privateCertPath" placeholder="请输入商户API证书路径">
-                <template #append>
-                  <el-button @click="handleSelectFile('privateCertPath')">选择文件</el-button>
-                </template>
-              </el-input>
-              <div class="form-tips">apiclient_cert.pem证书文件</div>
-            </el-form-item>
-
-            <el-form-item label="商户私钥" prop="privateKeyPath">
-              <el-input v-model="form35.privateKeyPath" placeholder="请输入商户私钥路径">
-                <template #append>
-                  <el-button @click="handleSelectFile('privateKeyPath')">选择文件</el-button>
-                </template>
-              </el-input>
-              <div class="form-tips">apiclient_key.pem私钥文件</div>
-            </el-form-item>
-
-            <el-form-item label="平台公钥证书" prop="publicKeyPath">
-              <el-input v-model="form35.publicKeyPath" placeholder="请输入平台公钥证书路径">
-                <template #append>
-                  <el-button @click="handleSelectFile('publicKeyPath')">选择文件</el-button>
-                </template>
-              </el-input>
-              <div class="form-tips">微信支付平台证书（自动更新时可留空）</div>
-            </el-form-item>
-
-            <el-form-item label="证书序列号" prop="serialNo">
-              <el-input v-model="form35.serialNo" placeholder="请输入证书序列号"></el-input>
-              <div class="form-tips">商户API证书的序列号，可在证书文件中查看</div>
-            </el-form-item>
-          </template>
+<!--          <el-form-item label="红包接口类型" prop="isNew">-->
+<!--            <el-radio-group v-model="form35.isNew" >-->
+<!--              <el-radio label="0">商家转账到零钱(旧)</el-radio>-->
+<!--              <el-radio label="1">商家转账到零钱(新)</el-radio>-->
+<!--            </el-radio-group>-->
+<!--          </el-form-item>-->
+
+<!--          &lt;!&ndash; 公共字段 &ndash;&gt;-->
+<!--          <el-form-item label="商户号" prop="mchId">-->
+<!--            <el-input v-model="form35.mchId" placeholder="请输入商户号"></el-input>-->
+<!--          </el-form-item>-->
+
+<!--          <el-form-item label="回调地址" prop="notifyUrl">-->
+<!--            <el-input v-model="form35.notifyUrl" placeholder="请输入回调地址"></el-input>-->
+<!--          </el-form-item>-->
+
+<!--          &lt;!&ndash; 旧版接口字段 &ndash;&gt;-->
+<!--          <template v-if="form35.isNew === '0'">-->
+<!--            <el-form-item label="商户密钥" prop="mchKey">-->
+<!--              <el-input v-model="form35.mchKey" placeholder="请输入商户密钥" show-password></el-input>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label="API证书(p12)" prop="keyPath">-->
+<!--              <el-input v-model="form35.keyPath" placeholder="请输入p12证书路径">-->
+<!--                <template #append>-->
+<!--                  <el-button @click="handleSelectFile('keyPath')">选择文件</el-button>-->
+<!--                </template>-->
+<!--              </el-input>-->
+<!--              <div class="form-tips">商户平台下载的apiclient_cert.p12证书</div>-->
+<!--            </el-form-item>-->
+<!--          </template>-->
+
+<!--          &lt;!&ndash; 新版接口字段 &ndash;&gt;-->
+<!--          <template v-if="form35.isNew === '1'">-->
+<!--            <el-form-item label="APIv3密钥" prop="apiV3Key">-->
+<!--              <el-input v-model="form35.apiV3Key" placeholder="请输入APIv3密钥" show-password></el-input>-->
+<!--              <div class="form-tips">商户平台API安全页面设置的APIv3密钥</div>-->
+<!--            </el-form-item>-->
+
+<!--            <el-form-item label="商户API证书" prop="privateCertPath">-->
+<!--              <el-input v-model="form35.privateCertPath" placeholder="请输入商户API证书路径">-->
+<!--                <template #append>-->
+<!--                  <el-button @click="handleSelectFile('privateCertPath')">选择文件</el-button>-->
+<!--                </template>-->
+<!--              </el-input>-->
+<!--              <div class="form-tips">apiclient_cert.pem证书文件</div>-->
+<!--            </el-form-item>-->
+
+<!--            <el-form-item label="商户私钥" prop="privateKeyPath">-->
+<!--              <el-input v-model="form35.privateKeyPath" placeholder="请输入商户私钥路径">-->
+<!--                <template #append>-->
+<!--                  <el-button @click="handleSelectFile('privateKeyPath')">选择文件</el-button>-->
+<!--                </template>-->
+<!--              </el-input>-->
+<!--              <div class="form-tips">apiclient_key.pem私钥文件</div>-->
+<!--            </el-form-item>-->
+
+<!--            <el-form-item label="平台公钥证书" prop="publicKeyPath">-->
+<!--              <el-input v-model="form35.publicKeyPath" placeholder="请输入平台公钥证书路径">-->
+<!--                <template #append>-->
+<!--                  <el-button @click="handleSelectFile('publicKeyPath')">选择文件</el-button>-->
+<!--                </template>-->
+<!--              </el-input>-->
+<!--              <div class="form-tips">微信支付平台证书（自动更新时可留空）</div>-->
+<!--            </el-form-item>-->
+
+<!--            <el-form-item label="证书序列号" prop="serialNo">-->
+<!--              <el-input v-model="form35.serialNo" placeholder="请输入证书序列号"></el-input>-->
+<!--              <div class="form-tips">商户API证书的序列号，可在证书文件中查看</div>-->
+<!--            </el-form-item>-->
+<!--          </template>-->
 
           <div class="footer">
             <el-button type="primary" @click="submitForm35">提 交</el-button>