Merge branch 'test'

application/index/controller/Finance.php

@@ -3427,13 +3427,13 @@ class Finance extends Basic
         }
 
         //查找调整前前的 paylog_id
-        $pay_log_id = $m_pay_adjustment->getFieldColumn('paylog_id', ['paylog_id'=>['in', $pay_log_id]]);
+        $pay_log_id = $m_pay_adjustment->getFieldColumn('paylog_id', ['paylog_id'=>['in', $pay_log_id], 'is_del'=>0]);
         if (count($pay_log_id) > 1) {
             return $this->response($code, '存在调整,不能删除.');
         }
 
         $m_refund = new ORefundModel();
-        $refund_id = $m_refund->getFind('id', ['pay_log_id'=>['in',[$pay_adjustment[0]['paylog_id'], $pay_log_id]]]);
+        $refund_id = $m_refund->getFind('id', ['pay_log_id'=>['in',[$pay_adjustment[0]['paylog_id'], $pay_log_id]], 'is_del'=>0]);
         if ($refund_id > 0) {
             return $this->response($code, '入账存在退款，不能删除');
         }

application/index/controller/Login.php

@@ -41,9 +41,16 @@ class Login extends Basic
         $this->m_store       = new AStore();
     }
 
+    /**
+     * @return \think\response\View
+     */
     public function login()
     {
         $this->assign('mac_address',$this->params['mac_address'] ? $this->params['mac_address']: '');
+        $expire_time = Session::get("expire_time");
+        if ($expire_time > time()) {
+            $this->redirect('/admin.php/index/mainIndex');
+        }
         return view("/login/login");
     }
 

application/index/view/member/user_genjing_modal.html

@@ -585,7 +585,7 @@
 							</tbody>
 							<tr class="text-center is-show-more-followlog">
 								<td colspan="3">
-									<span class="user-log-more text-info" style="cursor: pointer;">加载更多</span>
+									<span class="user-log-more text-info" style="cursor: pointer;">点击加载更多</span>
 								</td>
 							</tr>
 						</table>