Merge remote-tracking branch 'origin/master'

src/api/engine/engine.js

@@ -73,7 +73,7 @@ export function getRuleEngineInfo(id) {
 // 通过id查询
 export function findById(id) {
   return request({
-    url: '/engine/engine/findById/' + id,
+    url: '/engine/engine/findByIds/' + id,
     method: 'get'
   })
 }
@@ -88,3 +88,16 @@ export function dels(id) {
 }
 
 
+
+//天机规则数据
+export  function add(data){
+  return request({
+    url: "/engine/version/insert",
+    method: "post",
+    data:data
+  })
+}
+
+
+
+

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({

src/views/engine/engine/list.vue

@@ -1,7 +1,6 @@
 <template>
 
   <div>
-
     <div style="height: 30px">
 
       {{ maintenance.name }}<br>
@@ -72,35 +71,35 @@
 
     <el-dialog title="收货地址" :visible.sync="dialogFormVisible">
 
-      <el-form :model="form">
+      <el-form :model="maintenance">
 
         <el-form-item label="名称" :label-width="formLabelWidth">
 
-          <el-input v-model="form.name" autocomplete="off"></el-input>
+          <el-input v-model="maintenance.name" autocomplete="off"></el-input>
 
         </el-form-item>
 
         <el-form-item label="类型" :label-width="formLabelWidth">
 
-          <el-input v-model="form.type" autocomplete="off"></el-input>
+          <el-input v-model="maintenance.type" autocomplete="off"></el-input>
 
         </el-form-item>
 
         <el-form-item label="作用域" :label-width="formLabelWidth">
 
-          <el-input v-model="form.scope" autocomplete="off"></el-input>
+          <el-input v-model="maintenance.scope" autocomplete="off"></el-input>
 
         </el-form-item>
 
         <el-form-item label="是否激活" :label-width="formLabelWidth">
 
-          <el-input v-model="form.isActivate" autocomplete="off"></el-input>
+          <el-input v-model="maintenance.isActivate" autocomplete="off"></el-input>
 
         </el-form-item>
 
         <el-form-item label="状态" :label-width="formLabelWidth">
 
-          <el-input v-model="form.status" autocomplete="off"></el-input>
+          <el-input v-model="maintenance.status" autocomplete="off"></el-input>
 
         </el-form-item>
 
@@ -244,7 +243,7 @@
 
 <script>
 
-import {dels, findById, onEngine} from "@/api/engine/engine";
+import {add, dels, findById, onEngine} from "@/api/engine/engine";
 
 import {insert} from "@/api/version/version";
 
@@ -284,7 +283,8 @@ export default {
 
       dialogFormVisible: false,
 
-      formLabelWidth: '120px'
+      formLabelWidth: '120px',
+
 
     }
 
@@ -294,20 +294,16 @@ export default {
 
     handleInsert() {
 
-      this.maintenance = {}
-
       this.dialogFormVisible = true
 
-      insert(this.maintenance).then(res => {
+      add(this.maintenance).then(res => {
 
         this.$modal.msgSuccess("新增成功")
 
       })
-      this.dialogFormVisible = false
-
-      this.List();
 
     },
+
     onEngine(id) {
 
       onEngine(id).then(res => {
@@ -333,10 +329,6 @@ export default {
 
         this.maintenance = res.data;
 
-        console.log(this.maintenance)
-
-        console.log(this.maintenance.engineMaintenanceList)
-
       })
 
     },

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" :rules="rules" ref="authFormRef">
+          <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>
 
 
@@ -44,22 +63,36 @@
 </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";
 
 export default {
   data() {
     return {
       charts: "",
+      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: '加载中...'
       },
-      form:{
-
-      }
+      authForm: {
+        name: '',
+        idCard: ''
+      },
+      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() {
@@ -69,8 +102,51 @@ 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() {
+      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 {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+
     },
     async fetchUserBalance() {
       try {

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>