From 81689fc7768b86cc3a3a88abce1cf6a7830bb624 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com>
Date: Sun, 25 Aug 2024 11:17:18 +0800
Subject: [PATCH 01/22] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9A=E5=89=8D?=
 =?UTF-8?q?=E5=8F=B0=E4=BB=BB=E5=8A=A1=E8=AE=BE=E8=AE=A1=E9=9B=8F=E5=BD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/task/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/task/task/index.vue b/src/views/task/task/index.vue
index 8806ad1..1fc3495 100644
--- a/src/views/task/task/index.vue
+++ b/src/views/task/task/index.vue
@@ -370,6 +370,7 @@ export default {
       this.taskInputList();
     },
 
+
     addTaskInput(){
       this.taskInputAdd = false;
       this.findByInputId();

From 2cbe0231083133aefd92f74bd5b9836c58ccc01a Mon Sep 17 00:00:00 2001
From: wxy <14293288+zysysys@user.noreply.gitee.com>
Date: Sun, 25 Aug 2024 11:31:03 +0800
Subject: [PATCH 02/22] =?UTF-8?q?```feat(payment):=20=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E6=94=AF=E4=BB=98=E9=A1=B5=E9=9D=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增支付页面，包含支付金额和支付方式的选择。支持自定义金额及支付宝、微信支付方式。点击“确认支付”按钮后，根据支付方式执行相应的操作，目前仅模拟支付宝支付成功的结果。
```
---
 src/views/money/pay/index.vue | 135 ++++++++++++++++++++++++++++++++++
 1 file changed, 135 insertions(+)
 create mode 100644 src/views/money/pay/index.vue

diff --git a/src/views/money/pay/index.vue b/src/views/money/pay/index.vue
new file mode 100644
index 0000000..71b367c
--- /dev/null
+++ b/src/views/money/pay/index.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-card class="box-card">
+    <ul class="msg-box">
+      <li>
+        <h4>我要支付</h4>
+      </li>
+      <li>
+        <h4 style="margin-bottom: 15px;">支付金额</h4>
+        <el-radio-group v-model="amountVal" @change="amountChange">
+          <el-radio border :label="''+ 100">充值100</el-radio>
+          <el-radio border :label="''+ 500">充值500</el-radio>
+          <el-radio border :label="''+ 1000">充值1000</el-radio>
+          <el-radio border :label="''+ 2000">充值2000</el-radio>
+          <el-radio border :label="''+ 5000">充值5000</el-radio>
+          <el-radio border :label="''">自定义</el-radio>
+        </el-radio-group>
+      </li>
+      <li>
+        <h4 style="margin-bottom: 15px;">支付方式</h4>
+        <el-radio-group v-model="rechargeParams.paymentType" @change="paymentTypeChange">
+          <el-radio border :label="''+ 1">支付宝</el-radio>
+          <el-radio border :label="''+ 0">微信</el-radio>
+        </el-radio-group>
+      </li>
+      <li>
+        <h4 style="margin-bottom: 15px;">支付金额</h4>
+        <el-input :disabled="disabled" clearable v-model="rechargeParams.totalAmt" placeholder="请输入金额" style="width: 150px;"></el-input>
+      </li>
+    </ul>
+    <div style="text-align: center; margin-top: 30px;">
+      <el-button type="primary" @click="surePay">确认支付</el-button>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import { userRecharge } from "@/api/system/user";
+export default {
+  data() {
+    return {
+      amountVal: '',
+      disabled: false,
+      // 同步跳转页面地址
+      returnUrl:'http://localhost:8090/#/entertainment/payment',
+      //充值参数
+      rechargeParams: {
+        "totalAmt": '', //金额
+        "paymentType": "0", //支付方式[0:微信,1:支付宝,2:余额,3:活动]
+        "transType": "0" //交易类型[0:充值,1:消费]
+      }
+    }
+  },
+  methods: {
+    //充值金额
+    amountChange(val) {
+      this.rechargeParams.totalAmt = val;
+      if (val === '') {
+        this.disabled = false
+      } else {
+        this.disabled = true
+      }
+    },
+    //支付方式
+    paymentTypeChange(val) {
+      this.rechargeParams.paymentType = val
+    },
+    //确认支付
+    async surePay() {
+      if (this.rechargeParams.totalAmt === '') {
+        this.$message.warning('请输入金额');
+        return;
+      }
+      if (this.rechargeParams.paymentType === '0') {
+
+      } else if (this.rechargeParams.paymentType === '1') {
+        let praem = {
+          // 生成一个随你的订单号 方便测试
+          outTradeNo:this.getProjectNum() + Math.floor(Math.random() * 10000),
+          // 传递支付金额
+          totalAmount:this.rechargeParams.totalAmt,
+          // 传递同步跳转地址
+          returnUrl:this.returnUrl,
+          // 商品名称
+          subject:'支付金额',
+          // 支付类型
+          productCode:'FAST_INSTANT_TRADE_PAY'
+        }
+        userRecharge(praem).then(code => {
+          if (code.code === 200) {
+            // 支付方式跳转
+            this.$message.success('支付宝支付')
+            const payDiv = document.getElementById('payDiv');
+            if (payDiv) {
+              document.body.removeChild(payDiv);
+            }
+            const div = document.createElement('div');
+            div.id = 'payDiv';
+            div.innerHTML = code.data;
+            document.body.appendChild(div);
+            document.getElementById('payDiv').getElementsByTagName('form')[0].submit();
+          }
+        })
+      }
+    },
+    // 获取当前日期的方法
+    getProjectNum () {
+      const projectTime = new Date() // 当前中国标准时间
+      const Year = projectTime.getFullYear() // 获取当前年份 支持IE和火狐浏览器.
+      const Month = projectTime.getMonth() + 1 // 获取中国区月份
+      const Day = projectTime.getDate() // 获取几号
+      var CurrentDate = Year
+      if (Month >= 10) { // 判断月份和几号是否大于10或者小于10
+        CurrentDate += Month
+      } else {
+        CurrentDate += '0' + Month
+      }
+      if (Day >= 10) {
+        CurrentDate += Day
+      } else {
+        CurrentDate += '0' + Day
+      }
+      return CurrentDate
+    }
+  }
+}
+</script>
+
+<style scoped>
+/* 信息列表样式 */
+.msg-box > li {
+  list-style: none;
+  border-bottom: 1px solid #c5c5c5;
+  padding: 20px 10px;
+}
+</style>

From bd9e302e52036a06ce9c1707c9d28938ea985577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com>
Date: Sun, 25 Aug 2024 11:41:39 +0800
Subject: [PATCH 03/22] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9A=E5=89=8D?=
 =?UTF-8?q?=E5=8F=B0=E4=BB=BB=E5=8A=A1=E8=AE=BE=E8=AE=A1=E9=9B=8F=E5=BD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/task/index.vue | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/views/task/task/index.vue b/src/views/task/task/index.vue
index 1fc3495..4e8d9b0 100644
--- a/src/views/task/task/index.vue
+++ b/src/views/task/task/index.vue
@@ -189,28 +189,28 @@
 
       <el-form  label-width="80px" :model="taskInfoList" ref="queryForm"  :inline="true" class="demo-form-inline" size="small">
         <el-form-item label="任务id">
-          <el-input v-model="taskInfoList.taskId"></el-input>
+          <el-input v-model="taskInfo.taskId"></el-input>
         </el-form-item>
 
         <el-form-item label="数据库id">
-          <el-input v-model="taskInfoList.databaseId"></el-input>
+          <el-input v-model="taskInfo.databaseId"></el-input>
         </el-form-item>
         <el-form-item label="数据表">
-          <el-select v-model="taskInfoList.tableName" placeholder="请选择等级">
+          <el-select  v-model="taskInfo.tableName" placeholder="请选择等级">
             <el-option label="请选择" value="0"></el-option>
             <span v-for="table in taskInfoList">
-              <el-option :label=table.tableName :value=table.id :key=table.id></el-option>
+              <el-option @change="changeTableName(table)" :label=table.tableName :value=table.id :key=table.id></el-option>
             </span>
           </el-select>
         </el-form-item>
         <el-form-item label="表别名">
-          <el-input v-model="taskInputReq.tableAsName"></el-input>
+          <el-input v-model="taskInfo.tableAsName"></el-input>
         </el-form-item>
       </el-form>
 
       <div slot="footer" class="dialog-footer">
         <el-button @click="taskInputAdd = false">取 消</el-button>
-        <el-button type="primary" @click="addTaskInput()">下一步</el-button>
+        <el-button type="primary" @click="addTaskInput(taskInfo)">下一步</el-button>
       </div>
 
 
@@ -340,6 +340,7 @@ export default {
       taskInputReq:{},
       taskList:[],
       taskInfoList:[],
+      taskInfo:{},
       tableList:[],
       structureList:[],
     };
@@ -350,9 +351,14 @@ export default {
   watch: {},
   //方法集合",
   methods: {
+    //选择数据表改变数据
+    changeTableName(row){
+      this.taskInfo = row;
+    },
+
     //查询字段
-    findByInputId(row){
-      findByInputId(row.id).then(res=>{
+    findByInputId(taskInfo){
+      findByInputId(taskInfo.id).then(res=>{
         this.structureList = res.data;
       })
 
@@ -371,9 +377,9 @@ export default {
     },
 
 
-    addTaskInput(){
+    addTaskInput(taskInfo){
       this.taskInputAdd = false;
-      this.findByInputId();
+      this.findByInputId(taskInfo);
       this.taskInputFieldAdd = true;
     },
 

From badc198cdedf7f7f2c89c3d6e04f66de1168f682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com>
Date: Sun, 25 Aug 2024 11:45:16 +0800
Subject: [PATCH 04/22] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9A=E5=89=8D?=
 =?UTF-8?q?=E5=8F=B0=E4=BB=BB=E5=8A=A1=E8=AE=BE=E8=AE=A1=E9=9B=8F=E5=BD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/task/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/task/task/index.vue b/src/views/task/task/index.vue
index 4e8d9b0..9b9cea7 100644
--- a/src/views/task/task/index.vue
+++ b/src/views/task/task/index.vue
@@ -187,7 +187,7 @@
 <!--    添加任务详情设计-->
     <el-dialog title="添加表" :visible.sync="taskInputAdd">
 
-      <el-form  label-width="80px" :model="taskInfoList" ref="queryForm"  :inline="true" class="demo-form-inline" size="small">
+      <el-form  label-width="80px" :model="taskInfo" ref="queryForm"  :inline="true" class="demo-form-inline" size="small">
         <el-form-item label="任务id">
           <el-input v-model="taskInfo.taskId"></el-input>
         </el-form-item>
@@ -353,6 +353,7 @@ export default {
   methods: {
     //选择数据表改变数据
     changeTableName(row){
+      console.log(row);
       this.taskInfo = row;
     },
 

From d3659e5468609390c82df65afa27adabb336ef90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com>
Date: Sun, 25 Aug 2024 11:47:30 +0800
Subject: [PATCH 05/22] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9A=E5=89=8D?=
 =?UTF-8?q?=E5=8F=B0=E4=BB=BB=E5=8A=A1=E8=AE=BE=E8=AE=A1=E9=9B=8F=E5=BD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/task/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/task/task/index.vue b/src/views/task/task/index.vue
index 9b9cea7..b8fcd94 100644
--- a/src/views/task/task/index.vue
+++ b/src/views/task/task/index.vue
@@ -199,7 +199,7 @@
           <el-select  v-model="taskInfo.tableName" placeholder="请选择等级">
             <el-option label="请选择" value="0"></el-option>
             <span v-for="table in taskInfoList">
-              <el-option @change="changeTableName(table)" :label=table.tableName :value=table.id :key=table.id></el-option>
+              <el-option @select="changeTableName(table)" :label=table.tableName :value=table.id :key=table.id></el-option>
             </span>
           </el-select>
         </el-form-item>

From f4d9897c2dfeaaa395998bb0e372563cbdffec9d Mon Sep 17 00:00:00 2001
From: lwj <3529558005@qq.com>
Date: Sun, 25 Aug 2024 11:48:51 +0800
Subject: [PATCH 06/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E5=88=97=E8=A1=A8=E7=9A=84=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/etl/switch/index.vue | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/views/etl/switch/index.vue b/src/views/etl/switch/index.vue
index 6d7ff59..a737215 100644
--- a/src/views/etl/switch/index.vue
+++ b/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.yes_no"
+                :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.yes_no" :value="scope.row.status"/>
+        </template>
       </el-table-column>
 
       <el-table-column

From 905a67d1b8f21bd359b33fbc5b61b2a4b5d8c901 Mon Sep 17 00:00:00 2001
From: chaiyapeng <3535863041@qq.com>
Date: Sun, 25 Aug 2024 11:50:03 +0800
Subject: [PATCH 07/22] =?UTF-8?q?=E5=B0=8F=E5=8D=A1=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/port/port/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/port/port/index.vue b/src/views/port/port/index.vue
index 53d02d5..07f3293 100644
--- a/src/views/port/port/index.vue
+++ b/src/views/port/port/index.vue
@@ -5,7 +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>
+            <button @click="testPhone">测试</button>
+<!--            <el-button style="float: right; padding: 3px 0" type="text">测试</el-button>-->
             <el-button style="float: right; padding: 3px 0" type="text">购买</el-button>
           </div>
         </el-card>

From 95b3db2f10ee87acfe67de9a425e9464557d6d23 Mon Sep 17 00:00:00 2001
From: wxy <14293288+zysysys@user.noreply.gitee.com>
Date: Sun, 25 Aug 2024 11:52:08 +0800
Subject: [PATCH 08/22] =?UTF-8?q?```feat(user):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E8=87=B3=E5=85=85=E5=80=BC=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

用户余额页面现在包含一个“充值”按钮，点击后将导向充值页面，以提升用户交互体验。
```
---
 src/views/money/user/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/money/user/index.vue b/src/views/money/user/index.vue
index d2035df..0f5cdc2 100644
--- a/src/views/money/user/index.vue
+++ b/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');

From 9c8c26c6630281b22d9d3c9178873d2ef9b1e373 Mon Sep 17 00:00:00 2001
From: lwj <3529558005@qq.com>
Date: Sun, 25 Aug 2024 11:54:18 +0800
Subject: [PATCH 09/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E5=AD=97=E5=85=B8=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/etl/switch/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/etl/switch/index.vue b/src/views/etl/switch/index.vue
index a737215..0f0e561 100644
--- a/src/views/etl/switch/index.vue
+++ b/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>
 

From d8a652ab281b0bf7b7d98df25511e7795400b47b Mon Sep 17 00:00:00 2001
From: chaiyapeng <3535863041@qq.com>
Date: Sun, 25 Aug 2024 11:54:50 +0800
Subject: [PATCH 10/22] =?UTF-8?q?=E5=B0=8F=E5=8D=A1=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/port/port/index.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/port/port/index.vue b/src/views/port/port/index.vue
index 07f3293..5528b8d 100644
--- a/src/views/port/port/index.vue
+++ b/src/views/port/port/index.vue
@@ -5,9 +5,8 @@
         <el-card shadow="hover">
           <div slot="header" class="clearfix">
             <span>手机号查询归属地</span>
-            <button @click="testPhone">测试</button>
-<!--            <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>

From febfefef98bafd74547379f96e46f7c5faaad2cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com>
Date: Sun, 25 Aug 2024 11:56:25 +0800
Subject: [PATCH 11/22] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9A=E5=89=8D?=
 =?UTF-8?q?=E5=8F=B0=E4=BB=BB=E5=8A=A1=E8=AE=BE=E8=AE=A1=E9=9B=8F=E5=BD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/task/index.vue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/views/task/task/index.vue b/src/views/task/task/index.vue
index b8fcd94..0465078 100644
--- a/src/views/task/task/index.vue
+++ b/src/views/task/task/index.vue
@@ -196,10 +196,10 @@
           <el-input v-model="taskInfo.databaseId"></el-input>
         </el-form-item>
         <el-form-item label="数据表">
-          <el-select  v-model="taskInfo.tableName" placeholder="请选择等级">
+          <el-select @change="changeTableName(taskInfo.tableName)" v-model="taskInfo.tableName" placeholder="请选择等级">
             <el-option label="请选择" value="0"></el-option>
             <span v-for="table in taskInfoList">
-              <el-option @select="changeTableName(table)" :label=table.tableName :value=table.id :key=table.id></el-option>
+              <el-option  :label=table.tableName :value=table.id :key=table.id></el-option>
             </span>
           </el-select>
         </el-form-item>
@@ -352,9 +352,12 @@ export default {
   //方法集合",
   methods: {
     //选择数据表改变数据
-    changeTableName(row){
-      console.log(row);
-      this.taskInfo = row;
+    changeTableName(table){
+      this.taskInfoList.forEach(res=>{
+        if(table.eq(res.tableName)){
+          this.taskInfo = res;
+        }
+      })
     },
 
     //查询字段

From 02e9172427a3f88ea6695b2299f928887fb032e2 Mon Sep 17 00:00:00 2001
From: lwj <3529558005@qq.com>
Date: Sun, 25 Aug 2024 14:04:03 +0800
Subject: [PATCH 12/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E5=AD=97=E5=85=B8=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/etl/switch/index.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/etl/switch/index.vue b/src/views/etl/switch/index.vue
index 0f0e561..71683b6 100644
--- a/src/views/etl/switch/index.vue
+++ b/src/views/etl/switch/index.vue
@@ -274,13 +274,16 @@ import {getInfo} from "@/api/etl/switch";
 import {structure} from "@/api/etl/switch";
 
 export default {
+  dicts: ['sys_normal_disable','yes_no'],
   //import引入的组件需要注入到对象中才能使用"
   components: {},
   props: {},
   data() {
+
     //这里存放数据"
 
     return {
+      dicts: ['sys_normal_disable','yes_no'],
       rules: {
         dataResourceName: [
           {required: true, message: "接入源名称不能为空", trigger: "blur"}

From c810e2f67fc117f1623cc2c8b734a34c6e39c9cf Mon Sep 17 00:00:00 2001
From: lwj <3529558005@qq.com>
Date: Sun, 25 Aug 2024 14:08:05 +0800
Subject: [PATCH 13/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/etl/switch/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/etl/switch/index.vue b/src/views/etl/switch/index.vue
index 71683b6..66bf9c5 100644
--- a/src/views/etl/switch/index.vue
+++ b/src/views/etl/switch/index.vue
@@ -283,7 +283,7 @@ export default {
     //这里存放数据"
 
     return {
-      dicts: ['sys_normal_disable','yes_no'],
+      dicts: ['sys_normal_disable','type'],
       rules: {
         dataResourceName: [
           {required: true, message: "接入源名称不能为空", trigger: "blur"}

From a09a269ac9f61b03f4d5a51830d08222b228db83 Mon Sep 17 00:00:00 2001
From: lwj <3529558005@qq.com>
Date: Sun, 25 Aug 2024 14:12:21 +0800
Subject: [PATCH 14/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/etl/switch/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/etl/switch/index.vue b/src/views/etl/switch/index.vue
index 66bf9c5..108778d 100644
--- a/src/views/etl/switch/index.vue
+++ b/src/views/etl/switch/index.vue
@@ -283,7 +283,7 @@ export default {
     //这里存放数据"
 
     return {
-      dicts: ['sys_normal_disable','type'],
+      dicts: ['type','yes_no'],
       rules: {
         dataResourceName: [
           {required: true, message: "接入源名称不能为空", trigger: "blur"}

From 10ef5733e8fc66392b66fb09f901db45fd6115ad Mon Sep 17 00:00:00 2001
From: lwj <3529558005@qq.com>
Date: Sun, 25 Aug 2024 14:15:49 +0800
Subject: [PATCH 15/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/etl/switch/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/etl/switch/index.vue b/src/views/etl/switch/index.vue
index 108778d..db3d1af 100644
--- a/src/views/etl/switch/index.vue
+++ b/src/views/etl/switch/index.vue
@@ -212,7 +212,7 @@
         label="是否初始化"
         prop="status">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type" :value="scope.row.status"/>
+          <dict-tag :options="dict.type.yes_no" :value="scope.row.status"/>
         </template>
       </el-table-column>
 

From 2b91407347ce7e4a6e130508f89d6a118519b5cf Mon Sep 17 00:00:00 2001
From: chaiyapeng <3535863041@qq.com>
Date: Sun, 25 Aug 2024 14:18:40 +0800
Subject: [PATCH 16/22] =?UTF-8?q?=E5=B0=8F=E5=8D=A1=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/port/port/index.vue | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/views/port/port/index.vue b/src/views/port/port/index.vue
index 5528b8d..af3c985 100644
--- a/src/views/port/port/index.vue
+++ b/src/views/port/port/index.vue
@@ -14,8 +14,8 @@
         <el-card shadow="hover">
           <div slot="header" class="clearfix">
             <span>IP查询归属地</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="testIp">测试</el-button>
           </div>
         </el-card>
       </el-col>
@@ -23,8 +23,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="testNews">测试</el-button>
           </div>
         </el-card>
       </el-col>
@@ -32,8 +32,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="testWeather">测试</el-button>
           </div>
         </el-card>
       </el-col>
@@ -41,8 +41,17 @@
         <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="testBirth">测试</el-button>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col :span="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" @click="testPostcodd">测试</el-button>
           </div>
         </el-card>
       </el-col>
@@ -62,13 +71,7 @@ export default {
     //这里存放数据"
 
     return {
-      formLabelAlign:{
-        province:"",
-        city:"",
-        areacode:"",
-        zip:"",
-        company:"",
-      },
+
     };
   },
   //计算属性 类似于data概念",

From 102cfd3fe973815f5380af19588ea624121941ab Mon Sep 17 00:00:00 2001
From: chaiyapeng <3535863041@qq.com>
Date: Sun, 25 Aug 2024 14:23:17 +0800
Subject: [PATCH 17/22] =?UTF-8?q?=E5=B0=8F=E5=8D=A1=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/port/port/index.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/port/port/index.vue b/src/views/port/port/index.vue
index af3c985..a092609 100644
--- a/src/views/port/port/index.vue
+++ b/src/views/port/port/index.vue
@@ -5,7 +5,7 @@
         <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" @click="buyPhone">购买</el-button>
             <el-button style="float: right; padding: 3px 0" @click="testPhone">测试</el-button>
           </div>
         </el-card>
@@ -14,7 +14,7 @@
         <el-card shadow="hover">
           <div slot="header" class="clearfix">
             <span>IP查询归属地</span>
-            <el-button style="float: right; padding: 3px 0" type="text">购买</el-button>
+            <el-button style="float: right; padding: 3px 0" @click="buyIp">购买</el-button>
             <el-button style="float: right; padding: 3px 0" @click="testIp">测试</el-button>
           </div>
         </el-card>
@@ -23,7 +23,7 @@
         <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" @click="buyNews">购买</el-button>
             <el-button style="float: right; padding: 3px 0" @click="testNews">测试</el-button>
           </div>
         </el-card>
@@ -32,7 +32,7 @@
         <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" @click="buyWeather">购买</el-button>
             <el-button style="float: right; padding: 3px 0" @click="testWeather">测试</el-button>
           </div>
         </el-card>
@@ -41,7 +41,7 @@
         <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" @click="buyBirth">购买</el-button>
             <el-button style="float: right; padding: 3px 0" @click="testBirth">测试</el-button>
           </div>
         </el-card>
@@ -50,7 +50,7 @@
         <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" @click="buyPostcodd">购买</el-button>
             <el-button style="float: right; padding: 3px 0" @click="testPostcodd">测试</el-button>
           </div>
         </el-card>

From 377878c61f771e43e9b8258f88402d21e8233ff2 Mon Sep 17 00:00:00 2001
From: lwj <3529558005@qq.com>
Date: Sun, 25 Aug 2024 14:29:22 +0800
Subject: [PATCH 18/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/etl/switch/index.vue | 8 ++++----
 src/views/login.vue            | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/etl/switch/index.vue b/src/views/etl/switch/index.vue
index db3d1af..ddd0003 100644
--- a/src/views/etl/switch/index.vue
+++ b/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"
+                v-for="dict in dict.type.sys_yes_no"
                 :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="dicts.type.sys_yes_no" :value="scope.row.status"/>
         </template>
       </el-table-column>
 
@@ -274,7 +274,7 @@ import {getInfo} from "@/api/etl/switch";
 import {structure} from "@/api/etl/switch";
 
 export default {
-  dicts: ['sys_normal_disable','yes_no'],
+  dicts: ['sys_normal_disable','sys_yes_no'],
   //import引入的组件需要注入到对象中才能使用"
   components: {},
   props: {},
@@ -283,7 +283,7 @@ export default {
     //这里存放数据"
 
     return {
-      dicts: ['type','yes_no'],
+      dicts: ['type','sys_yes_no'],
       rules: {
         dataResourceName: [
           {required: true, message: "接入源名称不能为空", trigger: "blur"}
diff --git a/src/views/login.vue b/src/views/login.vue
index 5191361..fc32a33 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -87,7 +87,7 @@ export default {
       },
       loading: false,
       // 验证码开关
-      captchaEnabled: true,
+      captchaEnabled: false,
       // 注册开关
       register: true,
       redirect: undefined

From d9b239099399b4f3a296fb45ca3eaeb6d28de1c8 Mon Sep 17 00:00:00 2001
From: chaiyapeng <3535863041@qq.com>
Date: Sun, 25 Aug 2024 14:35:32 +0800
Subject: [PATCH 19/22] =?UTF-8?q?=E5=B0=8F=E5=8D=A1=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/port/port/index.vue | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/views/port/port/index.vue b/src/views/port/port/index.vue
index a092609..1670e34 100644
--- a/src/views/port/port/index.vue
+++ b/src/views/port/port/index.vue
@@ -6,7 +6,7 @@
           <div slot="header" class="clearfix">
             <span>手机号查询归属地</span>
             <el-button style="float: right; padding: 3px 0" @click="buyPhone">购买</el-button>
-            <el-button style="float: right; padding: 3px 0" @click="testPhone">测试</el-button>
+            <el-button style="float: right; padding: 3px 0" @click="dialogFormVisible=true">测试</el-button>dialogFormVisible
           </div>
         </el-card>
       </el-col>
@@ -56,6 +56,22 @@
         </el-card>
       </el-col>
     </el-row>
+<!--    手机号查询归属地测试-->
+    <el-dialog title="手机号查询归属地" :visible.sync="dialogFormVisible">
+      <el-form :model="form">
+        <el-form-item label="手机号" :label-width="formLabelWidth">
+          <el-input v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item  :label-width="formLabelWidth">
+          <button @click="">查询</button>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -71,7 +87,7 @@ export default {
     //这里存放数据"
 
     return {
-
+      dialogFormVisible:false,
     };
   },
   //计算属性 类似于data概念",

From ba537954ae2eb2a14216de34a8683ce05d4d09f9 Mon Sep 17 00:00:00 2001
From: lwj <3529558005@qq.com>
Date: Sun, 25 Aug 2024 14:40:43 +0800
Subject: [PATCH 20/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/etl/switch/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/etl/switch/index.vue b/src/views/etl/switch/index.vue
index ddd0003..8a4d10c 100644
--- a/src/views/etl/switch/index.vue
+++ b/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.sys_yes_no"
+                v-for="dict in dict.type.ys_yes_no"
                 :key="dict.value"
                 :label="dict.value"
               >{{ dict.label }}
@@ -212,7 +212,7 @@
         label="是否初始化"
         prop="status">
         <template slot-scope="scope">
-          <dict-tag :options="dicts.type.sys_yes_no" :value="scope.row.status"/>
+          <dict-tag :options="dicts.type.ys_yes_no" :value="scope.row.status"/>
         </template>
       </el-table-column>
 
@@ -274,7 +274,7 @@ import {getInfo} from "@/api/etl/switch";
 import {structure} from "@/api/etl/switch";
 
 export default {
-  dicts: ['sys_normal_disable','sys_yes_no'],
+  dicts: ['sys_normal_disable','ys_yes_no'],
   //import引入的组件需要注入到对象中才能使用"
   components: {},
   props: {},

From 4e78da8a1ed13d471be6ac794b59e2aa980d51f7 Mon Sep 17 00:00:00 2001
From: lwj <3529558005@qq.com>
Date: Sun, 25 Aug 2024 14:43:55 +0800
Subject: [PATCH 21/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/etl/switch/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/etl/switch/index.vue b/src/views/etl/switch/index.vue
index 8a4d10c..8b8a81a 100644
--- a/src/views/etl/switch/index.vue
+++ b/src/views/etl/switch/index.vue
@@ -283,7 +283,7 @@ export default {
     //这里存放数据"
 
     return {
-      dicts: ['type','sys_yes_no'],
+      dicts: ['sys_normal_disable','ys_yes_no'],
       rules: {
         dataResourceName: [
           {required: true, message: "接入源名称不能为空", trigger: "blur"}

From 971b9042d937140d5761083b61f1a199bc1b872c Mon Sep 17 00:00:00 2001
From: chaiyapeng <3535863041@qq.com>
Date: Sun, 25 Aug 2024 14:43:57 +0800
Subject: [PATCH 22/22] =?UTF-8?q?=E5=B0=8F=E5=8D=A1=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/port/port/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/port/port/index.vue b/src/views/port/port/index.vue
index 1670e34..5cc2f1b 100644
--- a/src/views/port/port/index.vue
+++ b/src/views/port/port/index.vue
@@ -67,7 +67,6 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">取 消</el-button>
         <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
       </div>
     </el-dialog>
@@ -88,6 +87,7 @@ export default {
 
     return {
       dialogFormVisible:false,
+      form:{},
     };
   },
   //计算属性 类似于data概念",