diff --git a/pages/billing/addUser.vue b/pages/billing/addUser.vue
index d1f3291..50dc5a5 100644
--- a/pages/billing/addUser.vue
+++ b/pages/billing/addUser.vue
@@ -221,9 +221,9 @@
 								name:this.formData.consigneeName,
 								phone:this.formData.consigneeMobile,
 								address:this.formData.address,
-								province:this.formData.province,
-								city:this.formData.city,
-								area:this.formData.area,
+								province:this.addressObj.province,
+								city:this.addressObj.city,
+								area:this.addressObj.area,
 								userName:this.formData.consigneeMobile
 							}, false,true).then((res) => {
 								if (res.code == 200) {
@@ -248,6 +248,9 @@
 						
 					}else{
 						if(that.type=='edit'){
+							this.formData.city = this.addressObj.city
+							this.formData.area = this.addressObj.area
+							this.formData.province = this.addressObj.province
 							that.tui.request("/app/supplier/edit", "post", this.formData, false,
 								true).then((res) => {
 								if (res.code == 200) {
diff --git a/pages/index/addHangOrder.vue b/pages/index/addHangOrder.vue
index 7456381..2fb6883 100644
--- a/pages/index/addHangOrder.vue
+++ b/pages/index/addHangOrder.vue
@@ -32,7 +32,7 @@
 					</view>
 					<view class="shop-list" v-for="(items,index1) in item.saleDetailDTOList" :key="index1">
 						<view class="order-name">
-							<text style="float: left;">{{items.productName}} {{items.productSn}}</text>
+							<text style="float: left;">{{items.productName}}（{{items.productSn}}）单价：{{items.price}}</text>
 							<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/6b5ab32ff93a4c51b90e562e0b22e850.png" @tap.stop="largeImg(items.productPicture)" alt="">
 						</view>
 						<view class="specs-name" v-for="(itemss,index2) in items.stockLogList1" :key="index2">
diff --git a/pages/index/dataStatistics.vue b/pages/index/dataStatistics.vue
index 0a27944..d36851e 100644
--- a/pages/index/dataStatistics.vue
+++ b/pages/index/dataStatistics.vue
@@ -143,7 +143,13 @@
 	}
 	
 	.u-grid-item:nth-child(4) {
-		background: linear-gradient(#79FF79, #BBFFBB) !important;
+		background: linear-gradient(#1AFD9C, #7AFEC6) !important;
+	}
+	.u-grid-item:nth-child(5) {
+		background: linear-gradient(#FFBB77, #FFDCB9) !important;
+	}
+	.u-grid-item:nth-child(6) {
+		background: linear-gradient(#84C1FF, #C4E1FF) !important;
 	}
 	.u-count-num {
 		color: #FFF !important
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 896ab04..3b99606 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -443,7 +443,13 @@
 	}
 	
 	.u-grid-item:nth-child(4) {
-		background-image: linear-gradient(#79FF79, #BBFFBB) !important;
+		background-image: linear-gradient(#1AFD9C, #7AFEC6) !important;
+	}
+	.u-grid-item:nth-child(5) {
+		background-image: linear-gradient(#FFBB77, #FFDCB9) !important;
+	}
+	.u-grid-item:nth-child(6) {
+		background-image: linear-gradient(#84C1FF, #C4E1FF) !important;
 	}
 	
 	.u-count-num {
diff --git a/pages/index/order.vue b/pages/index/order.vue
index 2b0ca86..8e29c1b 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -2,7 +2,7 @@
 	<view>
 		<view class="search">
 			<uni-datetime-picker style="margin-bottom:10px;" v-model="range" @change="searchList" type="daterange" />
-			<u-search placeholder="输入收货人/货号/商品名称/供应商查询" v-model="keyword" @search="searchList" bg-color="#fff"
+			<u-search placeholder="输入客户名称搜索" v-model="searchStr" @search="searchList" bg-color="#fff"
 				:show-action="false" style="margin-top:10px;" border-color="#afd9ee"></u-search>
 		</view>
 		<view class="ulList" v-if="inventoryList.length > 0">
@@ -33,13 +33,14 @@
 	export default {
 		data() {
 			return {
-				keyword: '',
+				searchStr: '',
 				type: '',
 				inventoryList: [],
 				status: 'loadmore',
 				page: 1,
 				totalPages: 0,
-				// type:'',
+				// type:'',
+				range:[]
 			};
 		},
 		onLoad(options) {
@@ -48,7 +49,8 @@
 			
 		},
 		onShow(){
-				this.getOrderInfoList()
+			// this.getMonth();
+			this.getOrderInfoList()
 		},
 		onReachBottom() {
 			if (this.page >= this.totalPages) return;
@@ -75,6 +77,9 @@
 						pageSize: 10,
 						pageNumber: this.page
 					},
+					startTime:this.range[0],
+					endTime:this.range[1],
+					searchStr:this.searchStr,
 					status:this.listStatus
 				}, false, false).then((res) => {
 					this.status = 'nomore';
@@ -115,6 +120,21 @@
 				uni.switchTab({
 					url: '/pages/inventory/goodsList1'
 				})
+			},
+			//获取当月1日到当前时间
+			getMonth() {
+				//获取新的时间
+				let date = new Date()
+				//获取当前时间的年份转为字符串
+				let year = date.getFullYear().toString()   //'年'
+				//获取月份，由于月份从0开始，此处要加1，判断是否小于10，如果是在字符串前面拼接'0'
+				let month = date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1).toString():(date.getMonth()+1).toString()  //'月'
+				//获取天，判断是否小于10，如果是在字符串前面拼接'0'
+				let da = date.getDate() < 10 ? '0'+date.getDate().toString():date.getDate().toString()  //'日'
+				//字符串拼接，开始时间，结束时间
+				let end = year + '-' + month + '-' + da  //当天
+				let beg = year + '-' + month + '-01'    //当月第一天
+				this.range = [beg,end]
 			}
 		}
 	}
diff --git a/pages/inventory/inventory.vue b/pages/inventory/inventory.vue
index 587cefd..eafc74e 100644
--- a/pages/inventory/inventory.vue
+++ b/pages/inventory/inventory.vue
@@ -64,8 +64,7 @@
 						<view class="up-down" v-if="item.delFlag ==0" @tap.stop="upDown('1',item)">上架</view>
 						<view class="box-right-price">
 							<view class="price-box" v-if='type==0'>
-								<text v-if="item.purchasePrice==null" style="color: red;">新商品</text>
-								<text v-else>{{item.purchasePrice}}</text>
+								<text style="color: red;">{{item.inStorageStatus==0?'待入库':item.purchasePrice==null?'新商品':item.purchasePrice}}</text>
 								<text>采购价</text>
 							</view>
 							<view class="price-box">
diff --git a/pages/login/login.vue b/pages/login/login.vue
index bc86760..45098dc 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -183,6 +183,7 @@
 					this.tui.request(loginUrl, "POST", data, true, true).then((res) => {
 						if (res.code == 200) {
 							uni.setStorageSync("hiver_token", res.result.accessToken)
+							uni.setStorageSync("wayValue", this.wayValue)
 							//多店铺的时候，在这里加上打开店铺选择弹窗
 							if(this.wayValue == 2){ //下游客户登录
 								setTimeout(() => {