Merge remote-tracking branch 'origin/master'

src/api/system/user.js

@@ -11,12 +11,13 @@ export function listUser(query) {
 }
 
 
-// 用户余额
+
+// 充值用户余额
 export function userRecharge(data) {
   return request({
-    url: '/system/alipay/recharge',
+    url: '/system/aliyun/pay/payZFB',
     method: 'post',
-    params: data
+    data: data
   })
 }
 

src/views/money/pay/index.vue

@@ -2,7 +2,8 @@
   <el-card class="box-card">
     <ul class="msg-box">
       <li>
-        <h4>我要支付</h4>
+        <h4 style="margin-bottom: 15px;">充值说明</h4>
+        <h4>你敢充钱,我就敢让你没钱</h4>
       </li>
       <li>
         <h4 style="margin-bottom: 15px;">支付金额</h4>
@@ -41,7 +42,7 @@ export default {
       amountVal: '',
       disabled: false,
       // 同步跳转页面地址
-      returnUrl:'http://localhost:8090/#/entertainment/payment',
+      returnUrl: 'http://172.13.1.1/money/money',
       //充值参数
       rechargeParams: {
         "totalAmt": '', //金额
@@ -74,16 +75,16 @@ export default {
 
       } else if (this.rechargeParams.paymentType === '1') {
         let praem = {
-          // 生成一个随你的订单号 方便测试
-          outTradeNo:this.getProjectNum() + Math.floor(Math.random() * 10000),
+          // 生成一个随的订单号 方便测试
+          outTradeNo: this.getProjectNum() + Math.floor(Math.random() * 10000),
           // 传递支付金额
-          totalAmount:this.rechargeParams.totalAmt,
+          totalAmount: this.rechargeParams.totalAmt,
           // 传递同步跳转地址
-          returnUrl:this.returnUrl,
+          returnUrl: this.returnUrl,
           // 商品名称
-          subject:'支付金额',
+          subject: '支付金额',
           // 支付类型
-          productCode:'FAST_INSTANT_TRADE_PAY'
+          productCode: 'FAST_INSTANT_TRADE_PAY'
         }
         userRecharge(praem).then(code => {
           if (code.code === 200) {
@@ -103,7 +104,7 @@ export default {
       }
     },
     // 获取当前日期的方法
-    getProjectNum () {
+    getProjectNum() {
       const projectTime = new Date() // 当前中国标准时间
       const Year = projectTime.getFullYear() // 获取当前年份 支持IE和火狐浏览器.
       const Month = projectTime.getMonth() + 1 // 获取中国区月份

src/views/task/task/index.vue

@@ -187,16 +187,16 @@
 <!--    添加任务详情设计-->
     <el-dialog title="添加表" :visible.sync="taskInputAdd">
 
-      <el-form  label-width="80px" :model="taskInfo" ref="queryForm"  :inline="true" class="demo-form-inline" size="small">
+      <el-form  label-width="80px" :model="taskInput" ref="queryForm"  :inline="true" class="demo-form-inline" size="small">
         <el-form-item label="任务id">
-          <el-input v-model="taskInfo.taskId"></el-input>
+          <el-input v-model="taskInput.taskId"></el-input>
         </el-form-item>
 
         <el-form-item label="数据库id">
-          <el-input v-model="taskInfo.databaseId"></el-input>
+          <el-input v-model="taskInput.databaseId"></el-input>
         </el-form-item>
         <el-form-item label="数据表">
-          <el-select @change="changeTableName(taskInfo.tableName)" v-model="taskInfo.tableName" placeholder="请选择等级">
+          <el-select @change="changeTableName(taskInput.tableName)" v-model="taskInput.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>
@@ -204,13 +204,13 @@
           </el-select>
         </el-form-item>
         <el-form-item label="表别名">
-          <el-input v-model="taskInfo.tableAsName"></el-input>
+          <el-input v-model="taskInput.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(taskInfo)">下一步</el-button>
+        <el-button type="primary" @click="addTaskInput(taskInput)">下一步</el-button>
       </div>
 
 
@@ -340,7 +340,7 @@ export default {
       taskInputReq:{},
       taskList:[],
       taskInfoList:[],
-      taskInfo:{},
+      taskInput:{},
       tableList:[],
       structureList:[],
     };
@@ -352,11 +352,10 @@ export default {
   //方法集合",
   methods: {
     //选择数据表改变数据
-    changeTableName(table){
-      this.taskInfoList.forEach(res=>{
-        if(table.eq(res.tableName)){
-          this.taskInfo = res;
-        }
+    changeTableName(row){
+      alert(row)
+      findByInputId(row).then(res=>{
+        this.taskInput = res.data;
       })
     },