From 50d6fdef3b9a2f30b25314f134be9d822e539080 Mon Sep 17 00:00:00 2001
From: liuxiaoquan <q8197264@126.com>
Date: Mon, 13 Mar 2023 18:55:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E5=85=A5=E9=A9=BB=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/route/merchant.php                  |  2 +-
 .../system/merchant/intention/lst.html        | 89 +++++++++++--------
 .../system/merchant/intention/status.html     |  4 +-
 3 files changed, 57 insertions(+), 38 deletions(-)

diff --git a/app/admin/route/merchant.php b/app/admin/route/merchant.php
index b1d61e3..9a13da9 100644
--- a/app/admin/route/merchant.php
+++ b/app/admin/route/merchant.php
@@ -53,7 +53,7 @@ Route::group(function(){
         Route::get('lst', '/lst')->name('systemMerchantIntentionLst')->option([
             '_alias' => '列表',
         ]);
-        Route::get('status', '/switchStatus')->name('systemMerchantIntentionStatus')->option([
+        Route::post('status', '/switchStatus')->name('systemMerchantIntentionStatus')->option([
             '_alias' => '审核',
         ]);
         Route::delete('delete', '/delete')->name('systemMerchantIntentionDelete')->option([
diff --git a/app/admin/view/merchant/system/merchant/intention/lst.html b/app/admin/view/merchant/system/merchant/intention/lst.html
index f89cc4d..a8cb3b1 100644
--- a/app/admin/view/merchant/system/merchant/intention/lst.html
+++ b/app/admin/view/merchant/system/merchant/intention/lst.html
@@ -18,14 +18,14 @@
                         <label class="layui-form-label">选择时间</label>
                         <div class="layui-input-block">
                             <div class="layui-btn-group">
-                                <input id="chonse_date" type="hidden" name="chonse_date" value="" disabled placeholder="选择时间">
-                                <button name="both" lay-submit="" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal">全部</button>
+                                <input id="chonse_date" type="hidden" name="chonse_date" value="" readonly placeholder="选择时间">
+                                <button name="both" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal">全部</button>
                                 <button name="today" lay-submit="" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal layui-btn-primary">今天</button>
                                 <button name="yeserday" lay-submit="" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal layui-btn-primary">昨天</button>
-                                <button lay-submit="" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal layui-btn-primary">最近7天</button>
-                                <button lay-submit="" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal layui-btn-primary">最近30天</button>
-                                <button lay-submit="" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal layui-btn-primary">本月</button>
-                                <button lay-submit="" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal layui-btn-primary">本年</button>
+                                <button name="week" lay-submit="" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal layui-btn-primary">最近7天</button>
+                                <button name="30day" lay-submit="" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal layui-btn-primary">最近30天</button>
+                                <button name="month" lay-submit="" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal layui-btn-primary">本月</button>
+                                <button name="year" lay-submit="" lay-filter="chonse_date" type="button" class="layui-btn layui-btn-normal layui-btn-primary">本年</button>
                             </div>
                         </div>
                     </div>
@@ -53,11 +53,11 @@
                         <label class="layui-form-label">商户审核</label>
                         <div class="layui-input-block">
                             <div class="layui-btn-group">
-                                <input type="hidden" id="status" name="status" value="0" disabled placeholder="核审状态值">
-                                <button name="both" lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal">全部</button>
-                                <button name="wait_status" lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">待审核</button>
-                                <button name="success_status" lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">审核通过</button>
-                                <button name="failed_status" lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">审核未通过</button>
+                                <input type="hidden" id="status" name="status" value="" readonly placeholder="核审状态值">
+                                <button name="both" lay-submit="" lay-filter="statusform" type="button" class="layui-btn layui-btn-normal">全部</button>
+                                <button name="wait_status" lay-submit="" lay-filter="statusform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">待审核</button>
+                                <button name="success_status" lay-submit="" lay-filter="statusform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">审核通过</button>
+                                <button name="failed_status" lay-submit="" lay-filter="statusform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">审核未通过</button>
                             </div>
                         </div>
                     </div>
@@ -83,7 +83,6 @@
 
             <div class="layui-form-item">
 
-
                 <div class="layui-input-inline" style="width:35%;">
                     <div class="layui-form-item">
                         <label class="layui-form-label">店铺类型</label>
@@ -292,7 +291,7 @@
             // 
             var $ = layui.$, active = {
 				reload: function(){
-					let dataRload = getformdata();;
+					let dataRload = getformdata();
 					console.log(dataRload)
 					//执行重载
 					table.reload('intention_list', {
@@ -320,20 +319,41 @@
 				return false;
 			});
 
+            //选择时间
             form.on('submit(chonse_date)', function(data){
-                console.log(data.elem.name);
-                $('#chonse_date').val(data.elem.name);
-                layui.pageTable.reload({
-					where: {
-						...data.field
-					},
-					page: {
-						curr: 1
-					}
-				});
+                var now = new Date().getTime(); //获取毫秒数
+                
+                let value = '';
+                let name = data.elem.name;
+                if (name =='today') {
+                    value = now;
+                }else if(name == 'yeserday'){
+                    value = new Date(now - 1 * 86400 * 1000).getTime();
+                }else if(name == 'week'){
+                    value = new Date(now - 7 * 86400 * 1000).getTime()+'-'+now;
+                }else if(name == '30day'){
+                    value = new Date(now - 30 * 86400 * 1000).getTime()+'-'+now;
+                }else if(name == 'month'){
+                    var day = now.getDate();//当前天份
+                    console.log(day);
+                    var day = (new Date()).getMonth()+1;//当前月份
+                    value = new Date(now - day * 86400 * 1000).getTime()
+                }else if(name == 'year'){
+                    value = now.getFullYear();//获取当前年份
+                }
+                $('#chonse_date').val(value);
+                active['reload'] ? active['reload'].call(this) : '';
+
 				return false;
             })
 
+            // 商户审核
+            form.on('submit(statusform)', function(data) {
+                $('#status').val(data.elem.name);
+                active['reload'] ? active['reload'].call(this) : '';
+				return false;
+			});
+
 			//监听select提交
 			form.on('select(seleform)', function(data) {
 				active['reload'] ? active['reload'].call(this) : '';
@@ -341,19 +361,18 @@
 				return false;
 			});
 
-
-
-            // 获取表单所有参数
-            function getformdata() {
-                var form = $('#filterform').serializeArray();
-                var data = new Array();
-                for(let i=0;i<form.length; i++){
-                    data[form[i].name] = form[i].value;
-                }
-
-                return data;
-            }
         });
+
+         // 获取表单所有参数
+         function getformdata() {
+            var form = $('#filterform').serializeArray();
+            var data = new Array();
+            for(let i=0;i<form.length; i++){
+                data[form[i].name] = form[i].value;
+            }
+
+            return data;
+        }
     }
 </script>
 {/block}
diff --git a/app/admin/view/merchant/system/merchant/intention/status.html b/app/admin/view/merchant/system/merchant/intention/status.html
index 7e2092d..0a8a71b 100644
--- a/app/admin/view/merchant/system/merchant/intention/status.html
+++ b/app/admin/view/merchant/system/merchant/intention/status.html
@@ -53,11 +53,11 @@
 				layer.msg(e.msg);
 				if (e.code == 0) {
 					setTimeout(function () {
-						// parent.location.reload();
+						parent.location.reload();
 					}, 1000);					
 				}
 			}
-			tool.get('/admin/merchant/intention/status', data.field, callback);
+			tool.post('/admin/merchant/intention/status', data.field, callback);
 			return false;
 		});
 	}