方案详情、购买页面调整，销售端客户楼盘接口对接

src/components/page-component/app-user-center-top/app-user-center-top.vue

@@ -237,6 +237,50 @@
 			</view>
 		</view>
 		<!-- style 4 end -->
+		
+		<!-- style 5 start -->
+		<view class="style-4 dir-left-nowrap cross-center box-grow-1" v-else-if="topStyle == '5'" >
+			<view class="box-grow-0 avatar-container">
+				<image :src="avatar"
+					class="avatar"></image>
+			</view>
+			<view class="box-grow-1 info-container">
+				<template v-if="isLogin">
+					<view class="dir-left-nowrap cross-center">
+						<view v-if="userInfo" class="nickname t-omit" :style="{'color':userNameColor}">
+							{{userInfo.salesperson_info.name}}
+						</view>
+						<!--#ifdef MP-WEIXIN -->
+							<image v-if="isRealname" style="width: 96rpx;height: 31rpx;margin-left: 14rpx;" src="https://t17.9026.com/web/statics/image/index/ysm.png" mode=""></image>
+						<button class="u-refresh dir-left-nowrap main-between cross-center member-margin"
+							open-type="getUserInfo" @getAuthorize="getUserInfo" @click="getUserInfo">
+							<icon class="u-icon" type></icon>
+							<text>刷新</text>
+						</button>
+						<!-- #endif-->
+						<!--#ifdef  H5 -->
+						<button class="u-refresh dir-left-nowrap main-between cross-center member-margin"
+							v-if="isWechat" @click="getUserInfo">
+							<icon class="u-icon" type></icon>
+							<text>刷新</text>
+						</button>
+						<!-- #endif-->
+					</view>
+					<view class="number" :style="{'color':userNameColor}">
+						{{userInfo.salesperson_info.mobile}}
+					</view>
+				</template>
+				<template v-else>
+					<app-form-id>
+						<view class="login-btn" @click="callLogin">点击登录</view>
+					</app-form-id>
+				</template>
+			</view>
+			<view class="box-grow-0 address-container">
+				<image style="width: 32rpx;height: 34rpx;" src="https://t17.9026.com/web/statics/image/index/arrow_right.png" mode=""></image>
+			</view>
+		</view>
+		<!-- style 5 end -->
 	</view>
 </template>
 

src/components/page-component/goods/u-attr.vue

@@ -4,7 +4,8 @@
 			<slot name="btn"></slot>
 		</view>
 		<u-popup v-model="newValue" mode="bottom" border-radius="14" :safeAreaInsetBottom="true" @close="close">
-
+		<template v-if="type==='goods'">
+			
 		    <!-- #ifdef MP-TOUTIAO -->
 		    <view class="u-model">
 		    <!-- #endif -->
@@ -172,6 +173,10 @@
                     </view>
                 </app-jump-button>
 			</view>
+			</template>
+			<template v-if="type==='package'">
+				<view>套餐</view>
+			</template>
 		</u-popup>
 		<app-preview-image v-if="showPreview" :cover_list="cover_list" :index="attrIndex" @change="closePreview"></app-preview-image>
 	</view>
