diff --git a/App.vue b/App.vue
index 8ba286d..0a2329f 100644
--- a/App.vue
+++ b/App.vue
@@ -62,7 +62,7 @@
 			test: '',
 			// baseUrl: "http://192.168.3.32:80",
 			baseUrl: "http://192.168.1.106:80",
-			imgPrefix: "http://47.104.224.41:9000/etriphome/appresource/image/",//图片资源
+			imgPrefix: "http://47.104.224.41:9000/etriphome/appresource/image/", //图片资源
 		},
 		methods: {
 			...mapMutations(['setUniverifyErrorMsg', 'setUniverifyLogin']),
@@ -74,9 +74,11 @@
 					success: (res) => {
 						// console.log(res)
 						if (res.data.code == 200) {
-							uni.setStorageSync('userInfo', JSON.stringify(res.data.data));
-							uni.setStorageSync('phone', res.data.data.phone);
-							this.doLogin(res.data.data.username, res.data.data.phone);
+							if (JSON.stringify(res.data.data) != '{}') {
+								uni.setStorageSync('userInfo', JSON.stringify(res.data.data));
+								uni.setStorageSync('phone', res.data.data.phone);
+								this.doLogin(res.data.data.username, res.data.data.phone);
+							}
 						} else {
 							uni.showToast({
 								title: res.data.msg,
diff --git a/pages/pages_zhentou/homePage/homePage.vue b/pages/pages_zhentou/homePage/homePage.vue
index 69451ed..b866a50 100644
--- a/pages/pages_zhentou/homePage/homePage.vue
+++ b/pages/pages_zhentou/homePage/homePage.vue
@@ -15,7 +15,8 @@
 		<view class="bottom_box">
 			<!-- <button class="btn" @click="addForm">填写报名单（其他渠道已购买）</button> -->
 			<button class="btn" v-if="!hasUserInfo &&canIUseGetUserProfile" @click="getUserProfile">立即定制</button>
-			<button v-else-if="!hasPhone" class="btn" @getphonenumber="getphonenumber">立即定制</button>
+			<button v-else-if="!hasPhone" open-type="getPhoneNumber" class="btn"
+				@getphonenumber="getPhoneNumber">立即定制</button>
 			<button v-else class="btn" @click="clickCustom">立即定制</button>
 		</view>
 	</view>
@@ -83,9 +84,26 @@
 					},
 					success: (res) => {
 						if (res.data.code == 200) {
-							console.log('下单成功')
+							console.log('下单成功');
+							uni.navigateTo({
+								url: '/pages/pages_zhentou/order/order'
+							})
 						} else if (res.data.code == 401) {
 							this.doLogin();
+						} else if (res.data.code == 1001) {
+							uni.showModal({
+								title: '提示',
+								content: res.data.msg,
+								success: (res2) => {
+									if (res2.confirm) {
+										uni.navigateTo({
+											url: '/pages/pages_zhentou/order/order'
+										})
+									} else if (res.cancel) {
+										console.log('用户点击取消');
+									}
+								}
+							});
 						} else {
 							uni.showToast({
 								title: res.data.msg,
@@ -120,7 +138,10 @@
 						console.log(res)
 						this.userInfo = res.userInfo;
 						this.hasUserInfo = true;
-						// uni.setStorageSync('userInfo', JSON.stringify(res.userInfo));
+						if (this.phone) {
+							//如果手机号存在直接调取保存
+							this.doSave();
+						}
 					},
 					fail: (err) => {
 						console.log(err)
@@ -129,7 +150,7 @@
 			},
 			//获取手机号
 			getPhoneNumber(e) {
-				console.log(e)
+				console.log(e, '获取手机号授权')
 				uni.request({
 					url: getApp().globalData.baseUrl + '/app/phone', //仅为示例，并非真实接口地址。
 					method: 'POST',
@@ -148,6 +169,17 @@
 								icon: 'none'
 							})
 						}
+					},
+					fail: function(res) {
+						// 获取手机号码失败
+						if (res.errMsg == 'getPhoneNumber:fail user deny') {
+							// 用户取消授权
+							uni.showToast({
+								title: '您未授权获取手机号码',
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					}
 				})
 			},
@@ -165,6 +197,8 @@
 					success: (res) => {
 						if (res.data.code == 200) {
 							uni.setStorageSync('userInfo', JSON.stringify(res.data.data));
+							//登录
+							this.doLogin();
 						} else {
 							uni.showToast({
 								title: res.data.msg,
diff --git a/pages/pages_zhentou/order/order.vue b/pages/pages_zhentou/order/order.vue
index e73b9f1..167e16f 100644
--- a/pages/pages_zhentou/order/order.vue
+++ b/pages/pages_zhentou/order/order.vue
@@ -11,11 +11,11 @@
 			<view class="order_item" @click="handleCheck(item)">
 				<view class="top_title">
 					<p class="title">壹人壹枕</p>
-					<p class="status_txt" v-if="item.status == 2" style="color: #D73232;">待付款</p>
-					<p class="status_txt" v-if="item.status == 3" style="color: #3E97F1;">待发货</p>
-					<p class="status_txt" v-if="item.status == 4" style="color: #D73232;">待收货</p>
-					<p class="status_txt" v-if="item.status == 5" style="color: #A5A5A5;">已完成</p>
-					<p class="status_txt" v-if="item.status == 6" style="color: #A5A5A5;">已取消</p>
+					<p class="status_txt" v-if="item.status == 1" style="color: #D73232;">待付款</p>
+					<p class="status_txt" v-if="item.status == 2" style="color: #3E97F1;">待发货</p>
+					<p class="status_txt" v-if="item.status == 3" style="color: #D73232;">待收货</p>
+					<p class="status_txt" v-if="item.status == 4" style="color: #A5A5A5;">已完成</p>
+					<p class="status_txt" v-if="item.status == 0" style="color: #A5A5A5;">已取消</p>
 				</view>
 				<view class="top_content">
 					<view class="left_cont">
@@ -32,7 +32,7 @@
 						</p>
 					</view>
 				</view>
-				<view class="sh_box" v-if="item.content != ''">
+				<view class="sh_box" v-if="item.status == 4">
 					<view class="img_box">
 						<image class="image" src="../../../static/image/address.png" mode=""></image>
 					</view>
@@ -48,11 +48,11 @@
 					<p class="mon_txt"><span style="font-size: 22rpx;">￥</span><span style="font-size: 34rpx;">699.0</span></p>
 				</view>
 				<view class="btn_box">
-					<p class="btn" v-if="item.status == 3 || item.status == 4 || item.status == 5">查看物流</p>
-					<p class="btn confirm" v-if="item.status == 4">确认收货</p>
-					<p class="btn" v-if="item.status == 2">取消订单</p>
-					<p class="btn confirm" v-if="item.status == 2">立即支付</p>
-					<p class="btn confirm info" v-if="item.status == 3">完善定制信息</p>
+					<p class="btn" v-if="item.status == 3 || item.status == 4">查看物流</p>
+					<p class="btn confirm" v-if="item.status == 3">确认收货</p>
+					<p class="btn" v-if="item.status == 1">取消订单</p>
+					<p class="btn confirm" v-if="item.status == 1">立即支付</p>
+					<p class="btn confirm info" v-if="item.status == 2">完善定制信息</p>
 					<p class="btn" v-if="item.status == 6">删除订单</p>
 					<p class="btn confirm" v-if="item.status == 6">再次定制</p>
 				</view>