Merge remote-tracking branch 'origin/master'

src/views/etl/switch/index.vue

@@ -139,7 +139,7 @@
           <el-form-item label="是否初始化：" prop="status">
             <el-radio-group v-model="sourceAddReq.status">
               <el-radio
-                v-for="dict in dict.type.yes_no"
+                v-for="dict in dict.type"
                 :key="dict.value"
                 :label="dict.value"
               >{{ dict.label }}
@@ -212,7 +212,7 @@
         label="是否初始化"
         prop="status">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.yes_no" :value="scope.row.status"/>
+          <dict-tag :options="dict.type" :value="scope.row.status"/>
         </template>
       </el-table-column>
 

src/views/money/user/index.vue

@@ -3,11 +3,11 @@
     <el-card style="margin-top: 50px;">
       <h1>用户余额</h1>
       <p>余额：{{ userBalanceData.userBalance || '加载中...' }}</p>
+      <el-button type="primary" @click="navigateToRecharge">充值</el-button>
     </el-card>
   </div>
 </template>
 
-
 <script>
 import { userBalance } from "@/api/system/user"; // 假设你的userBalance函数在@/api/money目录下
 
@@ -23,6 +23,9 @@ export default {
     this.fetchUserBalance();
   },
   methods: {
+    navigateToRecharge() {
+      this.$router.push('/money/zfb');
+    },
     async fetchUserBalance() {
       try {
         const userId = localStorage.getItem('userId');