Merge branch 'master' of http://git.dever.cc/dever-product/churen

app/cash/lib/Order.php

@@ -40,6 +40,13 @@ class Order
         $update['audit'] = $audit;
         $update['audit_type'] = $audit_type;
 
+        if ($update['status'] == 2) {
+            $update['operdate'] = time();
+            $update['fdate'] = $update['operdate'];
+            if (isset($order['fdate']) && $order['fdate'] && ($order['status'] == 5 || $order['status'] == 6)) {
+                $update['fdate'] = $order['fdate'];
+            }
+        }
         if ($info && $jstype == 3) {
 
         } else {
@@ -51,14 +58,6 @@ class Order
                 $update['source_id'] = $order['source_id'];
             }
 
-            if ($update['status'] == 2) {
-                $update['operdate'] = time();
-                $update['fdate'] = $update['operdate'];
-                if (isset($order['fdate']) && $order['fdate'] && ($order['status'] == 5 || $order['status'] == 6)) {
-                    $update['fdate'] = $order['fdate'];
-                }
-            }
-
             $update['source_order_num'] = $order['order_num'];
             $update['num'] = $order['num'];
 

app/mshop/src/Main.php

@@ -13,6 +13,12 @@ class Main
 
         return $this->data;
     }
+
+    public function checkLocation()
+    {
+        $this->data['location'] = 1;
+        return $this->data;
+    }
     
     # 登录
     public function login()

service/agent/lib/Core.php

@@ -20,7 +20,7 @@ class Core
         }
         $this->uid = Dever::load('passport/user')->check(false);
         if ($this->uid <= 0) {
-            //$this->uid = 4133;
+            $this->uid = 4133;
         }
         if ($this->check) {
             $this->checkLogin();

service/agent/src/My.php

@@ -9,7 +9,7 @@ class My extends Core
 {
     public function getSearch()
     {
-        echo Dever::maketime('2022-05-05 08:00:00');die;
+        echo Dever::maketime('2022-05-30 16:59:59');die;
         $data = Dever::db('agent/member')->getSearch(array('col' => '朱浙群'));
 
         return $data;

service/option/database/account.php

@@ -216,6 +216,7 @@ return array
             'match'     => 'is_numeric',
             'option'    => $is_idcard,
             'search'    => 'select',
+            'order'     => 'asc',
             //'update'    => 'radio',
             'list'      => $search_auth == 1 ? 'Dever::load("option/lib/account.getIdcard", {id})' : false,
             'list_order' => 3,

service/option/database/agreement.php

@@ -54,6 +54,7 @@ return array
     'end' => array
     (
         'update' => 'option/lib/manage.setAgreement',
+        'updatemul' => 'option/lib/manage.setAgreement',
     ),
     # 数据结构
     'struct' => array

service/option/lib/Manage.php

@@ -87,13 +87,6 @@ class Manage
         $audit = Dever::param('audit', $data);
         $desc = Dever::param('audit_desc', $data);
         if ($audit > 1) {
-            $admin = Dever::load('manage/auth.info');
-            $update['audit_date'] = time();
-            $update['audit_admin'] = $admin['id'];
-            if ($audit == 3) {
-                $update['status'] = 2;
-            }
-
             $mul_type = Dever::config('base')->mul_type;
             if ($mul_type == 2) {
                 $list = Dever::db('option/agreement')->select(array('status' => 2));
@@ -101,6 +94,20 @@ class Manage
                 $list = explode(',', $id);
             }
 
+            $admin = Dever::load('manage/auth.info');
+            if (!$admin) {
+                foreach ($list as $k => $v) {
+                    Dever::db('option/agreement')->update(array('where_id' => $v, 'audit' => 2));
+                }
+                
+                Dever::alert('请先登录');
+            }
+            $update['audit_date'] = time();
+            $update['audit_admin'] = $admin['id'];
+            if ($audit == 3) {
+                $update['status'] = 2;
+            }
+
             foreach ($list as $k => $v) {
                 $info = Dever::db('option/agreement')->one($v);
                 if ($info) {