Merge branch '0222-v3.0.8' into test

application/api_broker/service/DailyPaperService.php

@@ -161,6 +161,7 @@ class DailyPaperService
         $field = "sum(money) as money,pay_type";
         $params["agent_id"] = array("in", ($ids));
         $params["is_del"] = 0;
+        $params["source"] = array("in",("0,1"));
         $params["create_time"] = array("between", array($daily_data, $daily_data . " 23:59:59"));
         $payLogModel = new OPayLogModel();
         $total_arr = $payLogModel->getTotal($field, $params, "pay_type");

application/index/view/finance/getCollection.html

@@ -822,19 +822,28 @@
 								<strong><span class="col-xs-3 ld-Marheight">支付方式:</span></strong>
 								<div class="col-xs-6">
 									<select class="form-control" id="payType">
-										<option value="10">施总支付宝</option>		
-										<option value="11">林老师支付宝</option>	
-										<option value="12">筠姐支付宝</option>		
-										<option value="20">施总微信</option>		
-										<option value="21">林老师微信</option>
-										<option value="22">筠姐微信</option>	
-										<option value="30">pos机器</option>		
-										<option value="40">地产转账</option>	
-										<option value="41">世家公账</option>
-										<option value="42">3000账号</option>
-										<option value="50">现金</option>
-										<option value="70">银满谷银行卡</option>
-										<option value="60">其他</option>
+										<option value="10" class="shanghai">施总支付宝</option>		
+										<option value="11" class="shanghai">林老师支付宝</option>	
+										<option value="20" class="shanghai">施总微信</option>		
+										<option value="21" class="shanghai">林老师微信</option>
+										<option value="30" class="shanghai">pos机器</option>		
+										<option value="40" class="shanghai">地产转账</option>	
+										<option value="41" class="shanghai">世家公账</option>
+										<option value="42" class="shanghai">3000账号</option>
+										<option value="50" class="shanghai">现金</option>
+										<option value="60" class="shanghai">其他</option>
+										
+										<option value="11" class="hangzhou">林老师支付宝</option>	
+										<option value="21" class="hangzhou">林老师微信</option>
+										<option value="30" class="hangzhou">pos机器</option>		
+										<option value="40" class="hangzhou">地产转账</option>	
+										<option value="50" class="hangzhou">现金</option>
+										<!--<option value="60" class="hangzhou">其他</option>-->
+										
+										<option value="12" class="shenzheng">筠姐支付宝</option>		
+										<option value="22" class="shenzheng">筠姐微信</option>	
+										<option value="70" class="shenzheng">银满谷银行卡</option>
+										
 									</select>
 								</div>
 							</div>

application/index/view/houses/edit.html

@@ -339,7 +339,8 @@
 								<li class="list-group-item">
 									<div class="form-group">
 										<label for="internalName">对内商铺名称</label>
-										<input type="text" class="form-control" placeholder="请输入XX路靠近XX路X楼" name="internalName" id="internalName" data-alert="请填写对内商铺名称！">
+										<input type="text" class="form-control" placeholder="请输入XX路靠近XX路" name="internalName" id="internalName" data-alert="请填写对内商铺名称！">
+										<span class="text-danger">(会直接对客户展示为地址，请注意不要造成信息泄露！)</span>
 									</div>
 									<div class="form-group shangchang-show-part">
 										<label for="projectName">项目（大厦）名称</label>

public/resource/js/getCollection.js

@@ -1284,7 +1284,20 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 		},
 		
 		getValueFunction : function(data){
-			var persent = 0.7*1; 
+	    var  user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo')));  //读取缓存
+			if(user_info_obj.site_id == 10001){
+				$('.shanghai').show();
+				$('.hangzhou').hide();
+				$('.shenzheng').hide();
+			}else if(user_info_obj.site_id == 10002){
+				$('.shanghai').hide();
+				$('.hangzhou').show();
+				$('.shenzheng').hide();
+			}else{
+				$('.shanghai').hide();
+				$('.hangzhou').hide();
+				$('.shenzheng').show();
+			}
 			$('.zhzd').show();
 			$('.zjcon').hide();
 			var doc = $('#modal-addPic');

public/resource/template/house_template_tpl.html

@@ -23,7 +23,7 @@
             [% } %]
         </td>
         <td>[%= it[item]['disc'] %]</td>
-        <td>[%= hideStr(it[item]['internal_title']) %]</td>
+        <td>[%= it[item]['internal_title'] %]</td>
         <td>[%= it[item]['floor'] %]</td>
         
         <td>