修改bug

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

@@ -340,11 +340,14 @@ $app-bg-color: #FFFFFF;
             padding-left: #{26rpx};
 
             .icon-back {
-                background-image: url("https://shop.9026.com/web/statics/image/mall/static/icon/h5-back-2.png");
+                // background-image: url("https://shop.9026.com/web/statics/image/mall/static/icon/h5-back-2.png");
+				background-image: url("https://t17.9026.com/web/statics/image/index/back.png");
                 background-repeat: no-repeat;
                 background-size: 100% 100%;
-                height: #{27rpx};
-                width: #{16rpx};
+                // height: #{27rpx};
+                // width: #{16rpx};
+				height: #{33rpx};
+				width: #{33rpx};
                 display: block;
             }
         }

src/core/apiUrl.js

@@ -8,7 +8,8 @@ const apiUrl = {
 		customer_detail:'plugin/sale/api/customer/detail',
 		customer_save:'plugin/sale/api/customer/save',
 		
-		estate_list:'plugin/sale/api/estate/list'
+		estate_list:'plugin/sale/api/estate/list',
+		get_token:'plugin/sale/api/customer/get-token'
 	},
 	example:{
 		style_list:'plugin/example/api/index/style-list',

src/pages.json

@@ -152,7 +152,7 @@
 				}, {
 					"path": "cusmter/list",
 					"style": {
-						"navigationBarTitleText": "已认证客户",
+						"navigationBarTitleText": "我的客户",
 						"enablePullDownRefresh": false,
 						"navigationBarBackgroundColor": "#fff"
 					}

src/pages/cart/components/app-shop-product/app-shop-product.vue

@@ -40,7 +40,7 @@
                             <view>起批量 {{good.plugin_data.up_num}}{{good.goods.goodsWarehouse.unit}}</view>
                         </view>
                     </view>
-                    <text class="app-title" v-else :class="{'app-failed-title': good.new_status !== 0 && !(good.new_status == 6 && good.sell_time > 0)}">
+                    <text class="app-title" v-else :class="{'app-failed-title': good.new_status !== 0 && !(good.new_status == 6 && good.sell_time > 0)}" @click="jump(good)">
                         {{good.goods.name}}
                     </text>
                     <view class="app-specification-style" v-if="good.sign !== 'wholesale'">

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

@@ -1,6 +1,8 @@
 <template>
 	<view>
-		<app-nav-bar v-if="true" :fixed="true" :title="'预约'" color="#000" background-color="#eae2dd"></app-nav-bar>
+		<!-- <image src="../../../static/image/index/appointment_top.png" mode=""></image> -->
+		<app-nav-bar v-if="true" :fixed="true" :xStyle="1" :hasMallSetting="2" :title="'预约'" color="#fff" :background-color="'#e2c47b'"></app-nav-bar>
+		<!-- <app-nav-bar v-if="true" :fixed="true" :background-color="''" :xStyle="1" :hasMallSetting="2" -->
 		<view class="main-between-y builInfo">
 			<view class="main-between cross-center" style="height: 72rpx;" @click="$jump({open_type:'navigate',url:'/pages/sale/properties/addProperties'})">
 				<view class="hjx-ts-30 hjx-tw-600 hjx-tc-222">楼盘名称</view>

src/pages/case/hot_sale_project.vue

@@ -56,14 +56,14 @@
 				CompositionList:[],
 			};
 		},
-		onLoad() {
-			this.getCompositionClass()
-			this.getCompositionList()
+		onLoad(option) {
+			this.getCompositionClass(option.cat_id)
+			this.getCompositionList(option.cat_id)
 		},
 		methods:{
 			selectTag(index){
 				this.activeIndex=index
-				this.getCompositionList(this.classList[index].cat_id)
+				this.getCompositionList(this.classList[index].id)
 			},
 			headHeight(e){
 				this.navbarHeight=e+'px'
@@ -73,7 +73,7 @@
 					url:'/pages/case/projectInfo?id='+id
 				})
 			},
