销售端我的消息、UI调整、其他功能细节完善

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

@@ -757,7 +757,7 @@
 .u-btn {
     text-align: center;
     line-height: 70upx;
-    border-radius: 35upx;
+    // border-radius: 35upx;
     font-size: 26upx;
     width: calc(50% - 10upx);
 }
@@ -1005,7 +1005,7 @@
 	.u-btn {
 		text-align: center;
 		line-height: 70upx;
-		border-radius: 35upx;
+		
 		font-size: 26upx;
 		width: calc(50% - 10upx);
 	}

src/components/page-component/index/app-nav-bar.vue

@@ -14,7 +14,7 @@
                         <view v-if="showLeftIcon">
 							<template v-if="xStyle==5">
 								<view class="main-left cross-center hxj-area" @click="leftClick">
-									<view class="tt t-omit">{{selectedProperties.name}}</view><image src="https://t17.9026.com/web/statics/image/index/arrow-down.png" mode=""></image>
+									<view class="tt t-omit">{{selectedProperties.name?selectedProperties.name:'绑定楼盘'}}</view><image src="https://t17.9026.com/web/statics/image/index/arrow-down.png" mode=""></image>
 								</view>
 							</template>
 							<template v-else>

src/core/apiUrl.js

@@ -9,7 +9,10 @@ const apiUrl = {
 		customer_save:'plugin/sale/api/customer/save',
 		
 		estate_list:'plugin/sale/api/estate/list',
-		get_token:'plugin/sale/api/customer/get-token'
+		get_token:'plugin/sale/api/customer/get-token',
+		
+		message_list:'plugin/sale/api/message/list',
+		message_delete:'plugin/sale/api/message/delete'
 	},
 	example:{
 		style_list:'plugin/example/api/index/style-list',

src/pages.json

@@ -200,6 +200,14 @@
 						"enablePullDownRefresh": false
 					}
 
+				}, {
+					"path": "news/news",
+					"style": {
+						"navigationBarTitleText": "我的消息",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#fff"
+					}
+
 				}, {
 					"path": "salePersonInfo",
 					"style": {
@@ -496,13 +504,6 @@
 						"enablePullDownRefresh": false
 					}
 
-				}, {
-					"path": "news/news",
-					"style": {
-						"navigationBarTitleText": "我的消息",
-						"enablePullDownRefresh": false
-					}
-
 				}, {
 					"path": "about-mall/about-mall",
 					"style": {
@@ -601,7 +602,7 @@
 					"path": "order-submit",
 					"style": {
 						"navigationBarTitleText": "确认订单",
-						"navigationStyle": "default"
+						"navigationStyle": "custom"
 					}
 				},
 				{

src/pages/binding/app-phone-binding/app-phone-binding.vue

@@ -7,7 +7,7 @@
 				<text class="app-hone">{{phone}}</text>
 			</view>
 			<view class="app-button">
-				<app-button type="important" round background="#ff4544" height="88" width="700" fontSize="32" @click="clearPhone(false)">更换绑定</app-button>
+				<app-button type="important" round :background="getTheme.background_gradient_btn" height="88" width="700" fontSize="32" @click="clearPhone(false)">更换绑定</app-button>
 			</view>
 		</view>
 		<template v-else>
@@ -97,6 +97,9 @@
                 wxapp_img: state => state.mallConfig.__wxapp_img,
 				is_manual_mobile_auth: state => state.mallConfig.mall.setting.is_manual_mobile_auth
             }),
