Merge remote-tracking branch 'origin/master'

src/views/etl/switch/index.vue

@@ -136,16 +136,16 @@
           <span>其他信息</span>
         </div>
         <el-form ref="form" :model="sourceAddReq"  label-width="140px" :inline="true" class="demo-form-inline">
-<!--          <el-form-item label="是否初始化：" prop="status">-->
-<!--            <el-radio-group v-model="sourceAddReq.status">-->
-<!--              <el-radio-->
-<!--                v-for="dict in dict.type.yes_no"-->
-<!--                :key="dict.value"-->
-<!--                :label="dict.value"-->
-<!--              >{{ dict.label }}-->
-<!--              </el-radio>-->
-<!--            </el-radio-group>-->
-<!--          </el-form-item>-->
+          <el-form-item label="是否初始化：" prop="status">
+            <el-radio-group v-model="sourceAddReq.status">
+              <el-radio
+                v-for="dict in dict.type"
+                :key="dict.value"
+                :label="dict.value"
+              >{{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
           <el-form-item label="备注：">
             <el-input type="textarea" v-model="sourceAddReq.remark"></el-input>
           </el-form-item>
@@ -210,7 +210,10 @@
 
       <el-table-column
         label="是否初始化"
-        prop="name">
+        prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type" :value="scope.row.status"/>
+        </template>
       </el-table-column>
 
       <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');

src/views/port/port/index.vue

@@ -5,8 +5,8 @@
         <el-card shadow="hover">
           <div slot="header" class="clearfix">
             <span>手机号查询归属地</span>
-            <el-button style="float: right; padding: 3px 0" type="text">测试</el-button>
             <el-button style="float: right; padding: 3px 0" type="text">购买</el-button>
+            <el-button style="float: right; padding: 3px 0" @click="testPhone">测试</el-button>
           </div>
         </el-card>
       </el-col>