-			getCompositionClass(){
+			getCompositionClass(cat_id){
 				this.$request({
 					url: this.$api.composition.cat_list,
 					method:'post'
@@ -82,6 +82,11 @@
 						this.classList=res.data
 						this.classList.splice(0,0,{id:'',name:'全部'})
 					}
+					for (let i = 0; i < this.classList.length; i++) {
+						if(this.classList[i].id==cat_id){
+							this.activeIndex=i
+						}
+					}
 				})
 			},
 			getCompositionList(cat_id=''){

src/pages/index/binding/binding.vue

@@ -70,7 +70,7 @@
 </template>
 
 <script>
-	import {mapMutations} from 'vuex'
+	import {mapActions} from 'vuex'
 	import AppNoData from '@/components/page-component/app-no-goods/app-no-goods.vue'
 	import AppAreaPicker from "@/components/page-component/app-area-picker/app-area-picker.vue"
 	export default {
@@ -92,7 +92,7 @@
 
 				natureList: ['住宅用房', '非住宅用房'],
 
-				dataList: []
+				dataList: [{}]
 			};
 		},
 		onShow() {
@@ -151,6 +151,7 @@
 				this.regionId={}
 			},
 			getDate(page, name) {
+				this.$showLoading()
 				this.$request({
 					url: this.$api.sale.estate_list,
 					data: {
@@ -162,9 +163,10 @@
 					if (res.code === 0) {
 						this.dataList = res.data.list
 					}
+					this.$hideLoading()
 				})
 			},
-			...mapMutations('user',{
+			...mapActions('user',{
 				'selectedProperties':'selectedProperties'
 			}),
 			selectMasterEstate(index,estate_id){

src/pages/index/hxj_index_component.vue

@@ -169,7 +169,7 @@
 						<view class="text">decoration荟享自营</view>
 						<view class="text">心至所向·渐入家境</view>
 					</view>
-					<view class="category">2930人已收藏</view>
+					<!-- <view class="category">2930人已收藏</view> -->
 				</view>
 			</view>
 			<view class="dir-left-wrap bottom">

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

@@ -19,7 +19,7 @@
                 <view v-else class="main-center dir-top-nowrap list">
                     <view v-for="(item,index) in list"
                           :key="index"
-                          @click="setData(item.id)">
+                          @click="setData(item.id,item.address)">
                         <app-shipping-address @handleAddress="address"
                                               :item="item"
                                               :theme="getTheme"
@@ -192,13 +192,20 @@
                     uni.hideLoading();
                 });
             },
-            setData(data) {
+            setData(data,address) {
                 if (this.sign === 'gift') {
                     let formData = this.$store.state.gift.address_id;
                     formData = data;
-
                     this.$store.commit('gift/addressId', formData);
-                } else {
+                }else if(this.sign === 'invoice'){//选择发票地址
+					let invoice_info={}
+					if(this.$storage.getStorageSync('invoice_info')){
+						invoice_info=this.$storage.getStorageSync('invoice_info')
+					}
+					invoice_info.user_address_id=data
+					invoice_info.delivery_address=address
+					this.$storage.setStorageSync('invoice_info', invoice_info);
+				} else {
                     const formData = this.$store.state.orderSubmit.formData;
                     if (this.type === 1) {
                         formData.list[0].address_id = data;

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

@@ -1,12 +1,13 @@
 <template>
 	<view>
 		<view class="form-box">
-			<picker mode="region" @change="bindPickerRegion">
+			<picker mode="selector" @change="bindPickerBillType" :range="billType">
 				<view class="main-between cross-center item">
 					<view class="title_1">票据类型<text>*</text></view>
 					<view class="main-right cross-center">
-						<text :class="{'val':region!=='请选择','pla':region==='请选择'}">{{region}}</text>
-						<image class="arrow-right" src="https://t17.9026.com/web/statics/image/index/arrow-right-gray.png" mode="">
+						<text :class="{'val':invoice_info.bill_type!=='','pla':invoice_info.bill_type===''}">{{invoice_info.bill_type!==''?invoice_info.bill_type:'请选择'}}</text>
+						<image class="arrow-right"
+							src="https://t17.9026.com/web/statics/image/index/arrow-right-gray.png" mode="">
 						</image>
 					</view>
 				</view>
@@ -14,12 +15,13 @@
 		</view>
 		<view class="form-box">
 			<!-- <view class="title">楼盘信息</view> -->
-			<picker mode="region" @change="bindPickerRegion">
+			<picker mode="selector" @change="bindPickerHeaderType" :range="headerType">
 				<view class="main-between cross-center item">
 					<view class="title_1">抬头类型<text>*</text></view>
 					<view class="main-right cross-center">
-						<text :class="{'val':region!=='请选择','pla':region==='请选择'}">{{region}}</text>
-						<image class="arrow-right" src="https://t17.9026.com/web/statics/image/index/arrow-right-gray.png" mode="">
+						<text :class="{'val':invoice_info.header_type!=='','pla':invoice_info.header_type===''}">{{invoice_info.header_type!==''?invoice_info.header_type:'请选择'}}</text>
+						<image class="arrow-right"
+							src="https://t17.9026.com/web/statics/image/index/arrow-right-gray.png" mode="">
 						</image>
 					</view>
 				</view>
@@ -28,7 +30,7 @@
 			<view class="main-between cross-center item">
 				<view class="title_1">发票抬头<text>*</text></view>
 				<view class="main-right cross-center">
-					<input type="text" value="" placeholder="企业名称" style="text-align: right;"
+					<input type="text" v-model="invoice_info.header_name" placeholder="企业名称" style="text-align: right;font-size: 28rpx;"
 						placeholder-style="font-size: 28rpx;font-weight: 500;color: #999999;" />
 				</view>
 			</view>
@@ -36,7 +38,7 @@
 			<view class="main-between cross-center item">
 				<view class="title_1">税号</view>
 				<view class="main-right cross-center">
-					<input type="text" value="" placeholder="抬头为企业单位时填写" style="text-align: right;"
+					<input type="text" v-model="invoice_info.duty_number" placeholder="抬头为企业单位时填写" style="text-align: right;font-size: 28rpx;"
 						placeholder-style="font-size: 28rpx;font-weight: 500;color: #999999;" />
 				</view>
 			</view>
@@ -44,17 +46,17 @@
 			<view class="main-between cross-center item">
 				<view class="title_1">单位地址</view>
 				<view class="main-right cross-center">
-					<input type="text" value="" placeholder="请输入" style="text-align: right;"
+					<input type="text" v-model="invoice_info.company_address" placeholder="请输入" style="text-align: right;font-size: 28rpx;"
 						placeholder-style="font-size: 28rpx;font-weight: 500;color: #999999;" />
 				</view>
 			</view>
-			
+
 		</view>
 		<view class="form-box">
 			<view class="main-between cross-center item">
 				<view class="title_1">电话号码</view>
 				<view class="main-right cross-center">
-					<input type="text" value="" placeholder="请输入" style="text-align: right;"
+					<input type="text" v-model="invoice_info.phone" placeholder="请输入" style="text-align: right;font-size: 28rpx;"
 						placeholder-style="font-size: 28rpx;font-weight: 500;color: #999999;" />
 				</view>
 			</view>
@@ -62,7 +64,7 @@
 			<view class="main-between cross-center item">
 				<view class="title_1">开户银行</view>
 				<view class="main-right cross-center">
-					<input type="text" value="" placeholder="请输入" style="text-align: right;"
+					<input type="text" v-model="invoice_info.bank_name" placeholder="请输入" style="text-align: right;font-size: 28rpx;"
 						placeholder-style="font-size: 28rpx;font-weight: 500;color: #999999;" />
 				</view>
 			</view>
@@ -70,7 +72,7 @@
 			<view class="main-between cross-center item">
 				<view class="title_1">银行账户</view>
 				<view class="main-right cross-center">
-					<input type="text" value="" placeholder="请输入" style="text-align: right;"
+					<input type="text" v-model="invoice_info.bank_account" placeholder="请输入" style="text-align: right;font-size: 28rpx;"
 						placeholder-style="font-size: 28rpx;font-weight: 500;color: #999999;" />
 				</view>
 			</view>
@@ -78,13 +80,13 @@
 			<view class="main-between cross-center item">
 				<view class="title_1">开票金额<text>*</text></view>
 				<view class="main-right cross-center">
-					<input type="text" value="" placeholder="请输入" style="text-align: right;"
+					<input type="digit" v-model="invoice_info.amount" placeholder="请输入" style="text-align: right;font-size: 28rpx;"
 						placeholder-style="font-size: 28rpx;font-weight: 500;color: #999999;" />
 				</view>
 			</view>
-			
+
 		</view>
-		<button type="default" :class="{'add':true, 'allow-add':true, 'not-add':false}" :disabled="fasle">提交</button>
+		<button type="default" :class="{'add':true, 'allow-add':isAllowSub, 'not-add':!isAllowSub}"  @click="submit">提交</button>
 	</view>
 </template>
 
@@ -92,28 +94,61 @@
 	export default {
 		data() {
 			return {
-				region: '请选择',
-				nature: '请选择',
+				billType:['发票(普通)'],
+				headerType:['个人/非企事业单位'],
 
-				natureList: ['住宅用房', '非住宅用房']
+				invoice_info: {
+					bill_type: "",
+					header_type: "",
+					header_name: "",
+					duty_number: "",
+					company_address: "",
+					phone: "",
+					bank_name: "",
+					bank_account: "",
+					amount: '',
+					delivery_address: "",
+					user_address_id: ''
+				},
+				isAllowSub:false
 			};
 		},
+		watch:{
+			invoice_info:{
+				handler:function(nVal,oVal){
+					if(nVal.bill_type && nVal.header_type && nVal.header_name &&nVal.amount){
+						this.isAllowSub=true
+					}else{
+						this.isAllowSub=false
+					}
+				},
+				deep:true
+			}
+		},
+		onLoad() {
+			let storageInvoiceInfo=this.$storage.getStorageSync('invoice_info')
+			if(storageInvoiceInfo){
+				this.invoice_info.delivery_address=storageInvoiceInfo.delivery_address
+				this.invoice_info.user_address_id=storageInvoiceInfo.user_address_id
+			}
+		},
 		methods: {
-			selectBuild() {
-				uni.navigateTo({
-					url: '/pages/sale/properties/addProperties'
-				})
-			},
-			selectSale() {
-				uni.navigateTo({
-					url: '/pages/index/binding/bindingSale'
-				})
+			submit(){
+				if(this.isAllowSub){
+					this.$storage.setStorageSync('invoice_info', this.invoice_info);
+					uni.navigateBack()
+				}else{
+					uni.showToast({
+						title:'请填写完整信息',
+						icon:'none'
+					})
+				}	
 			},
-			bindPickerRegion(e) {
-				this.region = e.target.value.join('')
+			bindPickerBillType(e) {
+				this.invoice_info.bill_type = this.billType[e.target.value]
 			},
-			bindPickerNature(e) {
-				this.nature = this.natureList[e.target.value]
+			bindPickerHeaderType(e) {
+				this.invoice_info.header_type = this.headerType[e.target.value]
 			}
 		}
 	}

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

@@ -4,7 +4,7 @@
 			<view class="main-between cross-center item">
 				<view class="title_1">姓名</view>
 				<view class="main-right cross-center">
-					<input type="text" value="" placeholder="请输入" style="text-align: right;"
+					<input type="text" v-model="name" placeholder="请输入" style="text-align: right;font-size: 28rpx;"
 						placeholder-style="font-size: 28rpx;font-weight: 500;color: #999999;" />
 				</view>
 			</view>
@@ -12,7 +12,7 @@
 			<view class="main-between cross-center item">
 				<view class="title_1">电话</view>
 				<view class="main-right cross-center">
-					<input type="text" value="" placeholder="请输入" style="text-align: right;"
+					<input type="text" v-model="phone" placeholder="请输入" style="text-align: right;font-size: 28rpx;"
 						placeholder-style="font-size: 28rpx;font-weight: 500;color: #999999;" />
 				</view>
 			</view>
@@ -20,12 +20,12 @@
 			<view class="main-between cross-center item">
 				<view class="title_1">地址</view>
 				<view class="main-right cross-center">
-					<input type="text" value="" placeholder="请输入" style="text-align: right;"
+					<input type="text" v-model="addr" placeholder="请输入" style="text-align: right;font-size: 28rpx;"
 						placeholder-style="font-size: 28rpx;font-weight: 500;color: #999999;" />
 				</view>
 			</view>
 		</view>
-		<button type="default" :class="{'add':true, 'allow-add':true, 'not-add':false}" :disabled="fasle">提交</button>
+		<button type="default" :class="{'add':true, 'allow-add':true, 'not-add':false}" @click="submit">提交</button>
 	</view>
 </template>
 
@@ -37,7 +37,9 @@
 			};
 		},
 		methods: {
-			
+			submit(){
+				
+			}
 		}
 	}
 </script>

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

@@ -3,9 +3,14 @@
 		<view class="safe-area-inset-bottom">
 			<!-- 地址、商户、配送、商品、优惠、费用信息 -->
 			<view class="page" v-if="previewData">
-				<view v-if="getIsEnterSales" @click="navCustomer" class="select-customer" >
-					请选择客户
-				</view>
+				<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"
@@ -339,7 +344,7 @@
 							</view>
 							<view v-show="isNeedInvoice"
 								style="font-size: 24rpx;font-weight: 500;color: #AE8445;line-height: 46rpx;text-align: right;padding: 0 32rpx;"
-								@click="navigateInvoiceAddr">填写收货地址</view>
+								@click="navigateInvoiceAddr">选择收货地址</view>
 
 						</template><!-- 申请发票end -->
 						<template>
@@ -503,13 +508,13 @@
 					<view @click="subscribe" class="submit-btn u-submit-bar-height box-grow-0 main-center cross-center"
 						:class="[ submitLock? ' lock' : '', themeBgClass]"
 						:style="{'background-color': !is_gift ? theme.background : ''}">
-						<view style="background-color: transparent;color:#ffffff; text-align: center;">去支付</view>
+						<view style="background-color: transparent;color:#ffffff; text-align: center;">{{getIsEnterSales?'去下单':'去支付'}}</view>
 					</view>
 				</template>
 				<template v-else>
 					<view class="submit-btn u-submit-bar-height box-grow-0 main-center cross-center disabled"
 						:class="[themeTextClass]" :style="{'color': !is_gift ? theme.color : ''}">
-						<view style="background-color: transparent;color: #ffffff; text-align: center;">去支付</view>
+						<view style="background-color: transparent;color: #ffffff; text-align: center;">{{getIsEnterSales?'去下单':'去支付'}}</view>
 					</view>
 				</template>
 			</view>
@@ -571,6 +576,9 @@
 				is_open: false,
 				mchList: '',
 				p_pay_id: '', //重新提交处理
+				
+				customerInfo:null,
+				
 			};
 		},
 		computed: {
@@ -654,6 +662,9 @@
 				document.getElementsByClassName('uni-page-head__title')[0].innerHTML = '确认订单';
 				// #endif
 			});
+			var pages = getCurrentPages();
+			var currPage = pages[pages.length - 1]; //当前页面
+			'customerInfo' in currPage.$vm ? this.customerInfo = currPage.$vm.customerInfo : ''
 		},
 		onUnload() {
 			if (this.getPayDataTimer) {
@@ -671,11 +682,29 @@
 					this.changeZitiAddress();
 				},
 			},
+			customerInfo(nVal,oVal){
+				this.$request({
+					url:this.$api.sale.get_token,
+					data:{
+						user_id:this.customerInfo.user_id
+					},
+					method:'post'
+				}).then(res=>{
+					if(res.code===0){
+						this.previewData.address={}
+					}else{
+						uni.showToast({
+							title:res.msg,
+							icon:'none'
+						})
+					}
+				})
+			}
 		},
 		methods: {
 			navCustomer(){
 				uni.navigateTo({
-					url:'/pages/sale/cusmter/list'
+					url:'/pages/sale/cusmter/list?why=select_customer'
 				})
 			},
 			getMall(e) {
@@ -886,7 +915,8 @@
 			},
 			navigateInvoiceAddr() {
 				uni.navigateTo({
-					url: '/pages/order-submit/invoice/invoiceAddr'
+					// url: '/pages/order-submit/invoice/invoiceAddr'
+					url:'/pages/order-submit/address-pick?sign=invoice'
 				})
 			},
 			navigateCoupon(mchIndex) {
@@ -1257,6 +1287,36 @@
 						this.bookStorage('save', this.$store.state.orderSubmit.formData.list[i].store_id);
 					}
 				}
