duxinyuan

public/appnew/config/index.js

@@ -13,8 +13,8 @@ module.exports = {
     proxyTable: {},
 
     // Various Dev Server settings
-    host: '192.168.0.90', // can be overwritten by process.env.HOST
-//  host: 'localhost', // can be overwritten by process.env.HOST
+//  host: '192.168.0.90', // can be overwritten by process.env.HOST
+    host: 'localhost', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

public/appnew/src/components/receive/receiveDetail.vue

@@ -15,12 +15,12 @@
 			<div class="leftDiv"> 入账金额: {{item.money}} 元 </div>
 			<div class="rightDiv"> 提交人: {{item.agent_name}} </div>
 			<div class="leftDiv"> 来源: {{getSource(item.source)}} </div>
-			<div class="rightDiv"> 状态: {{item.is_dividend==0?'正常':'多收'}} </div>
+			<div class="rightDiv"> 状态: {{ getStatus(item.status) }}</div>
 			<div class="leftDiv"> 支付方式: {{getPayType(item.pay_type)}} </div>
 			<div class="rightDiv"> 转账户名: {{item.transfer_name}} </div>
-			<div class="leftDiv"> 商铺号: {{item.house_id}} </div>
+			<div class="leftDiv"> 商铺号: {{item.house_number}} </div>
 			<div class="rightDiv"> 业态/品牌: {{item.industry_type}} </div>
-			<div class="woalDiv"> 对应业务员:{{item.current_agent_name}} </div>
+			<div class="woalDiv" v-show="item.type == 91 || item.type == 92"> 对应业务员:{{item.current_agent_name}} </div>
 			
 			<div class="woalDiv" v-show="item.type == 91 || item.type == 92"> 对应成交报告ID: {{item.bargain_id}} </div>
 			<div class="leftDiv" v-show="item.type == 91 || item.type == 92"> 是否分红: {{item.is_dividend==1?'否':'是'}} </div>
@@ -29,9 +29,9 @@
 			<div class="leftDiv" v-show="item.type == 91 || item.type == 92"> 成交价: {{item.price}} </div>
 			<div class="rightDiv" v-show="item.type == 91 || item.type == 92"> 之前已收佣: {{item.received_money}} </div>
 			
-			<div class="leftDiv" v-show="item.type == 91 || item.type == 92"> 中介费类型: {{getType(item.type)}} </div>
-			<div class="rightDiv" v-show="item.type == 91 || item.type == 92"> 应收金额: {{(Math.floor(((item.price-0)*(item.is_dividend == 0 ? 0.7 : 0))*100)/100).toFixed(2)}} </div>
-			<div class="woalDiv" v-show="item.type == 91 || item.type == 92"> 多收金额:{{(Math.floor((item.money - ((item.price-0)*(item.is_dividend == 0 ? 0.7 : 0)) + (item.received_money-0)*(item.is_dividend == 0 ? 0.7 : 0) )*100)/100).toFixed(2)}}</div>
+			<div class="leftDiv" v-show="item.type == 91 || item.type == 92"> 中介费类型: <!--{{getType(item.type)}}-->{{item.type_ext==0?'正常':'多收'}} </div>
+			<div class="rightDiv" v-show="item.type == 91 || item.type == 92"> 应收金额: {{(Math.floor(((item.price-0)*(item.type_ext == 0 ? 0.7 : 0))*100)/100).toFixed(2)}} </div>
+			<div class="woalDiv" v-show="item.type == 91 || item.type == 92"> 多收金额:{{(Math.floor((item.money - ((item.price-0)*(item.type_ext == 0 ? 0.7 : 0)) + (item.received_money-0)*(item.type_ext == 0 ? 1 : 0) )*100)/100).toFixed(2)}}</div>
 			
 			<div class="leftDiv"> 手续费: {{item.transaction_fee}}</div>
 			<div class="rightDiv"> 实付金额: {{item.real_money}} </div>
@@ -67,7 +67,7 @@
 				<div class="btn-left" @click="turntoMobilBack(item)">
 					退款
 				</div>
-				<div class="btn-right" :style="item.is_check == 1 ? checking : ''"  @click="turntoMobilOpen(item)">
+				<div class="btn-right" :style="item.is_check == 1 ? checking : ''"  @click="turntoMobilOpen(item,item.is_check == 1 )">
 					{{ item.is_check == 1  ? '开业审核中' : '申请开业' }}
 				</div>
 			</div>
@@ -100,7 +100,7 @@
 			files : [] ,
 			item : {},
 			checking : {
-				'background':'#333333',
+				'background':'#858585',
 				'color':'#ffffff'
 			}
 		}),
@@ -111,6 +111,24 @@
 			this.getData();
 		},
 		methods: {
+			getStatus (t){
+				let str = '' ;
+				switch(t-0){
+					case 0 : 
+						str = '正常';
+						break ; 
+					case 1 : 
+						str = '被调整';
+						break ; 
+					case 2 : 
+						str = '被退款';
+						break ; 
+					case 3 : 
+						str = '被退款被调整';
+						break ; 
+				}
+				return str ;
+			},
 			//退款 调整 /带看
 			turntoMobilBack ( obj ){
 				let _this = this ; 
@@ -137,8 +155,11 @@
 				});
 			},
 			//开业
-			turntoMobilOpen (obj){
+			turntoMobilOpen (obj,status){
 				let _this = this ; 
+				if ( status ){
+					return false ; 
+				}
 				_this.common.Compatible({
 					paraIos: {
 						'route': 'onClickApplyOpen',
@@ -187,10 +208,10 @@
 				let str = '' ; 
 				switch(t-0){
 					case 0 : 
-						str = 'app';
+						str = '正常收款';
 						break ; 
 					case 1 : 
-						str = '智能pos机';
+						str = '正常收款';
 						break ; 
 					case 2 : 
 						str = '调整';
@@ -202,10 +223,28 @@
 				let str = '' ; 
 				switch(t-0){
 					case 10 : 
-						str = '支付宝';
+						str = '施总支付宝';
+						break ; 
+					case 11 : 
+						str = '林老师支付宝';
+						break ; 
+					case 12 : 
+						str = '韵姐支付宝';
+						break ; 
+					case 13 : 
+						str = '陈志杰支付宝';
 						break ; 
 					case 20 : 
-						str = '微信';
+						str = '施总微信';
+						break ; 
+					case 21 : 
+						str = '林老师微信';
+						break ; 
+					case 22 : 
+						str = '韵姐微信';
+						break ; 
+					case 23 : 
+						str = '陈志杰微信';
 						break ; 
 					case 30 : 
 						str = 'pos机器';
@@ -219,6 +258,21 @@
 					case 60 : 
 						str = '其他';
 						break ; 
+					case 70 : 
+						str = '银满谷银行卡';
+						break ; 
+					case 71 : 
+						str = '筠姐上海银行卡';
+						break ; 
+					case 72 : 
+						str = '林老师建行卡';
+						break ; 
+					case 73 : 
+						str = '新同联福居银行卡';
+						break ; 
+					case 74 : 
+						str = '陈志杰招商银行卡';
+						break ; 
 				}
 				return str ;
 			},
@@ -277,7 +331,7 @@
 			saveImgIntoDetail(name) {
 				let that = this ;
 				this.axios({
-					method: 'get',
+					method: 'post',
 //					url: '/office/getBuildingRoomH5',
 					url : '/broker/addReceiptImg',
 					responseType: 'json',