diff --git a/pages/pages_zhentou/form/form.vue b/pages/pages_zhentou/form/form.vue
index 87acbff..e493702 100644
--- a/pages/pages_zhentou/form/form.vue
+++ b/pages/pages_zhentou/form/form.vue
@@ -2,15 +2,50 @@
 	<view class="container">
 		<page-meta :root-font-size="fontsize+'px'"></page-meta> <!--动态设置html字体大小-->
 		<view class="content_box">
+			<view class="top_box">
+				<view class="title_box">
+					当前报名单：<span style="color:#D73232">报名单{{currentNum}}</span>
+				</view>
+				<view class="turn_box">
+					<p class="turn_item prev" @click="handlePrev" v-if="currentNum > 1">上一页</p>
+					<p class="turn_item next" @click="handleNext" v-if="currentNum < orderNum">下一页</p>
+				</view>
+				<!-- <view class="form_item">
+					<view class="img_box" @click="handlePrev">
+						<image src="../../../static/image/form.png" mode=""></image>
+						<image src="../../../static/image/form_act.png" mode=""></image>
+					</view>
+					<view class="form_txt">
+						报名单{{currentNum}}
+					</view>
+				</view>
+				<view class="line_box"></view>
+				<view class="form_item">
+					<view class="img_box">
+						<image src="../../../static/image/form.png" mode=""></image>
+						<image src="../../../static/image/form_act.png" mode=""></image>
+					</view>
+					<view class="form_txt">
+						报名单{{currentNum}}
+					</view>
+				</view>
+				<view class="line_box"></view>
+				<view class="form_item">
+					<view class="img_box">
+						<image src="../../../static/image/form.png" mode=""></image>
+						<image src="../../../static/image/form_act.png" mode=""></image>
+					</view>
+					<view class="form_txt" @click="handleNext">
+						报名单{{currentNum}}
+					</view>
+				</view> -->
+			</view>
 			<view class="rele_content">
 				<view class="form_box">
 					<view class="top_header">
 						<img class="top_img" :src="imgPrefix + 'top.png'" alt="">
 					</view>
 					<view class="top_content">
-						<view class="num_box" v-if="orderNum > 1">
-							表单{{currentNum}}
-						</view>
 						<view class="title">
 							枕头定制信息表
 						</view>
@@ -28,10 +63,12 @@
 						<uni-forms ref="valiForm" :rules="rules" :model="valiFormData" labelWidth="180px"
 							label-position="top">
 							<uni-forms-item label="姓名" required name="username" :label-style="{'font-size':'40rpx'}">
-								<uni-easyinput :disabled="isDisabled" v-model="valiFormData.username" placeholder="请输入姓名" />
+								<uni-easyinput :disabled="isDisabled" v-model="valiFormData.username"
+									placeholder="请输入姓名" />
 							</uni-forms-item>
 							<uni-forms-item label="手机" required name="phone">
-								<uni-easyinput :disabled="isDisabled" v-model="valiFormData.phone" placeholder="请输入手机" />
+								<uni-easyinput :disabled="isDisabled" v-model="valiFormData.phone"
+									placeholder="请输入手机" />
 							</uni-forms-item>
 							<!-- <uni-forms-item label="地址" required name="address">
 								<uni-data-picker v-model="valiFormData.city" :localdata="aCityData" popup-title="选择城市">
@@ -53,25 +90,30 @@
 							</uni-forms-item> -->
 							<uni-forms-item label="身高" required name="height">
 								<p class="item_txt">单位：厘米cm</p>
-								<uni-easyinput :disabled="isDisabled" v-model="valiFormData.height" placeholder="请输入身高" />
+								<uni-easyinput :disabled="isDisabled" v-model="valiFormData.height"
+									placeholder="请输入身高" />
 							</uni-forms-item>
 							<uni-forms-item label="体重" required name="weight">
 								<p class="item_txt">单位：公斤kg</p>
-								<uni-easyinput :disabled="isDisabled" v-model="valiFormData.weight" placeholder="请输入体重" />
+								<uni-easyinput :disabled="isDisabled" v-model="valiFormData.weight"
+									placeholder="请输入体重" />
 							</uni-forms-item>
 							<uni-forms-item label="肩颈宽度">
 								<p class="item_txt">单位：厘米cm</p>
-								<uni-easyinput :disabled="isDisabled" v-model="valiFormData.neckShoulderWidth" placeholder="请输入肩颈宽度" />
+								<uni-easyinput :disabled="isDisabled" v-model="valiFormData.neckShoulderWidth"
+									placeholder="请输入肩颈宽度" />
 							</uni-forms-item>
 							<uni-forms-item label="颈肩宽度示意图">
 								<view class="wid_pre">
 									<img class="wid_img" :src="imgPrefix + 'jian.png'" alt="">
-									<uni-data-checkbox :disabled="isDisabled" v-model="valiFormData.width" :localdata="widthData" />
+									<uni-data-checkbox :disabled="isDisabled" v-model="valiFormData.width"
+										:localdata="widthData" />
 								</view>
 							</uni-forms-item>
 							<uni-forms-item label="颈长">
 								<p class="item_txt">单位：厘米cm</p>
-								<uni-easyinput :disabled="isDisabled" v-model="valiFormData.neckLength" placeholder="请输入颈长" />
+								<uni-easyinput :disabled="isDisabled" v-model="valiFormData.neckLength"
+									placeholder="请输入颈长" />
 							</uni-forms-item>
 							<uni-forms-item label="颈长示意图">
 								<view class="hei_pre">
@@ -80,10 +122,12 @@
 								</view>
 							</uni-forms-item>
 							<uni-forms-item label="年龄">
-								<uni-data-checkbox :disabled="isDisabled" v-model="valiFormData.ageRange" :localdata="ageData" />
+								<uni-data-checkbox :disabled="isDisabled" v-model="valiFormData.ageRange"
+									:localdata="ageData" />
 							</uni-forms-item>
 							<uni-forms-item label="您每晚的睡眠时间">
-								<uni-data-checkbox :disabled="isDisabled" v-model="valiFormData.sleepLength" :localdata="sleepData" />
+								<uni-data-checkbox :disabled="isDisabled" v-model="valiFormData.sleepLength"
+									:localdata="sleepData" />
 							</uni-forms-item>
 							<uni-forms-item label="您习惯的睡眠姿势" required name="sleepingPosture">
 								<view class="pos_box">
@@ -101,24 +145,23 @@
 
 							</uni-forms-item>
 							<uni-forms-item label="您习惯的枕头软硬度" required name="pillowHardness">
-								<uni-data-checkbox :disabled="isDisabled" v-model="valiFormData.pillowHardness" :localdata="posData" />
+								<uni-data-checkbox :disabled="isDisabled" v-model="valiFormData.pillowHardness"
+									:localdata="posData" />
 							</uni-forms-item>
 							<uni-forms-item label="您喜欢的枕头类型" required name="pillowMaterial">
-								<uni-data-checkbox :disabled="isDisabled" v-model="valiFormData.pillowMaterial" :localdata="matData" />
+								<uni-data-checkbox :disabled="isDisabled" v-model="valiFormData.pillowMaterial"
+									:localdata="matData" />
 							</uni-forms-item>
 							<uni-forms-item label="您现在的颈椎出现问题了吗">
-								<uni-data-checkbox :disabled="isDisabled" v-model="valiFormData.cervicalVertebra" :localdata="cerData" />
+								<uni-data-checkbox :disabled="isDisabled" v-model="valiFormData.cervicalVertebra"
+									:localdata="cerData" />
 							</uni-forms-item>
 							<uni-forms-item label="您的其他需求">
-								<uni-easyinput :disabled="isDisabled" type="textarea" v-model="valiFormData.otherNeed" />
+								<uni-easyinput :disabled="isDisabled" type="textarea"
+									v-model="valiFormData.otherNeed" />
 							</uni-forms-item>
 						</uni-forms>
-						<button class="btn_box" @click="submit('valiForm')">提交</button>
-						<view class="button_box">
-							<p class="button" @click="handlePrev" v-if="currentNum > 1">上一个</p>
-							<p class="button" @click="jumpOver">跳过</p>
-							<p class="button" @click="handleNext" v-if="currentNum < orderNum">下一个</p>
-						</view>
+
 						<!-- <uni-popup ref="popup" background-color="#fff" @change="change">
 						<picker :range="locationArr" @change="cityChange" mode="multiSelector" @columnchange="columnchange"
 						:value="multiIndex">
@@ -153,9 +196,13 @@
 					<img class="code_img" :src="imgPrefix + 'add.jpg'" alt="">
 				</view>
 			</view>
+
 			
 		</view>
-		
+		<view class="bottom_con">
+			<p class="btn_box" @click="jumpOver">跳过</p>
+			<p class="btn_box" @click="submit('valiForm')">提交</p>
+		</view>
 	</view>
 </template>
 <script>
@@ -167,9 +214,9 @@
 	export default {
 		data() {
 			return {
-				phoneNumber:'',
+				phoneNumber: '',
 				imgPrefix: getApp().globalData.imgPrefix,
-				isShowLink:false,
+				isShowLink: false,
 				fontsize: 12,
 				// 校验表单数据
 				valiFormData: {},
@@ -341,16 +388,16 @@
 					text: '侧睡',
 					value: 2
 				}, ],
-				isDisabled:false,
-				orderNo:'',
-				orderNum:'',
-				orderData:[],
-				currentNum:null,
-				pageFrom:''
+				isDisabled: false,
+				orderNo: '',
+				orderNum: '',
+				orderData: [],
+				currentNum: null,
+				pageFrom: '',
+				formData: []
 			}
 		},
