修改运营商，以及财务中心页面

jsowell-ui/src/views/pile/merchant/components/adapayMember.vue

@@ -742,8 +742,6 @@ import { getToken } from "@/utils/auth";
 import text from "@/assets/json/bank_code.json";
 export default {
     components: {},
-
-    props: ["merchantId"],
     data() {
         return {
             dataDisabled: false,
@@ -816,7 +814,7 @@ export default {
             dialog: false,
             adapayCorpMember: {
                 bankAcctType: "1",
-                merchantId: this.merchantId,
+                merchantId: this.$route.params.id,
             },
             // 汇付会员
             adapayMember: "",
@@ -1338,7 +1336,7 @@ export default {
             this.adapayCorpMember.socialCreditCodeExpires =
                 this.updateSocialCreditCode;
             console.log(this.adapayCorpMember, "this.adapayCorpMember");
-            this.adapayCorpMember.merchantId = this.merchantId;
+            // this.adapayCorpMember.merchantId = this.merchantId;
             console.log("修改成功", form);
             this.$refs[form].validate((valid) => {
                 if (valid) {
@@ -1426,7 +1424,7 @@ export default {
             );
             this.adapayCorpMember.socialCreditCodeExpires = this.dataValue;
             this.adapayCorpMember.legalCertIdExpires = this.addLegalCertIdDate;
-            this.adapayCorpMember.merchantId = this.merchantId;
+            // this.adapayCorpMember.merchantId = this.$route.params.id;
             this.$refs[adapayCorpMember].validate((valid) => {
                 console.log(this.adapayCorpMember, "this.adapayCorpMember");
                 if (valid) {
@@ -1476,9 +1474,9 @@ export default {
         },
         // 查询汇付会员
         selectAdapayMember() {
-            console.log("this.merchantId", this.merchantId);
+            console.log("this.merchantId", this.adapayCorpMember.merchantId);
             let param = {
-                merchantId: this.merchantId,
+                merchantId: this.adapayCorpMember.merchantId,
             };
             selectAdapayMember(param).then((response) => {
                 console.log("查询 selectAdapayMember", response);

jsowell-ui/src/views/pile/merchant/detail.vue

@@ -1,43 +1,35 @@
 <template>
-
-    <div class="app-container">
-  <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
-    <el-tab-pane label="支付设置" name="first">
-      <adapay-member :merchantId="merchantId"></adapay-member>
-    </el-tab-pane>
-    <!-- <el-tab-pane label="配置管理" name="second">配置管理</el-tab-pane> -->
-<!--    <el-tab-pane label="角色管理" name="third">角色管理</el-tab-pane>-->
-    <el-tab-pane label="钱包汇总" name="wallet">
-      <wallet-summary :merchantId="merchantId"></wallet-summary>
-    </el-tab-pane>
-    <el-tab-pane label="营收报表" name="revenue">
-      <revenue :merchantId="merchantId"></revenue>
-    </el-tab-pane>
-  </el-tabs>
-    </div>
-
+  <div class="app-container">
+    <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
+      <el-tab-pane label="钱包汇总" name="wallet">
+        <adapay-member :merchantId="merchantId"></adapay-member>
+        <wallet-summary :merchantId="merchantId"></wallet-summary>
+      </el-tab-pane>
+      <el-tab-pane label="营收报表" name="revenue">
+        <revenue :merchantId="merchantId"></revenue>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
 </template>
 
 <script>
-import adapayMember from './components/adapayMember.vue';
-import Revenue from './components/revenue.vue';
-import WalletSummary from './components/walletSummary.vue';
+import adapayMember from "./components/adapayMember.vue";
+import Revenue from "./components/revenue.vue";
+import WalletSummary from "./components/walletSummary.vue";
 export default {
   components: { adapayMember, Revenue, WalletSummary },
- data() {
-      return {
-        activeName: 'first',
-        merchantId:this.$route.params.id
-      };
+  data() {
+    return {
+      activeName: "wallet",
+      merchantId: this.$route.params.id,
+    };
+  },
+  methods: {
+    handleClick(tab, event) {
+      console.log(tab, event);
     },
-    methods: {
-      handleClick(tab, event) {
-        console.log(tab, event);
-      }
-    }
-}
+  },
+};
 </script>
 
-<style>
-
-</style>
+<style></style>