Merge branch 'test'

application/index/controller/Finance.php

@@ -3418,7 +3418,7 @@ class Finance extends Basic
         }
 
         //查找调整前的 paylog_id
-        $where['is_del'] = 0;
+        $where_2['is_del'] = $where['is_del'] = 0;
         $where[] = ['EXP', "new_paylog_id = {$pay_adjustment[0]['paylog_id']} OR paylog_id =".$pay_adjustment[0]['paylog_id']];
         $pay_log_id = $m_pay_adjustment->getFieldColumn('paylog_id', $where);
 
@@ -3427,7 +3427,8 @@ class Finance extends Basic
         }
 
         //查找调整前前的 paylog_id
-        $pay_log_id = $m_pay_adjustment->getFieldColumn('paylog_id', ['paylog_id'=>['in', $pay_log_id], 'is_del'=>0]);
+        $where_2[] = ['EXP', "new_paylog_id = {$pay_adjustment[0]['new_paylog_id']} OR paylog_id =".$pay_adjustment[0]['new_paylog_id']];
+        $pay_log_id = $m_pay_adjustment->getFieldColumn('paylog_id', $where_2);
         if (count($pay_log_id) > 1) {
             return $this->response($code, '存在调整,不能删除.');
         }

application/index/view/remark/remark_follow_index.html

@@ -339,7 +339,7 @@
     display: none;
 }
  .ld-Marheight-tags{
-    	margin-top: 20px;
+    	margin-top: 12px;
     }
     /*收藏样式*/
 	#user_is_collect{