@@ -191,6 +196,10 @@
 		name: "u-attr",
 		mixins: [goodsMixin,calendarCommon],
 		props: {
+			type:{ //类型 goods单品、package套餐
+				type:String,
+				default:'goods'
+			},
 			value: {
 				type: [Boolean, Number]
 			},

src/core/apiUrl.js

@@ -1,15 +1,13 @@
 const apiUrl = {
 	sale:{
-		sale_login:'api/sale/user/login',
-		binding_estate:'api/sale/user/binding-estate',
-		customer:{
-			list:'api/sale/customer/list',
-			detail:'api/sale/customer/detail',
-			save:'api/sale/customer/save'
-		},
-		estate:{
-			list:'api/sale/estate/list'
-		}
+		sale_login:'plugin/sale/api/user/login',
+		binding_estate:'plugin/sale/api/user/binding-estate',
+		
+		customer_list:'plugin/sale/api/customer/list',
+		customer_detail:'plugin/sale/api/customer/detail',
+		customer_save:'plugin/sale/api/customer/save',
+		
+		estate_list:'plugin/sale/api/estate/list'
 	},
     index: {
         config: 'api/index/config',

src/pages.json

@@ -9,62 +9,26 @@
 				// #endif
 			}
 		}
-		// ,{
-		//     "path" : "plugins/fission/index/index",
-		//     "style" :                                                                                    
-		//     {
-		//         "navigationBarTitleText": "",
-		//         "enablePullDownRefresh": false
-		//     }
 
-		// }
-		// ,{
-		//     "path" : "plugins/fission/log/log",
-		//     "style" :                                                                                    
-		//     {
-		//         "navigationBarTitleText": "",
-		//         "enablePullDownRefresh": false
-		//     }
-
-		// }
-		// ,{
-		//     "path" : "plugins/weekly_buy/index/index",
-		//     "style" :                                                                                    
-		//     {
-		//         "navigationBarTitleText": "周期购",
-		//         "enablePullDownRefresh": false
-		//     }
-
-		// }
-		// ,{
-		//     "path" : "plugins/weekly_buy/goods/goods",
-		//     "style" :                                                                                    
-		//     {
-		//         "navigationBarTitleText": "",
-		//         "enablePullDownRefresh": false
-		//     }
-
-		// }
-		// ,{
-		//     "path" : "plugins/weekly_buy/send/send",
-		//     "style" :                                                                                    
-		//     {
-		//         "navigationBarTitleText": "",
-		//         "enablePullDownRefresh": false
-		//     }
-
-		// }
-		// ,{
-		//     "path" : "plugins/weekly_buy/time/time",
-		//     "style" :                                                                                    
-		//     {
-		//         "navigationBarTitleText": "",
-		//         "enablePullDownRefresh": false
-		//     }
-
-		// }
-
-	],
+	    ,{
+            "path" : "pages/index/binding/binding",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "绑定楼盘",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/index/binding/bindingSale",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "绑定销售",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "",

src/pages/case/projectInfo.vue

@@ -225,6 +225,7 @@
             <!--快捷导航-->
             <!-- <app-quick-navigation></app-quick-navigation> -->
             <u-attr
+			:type="'package'"
                 v-if="is_negotiable === 0 && exchangeStatus ==null && goods && goods.type"
                 v-model="attrShow"
                 :goods="goods"

src/pages/index/binding/binding.vue

@@ -0,0 +1,181 @@
+<template>
+	<view>
+		<view class="main-between cross-center lp">
+			<view class="name">世龙广场</view>
+			<image src="../../../static/image/index/arrow-down-bottom.png" mode=""></image>
+		</view>
+		<view class="form-box">
+			<view class="title">楼盘信息</view>
+			<view class="main-between cross-center item" @click="selectBuild">
+				<view class="title_1">楼盘名称</view>
+				<view class="main-right cross-center">
+					<text class="pla">请选择</text>
+					<image class="arrow-right" src="../../../static/image/index/arrow-right-gray.png" mode=""></image>
+				</view>
+			</view>
+			<view class="line"></view>
+			<picker mode="region" @change="bindPickerRegion">
+				<view class="main-between cross-center item">
+					<view class="title_1">区域信息</view>
+					<view class="main-right cross-center">
+						<text :class="{'val':region!=='请选择','pla':region==='请选择'}">{{region}}</text>
+						<image class="arrow-right" src="../../../static/image/index/arrow-right-gray.png" mode="">
+						</image>
+					</view>
+				</view>
+			</picker>
+			<view class="line"></view>
+			<picker mode="selector" @change="bindPickerNature" :range="natureList">
+				<view class="main-between cross-center item">
+					<view class="title_1">楼盘性质</view>
+					<view class="main-right cross-center">
+						<text :class="{'val':nature!=='请选择','pla':nature==='请选择'}">{{nature}}</text>
+						<image class="arrow-right" src="../../../static/image/index/arrow-right-gray.png" mode="">
+						</image>
+					</view>
+				</view>
+			</picker>
+			<view class="line"></view>
+			<view class="main-between cross-center item" @click="selectSale">
+				<view class="title_1">绑定销售</view>
+				<view class="main-right cross-center" >
+					<text class="pla">请选择</text>
+					<image class="arrow-right" src="../../../static/image/index/arrow-right-gray.png" mode=""></image>
+				</view>
+			</view>
+		</view>
+		<button type="default" :class="{'add':true, 'allow-add':true, 'not-add':false}" :disabled="fasle">添加楼盘</button>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				region: '请选择',
+				nature: '请选择',
+
+				natureList: ['住宅用房', '非住宅用房']
+			};
+		},
+		methods: {
+			selectBuild() {
+				uni.navigateTo({
+					url: '/pages/sale/properties/addProperties'
+				})
+			},
+			selectSale() {
+				uni.navigateTo({
+					url: '/pages/index/binding/bindingSale'
+				})
+			},
+			bindPickerRegion(e) {
+				this.region = e.target.value.join('')
+			},
+			bindPickerNature(e) {
+				this.nature = this.natureList[e.target.value]
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		min-height: 100vh;
+		background: #F8F8F8;
+		padding-top: 21rpx;
+	}
+
+	.lp {
+		width: 678rpx;
+		height: 100rpx;
+		background: #FFFFFF;
+		border-radius: 6rpx;
+		padding: 0 43rpx 0 34rpx;
+		margin: 0 auto;
+
+		.name {
+			font-size: 32rpx;
+			font-weight: bold;
+			color: #000000;
+		}
+
+		image {
+			width: 18rpx;
+			height: 11rpx;
+		}
+	}
+
+	.form-box {
+		width: 678rpx;
+		height: auto;
+		background: #FFFFFF;
+		border-radius: 6rpx;
+		margin: 21rpx auto;
+
+		.title {
+			font-size: 32rpx;
+			font-weight: bold;
+			color: #000000;
+			border-bottom: 1rpx solid #E4E2E2;
+			height: 99rpx;
+			padding-left: 34rpx;
+			line-height: 99rpx;
+		}
+
+		.item {
+			height: 89rpx;
+			padding: 0 32rpx 0 30rpx;
+		}
+
+		.title_1 {
+			font-size: 28rpx;
+			font-weight: bold;
+			color: #000000;
+		}
+
+		.pla {
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #999999;
+			margin-right: 20rpx;
+		}
+
+		.val {
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #232323;
+			margin-right: 20rpx;
+		}
+	}
+
+	.add {
+		width: 678rpx;
+		height: 90rpx;
+		border-radius: 6rpx;
+		margin: 0 auto;
+		font-size: 32rpx;
+		font-weight: bold;
+		color: #FFFFFF;
+	}
+
+	.allow-add {
+		background: #A18353;
+	}
+
+	.not-add {
+		background-color: #bab994;
+	}
+
+	.line {
+		width: 618rpx;
+		height: 1rpx;
+		background-color: #EAEAEA;
+		margin: 0 auto;
+	}
+
+	.arrow-right {
+		width: 12.8rpx;
+		height: 22.8rpx;
+	}
+</style>

src/pages/index/binding/bindingSale.vue

@@ -0,0 +1,118 @@
+<template>
+	<view>
+		<image class="a" src="../../../static/image/index/addcustomerbg.png" mode=""></image>
+		<view class="main-left cross-center search">
+			<image src="https://t17.9026.com/web/statics/image/index/search.png" mode=""></image>
+			<input style="width: 560rpx;" type="text" value="" placeholder="搜索楼盘" placeholder-style="font-size:28rpx;color:#999;" />
+		</view>
+		
+		<view class="main">
+			<view class="main-between cross-center" style="height: 100rpx;">
+				<view class="title">世龙广场销售人员</view>
+				<view class="main-right cross-center"><text class="pla">更多</text><image class="arrow-right" src="../../../static/image/index/arrow-right-gray.png" mode=""></image></view>
+			</view>
+			<view class="main-between cross-center item" v-for="(item,index) in 4" :key="index" @click="selectSale(index)">
+				<view class="main-left">
+					<image style="width: 79rpx;height: 79rpx;border-radius: 50%;margin-right: 24rpx;" src="https://img2.baidu.com/it/u=304846655,1860504905&fm=26&fmt=auto" mode=""></image>
+					<view>
+						<view class="name">王晓晓</view>
+						<view class="phone">15888888888</view>
+					</view>
+				</view>
+				<image v-show="selectSaleIndex===index" style="width: 36rpx;height: 36rpx;" src="../../../static/image/index/select_sale.png" mode=""></image>
+			</view>
+		</view>
+		<button type="default" @click="" :class="{'add':true, 'allow-add':selectSaleIndex!==-1, 'not-add':selectSaleIndex===-1}" :disabled="fasle">确认绑定</button>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				selectSaleIndex:-1,
+			};
+		},
+		methods:{
+			selectSale(index){
+				this.selectSaleIndex=index
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.item{
+		width: 678rpx;
+		height: 130rpx;
+		background-image: url(../../../static/image/index/sale_bg.png);
+		padding: 0 37rpx 0 31rpx;
+		margin-bottom: 21rpx;
+		.name{
+			font-size: 32rpx;
+			font-weight: bold;
+			color: #222222;
+			margin-bottom: 13rpx;
+		}
+		.phone{
+			font-size: 24rpx;
+			font-weight: 500;
+			color: #D6994E;
+		}
+	}
+	.add{
+		width: 678rpx;
+		height: 90rpx;
+		border-radius: 6rpx;
+		margin: 0 auto;
+		font-size: 32rpx;
+		font-weight: bold;
+		color: #FFFFFF;
+		position: fixed;
+		bottom: 60rpx;
+		left: 50%;
+		transform: translateX(-50%);
+	}
+	.allow-add{
+		background: #A18353;
+	}
+	.not-add{
+		background-color: #bab994;
+	}
+	.a{
+		width: 750rpx;
+		height: 197rpx;
+	}
+	.search{
+		width: 680rpx;
+		height: 82rpx;
+		background: #FFFFFF;
+		border: 1rpx solid #EEEEEE;
+		border-radius: 4rpx;
+		margin: 0 auto;
+		padding-left: 22rpx;
+		image{
+			width: 22rpx;
+			height: 22rpx;
+			margin-right: 18rpx;
+		}
+	}
+	.main{
+		padding: 20rpx 42rpx 0 30rpx;
+	}
+	.title{
+		font-size: 34rpx;
+		font-weight: bold;
+		color: #222222;
+	}
+	.pla{
+		font-size: 28rpx;
+		font-weight: 500;
+		color: #999999;
+		margin-right: 20rpx;
+	}
+	.arrow-right{
+		width: 12.8rpx;
+		height: 22.8rpx;
+	}
+</style>

src/pages/index/index.vue

@@ -147,7 +147,8 @@
 		methods: {
 			navProperties(){
 				uni.navigateTo({
-					url:'/pages/sale/properties/addProperties'
+					url:'/pages/index/binding/binding'
+					// url:'/pages/sale/properties/addProperties'
 				})
 			},
 			async loadMall() {

src/pages/sale/components/app-my-income.vue

@@ -3,7 +3,7 @@
 		<view class="item" @click="goPage('/pages/share/order/order')">
 			<view class="title">订单总额(万)</view>
 			<view class="main-between cross-center">
-				<view class="num">76</view>
+				<view class="num">{{userInfo.salesperson_info.order_total_amount}}</view>
 				<image style="width: 12rpx;height: 21rpx;" src="https://t17.9026.com/web/statics/image/index/arrow-right-gray.png"
 					mode=""></image>
 			</view>
@@ -12,7 +12,7 @@
 		<view class="item">
 			<view class="title">我的提成(万)</view>
 			<view class="main-between cross-center">
-				<view class="num">655.00</view>
+				<view class="num">{{userInfo.salesperson_info.order_total_commission}}</view>
 				<image style="width: 12rpx;height: 21rpx;" src="https://t17.9026.com/web/statics/image/index/arrow-right-gray.png"
 					mode=""></image>
 			</view>
@@ -21,7 +21,16 @@
 </template>
 
 <script>
+	import {
+		mapState,
+		mapGetters
+	} from 'vuex';
 	export default{
+		computed:{
+			...mapGetters({
+				userInfo: 'user/info',
+			}),
+		},
 		methods:{
 			goPage(url){
 				uni.navigateTo({

src/pages/sale/cusmter/addCustomer.vue

@@ -7,17 +7,17 @@
 			<image class="bg" src="https://t17.9026.com/web/statics/image/index/addcustomerbg.png" mode=""></image>
 			<view class="customerInfo">
 				<view class="top">基本信息</view>
-				<view class="head">
-					<image class="bg" src="https://t17.9026.com/web/statics/image/index/headbg.png" mode=""></image>
+				<view class="head" @click="uploadHead">
+					<image class="bg" :src="avatar===''?'https://t17.9026.com/web/statics/image/index/headbg.png':avatar" mode=""></image>
 					<image class="camera" src="https://t17.9026.com/web/statics/image/index/camera.png" mode=""></image>
 				</view>
 				<view class="main-left cross-center linp border_bottom">
 					<view class="field">姓名</view>
-					<input type="text" value="" placeholder="请输入姓名" />
+					<input type="text" v-model="name" placeholder="请输入姓名" placeholder-style="font-size:28rpx" />
 				</view>
 				<view class="main-left cross-center linp border_bottom">
 					<view class="field">手机号</view>
-					<input type="text" value="" placeholder="请输入手机号" />
+					<input type="text" v-model="mobile" placeholder="请输入手机号" placeholder-style="font-size:28rpx" />
 				</view>
 			</view>
 		</view>
@@ -25,21 +25,23 @@
 			<view class="main-left cross-center linp border_bottom">
 				<view class="field" style="font-weight: bold;">楼盘信息</view>
 			</view>
-			<view class="main-left cross-center linp border_bottom">
-				<view class="field">楼盘名称</view>
-				<input type="text" value="" placeholder="请选择楼盘名称" />
-			</view>
+			<picker mode="region" @change="bindPickerRegion">
 			<view class="main-left cross-center linp border_bottom">
 				<view class="field">区域信息</view>
-				<input type="text" value="" placeholder="请选择区域信息" />
+				<input type="text" v-model="region" placeholder="请选择区域" placeholder-style="font-size:28rpx" />
+			</view>
+			</picker>
+			<view class="main-left cross-center linp border_bottom" @click="selectEstate">
+				<view class="field">楼盘名称</view>
+				<input type="text" value="" placeholder="请选择楼盘" placeholder-style="font-size:28rpx"/>
 			</view>
 			<view class="main-left cross-center linp border_bottom">
 				<view class="field">楼盘性质</view>
-				<input type="text" value="" placeholder="请选择楼盘性质" />
+				<input type="text" value="" placeholder="请选择楼盘性质" placeholder-style="font-size:28rpx"/>
 			</view>
 			<view class="main-left cross-center linp border_bottom">
 				<view class="field">楼盘户号</view>
-				<input type="text" value="" placeholder="请输入楼盘户号" />
+				<input type="text" value="" placeholder="请输入楼盘户号" placeholder-style="font-size:28rpx"/>
 			</view>
 			<button type="default" class="complete">完成</button>
 		</view>
@@ -49,11 +51,61 @@
 </template>
 
 <script>
+	import uploadFile from '@/core/upload.js';
 	export default {
 		data() {
 			return {
+				avatar:'',
+				name:'',
+				mobile:'',
+				
+				estateInfoList:[
+					{
+						estate_id:'',
+						estate_no:'',
+						room_no:'',
+					}
+				],
 				
+				region:'',
 			};
+		},
+		onShow() {
+			var pages = getCurrentPages();
+			var currPage = pages[pages.length - 1]; //当前页面
+			console.log(currPage.$vm.estateInfo)
+		},
+		methods:{
+			bindPickerRegion(e) {
+				this.region = e.target.value.join('')
+			},
+			uploadHead(){
+				uni.chooseImage({
+				    count: 1, 
+				    sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+				    sourceType: ['album','camera'], //从相册选择
+				    success:  (res)=> {
+						console.log(res);
+				        console.log(JSON.stringify(res.tempFilePaths));
+						uploadFile({
+						    url: this.$api.upload.file,
+						    filePath: res.tempFilePaths[0],
+						    fileType: 'image',
+						    fileName: ''
+						}).then(res1 => {
+							console.log(JSON.parse(res1.data))
+						    if(JSON.parse(res1.data).code===0){
+								this.avatar=JSON.parse(res1.data).data.url
+							}
+						})
+				    }
+				});
+			},
+			selectEstate(){
+				uni.navigateTo({
+					url:'/pages/sale/properties/addProperties?type=addCustomer'
+				})
+			}
 		}
 	}
 </script>
@@ -85,6 +137,7 @@
 		background: #FEFEFE;
 		border-radius: 10rpx;
 		margin: 20rpx auto 39rpx;
+		padding-bottom: 20rpx;
 	}
 	.linp{
 		height: 104rpx;
@@ -150,6 +203,7 @@ border-bottom: 1px solid #EAEAEA;
 				.bg{
 					width: 127rpx;
 					height: 127rpx;
+					border-radius: 50%;
 				}
 				.camera{
 					width: 41rpx;

src/pages/sale/cusmter/list.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="page">
 		<view class="search main-left cross-center">
 			<image style="margin-right: 15rpx;" src="https://t17.9026.com/web/statics/image/sale/search_icon.png" mode=""></image><input type="text" placeholder-class="search_plh_class" placeholder="客户名、楼盘名">
 		</view>
@@ -9,8 +9,8 @@
 					<view>
 						<image style="width: 94rpx;height: 94rpx;border-radius: 50%;margin-right: 26rpx;" src="https://t17.9026.com/web/statics/image/sale/1.png" mode=""></image>
 					</view>
-					<view class="main-between-y">
-						<view class="name">周先生<image style="width: 96rpx; height: 32rpx;" src="https://t17.9026.com/web/statics/image/index/ysm.png" mode=""></image></view>
+					<view class="main-between-y ">
+						<view class="name cross-center">周先生<image style="width: 96rpx; height: 32rpx;margin-left: 10rpx;" src="https://t17.9026.com/web/statics/image/index/ysm.png" mode=""></image></view>
 						<view class="addr">世龙广场 2号楼-2202</view>
 					</view>
 				</view>
@@ -30,6 +30,19 @@
 				
 			};
 		},
+		onLoad() {
+			this.$request({
+				url: this.$api.sale.customer_list,
+				data: {
+					page: 1,
+					keyword: '1',
+					is_verify: '',
+				},
+				method: 'post'
+			}).then(res=>{
+				console.log(res)
+			})
+		},
 		methods:{
 			navCusmterInfo(){
 				uni.navigateTo({
@@ -41,6 +54,10 @@
 </script>
 
 <style lang="scss" scoped>
+	.page{
+		min-height: 100vh;
+		background-color: #fff;
+	}
 	.search{
 		width: 678rpx;
 		height: 77rpx;

src/pages/sale/properties/addProperties.vue

@@ -2,80 +2,153 @@
 	<view>
 		<view class="main-left cross-center search">
 			<image src="https://t17.9026.com/web/statics/image/index/search.png" mode=""></image>
-			<input style="width: 560rpx;" type="text" value="" placeholder="搜索楼盘" placeholder-style="font-size:28rpx;color:#999;" />
+			<input style="width: 560rpx;" type="text" v-model="name" placeholder="搜索楼盘"
+				placeholder-style="font-size:28rpx;color:#999;" @input="search" />
 		</view>
 		<view class="properties_list">
-			<view class="item main-left" v-for="(item,index) in 14" @click="show=true">
+			<view class="item main-left" v-for="(item,index) in dataList" :key="index" @click="selectEstate(index,item.name,item.id)">
 				<view class="left">
-					<image src="https://t17.9026.com/web/statics/image/sale/1.png" mode=""></image>
+					<image :src="item.cover_img" mode=""></image>
 				</view>
 				<view class="main-between-y right ">
-					<view class="title">建业·凯旋广场</view>
-					<view class="addr">成都市武侯区天府一街5号</view>
-					<view class="content">洛阳建业·凯旋广场由建业（住宅）集团投资，洛阳建业凯旋置地有限公司开发...</view>
+					<view class="title">{{item.name}}</view>
+					<view class="addr">{{item.address}}</view>
+					<view class="content t-omit-two" v-html="item.details"></view>
 				</view>
-				<image class="bg" src="https://t17.9026.com/web/statics/image/sale/properties_gradual.png" mode=""></image>
+				<image class="bg" src="https://t17.9026.com/web/statics/image/sale/properties_gradual.png" mode="">
+				</image>
 			</view>
-			<!-- <view style="100rpx"></view>
-			<navigator url="/pages/sale/properties/addProperties" hover-class="navigator-hover">
-				<button class="addPro" type="default">添加楼盘</button>
-			</navigator> -->
-		
+			<app-no-goods v-if="dataList.length === 0" :title="'暂无数据'" background="#f7f7f7"></app-no-goods>
 		</view>
 		<u-popup v-model="show" mode="center" border-radius="14" @close="show = false">
 			<view class="model">
-				<viwe class="main-right"><image src="https://t17.9026.com/web/statics/image/index/close.png" mode="" style="width: 25rpx;height: 24rpx;" @click="show=false"></image></viwe>
-				<viwe class="title">建业·凯旋广场</viwe>
-				<viwe class="main-left cross-center addr"><image src="https://t17.9026.com/web/statics/image/index/location.png" mode="" style="width: 18rpx;height: 20rpx;margin-right: 8rpx;"></image>
-				成都市武侯区天府一街5号
+				<viwe class="main-right">
+					<image src="https://t17.9026.com/web/statics/image/index/close.png" mode=""
+						style="width: 25rpx;height: 24rpx;" @click="show=false"></image>
 				</viwe>
-				<viwe class="img"><image class="img" src="https://t17.9026.com/web/statics/image/index/11.png" mode=""></image></viwe>
-				<viwe class="desc t-omit-three">建业南湖壹号，建业集团第19年首部旅游度假社区，也将是河南省第一个真正意义上的度假地产项目。</viwe>
-				<button type="default" class="btn">确认选择</button>
+				<viwe class="title">{{dataList[selectIndex].name}}</viwe>
+				<viwe class="main-left cross-center addr">
+					<image src="https://t17.9026.com/web/statics/image/index/location.png" mode=""
+						style="width: 18rpx;height: 20rpx;margin-right: 8rpx;"></image>
+					{{dataList[selectIndex].address}}
+				</viwe>
+				<viwe class="img">
+					<image class="img" :src="dataList[selectIndex].cover_img" mode=""></image>
+				</viwe>
+				<viwe class="desc t-omit-three" v-html="dataList[selectIndex].details"></viwe>
+				<button type="default" class="btn" @click="bindingEstate">确认选择</button> 
 			</view>
 		</u-popup>
 	</view>
 </template>
 
 <script>
-	import uPopup from '../../../components/basic-component/u-popup/u-popup.vue';
+	import appNoGoods from '@/components/page-component/app-no-goods/app-no-goods.vue';
+	import uPopup from '@/components/basic-component/u-popup/u-popup.vue';
 	export default {
-		components:{
+		components: {
+			appNoGoods,
 			uPopup
 		},
 		data() {
 			return {
-				show:false
+				type:'',
+				show: false,
+				page:1,
+				name:'',
+				
+				dataList:[],
+				selectIndex:-1,
 			};
+		},
+		onLoad(option) {
+			this.type=option.type
+			this.getDate(1)
+		},
+		methods:{
+			selectEstate(index,name,id){
+				if(this.type==='addCustomer'){
+					var pages = getCurrentPages();
+					var currPage = pages[pages.length - 1]; //当前页面
+					var prevPage = pages[pages.length - 2]; //上一个页面
+					prevPage.$vm.estateInfo={id:id,name:name}
+					uni.navigateBack()
+					return
+				}
+				this.selectIndex=index
+				this.show=true
+			},
+			bindingEstate(){
+				this.$request({
+					url: this.$api.sale.binding_estate,
+					data: {
+						estate_id:this.dataList[this.selectIndex].id
+					},
+					method: 'post'
+				}).then(res=>{
+					uni.showToast({
+						icon:'none',
+						title:res.msg
+					})
+				})
+			},
+			search(e){
+				this.$utils.debounce(()=>{
+					this.getDate(1,this.name)
+				},800)
+			},
+			getDate(page){
+				this.$request({
+					url: this.$api.sale.estate_list,
+					data: {
+						page: page,
+						is_myself: 0,
+						name: this.name,
+					},
+					method: 'post'
+				}).then(res=>{
+					if(res.code===0){
+						this.dataList=res.data.list
+					}
+				})
+			}
+		},
+		onReachBottom() {
+			this.page++
+			this.getDate(this.page)
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.model{
+	.model {
 		width: 626rpx;
 		height: 839rpx;
 		background: #FFFFFF;
 		border-radius: 14rpx;
 		padding: 37rpx 49rpx;
-		.title{
+
+		.title {
 			font-size: 36rpx;
 			font-weight: bold;
 			color: #222222;
 		}
-		.addr{
+
+		.addr {
 			font-size: 22rpx;
 			font-weight: 500;
 			color: #999999;
 			margin-top: 20rpx;
 		}
-		.img{
+
+		.img {
 			width: 528rpx;
 			height: 311rpx;
 			border-radius: 14rpx;
 			margin-top: 28rpx;
 		}
-		.desc{
+
+		.desc {
 			font-size: 26rpx;
 			font-weight: 500;
 			color: #222222;
@@ -83,7 +156,8 @@
 			margin-top: 36rpx;
 			max-height: 100rpx;
 		}
-		.btn{
+
+		.btn {
 			width: 525rpx;
 			height: 85rpx;
 			background: #A18353;
@@ -94,11 +168,13 @@
 			color: #FFFFFF;
 		}
 	}
-	.page{
+
+	.page {
 		padding: 22rpx 0 0 0;
 		min-height: 100vh;
 	}
-	.search{
+
+	.search {
 		width: 680rpx;
 		height: 82rpx;
 		background: #FFFFFF;
@@ -106,12 +182,14 @@
 		border-radius: 4rpx;
 		margin: 0 auto;
 		padding-left: 22rpx;
-		image{
+
+		image {
 			width: 22rpx;
 			height: 22rpx;
 			margin-right: 18rpx;
 		}
 	}
+
 	.properties_list {
 		background-color: #F8F8F8;
 

src/pages/sale/properties/properties.vue

@@ -1,13 +1,13 @@
 <template>
 	<view class="properties_list">
-		<view class="item main-left" v-for="(item,index) in 4">
+		<view class="item main-left" v-for="(item,index) in dataList">
 			<view class="left">
-				<image src="https://t17.9026.com/web/statics/image/sale/1.png" mode=""></image>
+				<image :src="item.cover_img" mode=""></image>
 			</view>
 			<view class="main-between-y right ">
-				<view class="title">建业·凯旋广场</view>
-				<view class="addr">成都市武侯区天府一街5号</view>
-				<view class="content">洛阳建业·凯旋广场由建业（住宅）集团投资，洛阳建业凯旋置地有限公司开发...</view>
+				<view class="title">{{item.name}}</view>
+				<view class="addr">{{item.address}}</view>
+				<view class="content t-omit-two" v-html="item.details"></view>
 			</view>
 			<image class="bg" src="https://t17.9026.com/web/statics/image/sale/properties_gradual.png" mode=""></image>
 		</view>
@@ -15,7 +15,6 @@
 		<navigator url="/pages/sale/properties/addProperties" hover-class="navigator-hover">
 			<button class="addPro" type="default">添加楼盘</button>
 		</navigator>
-
 	</view>
 </template>
 
@@ -23,8 +22,28 @@
 	export default {
 		data() {
 			return {
-
+				dataList:[]
 			};
+		},
+		onLoad() {
+			this.getDate(1,'')
+		},
+		methods:{
+			getDate(page,name){
+				this.$request({
+					url: this.$api.sale.estate_list,
+					data: {
+						page: page,
+						is_myself: 1,
+						name: name,
+					},
+					method: 'post'
+				}).then(res=>{
+					if(res.code===0){
+						this.dataList=res.data.list
+					}
+				})
+			}
 		}
 	}
 </script>

src/pages/sale/sale-user-center.vue

@@ -1,11 +1,10 @@
 <template>
     <app-layout :haveBackground="false">
-		<image style="height: 396rpx;width: 100%;position: absolute;top: 0;left: 0;" src="https://t17.9026.com/web/statics/image/index/sale_top_bg.png" mode=""></image>
+		<image style="height: 396rpx;width: 100%;position: absolute;top: 0;left: 0;z-index: -1;" src="https://t17.9026.com/web/statics/image/index/sale_top_bg.png" mode=""></image>
 		<app-nav-bar v-if="true" :fixed="true" :title="mall.name" color="#000" :hasMallSetting="2"
 			background-color=""></app-nav-bar>
         <app-user-center-top
-            :top-style="4"
-            :top-pic-url="userCenter.top_pic_url"
+            :top-style="5"
             :member-pic-url="userCenter.member_pic_url"
             :is_icon_super_vip="is_icon_super_vip"
             user-name-color="#ffffff"
@@ -14,31 +13,10 @@
 		
 		<app-my-income></app-my-income>
 
-        <view class="app-my-service" v-if="userCenter.is_menu_status == 1">
+        <view class="app-my-service" v-if="userCenter.is_menu_status == 1 || true">
             <!-- <view class="title" v-if="userCenter.menu_title">{{userCenter.menu_title}}</view> -->
             <view class="list" :class="[listStyle]">
                 <!--  #ifdef MP -->
-               <!-- <view class="item" v-for="(item, index) in userCenter.menus" :key="index" >
-                    <app-jump-button form
-                                     :url="item.link_url"
-                                     :open_type="item.open_type"
-                                     :item="item"
-                                     :arrangement="'row'">
-                        <view style="width: 100%"
-                              class="item-container dir-left-nowrap cross-center"
-                              >
-                            <view class="box-grow-0">
-                                <image :src="item.icon_url" class="icon"></image>
-                            </view>
-                            <view class="box-grow-1" style="max-width: 100%">
-                                <view class="name">{{item.name}}</view>
-                            </view>
-                            <view class="box-grow-0" >
-                                <image src="https://shop.9026.com/web/statics/image/mall/static/icon/arrow-right.png" class="arrow"></image>
-                            </view>
-                        </view>
-                    </app-jump-button>
-                </view> -->
 				<view class="item" v-for="(item, index) in temporaryMenu" :key="index" >
 				    <app-jump-button form
 				                     :url="item.link_url"
@@ -63,7 +41,7 @@
 				</view>
                 <!--  #endif -->
                 <!--  #ifdef H5 -->
-                <block v-for="(item, index) in menus" :key="index">
+                <block v-for="(item, index) in temporaryMenu" :key="index">
                     <view class="item" v-if="item.open_type !== 'app'">
                         <app-jump-button form
                                          :url="item.link_url"

src/pages/sale/sale_login/sale_login.vue

@@ -32,19 +32,21 @@
 		},
 		methods:{
 			login(){
-				// this.$request({
-				//     url: this.$api.sale.sale_login,
-				//     data: {
-				//         account:this.account,
-				// 		password:this.password
-				//     },
-				//     method:'post'
-				// }).then(res=>{
-				// 	console.log(res)
-				// })
-				uni.redirectTo({
-					url:'/pages/sale/sale-user-center'
+				this.$request({
+				    url: this.$api.sale.sale_login,
+				    data: {
+				        account:this.account,
+						password:this.password
+				    },
+				    method:'post'
+				}).then(res=>{
+					if(res.code===0){
+						uni.redirectTo({
+							url:'/pages/sale/sale-user-center'
+						})
+					}
 				})
+				
 			}
 		}
 	}