From 70eb109eb602406345c7a44ff932ddb5db9d629a Mon Sep 17 00:00:00 2001
From: wxy <14293288+zysysys@user.noreply.gitee.com>
Date: Fri, 30 Aug 2024 22:02:13 +0800
Subject: [PATCH 1/5] =?UTF-8?q?###=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

####1. 增加实名认证功能
在用户余额页面增加实名认证对话框，包括姓名和身份证号输入，取消和确认按钮。实名认证逻辑在`navigateToRecharge`方法中实现，如果用户已实名，则直接跳转至充值页面，否则显示实名认证对话框。

####2. 重构充值按钮逻辑充值按钮现在会根据用户实名认证状态跳转至相应页面。如果用户未实名，将显示实名认证对话框。

####3. 更新用户余额获取逻辑优化`fetchUserBalance`方法，处理用户未登录和用户余额获取失败的情况。

#### 4.暂时注释接口列表代码
在`index.vue`文件中，接口列表的表格代码被注释掉，可能是因为接口列表功能尚未实现或暂时禁用。

#### 5. 新增实名认证API调用
增加新的API调用`checkRealNameAuth`，用于实名认证校验。此方法通过POST请求调用第三方服务，传入用户实名和身份证号数据。

以上修改涉及用户余额页面的增强和实名认证流程的引入，同时对现有API进行扩展以支持新的功能需求。
---
 src/api/system/user.js             | 10 +++++
 src/views/money/user/index.vue     | 72 +++++++++++++++++++++++++++---
 src/views/workbench/rate/index.vue | 15 ++++---
 3 files changed, 84 insertions(+), 13 deletions(-)

diff --git a/src/api/system/user.js b/src/api/system/user.js
index 8c29a3b..92d0721 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -31,6 +31,16 @@ export function userRecharge(data) {
 }
 
 
