更新

admin-ui/src/views/dashboard/arows.vue

@@ -55,7 +55,7 @@
       </div>
       <div class="boc">
         <div class="yr" style="width: 33.333%">
-          <router-link to="/square/recharge?state=0">
+          <router-link to="/square/recharge?state=0&type=0">
             <div class="rout">
               <div class="rint" style="text-align: center; cursor: pointer">
                 <span class="icon" style="float: none; color: #2196f3">&#xe6b0;</span>
@@ -115,6 +115,17 @@
             </div>
           </router-link>
         </div>
+        <div class="yr" style="width: 33.333%">
+          <router-link to="/job/job/cash?state=0">
+            <div class="rout">
+              <div class="rint" style="text-align: center; cursor: pointer">
+                <span class="icon" style="float: none; color: #2196f3">&#xe6b0;</span>
+                <span class="bages">{{ cdata.cash > 100 ? '99+' : cdata.cash || 0 }}</span>
+                <div class="ctt">余额提现审核</div>
+              </div>
+            </div>
+          </router-link>
+        </div>
       </div>
     </div>
     <div v-if="row == '统计概览'">
@@ -283,7 +294,7 @@ export default {
     padding-top: 10px;
     border-radius: 7px;
     margin-bottom: 10px;
-    margin-top:-10px;
+    margin-top: -10px;
   }
   .yr {
     float: left;

admin-ui/src/views/work/money/recharge/index.vue

@@ -100,6 +100,7 @@ export default {
   created() {
     if (this.$route.query.state) {
       this.queryParams.state = this.$route.query.state;
+      this.queryParams.type = this.$route.query.type;
     }
     this.getList();
   },
@@ -120,6 +121,7 @@ export default {
     resetQuery() {
       this.resetForm('queryForm');
       this.queryParams.state = null;
+      this.queryParams.type = null;
       this.dateRange = [];
       this.handleQuery();
     },

admin-ui/src/views/work/pay/cash_out.vue

@@ -64,6 +64,7 @@ export default {
     return {
       showSearch: true,
       response: {},
+      dateRange: [],
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -76,10 +77,17 @@ export default {
     };
   },
   created() {
+    if (this.$route.query.state) {
+      this.queryParams.state = this.$route.query.state;
+    }
     this.getList();
   },
   methods: {
     getList() {
+      if (this.dateRange) {
+        this.queryParams.dateBegin = this.dateRange[0];
+        this.queryParams.dateEnd = this.dateRange[1];
+      }
       this.ajax({ url: '/work/pay/list', data: this.queryParams }).then((response) => {
         this.response = response;
       });
@@ -90,6 +98,8 @@ export default {
     },
     resetQuery() {
       this.resetForm('queryForm');
+      this.queryParams.state = null;
+      this.dateRange = [];
       this.handleQuery();
     },
     op(tag, row) {

admin-ui/src/views/work/pay/edit.vue

@@ -32,7 +32,7 @@
         </div>
       </el-form>
       <el-alert title="提现成功" type="success" show-icon class="cg" v-if="form.state === 1"></el-alert>
-      <el-alert title="提现失败,已退款到用户余额" :description="form.msg" type="error" show-icon class="cg" v-if="form.state === 2" :closable="false"></el-alert>
+      <el-alert title="提现驳回,已退款到用户余额" :description="form.msg" type="error" show-icon class="cg" v-if="form.state === 2" :closable="false"></el-alert>
     </div>
     <div class="mfooter" v-if="!param.detail">
       <el-button type="primary" @click="submitForm(1)">确认转账</el-button>

app/common/http.js

@@ -1,6 +1,6 @@
 //const ip = 'http://127.0.0.1:9191';
-//const ip = 'https://chenglantimes.com/prod-api';
-const ip = 'http://192.168.0.102:9191';
+const ip = 'https://chenglantimes.com/prod-api';
+//const ip = 'http://192.168.0.102:9191';
 /**
  * 封装的http请求
  */

ruoyi-admin/src/main/resources/mapper/work/CommonMapper.xml

@@ -32,7 +32,8 @@
                 ( SELECT COUNT( id ) FROM tb_packages) AS packages,
                 ( SELECT COUNT( id ) FROM tb_user WHERE is_contract=1) AS contracts,
                 ( SELECT COUNT( id ) FROM tb_enterprise WHERE state=0) AS enterprise,
-                ( SELECT COUNT( id ) FROM tb_position WHERE audit=0) AS position
+                ( SELECT COUNT( id ) FROM tb_position WHERE audit=0) AS position,
+                ( SELECT COUNT( id ) FROM tb_pay WHERE state=0 and type=2) AS cash
     </select>
     <!--后台企业端每月交易金额统计-->
     <select id="record" resultType="java.util.Map">

ruoyi-admin/src/main/resources/mapper/work/RechargeMapper.xml

@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nums != null  and nums != ''"> and r.nums like concat('%', #{nums}, '%')</if>
             <if test="companyId != null "> and r.company_id = #{companyId}</if>
             <if test="state != null "> and r.state = #{state}</if>
+            <if test="type != null "> and r.type = #{type}</if>
             <if test="dateBegin != null  and dateBegin != ''"> AND r.create_time BETWEEN #{dateBegin} AND #{dateEnd} + INTERVAL 1 DAY</if>
         </where>
     </select>