diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue
index 924ce03..2c3cc14 100644
--- a/pages/order_details/stay.vue
+++ b/pages/order_details/stay.vue
@@ -157,7 +157,7 @@
 					<view>商品总额：</view>
 					<view class='conter'>￥{{orderInfo.total_price}}</view>
 				</view>
-				<view class='item acea-row row-between' v-if="orderInfo.orderList[0].merchant.settle_cycle">
+				<view class='item acea-row row-between' v-if="orderInfo.orderList && orderInfo.orderList[0].merchant.settle_cycle">
 					<view>支付方式：</view>
 					<view class='conter' v-if="orderInfo.pay_type==0">余额支付</view>
 					<view class='conter' v-if="orderInfo.pay_type==4 || orderInfo.pay_type==5">支付宝支付</view>
@@ -273,7 +273,7 @@
 		openOrderRefundSubscribe
 	} from '@/utils/SubscribeMessage.js';
 	import {
-		getUserInfo
+		getUserInfo as getUserInfos
 	} from '@/api/user.js';
 	import payment from '@/components/payment';
 	import orderGoods from "@/components/orderGoods";
@@ -519,7 +519,7 @@
 			 */
 			getUserInfo: function() {
 				let that = this;
-				getUserInfo().then(res => {
+				getUserInfos().then(res => {
 					that.payMode[2].number = res.data.now_money;
 					that.$set(that, 'payMode', that.payMode);
 				})
@@ -595,10 +595,11 @@
 			//计算是否逾期
 			moerTime(autoTime, c_time) {
 				if (this.isSelfOrder) {
-					let limitPayTime = 60 //支付时间限制
-					let curData = new Date(autoTime);
+          // console.log(new Date(autoTime), new Date(c_time*1000));
+					// let limitPayTime = 60 //支付时间限制
+					// let curData = new Date(autoTime);
+					let curData = new Date(c_time*1000 || new Date(autoTime).getSeconds() + (60*30)); // 优先使用后台设置的取消支付时间, 否则默认创建订单后30分钟
 					// curData.setSeconds(curData.getSeconds() + (60 * limitPayTime));
-					curData.setSeconds(curData.getSeconds() + (60 * limitPayTime));
 					this.be_overdue = curData.getFullYear() + '-' + (curData.getMonth() + 1) + '-' + curData.getDate() +
 						' ' +
 						curData.getHours() + ':' +