+				if(this.isNeedInvoice){ //判断是否选择发票，并设置发票信息
+					let invoice_info=this.$storage.getStorageSync('invoice_info')
+					if(invoice_info){
+						if(!invoice_info.amount){
+							uni.showToast({
+								title:'请填写发票资料',
+								icon:'none'
+							})
+							return
+						}
+						if(!invoice_info.user_address_id){
+							uni.showToast({
+								title:'请选择发票收货地址',
+								icon:'none'
+							})
+							return
+						}
+					}else{
+						uni.showToast({
+							title:'请填写发票资料',
+							icon:'none'
+						})
+						return
+					}
+					
+					const formData = this.$store.state.orderSubmit.formData;
+					formData.invoice_info=invoice_info
+					this.$store.commit('orderSubmit/mutSetFormData', formData);
+				}
+				
 				if (this.submitLock) return;
 				this.submitLock = true;
 				this.$subscribe(this.previewData.template_message_list).then(res => {

src/pages/sale/cusmter/list.vue

@@ -7,7 +7,7 @@
 		</view>
 		<view class="list">
 			<view class="main-between cross-center item" v-for="(item,index) in dataList" :key="index"
-				@click="navCusmterInfo(item.id)">
+				@click="navCusmterInfo(item.id,item.name,item.mobile,item.user_id)">
 				<view class="main-left">
 					<view>
 						<image style="width: 94rpx;height: 94rpx;border-radius: 50%;margin-right: 26rpx;"
@@ -26,9 +26,11 @@
 				<image style="width: 13rpx;height: 21rpx;"
 					src="https://t17.9026.com/web/statics/image/sale/arrow_right.png" mode=""></image>
 			</view>
+			<view class="no-more" v-if="noMore">没有更多了...</view>
+			<view style="height: 200rpx;"></view>
 			<app-no-goods v-if="dataList.length === 0" :title="'暂无数据'" background="#f7f7f7"></app-no-goods>
 		</view>
-		<navigator url="/pages/sale/cusmter/addCustomer" hover-class="navigator-hover">
+		<navigator url="/pages/sale/cusmter/addCustomer" hover-class="navigator-hover" v-if="!why==='select_customer'">
 			<button class="addPro" type="default">添加客户</button>
 		</navigator>
 	</view>
@@ -46,14 +48,20 @@
 				searchVal:"",
 				dataList: [],
 				page:1,
+				
+				noMore:false,
+				why:'',
 			};
 		},
