From ec15bec1cbde92784b0daa2d1e31e0b5fdeff0e6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Aug 2023 15:59:24 +0800
Subject: [PATCH] jufu商城

---
 src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html     |   34 ++++++++++++++++++++++++++++------
 src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyChargeListVo.java                   |    3 +++
 src/main/resources/mapper/modules/MallMoneyFlowMapper.xml                          |    6 +++++-
 src/main/resources/templates/febs/views/modules/mallMember/chargeFlowListType.html |    2 +-
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyChargeListVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyChargeListVo.java
index 80053ce..6508bd0 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyChargeListVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyChargeListVo.java
@@ -32,4 +32,7 @@
 
     private String bindPhone;
     private String remark;
+    private String aliName;
+    private String aliNum;
+    private String aliPic;
 }
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 8fe8066..fa8acd8 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -89,9 +89,13 @@
         b.name,
         b.account_login accountLogin,
         b.bind_phone bindPhone,
-        b.phone
+        b.phone,
+        c.name aliName,
+        c.ali_num aliNum,
+        c.ali_pic aliPic
         from mall_member_withdraw a
         inner join mall_member b on a.member_id=b.id
+        left join mall_member_alipay c on c.id = a.wtihdraw_type_id
         <where>
             <if test="record != null" >
                 <if test="record.accountLogin!=null and record.accountLogin!=''">
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
index 7d9317e..f5f6db9 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
@@ -58,13 +58,13 @@
     {{# if(d.status === 1) { }}
 <!--        <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="chargeAgree:update" lay-event="chargeAgree">同意</button>-->
         <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="chargeAgree:update" lay-event="chargeAgree">同意</button>
-        <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="searchInfo:view" lay-event="searchInfo">查询结果</button>
-        <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="accountInfo:view" lay-event="accountInfo">账户余额</button>
+<!--        <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="searchInfo:view" lay-event="searchInfo">查询结果</button>-->
+<!--        <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="accountInfo:view" lay-event="accountInfo">账户余额</button>-->
         <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="chargeDisagree:update" lay-event="chargeDisagree" >拒绝</button>
-        <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="paymentInfo:update" lay-event="paymentInfo">查看收款方式</button>
+<!--        <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="paymentInfo:update" lay-event="paymentInfo">查看收款方式</button>-->
     {{# } else { }}
-        <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="paymentInfo:update" lay-event="paymentInfo">查看收款方式</button>
-        <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="searchInfo:view" lay-event="searchInfo">查询结果</button>
+<!--        <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="paymentInfo:update" lay-event="paymentInfo">查看收款方式</button>-->
+<!--        <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="searchInfo:view" lay-event="searchInfo">查询结果</button>-->
     {{# } }}
 </script>
 <!-- 表格操作栏 end -->
@@ -130,6 +130,22 @@
                     maxmin: true,
                 });
             }
+
+            if (layEvent === 'seeCardFront') {
+                var t = $view.find('#seeCardFront'+data.id+'');
+                //页面层
+                layer.open({
+                    type: 1,
+                    title: "图片",
+                    skin: 'layui-layer-rim', //加上边框
+                    area: ['80%', '80%'], //宽高
+                    shadeClose: true, //开启遮罩关闭
+                    end: function (index, layero) {
+                        return false;
+                    },
+                    content: '<div style="text-align:center"><img src="' + $(t).attr('src') + '" /></div>'
+                });
+            }
         });
         function searchInfo(id) {
             febs.get(ctx + 'admin/mallMember/searchInfo/' + id, null, function (data) {
@@ -183,8 +199,14 @@
                 cols: [[
                     {field: 'withdrawNo', title: '编号', minWidth: 100,align:'left', totalRowText: '合计:'},
                     {field: 'accountLogin', title: '登录账户', minWidth: 100,align:'left'},
-                    {field: 'name', title: '名称', minWidth: 100,align:'left'},
+                    // {field: 'name', title: '名称', minWidth: 100,align:'left'},
                     {field: 'phone', title: '手机号码', minWidth: 150,align:'left'},
+                    {field: 'aliName', title: '姓名', minWidth: 150,align:'left'},
+                    {field: 'aliNum', title: '支付宝账号', minWidth: 150,align:'left'},
+                    {field: 'aliPic', title: '二维码',
+                        templet: function (d) {
+                            return '<a lay-event="seeCardFront"><img id="seeCardFront'+d.id+'" src="'+d.aliPic+'" alt=""></a>';
+                        }, minWidth: 150,align:'center'},
                     // {field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
                     {field: 'amount', title: '金额', minWidth: 150,align:'left',totalRow: '{{= parseInt(d.amount) }}'},
                     {field: 'amountFee', title: '手续费', minWidth: 150,align:'left',totalRow: '{{= parseInt(d.amountFee) }}'},
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowListType.html b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowListType.html
index 386f772..ba4139b 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowListType.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowListType.html
@@ -31,7 +31,7 @@
             <label class="layui-form-label febs-form-item-require">方式:</label>
             <div class="layui-input-block">
                 <input type="radio" name="agreeType" value="1" title="手动转账" >
-                <input type="radio" name="agreeType" value="2" title="宁波银行转账" checked="">
+<!--                <input type="radio" name="agreeType" value="2" title="宁波银行转账" checked="">-->
             </div>
         </div>
         <div class="layui-form-item febs-hide">

--
Gitblit v1.9.1