Merge remote-tracking branch 'origin/txx'
# Conflicts: # manifest.json # pages/users/order_confirm/index.vue
This commit is contained in:
commit
970d50b372
|
|
@ -81,7 +81,9 @@ export function orderComment(data) {
|
|||
export function orderPay(data) {
|
||||
return request.post('pay/payment', data);
|
||||
}
|
||||
|
||||
export function orderPays(data) {
|
||||
return request.post('user/aliPayRepayment', data);
|
||||
}
|
||||
/**
|
||||
* 订单统计数据
|
||||
*/
|
||||
|
|
|
|||
594
components/payments/index.vue
Normal file
594
components/payments/index.vue
Normal file
|
|
@ -0,0 +1,594 @@
|
|||
<template>
|
||||
<view>
|
||||
<view class="payment" :class="pay_close ? 'on' : ''">
|
||||
<view class="title acea-row row-center-wrapper">
|
||||
选择付款方式<text class="iconfont icon-guanbi" @click='close'></text>
|
||||
</view>
|
||||
<view class="item acea-row row-between-wrapper" @click='goPay(item.number || 0 , item.value)'
|
||||
v-for="(item,index) in payMode" :key="index" v-if="item.payStatus==1">
|
||||
<view class="left acea-row row-between-wrapper">
|
||||
<view class="iconfont" :class="item.icon"></view>
|
||||
<view class="text">
|
||||
<view class="name">{{item.name}}</view>
|
||||
<view class="info" v-if="item.number">
|
||||
{{item.title}} <span class="money">￥{{ item.number }}</span>
|
||||
</view>
|
||||
<view class="info" v-else>{{item.title}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="iconfont icon-xiangyou"></view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="mask" style="background: none;" @click='close' v-if="pay_close"></view>
|
||||
<view class="alipaysubmit" v-html="formContent"></view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
|
||||
<script>
|
||||
import {
|
||||
orderPays,
|
||||
wechatQueryPayResult,
|
||||
getPayConfig,
|
||||
alipayQueryPayResult
|
||||
} from '@/api/order.js';
|
||||
import {
|
||||
mapGetters
|
||||
} from "vuex";
|
||||
export default {
|
||||
props: {
|
||||
pay_close: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
order_id: {
|
||||
type: String,
|
||||
default: ''
|
||||
},
|
||||
totalPrice: {
|
||||
type: String,
|
||||
default: '0'
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
formContent: '',
|
||||
payChannel: '',
|
||||
openId: '',
|
||||
checkid: '',
|
||||
intervalId: null, // 用于存储定时器的ID
|
||||
//支付方式
|
||||
payMode: [
|
||||
{
|
||||
"name": "微信支付",
|
||||
"icon": "icon-weixin2",
|
||||
value: 'weixin',
|
||||
title: '微信快捷支付',
|
||||
payStatus: 1,
|
||||
},
|
||||
// {
|
||||
// "name": "余额支付",
|
||||
// "icon": "icon-yuezhifu",
|
||||
// value: 'yue',
|
||||
// title: '可用余额:',
|
||||
// payStatus: 1,
|
||||
// number: 0
|
||||
// },
|
||||
// // #ifndef MP
|
||||
// {
|
||||
// "name": "支付宝支付",
|
||||
// "icon": "icon-zhifubao",
|
||||
// value: 'alipay',
|
||||
// title: '支付宝快捷支付',
|
||||
// payStatus: 1,
|
||||
// }
|
||||
// // #endif
|
||||
],
|
||||
};
|
||||
},
|
||||
computed: mapGetters(['systemPlatform', 'userInfo', 'productType']),
|
||||
created() {
|
||||
// this.alipayQueryPay()
|
||||
this.payConfig();
|
||||
// this.payMode[1].number = this.userInfo.nowMoney;
|
||||
this.importAliPayScript(); // 导入支付宝脚本
|
||||
this.listenMessageFromMiniProgram(); // 监听来自小程序的消息
|
||||
|
||||
},
|
||||
methods: {
|
||||
// 导入 my 对象所需的脚本
|
||||
importAliPayScript() {
|
||||
if (navigator.userAgent.indexOf('AliApp') > -1) {
|
||||
const scriptElement = document.createElement('script');
|
||||
scriptElement.src = 'https://appx/web-view.min.js';
|
||||
document.head.appendChild(scriptElement);
|
||||
}
|
||||
},
|
||||
// 发送消息给小程序
|
||||
sendMessageToMiniProgram() {
|
||||
my.postMessage({
|
||||
name: "测试支付"
|
||||
});
|
||||
},
|
||||
// 监听来自小程序的消息
|
||||
listenMessageFromMiniProgram() {
|
||||
my.onMessage = (e) => {
|
||||
if (e.type == 'authorizeResult') {
|
||||
this.openId = e.data.data.alipaySystemOauthTokenResponse.openId
|
||||
}
|
||||
console.log(e.data.data.alipaySystemOauthTokenResponse, 'aaaa'); // 在这里处理来自小程序的消息
|
||||
};
|
||||
},
|
||||
alipayQueryPay() {
|
||||
|
||||
let id = this.checkid
|
||||
alipayQueryPayResult(id).then(res => {
|
||||
if(res.data==true){
|
||||
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/alipay_returns/alipay_return?id='+id
|
||||
})
|
||||
}else{
|
||||
setTimeout(() => {
|
||||
this.alipayQueryPay()
|
||||
}, 1000);
|
||||
}
|
||||
if(res.data==null){
|
||||
setTimeout(() => {
|
||||
this.alipayQueryPay()
|
||||
}, 1000);
|
||||
}
|
||||
}).catch(err => {
|
||||
|
||||
})
|
||||
},
|
||||
// startPolling() {
|
||||
|
||||
// // 开始轮询，设置定时器每隔一段时间执行一次alipayQueryPay方法
|
||||
// this.intervalId = my.setInterval(() => {
|
||||
// this.alipayQueryPay();
|
||||
// console.log('进行了')
|
||||
// }, 5000); // 每隔5秒钟查询一次，您可以根据需要调整时间间隔次，您可以根据需要调整时间间隔
|
||||
// },
|
||||
stopPolling() {
|
||||
// 停止轮询，清除定时器
|
||||
clearInterval(this.intervalId);
|
||||
},
|
||||
// 调用支付宝支付
|
||||
aliPay(id) {
|
||||
console.log('支付宝小程序支付');
|
||||
let that = this
|
||||
console.log(that.order_id, 'idididiid');
|
||||
|
||||
my.tradePay({
|
||||
tradeNO: that.order_id,
|
||||
success: (res) => {
|
||||
uni.hideLoading();
|
||||
this.alipayQueryPay()
|
||||
// my.alert({
|
||||
// content: JSON.stringify(res),
|
||||
// });
|
||||
|
||||
// setTimeout(res => {
|
||||
// that.$emit('onChangeFun', {
|
||||
// action: 'pay_complete'
|
||||
// });
|
||||
// }, 2000)
|
||||
},
|
||||
fail: (error) => {
|
||||
uni.hideLoading();
|
||||
// that.stopPolling()
|
||||
uni.showModal({
|
||||
content: "支付失败",
|
||||
showCancel: false,
|
||||
success: function(res) {
|
||||
if (res.confirm) {
|
||||
//点击确认的操作
|
||||
that.$emit('onChangeFun', {
|
||||
action: 'pay_fail'
|
||||
});
|
||||
} else if (res.cancel) {
|
||||
|
||||
}
|
||||
}
|
||||
})
|
||||
// console.error('调用 my.tradePay 失败: ', JSON.stringify(error));
|
||||
},
|
||||
});
|
||||
},
|
||||
close: function() {
|
||||
this.$emit('onChangeFun', {
|
||||
action: 'payClose'
|
||||
});
|
||||
},
|
||||
payConfig() {
|
||||
getPayConfig().then(res => {
|
||||
this.payMode[1].payStatus = parseInt(res.data.yuePayStatus) === 1 ? 1 : 2;
|
||||
this.payMode[0].payStatus = parseInt(res.data.payWeixinOpen) === 1 ? 1 : 0;
|
||||
})
|
||||
},
|
||||
goPay: function(number, paytype) {
|
||||
let that = this;
|
||||
let goPages = '/pages/order_pay_status/index?order_id=' + that.order_id;
|
||||
if (!that.order_id) return that.$util.Tips({
|
||||
title: '请选择要支付的订单'
|
||||
});
|
||||
if (paytype == 'yue' && parseFloat(number) < parseFloat(that.totalPrice)) return that.$util.Tips({
|
||||
title: '余额不足！'
|
||||
});
|
||||
uni.showLoading({
|
||||
title: '支付中'
|
||||
});
|
||||
// #ifdef H5
|
||||
if (paytype == 'alipay') {
|
||||
that.payChannel = 'alipay';
|
||||
} else if (paytype == 'weixin' && this.$wechat.isWeixin()) {
|
||||
that.payChannel = 'public';
|
||||
} else {
|
||||
that.payChannel = 'weixinh5';
|
||||
}
|
||||
// #endif
|
||||
// #ifdef APP-PLUS
|
||||
if (paytype == 'alipay') {
|
||||
that.payChannel = 'appAliPay';
|
||||
} else if (paytype == 'weixin') {
|
||||
that.payChannel = that.systemPlatform === 'ios' ? 'weixinAppIos' : 'weixinAppAndroid';
|
||||
}
|
||||
// #endif
|
||||
orderPays({
|
||||
id: that.order_id,
|
||||
openid: that.openId,
|
||||
// orderNo: that.order_id,
|
||||
// // #ifdef MP
|
||||
// payChannel: 'routine',
|
||||
// // #endif
|
||||
// // #ifndef MP
|
||||
// payChannel:that.payChannel,
|
||||
// // #endif
|
||||
payType: paytype,
|
||||
// scene: that.productType === 'normal' ? 0 : 1177 //下单时小程序的场景值
|
||||
}).then(res => {
|
||||
let jsConfig = res.data.jsConfig;
|
||||
that.order_id = res.data.tradeNo;
|
||||
that.checkid = res.data.orderNo
|
||||
// console.log(that.checkid,'that.checkidthat.checkid');
|
||||
switch (res.data.payType) {
|
||||
case 'weixin':
|
||||
that.weixinPay(jsConfig);
|
||||
break;
|
||||
case 'yue':
|
||||
uni.hideLoading();
|
||||
return that.$util.Tips({
|
||||
title: '余额支付成功',
|
||||
icon: 'success'
|
||||
}, () => {
|
||||
that.$emit('onChangeFun', {
|
||||
action: 'pay_complete'
|
||||
});
|
||||
});
|
||||
break;
|
||||
case 'weixinh5':
|
||||
uni.hideLoading();
|
||||
location.replace(jsConfig.mwebUrl + '&redirect_url=' + window.location.protocol +
|
||||
'//' + window.location.host + goPages + '&status=1');
|
||||
return that.$util.Tips({
|
||||
title: "支付中",
|
||||
icon: 'success'
|
||||
}, () => {
|
||||
that.$emit('onChangeFun', {
|
||||
action: 'pay_complete'
|
||||
});
|
||||
});
|
||||
break;
|
||||
case 'alipay':
|
||||
//
|
||||
// uni.hideLoading();
|
||||
if(that.openId==''){
|
||||
if (this.$wechat.isWeixin()) {
|
||||
//微信公众号内支付
|
||||
} else {
|
||||
//h5支付
|
||||
console.log('进入h5支付宝');
|
||||
uni.hideLoading();
|
||||
that.formContent = res.data.alipayRequest;
|
||||
uni.setStorage({
|
||||
key: 'orderNo',
|
||||
data: that.order_id
|
||||
});
|
||||
that.$nextTick(() => {
|
||||
document.forms['punchout_form'].submit();
|
||||
})
|
||||
}
|
||||
}else{
|
||||
this.aliPay(that.order_id)
|
||||
}
|
||||
//#ifdef H5
|
||||
|
||||
//#endif
|
||||
//#ifdef MP-ALIPAY
|
||||
|
||||
|
||||
//#endif
|
||||
// #ifdef APP-PLUS
|
||||
let alipayRequest = res.data.alipayRequest;
|
||||
uni.requestPayment({
|
||||
provider: 'alipay',
|
||||
orderInfo: alipayRequest,
|
||||
success: (e) => {
|
||||
uni.showToast({
|
||||
title: "支付成功"
|
||||
})
|
||||
setTimeout(res => {
|
||||
that.$emit('onChangeFun', {
|
||||
action: 'pay_complete'
|
||||
});
|
||||
}, 2000)
|
||||
},
|
||||
fail: (e) => {
|
||||
uni.showModal({
|
||||
content: "支付失败",
|
||||
showCancel: false,
|
||||
success: function(res) {
|
||||
if (res.confirm) {
|
||||
//点击确认的操作
|
||||
that.$emit('onChangeFun', {
|
||||
action: 'pay_fail'
|
||||
});
|
||||
} else if (res.cancel) {
|
||||
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
complete: () => {
|
||||
uni.hideLoading();
|
||||
},
|
||||
});
|
||||
// #endif
|
||||
break;
|
||||
}
|
||||
}).catch(err => {
|
||||
uni.hideLoading();
|
||||
return that.$util.Tips({
|
||||
title: err
|
||||
}, () => {
|
||||
that.$emit('onChangeFun', {
|
||||
action: 'pay_fail'
|
||||
});
|
||||
});
|
||||
})
|
||||
},
|
||||
weixinPay(jsConfig) {
|
||||
let that = this;
|
||||
// #ifdef MP
|
||||
uni.requestOrderPayment({
|
||||
timeStamp: jsConfig.timeStamp,
|
||||
nonceStr: jsConfig.nonceStr,
|
||||
package: jsConfig.packages,
|
||||
signType: jsConfig.signType,
|
||||
paySign: jsConfig.paySign,
|
||||
ticket: jsConfig.ticket,
|
||||
success: function(ress) {
|
||||
uni.hideLoading();
|
||||
wechatQueryPayResult(that.order_id).then(res => {
|
||||
uni.hideLoading();
|
||||
return that.$util.Tips({
|
||||
title: "支付成功",
|
||||
icon: 'success'
|
||||
}, () => {
|
||||
that.$emit('onChangeFun', {
|
||||
action: 'pay_complete'
|
||||
});
|
||||
});
|
||||
}).cache(err => {
|
||||
uni.hideLoading();
|
||||
return that.$util.Tips({
|
||||
title: err
|
||||
});
|
||||
})
|
||||
},
|
||||
fail: function(e) {
|
||||
uni.hideLoading();
|
||||
return that.$util.Tips({
|
||||
title: '取消支付'
|
||||
}, () => {
|
||||
that.$emit('onChangeFun', {
|
||||
action: 'pay_fail'
|
||||
});
|
||||
});
|
||||
},
|
||||
complete: function(e) {
|
||||
uni.hideLoading();
|
||||
if (e.errMsg == 'requestPayment:cancel') return that.$util
|
||||
.Tips({
|
||||
title: '取消支付'
|
||||
}, () => {
|
||||
that.$emit('onChangeFun', {
|
||||
action: 'pay_fail'
|
||||
});
|
||||
});
|
||||
},
|
||||
})
|
||||
// #endif
|
||||
// #ifdef H5
|
||||
let datas = {
|
||||
timestamp: jsConfig.timeStamp,
|
||||
nonceStr: jsConfig.nonceStr,
|
||||
package: jsConfig.packages,
|
||||
signType: jsConfig.signType,
|
||||
paySign: jsConfig.paySign
|
||||
};
|
||||
that.$wechat.pay(datas).then(res => {
|
||||
if (res.errMsg == 'chooseWXPay:cancel') {
|
||||
uni.hideLoading();
|
||||
return that.$util.Tips({
|
||||
title: '支付失败'
|
||||
});
|
||||
} else {
|
||||
wechatQueryPayResult(that.order_id).then(res => {
|
||||
uni.hideLoading();
|
||||
return that.$util.Tips({
|
||||
title: "支付成功",
|
||||
icon: 'success'
|
||||
}, () => {
|
||||
that.$emit('onChangeFun', {
|
||||
action: 'pay_complete'
|
||||
});
|
||||
});
|
||||
}).cache(err => {
|
||||
uni.hideLoading();
|
||||
return that.$util.Tips({
|
||||
title: err
|
||||
});
|
||||
})
|
||||
}
|
||||
|
||||
}).cache(errW => {
|
||||
uni.hideLoading();
|
||||
return that.$util.Tips({
|
||||
title: errW
|
||||
});
|
||||
})
|
||||
// #endif
|
||||
// #ifdef APP-PLUS
|
||||
uni.requestPayment({
|
||||
provider: 'wxpay',
|
||||
orderInfo: {
|
||||
"appid": jsConfig.appId, // 微信开放平台 - 应用 - AppId，注意和微信小程序、公众号 AppId 可能不一致
|
||||
"noncestr": jsConfig.nonceStr, // 随机字符串
|
||||
"package": "Sign=WXPay", // 固定值
|
||||
"partnerid": jsConfig.partnerid, // 微信支付商户号
|
||||
"prepayid": jsConfig.packages, // 统一下单订单号
|
||||
"timestamp": Number(jsConfig.timeStamp), // 时间戳（单位：秒）
|
||||
"sign": this.systemPlatform === 'ios' ? 'MD5' : jsConfig
|
||||
.paySign // 签名，这里用的 MD5 签名
|
||||
}, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
|
||||
success: (e) => {
|
||||
uni.hideLoading();
|
||||
let url = '/pages/order_pay_status/index?order_id=' + that.order_id;
|
||||
uni.showToast({
|
||||
title: "支付成功"
|
||||
})
|
||||
setTimeout(res => {
|
||||
that.$emit('onChangeFun', {
|
||||
action: 'pay_complete'
|
||||
});
|
||||
}, 2000)
|
||||
},
|
||||
fail: (e) => {
|
||||
uni.hideLoading();
|
||||
uni.showModal({
|
||||
content: "支付失败",
|
||||
showCancel: false,
|
||||
success: function(res) {
|
||||
if (res.confirm) {
|
||||
that.$emit('onChangeFun', {
|
||||
action: 'pay_fail'
|
||||
});
|
||||
} else if (res.cancel) {
|
||||
console.log('用户点击取消');
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
complete: () => {
|
||||
uni.hideLoading();
|
||||
},
|
||||
});
|
||||
// #endif
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.payment {
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
border-radius: 16rpx 16rpx 0 0;
|
||||
background-color: #fff;
|
||||
padding-bottom: 60rpx;
|
||||
z-index: 99;
|
||||
transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
|
||||
transform: translate3d(0, 100%, 0);
|
||||
}
|
||||
|
||||
.payment.on {
|
||||
transform: translate3d(0, 0, 0);
|
||||
}
|
||||
|
||||
.payment .title {
|
||||
text-align: center;
|
||||
height: 123rpx;
|
||||
font-size: 32rpx;
|
||||
color: #282828;
|
||||
font-weight: bold;
|
||||
padding-right: 30rpx;
|
||||
margin-left: 30rpx;
|
||||
position: relative;
|
||||
border-bottom: 1rpx solid #eee;
|
||||
}
|
||||
|
||||
.payment .title .iconfont {
|
||||
position: absolute;
|
||||
right: 30rpx;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
font-size: 43rpx;
|
||||
color: #8a8a8a;
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
.payment .item {
|
||||
border-bottom: 1rpx solid #eee;
|
||||
height: 130rpx;
|
||||
margin-left: 30rpx;
|
||||
padding-right: 30rpx;
|
||||
}
|
||||
|
||||
.payment .item .left {
|
||||
width: 610rpx;
|
||||
}
|
||||
|
||||
.payment .item .left .text {
|
||||
width: 540rpx;
|
||||
}
|
||||
|
||||
.payment .item .left .text .name {
|
||||
font-size: 32rpx;
|
||||
color: #282828;
|
||||
}
|
||||
|
||||
.payment .item .left .text .info {
|
||||
font-size: 24rpx;
|
||||
color: #999;
|
||||
}
|
||||
|
||||
.payment .item .left .text .info .money {
|
||||
color: #ff9900;
|
||||
}
|
||||
|
||||
.payment .item .left .iconfont {
|
||||
font-size: 45rpx;
|
||||
color: #09bb07;
|
||||
}
|
||||
|
||||
.payment .item .left .iconfont.icon-zhifubao {
|
||||
color: #00aaea;
|
||||
}
|
||||
|
||||
.payment .item .left .iconfont.icon-yuezhifu {
|
||||
color: #ff9900;
|
||||
}
|
||||
|
||||
.payment .item .left .iconfont.icon-yuezhifu1 {
|
||||
color: #eb6623;
|
||||
}
|
||||
|
||||
.payment .item .iconfont {
|
||||
font-size: 0.3rpx;
|
||||
color: #999;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
//移动端商城API
|
||||
// let domain = 'http://117.50.163.143:20410'
|
||||
// let domain = 'http://117.50.215.20:20410'
|
||||
// let domain = 'http://192.168.2.14:8081'
|
||||
let domain = 'http://192.168.2.26:20411'
|
||||
// let domain = 'http://106.75.49.247:20410'
|
||||
let domain = 'https://yruibao.com/prod'
|
||||
// let domain = 'https://yruibao.com/prod'
|
||||
module.exports = {
|
||||
// 请求域名 格式： https://您的域名
|
||||
// #ifdef MP || APP-PLUS
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name" : "先享后付",
|
||||
"appid" : "__UNI__E7B7107", //wxb74514b47a2f29d4 wx46c3a73d8c4f7051 __UNI__EB8A7B
|
||||
"appid" : "__UNI__EA8F22D", //wxb74514b47a2f29d4 wx46c3a73d8c4f7051 __UNI__EB8A7B
|
||||
"description" : "crmeb商城",
|
||||
"versionName" : "2.1",
|
||||
"versionCode" : 2,
|
||||
|
|
@ -219,7 +219,8 @@
|
|||
"async" : {
|
||||
"timeout" : 200000
|
||||
},
|
||||
"title" : "先享后付"
|
||||
"title" : "先享后付",
|
||||
"template" : "template.html"
|
||||
},
|
||||
"plus" : {
|
||||
"statusbar" : {
|
||||
|
|
|
|||
|
|
@ -820,6 +820,14 @@
|
|||
"enablePullDownRefresh": false
|
||||
}
|
||||
}
|
||||
,{
|
||||
"path" : "alipay_returns/alipay_return",
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText": "",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
}
|
||||
,{
|
||||
"path" : "alipay_invoke/index",
|
||||
"style" :
|
||||
|
|
|
|||
|
|
@ -108,20 +108,20 @@
|
|||
</scroll-view>
|
||||
<view class='footer acea-row row-between-wrapper'>
|
||||
<!-- #ifdef MP -->
|
||||
<button hover-class='none' class='item skeleton-rect' @click="onClickService" v-if="chatConfig.telephone_service_switch === '1'">
|
||||
<!-- <button hover-class='none' class='item skeleton-rect' @click="onClickService" v-if="chatConfig.telephone_service_switch === '1'">
|
||||
<view class='iconfont icon-kefu'></view>
|
||||
<view>客服</view>
|
||||
</button>
|
||||
<button open-type="contact" hover-class='none' class='item skeleton-rect' v-else>
|
||||
</button> -->
|
||||
<!-- <button open-type="contact" hover-class='none' class='item skeleton-rect' v-else>
|
||||
<view class='iconfont icon-kefu'></view>
|
||||
<view>客服</view>
|
||||
</button>
|
||||
</button> -->
|
||||
<!-- #endif -->
|
||||
<!-- #ifndef MP -->
|
||||
<navigator hover-class="none" class="item skeleton-rect" @click="onClickService">
|
||||
<!-- <navigator hover-class="none" class="item skeleton-rect" @click="onClickService">
|
||||
<view class="iconfont icon-kefu"></view>
|
||||
<view>客服</view>
|
||||
</navigator>
|
||||
</navigator> -->
|
||||
<!-- #endif -->
|
||||
<view @tap='setCollect' class='item skeleton-rect'>
|
||||
<view class='iconfont icon-shoucang1' v-if="userCollect"></view>
|
||||
|
|
|
|||
|
|
@ -200,10 +200,10 @@
|
|||
</button>
|
||||
<!-- #endif -->
|
||||
<!-- #ifndef MP -->
|
||||
<view class="item skeleton-rect" @click="onClickService">
|
||||
<!-- <view class="item skeleton-rect" @click="onClickService">
|
||||
<view class="iconfont icon-kefu"></view>
|
||||
<view>客服</view>
|
||||
</view>
|
||||
</view> -->
|
||||
<!-- #endif -->
|
||||
<block v-if="type === 'normal'">
|
||||
<view @click="setCollect" class='item skeleton-rect'>
|
||||
|
|
|
|||
|
|
@ -113,17 +113,17 @@
|
|||
|
||||
<!-- #ifndef MP -->
|
||||
<div class="goodCall borRadius14" @click="onClickService">
|
||||
<span class="iconfont icon-kefu"></span><span>联系客服</span>
|
||||
<!-- <span class="iconfont icon-kefu"></span><span>联系客服</span> -->
|
||||
</div>
|
||||
<!-- #endif -->
|
||||
<!-- #ifdef MP -->
|
||||
<div class="goodCall borRadius14">
|
||||
<button hover-class='none' @click="onClickService" v-if="chatConfig.telephone_service_switch === '1'">
|
||||
<!-- <button hover-class='none' @click="onClickService" v-if="chatConfig.telephone_service_switch === '1'">
|
||||
<span class="iconfont icon-kefu"></span><span>联系客服</span>
|
||||
</button>
|
||||
<button open-type='contact' hover-class='none' v-else>
|
||||
<span class="iconfont icon-kefu"></span><span>联系客服</span>
|
||||
</button>
|
||||
</button> -->
|
||||
</div>
|
||||
<!-- #endif -->
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -111,14 +111,14 @@
|
|||
</view>
|
||||
</block>
|
||||
<!-- #ifndef MP -->
|
||||
<view class="item" @click="onClickService">
|
||||
<!-- <view class="item" @click="onClickService">
|
||||
<image :src="servicePic"></image>
|
||||
<text>联系客服</text>
|
||||
</view>
|
||||
</view> -->
|
||||
<!-- #endif -->
|
||||
<!-- #ifdef MP -->
|
||||
<!-- v-if="chatConfig.telephone_service_switch" -->
|
||||
<button class="item" hover-class='none' @click="onClickService"
|
||||
<!-- <button class="item" hover-class='none' @click="onClickService"
|
||||
v-if="chatConfig.telephone_service_switch === '1'">
|
||||
<image :src="servicePic"></image>
|
||||
<text>联系客服</text>
|
||||
|
|
@ -126,7 +126,7 @@
|
|||
<button class="item" open-type='contact' hover-class='none' v-else>
|
||||
<image :src="servicePic"></image>
|
||||
<text>联系客服</text>
|
||||
</button>
|
||||
</button> -->
|
||||
<!-- #endif -->
|
||||
</view>
|
||||
</view>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
242
pages/users/alipay_returns/alipay_return.vue
Normal file
242
pages/users/alipay_returns/alipay_return.vue
Normal file
|
|
@ -0,0 +1,242 @@
|
|||
<template>
|
||||
<view :data-theme="theme">
|
||||
<view class='payment-status'>
|
||||
<!--失败时： 用icon-iconfontguanbi fail替换icon-duihao2 bg-color-->
|
||||
<view class='iconfont icons icon-duihao2 bg_color'
|
||||
v-if="order_pay_info.paid === 1"></view>
|
||||
<view v-if="order_pay_info.paid === 2" class='iconfont icons icon-iconfontguanbi'></view>
|
||||
<!-- 失败时：订单支付失败 -->
|
||||
<view class='status'>{{payResult}}</view>
|
||||
<view class='wrapper'>
|
||||
<view class='item acea-row row-between-wrapper'>
|
||||
<view>订单编号</view>
|
||||
<view class='itemCom'>{{orderId}}</view>
|
||||
</view>
|
||||
<view class='item acea-row row-between-wrapper'>
|
||||
<view>下单时间</view>
|
||||
<view class='itemCom'>{{order_pay_info.createTime?order_pay_info.createTime:'-'}}</view>
|
||||
</view>
|
||||
<view class='item acea-row row-between-wrapper'>
|
||||
<view>支付方式</view>
|
||||
<view class='itemCom'>支付宝支付</view>
|
||||
</view>
|
||||
<view class='item acea-row row-between-wrapper'>
|
||||
<view>支付金额</view>
|
||||
<view class='itemCom'>{{order_pay_info.payPrice}}</view>
|
||||
</view>
|
||||
<!--失败时加上这个 -->
|
||||
<view class='item acea-row row-between-wrapper'
|
||||
v-if="order_pay_info.paid === 2">
|
||||
<view>失败原因</view>
|
||||
<view class='itemCom'>{{msg}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<!--失败时： 重新购买 -->
|
||||
<!-- <view @tap="goOrderDetails">
|
||||
<button formType="submit" class='returnBnt bg_color' hover-class='none'>查看订单</button>
|
||||
</view> -->
|
||||
<button @click="goIndex" class='returnBnt cart-color' formType="submit" hover-class='none'>返回首页</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {getOrderDetail,alipayQueryPayResult} from '@/api/order.js';
|
||||
let app = getApp();
|
||||
export default{
|
||||
data() {
|
||||
return {
|
||||
orderId: '',
|
||||
payPrice:'',
|
||||
order_pay_info: {
|
||||
paid: 0,
|
||||
_status: {}
|
||||
},
|
||||
isAuto: false, //没有授权的不会自动授权
|
||||
isShowAuth: false, //是否隐藏授权
|
||||
status: 0,
|
||||
msg: '',
|
||||
payResult: '账单支付成功',
|
||||
payTime:'',
|
||||
theme:app.globalData.theme,
|
||||
};
|
||||
},
|
||||
onLoad(e){
|
||||
console.log(e,'order42554170683809301198448order42554170683809301198448order42554170683809301198448');
|
||||
this.orderId = e.id; //返回的订单号
|
||||
this.getOrderPayInfo();
|
||||
// // #ifdef H5
|
||||
// var url = window.location.search;
|
||||
// if(url){
|
||||
// var theRequest = new Object();
|
||||
// if (url.indexOf("?") != -1) {
|
||||
// var str = url.substr(1);
|
||||
// var strs = str.split("&");
|
||||
// for (var i = 0; i < strs.length; i++) {
|
||||
// theRequest[strs[i].split('=')[0]] = decodeURI(strs[i].split('=')[1]);
|
||||
// }
|
||||
// }
|
||||
// // this.orderId = theRequest.out_trade_no; //返回的订单号
|
||||
|
||||
// }else{
|
||||
// let that = this;
|
||||
// uni.getStorage({
|
||||
// key: 'orderNo',
|
||||
// success: function (res) {
|
||||
// that.orderId = res.data; //如果是支付宝中途放弃支付跳转到这个页面，就从缓存读取订单号查询订单详情和支付结果
|
||||
// setTimeout(()=>{
|
||||
// that.getOrderPayInfo();
|
||||
// },200)
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
// // #endif
|
||||
|
||||
// // #ifdef APP-PLUS
|
||||
// console.log(e);
|
||||
// this.orderId = e.out_trade_no;
|
||||
// this.getOrderPayInfo();
|
||||
// // #endif
|
||||
},
|
||||
methods:{
|
||||
getOrderPayInfo: function() {
|
||||
let that = this;
|
||||
uni.showLoading({
|
||||
title: '正在加载中'
|
||||
});
|
||||
getOrderDetail(that.orderId).then(res => {
|
||||
that.$set(that, 'order_pay_info', res.data);
|
||||
if(res.data.paid === false){
|
||||
that.alipayQueryPay();
|
||||
}
|
||||
uni.hideLoading();
|
||||
}).catch(err => {
|
||||
uni.hideLoading();
|
||||
});
|
||||
},
|
||||
alipayQueryPay() {
|
||||
alipayQueryPayResult(this.orderId).then(res => {
|
||||
this.payResult = '支付成功';
|
||||
uni.setNavigationBarTitle({
|
||||
title: '支付成功'
|
||||
});
|
||||
this.order_pay_info.paid = 1;
|
||||
uni.hideLoading();
|
||||
}).catch(err => {
|
||||
this.order_pay_info.paid = 2;
|
||||
this.payResult = err;
|
||||
this.msg = err;
|
||||
uni.hideLoading();
|
||||
return this.$util.Tips({
|
||||
title: err
|
||||
});
|
||||
})
|
||||
},
|
||||
goOrderDetails(){
|
||||
uni.navigateTo({
|
||||
url: '/pages/order_details/index?order_id=' + this.orderId
|
||||
})
|
||||
},
|
||||
goIndex(){
|
||||
uni.switchTab({
|
||||
url: '/pages/index/index'
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style lang="scss">
|
||||
.icon-iconfontguanbi {
|
||||
background-color: #999 !important;
|
||||
text-shadow: none !important;
|
||||
}
|
||||
.bg_color{
|
||||
@include main_bg_color(theme);
|
||||
}
|
||||
.cart_color{
|
||||
@include main_color(theme);
|
||||
@include coupons_border_color(theme);
|
||||
}
|
||||
.payment-status {
|
||||
background-color: #fff;
|
||||
margin: 195rpx 30rpx 0 30rpx;
|
||||
border-radius: 10rpx;
|
||||
padding: 1rpx 0 28rpx 0;
|
||||
}
|
||||
|
||||
.payment-status .icons {
|
||||
font-size: 70rpx;
|
||||
width: 140rpx;
|
||||
height: 140rpx;
|
||||
border-radius: 50%;
|
||||
color: #fff;
|
||||
text-align: center;
|
||||
line-height: 140rpx;
|
||||
text-shadow: 0px 4px 0px #df1e14;
|
||||
border: 6rpx solid #f5f5f5;
|
||||
margin: -76rpx auto 0 auto;
|
||||
background-color: #999;
|
||||
}
|
||||
|
||||
.payment-status .iconfont {
|
||||
font-size: 70rpx;
|
||||
width: 140rpx;
|
||||
height: 140rpx;
|
||||
border-radius: 50%;
|
||||
color: #fff;
|
||||
text-align: center;
|
||||
line-height: 140rpx;
|
||||
text-shadow: 0px 4px 0px #df1e14;
|
||||
border: 6rpx solid #f5f5f5;
|
||||
margin: -76rpx auto 0 auto;
|
||||
background-color: #999;
|
||||
}
|
||||
|
||||
.payment-status .iconfont.fail {
|
||||
text-shadow: 0px 4px 0px #7a7a7a;
|
||||
}
|
||||
|
||||
.payment-status .status {
|
||||
font-size: 32rpx;
|
||||
font-weight: bold;
|
||||
text-align: center;
|
||||
margin: 25rpx 0 37rpx 0;
|
||||
}
|
||||
|
||||
.payment-status .wrapper {
|
||||
border: 1rpx solid #eee;
|
||||
margin: 0 30rpx 47rpx 30rpx;
|
||||
padding: 35rpx 0;
|
||||
border-left: 0;
|
||||
border-right: 0;
|
||||
}
|
||||
|
||||
.payment-status .wrapper .item {
|
||||
font-size: 28rpx;
|
||||
color: #282828;
|
||||
}
|
||||
|
||||
.payment-status .wrapper .item~.item {
|
||||
margin-top: 20rpx;
|
||||
}
|
||||
|
||||
.payment-status .wrapper .item .itemCom {
|
||||
color: #666;
|
||||
}
|
||||
|
||||
.payment-status .returnBnt {
|
||||
width: 630rpx;
|
||||
height: 86rpx;
|
||||
border-radius: 50rpx;
|
||||
color: #fff;
|
||||
font-size: 30rpx;
|
||||
text-align: center;
|
||||
line-height: 86rpx;
|
||||
margin: 0 auto 20rpx auto;
|
||||
|
||||
}
|
||||
.cart-color {
|
||||
@include main_color(theme);
|
||||
@include coupons_border_color(theme);
|
||||
}
|
||||
</style>
|
||||
|
|
@ -1110,7 +1110,7 @@
|
|||
uid: this.$store.getters.uid
|
||||
}
|
||||
getidentity(data).then(res=>{
|
||||
if (res.message == '操作成功' && res.data != '') {
|
||||
if (res.message == '操作成功' && res.data!=null){
|
||||
this.sfxx = '已完成'
|
||||
this.identification = res.data
|
||||
}
|
||||
|
|
|
|||
|
|
@ -76,8 +76,10 @@
|
|||
</view>
|
||||
<view class='bottom acea-row row-right row-middle'>
|
||||
<view class="bohui" v-if="item.status == -4">驳回原因: {{item.auditRejectReason}}</view>
|
||||
<!-- <view class='bnt bg_color' @click='goPay(item.payPrice,item.orderId)'>立即付款</view> -->
|
||||
<!-- <view class='bnt cancelBnt' v-if="item.status == 6 || item.status== 7" @click='cancelOrder(index,item.id)'>取消订单</view> -->
|
||||
<view class='bnt bg_color' v-if="item.status==7" @click='lijiqy(item.orderId,item.id)'>立即签约
|
||||
<!-- <view class='bnt bg_color' v-if="item.status==7" @click='lijiali()'>立即签约 -->
|
||||
</view>
|
||||
<view class='bnt bg_color'
|
||||
v-else-if="item.status== 2 || item.status== 8 || item.status== 4 || item.status== -1"
|
||||
|
|
@ -216,8 +218,16 @@
|
|||
// #ifdef H5
|
||||
if (this.$wechat.isWeixin()) this.payMode.pop();
|
||||
// #endif
|
||||
|
||||
},
|
||||
methods: {
|
||||
lijiali(){
|
||||
uni.webView.postMessage({
|
||||
data: {
|
||||
action: 'getqiany'
|
||||
}
|
||||
})
|
||||
},
|
||||
// 点击立即签约
|
||||
lijiqy(id, ids) {
|
||||
this.$Cache.set('qyids', id)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
<template>
|
||||
<view class="repaymentbox">
|
||||
<!-- <view class="toreturn" @click="toreturn()">
|
||||
111111111
|
||||
</view> -->
|
||||
<view class="repaymenttext">
|
||||
<a href="javascript:;" :class="index == 0 ? 'active' : ''" v-model="index" @click="btnhk">待还款</a>
|
||||
<a href="javascript:;" :class="index == 1 ? 'active' : ''" v-model="index" @click="btnjq">已结清</a>
|
||||
|
|
@ -18,10 +21,14 @@
|
|||
{{item.repaymentStatus == 'Pending'? '待还款' : 'Partial' ? '部分还款' : 'Paid' ? '已还款' : '逾期'}}</view>
|
||||
<!-- 'Pending'? '待还款' : 'Partial' ? '部分还款' : 'Paid' ? '已还款' : '逾期' -->
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<view class="rt">
|
||||
<a href="javascript:;">{{title}}</a>
|
||||
<a href="javascript:;" @click='goPay(item.repaymentAmount,item.id)'>{{title}}</a>
|
||||
<!-- <view class='bnt bg_color' v-if="!item.paid" @click='goPay(item.payPrice,item.orderId)'>立即付款</view> -->
|
||||
</view>
|
||||
<payment :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id" :totalPrice='totalPrice'>
|
||||
</payment>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
|
@ -30,19 +37,53 @@
|
|||
import {
|
||||
getreceivable
|
||||
} from '@/api/api.js'
|
||||
import payment from '@/components/payments';
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
index: 0,
|
||||
binglist: [],
|
||||
title: '还款'
|
||||
title: '还款',
|
||||
pay_close: false,
|
||||
pay_order_id: '',
|
||||
totalPrice: '0',
|
||||
}
|
||||
},
|
||||
components: {
|
||||
payment,
|
||||
|
||||
},
|
||||
onLoad() {
|
||||
this.getData()
|
||||
uni.webView.postMessage({
|
||||
data: {
|
||||
action: 'authorize'
|
||||
}
|
||||
})
|
||||
//#ifdef MP-ALIPAY
|
||||
|
||||
// this.aliPay(that.order_id)
|
||||
//#endif
|
||||
|
||||
// console.log(this.$Cache.get('orderno'))
|
||||
// window.my.postMessage({ action: 'authorize' });
|
||||
|
||||
// step 4. 接受小程序发过来的用户信息
|
||||
|
||||
},
|
||||
methods: {
|
||||
toreturn(){
|
||||
console.log('点击了');
|
||||
|
||||
// uni.navigateTo({
|
||||
// url: '/pages/users/alipay_return/alipay_return'
|
||||
// })
|
||||
},
|
||||
ispayok(num){
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/alipay_return/alipay_return'
|
||||
})
|
||||
},
|
||||
btnhk() {
|
||||
this.index = 0
|
||||
this.title = '还款'
|
||||
|
|
@ -57,13 +98,59 @@
|
|||
getData: function() {
|
||||
let data = {
|
||||
uid:this.$store.getters.uid,
|
||||
orderId:this.$Cache.get('ordernobh'),
|
||||
// orderId:this.$Cache.get('ordernobh'),
|
||||
type: this.index
|
||||
}
|
||||
getreceivable(data).then(res => {
|
||||
this.binglist = res.data
|
||||
})
|
||||
}
|
||||
},
|
||||
/**
|
||||
* 事件回调
|
||||
*
|
||||
*/
|
||||
onChangeFun: function(e) {
|
||||
|
||||
let opt = e;
|
||||
let action = opt.action || null;
|
||||
let value = opt.value != undefined ? opt.value : null;
|
||||
(action && this[action]) && this[action](value);
|
||||
},
|
||||
/**
|
||||
* 关闭支付组件
|
||||
*
|
||||
*/
|
||||
payClose: function() {
|
||||
this.pay_close = false;
|
||||
},
|
||||
/**
|
||||
* 打开支付组件
|
||||
*
|
||||
*/
|
||||
goPay(pay_price, order_id) {
|
||||
this.$set(this, 'pay_close', true);
|
||||
this.$set(this, 'pay_order_id', order_id);
|
||||
this.$set(this, 'totalPrice', pay_price);
|
||||
},
|
||||
/**
|
||||
* 支付成功回调
|
||||
*
|
||||
*/
|
||||
pay_complete: function() {
|
||||
this.loadend = false;
|
||||
this.page = 1;
|
||||
this.$set(this, 'orderList', []);
|
||||
this.$set(this, 'pay_close', false);
|
||||
this.getOrderData();
|
||||
this.getOrderList();
|
||||
},
|
||||
/**
|
||||
* 支付失败回调
|
||||
*
|
||||
*/
|
||||
pay_fail: function() {
|
||||
this.pay_close = false;
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -52,12 +52,17 @@
|
|||
}
|
||||
},
|
||||
onLoad(option) {
|
||||
this.orderNo = this.$Cache.get('qyids')
|
||||
// this.orderNo = this.$Cache.get('qyids')
|
||||
// console.log(this.id)
|
||||
// this.orderNo = option.orderId
|
||||
this.orderNo = option.orderId
|
||||
let token =option.token
|
||||
console.log(token,'tokentokentokentokentoken');
|
||||
this.$store.commit("LOGIN", {
|
||||
'token': token
|
||||
});
|
||||
// this.shopobj = JSON.parse(option.shopobj)
|
||||
this.getnews(this.orderNo)
|
||||
this.logoflag = true
|
||||
// this.getnews()
|
||||
// this.logoflag = true
|
||||
|
||||
this.timer = setInterval(() => {
|
||||
this.getnews()
|
||||
|
|
@ -67,14 +72,15 @@
|
|||
|
||||
},
|
||||
methods: {
|
||||
getnews(orderNo) {
|
||||
getqianyue(orderNo).then(res => {
|
||||
getnews() {
|
||||
getqianyue(this.orderNo).then(res => {
|
||||
console.log(res)
|
||||
this.signStatus = res.data.signStatus
|
||||
if (this.signStatus == 2) {
|
||||
this.flag = true
|
||||
this.text = '成功'
|
||||
this.logoflag = false
|
||||
clearInterval(this.timer);
|
||||
}
|
||||
})
|
||||
},
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
<view v-else>
|
||||
<button v-if="routinePhoneVerification == 1 || routinePhoneVerification.length===3" hover-class="none"
|
||||
@click="onUserPhone" class="btn1 bg-color"><text
|
||||
class='iconfont icon-weixin2'></text>一键绑定手机号</button>
|
||||
class='iconfont icon-weixin2' v-if="false"></text>手机号快捷登录</button>
|
||||
<button v-if="routinePhoneVerification == 2 || routinePhoneVerification.length===3" hover-class="none"
|
||||
@click="onUserPhone('isPhone')" class="btn2">手动绑定手机号</button>
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -1,29 +1,48 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="zh-CN">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="apple-mobile-web-app-title" content="融合评价">
|
||||
<title>
|
||||
<%= htmlWebpackPlugin.options.title %>
|
||||
</title>
|
||||
<!-- Open Graph data -->
|
||||
<!-- <meta property="og:title" content="Title Here" /> -->
|
||||
<!-- <meta property="og:url" content="http://www.example.com/" /> -->
|
||||
<!-- <meta property="og:image" content="http://example.com/image.jpg" /> -->
|
||||
<!-- <meta property="og:description" content="Description Here" /> -->
|
||||
<script>
|
||||
var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
|
||||
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
|
||||
</script>
|
||||
<link rel="stylesheet" href="<%= BASE_URL %>static/index.<%= VUE_APP_INDEX_CSS_HASH %>.css" />
|
||||
<link rel="apple-touch-icon" href="/static/favicon.png">
|
||||
</head>
|
||||
<body>
|
||||
<noscript>
|
||||
<strong>Please enable JavaScript to continue.</strong>
|
||||
</noscript>
|
||||
<div id="app"></div>
|
||||
<!-- built files will be auto injected -->
|
||||
</body>
|
||||
</html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<title>
|
||||
<%= htmlWebpackPlugin.options.title %>
|
||||
</title>
|
||||
<!-- Open Graph data -->
|
||||
<!-- <meta property="og:title" content="Title Here" /> -->
|
||||
<!-- <meta property="og:url" content="http://www.example.com/" /> -->
|
||||
<!-- <meta property="og:image" content="http://example.com/image.jpg" /> -->
|
||||
<!-- <meta property="og:description" content="Description Here" /> -->
|
||||
<script>
|
||||
var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS
|
||||
.supports(
|
||||
'top: constant(a)'))
|
||||
document.write(
|
||||
'<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
|
||||
(coverSupport ? ', viewport-fit=cover' : '') + '" />')
|
||||
</script>
|
||||
<link rel="stylesheet" href="<%= BASE_URL %>static/index.<%= VUE_APP_INDEX_CSS_HASH %>.css" />
|
||||
</head>
|
||||
<body>
|
||||
<noscript>
|
||||
<strong>Please enable JavaScript to continue.</strong>
|
||||
</noscript>
|
||||
<div id="app"></div>
|
||||
<!-- built files will be auto injected -->
|
||||
</body>
|
||||
<script type="text/javascript">
|
||||
var userAgent = navigator.userAgent;
|
||||
if (userAgent.indexOf('AlipayClient') > -1) {
|
||||
// 支付宝小程序的 JS-SDK 防止 404 需要动态加载，如果不需要兼容支付宝小程序，则无需引用此 JS 文件。
|
||||
document.writeln('<script src="https://appx/web-view.min.js"' + '>' + '<' + '/' + 'script>');
|
||||
}
|
||||
</script>
|
||||
<script type="text/javascript" src="https://js.cdn.aliyun.dcloud.net.cn/dev/uni-app/uni.webview.1.5.2.js"></script>
|
||||
<script type="text/javascript">
|
||||
// 待触发 `UniAppJSBridgeReady` 事件后，即可调用 uni 的 API。
|
||||
document.addEventListener('UniAppJSBridgeReady', function() {
|
||||
|
||||
uni.webView.getEnv(function(res) {
|
||||
console.log('当前环境：' + JSON.stringify(res));
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</html>
|
||||
|
|
@ -6,10 +6,10 @@ export function checkOverdue(data) {
|
|||
url: Url + '/api/front/user',
|
||||
method: 'GET',
|
||||
header: header,
|
||||
success:(res) =>{
|
||||
if([410000, 410001, 410002, 401].indexOf(res.data.code) !== -1){
|
||||
store.commit("LOGOUT");
|
||||
}
|
||||
}
|
||||
// success:(res) =>{
|
||||
// if([410000, 410001, 410002, 401].indexOf(res.data.code) !== -1){
|
||||
// store.commit("LOGOUT");
|
||||
// }
|
||||
// }
|
||||
})
|
||||
}
|
||||
|
|
@ -46,7 +46,7 @@ function baseRequest(url, method, data, {
|
|||
else if (res.data.code == 200)
|
||||
reslove(res.data, res);
|
||||
else if ([410000, 410001, 410002, 401].indexOf(res.data.code) !== -1) {
|
||||
toLogin();
|
||||
// toLogin();
|
||||
reject(res.data);
|
||||
}else if (res.data.code == 500){
|
||||
reject(res.data.message || '系统异常');
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user