-		onLoad() {
+		onLoad(option) {
+			this.why=option.why
 			this.getData()
 		},
 		onReachBottom() {
-			this.page++
-			this.getData()
+			if(!this.noMore){
+				this.page++
+				this.getData()
+			}
 		},
 		methods: {
 			search(){
@@ -73,15 +81,29 @@
 					method: 'post'
 				}).then(res => {
 					if (res.code === 0) {
-						this.dataList = res.data.list
+						if(this.page===1){
+							this.dataList = res.data.list
+						}else{
+							this.dataList=this.dataList.concat(res.data.list)
+						}
+						if(res.data.list.length<20){
+							this.noMore=true
+						}
 					}
 					this.$hideLoading()
 				})
 			},
-			navCusmterInfo(id) {
-				uni.navigateTo({
-					url: `/pages/sale/cusmter/info?id=${id}`
-				})
+			navCusmterInfo(id,name,mobile,user_id) {
+				if(this.why==='select_customer'){
+					let pages = getCurrentPages();
+					let prevPage = pages[pages.length - 2]; //上一个页面
+					prevPage.$vm.customerInfo={user_id:user_id,name:name,mobile:mobile}
+					uni.navigateBack()
+				}else{
+					uni.navigateTo({
+						url: `/pages/sale/cusmter/info?id=${id}`
+					})
+				}
 			}
 		}
 	}