+			...mapGetters('mallConfig', {
+				getTheme: 'getTheme',
+			}),
         },
 	    created() {
             // #ifndef MP-ALIPAY

src/pages/case/appointment/appointment-list.vue

@@ -19,7 +19,7 @@
 				<view class="line"></view>
 				<view class="main-between cross-center addr">
 					<view class="t-omit" style="width: 400rpx;">活动地点：{{item.address}}</view>
-					<button class="appointment-now" size="mini" :style="{'background-color':getTheme.background,}">立即预约</button>
+					<button class="appointment-now" size="mini" :style="{'background-color':getTheme.background,}">去预约</button>
 				</view>
 			</view>
 			<appNoData v-if="VisitList.length===0" :title="'暂无预约'"></appNoData>
@@ -188,7 +188,7 @@
 				height: 1px;
 			}
 			.addr{
-				padding: 24rpx 28rpx 32rpx;
+				padding: 24rpx 22rpx 32rpx 28rpx;
 				font-size: 22rpx;
 				font-weight: 500;
 				color: #999999;

src/pages/case/hot_sale_project.vue

@@ -37,7 +37,8 @@
 					</view>
 				</view>
 			</view>
-			<appNoData v-if="CompositionList.length==0" :title="'该分类暂无套餐'"></appNoData>
+			<view class="no-more" v-if="noMore && CompositionList.length>0">没有更多了...</view>
+			<appNoData v-if="CompositionList.length==0" :background="'#f8f8f8'" :title="'该分类暂无套餐'"></appNoData>
 		</view>
 	</view>
 </template>
@@ -57,6 +58,7 @@
 				
 				classList:[],
 				CompositionList:[],
+				noMore:false,
 			};
 		},
 		onLoad(option) {
@@ -110,6 +112,13 @@
 </script>
 
 <style lang="scss" scoped>
+	.no-more {
+		font-size: 24rpx;
+		font-weight: 500;
+		color: #666666;
+		margin-top: 37rpx;
+		text-align: center;
+	}
 	.page{
 		position: relative;
 		min-height: 100vh;

src/pages/coupon/details/app-details.vue

@@ -30,13 +30,14 @@
                     <view class="scan-code">仅限礼品卡使用</view>
                 </view>
                 <view @click="toGoods" v-if="list.status == 1">
-                    <button style="background-color: #fff;color: #ff4544;border: 1rpx solid #ff4544"
+                    <button style="background-color: #fff;"
+					:style="{'color': getTheme.color,'border': `1rpx solid ${getTheme.color}`}"
                             :class="[`btn`]">
                         立即使用
                     </button>
                 </view>
                 <view @click="receive(list.id)" v-else-if="list.status == 0">
-                    <button style="color:#fff;border: 1rpx solid #ff4544;background: #ff4544;" :class="[`btn`]">立即领取
+                    <button style="color:#fff;" :style="{'color': getTheme.color,'border': `1rpx solid ${getTheme.color}`}" :class="[`btn`]">立即领取
                     </button>
                 </view>
                 <button class="btn used" v-else-if="list.status == 2">已使用</button>
@@ -116,7 +117,10 @@
         computed: {
             ...mapGetters({
                 userInfo: 'user/info',
-            })
+            }),
+			...mapGetters('mallConfig', {
+			    getTheme: 'getTheme',
+			}),
         },
         watch: {
             // #ifndef H5

src/pages/coupon/index/index.vue

@@ -22,13 +22,16 @@
 	                    <view style="font-size: 10px" v-if="item.discount_limit">优惠上限:￥{{item.discount_limit | reservedNum}}</view>
 	                </view>
 	                <view class="item-right">
-	                    <view class="item-name t-omit t-large t-large-color hjx-tc-222 hjx-tw-600">{{item.coupon.name}}</view>
+	                    <view class="item-name t-omit hjx-tc-222 hjx-tw-600">{{item.coupon.name}}</view>
 						<view v-if="item.coupon.appoint_type == 3">全场通用</view>
 						<view v-else-if="item.coupon.appoint_type == 4">仅限当面付活动使用</view>
 						<view v-else-if="item.coupon.appoint_type == 5">仅限礼品卡使用</view>
 						<view v-else>限品类</view>
-	                    <view class="t-small-color time-area hjx-tc-B19D60">{{item.start_time}} - {{item.end_time}}</view>
+	                    <view class="t-omit t-small-color time-area hjx-tc-B19D60">{{item.start_time.split(' ')[0]}} - {{item.end_time.split(' ')[0]}}</view>
 	                </view>
+					<view class="item-right-btn cross-center" v-if="activeTab == 1">
+						<view class="btn">去使用</view>
+					</view>
 	            </view>
 	        </view>
 	    </view>
@@ -186,7 +189,7 @@
     }
 
     .time-area {
-        padding:#{7rpx} 0;
+		font-size: 22rpx;
     }
 
 	.list {
@@ -195,10 +198,10 @@
 	}
 
 	.list-item {
-	    height: #{152rpx};
+	    height: #{181rpx};
 	    width: 100%;
 	    position: relative;
-	    margin-bottom: #{25rpx};
+	    margin-bottom: #{20rpx};
 	}
 
 	.list-item image {
@@ -227,21 +230,38 @@
 	.item-right {
 	    position: absolute;
 	    left: #{220rpx};
-	    top: #{15rpx};
-	    width: 65%;
-	    color: #6f6e6d;
-	    font-size: #{20rpx};
+	    top: #{30rpx};
+	    width: 45%;
+	    color: #666666;
+	    font-size: #{24rpx};
 	}
 
 	.item-name {
 	    font-size: #{32rpx};
-	    color: #353535;
 	}
 
 	.item-right view {
 	    margin-bottom: #{4rpx};
 	}
-
+	.item-right-btn{
+		position: absolute;
+		right: 0;
+		top: 0;
+		width: 20%;
+		height: 100%;
+		.btn{
+			width: 118rpx;
+			height: 52rpx;
+			border: 1rpx solid #B19D60;
+			border-radius: 26rpx;
+			font-size: 22rpx;
+			font-weight: 500;
+			color: #B19D60;
+			text-align: center;
+			line-height: 52rpx;
+			box-sizing: border-box;
+		}
+	}
 	.coupon-footer {
 	    position: fixed;
 	    bottom: 0;

src/pages/favorite/favorite.vue

@@ -10,7 +10,7 @@
 							class="u-tabs-item"
 							:style="{
 								fontWeight: index == getCurrent ? 'bold' : 'normal',
-								color: index == getCurrent ? getTheme.color : ''
+								color: index == getCurrent ? getTheme.color : '#838584'
 							}"
 							v-for="(item, index) in getTabs"
 							:key="index"
@@ -923,7 +923,7 @@ export default {
 }
 .f-status {
 	height: 78upx;
-	background-color: #ffffff;
+	background-color: #F8F8F8;
 	border-bottom: 1upx solid #e2e2e2;
 	padding: 0 24upx;
 	transition: 0.5s;
@@ -961,7 +961,7 @@ export default {
 	}
 	.f-def-set {
 		border: 1upx solid #f5f5f5;
-		background-color: #f5f5f5;
+		background-color: #ffffff;
 	}
 
 	.f-img {

src/pages/index/binding/binding.vue

@@ -7,7 +7,7 @@
 				</view>
 				<view class="main-between-y right ">
 					<view class="title">{{item.name}}</view>
-					<view class="addr">{{item.address}}</view>
+					<view class="addr"><image style="width: 18rpx;height: 20rpx;margin-right: 12rpx;" src="https://t17.9026.com/web/statics/image/index/location.png"></image>{{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="">
@@ -93,7 +93,7 @@
 
 				propertyList: ['住宅用房', '非住宅用房'],
 
-				dataList: [{}],
+				dataList: [],
 				
 				isSwitchMainBuilding:0
 			};

src/pages/index/hxj_index_component.vue

@@ -150,11 +150,13 @@
 						</view>
 						<view class="b_card main-between" >
 							<view class="main-left cross-center left">
-								<view class="i">02</view>
+								<view class="i">{{item.pintuanGoods.time_str.day}}</view>
 								<view class="q">:</view>
-								<view class="i">24</view>
+								<view class="i">{{item.pintuanGoods.time_str.hou}}</view>
 								<view class="q">:</view>
-								<view class="i">45</view>
+								<view class="i">{{item.pintuanGoods.time_str.min}}</view>
+								<view class="q">:</view>
+								<view class="i">{{item.pintuanGoods.time_str.sec}}</view>
 							</view>
 							<view class="right">
 								<view class="price"><text class="rmb">￥</text><text>{{item.pintuan_price}}</text><text
@@ -223,7 +225,7 @@
 			uAnnouncement
 		},
 		props: {
-			homePages: {
+			homePagesProps: {
 				type: Object,
 				default () {
 					return {
@@ -258,6 +260,13 @@
 			selectedProperties(){
 				this.getComposition()
 			},
+			homePagesProps:{
+				handler:function(nVal,oVal){
+					this.homePages=nVal;
+					this.countdown(nVal[9].data.list)
+				},
+				deep:true
+			}
 		},
 		data() {
 			return {
@@ -265,6 +274,7 @@
 				pageData: '',
 				swiperKey: 0, //轮播位置
 				bottom_goods_index:0, //底部商品分类索引
+				homePages:null,
 				list: [
 
 					{
@@ -325,6 +335,14 @@
 				// 	}, 
 				// ],
 				compositionList:[],//本期家点灵感
+				// 倒计时
+				// time_str: {
+				//     day: '00',
+				//     hou: '00',
+				//     min: '00',
+				//     sec: '00'
+				// },
+				down_time: 0,
 			}
 		},
 		created() {
@@ -425,7 +443,31 @@
 			},
 			ptChange(e){
 				this.ptCurrent=e.detail.current
-			}
+			},
+			countdown(list) {
+				for (let i = 0; i < list.length; i++) {
+					let item=list[i].pintuanGoods.end_time
+					let time = new Date(item.replace(/-/g, '/'));
+					let nowTime = new Date();
+					let equation = time.getTime() - nowTime.getTime();
+					let day = parseInt((equation / 3600000 / 24));
+					let hour = parseInt((equation / 1000 / 60 / 60) % 24);
+					let minute = parseInt((equation / 1000 / 60) % 60);
+					let second = parseInt((equation / 1000) % 60);
+					this.homePages[9].data.list[i].pintuanGoods.time_str = {
+					    day: day < 10 ? `0${day}` : day,
+					    hou: hour < 10 ? `0${hour}` : hour,
+					    min: minute < 10 ? `0${minute}` : minute,
+					    sec: second < 10 ? `0${second}` : second
+					}
+				}
+			    this.down_time = setTimeout(() => {
+			        this.countdown(list);
+			    }, 1000);
+			},
+		},
+		deactivated() {
+			clearTimeout(this.down_time)
 		}
 	}
 </script>

src/pages/index/index.vue

@@ -30,7 +30,7 @@
                           :is_storage="is_storage" :theme="getTheme" :page_id="page_id" :is_required="is_required"
                           :coupon_req="coupon_req"></app-diy-page> -->
 
-			<hxj-index :home-pages="homePages.navs[0].template.data[1].data.list[0].data"></hxj-index>
+			<hxj-index :homePagesProps="homePages.navs[0].template.data[1].data.list[0].data"></hxj-index>
 		</template>
 		<!-- <app-buy-prompt :isShowAttention="isShowAttention" v-if="config.is_purchase_frame === 1"></app-buy-prompt> -->
 		<app-attr :goods="attrGoods.goods" :attrGroupList="attrGoods.goods.attr_groups" :theme="getTheme"

src/pages/order-submit/order-submit.vue

@@ -1,20 +1,25 @@
 <template>
 	<app-layout>
 		<view class="safe-area-inset-bottom">
+			<!-- <image style="height: 396rpx;width: 100%;position: absolute;top: 0;left: 0;" src="../../static/image/index/appointment_top.png" mode=""></image> -->
 			<!-- 地址、商户、配送、商品、优惠、费用信息 -->
 			<view class="page" v-if="previewData">
-				<template v-if="getIsEnterSales">
-					<view v-if="!customerInfo" @click="navCustomer" class="select-customer" >
-						请选择客户
-					</view>
-					<view v-else @click="navCustomer" class="select-customer" >
-						客户：{{customerInfo.name}} 手机号：{{customerInfo.mobile}}
+				<view style="background-image: url(../../static/image/index/appointment_top.png);background-size: 100%;padding-bottom: 24rpx;">
+					<app-nav-bar :fixed="true" :background-color="''" :title="'确认订单'" :xStyle="1" :hasMallSetting="2"
+						:hasHeight="true"></app-nav-bar>
+					<template v-if="getIsEnterSales">
+						<view v-if="!customerInfo" @click="navCustomer" class="select-customer" >
+							请选择客户
+						</view>
+						<view v-else @click="navCustomer" class="select-customer" >
+							客户：{{customerInfo.name}} 手机号：{{customerInfo.mobile}}
+						</view>
+					</template>
+					<view v-if="!previewData.hasCity && previewData.show_address !== false && previewData.hasRecipient"
+						class="group">
+						<app-address-bar :address="previewData.address" :has-ziti="previewData.has_ziti"
+							:all-ziti="previewData.allZiti" @address-input="handleAddressInput"></app-address-bar>
 					</view>
-				</template>
-				<view v-if="!previewData.hasCity && previewData.show_address !== false && previewData.hasRecipient"
-					class="group">
-					<app-address-bar :address="previewData.address" :has-ziti="previewData.has_ziti"
-						:all-ziti="previewData.allZiti" @address-input="handleAddressInput"></app-address-bar>
 				</view>
 				<template v-for="(mch, mchIndex) in previewData.mch_list">
 					<!-- <view v-if="previewData.hasCity && mchIndex === 0" class="group xz">
@@ -303,12 +308,12 @@
 							<view class="line"></view>
 						</template>
 						<template>
-							<view class="dir-left-nowrap cross-center" style="height: 84rpx; padding: 0 32rpx;">
+							<!-- <view class="dir-left-nowrap cross-center" style="height: 84rpx; padding: 0 32rpx;">
 								<view class="box-grow-1">支付方式</view>
 								<view class="box-grow-0">
 									微信支付
 								</view>
-							</view>
+							</view> -->
 							<view class="dir-left-nowrap cross-center" style="height: 84rpx; padding: 0 32rpx;">
 								<view class="box-grow-1">配送方式</view>
 								<view class="box-grow-0">
@@ -539,6 +544,7 @@
 	import AppSubmitCheckbox from "./app-submit-checkbox";
 	import AppClose from '../../components/basic-component/app-close/app-close.vue';
 
+	import appNavBar from '@/components/page-component/index/app-nav-bar.vue';
 	export default {
 		name: 'order-submit',
 		components: {
@@ -548,7 +554,8 @@
 			AppCouponPick,
 			AppDiyForm,
 			appSubmitGoods,
-			AppClose
+			AppClose,
+			appNavBar
 		},
 		data() {
 			return {
@@ -1472,7 +1479,7 @@
 		background: #fff;
 		border-radius: #{16rpx};
 		overflow: hidden;
-		box-shadow: 0 0 #{5rpx} rgba(0, 0, 0, 0.025);
+		// box-shadow: 0 0 #{5rpx} rgba(0, 0, 0, 0.025);
 	}
 
 	.row {

src/pages/sale/cusmter/list.vue

@@ -28,9 +28,9 @@
 			</view>
 			<view class="no-more" v-if="noMore && dataList.length>0">没有更多了...</view>
 			<view style="height: 200rpx;"></view>
-			<app-no-goods v-if="dataList.length === 0" :title="'暂无数据'" background="#f7f7f7"></app-no-goods>
+			<app-no-goods v-if="dataList.length === 0" :title="'暂无数据'" background="#ffffff"></app-no-goods>
 		</view>
-		<navigator url="/pages/sale/cusmter/addCustomer" hover-class="navigator-hover" v-if="!why==='select_customer'">
+		<navigator url="/pages/sale/cusmter/addCustomer" hover-class="navigator-hover" v-if="why!='select_customer'">
 			<button class="addPro" type="default">添加客户</button>
 		</navigator>
 	</view>

src/pages/sale/mySaleOrder.vue

@@ -6,7 +6,7 @@
 		<view style="background-color: #fff;">
 			<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="搜索客户、商品、时间、订单号" v-model="keyword"
+				<input style="width: 560rpx;" type="text" value="" placeholder="搜索客户、商品、时间、订单号" v-model="keyword" @confirm="search"
 					placeholder-style="font-size:28rpx;color:#999;" />
 			</view>
 		</view>
@@ -88,7 +88,7 @@
 							<!-- <view class="kbtn">上传发票</view> -->
 							<view class="kbtn">再次购买</view>
 							
-							<view class="kbtn" @click="$jump({open_type:'navigate',url:'/pages/order/express-detail/express-detail'})">查看物流</view>
+							<view class="kbtn" v-if="item.status>1" @click="$jump({open_type:'navigate',url:'/pages/order/express-detail/express-detail'})">查看物流</view>
 						</view>
 					</template>
 					<!-- <template v-if="false">
@@ -128,7 +128,7 @@
 		},
 		data() {
 			return {
-				dataList:[{}],
+				dataList:[],
 				options: [
 					[
 						{
@@ -154,19 +154,20 @@
 					],
 					[{
 						text: '全部客户',
-						value: 1,
+						value: 0,
 						checked: true
 					}, {
 						text: '已认证',
 						value: 2
 					}, {
 						text: '未认证',
-						value: 3
+						value: 1
 					}]
 				],
 				range: '订单状态',
 				status:0,
 				range1: '全部客户',
+				user_verify_status:0,
 				selectIndex: 0,
 				rangeShow: false,
 				rangeShow1: false,
@@ -205,7 +206,8 @@
 						keyword: this.keyword,
 						dateArr: [],
 						page: this.page,
-						sale_id:this.info.salesperson_id
+						sale_id:this.info.salesperson_id,
+						user_verify_status:this.user_verify_status
 					},
 					method:'get'
 				}).then(res=>{
@@ -232,6 +234,7 @@
 			rangeItemClick(e) {
 				if(this.selectIndex){
 					this.range1 = e.text
+					this.user_verify_status=e.value
 				}else{
 					this.range = e.text
 					this.status=e.value
@@ -241,6 +244,11 @@
 			},
 			rangeClose() {
 				this.selectIndex ? this.rangeShow1 = false : this.rangeShow = false
+			},
+			
+			search(){
+				this.page=1
+				this.getDataList()
 			}
 		}
 	}
@@ -281,7 +289,7 @@
 		height: 82rpx;
 		// background: #FFFFFF;
 		border: 1rpx solid #EEEEEE;
-		border-radius: 4rpx;
+		border-radius: 82rpx;
 		margin: 0 auto;
 		padding-left: 22rpx;
 

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

@@ -1,16 +1,16 @@
 <template>
 	<view class="page">
-		<view class="box" v-for="(item,index) in 3" :key="index">
+		<view class="box" v-for="(item,index) in dataList" :key="index">
 			<view class="main-between cross-center header">
 				<!-- <view class="cross-center head t-omit" :class="{'border_bottom':true}">
 					<image src="https://t17.9026.com/web/statics/image/sale/1.png" mode=""></image>
 					周先生
 				</view> -->
 				<view class="cross-center head1">
-					<image src="https://t17.9026.com/web/statics/image/sale/1.png" mode=""></image>
+					<image src="../../../static/image/index/msg.png" mode=""></image>
 					客户楼盘绑定通知
 				</view>
-				<view class="main-between cross-center">
+				<view class="main-between cross-center" @click="del_msg(item.id,index)">
 					<!-- <view class="date">2021-11-17</view> -->
 					<image class="del" src="https://t17.9026.com/web/statics/image/user-center/del.png" mode=""></image>
 				</view>
@@ -23,7 +23,8 @@
 						<image src="https://t17.9026.com/web/statics/image/user-center/arrow-bottom.png" mode=""></image>
 					</view>
 				</view> -->
-				<view class="center-text">客户xxxx向您发起了楼盘xxxx的认证通知，请前往我的-我的客户查看并处理</view>
+				<view class="center-text">{{item.message}}</view>
+				<!-- 客户xxxx向您发起了楼盘xxxx的认证通知，请前往我的-我的客户查看并处理 -->
 				<!-- <view class="center-img">
 					<image v-for="(item, index) in 5" :key="index" src="https://t17.9026.com/web/statics/image/user-center/1.png" mode=""></image>
 				</view>
@@ -47,17 +48,77 @@
 			<view class="main-between footer cross-center border_top">
 				<view class="left">查看详情</view>
 				<image style="width: 12rpx;height: 22rpx;" src="https://t17.9026.com/web/statics/image/index/arrow-right-gray.png"
-					mode=""></image>
+					mode="" ></image>
 			</view>
 		</view>
-		<view class="no-more">没有更多了...</view>
+		<view class="no-more" v-if="noMore && dataList.length>0">没有更多了...</view>
 	</view>
 </template>
 
 <script>
 	export default {
 		data() {
-			return {};
+			return {
+				page:1,
+				dataList:[],
+				noMore:false
+			};
+		},
+		onLoad() {
+			this.getMessageList()
+		},
+		onReachBottom() {
+			if(!this.noMore){
+				this.page++
+				this.getMessageList()
+			}
+		},
+		methods:{
+			getMessageList(){
+				this.$request({
+					url:this.$api.sale.message_list,
+					data:{
+						page:this.page
+					},
+					method:'post'
+				}).then(res=>{
+					if(res.code===0){
+						if(this.page===1){
+							this.dataList=res.data.list
+						}else{
+							this.dataList=this.dataList(res.data.list)
+						}
+						if(res.data.list.length<20){
+							this.noMore=true
+						}
+					}
+					
+				})
+			},
+			del_msg(id,index){
+				uni.showModal({
+				    title: '提示',
+				    content: '确定删除该条消息吗',
+				    success:(qq)=> {
+				        if (qq.confirm) {
+				            this.$request({
+				            	url:this.$api.sale.message_delete,
+				            	data:{
+				            		message_id:id
+				            	},
+				            	method:'post'
+				            }).then(res=>{
+				            	if(res.code===0){
+									this.dataList.splice(index,1)
+								}
+				            })
+				        } else if (qq.cancel) {
+				            console.log('用户点击取消');
+				        }
+				    }
+				});
+				
+			}
 		}
 	};
 </script>

src/pages/sale/properties/addProperties.vue

@@ -13,7 +13,7 @@
 				</view>
 				<view class="main-between-y right ">
 					<view class="title">{{item.name}}</view>
-					<view class="addr">{{item.address}}</view>
+					<view class="addr"><image style="width: 18rpx;height: 20rpx;margin-right: 12rpx;" src="https://t17.9026.com/web/statics/image/index/location.png"></image>{{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="">

src/pages/sale/properties/properties.vue

@@ -10,14 +10,16 @@
 			</view>
 			<view class="main-between-y right ">
 				<view class="title">{{item.name}}</view>
-				<view class="addr">{{item.address}}</view>
+				<view class="addr"><image style="width: 18rpx;height: 20rpx;margin-right: 12rpx;" src="https://t17.9026.com/web/statics/image/index/location.png"></image>{{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>
 		<view style="100rpx"></view>
 		<navigator url="/pages/sale/properties/addProperties" hover-class="navigator-hover">
-			<button class="addPro" type="default">添加楼盘</button>
+			<button class="addPro" :class="[`coupon-footer`,iphone_x? `iphone_x`:``]" type="default">添加楼盘</button>
+			<!-- <view :class="[`footer-space`,iphone_x? `iphone_x`:``]"></view>
+			<view :class="[`coupon-footer`,iphone_x? `iphone_x`:``]" @click="toList">去领券</view> -->
 		</navigator>
 	</view>
 </template>
@@ -27,7 +29,8 @@
 		data() {
 			return {
 				audit_state:2,
-				dataList:[]
+				dataList:[],
+				iphone_x:false,
 			};
 		},
 		watch:{
@@ -39,7 +42,13 @@
 			this.getDate(1,'')
 		},
 		onLoad() {
-			
+			 uni.getSystemInfo({
+			     success: (res)=> {
+			         if(res.model.indexOf('iPhone X') > -1 || res.model.indexOf('iPhone 11') > -1 || res.model.indexOf('iPhone11') > -1 || res.model.indexOf('iPhone12') > -1 || res.model.indexOf('Unknown Device') > -1) {
+			             this.iphone_x = true;
+			         }
+			     }
+			 })
 		},
 		methods:{
 			getDate(page,name){
@@ -63,6 +72,31 @@
 </script>
 
 <style lang="scss" scoped>
+	.footer-space {
+	    height: #{100rpx};
+	}
+	
+	.footer-space.iphone_x {
+	    height: #{150rpx};
+	}
+	.coupon-footer {
+	    position: fixed;
+	    bottom: 0;
+	    left: 0;
+	    right: 0;
+	    width: 100%;
+	    height: #{100rpx};
+	    line-height: #{100rpx};
+	    text-align: center;
+	    background-color: #fff;
+	    z-index: 2;
+	}
+	
+	.coupon-footer.iphone_x {
+	    height: #{150rpx};
+	    padding-bottom: #{50rpx};
+	}
+	
 	.properties_list {
 		background-color: #F8F8F8;
 		

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

@@ -14,18 +14,19 @@
 			<view class="list" :class="[listStyle]">
 				<!--  #ifdef MP -->
 				<view class="item" v-for="(item, index) in temporaryMenu" :key="index">
-					<app-jump-button form :url="item.link_url" :open_type="item.open_type" :item="item"
+					<app-jump-button form :url="item.link_url" :open_type="item.open_type" :item="item" :number="userInfo.service_phone"
 						: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="box-grow-1 main-between" style="max-width: 100%">
 								<view class="name">{{item.name}}</view>
+								<view class="num" v-if="item.num">{{item.num===1?Number(userInfo.salesperson_info.already_verify_num) + Number(userInfo.salesperson_info.not_verify_num):userInfo.salesperson_info.estate_num}}</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>
+								<image src="https://t17.9026.com/web/statics/image/index/arrow-right-bgwrite.png"
+									class="arrow" ></image>
 								<!-- <image src="https://t17.9026.com/web/statics/image/index/arrow-right-bgwrite.png" class="arrow"></image> -->
 							</view>
 						</view>
@@ -46,11 +47,12 @@
 								</view>
 								<view class="box-grow-1" style="max-width: 100%">
 									<view class="name">{{item.name}}</view>
+									<view class="num" v-if="item.num">{{item.num===1?Number(userInfo.salesperson_info.already_verify_num) + Number(userInfo.salesperson_info.not_verify_num):userInfo.salesperson_info.estate_num}}</view>
 								</view>
 								<view class="box-grow-0" v-if="userCenter.menu_style=='1'">
 									<image
-										src="https://shop.9026.com/web/statics/image/mall/static/icon/arrow-right.png"
-										class="arrow"></image>
+										src="https://t17.9026.com/web/statics/image/index/arrow-right.png"
+										class="arrow" ></image>
 								</view>
 							</view>
 						</app-jump-button>
@@ -120,6 +122,7 @@
 						link_url: "/pages/sale/cusmter/list",
 						name: "我的客户",
 						open_type: "navigate",
+						num:1,
 					},
 					{
 						icon_url: "https://t17.9026.com/web/statics/image/index/lp.png",
@@ -127,11 +130,12 @@
 						link_url: "/pages/sale/properties/properties",
 						name: "我负责的楼盘",
 						open_type: "navigate",
+						num:2,
 					},
 					{
 						icon_url: "https://t17.9026.com/web/statics/image/index/xx.png",
 						key: "pintuan",
-						link_url: "/pages/user-center/news/news",
+						link_url: "/pages/sale/news/news",
 						name: "我的消息",
 						open_type: "navigate",
 					},
@@ -147,7 +151,7 @@
 						key: "pintuan",
 						link_url: "",
 						name: "联系客服",
-						open_type: "navigate",
+						open_type: "tel",
 					},
 					{
 						icon_url: "https://t17.9026.com/web/statics/image/sale/sale_home.png",
@@ -399,9 +403,9 @@
 	}
 
 	.app-my-service {
-		width: #{702rpx};
+		// width: #{702rpx};
 		border-radius: #{16rpx};
-		margin: #{24rpx} auto;
+		// margin: #{24rpx} auto;
 		box-shadow: 0 0 #{8rpx} rgba(0, 0, 0, .05);
 		background: #fff;
 
@@ -412,21 +416,25 @@
 		.list {
 			.item {
 				.icon {
-					width: #{50rpx};
-					height: #{50rpx};
+					width: #{36rpx};
+					height: #{36rpx};
 					display: block;
 				}
 
 				.arrow {
-					width: #{12rpx};
-					height: #{22rpx};
+					width: 42rpx;height: 42rpx;
+				}
+				.num{
+					font-size: 28rpx;
+					color: #999999;
+					margin-right: 32rpx;
 				}
 			}
 		}
 
 		.list.row {
 			.item-container {
-				padding: #{20rpx} #{32rpx};
+				padding: #{30rpx} #{39rpx};
 			}
 
 			.icon {

src/pages/sale/salePersonInfo.vue

@@ -59,6 +59,9 @@
 		font-size: 30rpx;
 		font-weight: 500;
 		color: #222222;
+		.title{
+			width: 200rpx;
+		}
 		.head{
 			width: 78rpx;
 			height: 78rpx;
@@ -73,7 +76,7 @@
 		.input{
 			text-align: right;
 			font-size: 30rpx;
-			font-weight: 500;
+			// font-weight: 500;
 			color: #999999;
 		}
 	}

src/pages/sale/sale_login/sale_login.vue

@@ -17,12 +17,13 @@
 				<view class="b_line"></view>
 			</view>
 			<view class="forget" @click="forgetPwd">忘记密码</view>
-			<button class="submit" type="default" @click="login">登录</button>
+			<button class="submit" :style="{background:getTheme.background_gradient_btn,}" type="default" @click="login">登录</button>
 		</view>
 	</app-layout>
 </template>
 
 <script>
+	import {mapGetters} from 'vuex'
 	export default {
 		data() {
 			return {
@@ -30,6 +31,11 @@
 				password:'',
 			};
 		},
+		computed:{
+			...mapGetters('mallConfig', {
+				getTheme: 'getTheme'
+			}),
+		},
 		methods:{
 			login(){
 				this.$request({

src/plugins/composition/detail/detail.vue

@@ -1,10 +1,10 @@
 <template>
 	<app-layout>
-		<app-bd-info @receive="receive" :info="list[0]" :coupons="goods_coupon_center" :total="total"></app-bd-info>
+		<app-bd-info v-if="list.length>0" @receive="receive" :info="list[0]" :coupons="goods_coupon_center" :total="total"></app-bd-info>
 		<!--商品优惠券-->
 		<bd-coupon @change="setCoupon" @on-show-change="val => {isCouponShow = val}" :isCustomEntry="true"
 			:myShow="isCouponShow" :theme="getTheme" :coupons="goods_coupon_center"></bd-coupon>
-		<view
+		<view v-show="list.length>0"
 			style="font-size: 34rpx;font-weight: bold;color: #222222;line-height: 46rpx;padding:30rpx 0 0 35rpx;background-color: #fff;">
 			套餐内商品</view>
 		<app-list v-if="loading" :hidden="false" :top="0" :theme="getTheme" :list="list" v-on:update="update"