+
+// 调用第三方实名认证
+export function checkRealNameAuth(data) {
+  return request({
+    url: '/system/aliyun/pay/doPost',
+    method: 'post',
+    data: data
+  })
+}
+
 // 充值用户余额记录
 export function createRechargeRecord(data) {
   return request({
diff --git a/src/views/money/user/index.vue b/src/views/money/user/index.vue
index 0c5f753..1b78607 100644
--- a/src/views/money/user/index.vue
+++ b/src/views/money/user/index.vue
@@ -4,6 +4,25 @@
       <h1>用户余额</h1>
       <p>余额：{{ userBalanceData.userBalance || '加载中...' }}</p>
       <el-button type="primary" @click="navigateToRecharge">充值</el-button>
+      <el-dialog
+        title="实名认证"
+        :visible.sync="dialogVisible"
+        width="30%"
+        @close="handleDialogClose"
+      >
+        <el-form :model="authForm">
+          <el-form-item label="姓名" :label-width="formLabelWidth">
+            <el-input v-model="authForm.name"></el-input>
+          </el-form-item>
+          <el-form-item label="身份证号" :label-width="formLabelWidth">
+            <el-input v-model="authForm.idCard"></el-input>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="handleCancel">取消</el-button>
+          <el-button type="primary" @click="handleConfirm">确认</el-button>
+        </div>
+      </el-dialog>
     </el-card>
 
 
@@ -46,17 +65,23 @@
 <script>
 import { userBalance } from "@/api/system/user"; //
 import * as echarts from 'echarts' //引用echarts
+import {checkRealNameAuth} from "@/api/system/user";
 
 export default {
   data() {
     return {
       charts: "",
+      dialogVisible: false,
       dialogFormVisible: false,
       formLabelWidth: '120px',
       opinionData: ["155", "400", "900", "800", "300", "900", "270","684","165","0","300","150"], // 数据
       userBalanceData: {
         userBalance: '加载中...'
       },
+      authForm: {
+        name: '',
+        idCard: ''
+      },
       form:{
 
       }
@@ -69,26 +94,61 @@ export default {
     this.drawLine();
   },
   methods: {
-    navigateToRecharge() {
-      this.$router.push('/money/zfb');
+    handleCancel() {
+      this.dialogVisible = false;
+    },
+    handleDialogClose() {
+      this.authForm.name = '';
+      this.authForm.idCard = '';
+    },
+    async navigateToRecharge() {
+      try {
+        const response = await checkRealNameAuth(this.authForm);
+        if (response.data && response.data.isAuthenticated) {
+          // 如果已实名认证，直接跳转页面
+          this.$router.push('/money/zfb');
+        } else {
+          // 如果未实名认证，显示对话框
+          this.dialogVisible = true;
+        }
+      } catch (error) {
+        this.$message.error('实名认证检查失败，请稍后再试');
+        console.error('实名认证检查失败:', error);
+      }
+    },
+    async handleConfirm() {
+      try {
+        const { name, idCard } = this.authForm;
+        const authResponse = await checkRealNameAuth(this.authForm);
+        if (authResponse.code ==200 ) {
+          this.$message.success('实名认证成功');
+          this.dialogVisible = false;
+          this.$router.push('/money/zfb');
+        } else {
+          this.$message.error('实名认证失败，请检查您的信息');
+        }
+      } catch (error) {
+        this.$message.error('实名认证验证失败，请稍后再试');
+        console.error('实名认证验证失败:', error);
+      }
     },
     async fetchUserBalance() {
       try {
         const userId = localStorage.getItem('userId');
         console.log(userId)// 登录后把userId存到了localStorage
         if (!userId) {
-          this.userBalanceData = {userBalance: '未登录'};
+          this.userBalanceData = { userBalance: '未登录' };
           return;
         }
         const response = await userBalance(userId);
-        if (response.data) {
+        if (response.data ) {
           console.log(response.data)
           this.userBalanceData.userBalance = response.data;
         } else {
-          this.userBalanceData.userBalance = {userBalance: '获取失败'};
+          this.userBalanceData.userBalance = { userBalance: '获取失败' };
         }
       } catch (error) {
-        this.userBalanceData = {userBalance: '获取失败'};
+        this.userBalanceData = { userBalance: '获取失败' };
         console.error('Error fetching user balance:', error);
       }
     },
diff --git a/src/views/workbench/rate/index.vue b/src/views/workbench/rate/index.vue
index 089b9ad..f6cb363 100644
--- a/src/views/workbench/rate/index.vue
+++ b/src/views/workbench/rate/index.vue
@@ -16,15 +16,16 @@
     <el-card style="margin-top: 50px;">
       <h3>接口列表</h3>
       <el-divider></el-divider>
-      <el-table  :data="tableData">
-        <el-table-column label="">
-          <template slot-scope="scope">
-            <span style="margin-left: 10px">{{ scope.row.connectorName }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
+<!--      <el-table  :data="tableData">-->
+<!--        <el-table-column label="">-->
+<!--          <template slot-scope="scope">-->
+<!--            <span style="margin-left: 10px">{{ scope.row.connectorName }}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--      </el-table>-->
     </el-card>
   </div>
+
 </template>
 
 <script>

From e609d05e5b4a4deca96604ff9d3d975ed9497844 Mon Sep 17 00:00:00 2001
From: wxy <14293288+zysysys@user.noreply.gitee.com>
Date: Fri, 30 Aug 2024 22:20:11 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=9E=E5=90=8D=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=B7=BB=E5=8A=A0=E9=AA=8C=E8=AF=81=E5=92=8C?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

实名认证功能已进行以下改进：
- 表单字段添加了验证规则，以确保用户输入有效的姓名和身份证号。- 修复了表单提交逻辑，确保只有在通过验证后才会进行实名认证提交。
-调整了实名认证弹窗关闭时的处理逻辑。
- 修正了实名认证成功后的导航路径。
---
 src/views/money/user/index.vue | 60 +++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 22 deletions(-)

diff --git a/src/views/money/user/index.vue b/src/views/money/user/index.vue
index 1b78607..00dd18e 100644
--- a/src/views/money/user/index.vue
+++ b/src/views/money/user/index.vue
@@ -10,7 +10,7 @@
         width="30%"
         @close="handleDialogClose"
       >
-        <el-form :model="authForm">
+        <el-form :model="authForm" :rules="rules" ref="authFormRef">
           <el-form-item label="姓名" :label-width="formLabelWidth">
             <el-input v-model="authForm.name"></el-input>
           </el-form-item>
@@ -63,7 +63,7 @@
 </template>
 
 <script>
-import { userBalance } from "@/api/system/user"; //
+import {userBalance} from "@/api/system/user"; //
 import * as echarts from 'echarts' //引用echarts
 import {checkRealNameAuth} from "@/api/system/user";
 
@@ -74,7 +74,7 @@ export default {
       dialogVisible: false,
       dialogFormVisible: false,
       formLabelWidth: '120px',
-      opinionData: ["155", "400", "900", "800", "300", "900", "270","684","165","0","300","150"], // 数据
+      opinionData: ["155", "400", "900", "800", "300", "900", "270", "684", "165", "0", "300", "150"], // 数据
       userBalanceData: {
         userBalance: '加载中...'
       },
@@ -82,9 +82,17 @@ export default {
         name: '',
         idCard: ''
       },
-      form:{
-
-      }
+      rules: {
+        name: [
+          {required: true, message: '请输入姓名', trigger: 'blur'},
+          {min: 2, max: 10, message: '姓名长度在 2 到 10 个字符', trigger: 'blur'}
+        ],
+        idCard: [
+          {required: true, message: '请输入身份证号', trigger: 'blur'},
+          {pattern: /^\d{17}[\dXx]$/, message: '身份证号格式不正确', trigger: 'blur'}
+        ],
+      },
+      form: {}
     };
   },
   created() {
@@ -117,38 +125,46 @@ export default {
       }
     },
     async handleConfirm() {
-      try {
-        const { name, idCard } = this.authForm;
-        const authResponse = await checkRealNameAuth(this.authForm);
-        if (authResponse.code ==200 ) {
-          this.$message.success('实名认证成功');
-          this.dialogVisible = false;
-          this.$router.push('/money/zfb');
+      this.$refs.authFormRef.validate(async (valid) => {
+        if (valid) {
+          try {
+            const {name, idCard} = this.authForm;
+            const authResponse = await checkRealNameAuth(this.authForm);
+            if (authResponse.code == 200) {
+              this.$message.success('实名认证成功');
+              this.dialogVisible = false;
+              this.$router.push('/money/zfb');
+            } else {
+              this.$message.error('实名认证失败，请检查您的信息');
+            }
+          } catch (error) {
+            this.$message.error('实名认证验证失败，请稍后再试');
+            console.error('实名认证验证失败:', error);
+          }
         } else {
-          this.$message.error('实名认证失败，请检查您的信息');
+          console.log('error submit!!');
+          return false;
         }
-      } catch (error) {
-        this.$message.error('实名认证验证失败，请稍后再试');
-        console.error('实名认证验证失败:', error);
-      }
+      });
+
     },
     async fetchUserBalance() {
       try {
         const userId = localStorage.getItem('userId');
         console.log(userId)// 登录后把userId存到了localStorage
         if (!userId) {
-          this.userBalanceData = { userBalance: '未登录' };
+          this.userBalanceData = {userBalance: '未登录'};
           return;
         }
         const response = await userBalance(userId);
-        if (response.data ) {
+        if (response.data) {
           console.log(response.data)
           this.userBalanceData.userBalance = response.data;
         } else {
-          this.userBalanceData.userBalance = { userBalance: '获取失败' };
+          this.userBalanceData.userBalance = {userBalance: '获取失败'};
         }
       } catch (error) {
-        this.userBalanceData = { userBalance: '获取失败' };
+        this.userBalanceData = {userBalance: '获取失败'};
         console.error('Error fetching user balance:', error);
       }
     },

From e4a178d8786b8466d8afe9569c3c02ffaff35557 Mon Sep 17 00:00:00 2001
From: chaiyapeng <3535863041@qq.com>
Date: Fri, 30 Aug 2024 22:34:05 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=B0=94=E8=B1=A1=E9=A2=84=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/port/port/index.js       |  13 ++++
 src/views/port/port/employee.vue | 114 ++++++++++++++++++++++++-------
 2 files changed, 104 insertions(+), 23 deletions(-)

diff --git a/src/api/port/port/index.js b/src/api/port/port/index.js
index fee0964..2b74f23 100644
--- a/src/api/port/port/index.js
+++ b/src/api/port/port/index.js
@@ -57,3 +57,16 @@ export function getBirthday(data) {
     data:data
   })
 }
+
+export function getPostcode(code) {
+  return request({
+    url: '/port/list/getPostcode?code='+code,
+    method: 'GET'
+  })
+}
+export function getWeather() {
+  return request({
+    url: '/port/list/getWeather',
+    method: 'GET'
+  })
+}
diff --git a/src/views/port/port/employee.vue b/src/views/port/port/employee.vue
index dff8371..5d0c57a 100644
--- a/src/views/port/port/employee.vue
+++ b/src/views/port/port/employee.vue
@@ -17,9 +17,9 @@
           <el-button type="primary" style="float: right; padding: 10px 10px" @click="testPhone()" v-if="connector.connectorName=='手机号查询归属地'">测试API</el-button>
           <el-button type="primary" style="float: right; padding: 10px 10px" @click="testIP()" v-if="connector.connectorName=='IP查询归属地'">测试API</el-button>
           <el-button type="primary" style="float: right; padding: 10px 10px" @click="testNews()" v-if="connector.connectorName=='新闻头条'">测试API</el-button>
-          <el-button type="primary" style="float: right; padding: 10px 10px" @click="testWeather()" v-if="connector.connectorName=='气象预警'">测试</el-button>
+          <el-button type="primary" style="float: right; padding: 10px 10px" @click="testWeather()" v-if="connector.connectorName=='气象预警'">测试API</el-button>
           <el-button type="primary" style="float: right; padding: 10px 10px" @click="testBirthdate()" v-if="connector.connectorName=='生辰助手'">测试API</el-button>
-          <el-button type="primary" style="float: right; padding: 10px 10px" @click="testMailbox()" v-if="connector.connectorName=='邮编查询'">测试</el-button>
+          <el-button type="primary" style="float: right; padding: 10px 10px" @click="testMailbox()" v-if="connector.connectorName=='邮编查询'">测试API</el-button>
         </el-card>
       </el-col>
     </el-row>
@@ -88,31 +88,58 @@
           <el-input v-model="formBirthday.hour" autocomplete="off" placeholder="请输入几点"></el-input>
         </el-form-item>
         <span style="font-weight: bold;font-size: 20px" v-if="formBirthday.reason==true">
-          {{this.formBirthday.years}}<br>
-          {{this.formBirthday.months}}<br>
-          {{this.formBirthday.days}}<br>
-          {{this.formBirthday.animal}}<br>
-          {{this.formBirthday.imonthcn}}<br>
-          {{this.formBirthday.idaycn}}<br>
-          {{this.formBirthday.cyear}}<br>
-          {{this.formBirthday.cmonth}}<br>
-          {{this.formBirthday.cday}}<br>
-          {{this.formBirthday.gzyear}}<br>
-          {{this.formBirthday.gzmonth}}<br>
-          {{this.formBirthday.gzday}}<br>
-          {{this.formBirthday.isleap}}<br>
-          {{this.formBirthday.ncweek}}<br>
-          {{this.formBirthday.isterm}}<br>
-          {{this.formBirthday.term}}<br>
-          {{this.formBirthday.astro}}<br>
-          {{this.formBirthday.eightall}}<br>
-          {{this.formBirthday.fiveall}}
+         years： {{this.formBirthday.years}}<br>
+         months： {{this.formBirthday.months}}<br>
+         days： {{this.formBirthday.days}}<br>
+         animal： {{this.formBirthday.animal}}<br>
+         imonthcn： {{this.formBirthday.imonthcn}}<br>
+         idaycn： {{this.formBirthday.idaycn}}<br>
+         cyear： {{this.formBirthday.cyear}}<br>
+         cmonth： {{this.formBirthday.cmonth}}<br>
+         cday： {{this.formBirthday.cday}}<br>
+         gzyear： {{this.formBirthday.gzyear}}<br>
+         gzmonth： {{this.formBirthday.gzmonth}}<br>
+         gzday： {{this.formBirthday.gzday}}<br>
+         isleap： {{this.formBirthday.isleap}}<br>
+         ncweek： {{this.formBirthday.ncweek}}<br>
+         isterm： {{this.formBirthday.isterm}}<br>
+         term： {{this.formBirthday.term}}<br>
+         astro： {{this.formBirthday.astro}}<br>
+         eightall： {{this.formBirthday.eightall}}<br>
+         fiveall： {{this.formBirthday.fiveall}}
         </span>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="getBirthday()">发起请求</el-button>
       </div>
     </el-dialog>
+
+    <!--邮编查询-->
+    <el-dialog title="邮编查询" :visible.sync="dialogFormVisible3">
+      <el-form :model="formPostCode">
+        <el-form-item label="邮编" >
+          <el-input v-model="formPostCode.code" autocomplete="off" placeholder="请输入邮编"></el-input>
+        </el-form-item>
+        <el-table :data="gridData2" v-if="formPostCode.reason==true">
+          <el-table-column property="postNumber" label="邮编" width="150"></el-table-column>
+          <el-table-column property="province" label="省" width="200"></el-table-column>
+          <el-table-column property="city" label="市"></el-table-column>
+          <el-table-column property="district" label="区"></el-table-column>
+          <el-table-column property="address" label="县"></el-table-column>
+        </el-table>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="getPostcode()">发起请求</el-button>
+      </div>
+    </el-dialog>
+
+    <!--    气象预警-->
+    <el-dialog title="气象预警" :visible.sync="dialogFormVisible4">
+        <el-aside width="100%">
+          <el-tree :data="data" :props="defaultProps"></el-tree>
+        </el-aside>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -125,6 +152,8 @@ import {phonePlace} from "@/api/port/port";
 import {getIpPlace} from "@/api/port/port";
 import {getHeadlines} from "@/api/port/port";
 import {getBirthday} from "@/api/port/port";
+import {getPostcode} from "@/api/port/port";
+import {getWeather} from "@/api/port/port";
 export default {
   //import引入的组件需要注入到对象中才能使用"
   components: {},
@@ -133,9 +162,26 @@ export default {
     //这里存放数据"
 
     return {
+      formWeather:{},
+      data:[],
+      defaultProps: {
+        children:"citys",
+        label:'provinceName',
+      },
       connectorList:[],
       gridData:[],
+      gridData2:[],
       form:{},
+      // 邮编查询
+      formPostCode:{
+        code:"",
+        // postNumber:"",
+        // province:"",
+        // city:"",
+        // district:"",
+        // address:"",
+        reason:"",
+      },
       // 手机号查询归属地formInline
       formInline:{
         tel:"",
@@ -189,6 +235,8 @@ export default {
       dialogFormVisible:false,
       dialogFormVisible1:false,
       dialogFormVisible2:false,
+      dialogFormVisible3:false,
+      dialogFormVisible4:false,
       dialogTableVisible:false,
     };
   },
@@ -205,6 +253,26 @@ export default {
   watch: {},
   //方法集合",
   methods: {
+    // 气象预警
+    testWeather(){
+
+      getWeather().then((res)=>{
+        this.data=res.data;
+
+        this.dialogFormVisible4=true;
+      })
+    },
+    // 邮编查询
+    getPostcode(){
+      getPostcode(this.formPostCode.code).then((res)=>{
+        console.log(res.data);
+        this.gridData2=res.data;
+        this.formPostCode.reason=true;
+      })
+    },
+    testMailbox(){
+      this.dialogFormVisible3=true;
+    },
     getBirthday(){
       getBirthday(this.formBirthday).then((res)=>{
         console.log(res.data);
@@ -226,8 +294,8 @@ export default {
         this.formBirthday.isterm=res.data.isterm;
         this.formBirthday.term=res.data.term;
         this.formBirthday.astro=res.data.astro;
-        // this.formBirthday.eightall=res.data.eightall;
-        // this.formBirthday.fiveall=res.data.fiveall;
+        this.formBirthday.eightall=res.data.eightall;
+        this.formBirthday.fiveall=res.data.fiveall;
 
       })
     },

From a704fa4bb1a63c7e2a58ca76b0a4eac49719450d Mon Sep 17 00:00:00 2001
From: chaiyapeng <3535863041@qq.com>
Date: Sat, 31 Aug 2024 00:59:14 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=B0=94=E8=B1=A1=E9=A2=84=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/port/port/employee.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/port/port/employee.vue b/src/views/port/port/employee.vue
index 5d0c57a..a6897fd 100644
--- a/src/views/port/port/employee.vue
+++ b/src/views/port/port/employee.vue
@@ -136,7 +136,11 @@
     <!--    气象预警-->
     <el-dialog title="气象预警" :visible.sync="dialogFormVisible4">
         <el-aside width="100%">
-          <el-tree :data="data" :props="defaultProps"></el-tree>
+          <el-tree :data="data" :props="defaultProps">
+            <template slot-scope="{data,node}">
+              <span>{{data.provinceName}}{{data.cityName}}--{{data.cityCode}}</span>
+            </template>
+          </el-tree>
         </el-aside>
     </el-dialog>
 

From 51cc9087caad83079e09fc19ecf99034382ec07a Mon Sep 17 00:00:00 2001
From: wxy <14293288+zysysys@user.noreply.gitee.com>
Date: Sat, 31 Aug 2024 01:13:14 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=9E=E5=90=8D=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在实名认证检查中，条件判断从使用`isAuthenticated`改为使用`desc`。这与更新的认证响应格式保持一致。
---
 src/views/money/user/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/money/user/index.vue b/src/views/money/user/index.vue
index 00dd18e..874a1a7 100644
--- a/src/views/money/user/index.vue
+++ b/src/views/money/user/index.vue
@@ -112,7 +112,7 @@ export default {
     async navigateToRecharge() {
       try {
         const response = await checkRealNameAuth(this.authForm);
-        if (response.data && response.data.isAuthenticated) {
+        if (response.data && response.data.desc) {
           // 如果已实名认证，直接跳转页面
           this.$router.push('/money/zfb');
         } else {
@@ -130,7 +130,7 @@ export default {
           try {
             const {name, idCard} = this.authForm;
             const authResponse = await checkRealNameAuth(this.authForm);
-            if (authResponse.code == 200) {
+            if (authResponse.data && authResponse.data.desc) {
               this.$message.success('实名认证成功');
               this.dialogVisible = false;
               this.$router.push('/money/zfb');