no message

src/views/setting/organizationManagement/settledManagement/index.vue

@@ -253,20 +253,20 @@
 
         <el-card shadow="never" class="my-card">
           <div class="title" style="margin-bottom: 20px;">1.其他基础配置</div>
-          <el-form-item label="小程序appId" prop="appId">
-            <el-input v-model="step3Form.appId" autocomplete="off" placeholder="请输入小程序appId"></el-input>
+          <el-form-item label="服务商appId" prop="appId">
+            <el-input v-model="step3Form.appId" autocomplete="off" placeholder="请输入服务商appId"></el-input>
           </el-form-item>
-          <el-form-item label="商户号Id" prop="merchantId">
-            <el-input v-model="step3Form.merchantId" autocomplete="off" placeholder="请输入商户号Id"></el-input>
+          <el-form-item label="服务商商户号" prop="merchantId">
+            <el-input v-model="step3Form.merchantId" autocomplete="off" placeholder="请输入服务商商户号"></el-input>
           </el-form-item>
-          <el-form-item label="商户号Key" prop="merchantKey">
-            <el-input v-model="step3Form.merchantKey" autocomplete="off" placeholder="请输入商户号Key"></el-input>
+          <el-form-item label="服务商商户密钥" prop="merchantKey">
+            <el-input v-model="step3Form.merchantKey" autocomplete="off" placeholder="请输入服务商商户密钥"></el-input>
           </el-form-item>
-          <el-form-item label="子appId" prop="childAppId">
-            <el-input v-model="step3Form.childAppId" autocomplete="off" placeholder="请输入子appId"></el-input>
+          <el-form-item label="小程序appid" prop="appletAppid">
+            <el-input v-model="step3Form.appletAppid" autocomplete="off" placeholder="请输入小程序appid"></el-input>
           </el-form-item>
-          <el-form-item label="子密钥" prop="childKey">
-            <el-input v-model="step3Form.childKey" autocomplete="off" placeholder="请输入子密钥"></el-input>
+          <el-form-item label="小程序密钥" prop="appletSecret">
+            <el-input v-model="step3Form.appletSecret" autocomplete="off" placeholder="请输入小程序密钥"></el-input>
           </el-form-item>
           <el-form-item label="子商户号Id" prop="childMerchantId">
             <el-input v-model="step3Form.childMerchantId" autocomplete="off" placeholder="请输入子商户号Id"></el-input>
@@ -434,8 +434,8 @@ export default {
         appId: '',
         merchantId: '',
         merchantKey: '',
-        childAppId: '',
-        childKey: '',
+        appletAppid: '',
+        appletSecret: '',
         childMerchantId: '',
         templateId: '',
         pubAppId: '',
@@ -615,8 +615,8 @@ export default {
             appId: this.step3Form.appId,
             mchId: this.step3Form.merchantId,
             mchKey: this.step3Form.merchantKey,
-            subAppId: this.step3Form.childAppId,
-            subSecret: this.step3Form.childKey,
+            appletAppid: this.step3Form.appletAppid,
+            appletSecret: this.step3Form.appletSecret,
             subMchId: this.step3Form.childMerchantId,
             template: this.step3Form.templateId,
             pubAppId: this.step3Form.pubAppId,

src/views/setting/organizationManagement/tenantDetails/index.vue

@@ -186,20 +186,20 @@
 
         <el-card shadow="never" class="my-card">
           <div class="title" style="margin-bottom: 20px;">1.其他基础配置</div>
-          <el-form-item label="小程序appId" prop="appId">
-            <el-input v-model="step3Form.appId" autocomplete="off" placeholder="请输入小程序appId"></el-input>
+          <el-form-item label="服务商appId" prop="appId">
+            <el-input v-model="step3Form.appId" autocomplete="off" placeholder="请输入服务商appId"></el-input>
           </el-form-item>
-          <el-form-item label="商户号Id" prop="merchantId">
-            <el-input v-model="step3Form.merchantId" autocomplete="off" placeholder="请输入商户号Id"></el-input>
+          <el-form-item label="服务商商户号" prop="merchantId">
+            <el-input v-model="step3Form.merchantId" autocomplete="off" placeholder="请输入服务商商户号"></el-input>
           </el-form-item>
-          <el-form-item label="商户号Key" prop="merchantKey">
-            <el-input v-model="step3Form.merchantKey" autocomplete="off" placeholder="请输入商户号Key"></el-input>
+          <el-form-item label="服务商商户密钥" prop="merchantKey">
+            <el-input v-model="step3Form.merchantKey" autocomplete="off" placeholder="请输入服务商商户密钥"></el-input>
           </el-form-item>
-          <el-form-item label="子appId" prop="childAppId">
-            <el-input v-model="step3Form.childAppId" autocomplete="off" placeholder="请输入子appId"></el-input>
+          <el-form-item label="小程序appid" prop="appletAppid">
+            <el-input v-model="step3Form.appletAppid" autocomplete="off" placeholder="请输入小程序appid"></el-input>
           </el-form-item>
-          <el-form-item label="子密钥" prop="childKey">
-            <el-input v-model="step3Form.childKey" autocomplete="off" placeholder="请输入子密钥"></el-input>
+          <el-form-item label="小程序密钥" prop="appletSecret">
+            <el-input v-model="step3Form.appletSecret" autocomplete="off" placeholder="请输入小程序密钥"></el-input>
           </el-form-item>
           <el-form-item label="子商户号Id" prop="childMerchantId">
             <el-input v-model="step3Form.childMerchantId" autocomplete="off" placeholder="请输入子商户号Id"></el-input>
@@ -438,8 +438,8 @@ export default {
         appId: '',
         merchantId: '',
         merchantKey: '',
-        childAppId: '',
-        childKey: '',
+        appletAppid: '',
+        appletSecret: '',
         childMerchantId: '',
         templateId: '',
         pubAppId: '',
@@ -543,8 +543,8 @@ export default {
         this.step3Form.appId = res.data.appId;
         this.step3Form.merchantId = res.data.mchId;
         this.step3Form.merchantKey = res.data.mchKey;
-        this.step3Form.childAppId = res.data.subAppId;
-        this.step3Form.childKey = res.data.subSecret;
+        this.step3Form.appletAppid = res.data.appletAppid;
+        this.step3Form.appletSecret = res.data.appletSecret;
         this.step3Form.childMerchantId = res.data.subMchId;
         this.step3Form.templateId = res.data.template;
         this.step3Form.pubAppId = res.data.pubAppId;
@@ -720,8 +720,8 @@ export default {
             appId: this.step3Form.appId,
             mchId: this.step3Form.merchantId,
             mchKey: this.step3Form.merchantKey,
-            subAppId: this.step3Form.childAppId,
-            subSecret: this.step3Form.childKey,
+            appletAppid: this.step3Form.appletAppid,
+            appletSecret: this.step3Form.appletSecret,
             subMchId: this.step3Form.childMerchantId,
             template: this.step3Form.templateId,
             pubAppId: this.step3Form.pubAppId,