-		onShow(){
-		},
+		onShow() {},
 		onLoad(options) {
 			// let srceenNunber=15;	//因设计图是1920所有把设计图分为19.2份，所以html字体大小为100px
 			let that = this;
@@ -388,158 +435,196 @@
 			// 	// this.getInfo()
 			// }
 			this.getOrderInfo()
-							// this.getCurrentArea('北京市')
+			// this.getCurrentArea('北京市')
 		},
 		methods: {
 			// 根据订单号获取已填写的订单信息
-			getOrderInfo(type){
+			getOrderInfo(type) {
 				uni.request({
-					url:getApp().globalData.baseUrl + '/blade-desk/custom-made-info/list-by-order-no?orderNo=' + this.orderNo,
-					method:'GET',
-					header:{
+					url: getApp().globalData.baseUrl + '/blade-desk/custom-made-info/list-by-order-no?orderNo=' +
+						this.orderNo,
+					method: 'GET',
+					header: {
 						'Blade-Auth': 'bearer ' + uni.getStorageSync('token')
 					},
-					success:(res) =>{
+					success: (res) => {
 						console.log(res)
-						this.orderData = res.data.data;
-						if(type == 'save'){
-							if(this.orderData.length == this.orderNum){
-								if(this.pageFrom == 'order'){
-									uni.navigateBack({
-										url:"/pages/pages_zhentou/order/order"
-									})
-								}else{
-									uni.redirectTo({
-										url:"/pages/pages_zhentou/order/order"
-									})
+						if (res.data.code == 200) {
+							this.orderData = res.data.data;
+							if (type == 'save') {
+								if (this.orderData.length == this.orderNum) {
+									if (this.pageFrom == 'order') {
+										uni.navigateBack({
+											url: "/pages/pages_zhentou/order/order"
+										})
+									} else {
+										uni.redirectTo({
+											url: "/pages/pages_zhentou/order/order"
+										})
+									}
+
+								} else {
+									this.currentNum = this.orderData.length + 1;
+								}
+							} else {
+								if (this.orderData.length == this.orderNum) {
+									this.currentNum = 1;
+									this.valiFormData = this.orderData[0]
+									this.valiFormData.neckShoulderWidth = this.valiFormData
+										.neckShoulderWidth == -1 ? '' : this.valiFormData.neckShoulderWidth;
+									this.valiFormData.neckLength = this.valiFormData.neckLength == -1 ? '' :
+										this.valiFormData.neckLength;
+									this.valiFormData.ageRange = this.valiFormData.ageRange == -1 ? '' : this
+										.valiFormData.ageRange;
+									this.valiFormData.sleepLength = this.valiFormData.sleepLength == -1 ? '' :
+										this.valiFormData.sleepLength;
+									this.valiFormData.cervicalVertebra = this.valiFormData.cervicalVertebra ==
+										-1 ? '' : this.valiFormData.cervicalVertebra;
+									this.valiFormData.otherNeed = this.valiFormData.otherNeed == -1 ? '' : this
+										.valiFormData.otherNeed;
+
+								} else {
+									this.currentNum = this.orderData.length + 1;
 								}
-								
-							}else{
-								this.currentNum = this.orderData.length + 1;
-							}
-						}else{
-							if(this.orderData.length == this.orderNum){
-								this.currentNum = 1;
-								this.valiFormData = this.orderData[0]
-								this.valiFormData.neckShoulderWidth = this.valiFormData.neckShoulderWidth == -1 ? '' : this.valiFormData.neckShoulderWidth;
-								this.valiFormData.neckLength = this.valiFormData.neckLength == -1 ? '' : this.valiFormData.neckLength;
-								this.valiFormData.ageRange = this.valiFormData.ageRange == -1 ? '' : this.valiFormData.ageRange;
-								this.valiFormData.sleepLength = this.valiFormData.sleepLength == -1 ? '' : this.valiFormData.sleepLength;
-								this.valiFormData.cervicalVertebra = this.valiFormData.cervicalVertebra == -1 ? '' : this.valiFormData.cervicalVertebra;
-								this.valiFormData.otherNeed = this.valiFormData.otherNeed == -1 ? '' : this.valiFormData.otherNeed;
-								
-							}else{
-								this.currentNum = this.orderData.length + 1;
 							}
+						} else if (res.data.code == 401) {
+							this.doLogin()
+						} else {
+							uni.showToast({
+								title: res.data.msg,
+								icon: 'none'
+							})
 						}
-						
-						
+
+
+
 					}
 				})
 			},
-			handlePrev(){
+			handlePrev() {
 				// console.log(this.currentNum - 2)
 				this.currentNum = this.currentNum - 1;
 				this.valiFormData = this.orderData[this.currentNum - 1];
-				if(!this.valiFormData){
+				if (!this.valiFormData) {
 					this.valiFormData = {}
-				}else{
-					this.valiFormData.neckShoulderWidth = this.valiFormData.neckShoulderWidth == -1 ? '' : this.valiFormData.neckShoulderWidth;
+				} else {
+					this.valiFormData.neckShoulderWidth = this.valiFormData.neckShoulderWidth == -1 ? '' : this
+						.valiFormData.neckShoulderWidth;
 					this.valiFormData.neckLength = this.valiFormData.neckLength == -1 ? '' : this.valiFormData.neckLength;
 					this.valiFormData.ageRange = this.valiFormData.ageRange == -1 ? '' : this.valiFormData.ageRange;
-					this.valiFormData.sleepLength = this.valiFormData.sleepLength == -1 ? '' : this.valiFormData.sleepLength;
-					this.valiFormData.cervicalVertebra = this.valiFormData.cervicalVertebra == -1 ? '' : this.valiFormData.cervicalVertebra;
+					this.valiFormData.sleepLength = this.valiFormData.sleepLength == -1 ? '' : this.valiFormData
+						.sleepLength;
+					this.valiFormData.cervicalVertebra = this.valiFormData.cervicalVertebra == -1 ? '' : this.valiFormData
+						.cervicalVertebra;
 					this.valiFormData.otherNeed = this.valiFormData.otherNeed == -1 ? '' : this.valiFormData.otherNeed;
 				}
 			},
-			jumpOver(){
-				if(this.pageFrom == 'order'){
+			jumpOver() {
+				if (this.pageFrom == 'order') {
 					uni.navigateBack({
-						url:"/pages/pages_zhentou/order/order"
+						url: "/pages/pages_zhentou/order/order"
 					})
-				}else{
+				} else {
 					uni.redirectTo({
-						url:"/pages/pages_zhentou/order/order"
+						url: "/pages/pages_zhentou/order/order"
 					})
 				}
 			},
-			handleNext(){
+			handleNext() {
 				console.log(this.currentNum)
 				this.currentNum = this.currentNum + 1
 				this.valiFormData = this.orderData[this.currentNum - 1];
-				if(!this.valiFormData){
+				if (!this.valiFormData) {
 					console.log('123')
 					this.valiFormData = {}
-				}else{
+				} else {
 					console.log('456')
-					this.valiFormData.neckShoulderWidth = this.valiFormData.neckShoulderWidth == -1 ? '' : this.valiFormData.neckShoulderWidth;
+					this.valiFormData.neckShoulderWidth = this.valiFormData.neckShoulderWidth == -1 ? '' : this
+						.valiFormData.neckShoulderWidth;
 					this.valiFormData.neckLength = this.valiFormData.neckLength == -1 ? '' : this.valiFormData.neckLength;
 					this.valiFormData.ageRange = this.valiFormData.ageRange == -1 ? '' : this.valiFormData.ageRange;
-					this.valiFormData.sleepLength = this.valiFormData.sleepLength == -1 ? '' : this.valiFormData.sleepLength;
-					this.valiFormData.cervicalVertebra = this.valiFormData.cervicalVertebra == -1 ? '' : this.valiFormData.cervicalVertebra;
+					this.valiFormData.sleepLength = this.valiFormData.sleepLength == -1 ? '' : this.valiFormData
+						.sleepLength;
+					this.valiFormData.cervicalVertebra = this.valiFormData.cervicalVertebra == -1 ? '' : this.valiFormData
+						.cervicalVertebra;
 					this.valiFormData.otherNeed = this.valiFormData.otherNeed == -1 ? '' : this.valiFormData.otherNeed;
 				}
 			},
 			// 获取表单信息
-			getInfo(){
+			getInfo() {
 				uni.request({
 					// this.phoneNumber
-					url:getApp().globalData.baseUrl + '/blade-desk/custom-made-info/get-newest?phone=15932584136' ,
-					method:'GET',
-					header:{
+					url: getApp().globalData.baseUrl + '/blade-desk/custom-made-info/get-newest?phone=15932584136',
+					method: 'GET',
+					header: {
 						'Blade-Auth': 'bearer ' + uni.getStorageSync('token')
 					},
-					success:(res) =>{
+					success: (res) => {
 						console.log(res)
-						if(res.data.code == 200){
+						if (res.data.code == 200) {
 							this.valiFormData = {
-								username:res.data.data.username == '-1' ? '' : res.data.data.username,
-								ageRange:res.data.data.ageRange == '-1' ? '' : res.data.data.ageRange,
-								height:res.data.data.height == '-1' ? '' : res.data.data.height,
-								neckLength:res.data.data.neckLength == '-1' ? '' : res.data.data.neckLength,
-								neckShoulderWidth:res.data.data.neckShoulderWidth == '-1' ? '' : res.data.data.neckShoulderWidth,
-								pillowHardness:res.data.data.pillowHardness == '-1' ? '' : res.data.data.pillowHardness,
-								pillowMaterial:res.data.data.pillowMaterial == '-1' ? '' : res.data.data.pillowMaterial,
-								sleepingPosture:res.data.data.sleepingPosture == '-1' ? '' : res.data.data.sleepingPosture,
-								status:res.data.data.status == '-1' ? '' : res.data.data.status,
-								weight:res.data.data.weight == '-1' ? '' : res.data.data.weight,
-								address:res.data.data.detail == '-1' ? '' : res.data.data.detail,
-								sleepLength:res.data.data.sleepLength == '-1' ? '' : res.data.data.sleepLength,
-								cervicalVertebra:res.data.data.cervicalVertebra == '-1' ? '' : res.data.data.cervicalVertebra,
-								otherNeed:res.data.data.otherNeed == '-1' ? '' : res.data.data.otherNeed,
-								phone:res.data.data.phone == '-1' ? '' : res.data.data.phone
+								username: res.data.data.username == '-1' ? '' : res.data.data.username,
+								ageRange: res.data.data.ageRange == '-1' ? '' : res.data.data.ageRange,
+								height: res.data.data.height == '-1' ? '' : res.data.data.height,
+								neckLength: res.data.data.neckLength == '-1' ? '' : res.data.data
+									.neckLength,
+								neckShoulderWidth: res.data.data.neckShoulderWidth == '-1' ? '' : res.data
+									.data.neckShoulderWidth,
+								pillowHardness: res.data.data.pillowHardness == '-1' ? '' : res.data.data
+									.pillowHardness,
+								pillowMaterial: res.data.data.pillowMaterial == '-1' ? '' : res.data.data
+									.pillowMaterial,
+								sleepingPosture: res.data.data.sleepingPosture == '-1' ? '' : res.data.data
+									.sleepingPosture,
+								status: res.data.data.status == '-1' ? '' : res.data.data.status,
+								weight: res.data.data.weight == '-1' ? '' : res.data.data.weight,
+								address: res.data.data.detail == '-1' ? '' : res.data.data.detail,
+								sleepLength: res.data.data.sleepLength == '-1' ? '' : res.data.data
+									.sleepLength,
+								cervicalVertebra: res.data.data.cervicalVertebra == '-1' ? '' : res.data
+									.data.cervicalVertebra,
+								otherNeed: res.data.data.otherNeed == '-1' ? '' : res.data.data.otherNeed,
+								phone: res.data.data.phone == '-1' ? '' : res.data.data.phone
 							}
-							this.province = res.data.data.province == '-1' ? '' :res.data.data.province; 
-							this.city = res.data.data.city == '-1' ? '' :res.data.data.city; 
-							this.district = res.data.data.district == '-1' ? '' :res.data.data.district; 
+							this.province = res.data.data.province == '-1' ? '' : res.data.data.province;
+							this.city = res.data.data.city == '-1' ? '' : res.data.data.city;
+							this.district = res.data.data.district == '-1' ? '' : res.data.data.district;
 							// this.getCurrentArea(this.province)
 							console.log(this.valiFormData)
-							if(this.valiFormData.username !== '' && 
-							this.valiFormData.phone !== '' && this.valiFormData.height !== '' && 
-							this.valiFormData.weight !== '' && this.valiFormData.pillowHardness !== '' && 
-							this.valiFormData.pillowMaterial !== '' && this.valiFormData.sleepingPosture !== ''){
+							if (this.valiFormData.username !== '' &&
+								this.valiFormData.phone !== '' && this.valiFormData.height !== '' &&
+								this.valiFormData.weight !== '' && this.valiFormData.pillowHardness !== '' &&
+								this.valiFormData.pillowMaterial !== '' && this.valiFormData
+								.sleepingPosture !== '') {
 								this.isDisabled = true
-							}else{
+							} else {
 								this.isDisabled = false
 							}
+						} else if (res.data.code == 401) {
+							this.doLogin()
+						} else {
+							uni.showToast({
+								title: res.data.msg,
+								icon: 'none'
+							})
 						}
 					}
 				})
 			},
-			getCurrentArea(value){
-				this.allCityData.map((item,index) =>{
-					if(item.province == value){
+			getCurrentArea(value) {
+				this.allCityData.map((item, index) => {
+					if (item.province == value) {
 						this.multiIndex[0] = index
-						item.citys.map((item1,index1) =>{
-							if(item1.city == this.province){
+						item.citys.map((item1, index1) => {
+							if (item1.city == this.province) {
 								console.log('111')
 								this.locationArr[1].push(item.city);
 							}
-							if(item1.city == this.city){
-								
+							if (item1.city == this.city) {
+
 							}
 						})
-						
+
 					}
 				})
 			},
@@ -630,11 +715,11 @@
 						sleepLength: this.valiFormData.sleepLength,
 						cervicalVertebra: this.valiFormData.cervicalVertebra,
 						otherNeed: this.valiFormData.otherNeed,
-						orderNo:this.orderNo,
-						id:this.valiFormData.id ? this.valiFormData.id : ''
- 					}
+						orderNo: this.orderNo,
+						id: this.valiFormData.id ? this.valiFormData.id : ''
+					}
 					console.log(getApp().globalData.baseUrl)
-					
+
 					uni.request({
 						url: getApp().globalData.baseUrl + '/blade-desk/custom-made-info/save',
 						data: params,
@@ -647,11 +732,13 @@
 									icon: 'none'
 								});
 								this.valiFormData = {},
-								this.multiIndex[0, 0, 0];
+									this.multiIndex[0, 0, 0];
 								this.city = ''
 								this.province = '';
 								this.district = '';
 								this.getOrderInfo('save')
+							} else if (res.data.code == 401) {
+								this.doLogin()
 							} else {
 								uni.showToast({
 									title: '提交失败',
@@ -667,6 +754,37 @@
 					console.log('err', err);
 				})
 			},
+			//登录
+			doLogin(type) {
+				uni.showLoading({
+					title: '登录中',
+					mask: true
+				});
+				uni.request({
+					url: getApp().globalData.baseUrl + '/blade-auth/getToken',
+					method: 'POST',
+					data: {
+						openId: getApp().globalData.openId,
+						phone: this.phone
+					},
+					header: {
+						'Authorization': 'Basic c2FiZXI6c2FiZXJfc2VjcmV0'
+					},
+					success: (res) => {
+						if (res.data.code == 200) {
+							uni.setStorageSync('token', res.data.data.access_token);
+						} else {
+							uni.showToast({
+								title: res.data.msg,
+								icon: 'none'
+							})
+						}
+					},
+					complete: () => {
+						uni.hideLoading();
+					}
+				})
+			},
 			// 省市区确认事件
 			pickerChange(e) {
 				var _this = this
@@ -764,7 +882,7 @@
 		position: relative;
 		/* max-width: 1920px;
 		max-height: 920px; */
-		background-image: url('http://47.104.224.41:9000/etriphome/appresource/image/bag.png');
+		// background-image: url('http://47.104.224.41:9000/etriphome/appresource/image/bag.png');
 		background-position: top center;
 		background-size: cover;
 		background-repeat: no-repeat;
@@ -775,249 +893,302 @@
 		/* padding-bottom: 30px; */
 
 		.content_box {
+			width: 690rpx;
 			/* max-width: 700px; */
-			height: 96%;
+			height: 80%;
+			background-color: #fff;
 			margin: 0 auto;
 			margin-top: 2%;
-			overflow: auto;
 			border-radius: 24rpx;
-			
-			.rele_content{
+			padding: 30rpx 0;
+
+			.top_box {
+				width: 690rpx;
+				margin: 0 auto;
+				// background: #fff;
+				// display: flex;
+				// align-items: center;
+				// justify-content: space-around;
+				
+				.title_box{
+					width:100%;
+					text-align: left;
+					margin-left: 30rpx;
+					color: #666;
+					font-size: 26rpx;
+				}
+				
+				.turn_box{
+					width: 690rpx;
+					display: flex;
+					margin: 28rpx 0 36rpx 0;
+					
+					.turn_item{
+						width: 200rpx;
+						height: 78rpx;
+						background: #FFFFFF;
+						border-radius: 20rpx 20rpx 20rpx 20rpx;
+						border: 1rpx solid #D73232;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						font-size: 26rpx;
+						color: #D73232;
+						margin-right: 106rpx;
+						margin-left: 30rpx;
+						
+						&.next{
+							color: #666666;
+							border: 1rpx solid #A5A5A5;
+						}
+					}
+				}
+
+				.form_item {
+					width: 100rpx;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					justify-content: center;
+
+					.img_box {
+						width: 68rpx;
+						height: 68rpx;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+
+					.form_txt {
+						color: #666;
+						font-size: 24rpx;
+					}
+				}
+
+				.line_box {
+					width: 153rpx;
+					height: 1px;
+					background: #D1D1D1;
+				}
+			}
+
+			.rele_content {
 				width: 100%;
-				height: 100%;
+				height: 80%;
 				margin: 0 auto;
 				position: relative;
+				overflow: auto;
 			}
 
+			
+
 			.footer {
 				margin: 0 auto;
-				max-width: 700px;
+				max-width: 100%;
 				height: 80rpx;
 				font-size: 28rpx;
-				color: #e9e9e9;
+				color: #666;
 				display: flex;
 				align-items: center;
 				justify-content: center;
 			}
-		
 
-		.link_box {
-			position: absolute;
-			top: 0;
-			// left: 68.5%;
-			right: 0;
-			top: 50%;
-			transform: translateY(-50%);
-			background-color: #fff;
-			border: 2rpx dashed transparent;
-			border-radius: 12rpx;
-			box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, .1);
-			height: 440rpx;
-			line-height: 40rpx;
-			padding: 32rpx 20rpx;
-			text-align: center;
-			font-size: 28rpx;
-			width: 80rpx;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			justify-content: center;
-			cursor: pointer;
-		}
-		
-		.add_item{
-			width: 600rpx;
-			    height: 600rpx;
-			    position: absolute;
-			    background: #fff;
-			    right: 120rpx;
-			    bottom: 43%;
-			    z-index: 99;
-			    display: flex;
-			    flex-direction: column;
-			    align-items: center;
-			    justify-content: center;
-			    box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, .1);
-			
-			.code_img {
-				width: 200rpx;
+
+			.link_box {
+				position: absolute;
+				top: 0;
+				// left: 68.5%;
+				right: 0;
+				top: 50%;
+				transform: translateY(-50%);
+				background-color: #fff;
+				border: 2rpx dashed transparent;
+				border-radius: 12rpx;
+				box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, .1);
+				height: 440rpx;
+				line-height: 40rpx;
+				padding: 32rpx 20rpx;
+				text-align: center;
+				font-size: 28rpx;
+				width: 80rpx;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+				cursor: pointer;
 			}
-		}
-		.form_box {
-			max-width: 700rpx;
-			background: #fff;
-			margin: 0 auto;
-			border-radius: 24rpx;
-			/* margin-top: 64rpx; */
-			box-shadow: 0 24rpx 48rpx rgba(0, 0, 0, .05);
 
-			.top_header {
-				width: 100%;
-				/* height: 342rpx; */
-				border-top-left-radius: 24rpx;
-				border-top-right-radius: 24rpx;
+			.add_item {
+				width: 600rpx;
+				height: 600rpx;
+				position: absolute;
+				background: #fff;
+				right: 120rpx;
+				bottom: 43%;
+				z-index: 99;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+				box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, .1);
 
-				.top_img {
-					width: 100%;
-					height: 100%;
-					border-top-left-radius: 24rpx;
-					border-top-right-radius: 24rpx;
+				.code_img {
+					width: 200rpx;
 				}
 			}
 
-			.top_content {
-				padding: 30rpx;
-				
-				.num_box{
-					font-family: inherit;
-					font-size: 40rpx;
-					font-weight: normal;
-					color: rgb(7, 0, 89);
-					text-align: left;
-					margin-bottom: 16rpx;
-				}
+			.form_box {
+				max-width: 100%;
+				background: #fff;
+				margin: 0 auto;
+				border-radius: 24rpx;
+				/* margin-top: 64rpx; */
+				box-shadow: 0 24rpx 48rpx rgba(0, 0, 0, .05);
 
-				.title {
-					font-family: inherit;
-					font-size: 40rpx;
-					font-weight: normal;
-					color: rgb(7, 0, 89);
-					text-align: center;
-					margin-bottom: 16rpx;
+				.top_header {
+					width: 100%;
+					/* height: 342rpx; */
+					border-top-left-radius: 24rpx;
+					border-top-right-radius: 24rpx;
+
+					.top_img {
+						width: 100%;
+						height: 100%;
+						border-top-left-radius: 24rpx;
+						border-top-right-radius: 24rpx;
+					}
 				}
 
-				.content {
-					color: #666;
-					line-height: 1.5;
-					max-width: 100%;
-					overflow: visible;
-					word-break: break-word;
+				.top_content {
+					padding: 30rpx;
 
-					p {
+					.num_box {
+						font-family: inherit;
+						font-size: 40rpx;
+						font-weight: normal;
+						color: rgb(7, 0, 89);
 						text-align: left;
-						font-size: 28rpx;
+						margin-bottom: 16rpx;
 					}
-				}
-			}
 
-			.form_content {
-				margin: 0rpx 30rpx;
-				padding: 20rpx 0rpx;
-
-				.btn_box {
-					width: 484rpx;
-					font-family: inherit;
-					font-size: 28rpx;
-					font-weight: normal;
-					color: rgb(255, 255, 255);
-					padding: 20rpx 110rpx;
-					background-color: rgb(245, 189, 55);
-					border-color: rgb(255, 255, 255);
-					border-width: 0rpx;
-					box-shadow: rgba(0, 0, 0, 0.2) 0px 0px 1px;
-					margin: 40rpx auto;
-				}
-				
-				.button_box{
-					width: 484rpx;
-					height: 60rpx;
-					display: flex;
-					align-self: center;
-					justify-content: space-between;
-					padding: 0 100rpx;
-					.button{
-						width: 100rpx;
-						height: 60rpx;
-						background: #fff;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						line-height: 60rpx;
-						font-size: 26rpx;
-						font-family: PingFang SC-Regular, PingFang SC;
-						font-weight: 400;
-						color: #666666;
-						border-radius: 20rpx;
-						border: 1rpx solid #A5A5A5;
-						// margin: 0 60rpx;
+					.title {
+						font-family: inherit;
+						font-size: 40rpx;
+						font-weight: normal;
+						color: rgb(7, 0, 89);
+						text-align: center;
+						margin-bottom: 16rpx;
 					}
-				}
 
-				.uni-forms-item {
+					.content {
+						color: #666;
+						line-height: 1.5;
+						max-width: 100%;
+						overflow: visible;
+						word-break: break-word;
 
-					/* background-color: red; */
-					::v-deep.checklist-box {
-						width: 686rpx;
-						height: 92rpx;
-						border: 2rpx solid #eaeaea;
-						padding-left: 20rpx;
-						border-radius: 12rpx;
+						p {
+							text-align: left;
+							font-size: 28rpx;
+						}
 					}
+				}
 
-					.address_item {
-						margin-top: 16rpx;
-					}
+				.form_content {
+					margin: 0rpx 30rpx;
+					padding: 20rpx 0rpx;
 
-					.uni-forms-item__label {
+					.btn_box {
+						width: 484rpx;
 						font-family: inherit;
-						font-size: 14px;
-						font-weight: bold;
-						color: rgb(7, 0, 89);
-
-						.is-required {
-							margin-right: 10rpx;
-						}
+						font-size: 28rpx;
+						font-weight: normal;
+						color: rgb(255, 255, 255);
+						padding: 20rpx 110rpx;
+						background-color: rgb(245, 189, 55);
+						border-color: rgb(255, 255, 255);
+						border-width: 0rpx;
+						box-shadow: rgba(0, 0, 0, 0.2) 0px 0px 1px;
+						margin: 40rpx auto;
 					}
 
-					.wid_pre {
-						width: 306rpx;
-						height: 400rpx;
+					.button_box {
+						width: 484rpx;
+						height: 60rpx;
 						display: flex;
-						flex-direction: column;
+						align-self: center;
+						justify-content: space-between;
+						padding: 0 100rpx;
 
-						.wid_img {
-							width: 100%;
-							border-top-left-radius: 16rpx;
-							border-top-right-radius: 16rpx;
+						.button {
+							width: 100rpx;
+							height: 60rpx;
+							background: #fff;
+							display: flex;
+							align-items: center;
+							justify-content: center;
+							line-height: 60rpx;
+							font-size: 26rpx;
+							font-family: PingFang SC-Regular, PingFang SC;
+							font-weight: 400;
+							color: #666666;
+							border-radius: 20rpx;
+							border: 1rpx solid #A5A5A5;
+							// margin: 0 60rpx;
 						}
+					}
+
+					.uni-forms-item {
 
+						/* background-color: red; */
 						::v-deep.checklist-box {
-							width: 306rpx;
-							height: 94rpx;
-							margin: 0;
-							border-radius: 0rpx;
-							border-bottom-left-radius: 16rpx;
-							border-bottom-right-radius: 16rpx;
+							width: 686rpx;
+							height: 92rpx;
+							border: 2rpx solid #eaeaea;
+							padding-left: 20rpx;
+							border-radius: 12rpx;
 						}
-					}
 
-					.hei_pre {
-						width: 306rpx;
-						height: 400rpx;
-						display: flex;
-						flex-direction: column;
+						.address_item {
+							margin-top: 16rpx;
+						}
 
-						.hei_img {
-							width: 100%;
-							border-top-left-radius: 16rpx;
-							border-top-right-radius: 16rpx;
+						.uni-forms-item__label {
+							font-family: inherit;
+							font-size: 14px;
+							font-weight: bold;
+							color: rgb(7, 0, 89);
+
+							.is-required {
+								margin-right: 10rpx;
+							}
 						}
 
-						::v-deep.checklist-box {
+						.wid_pre {
 							width: 306rpx;
-							height: 94rpx;
-							margin: 0;
-							border-radius: 0rpx;
-							border-bottom-left-radius: 16rpx;
-							border-bottom-right-radius: 16rpx;
-						}
-					}
+							height: 400rpx;
+							display: flex;
+							flex-direction: column;
 
-					.pos_box {
-						display: flex;
-						justify-content: space-around;
+							.wid_img {
+								width: 100%;
+								border-top-left-radius: 16rpx;
+								border-top-right-radius: 16rpx;
+							}
+
+							::v-deep.checklist-box {
+								width: 306rpx;
+								height: 94rpx;
+								margin: 0;
+								border-radius: 0rpx;
+								border-bottom-left-radius: 16rpx;
+								border-bottom-right-radius: 16rpx;
+							}
+						}
 
-						.pos_pre {
+						.hei_pre {
 							width: 306rpx;
 							height: 400rpx;
 							display: flex;
@@ -1033,84 +1204,143 @@
 								width: 306rpx;
 								height: 94rpx;
 								margin: 0;
-								border-radius: 0px;
+								border-radius: 0rpx;
 								border-bottom-left-radius: 16rpx;
 								border-bottom-right-radius: 16rpx;
 							}
 						}
-					}
 
-					.item_txt {
-						font-size: 28rpx;
-						margin-bottom: 24rpx;
-						color: #666;
-					}
+						.pos_box {
+							display: flex;
+							justify-content: space-around;
 
-					.city_box {
-						width: 100%;
-						height: 70rpx;
-						padding-left: 20rpx;
-						border: 1px solid;
-						display: flex;
-						align-items: center;
-						display: flex;
-						box-sizing: border-box;
-						flex-direction: row;
-						align-items: center;
-						border: 1px solid #dcdfe6;
-						border-radius: 8rpx;
-						font-size: 24rpx;
-					}
+							.pos_pre {
+								width: 306rpx;
+								height: 400rpx;
+								display: flex;
+								flex-direction: column;
+
+								.hei_img {
+									width: 100%;
+									border-top-left-radius: 16rpx;
+									border-top-right-radius: 16rpx;
+								}
+
+								::v-deep.checklist-box {
+									width: 306rpx;
+									height: 94rpx;
+									margin: 0;
+									border-radius: 0px;
+									border-bottom-left-radius: 16rpx;
+									border-bottom-right-radius: 16rpx;
+								}
+							}
+						}
+
+						.item_txt {
+							font-size: 28rpx;
+							margin-bottom: 24rpx;
+							color: #666;
+						}
 
+						.city_box {
+							width: 100%;
+							height: 70rpx;
+							padding-left: 20rpx;
+							border: 1px solid;
+							display: flex;
+							align-items: center;
+							display: flex;
+							box-sizing: border-box;
+							flex-direction: row;
+							align-items: center;
+							border: 1px solid #dcdfe6;
+							border-radius: 8rpx;
+							font-size: 24rpx;
+						}
+
+					}
 				}
+
 			}
 
-		}
+			.mask_box {
+				width: 100%;
+				height: 100%;
+				background: #000;
+				position: absolute;
+				z-index: 98;
+				top: 0;
+				opacity: 0.6;
+			}
 
-		.mask_box {
-			width: 100%;
-			height: 100%;
-			background: #000;
-			position: absolute;
-			z-index: 98;
-			top: 0;
-			opacity: 0.6;
-		}
+			.phone_box {
+				align-items: center;
+				background-color: #fff;
+				border-radius: 50%;
+				bottom: 220rpx;
+				box-shadow: 0 24rpx 24rpx rgba(0, 0, 0, .1);
+				display: flex;
+				height: 120rpx;
+				justify-content: center;
+				margin-top: 12rpx;
+				position: fixed;
+				right: 24rpx;
+				width: 120rpx;
+				z-index: 98;
+			}
 
-		.phone_box {
-			align-items: center;
+			.code_box {
+				width: 350rpx;
+				height: 320rpx;
+				background: url('http://47.104.224.41:9000/etriphome/appresource/image/add_bag.png') no-repeat;
+				background-size: 100% 100%;
+				position: fixed;
+				right: 24rpx;
+				bottom: 360rpx;
+				z-index: 99;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+
+				.code_img {
+					width: 200rpx;
+				}
+			}
+		}
+		
+		.bottom_con {
+			width: 100%;
+			height: 160rpx;
 			background-color: #fff;
-			border-radius: 50%;
-			bottom: 220rpx;
-			box-shadow: 0 24rpx 24rpx rgba(0, 0, 0, .1);
 			display: flex;
-			height: 120rpx;
 			justify-content: center;
-			margin-top: 12rpx;
-			position: fixed;
-			right: 24rpx;
-			width: 120rpx;
-			z-index: 98;
-		}
-
-		.code_box {
-			width: 350rpx;
-			height: 320rpx;
-			background: url('http://47.104.224.41:9000/etriphome/appresource/image/add_bag.png') no-repeat;
-			background-size: 100% 100%;
+			// align-items: center;
+			margin: 0 auto;
+			// margin-top: 40rpx;
 			position: fixed;
-			right: 24rpx;
-			bottom: 360rpx;
-			z-index: 99;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			justify-content: center;
-
-			.code_img {
-				width: 200rpx;
+			bottom: 0;
+		
+			.btn_box {
+				width: 320rpx;
+				height: 78rpx;
+				margin-top: 30rpx;
+				background: #FFFFFF;
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+				border: 1rpx solid #D73232;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-size: 26rpx;
+				color: #D73232;
+		
+				&:last-child {
+					background: #D73232;
+					color: #fff;
+					margin-left: 50rpx;
+				}
 			}
 		}
 	}
-	}
 </style>
\ No newline at end of file
diff --git a/pages/pages_zhentou/homePage/homePage.vue b/pages/pages_zhentou/homePage/homePage.vue
index 198c858..cb20759 100644
--- a/pages/pages_zhentou/homePage/homePage.vue
+++ b/pages/pages_zhentou/homePage/homePage.vue
@@ -4,13 +4,25 @@
 			<image class="img" mode="widthFix" :src="bgSrc"></image>
 			<!-- <img class="img" src="../../../static/image/bag.jpg" mode=""></img> -->
 		</view>
-		<view class="per_box" @click="turnMyPage">
-			<view class="image_box">
-				<image class="img" src="../../../static/image/person.png" mode=""></image>
+		<view class="per_box">
+			<view class="my_box" @click="turnMyPage">
+				<view class="image_box">
+					<image class="img" src="../../../static/image/person.png" mode=""></image>
+				</view>
+				<view class="per_txt">
+					我的
+				</view>
 			</view>
-			<view class="per_txt">
-				我的
+			<view class="line"></view>
+			<view class="service_box" @click="turnShouhou">
+				<view class="image_box">
+					<image class="img" src="../../../static/image/icon-contact.png" mode=""></image>
+				</view>
+				<view class="per_txt">
+					客服
+				</view>
 			</view>
+			
 		</view>
 		<view class="bottom_box">
 			<!-- <button class="btn" @click="addForm">填写报名单（其他渠道已购买）</button> -->
@@ -74,6 +86,12 @@
 					url: "/pages/pages_zhentou/myPage/myPage"
 				})
 			},
+			// 跳转到售后页面
+			turnShouhou() {
+				uni.navigateTo({
+					url: "/pages/pages_zhentou/contact/contact"
+				})
+			},
 			// 填写表单
 			addForm() {
 				uni.switchTab({
@@ -193,7 +211,7 @@
 
 	.per_box {
 		width: 70rpx;
-		height: 118rpx;
+		height: 242rpx;
 		background: rgba(255, 255, 255, 0.8);
 		border-radius: 20rpx 20rpx 20rpx 20rpx;
 		position: fixed;
@@ -204,17 +222,50 @@
 		align-items: center;
 		justify-content: center;
 		cursor: pointer;
+		
+		.line{
+			width: 43rpx;
+			height: 2rpx;
+			background: #000;
+			margin: 16rpx 0;
+		}
+		
+		.my_box{
+			width: 70rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			.image_box {
+				width: 44rpx;
+				height: 44rpx;
 
-		.image_box {
-			width: 44rpx;
-			height: 44rpx;
-
-			.img {
-				width: 100%;
-				height: 100%;
+				.img {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+		
+		.service_box{
+			width: 70rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			.image_box {
+				width: 44rpx;
+				height: 44rpx;
+			
+				.img {
+					width: 100%;
+					height: 100%;
+				}
 			}
 		}
 
+		
+
 		.per_txt {
 			margin-top: 10rpx;
 			color: #333;
diff --git a/pages/pages_zhentou/myPage/address.vue b/pages/pages_zhentou/myPage/address.vue
index f483489..77be4df 100644
--- a/pages/pages_zhentou/myPage/address.vue
+++ b/pages/pages_zhentou/myPage/address.vue
@@ -3,7 +3,17 @@
 		<view class="address_box">
 			<view class="address_item" v-for="(item,index) in addressData" :key="index">
 				<view class="top_box" @click="turnToOrder(item)">
-					<view class="top_item">
+					<view class="top_item" v-if="item.address == deAddress && item.consignee == deConsignee && item.phone == dePhone &&
+					item.province == deProvince && item.city == deCity && item.area == deDistrict && item.isDefault == isDefaultAddress">
+						<view class="top">
+							<span class="name_txt">{{item.consignee}}</span>
+							<span class="phone_txt">{{item.phone}}</span>
+						</view>
+						<view class="bottom" style="color: #D73232;">
+							{{item.province}}{{item.city}}{{item.area}}{{item.address}}
+						</view>
+					</view>
+					<view class="top_item" v-else>
 						<view class="top">
 							<span class="name_txt">{{item.consignee}}</span>
 							<span class="phone_txt">{{item.phone}}</span>
@@ -12,14 +22,14 @@
 							{{item.province}}{{item.city}}{{item.area}}{{item.address}}
 						</view>
 					</view>
-					<view class="edit_box" @click="handleEdit(item)">
+					<view class="edit_box" @click.stop="handleEdit(item)">
 						<view class="img_box">
 							<image class="img" src="../../../static/image/edit.png" mode=""></image>
 						</view>
 					</view>
 				</view>
 				<view class="bottom_item">
-					<view class="no_checked_box" v-if="item.isDefault == 0" @click="handleDefault(item)">
+					<view class="no_checked_box" v-if="item.isDefault == 0" @click.stop="handleDefault(item)">
 						<view class="no_checked"></view>
 						<p class="no_default">设为默认</p>
 					</view>
@@ -151,11 +161,28 @@
 				title: '',
 				addressId: '',
 				userInfo: {},
-				pageFrom: ''
+				pageFrom: '',
+				orderId:'',
+				deAddress:'',
+				deConsignee:'',
+				dePhone:'',
+				deProvince:'',
+				deCity:'',
+				deDistrict:'',
+				isDefaultAddress:''
 			}
 		},
 		onLoad(options) {
+			console.log(options)
 			this.pageFrom = options.from;
+			this.orderId = options.orderId;
+			this.deAddress = options.address;
+			this.deConsignee = options.consignee;
+			this.dePhone = options.phone;
+			this.deProvince = options.province;
+			this.deCity = options.city;
+			this.deDistrict = options.area;
+			this.isDefaultAddress = options.isDefaultAddress;
 			this.getData()
 			let userInfo = uni.getStorageSync('userInfo');
 			if (userInfo) {
@@ -207,6 +234,13 @@
 										this.hasMore = true;
 										this.current = 0;
 										this.loadMore()
+									}else if (res.data.code == 401) {
+										this.doLogin()
+									}else{
+										uni.showToast({
+											title: res.data.msg,
+											icon: 'none'
+										})
 									}
 								}
 							})
@@ -247,6 +281,8 @@
 										this.hasMore = true;
 										this.current = 0;
 										this.loadMore()
+									}else if (res.data.code == 401) {
+										this.doLogin()
 									} else {
 										uni.showToast({
 											title: res.data.msg,
@@ -339,6 +375,8 @@
 										this.hasMore = true;
 										this.current = 0;
 										this.loadMore()
+									}else if (res.data.code == 401) {
+										this.doLogin()
 									} else {
 										uni.showToast({
 											title: res.data.msg,
@@ -384,6 +422,8 @@
 										this.hasMore = true;
 										this.current = 0;
 										this.loadMore()
+									}else if (res.data.code == 401) {
+										this.doLogin()
 									} else {
 										uni.showToast({
 											title: res.data.msg,
@@ -410,6 +450,48 @@
 						uni.setStorageSync('address', JSON.stringify(item))
 						uni.navigateBack();
 					}
+				}else if(this.pageFrom == 'order'){
+					var pages = getCurrentPages(); // 获取页面栈
+					var currPage = pages[pages.length - 1]; // 当前页面
+					var prevPage = pages[pages.length - 2]; 
+					if (prevPage.route == 'pages/pages_zhentou/order/checkOrder') {
+						console.log('111')
+						let params ={
+							id:this.orderId,
+							consignee:item.consignee,
+							consigneePhone:item.phone,
+							address:item.address,
+							province:item.province,
+							city:item.city,
+							district:item.area,
+							isDefaultAddress:item.isDefault
+						}
+						console.log(params)
+						uni.request({
+							url:getApp().globalData.baseUrl + "/blade-desk/order/updateAddress?id=" + this.orderId + '&consignee=' + item.consignee + 
+							'&consigneePhone=' + item.phone + '&address=' + item.address + '&province=' + item.province + '&city=' + item.city + 
+							'&district=' + item.area + '&isDefaultAddress=' + item.isDefault,
+							 method:"POST",
+							 header:{
+								 'Blade-Auth': 'bearer ' + uni.getStorageSync('token')
+							 },
+							 // params:params,
+							 success:(res) =>{
+								 console.log(res)
+								 if(res.data.code == 200){
+									uni.setStorageSync('orderId', this.orderId);
+									uni.navigateBack();
+								 }else if (res.data.code == 401) {
+									this.doLogin()
+								 }else{
+									 uni.showToast({
+									 	title: res.data.msg,
+									 	icon: 'none'
+									 })
+								 }
+							 }
+						})
+					}
 				}
 			},
 			// 取消新增
@@ -580,6 +662,37 @@
 				}
 			},
 
+			//登录
+			doLogin(type) {
+				uni.showLoading({
+					title: '登录中',
+					mask: true
+				});
+				uni.request({
+					url: getApp().globalData.baseUrl + '/blade-auth/getToken',
+					method: 'POST',
+					data: {
+						openId: getApp().globalData.openId,
+						phone: this.phone
+					},
+					header: {
+						'Authorization': 'Basic c2FiZXI6c2FiZXJfc2VjcmV0'
+					},
+					success: (res) => {
+						if (res.data.code == 200) {
+							uni.setStorageSync('token', res.data.data.access_token);
+						} else {
+							uni.showToast({
+								title: res.data.msg,
+								icon: 'none'
+							})
+						}
+					},
+					complete: () => {
+						uni.hideLoading();
+					}
+				})
+			}
 		}
 	}
 </script>
diff --git a/pages/pages_zhentou/order/checkOrder.vue b/pages/pages_zhentou/order/checkOrder.vue
index de31e69..0261b01 100644
--- a/pages/pages_zhentou/order/checkOrder.vue
+++ b/pages/pages_zhentou/order/checkOrder.vue
@@ -43,6 +43,19 @@
 				</view>
 			</view>
 		</view>
+		<view class="address_box" @click="returnToAddress">
+			<p class="info_title">收货地址</p>
+			<view class="address_top" v-if="addressInfo">
+				<view class="isflag" v-if="addressInfo.isDefaultAddress == 1">默认</view>
+				<view class="txt">{{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}</view>
+			</view>
+			<view class="address_des" v-if="addressInfo">{{addressInfo.address}}</view>
+			<view class="address_des" style="color: #666;font-weight: normal;" v-else>请填写收货地址</view>
+			<view class="address_user" v-if="addressInfo">
+				<text class="user_name">{{addressInfo.consignee}}</text>
+				<text class="user_phone">{{addressInfo.consigneePhone}}</text>
+			</view>
+		</view>
 		<view class="order_info">
 			<p class="info_title">订单信息</p>
 			<p class="info_mess">
@@ -71,13 +84,15 @@
 			</view>
 		</view>
 		<view class="btn_box">
-			<p class="btn" @click="handleWuliu" v-if="orderData.status == 2 || orderData.status == 3 || orderData.status == 4">查看物流</p>
-			<p class="btn confirm" v-if="orderData.status == 3" @click="handleConfirm">确认收货</p>
+			<p class="btn" @click="handleWuliu"
+				v-if="orderData.status == 3 || orderData.status == 4">查看物流</p>
 			<p class="btn" v-if="orderData.status == 1" @click="cancelOrder">取消订单</p>
+			<p class="btn" v-if="orderData.status == 2" @click="returnToAddress">修改地址</p>
+			<p class="btn" v-if="orderData.status == 0" @click="handleDelete">删除订单</p>
+			<p class="btn confirm" v-if="orderData.status == 3" @click="handleConfirm">确认收货</p>
 			<p class="btn confirm" v-if="orderData.status == 1">立即支付</p>
 			<!-- <p class="btn confirm info" v-if="orderData.status == 3" @click="handleInfo(item)">完善定制信息</p> -->
 			<p class="btn confirm info" v-if="orderData.status == 2" @click="handleInfo">完善定制信息</p>
-			<p class="btn" v-if="orderData.status == 0" @click="handleDelete">删除订单</p>
 			<p class="btn confirm" v-if="orderData.status == 0" @click="clickCustom">再次定制</p>
 		</view>
 	</view>
@@ -88,8 +103,18 @@
 		data() {
 			return {
 				imgPrefix: getApp().globalData.imgPrefix,
-				orderData:{},
-				orderId:''
+				orderData: {},
+				orderId: '',
+				addressInfo: null,
+			}
+		},
+		onShow() {
+			if (uni.getStorageSync('orderId')) {
+				this.orderId = uni.getStorageSync('orderId');
+				if (this.orderId) {
+					this.getDetail();
+					uni.removeStorageSync('orderId');
+				}
 			}
 		},
 		onLoad(options) {
@@ -99,54 +124,78 @@
 			console.log('进入模块')
 		},
 		methods: {
+			returnToAddress() {
+				uni.navigateTo({
+					url: "/pages/pages_zhentou/myPage/address?consignee=" + this.addressInfo.consignee +
+						"&phone=" + this.addressInfo.consigneePhone +
+						"&province=" + this.addressInfo.province + '&city=' + this.addressInfo.city + '&area=' +
+						this.addressInfo.district + '&from=order' +
+						'&isDefaultAddress=' + this.addressInfo.isDefaultAddress + "&orderId=" + this.orderId +
+						'&address=' + this.addressInfo.address
+				})
+			},
 			// 获取物流详情
-			getDetail(){
+			getDetail() {
 				uni.request({
 					// + this.orderId
 					url: getApp().globalData.baseUrl + '/blade-desk/order/detail?id=' + this.orderId,
-					method:'GET',
-					header:{
+					method: 'GET',
+					header: {
 						'Blade-Auth': 'bearer ' + uni.getStorageSync('token')
 					},
 					success: (res) => {
 						console.log(res)
-						if(res.data.code == 200){
+						if (res.data.code == 200) {
 							this.orderData = res.data.data;
-						}else{
+							this.addressInfo = {
+								consignee: res.data.data.consignee,
+								consigneePhone: res.data.data.consigneePhone,
+								address: res.data.data.address,
+								province: res.data.data.province,
+								city: res.data.data.city,
+								district: res.data.data.district,
+								isDefaultAddress: res.data.data.isDefaultAddress,
+							}
+						} else if (res.data.code == 401) {
+							this.doLogin()
+						} else {
 							uni.showToast({
 								title: res.data.msg,
 								icon: 'none'
 							})
 						}
-						
+
 					}
 				})
 			},
 			// 取消订单
-			cancelOrder(){
+			cancelOrder() {
 				uni.showModal({
 					title: '提示',
 					content: '确认取消该订单？',
 					success: (res) => {
 						if (res.confirm) {
 							uni.request({
-								url:getApp().globalData.baseUrl + '/blade-desk/order/cancel?id=' + this.orderId,
-								method:'POST',
-								header:{
+								url: getApp().globalData.baseUrl + '/blade-desk/order/cancel?id=' +
+									this.orderId,
+								method: 'POST',
+								header: {
 									'Blade-Auth': 'bearer ' + uni.getStorageSync('token')
 								},
 								success: (res) => {
 									console.log(res)
-									if(res.data.code == 200){
+									if (res.data.code == 200) {
 										uni.showToast({
 											title: '订单取消成功',
 											icon: 'none'
 										})
-										setTimeout(() =>{
+										setTimeout(() => {
 											uni.navigateBack()
-										},500)
-										
-									}else{
+										}, 500)
+
+									} else if (res.data.code == 401) {
+										this.doLogin()
+									} else {
 										uni.showToast({
 											title: res.data.msg,
 											icon: 'none'
@@ -155,15 +204,15 @@
 								}
 							})
 						} else if (res.cancel) {
-							
+
 						}
 					}
 				});
 			},
 			// 确认收货
-			handleConfirm(){
+			handleConfirm() {
 				let params = {
-					id:this.orderId
+					id: this.orderId
 				}
 				uni.showModal({
 					title: '提示',
@@ -171,22 +220,25 @@
 					success: (res) => {
 						if (res.confirm) {
 							uni.request({
-								url:getApp().globalData.baseUrl + '/blade-desk/order/confirmReceive?id=' + this.orderId,
-								method:"POST",
-								header:{
+								url: getApp().globalData.baseUrl +
+									'/blade-desk/order/confirmReceive?id=' + this.orderId,
+								method: "POST",
+								header: {
 									'Blade-Auth': 'bearer ' + uni.getStorageSync('token')
 								},
-								success:(res) =>{
+								success: (res) => {
 									console.log(res)
-									if(res.data.code == 200){
+									if (res.data.code == 200) {
 										uni.showToast({
 											title: '收货成功',
 											icon: 'none'
 										})
-										setTimeout(() =>{
+										setTimeout(() => {
 											uni.navigateBack()
-										},500)
-									}else{
+										}, 500)
+									} else if (res.data.code == 401) {
+										this.doLogin()
+									} else {
 										uni.showToast({
 											title: res.data.msg,
 											icon: 'none'
@@ -195,41 +247,46 @@
 								}
 							})
 						} else if (res.cancel) {
-							
+
 						}
 					}
 				});
 			},
 			// 查看物流
-			handleWuliu(){
+			handleWuliu() {
 				uni.navigateTo({
-					url:"/pages/pages_zhentou/order/express?logisticsNo=" + this.orderData.logisticsNo + '&company=' + this.orderData.logisticsCompany + '&companyCode=' + this.orderData.logisticsCompanyCode
+					url: "/pages/pages_zhentou/order/express?logisticsNo=" + this.orderData.logisticsNo +
+						'&company=' + this.orderData.logisticsCompany + '&companyCode=' + this.orderData
+						.logisticsCompanyCode
 				})
 			},
 			// 删除订单
-			handleDelete(){
+			handleDelete() {
 				uni.showModal({
 					title: '提示',
 					content: '确认删除订单吗？',
 					success: (res) => {
 						if (res.confirm) {
 							uni.request({
-								url:getApp().globalData.baseUrl + '/blade-desk/order/remove?ids=' + this.orderId,
-								method:"POST",
-								header:{
+								url: getApp().globalData.baseUrl + '/blade-desk/order/remove?ids=' +
+									this.orderId,
+								method: "POST",
+								header: {
 									'Blade-Auth': 'bearer ' + uni.getStorageSync('token')
 								},
 								success: (res) => {
 									console.log(res)
-									if(res.data.code == 200){
+									if (res.data.code == 200) {
 										uni.showToast({
 											title: '订单删除成功',
 											icon: 'none'
 										})
-										setTimeout(() =>{
+										setTimeout(() => {
 											uni.navigateBack()
-										},500)
-									}else{
+										}, 500)
+									} else if (res.data.code == 401) {
+										this.doLogin()
+									} else {
 										uni.showToast({
 											title: res.data.msg,
 											icon: 'none'
@@ -237,29 +294,60 @@
 									}
 								}
 							})
-						} else if (res.cancel) {
-						}
+						} else if (res.cancel) {}
 					}
 				});
 			},
 			// 点击再次定制按钮，跳转到提交订单页面
-			clickCustom(){
+			clickCustom() {
 				uni.navigateTo({
 					url: '/pages/pages_zhentou/order/confirmOrder'
 				})
 			},
 			// 完善定制信息,跳转表单页面
-			handleInfo(){
+			handleInfo() {
 				uni.navigateTo({
-					url:"/pages/pages_zhentou/form/form?phone=" + this.orderData.buyerPhone + '&pageFrom=order' + '&orderNo='+ this.orderData.orderNo + '&orderNum=' + this.orderData.goodsNum
+					url: "/pages/pages_zhentou/form/form?phone=" + this.orderData.buyerPhone + '&pageFrom=order' +
+						'&orderNo=' + this.orderData.orderNo + '&orderNum=' + this.orderData.goodsNum
 				})
 			},
 			// 跳转售后服务
-			returnToServe(){
+			returnToServe() {
 				uni.navigateTo({
-					url:"/pages/pages_zhentou/contact/contact"
+					url: "/pages/pages_zhentou/contact/contact"
 				})
 			},
+			//登录
+			doLogin(type) {
+				uni.showLoading({
+					title: '登录中',
+					mask: true
+				});
+				uni.request({
+					url: getApp().globalData.baseUrl + '/blade-auth/getToken',
+					method: 'POST',
+					data: {
+						openId: getApp().globalData.openId,
+						phone: this.phone
+					},
+					header: {
+						'Authorization': 'Basic c2FiZXI6c2FiZXJfc2VjcmV0'
+					},
+					success: (res) => {
+						if (res.data.code == 200) {
+							uni.setStorageSync('token', res.data.data.access_token);
+						} else {
+							uni.showToast({
+								title: res.data.msg,
+								icon: 'none'
+							})
+						}
+					},
+					complete: () => {
+						uni.hideLoading();
+					}
+				})
+			}
 		}
 	}
 </script>
@@ -416,40 +504,114 @@
 				}
 			}
 		}
-		.order_info{
+
+		.address_box {
+			width: 690rpx;
+			background: #FFFFFF;
+			border-radius: 30rpx 30rpx 30rpx 30rpx;
+			margin: 0 auto;
+			margin-top: 30rpx;
+			padding: 30rpx 0;
+			padding-left: 30rpx;
+
+			.info_title {
+				font-size: 28rpx;
+				color: #333;
+
+			}
+
+			.address_top {
+				display: flex;
+				align-items: center;
+				margin-top: 30rpx;
+
+				.isflag {
+					width: 60rpx;
+					color: #D73232;
+					font-size: 20rpx;
+					font-family: PingFang SC-Regular, PingFang SC;
+					font-weight: 400;
+					line-height: 30rpx;
+					text-align: center;
+					background: #FFFFFF;
+					border-radius: 10rpx;
+					border: 1rpx solid #D73232;
+					margin-right: 12rpx;
+				}
+
+				.txt {
+					line-height: 32rpx;
+					font-size: 24rpx;
+					font-family: PingFang SC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #666666;
+				}
+			}
+
+			.address_des {
+				line-height: 40rpx;
+				font-size: 28rpx;
+				font-family: PingFang SC-Bold, PingFang SC;
+				font-weight: bold;
+				color: #333333;
+				word-break: break-all;
+				margin: 20rpx 0;
+			}
+
+			.address_user {
+				display: flex;
+				align-items: center;
+				line-height: 33rpx;
+				font-size: 24rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+
+				.user_name {
+					color: #333333;
+				}
+
+				.user_phone {
+					color: #999999;
+					margin-left: 10rpx;
+				}
+			}
+		}
+
+		.order_info {
 			width: 690rpx;
 			height: auto;
 			background: #FFFFFF;
 			border-radius: 30rpx 30rpx 30rpx 30rpx;
-			margin:0 auto;
+			margin: 0 auto;
 			margin-top: 30rpx;
 			padding-bottom: 30rpx;
-			
-			.info_title{
+
+			.info_title {
 				font-size: 28rpx;
 				color: #333;
 				padding-left: 30rpx;
 				padding-top: 30rpx;
 			}
-			.info_mess{
+
+			.info_mess {
 				padding-left: 30rpx;
 				margin-top: 30rpx;
 				display: flex;
 				width: 100%;
-				
-				.left_info{
+
+				.left_info {
 					width: 130rpx;
 					font-size: 26rpx;
 					color: #666;
 				}
-				
-				.right_info{
+
+				.right_info {
 					margin-left: 28rpx;
 				}
 			}
 		}
-		
-		.sh_box{
+
+		.sh_box {
 			width: 690rpx;
 			height: 90rpx;
 			background: #FFFFFF;
@@ -459,24 +621,25 @@
 			align-items: center;
 			justify-content: center;
 			margin-top: 30rpx;
-			
-			.sh_img{
+
+			.sh_img {
 				width: 44rpx;
 				height: 44rpx;
-				
-				.img{
+
+				.img {
 					width: 100%;
 					height: 100%;
 				}
 			}
-			.sh_txt{
+
+			.sh_txt {
 				font-size: 26rpx;
 				color: #333;
 				margin-left: 10rpx;
 			}
 		}
-		
-		.btn_box{
+
+		.btn_box {
 			width: 100%;
 			height: 160rpx;
 			background: #FFFFFF;
@@ -484,8 +647,8 @@
 			bottom: 0;
 			display: flex;
 			justify-content: flex-end;
-			
-			.btn{
+
+			.btn {
 				width: 161rpx;
 				height: 60rpx;
 				background: #FFFFFF;
@@ -498,13 +661,13 @@
 				align-items: center;
 				justify-content: center;
 				color: #666666;
-				
-				&.confirm{
+
+				&.confirm {
 					border: 1rpx solid #D73232;
 					color: #D73232;
 				}
-				
-				&.info{
+
+				&.info {
 					width: 210rpx;
 				}
 			}
diff --git a/pages/pages_zhentou/order/order.vue b/pages/pages_zhentou/order/order.vue
index ae9e44f..064bfb6 100644
--- a/pages/pages_zhentou/order/order.vue
+++ b/pages/pages_zhentou/order/order.vue
@@ -45,7 +45,8 @@
 				</view> -->
 				<view class="pay_box">
 					<p class="pay_txt">实付款</p>
-					<p class="mon_txt"><span style="font-size: 22rpx;">￥</span><span style="font-size: 34rpx;">699.0</span></p>
+					<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" @click.stop="handleWuliu(item)">查看物流</p>
@@ -84,14 +85,14 @@
 		},
 		onLoad() {
 			let userInfo = uni.getStorageSync('userInfo');
-			if(userInfo) {
+			if (userInfo) {
 				this.userInfo = JSON.parse(userInfo);
 				this.loadMore();
 			}
 		},
 		methods: {
 			// 点击再次定制按钮，跳转到提交订单页面
-			clickCustom(){
+			clickCustom() {
 				uni.navigateTo({
 					url: '/pages/pages_zhentou/order/confirmOrder'
 				})
@@ -99,25 +100,29 @@
 			//支付成功回调
 			doPaySuccess(orderNo) {
 				uni.request({
-					url:getApp().globalData.baseUrl + '/blade-desk/order/paySuccessCallback',
-					method:'POST',
+					url: getApp().globalData.baseUrl + '/blade-desk/order/paySuccessCallback',
+					method: 'POST',
 					data: {
 						id: orderNo
 					},
-					header:{
+					header: {
 						'Blade-Auth': 'bearer ' + uni.getStorageSync('token')
 					},
 					success: (res) => {
-						if(res.data.code == 200){
+						if (res.data.code == 200) {
 							uni.showToast({
 								title: '订单支付成功',
 								icon: 'none'
 							})
-							let idx = this.orderData.findIndex(item => { return item.id == orderNo; })
-							if(idx > -1) {
+							let idx = this.orderData.findIndex(item => {
+								return item.id == orderNo;
+							})
+							if (idx > -1) {
 								this.orderData[idx].status = 2;
 							}
-						}else{
+						} else if (res.data.code == 401) {
+							this.doLogin()
+						} else {
 							uni.showToast({
 								title: res.data.msg,
 								icon: 'none'
@@ -155,10 +160,9 @@
 								paySign: res.data.data.paySign,
 								success: (res1) => {
 									console.log(res1)
-									if(res1.errMsg == 'requestPayment:ok') {
+									if (res1.errMsg == 'requestPayment:ok') {
 										this.doPaySuccess(orderInfo.id);
-									}
-									else{
+									} else {
 										uni.showToast({
 											title: '支付失败',
 											icon: 'none'
@@ -169,6 +173,8 @@
 									console.log(res2)
 								}
 							})
+						} else if (res.data.code == 401) {
+							this.doLogin()
 						} else {
 							uni.showToast({
 								title: res.data.msg,
@@ -184,40 +190,45 @@
 			// 查看物流
 			handleWuliu(row) {
 				uni.navigateTo({
-					url: "/pages/pages_zhentou/order/express?logisticsNo=" + row.logisticsNo + '&company=' + row.logisticsCompany + '&companyCode=' +row.logisticsCompanyCode
+					url: "/pages/pages_zhentou/order/express?logisticsNo=" + row.logisticsNo + '&company=' + row
+						.logisticsCompany + '&companyCode=' + row.logisticsCompanyCode
 				})
 			},
 			// 完善定制信息,跳转表单页面
-			handleInfo(item){
+			handleInfo(item) {
 				uni.navigateTo({
-					url:"/pages/pages_zhentou/form/form?phone=" + item.buyerPhone + '&pageFrom=order' + '&orderNo='+ item.orderNo + '&orderNum=' + item.goodsNum
+					url: "/pages/pages_zhentou/form/form?phone=" + item.buyerPhone + '&pageFrom=order' +
+						'&orderNo=' + item.orderNo + '&orderNum=' + item.goodsNum
 				})
 			},
 			// 取消订单
-			cancelOrder(row){
+			cancelOrder(row) {
 				uni.showModal({
 					title: '提示',
 					content: '确认取消该订单？',
 					success: (res) => {
 						if (res.confirm) {
 							uni.request({
-								url:getApp().globalData.baseUrl + '/blade-desk/order/cancel?id=' + row.id,
-								method:'POST',
-								header:{
+								url: getApp().globalData.baseUrl + '/blade-desk/order/cancel?id=' + row
+									.id,
+								method: 'POST',
+								header: {
 									'Blade-Auth': 'bearer ' + uni.getStorageSync('token')
 								},
 								success: (res) => {
 									console.log(res)
-									if(res.data.code == 200){
+									if (res.data.code == 200) {
 										uni.showToast({
 											title: '订单取消成功',
 											icon: 'none'
 										})
-										setTimeout(() =>{
+										setTimeout(() => {
 											uni.navigateBack()
-										},500)
-										
-									}else{
+										}, 500)
+
+									} else if (res.data.code == 401) {
+										this.doLogin()
+									} else {
 										uni.showToast({
 											title: res.data.msg,
 											icon: 'none'
@@ -226,36 +237,39 @@
 								}
 							})
 						} else if (res.cancel) {
-							
+
 						}
 					}
 				});
-				
+
 			},
 			// 删除订单
-			handleDelete(row){
+			handleDelete(row) {
 				uni.showModal({
 					title: '提示',
 					content: '确认删除订单吗？',
 					success: (res) => {
 						if (res.confirm) {
 							uni.request({
-								url:getApp().globalData.baseUrl + '/blade-desk/order/remove?ids=' + row.id,
-								method:"POST",
-								header:{
+								url: getApp().globalData.baseUrl + '/blade-desk/order/remove?ids=' +
+									row.id,
+								method: "POST",
+								header: {
 									'Blade-Auth': 'bearer ' + uni.getStorageSync('token')
 								},
 								success: (res) => {
 									console.log(res)
-									if(res.data.code == 200){
+									if (res.data.code == 200) {
 										uni.showToast({
 											title: '订单删除成功',
 											icon: 'none'
 										})
-										setTimeout(() =>{
+										setTimeout(() => {
 											uni.navigateBack()
-										},500)
-									}else{
+										}, 500)
+									} else if (res.data.code == 401) {
+										this.doLogin()
+									} else {
 										uni.showToast({
 											title: res.data.msg,
 											icon: 'none'
@@ -263,8 +277,7 @@
 									}
 								}
 							})
-						} else if (res.cancel) {
-						}
+						} else if (res.cancel) {}
 					}
 				});
 			},
@@ -273,7 +286,8 @@
 					this.current = this.current + 1;
 					this.status = 'loading';
 					uni.request({
-						url: getApp().globalData.baseUrl + '/blade-desk/order/page?buyerPhone=' + this.userInfo.phone + '&status=' + this.active + '&current=' + this.current + '&size=' + this
+						url: getApp().globalData.baseUrl + '/blade-desk/order/page?buyerPhone=' + this.userInfo
+							.phone + '&status=' + this.active + '&current=' + this.current + '&size=' + this
 							.size,
 						method: 'GET',
 						header: {
@@ -288,6 +302,8 @@
 								} else {
 									this.status = 'more';
 								}
+							} else if (res.data.code == 401) {
+								this.doLogin()
 							} else {
 								uni.showToast({
 									title: res.data.msg,
@@ -311,6 +327,37 @@
 					url: "/pages/pages_zhentou/order/checkOrder?id=" + row.id
 				})
 			},
+			//登录
+			doLogin(type) {
+				uni.showLoading({
+					title: '登录中',
+					mask: true
+				});
+				uni.request({
+					url: getApp().globalData.baseUrl + '/blade-auth/getToken',
+					method: 'POST',
+					data: {
+						openId: getApp().globalData.openId,
+						phone: this.phone
+					},
+					header: {
+						'Authorization': 'Basic c2FiZXI6c2FiZXJfc2VjcmV0'
+					},
+					success: (res) => {
+						if (res.data.code == 200) {
+							uni.setStorageSync('token', res.data.data.access_token);
+						} else {
+							uni.showToast({
+								title: res.data.msg,
+								icon: 'none'
+							})
+						}
+					},
+					complete: () => {
+						uni.hideLoading();
+					}
+				})
+			}
 		}
 	}
 </script>