diff --git a/src/subPackages/order/paymentResult/index.vue b/src/subPackages/order/paymentResult/index.vue index 8db7122..022b1b4 100644 --- a/src/subPackages/order/paymentResult/index.vue +++ b/src/subPackages/order/paymentResult/index.vue @@ -5,16 +5,15 @@ 支付成功 - 请告知加油员,已成功支付,如需发票,请联系加油站开票 - 订单详情 - 返回首页 + + 订单详情 + 返回首页 + @@ -35,6 +34,7 @@ export default { }, onLoad(options) { let { orderSerialNumber } = options; + if (!orderSerialNumber) return; this.paramter.params.orderSerialNumber = orderSerialNumber; serve.getCInfoByPage(this.paramter).then((res) => { if (res.code === 20000) { @@ -77,30 +77,25 @@ export default { font-size: 40rpx; text-align: center; } - .tip { - padding: 0 70rpx; - margin-top: 30rpx; - font-size: 26rpx; - text-align: center; - color: #999; - } - .button { - margin: 0 auto; - width: 650rpx; - height: 100rpx; - line-height: 100rpx; - text-align: center; - font-size: 28rpx; - border-radius: 15rpx; - &.details { - margin-top: 120rpx; - background: #67c23a; - color: #fff; - } - &.home { - margin-top: 30rpx; - border: 1px solid #ddd; - color: #333; + .buttons { + margin-top: 150rpx; + > view { + margin: 0 auto; + width: 650rpx; + height: 100rpx; + line-height: 100rpx; + text-align: center; + font-size: 28rpx; + border-radius: 15rpx; + &.details { + background: #67c23a; + color: #fff; + } + &.home { + margin-top: 30rpx; + border: 1px solid #ddd; + color: #333; + } } } } diff --git a/src/utils/request.js b/src/utils/request.js index b4ecf67..9ff7b8b 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -28,22 +28,22 @@ instance.interceptors.request.use( } if (!token) { - token = uni.getStorageSync("Authorization") || " "; + token = uni.getStorageSync("Authorization"); } if (!unionId) { - unionId = uni.getStorageSync("unionid") || " "; + unionId = uni.getStorageSync("unionid"); } if (!openId) { - openId = uni.getStorageSync("openid") || " "; + openId = uni.getStorageSync("openid"); } + config.headers["Authorization"] = token; config.headers["imei"] = unionId; config.headers["openId"] = openId; config.headers["dataSources"] = "MP"; config.headers["loginSystem"] = "MINI_APP"; config.headers["loginDevice"] = "LOGIN_MP_WECHAT"; config.headers["accountSources"] = "LOGIN_MP_WECHAT"; - config.headers["Authorization"] = token; if (env === "production") { const JSESSIONID = utils.uuid();