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/engine/engine/index.vue

@@ -1,6 +1,5 @@
 <template>
   <div>
-
     <el-form  label-width="80px" :model="engine"  :inline="true" class="demo-form-inline" size="small">
       <el-form-item label="规则名称">
         <el-input v-model="engine.name"></el-input>
@@ -18,9 +17,6 @@
         查询
       </el-button>
     </el-form>
-
-
-
     <el-button
       type="warning"
       plain
@@ -30,8 +26,6 @@
       v-hasPermi="['source:data:export']"
     >导出
     </el-button>
-
-
     <el-button
       icon="el-icon-delete"
       plain
@@ -40,10 +34,7 @@
       @click="insert()"
     >新增
     </el-button>
-
-
     <el-dialog title="添加数据源接入" :visible.sync="dialogFormVisible" >
-
       <el-form :model="engine">
         <el-form-item label="接入源名称">
           <el-input v-model="engine.id"></el-input>
@@ -69,24 +60,13 @@
         <el-form-item label="数据库密码">
           <el-input v-model="engine.description"></el-input>
         </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>
-
-
-
-
-
-
     <el-table :data="arr" style="width: 100%">
-
       <el-table-column label="编号" prop="id"></el-table-column>
       <el-table-column label="名称" prop="name"></el-table-column>
       <el-table-column label="类型" style="color: #13ce66" prop="type">
@@ -115,39 +95,27 @@
         </template>
       </el-table-column>
       <el-table-column label="状态"  style="color: #787be8" prop="status">
-
         <template v-slot="scope">
           <span v-if="scope.row.status==1">开启</span>
           <span v-if="scope.row.status==2">关闭</span>
         </template>
-
       </el-table-column>
       <el-table-column label="描述" prop="description"></el-table-column>
-
-
-
-
       <el-table-column
         align="right">
         <template slot-scope="scope">
-
           <el-button
             icon="el-icon-delete"
             size="mini"
             type="text"
             @click="handleDelete(scope.row.id)">删除</el-button>
-
           <el-button
             icon="el-icon-service"
             size="mini"
             type="text"
             @click="handUpdate(scope.row.id)">规则维护</el-button>
-
-
         </template>
-
       </el-table-column>
-
     </el-table>
 
 

src/views/etl/switch/index.vue

@@ -16,16 +16,6 @@
       </el-button>
     </el-form>
 
-
-<!--    <el-button-->
-<!--      v-hasPermi="['system:user:remove']"-->
-<!--      icon="el-icon-delete"-->
-<!--      size="mini"-->
-<!--      type="text"-->
-<!--      @click="handleDelete(scope.row)"-->
-<!--    >删除-->
-<!--    </el-button>-->
-
     <el-button
       v-hasPermi="['tool:gen:import']"
       icon="el-icon-download"
@@ -139,7 +129,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.ys_yes_no"
                 :key="dict.value"
                 :label="dict.value"
               >{{ dict.label }}
@@ -212,7 +202,7 @@
         label="是否初始化"
         prop="status">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type" :value="scope.row.status"/>
+          <dict-tag :options="dicts.type.ys_yes_no" :value="scope.row.status"/>
         </template>
       </el-table-column>
 
@@ -274,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

@@ -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/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" @click="testPhone">测试</el-button>
+            <el-button style="float: right; padding: 3px 0" @click="dialogFormVisible=true">测试</el-button>
           </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="textPhone()">查询</button>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -62,13 +86,8 @@ export default {
     //这里存放数据"
 
     return {
-      formLabelAlign:{
+      dialogFormVisible:false,
-        province:"",
+      form:{},
-        city:"",
-        areacode:"",
-        zip:"",
-        company:"",
-      },
     };
   },
   //计算属性 类似于data概念",
@@ -77,7 +96,9 @@ export default {
   watch: {},
   //方法集合",
   methods: {
-
+    textPhone(){
+      alert(111);
+    }
   },
   //生命周期 - 创建完成（可以访问当前this实例）",
   created() {