@@ -155,4 +177,11 @@
 		font-weight: bold;
 		color: #FFFFFF;
 	}
+	.no-more {
+		font-size: 24rpx;
+		font-weight: 500;
+		color: #666666;
+		margin-top: 37rpx;
+		text-align: center;
+	}
 </style>

src/pages/sale/mySaleOrder.vue

@@ -106,6 +106,7 @@
 				</view>
 			</view>
 			<view class="no-more">没有更多了...</view>
+			<app-no-goods :title="'暂无数据'" background="#f7f7f7"></app-no-goods>
 		</view>
 		<template>
 			<view class="safe-area-inset-bottom">
@@ -124,10 +125,12 @@
 	} from 'vuex'
 	import AppTabBar from '@/components/basic-component/app-tab-bar/app-tab-bar.vue';
 	import AppDropdownMenu from '@/components/fui-dropdown-menu/fui-dropdown-menu.vue';
+	import appNoGoods from '@/components/page-component/app-no-goods/app-no-goods.vue';
 	export default {
 		components: {
 			AppTabBar,
-			AppDropdownMenu
+			AppDropdownMenu,
+			appNoGoods,
 		},
 		data() {
 			return {

src/pages/sale/sale_login/sale_login.vue

@@ -17,7 +17,7 @@
 				<view class="b_line"></view>
 			</view>
 			<view class="forget" @click="forgetPwd">忘记密码</view>
-			<button class="submit" type="default" @tap="login">登录</button>
+			<button class="submit" type="default" @click="login">登录</button>
 		</view>
 	</view>
 </template>
@@ -44,6 +44,11 @@
 						uni.reLaunch({
 							url:'/pages/sale/sale-user-center'
 						})
+					}else{
+						uni.showToast({
+							title:res.msg,
+							icon:'none'
+						})
 					}
 				})
 				

src/plugins/pt/order/order.vue

@@ -6,6 +6,7 @@
 		    </view>
 	        <view class="order-list">
 		        <app-order-list :theme="getTheme" @click="deleteItem" :list="list"></app-order-list>
+				<AppNoData v-if="list.length===0" title="暂无订单"></AppNoData>
 	        </view>
 	    </view>
     </app-layout>
@@ -14,6 +15,7 @@
 <script>
 	import appNav from '../components/app-nav.vue';
 	import appOrderList from '../components/app-order-list.vue';
+	import AppNoData from '@/components/page-component/app-no-goods/app-no-goods.vue'
 	import {mapGetters} from "vuex";
 	
     export default {
@@ -85,6 +87,7 @@
 	    components: {
             'app-nav': appNav,
 		    'app-order-list': appOrderList,
+			AppNoData,
 	    }
     }
 </script>

src/store/modules/user.js

@@ -1,3 +1,4 @@
+import Vue from 'vue';
 import user from '../../core/user.js';
 
 const state = {
@@ -16,9 +17,7 @@ const state = {
 	},
 	isSign: false,
 
-	selectedProperties: {
-		name: '绑定楼盘'
-	},
+	selectedProperties: uni.getStorageSync('selectedProperties')?uni.getStorageSync('selectedProperties'):{name: '绑定楼盘'},
 
 	isEnterSales: false, //是否进入销售端
 };
@@ -171,6 +170,12 @@ const actions = {
 	},
 	showAttentionTwo(context, data) {
 		context.commit('showAttentionTwo', data);
+	},
+	selectedProperties(context, data){
+		context.commit('selectedProperties', data);
+		// Vue.prototype.$store.setStorageSync('selectedProperties',data)
+		
+		uni.setStorageSync('selectedProperties',data)
 	}
 };