Skip to content

T
tl_estate
Commit 983d253b authored by duxinyuan's avatar duxinyuan
Browse files
Options

1

parent 04c53918
Hide whitespace changes
Inline Side-by-side
Showing with 176 additions and 33 deletions
public/app/dist/index.html
View file @ 983d253b
...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
if(!doc.addEventListener) return; if(!doc.addEventListener) return;
win.addEventListener(resizeEvt, recalc, false); win.addEventListener(resizeEvt, recalc, false);
doc.addEventListener('DOMContentLoaded', recalc, false); doc.addEventListener('DOMContentLoaded', recalc, false);
})(document, window);</script><link href=./static/css/app.da872a139a7cdbb068f0f7b226d3a97b.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.56ecb04556dd8bb41697.js></script></body></html> })(document, window);</script><link href=./static/css/app.55755464f6625584e0e88681def052a7.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.bcc4cff6ef8812895ee5.js></script></body></html>
\ No newline at end of file \ No newline at end of file
public/app/dist/static/css/app.0200b81a0de2915dbe3daa7832494948.css 0 → 100644
View file @ 983d253b
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/css/app.032a30666f8dd9b8af791fe1ab888e4d.css 0 → 100644
View file @ 983d253b
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/css/app.55755464f6625584e0e88681def052a7.css 0 → 100644
View file @ 983d253b
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/css/app.9db5d0acde7b566379ee28e97c5fd43a.css 0 → 100644
View file @ 983d253b
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/css/app.c7dd96fc125c430125254c595f45d704.css 0 → 100644
View file @ 983d253b
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.4011b6521090bb24432f.js 0 → 100644
View file @ 983d253b
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.8f493ca86a5fea353610.js 0 → 100644
View file @ 983d253b
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.97c7f1635cf7746a891c.js 0 → 100644
View file @ 983d253b
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.9dd40d05a83edea2b90a.js 0 → 100644
View file @ 983d253b
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.bcc4cff6ef8812895ee5.js 0 → 100644
View file @ 983d253b
This source diff could not be displayed because it is too large. You can view the blob instead.
public/appnew/package.json
View file @ 983d253b
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
"scripts": { "scripts": {
"dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
"start": "npm run dev", "start": "npm run dev",
"serve": "npm run dev",
"build": "node build/build.js" "build": "node build/build.js"
}, },
"dependencies": { "dependencies": {
......
public/appnew/src/components/office_building/buildList.vue
View file @ 983d253b
...@@ -77,6 +77,7 @@ ...@@ -77,6 +77,7 @@
mounted () { mounted () {
let that = this ; let that = this ;
that.getList(0); that.getList(0);
that.test();
}, },
methods: { methods: {
search(e){ search(e){
...@@ -93,7 +94,7 @@ ...@@ -93,7 +94,7 @@
// 'housename' : name // 'housename' : name
// } // }
// }) // })
window.location.href = this.common.ServerHost + '/index/ShareOfficeRoom?id=' + id + '&housename=' + name ; window.location.href = this.common.ServerHost + '/index/ShareOfficeRoom?id=' + id + '&' + window.location.href.split("?")[1] ;
}, },
backSearchData (data){ backSearchData (data){
let that = this ; let that = this ;
...@@ -115,6 +116,8 @@ ...@@ -115,6 +116,8 @@
// console.log(that.searchData) ; // console.log(that.searchData) ;
let data = { let data = {
city :'上海市' , city :'上海市' ,
pageSize : that.pageSize ,
pageNo : that.pageNo,
// disc : '', // disc : '',
// id :'' , // id :'' ,
// business_district_id :'' , // business_district_id :'' ,
...@@ -228,6 +231,14 @@ ...@@ -228,6 +231,14 @@
console.log(error) console.log(error)
layer.tipsX(error); layer.tipsX(error);
}); });
},
test (){
let sttr = '{"name":"duxinyuan","id":"123213"}';
let newStr = JSON.parse(sttr);
console.log(newStr,newStr.name);
} }
}, },
......
public/appnew/src/components/receive/receiveDetail.vue
View file @ 983d253b
<template> <template>
<div> <div style="margin-top:.3rem;">
<header-pulic :data="headerData"></header-pulic> <!--<header-pulic :data="headerData"></header-pulic>-->
<div style="margin-left:.36rem;width:6.78rem;overflow:hidden;margin-top:.08rem;padding-bottom:.12rem;border-bottom:1px solid #F8F9FB"> <div style="margin-left:.36rem;width:6.78rem;overflow:hidden;margin-top:.08rem;padding-bottom:.12rem;border-bottom:1px solid #F8F9FB;">
<div style="font-size:.36rem;font-family:PingFangSC-Semibold;font-weight:600;color:rgba(28,28,28,1);line-height:.50rem;float:left;"> <div style="font-size:.36rem;font-family:PingFangSC-Semibold;font-weight:600;color:rgba(28,28,28,1);line-height:.50rem;float:left;">
案场费 {{getType(item.type)}}
</div> </div>
<div style="font-size:.26rem;font-family:PingFangSC-Semibold;font-weight:400;color:rgba(28,28,28,1);line-height:.50rem;float:right;"> <div style="font-size:.26rem;font-family:PingFangSC-Semibold;font-weight:400;color:rgba(28,28,28,1);line-height:.50rem;float:right;" @click="turntoMobilBack(item)">
带看订单ID：{{item.order_id}} <span class="aaa"></span> 带看订单ID：{{item.order_id}} <span class="aaa"></span>
</div> </div>
</div> </div>
...@@ -22,21 +22,21 @@ ...@@ -22,21 +22,21 @@
<div class="rightDiv"> 业态/品牌: {{item.industry_type}} </div> <div class="rightDiv"> 业态/品牌: {{item.industry_type}} </div>
<div class="woalDiv"> 对应业务员:{{item.current_agent_name}} </div> <div class="woalDiv"> 对应业务员:{{item.current_agent_name}} </div>
<div class="leftDiv" v-show="!yixiang"> 对应成交报告ID: {{item.bargain_id}} </div> <div class="woalDiv" v-show="item.type == 91 || item.type == 92"> 对应成交报告ID: {{item.bargain_id}} </div>
<div class="rightDiv" v-show="!yixiang"> 是否分红: {{item.is_dividend==0?'否':'是'}} </div> <div class="leftDiv" v-show="item.type == 91 || item.type == 92"> 是否分红: {{item.is_dividend==1?'否':'是'}} </div>
<div class="leftDiv" v-show="!yixiang"> 开业确定时间: {{item.open_time}}</div> <div class="rightDiv" v-show="item.type == 91 || item.type == 92"> 是否开业: {{item.is_open==0?'未开业':'开业'}}</div>
<div class="rightDiv" v-show="!yixiang"> 是否开业: {{item.is_open==0?'未开业':'开业'}}</div> <div class="woalDiv" v-show="item.type == 91 || item.type == 92"> 开业确定时间: {{item.open_time}}</div>
<div class="leftDiv" v-show="!yixiang"> 成交价: {{item.price}} </div> <div class="leftDiv" v-show="item.type == 91 || item.type == 92"> 成交价: {{item.price}} </div>
<div class="rightDiv" v-show="!yixiang"> 之前已收佣: {{item.received_money}} </div> <div class="rightDiv" v-show="item.type == 91 || item.type == 92"> 之前已收佣: {{item.received_money}} </div>
<div class="leftDiv" v-show="anchang || yixiang "> 中介费类型: {{getType(item.type)}} </div> <div class="leftDiv" v-show="item.type == 91 || item.type == 92"> 中介费类型: {{getType(item.type)}} </div>
<div class="rightDiv" v-show="anchang || yixiang "> 应收金额: 1000 </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="anchang || yixiang "> 多收金额:1000000</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"> 手续费: {{item.transaction_fee}}</div> <div class="leftDiv"> 手续费: {{item.transaction_fee}}</div>
<div class="rightDiv"> 实付金额: {{item.real_money}} </div> <div class="rightDiv"> 实付金额: {{item.real_money}} </div>
<div class="woalDiv"> 备注:{{item.remark}}</div> <div class="woalDiv"> 备注:{{item.remark}}</div>
<div class="woalDiv"> 最后转定时间: {{item.last_transfer_time}}</div> <div class="woalDiv" v-show="item.type == 10 || item.type == 30"> 最后转定时间: {{item.last_transfer_time}}</div>
</div> </div>
<div style="margin-left:.36rem;width:6.78rem;overflow:hidden;margin-top:.08rem;padding-bottom:.12rem;border-bottom:1px solid #F8F9FB"> <div style="margin-left:.36rem;width:6.78rem;overflow:hidden;margin-top:.08rem;padding-bottom:.12rem;border-bottom:1px solid #F8F9FB">
<div style="font-size:.36rem;font-family:PingFangSC-Semibold;font-weight:600;color:rgba(28,28,28,1);line-height:.50rem;float:left;"> <div style="font-size:.36rem;font-family:PingFangSC-Semibold;font-weight:600;color:rgba(28,28,28,1);line-height:.50rem;float:left;">
...@@ -44,24 +44,38 @@ ...@@ -44,24 +44,38 @@
</div> </div>
</div> </div>
<div style="margin-left:.36rem;width:6.78rem;overflow:hidden;margin-top:.08rem;padding-bottom:.12rem;"> <div style="margin-left:.36rem;width:6.78rem;overflow:hidden;margin-top:.08rem;padding-bottom:.12rem;">
<div v-for="item,index in item.img_arr" style="margin-left;margin-right:.135rem;float:left;margin-bottom:.18rem;"> <div v-for="item1,index in item.img_arr" style="margin-left;margin-right:.135rem;float:left;margin-bottom:.18rem;">
<img :src="tie" style="width:1.55rem;height:1.15rem;border-radius:.1rem;" /> <img :src="item.img_path + item1.img_name" style="width:1.55rem;height:1.15rem;border-radius:.1rem;" />
</div> </div>
<div style="margin-left;margin-right:.135rem;float:left;margin-bottom:.18rem;" @click="addImage"> <div style="margin-left;margin-right:.135rem;float:left;margin-bottom:.18rem;" @click="addImage">
<img :src="addImg" style="width:1.55rem;height:1.15rem;border-radius:.1rem;border: 1px dashed red" /> <img :src="addImg" style="width:1.55rem;height:1.15rem;border-radius:.1rem;border: 1px dashed red" />
<form enctype="multipart/form-data" name="fileinfo"><input id="upload_file" type="file" style="display: none;" accept='image/*' name="file" @change="fileChange($event)"/></form> <form enctype="multipart/form-data" name="fileinfo"><input id="upload_file" type="file" style="display: none;" accept='image/*' name="file" @change="fileChange($event)"/></form>
</div> </div>
</div> </div>
<div style="position: fixed;bottom:0rem;left:0rem;height:1rem;background-color:#ffffff;width:7.5rem;"> <div style="position: fixed;bottom:0rem;left:0rem;height:1rem;background-color:#ffffff;width:7.5rem;" v-if="item.type == 10 ||item.type == 30">
<div style="height:.76rem;margin-top:.15rem;"> <div style="height:.76rem;margin-top:.15rem;">
<div style="margin-left:0.35rem;float:left;width:3.30rem;height:.76rem;background:linear-gradient(90deg,rgba(255,160,40,.1) 0%,rgba(255,128,24,.1) 100%);border-radius:.10rem;font-size:.28rem;font-weight:500;color:rgba(255,128,24,1);text-align:center;line-height:.76rem;"> <div class="btn-left" @click="turntoMobilBack(item)">
调整
</div>
<div class="btn-right" @click="turntoMobilBack(item)">
退款 退款
</div> </div>
<div style="margin-left:.2rem;float:left;width:3.30rem;height:.76rem;background:linear-gradient(90deg,rgba(255,160,40,.1) 0%,rgba(255,128,24,.1) 100%);border-radius:.10rem;font-size:.28rem;font-weight:500;color:rgba(255,128,24,1);text-align:center;line-height:.76rem;"> </div>
</div>
<div style="position: fixed;bottom:0rem;left:0rem;height:1rem;background-color:#ffffff;width:7.5rem;" v-else>
<div style="height:.76rem;margin-top:.15rem;" v-show="item.is_open == 0">
<div class="btn-left" @click="turntoMobilBack(item)">
退款
</div>
<div class="btn-right" :style="item.is_check == 1 ? checking : ''" @click="turntoMobilOpen(item)">
{{ item.is_check == 1 ? '开业审核中' : '申请开业' }}
</div>
</div>
<div style="height:.76rem;margin-top:.15rem;" v-show="item.is_open == 1 ">
<div class="btn-left" style="margin-left:2.05rem;" @click="turntoMobilBack(item)">
退款 退款
</div> </div>
</div> </div>
</div> </div>
<div style="width:7.5rem;height:1rem;"></div> <div style="width:7.5rem;height:1rem;"></div>
</div> </div>
...@@ -83,9 +97,12 @@ ...@@ -83,9 +97,12 @@
}, },
addImg, addImg,
tie : 'http://img.redocn.com/sheji/20141219/zhongguofengdaodeliyizhanbanzhijing_3744115.jpg', tie : 'http://img.redocn.com/sheji/20141219/zhongguofengdaodeliyizhanbanzhijing_3744115.jpg',
images:[,,,,,,,,,],
files : [] , files : [] ,
item : {} item : {},
checking : {
'background':'#333333',
'color':'#ffffff'
}
}), }),
mounted () { mounted () {
if ( this.$route.query.from ){ if ( this.$route.query.from ){
...@@ -94,6 +111,54 @@ ...@@ -94,6 +111,54 @@
this.getData(); this.getData();
}, },
methods: { methods: {
//退款 调整 /带看
turntoMobilBack ( obj ){
let _this = this ;
let _url = location.href ;
_this.common.Compatible({
paraIos: {
'route': 'onClickToDetail',
// 'url': _url,
'orderId' : obj.order_id - 0,
'house_id' : obj.house_id - 0
// 'orderNo' : obj.order_no,
// 'reportId' : obj.report_id,
// 'houseAddress' : obj.address,
// 'pauId': obj.id
},
fnAndroid() {
// window.android.onClickToDetail(obj.order_id, obj.order_no,obj.report_id, obj.address,obj.id);
window.android.onClickToDetail(obj.order_id, obj.house_id);
},
fn() {
console.warn('error');
}
});
},
//开业
turntoMobilOpen (obj){
let _this = this ;
_this.common.Compatible({
paraIos: {
'route': 'onClickApplyOpen',
'orderId' : obj.order_id ,
'bargainId' : obj.bargain_id ,
'reportId' : obj.report_id,
'payId' : obj.id,
'houseId' : obj.house_id,
'houseAddress': obj.address
},
fnAndroid() {
// window.android.onClickToDetail(obj.order_id, obj.order_no,obj.report_id, obj.address,obj.id);
window.android.onClickApplyOpen(obj.order_id, obj.bargain_id ,obj.report_id,obj.id,obj.house_id,obj.address);
},
fn() {
console.warn('error');
}
});
},
getType (t){ getType (t){
let str = '' ; let str = '' ;
switch(t-0){ switch(t-0){
...@@ -165,8 +230,10 @@ ...@@ -165,8 +230,10 @@
url : '/broker/getPayLogDetail', url : '/broker/getPayLogDetail',
responseType: 'json', responseType: 'json',
data: { data: {
AuthToken : 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJkYXRhIjp7ImlkIjo1NzM5LCJuYW1lIjoiXHU2MDNiXHU2ZDRiXHU4YmQ1MSIsInBob25lIjoiMTU2MDE2NTIzNTMiLCJsZXZlbCI6MzB9LCJ0aW1lU3RhbXBfIjoxNTQxNTc2MzQ3fQ.csvXQnqzLdZ-dW3pVGosyPqbCPWPXyECncwD4dD6M6I', // AuthToken : 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJkYXRhIjp7ImlkIjo1NzM5LCJuYW1lIjoiXHU2MDNiXHU2ZDRiXHU4YmQ1MSIsInBob25lIjoiMTU2MDE2NTIzNTMiLCJsZXZlbCI6MzB9LCJ0aW1lU3RhbXBfIjoxNTQxNTc2MzQ3fQ.csvXQnqzLdZ-dW3pVGosyPqbCPWPXyECncwD4dD6M6I',
pay_id : 1132 // pay_id : 1100,
AuthToken : that.$route.query.token,
pay_id : that.$route.query.id
} }
}).then(function(res){ }).then(function(res){
if(res.data.code == 200) { if(res.data.code == 200) {
...@@ -185,17 +252,43 @@ ...@@ -185,17 +252,43 @@
let that = this ; let that = this ;
let file = e.target.files[0] let file = e.target.files[0]
let formData = new FormData(); let formData = new FormData();
formData.append('type', 'house_img'); formData.append('type', 'chat');
formData.append('image', file); formData.append('image', file);
formData.append('AuthToken', that.$route.query.token);
//由于公用的data会进行数据的转换，因此重新create一个新的axios //由于公用的data会进行数据的转换，因此重新create一个新的axios
let instance = this.axios.create({ let instance = this.axios.create({
baseURL: that.common.ServerHostImageLiu, baseURL: that.common.ServerHostImageLiu,
timeout: 1000, timeout: 1000,
headers: {'Content-Type': 'multipart/form-data'} headers: {'Content-Type': 'multipart/form-data'}
}); });
instance.post('/index/uploadImg',formData).then((res)=>{ instance.post('/broker/uploadImg',formData).then((res)=>{
if(res.data.code == 200) { if(res.data.code == 200) {
console.log(res.data.data.img_path) console.log(res.data.data.img_path)
that.item.img_arr.push({
img_name : res.data.data.img_path,
id : ''
});
that.saveImgIntoDetail(res.data.data.img_path)
} else {
layer.tipsX(res.data.msg);
}
})
},
saveImgIntoDetail(name) {
let that = this ;
this.axios({
method: 'get',
// url: '/office/getBuildingRoomH5',
url : '/broker/addReceiptImg',
responseType: 'json',
data: {
AuthToken : that.$route.query.token,
img_name : name ,
img_id : that.item.id
}
}).then(function(res){
if(res.data.code == 200) {
layer.tipsX(res.data.msg);
} else { } else {
layer.tipsX(res.data.msg); layer.tipsX(res.data.msg);
} }
...@@ -233,4 +326,31 @@ ...@@ -233,4 +326,31 @@
float:left; float:left;
width:100%; width:100%;
} }
.btn-left{
margin-left:0.35rem;
float:left;
width:3.30rem;
height:.76rem;
background:linear-gradient(90deg,rgba(255,160,40,.1) 0%,rgba(255,128,24,.1) 100%);
border-radius:.10rem;
font-size:.28rem;
font-weight:500;
color:rgba(255,128,24,1);
text-align:center;
line-height:.76rem;
}
.btn-right{
margin-left:0.2rem;
float:left;
width:3.30rem;
height:.76rem;
/*background:linear-gradient(90deg,rgba(255,160,40,.1) 0%,rgba(255,128,24,.1) 100%);*/
background:linear-gradient(90deg,rgba(255,160,40,1) 0%,rgba(255,128,24,1) 100%);
border-radius:.10rem;
font-size:.28rem;
font-weight:500;
color:rgba(255,255,255,1);
text-align:center;
line-height:.76rem;
}
</style> </style>
\ No newline at end of file
public/appnew/src/components/reportDetails/reportDetails.vue
View file @ 983d253b
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
<section v-show="3 === initTabNumMain"> <section v-show="3 === initTabNumMain">
<ul class="li-box" v-for="(item,index) in getItem"> <ul class="li-box" v-for="(item,index) in getItem" @click="turn('receiveDetail',item.id)">
<li class="main-sec-li no-background-color"> <li class="main-sec-li no-background-color">
<div class="special-style">提交时间:<span class="margin-left">{{ item.create_time}}</span></div> <div class="special-style">提交时间:<span class="margin-left">{{ item.create_time}}</span></div>
</li> </li>
...@@ -190,9 +190,9 @@ ...@@ -190,9 +190,9 @@
<li class="main-sec-li half no-background-color"> <li class="main-sec-li half no-background-color">
<div class="special-style">来源:<span class="margin-left">{{ getComeFrom(item.source)}}</span></div> <div class="special-style">来源:<span class="margin-left">{{ getComeFrom(item.source)}}</span></div>
</li> </li>
<li class="main-sec-li half no-background-color"> <!--<li class="main-sec-li half no-background-color">
<div class="special-style">对应业务员:<span class="margin-left">{{ item.salesman}}</span></div> <div class="special-style">对应业务员:<span class="margin-left">{{ item.salesman}}</span></div>
</li> </li>-->
<li class="main-sec-li half no-background-color"> <li class="main-sec-li half no-background-color">
<div class="special-style">状态:<span class="margin-left">{{ getStatus(item.source,item.is_refund)}}</span></div> <div class="special-style">状态:<span class="margin-left">{{ getStatus(item.source,item.is_refund)}}</span></div>
</li> </li>
...@@ -261,6 +261,16 @@ ...@@ -261,6 +261,16 @@
_this.loadMain(); _this.loadMain();
}, },
methods: { methods: {
turn (str,id){
let that = this ;
this.$router.push({
path : '/' + str,
query : {
'token' : that.$route.query.token,
'id' : id
}
})
},
getIntoType : function(no){ getIntoType : function(no){
var str = "" var str = ""
switch ( no ) { switch ( no ) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment