diff --git a/App.vue b/App.vue
index bafa876..f111356 100644
--- a/App.vue
+++ b/App.vue
@@ -60,8 +60,8 @@
 		globalData: {
 			openId: '',
 			test: '',
-			// baseUrl: "http://192.168.3.32:80",
-			baseUrl: "http://192.168.1.106:80",
+			baseUrl: "http://192.168.3.32:80",
+			// baseUrl: "http://192.168.1.106:80",
 			// baseUrl: "http://47.104.224.41:80",//测试环境
 			imgPrefix: "http://47.104.224.41:9000/etriphome/appresource/image/", //图片资源
 		},
diff --git a/pages/pages_zhentou/contact/contact.vue b/pages/pages_zhentou/contact/contact.vue
index 371c0d9..ee27bb6 100644
--- a/pages/pages_zhentou/contact/contact.vue
+++ b/pages/pages_zhentou/contact/contact.vue
@@ -3,7 +3,7 @@
 		<view class="contact_box">
 			<view class="qrcode_bg">
 				<image src="../../../static/image/logo.png" class="contact_logo"></image>
-				<image :src="imgPrefix + 'add.png'" class="qrcode"></image>
+				<image :show-menu-by-longpress="true" :src="imgPrefix + 'add.png'" class="qrcode"></image>
 				<view class="contact_txt">
 					<image src="../../../static/image/icon-contact.png" style="width: 44rpx; height: 44rpx;"></image>
 					<text class="txt">壹人壹枕</text>
diff --git a/pages/pages_zhentou/myPage/myPage.vue b/pages/pages_zhentou/myPage/myPage.vue
index e2a6a70..6169b30 100644
--- a/pages/pages_zhentou/myPage/myPage.vue
+++ b/pages/pages_zhentou/myPage/myPage.vue
@@ -9,7 +9,7 @@
 			</view>
 			<view class="nickname_warp">
 				<text>昵称</text>
-				<input @blur="formSubmit" v-model="userInfo.username" class="nickname" type="nickname" placeholder="请输入昵称" />
+				<input blur="formSubmit" v-model="userInfo.username" class="nickname" type="nickname" placeholder="请输入昵称" />
 			</view>
 		</view>
 		<view class="cnt-box">
@@ -81,8 +81,9 @@
 						'Blade-Auth': 'bearer ' + uni.getStorageSync('token')
 					},
 					success: (res) => {
-						if (res.data.code == 200) {
-							this.updateAvatar(res.data.link);
+						let _data = JSON.parse(res.data);
+						if (_data.code == 200) {
+							this.updateAvatar(_data.data.link);
 						}
 					}
 				})
diff --git a/pages/pages_zhentou/order/confirmOrder.vue b/pages/pages_zhentou/order/confirmOrder.vue
index 8039179..a13e8f4 100644
--- a/pages/pages_zhentou/order/confirmOrder.vue
+++ b/pages/pages_zhentou/order/confirmOrder.vue
@@ -1,9 +1,9 @@
 <template>
 	<view class="order_box">
-		<view class="order_address">
+		<view class="order_address" @click="goAddress">
 			<view class="address_info">
 				<view class="address_top" v-if="address">
-					<view class="isflag">默认</view>
+					<view class="isflag" v-if="address.isDefault == 1">默认</view>
 					<view class="txt">山东省青岛市市北区</view>
 				</view>
 				<view class="address_des" v-if="address">大港街道大港三路8号铁路住宅小区6号楼6单元666室</view>
@@ -13,7 +13,7 @@
 					<text class="user_phone">15612345678</text>
 				</view>
 			</view>
-			<image @click="goAddress" class="arrow" src="../../../static/image/icon-arrow-right.png"></image>
+			<image class="arrow" src="../../../static/image/icon-arrow-right.png"></image>
 		</view>
 		<view class="order_content">
 			<view class="order_item">
@@ -146,13 +146,13 @@
 			},
 			//提交订单
 			submitOrder() {
-				// if(!this.address) {
-				// 	uni.showToast({
-				// 		title: '请填写收货地址',
-				// 		icon: 'none'
-				// 	})
-				// 	return;
-				// }
+				if(!this.address) {
+					uni.showToast({
+						title: '请填写收货地址',
+						icon: 'none'
+					})
+					return;
+				}
 				uni.request({
 					url: getApp().globalData.baseUrl + '/blade-desk/order/save',
 					method: 'POST',
@@ -193,8 +193,41 @@
 					}
 				})
 			},
+			//支付成功回调
+			doPaySuccess(orderNo) {
+				uni.request({
+					url:getApp().globalData.baseUrl + '/blade-desk/order/paySuccessCallback',
+					method:'POST',
+					data: {
+						id: orderNo
+					},
+					header:{
+						'Blade-Auth': 'bearer ' + uni.getStorageSync('token')
+					},
+					success: (res) => {
+						if(res.data.code == 200){
+							uni.showToast({
+								title: '订单支付成功',
+								icon: 'none'
+							})
+							uni.redirectTo({
+								url: '/pages/pages_zhentou/order/order'
+							})
+						}else{
+							uni.showToast({
+								title: res.data.msg,
+								icon: 'none'
+							})
+						}
+					}
+				})
+			},
 			//支付
 			goPay(orderInfo) {
+				uni.showLoading({
+					title: '支付中',
+					mask: true
+				})
 				uni.request({
 					url: getApp().globalData.baseUrl + '/app/createOrder',
 					method: 'POST',
@@ -218,6 +251,7 @@
 								paySign: res.data.data.paySign,
 								success: (res1) => {
 									console.log(res1)
+									this.doPaySuccess(orderInfo.id)
 								},
 								fail: (res2) => {
 									console.log(res2)
@@ -300,6 +334,7 @@
 						background: #FFFFFF;
 						border-radius: 10rpx;
 						border: 1rpx solid #D73232;
+						margin-right: 12rpx;
 					}
 					.txt{
 						line-height: 32rpx;
@@ -307,7 +342,6 @@
 						font-family: PingFang SC-Regular, PingFang SC;
 						font-weight: 400;
 						color: #666666;
-						margin-left: 12rpx;
 					}
 				}
 				.address_des{
diff --git a/pages/pages_zhentou/order/order.vue b/pages/pages_zhentou/order/order.vue
index 138594b..3b57a4e 100644
--- a/pages/pages_zhentou/order/order.vue
+++ b/pages/pages_zhentou/order/order.vue
@@ -48,12 +48,12 @@
 					<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="handleWuliu(item)">查看物流</p>
-					<p class="btn confirm" v-if="item.status == 3" @click="handleConfirm(item)">确认收货</p>
-					<p class="btn" v-if="item.status == 1" @click="cancelOrder(item)">取消订单</p>
-					<p class="btn confirm" v-if="item.status == 1">立即支付</p>
+					<p class="btn" v-if="item.status == 3 || item.status == 4" @click.stop="handleWuliu(item)">查看物流</p>
+					<p class="btn confirm" v-if="item.status == 3" @click.stop="handleConfirm(item)">确认收货</p>
+					<p class="btn" v-if="item.status == 1" @click.stop="cancelOrder(item)">取消订单</p>
+					<p class="btn confirm" @click.stop="goPay(item)" v-if="item.status == 1">立即支付</p>
 					<p class="btn confirm info" v-if="item.status == 2">完善定制信息</p>
-					<p class="btn" v-if="item.status == 0" @click="handleDelete(item)">删除订单</p>
+					<p class="btn" v-if="item.status == 0" @click.stop="handleDelete(item)">删除订单</p>
 					<p class="btn confirm" v-if="item.status == 0">再次定制</p>
 				</view>
 			</view>
@@ -90,6 +90,91 @@
 			}
 		},
 		methods: {
+			//支付成功回调
+			doPaySuccess(orderNo) {
+				uni.request({
+					url:getApp().globalData.baseUrl + '/blade-desk/order/paySuccessCallback',
+					method:'POST',
+					data: {
+						id: orderNo
+					},
+					header:{
+						'Blade-Auth': 'bearer ' + uni.getStorageSync('token')
+					},
+					success: (res) => {
+						if(res.data.code == 200){
+							uni.showToast({
+								title: '订单支付成功',
+								icon: 'none'
+							})
+							let idx = this.orderData.findIndex(item => { return item.id == orderNo; })
+							if(idx > -1) {
+								this.orderData[idx].status = 2;
+							}
+						}else{
+							uni.showToast({
+								title: res.data.msg,
+								icon: 'none'
+							})
+						}
+					}
+				})
+			},
+			//支付
+			goPay(orderInfo) {
+				uni.showLoading({
+					title: '支付中',
+					mask: true
+				})
+				uni.request({
+					url: getApp().globalData.baseUrl + '/app/createOrder',
+					method: 'POST',
+					data: {
+						openId: getApp().globalData.openId,
+						outTradeNo: orderInfo.orderNo
+					},
+					header: {
+						'Blade-Auth': 'bearer ' + uni.getStorageSync('token')
+					},
+					success: (res) => {
+						console.log(res)
+						if (res.data.code == 200) {
+							uni.requestPayment({
+								provider: 'wxpay',
+								orderInfo: orderInfo,
+								timeStamp: res.data.data.timeStamp,
+								nonceStr: res.data.data.nonceStr,
+								package: res.data.data.package,
+								signType: res.data.data.signType,
+								paySign: res.data.data.paySign,
+								success: (res1) => {
+									console.log(res1)
+									if(res1.errMsg == 'requestPayment:ok') {
+										this.doPaySuccess(orderInfo.id);
+									}
+									else{
+										uni.showToast({
+											title: '支付失败',
+											icon: 'none'
+										})
+									}
+								},
+								fail: (res2) => {
+									console.log(res2)
+								}
+							})
+						} else {
+							uni.showToast({
+								title: res.data.msg,
+								icon: 'none'
+							})
+						}
+					},
+					complete: () => {
+						uni.hideLoading();
+					}
+				})
+			},
 			// 查看物流
 			handleWuliu(row) {
 				uni.navigateTo({