Merge branch 'master' of https://gitea.qinmian.online/TreeData/cloud-web

src/views/etl/switch/index.vue

@@ -126,16 +126,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-form-item label="是否初始化：" prop="status">
-<!--            <el-radio-group v-model="sourceAddReq.status">-->
+            <el-radio-group v-model="sourceAddReq.status">
-<!--              <el-radio-->
+              <el-radio
-<!--                v-for="dict in dict.type.yes_no"-->
+                v-for="dict in dict.type.ys_yes_no"
-<!--                :key="dict.value"-->
+                :key="dict.value"
-<!--                :label="dict.value"-->
+                :label="dict.value"
-<!--              >{{ dict.label }}-->
+              >{{ dict.label }}
-<!--              </el-radio>-->
+              </el-radio>
-<!--            </el-radio-group>-->
+            </el-radio-group>
-<!--          </el-form-item>-->
+          </el-form-item>
           <el-form-item label="备注：">
             <el-input type="textarea" v-model="sourceAddReq.remark"></el-input>
           </el-form-item>
@@ -200,7 +200,10 @@
 
       <el-table-column
         label="是否初始化"
-        prop="name">
+        prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dicts.type.ys_yes_no" :value="scope.row.status"/>
+        </template>
       </el-table-column>
 
       <el-table-column
@@ -261,13 +264,16 @@ import {getInfo} from "@/api/etl/switch";
 import {structure} from "@/api/etl/switch";
 
 export default {
+  dicts: ['sys_normal_disable','ys_yes_no'],
   //import引入的组件需要注入到对象中才能使用"
   components: {},
   props: {},
   data() {
+
     //这里存放数据"
 
     return {
+      dicts: ['sys_normal_disable','ys_yes_no'],
       rules: {
         dataResourceName: [
           {required: true, message: "接入源名称不能为空", trigger: "blur"}

src/views/login.vue

@@ -87,7 +87,7 @@ export default {
       },
       loading: false,
       // 验证码开关
-      captchaEnabled: true,
+      captchaEnabled: false,
       // 注册开关
       register: true,
       redirect: undefined

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>

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" @click="buyPhone">购买</el-button>
-            <el-button style="float: right; padding: 3px 0" type="text">购买</el-button>
+            <el-button style="float: right; padding: 3px 0" @click="dialogFormVisible=true">测试</el-button>dialogFormVisible
           </div>
         </el-card>
       </el-col>
@@ -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" @click="buyIp">购买</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" @click="buyNews">购买</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" @click="buyWeather">购买</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,12 +41,36 @@
         <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" 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" @click="buyPostcodd">购买</el-button>
+            <el-button style="float: right; padding: 3px 0" @click="testPostcodd">测试</el-button>
           </div>
         </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 type="primary" @click="dialogFormVisible = false">确 定</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -62,13 +86,8 @@ export default {
     //这里存放数据"
 
     return {
-      formLabelAlign:{
+      dialogFormVisible:false,
-        province:"",
+      form:{},
-        city:"",
-        areacode:"",
-        zip:"",
-        company:"",
-      },
     };
   },
   //计算属性 类似于data概念",

src/views/task/task/index.vue

@@ -187,30 +187,30 @@
 <!--    添加任务详情设计-->
     <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="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 @change="changeTableName(taskInfo.tableName)" 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  :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,18 @@ export default {
   watch: {},
   //方法集合",
   methods: {
+    //选择数据表改变数据
+    changeTableName(table){
+      this.taskInfoList.forEach(res=>{
+        if(table.eq(res.tableName)){
+          this.taskInfo = res;
+        }
+      })
+    },
+
     //查询字段
-    findByInputId(row){
+    findByInputId(taskInfo){
-      findByInputId(row.id).then(res=>{
+      findByInputId(taskInfo.id).then(res=>{
         this.structureList = res.data;
       })
 
@@ -370,9 +380,10 @@ export default {
       this.taskInputList();
     },
 
-    addTaskInput(){
+
+    addTaskInput(taskInfo){
       this.taskInputAdd = false;
-      this.findByInputId();
+      this.findByInputId(taskInfo);
       this.taskInputFieldAdd = true;
     },