From 9cc1acc41672b1e82e9af9bc20f6dcc0aeddfda1 Mon Sep 17 00:00:00 2001
From: liuxiaoquan <q8197264@126.com>
Date: Tue, 7 Mar 2023 00:57:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=9D=E8=AF=81=E9=87=91?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../merchant/system/merchant/margin/list.html | 97 ++++++++++++++++---
 1 file changed, 82 insertions(+), 15 deletions(-)

diff --git a/app/admin/view/merchant/system/merchant/margin/list.html b/app/admin/view/merchant/system/merchant/margin/list.html
index 3ef43ca..4dab01b 100644
--- a/app/admin/view/merchant/system/merchant/margin/list.html
+++ b/app/admin/view/merchant/system/merchant/margin/list.html
@@ -100,6 +100,7 @@
 
                 <div class="layui-input-inline" style="width:35%;">
                     <div class="layui-form-item">
+
                         <label class="layui-form-label">保证金状态</label>
                         <div class="layui-input-block">
                             <select name="interest" lay-filter="aihao">
@@ -111,6 +112,18 @@
                                 <option value="4">旅行</option>
                             </select>
                         </div>
+
+                        <div class="layui-tab" lay-filter="demo" lay-allowclose="true">
+                            <ul class="layui-tab-title">
+                              <li class="layui-this" lay-id="11"></li>
+                              <li lay-id="22"></li>
+                            </ul>
+                            <div class="layui-tab-content">
+                              <div class="layui-this" lay-id="11"  class="layui-tab-item layui-show">内容1</div>
+                              <div lay-id="22" class="layui-tab-item">内容2</div>
+                            </div>
+                        </div>
+
                     </div>
                 </div>
 
@@ -124,8 +137,8 @@
 
     <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
         <ul class="layui-tab-title">
-            <li class="layui-this">缴存保证金</li>
-            <li>退回保证金</li>
+            <li lay-id="11" class="layui-this site-demo-active" data-type="tabChange">缴存保证金</li>
+            <li lay-id="22" class="site-demo-active" data-type="tabChange">退回保证金</li>
         </ul>
         <div class="layui-tab-content" style="height: 100px;">
 
@@ -299,7 +312,7 @@
                         fixed: 'right',
                         field: 'right',
                         title: '操作',
-                        toolbar: '#barDemo',
+                        toolbar: '#refundBar',
                         width: 190,
                         align: 'center'
                     }
@@ -343,29 +356,83 @@
         });
 
         //监听搜索提交
-        // form.on('submit(searchform)', function(data) {
-        // 	layui.pageTable.reload({
-        // 		where: {
-        // 			keywords: data.field.keywords
-        // 		},
-        // 		page: {
-        // 			curr: 1
-        // 		}
-        // 	});
-        // 	return false;
-        // });
+        form.on('submit(searchform)', function(data) {
+        	layui.pageTable.reload({
+        		where: {
+        			keywords: data.field.keywords
+        		},
+        		page: {
+        			curr: 1
+        		}
+        	});
+        	return false;
+        });
 
         // 日期范围
-        layui.use('laydate', function () {
+        layui.use(['laydate','element'], function () {
             var laydate = layui.laydate;
+            var $ = layui.jquery,element = layui.element;
             //日期范围
             laydate.render({
                 elem: '#test6'
                 //设置开始日期、日期日期的 input 选择器
                 //数组格式为 2.6.6 开始新增，之前版本直接配置 true 或任意分割字符即可
                 , range: ['#test-startDate-1', '#test-endDate-1']
+                ,done: function(value, date, endDate){
+                    if (value) {
+                        // 时间选择
+                        console.log(value); //得到日期生成的值，如：2017-08-18
+                        console.log(date); //得到日期时间对象：{year: 2017, month: 8, date: 18, hours: 0, minutes: 0, seconds: 0}
+                        console.log(endDate); //得结束的日期时间对象，开启范围选择（range: true）才会返回。对象成员同上。
+                        alert(1);
+
+                        layui.pageTable.reload({
+                            where: {
+                                keywords: data.field.keywords
+                            },
+                            page: {
+                                curr: 1
+                            }
+                        });
+                    } else {
+                        // 重置
+                    }
+                }
             });
+
+            //触发事件
+            var active = {
+                tabChange: function(){
+                    //切换到指定Tab项
+                    element.tabChange('demo', this.getAttribute('lay-id')); //切换到：用户管理
+                    // 展示
+                    this.getAttribute()
+                    // 删除
+                }
+            };
+            
+            $('.site-demo-active').on('click', function(){
+                var othis = $(this), type = othis.data('type');
+                active[type] ? active[type].call(this, othis) : '';
+            });
+            
+            //Hash地址的定位
+            // var layid = location.hash.replace(/^#test=/, '');
+            // element.tabChange('test', layid);
         });
+
+
+        // table.on('laydate', function (obj) {
+        //     if (obj.event === 'add') {
+        //         tool.side("/admin/merchant/type/form");
+        //         return false;
+        //     }
+        // });
+
+
+            
+        
+     
     }
 </script>
 {/block}