Merge branch 'test'

application/index/controller/Refund.php

@@ -221,16 +221,10 @@ class Refund extends Basic
                 $where['a.status'] = ['in', '0,1'];
             } else {
                 $where['a.status'] = $this->params['status'];
-
-                if ($this->params['status'] == '0') {
-                    $where['c.site_id'] = $this->siteId;
-                }
             }
-        } else {
-            $where['c.site_id'] = $this->params['site_id'];
         }
 
-        if ($this->params['status'] > 0 && isset($this->params['site_id'])) {
+        if (!empty($this->params['site_id'])) {
             $where['c.site_id'] = $this->params['site_id'];
         }
 
@@ -355,7 +349,7 @@ class Refund extends Basic
         }
 
         $data['data']['list']        = $list;
-        $data['data']['total_money'] = $refund->getSumMoney($where);
+        $data['data']['total_money'] = $refund->getSumMoney($where).'';
         $data['data']['total']       = $refund->getCheckRefundListTotal($where);
 
         return $this->response($data['code'], $data['msg'], $data['data']);
@@ -383,16 +377,10 @@ class Refund extends Basic
                 $where['a.status'] = ['in', '0,1'];
             } else {
                 $where['a.status'] = $this->params['status'];
-
-                if ($this->params['status'] == '0') {
-                    $where['c.site_id'] = $this->siteId;
-                }
             }
-        } else {
-            $where['c.site_id'] = $this->params['site_id'];
         }
 
-        if ($this->params['status'] > 0 && isset($this->params['site_id'])) {
+        if (!empty($this->params['site_id'])) {
             $where['c.site_id'] = $this->params['site_id'];
         }
 

application/index/view/global/footer_tpl.html

 
-<script src='/resource/lib/js/require.min.js' data-main='/resource/js/main?version=20190807112166166' charset='utf-8'></script>
+<script src='/resource/lib/js/require.min.js' data-main='/resource/js/main?version=20190806' charset='utf-8'></script>
 

application/index/view/member/user_genjing_modal.html

@@ -23,7 +23,7 @@
 		width: 50%;
 	}
 	.user-detail-relational>div>span,.user-detail-relational>div>a{
-		margin-left: 5px;
+		margin-left: 2px;
 		cursor: pointer;
 	}
 	.user-ul-liu{
@@ -468,7 +468,7 @@
 	}
 	.public-box-noleft-73{
 		display: inline-block;
-	    width: 60px;
+	    width: 56px;
 	    height: 26px;
 	    line-height: 26px;
 	    text-align: center;

public/resource/js/user_genjing_modal.js

@@ -1392,7 +1392,7 @@ define(['doT', 'text!temp/user_model_template_tpl.html','css!style/home.css', 'c
 									var yuanpan = '<a class="public-box-noleft-73 heavyPlates6" href="#modal-heavyPlates" data-toggle="modal" data-id="'+ item.user_id +'">重盘</a>'
 								}
 								
-								user_bind_list += '<div>' + item.user_name + '，ID：' + item.user_id + '，' + hideTel(item.user_phone) + '<span class="public-box-noleft-73 del-relational" data-id="'+ item.user_id +'">解除关联</span>' +  '<a class="public-box-noleft-73 user-detail" href="#modal-userDetail" data-toggle="modal" data-id="'+ item.user_id +'">客户详情</a>' + yuanpan + '</div>';
+								user_bind_list += '<div>' + item.user_name + ',ID:' + item.user_id + ',' + hideTel(item.user_phone) + '<span class="public-box-noleft-73 del-relational" data-id="'+ item.user_id +'">解除关联</span>' +  '<a class="public-box-noleft-73 user-detail" href="#modal-userDetail" data-toggle="modal" data-id="'+ item.user_id +'">客户详情</a>' + yuanpan + '</div>';
 							});
 							if(user_bind_list){
 							   $(".user-detail-relational").html(user_bind_list);