Skip to content

T
tl_estate
Commit 6a9650cf authored by hujun's avatar hujun
Browse files
Options

Merge remote-tracking branch 'origin/0731-v3.3.6' into 0731-v3.3.6

parents 126d7495 cd7d83fb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 438 additions and 4 deletions
public/appnew/src/components/office_building/buildList.vue
View file @ 6a9650cf
<template>
<div>
<build-search @backSearchData="backSearchData" style="height:1.3rem;"></build-search>
<header-d :data="headerData" @headerSearch="showSearch=true"></header-d>
<build-search @backSearchData="backSearchData" style="height:1rem;border-top:1px solid #eaeaea ; border-bottom: 1px solid #eaeaea;"></build-search>
<page-load :canload="true" :distance="10" @load="getList">
<div class="officeLI" v-for="item,index in items" v-key="index" @click="turn('ShareOfficeRoom',item.id,item.title)">
<div style="width:2.1rem ; height : 1.58rem ; overflow:hidden ;border-radius:.25rem; float:left;">
<img :src="icon_down02" style="width:100%;height:100%;"/>
</div>
<div style="float:left;margin-left:.3rem;overflow:hidden;width:4.46rem;">
<div style="font-size:.30rem;font-family:PingFangSC-Medium;font-weight:500;color:rgba(28,28,28,1);line-height:.34rem;height:.7rem;">
{{item.title}}
</div>
<div style="width:100%;margin-top:.0rem;overflow: hidden;">
<div style="float:left;font-size:.36rem;font-family:DIN-Medium;font-weight:500;color:rgba(255,92,80,1);line-height:.44rem;overflow: hidden;">
{{item.price_total}} <span style="font-size:.2rem">元/月</span>
</div>
<div style="float:right;font-size:.36rem;font-family:DIN-Medium;font-weight:500;color:rgba(255,92,80,1);line-height:.44rem;overflow: hidden;">
{{item.price}} <span style="font-size:.2rem;color : #999999">元/㎡/天</span>
</div>
<div style="width:100%;overflow:hidden ;height:.35rem">
<div class="slogn" v-for="item1,index1 in item.shop_sign" :style="{'margin-left':index1==0?'0rem':'.01rem'}">
{{item1}}
</div>
</div>
</div>
</div>
</div>
</page-load>
<div style="width:100%;height:100%;position:fixed;top:0rem;left:0rem;background-color:rgba(255,255,255,1);z-index:1000;padding-top:.3rem;" v-show="showSearch">
<div style="width:5.8rem;height:.62rem;background:rgba(248,249,251,1);margin-left:.32rem;float:left;">
<div style="float:left;padding-left:.2rem;width:.1.9rem;text-align:center;width:1.7rem" @click="showSelecter = true ">
<span class="selecter">{{st}}</span>
</div>
<div style="margin-left:.2rem;float:left;">
<input style="width:3.3rem;float:left;height:.62rem;line-height:.62rem;margin-left:.2rem;" placeholder="qinggkghgfj" v-model="searchStr" @keydown="search($event)"/>
</div>
</div>
<div style="float:left;line-height:.62rem;margin-left:.3rem;color:rgba(255,128,24,1);font-size:.32rem;" @click="showSearch=false">取消</div>
<div v-show="showSelecter" class="options">
<div class="option" @click="st='房源地址';si=0;showSelecter=false">房源地址</div>
<div class="option" @click="st='楼盘名称';si=1;showSelecter=false">楼盘名称</div>
<div class="option" @click="st='房东手机号';si=2;showSelecter=false">房东手机号</div>
</div>
</div>
</div>
</template>
<script>
import headerP from '@/components/office_building/headPublic.vue'
import icon_down02 from '@/components/shop/images/icon_down02@2x.png';
import paginationLoad from '@/components/publicEg/paginationLoad';
import buildSearch from '@/components/office_building/buildSearch.vue';
export default {
name: '',
data : ()=>({
pageSize : 20 , icon_down02,
pageNo : 1 ,
items : [] ,
headerData: {
'title': '办公楼',
'noborder': false,
'isBack': false
},
searchData : {},
showSearch : false ,
showSelecter : false ,
st : '房源地址',
si : 0 ,
searchStr : '' ,
}),
components: {
'build-search': buildSearch,
'page-load' : paginationLoad ,
'header-d' :headerP
},
mounted () {
let that = this ;
that.getList(0);
},
methods: {
search(e){
let that = this ;
if ( e.keyCode == 13 ){
that.getList(0,true);
}
},
turn(str,id,name){
// this.$router.push({
// path : '/' + str,
// query : {
// 'id' : id,
// 'housename' : name
// }
// })
window.location.href = this.common.ServerHost + '/index/ShareOfficeRoom?id=' + id + '&housename=' + name ;
},
backSearchData (data){
let that = this ;
console.log(data);
that.searchData = data ;
that.pageNo = 1 ;
that.items = [] ;
that.getList();
},
getsign ( arr ){
let str = '';
arr.map((i)=>{
str+=i;
})
return str;
},
getList (no,status) {
let that = this ;
console.log(that.searchData)
that.axios({
method: 'get',
url: '/office/getBuildingRoomH5',
responseType: 'json',
data: {
// city :'上海市' ,
// disc : '',
// title :'' ,
// id :'' ,
// business_district_id :'' ,
// area_start :that.searchData.area ? that.searchData.area[0] : '' , ,
// area_end :that.searchData.area ? that.searchData.area[1] : '' ,,
// type :that.searchData.more.officeChoosen.index ? that.searchData.more.officeChoosen.index : '' ,
// price_start :that.searchData.money ? that.searchData.money[0] : '' ,
// price_end :that.searchData.money ? that.searchData.money[1] : '' ,
// is_exclusive_type : that.searchData.more.dujia ? that.searchData.more.dujia : '' ,
// agent_start_time :that.searchData.more.startTime ? that.searchData.more.startTime : '' ,
// agent_end_time :that.searchData.more.endTime ? that.searchData.more.endTime : '' ,
// is_rent :that.searchData.more.qiuzu ? that.searchData.more.qiuzu : '' ,
// status :that.searchData.more.shangjia ? that.searchData.more.shangjia : '' ,
// shop_sign :that.getsign(that.searchData.more.specialSpan) ,
}
}).then(function(res) {
if(res.data.code == 200) {
console.log(res.data.data);
res.data.data.map( (obj) => {
obj.shop_sign="临街旺铺,临近地铁,商业综合体,独家";
let array = obj.shop_sign.split(",");
obj.shop_sign=array;
that.items.push(obj);
})
that.pageNo += 1 ;
} else {
layer.tipsX(res.data.msg);
}
}).catch(function(error) {
console.log(error)
layer.tipsX(error);
});
}
},
......@@ -31,5 +162,62 @@
</script>
<style scoped>
.officeLI{
width:6.86rem ;
margin-left:.32rem ;
overflow:hidden ;
padding:.46rem 0rem .42rem ;
border-bottom:1px solid #eaeaea
}
.slogn {
float:left;
padding:.04rem 0.1rem;
height:.22rem;
border : 1px solid rgba(256,186,18,1);
color:#FF9318;font-size:.2rem;
line-height:.28rem;
border-radius:.04rem .04rem .04rem 0rem;
}
.selecter{
font-size:.24rem;
font-family:PingFangSC-Regular;
font-weight:400;
color:rgba(51,51,51,1);
line-height:.62rem;
float:left;
}
.selecter:after{
content: '';
width:0;
border-width:.1rem;
border-style:solid;
border-color:#1a1a1a transparent transparent transparent;
position:relative;
top:.2rem;
margin-left:.1rem;
}
.option{
padding:.1rem .2rem;
border-bottom:1px solid #ffffff;
}
.options{
position:fixed;
top:.95rem;
left:.3rem;
background-color:rgba(0,0,0,.7);
color:#ffffff;
font-size:.25rem;
}
.options:after{
content: '';
width:0;
border-width:.1rem;
border-style:solid;
border-color: transparent transparent #1a1a1a transparent;
position:fixed;
top:.75rem;
left:1rem;
margin-left:.1rem;
}
</style>
\ No newline at end of file
public/appnew/src/components/office_building/headPublic.vue 0 → 100644
View file @ 6a9650cf
<template>
<div>
<header :class="{'no-border':data.noborder}">
<a class="ps-back" @click="back" href="javascript:;"></a>
<h2>{{data.title}}</h2>
<slot></slot>
</header>
<div class="header_seat"></div>
</div>
</template>
<script>
export default {
name: '',
props: {
data: {
type: Object,
default: () => ({
message: 'hello'
})
}
},
data: () => ({
}),
computed: {
},
methods: {
back() {
this.$emit('headerSearch',true)
}
}
}
</script>
<style scoped>
header {
box-sizing: border-box;
position: fixed;
top: 0;
right: 0;
left: 0;
width: 100%;
height: .88rem;
background: #fff;
z-index: 100;
box-shadow: 0 2px 4px 0 rgba(186,186,186,0.15);
}
header.no-border{
box-shadow: none;
}
header .ps-back {
position: absolute;
top: 0;
bottom: 0;
right: 0;
display: block;
width: .88rem;
height: .88rem;
background: url(images/icon_search@2x.png) no-repeat 0.3rem center;
background-size: .48rem .48rem;
}
header .icon-link {
position: absolute;
top: 0;
bottom: 0;
right: 0;
display: block;
width: .88rem;
height: .88rem;
}
/*header .icon-link.icon-link-share {
background: url(images/icon_share@2x.png) no-repeat center center/.34rem .38rem;
}*/
header>h2{
font-size: .34rem;
line-height: .88rem;
overflow: hidden;
height: .88rem;
padding: 0 .88rem;
text-align: center;
white-space: nowrap;
text-overflow: ellipsis;
color: #333;
}
header+.header_seat {
height: 0.88rem;
}
</style>
\ No newline at end of file
public/appnew/src/components/receive/receiveDetail.vue 0 → 100644
View file @ 6a9650cf
<template>
<div>
<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="font-size:.36rem;font-family:PingFangSC-Semibold;font-weight:600;color:rgba(28,28,28,1);line-height:.50rem;float:left;">
案场费
</div>
<div style="font-size:.26rem;font-family:PingFangSC-Semibold;font-weight:400;color:rgba(28,28,28,1);line-height:.50rem;float:right;">
带看订单ID：2343 <span class="aaa"></span>
</div>
</div>
<div style="margin-left:.36rem;width:6.78rem;overflow:hidden;margin-top:.08rem;padding-bottom:.12rem;font-size:.26rem;font-family:PingFangSC-Light;font-weight:300;color:rgba(28,28,28,1);line-height:.52rem;">
<div class="leftDiv"> 提交吋囘: 2019.2.1 10:00:00 </div>
<div class="rightDiv"> 入账日期: 2019.2.1 </div>
<div class="leftDiv"> 入账金额: 2019.2.1 10:00:00 </div>
<div class="rightDiv"> 提交人: 2019.2.1 </div>
<div class="leftDiv"> 来源: 2019.2.1 10:00:00 </div>
<div class="rightDiv"> 状态: 2019.2.1 </div>
<div class="leftDiv"> 支付方式: 2019.2.1 10:00:00 </div>
<div class="rightDiv"> 转账户名: 2019.2.1 </div>
<div class="leftDiv"> 商铺号: 2019.2.1 10:00:00 </div>
<div class="rightDiv"> 业态/品牌: 2019.2.1 </div>
<div class="woalDiv"> 对应业务员:开发巨大高不可及的干部看见的那个科比你的大 </div>
<div class="leftDiv" v-show="!yixiang"> 对应成交报告ID: 1234 </div>
<div class="rightDiv" v-show="!yixiang"> 是否分红: 是 </div>
<div class="leftDiv" v-show="!yixiang"> 开业确定时间: 2019.2.1 </div>
<div class="rightDiv" v-show="!yixiang"> 是否开业: 是 </div>
<div class="leftDiv" v-show="!yixiang"> 成交价: 10000 </div>
<div class="rightDiv" v-show="!yixiang"> 之前已收佣: 11000 </div>
<div class="leftDiv" v-show="anchang || yixiang "> 中介费类型: 爱的发生大 </div>
<div class="rightDiv" v-show="anchang || yixiang "> 应收金额: 1000 </div>
<div class="woalDiv" v-show="anchang || yixiang "> 多收金额:1000000</div>
<div class="leftDiv"> 手续费: 2019.2.1 10:00:00 </div>
<div class="rightDiv"> 实付金额: 2019.2.1 </div>
<div class="woalDiv"> 备注:</div>
<div class="leftDiv"> 最后转定时间: 2019.2.1 10:00:00 </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="font-size:.36rem;font-family:PingFangSC-Semibold;font-weight:600;color:rgba(28,28,28,1);line-height:.50rem;float:left;">
资料图片
</div>
</div>
<div style="margin-left:.36rem;width:6.78rem;overflow:hidden;margin-top:.08rem;padding-bottom:.12rem;">
<div v-for="item,index in images" style="margin-left;margin-right:.135rem;float:left;margin-bottom:.18rem;">
<img :src="tie" style="width:1.55rem;height:1.15rem;border-radius:.1rem;" />
</div>
<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" />
<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>
</template>
<script>
import headerP from '@/components/office_building/headPublic.vue'
import icon_down02 from '@/components/shop/images/icon_down02@2x.png';
import paginationLoad from '@/components/publicEg/paginationLoad';
import buildSearch from '@/components/office_building/buildSearch.vue';
import addImg from '@/components/receive/images/addImg.png'
export default {
name: '',
data : ()=>({
headerData: {
'title': '收款详情',
'noborder': true,
'isBack': false
},
addImg,
tie : 'http://img.redocn.com/sheji/20141219/zhongguofengdaodeliyizhanbanzhijing_3744115.jpg',
images:[,,,,,,,,,],
files : []
}),
mounted () {
},
methods: {
addImage (){
let that = this ;
document.getElementById('upload_file').click();
},
fileChange(e){
let that = this ;
let file = e.target.files[0]
let formData = new FormData();
formData.append('type', 'house_img');
formData.append('image', file);
//由于公用的data会进行数据的转换，因此重新create一个新的axios
let instance = this.axios.create({
baseURL: that.common.ServerHostImageLiu,
timeout: 1000,
headers: {'Content-Type': 'multipart/form-data'}
});
instance.post('/index/uploadImg',formData).then((res)=>{
if(res.data.code == 200) {
console.log(res.data.data.img_path)
} else {
layer.tipsX(res.data.msg);
}
})
}
},
computed: {
}
}
</script>
<style scoped>
.aaa{
width: .14rem;
height: .14rem;
border-top: 2px solid #333333;
border-right: 2px solid #333333;
transform: rotate(45deg);
float:right;
margin-right:.2rem;
margin-top:.15rem;
margin-left:.2rem
}
.leftDiv{
float:left;
width:3.5rem;
}
.rightDiv{
float:left;
width:2.62rem;
margin-left:.24rem;
}
.woalDiv{
float:left;
width:100%;
}
</style>
\ No newline at end of file
public/appnew/src/router/index.js
View file @ 6a9650cf
......@@ -29,6 +29,9 @@ import search from '@/components/businessCollege/search'
import openSquareDetails from '@/components/openSquareDetails/openSquareDetails'
import buildList from '@/components/office_building/buildList'
import builldDetail from '@/components/office_building/builldDetail'
import receiveDetail from '@/components/receive/receiveDetail'
Vue.use(VueRouter)
......@@ -187,7 +190,14 @@ export default new VueRouter({
path: '/builldDetail',
name: 'v-builldDetail',
component: builldDetail
},{
path: '/receiveDetail',
name: 'v-receiveDetail',
component: receiveDetail
}
]
})
......
public/resource/js/schoolBusinessNew.js
View file @ 6a9650cf
......@@ -105,6 +105,7 @@ define(['doT', 'text!temp/schoolBusiness_template_tpl.html', 'ckfinder', 'ckfind
//图片上传，附件上传处理事件
$("#upload-image-btn").change(function() {
console.log("duxinyuan")
var _this = $(this),
_spFile = _this.data('spfile'),
_limitTop = 1,//_this.data('limittop'),
......@@ -137,6 +138,9 @@ define(['doT', 'text!temp/schoolBusiness_template_tpl.html', 'ckfinder', 'ckfind
var formData = new FormData();
formData.append('type', 'house_img');
formData.append('image', _this[0].files[0]);
console.log(formData.image)
$.ajax({
type: 'post',
url: ServerHostImageLiu + '/index/uploadImg',
......
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