Merge branch 'master' of https://git.yuzhankeji.cn/zhangjing/douhuo-h5
This commit is contained in:
@@ -579,8 +579,8 @@
|
|||||||
officialGeneral(){
|
officialGeneral(){
|
||||||
// 获取微信授权信息
|
// 获取微信授权信息
|
||||||
authFollow({
|
authFollow({
|
||||||
url: 'https://web.douhuofalv.com/webview/webCode'
|
// url: 'https://web.douhuofalv.com/webview/webCode'
|
||||||
// url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
|
url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
window.location.href = res
|
window.location.href = res
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
|
|||||||
@@ -78,8 +78,8 @@
|
|||||||
judgeGeneral(){
|
judgeGeneral(){
|
||||||
// 获取微信授权信息
|
// 获取微信授权信息
|
||||||
authFollow({
|
authFollow({
|
||||||
url: 'https://web.douhuofalv.com/webview/webCode'
|
// url: 'https://web.douhuofalv.com/webview/webCode'
|
||||||
// url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
|
url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
window.location.href = res
|
window.location.href = res
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
|
|||||||
@@ -95,8 +95,8 @@
|
|||||||
judgeGeneral(){
|
judgeGeneral(){
|
||||||
// 获取微信授权信息
|
// 获取微信授权信息
|
||||||
authFollow({
|
authFollow({
|
||||||
// url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
|
url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
|
||||||
url: 'https://web.douhuofalv.com/webview/webCode'
|
// url: 'https://web.douhuofalv.com/webview/webCode'
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
window.location.href = res
|
window.location.href = res
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
|
|||||||
@@ -78,8 +78,8 @@
|
|||||||
judgeGeneral(){
|
judgeGeneral(){
|
||||||
// 获取微信授权信息
|
// 获取微信授权信息
|
||||||
authFollow({
|
authFollow({
|
||||||
url: 'https://web.douhuofalv.com/webview/webCode',
|
// url: 'https://web.douhuofalv.com/webview/webCode',
|
||||||
// url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
|
url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
window.location.href = res
|
window.location.href = res
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
|
|||||||
@@ -94,8 +94,8 @@
|
|||||||
realName({
|
realName({
|
||||||
front_card: this.frontCard.path,
|
front_card: this.frontCard.path,
|
||||||
back_card : this.backCard.path,
|
back_card : this.backCard.path,
|
||||||
redirect_url: "https://web.douhuofalv.com/sheet/authSuccess",
|
// redirect_url: "https://web.douhuofalv.com/sheet/authSuccess",
|
||||||
// redirect_url: "https://web.douhuotest.douhuofalv.com/sheet/authSuccess"
|
redirect_url: "https://web.douhuotest.douhuofalv.com/sheet/authSuccess"
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
this.realData = res.certification
|
this.realData = res.certification
|
||||||
this.authShortUrl = res.sign.authShortUrl
|
this.authShortUrl = res.sign.authShortUrl
|
||||||
|
|||||||
@@ -558,8 +558,8 @@
|
|||||||
// 去签约
|
// 去签约
|
||||||
contractClick(id) {
|
contractClick(id) {
|
||||||
contractGo(id, {
|
contractGo(id, {
|
||||||
redirect_url: "https://web.douhuofalv.com/user/index",
|
// redirect_url: "https://web.douhuofalv.com/user/index",
|
||||||
// redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
|
redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
|
||||||
app_scheme : ''
|
app_scheme : ''
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
// let faceUrl = encodeURIComponent(res.sign_url)
|
// let faceUrl = encodeURIComponent(res.sign_url)
|
||||||
|
|||||||
@@ -81,8 +81,8 @@
|
|||||||
judgeGeneral(){
|
judgeGeneral(){
|
||||||
// 获取微信授权信息
|
// 获取微信授权信息
|
||||||
authFollow({
|
authFollow({
|
||||||
url: 'https://web.douhuofalv.com/webview/webCode',
|
// url: 'https://web.douhuofalv.com/webview/webCode',
|
||||||
// url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
|
url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
window.location.href = res
|
window.location.href = res
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
|
|||||||
@@ -71,7 +71,7 @@
|
|||||||
<!-- web.douhuotest.douhuofalv dev=0是线上 dev=1是线下 -->
|
<!-- web.douhuotest.douhuofalv dev=0是线上 dev=1是线下 -->
|
||||||
<wx-open-launch-weapp
|
<wx-open-launch-weapp
|
||||||
username="gh_918c81628d6f"
|
username="gh_918c81628d6f"
|
||||||
:path="'pages/pay/pay?type=h5&dev=0&trade_id=' + tradeId + '&token=' + token"
|
:path="'pages/pay/pay?type=h5&dev=1&trade_id=' + tradeId + '&token=' + token"
|
||||||
>
|
>
|
||||||
<script type="text/wxtag-template">
|
<script type="text/wxtag-template">
|
||||||
<style>
|
<style>
|
||||||
|
|||||||
@@ -42,7 +42,7 @@
|
|||||||
<!-- douhuotest dev=0是线上 dev=1是线下 -->
|
<!-- douhuotest dev=0是线上 dev=1是线下 -->
|
||||||
<wx-open-launch-weapp
|
<wx-open-launch-weapp
|
||||||
username="gh_918c81628d6f"
|
username="gh_918c81628d6f"
|
||||||
:path="'pages/pay/pay?type=h5&dev=0&trade_id=' + tradeId + '&token=' + token"
|
:path="'pages/pay/pay?type=h5&dev=1&trade_id=' + tradeId + '&token=' + token"
|
||||||
>
|
>
|
||||||
<script type="text/wxtag-template">
|
<script type="text/wxtag-template">
|
||||||
<style>
|
<style>
|
||||||
@@ -289,8 +289,8 @@
|
|||||||
|
|
||||||
// 获取微信授权信息-获取oppid
|
// 获取微信授权信息-获取oppid
|
||||||
authFollow({
|
authFollow({
|
||||||
// url: 'https://web.douhuotest.douhuofalv.com/webWechat/index?id=' + this.$Route.query.id + '&style=' + this.$Route.query.style + '&price=' + this.$Route.query.price
|
url: 'https://web.douhuotest.douhuofalv.com/webWechat/index?id=' + this.$Route.query.id + '&style=' + this.$Route.query.style + '&price=' + this.$Route.query.price
|
||||||
url: 'https://web.douhuofalv.com/webWechat/index?id=' + this.$Route.query.id + '&style=' + this.$Route.query.style + '&price=' + this.$Route.query.price
|
// url: 'https://web.douhuofalv.com/webWechat/index?id=' + this.$Route.query.id + '&style=' + this.$Route.query.style + '&price=' + this.$Route.query.price
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
window.location.href = res
|
window.location.href = res
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
|
|||||||
@@ -436,8 +436,8 @@
|
|||||||
// 去签约
|
// 去签约
|
||||||
contractClick() {
|
contractClick() {
|
||||||
contractGo(this.$Route.query.id, {
|
contractGo(this.$Route.query.id, {
|
||||||
redirect_url: "https://web.douhuofalv.com/user/index",
|
// redirect_url: "https://web.douhuofalv.com/user/index",
|
||||||
// redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
|
redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
|
||||||
app_scheme : ''
|
app_scheme : ''
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
// let faceUrl = encodeURIComponent(res.sign_url)
|
// let faceUrl = encodeURIComponent(res.sign_url)
|
||||||
|
|||||||
@@ -231,8 +231,8 @@
|
|||||||
judgeGeneral(){
|
judgeGeneral(){
|
||||||
// 获取微信授权信息
|
// 获取微信授权信息
|
||||||
authFollow({
|
authFollow({
|
||||||
url: 'https://web.douhuofalv.com/webview/webCode'
|
// url: 'https://web.douhuofalv.com/webview/webCode'
|
||||||
// url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
|
url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
window.location.href = res
|
window.location.href = res
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
|
|||||||
@@ -240,8 +240,8 @@
|
|||||||
esignUrl({
|
esignUrl({
|
||||||
order_id : id,
|
order_id : id,
|
||||||
order_type: type,
|
order_type: type,
|
||||||
redirect_url: "https://web.douhuofalv.com/user/index",
|
// redirect_url: "https://web.douhuofalv.com/user/index",
|
||||||
// redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
|
redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
|
||||||
channel : 'h5',
|
channel : 'h5',
|
||||||
app_scheme : ''
|
app_scheme : ''
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
|
|||||||
@@ -210,8 +210,8 @@
|
|||||||
judgeGeneral(){
|
judgeGeneral(){
|
||||||
// 获取微信授权信息
|
// 获取微信授权信息
|
||||||
authFollow({
|
authFollow({
|
||||||
url: 'https://web.douhuofalv.com/webview/webCode'
|
// url: 'https://web.douhuofalv.com/webview/webCode'
|
||||||
// url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
|
url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
window.location.href = res
|
window.location.href = res
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
|
|||||||
@@ -219,8 +219,8 @@
|
|||||||
esignUrl({
|
esignUrl({
|
||||||
order_id : id,
|
order_id : id,
|
||||||
order_type: type,
|
order_type: type,
|
||||||
redirect_url: "https://web.douhuofalv.com/user/index",
|
// redirect_url: "https://web.douhuofalv.com/user/index",
|
||||||
// redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
|
redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
|
||||||
channel : 'h5',
|
channel : 'h5',
|
||||||
app_scheme : ''
|
app_scheme : ''
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
|
|||||||
@@ -61,7 +61,7 @@
|
|||||||
<!-- web.douhuotest.douhuofalv dev=0是线上 dev=1是线下 -->
|
<!-- web.douhuotest.douhuofalv dev=0是线上 dev=1是线下 -->
|
||||||
<wx-open-launch-weapp
|
<wx-open-launch-weapp
|
||||||
username="gh_918c81628d6f"
|
username="gh_918c81628d6f"
|
||||||
:path="'pages/pay/pay?type=h5&dev=0&trade_id=' + tradeId + '&token=' + token"
|
:path="'pages/pay/pay?type=h5&dev=1&trade_id=' + tradeId + '&token=' + token"
|
||||||
>
|
>
|
||||||
<script type="text/wxtag-template">
|
<script type="text/wxtag-template">
|
||||||
<style>
|
<style>
|
||||||
@@ -349,8 +349,8 @@
|
|||||||
|
|
||||||
// 获取微信授权信息-获取oppid
|
// 获取微信授权信息-获取oppid
|
||||||
authFollow({
|
authFollow({
|
||||||
url: 'https://web.douhuofalv.com/webWechat/index?id=' + this.$Route.query.id + '&style=' + this.$Route.query.style + '&price=' + this.$Route.query.price
|
// url: 'https://web.douhuofalv.com/webWechat/index?id=' + this.$Route.query.id + '&style=' + this.$Route.query.style + '&price=' + this.$Route.query.price
|
||||||
// url: 'https://web.douhuotest.douhuofalv.com/webWechat/index?id=' + this.orderId + '&style=' + this.$Route.query.style + '&price=' + this.$Route.query.price
|
url: 'https://web.douhuotest.douhuofalv.com/webWechat/index?id=' + this.orderId + '&style=' + this.$Route.query.style + '&price=' + this.$Route.query.price
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
window.location.href = res
|
window.location.href = res
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
|
|||||||
@@ -243,8 +243,8 @@
|
|||||||
judgeGeneral(){
|
judgeGeneral(){
|
||||||
// 获取微信授权信息
|
// 获取微信授权信息
|
||||||
authFollow({
|
authFollow({
|
||||||
url: 'https://web.douhuofalv.com/webview/webCode'
|
// url: 'https://web.douhuofalv.com/webview/webCode'
|
||||||
// url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
|
url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
window.location.href = res
|
window.location.href = res
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
|
|||||||
@@ -268,8 +268,8 @@
|
|||||||
judgeGeneral(){
|
judgeGeneral(){
|
||||||
// 获取微信授权信息
|
// 获取微信授权信息
|
||||||
authFollow({
|
authFollow({
|
||||||
url: 'https://web.douhuofalv.com/webview/webCode'
|
// url: 'https://web.douhuofalv.com/webview/webCode'
|
||||||
// url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
|
url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
window.location.href = res
|
window.location.href = res
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
|
|||||||
@@ -218,8 +218,8 @@
|
|||||||
esignUrl({
|
esignUrl({
|
||||||
order_id : id,
|
order_id : id,
|
||||||
order_type: type,
|
order_type: type,
|
||||||
redirect_url: "https://web.douhuofalv.com/user/index",
|
// redirect_url: "https://web.douhuofalv.com/user/index",
|
||||||
// redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
|
redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
|
||||||
channel : 'h5',
|
channel : 'h5',
|
||||||
app_scheme : ''
|
app_scheme : ''
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
|
|||||||
@@ -273,8 +273,8 @@
|
|||||||
judgeGeneral(){
|
judgeGeneral(){
|
||||||
// 获取微信授权信息
|
// 获取微信授权信息
|
||||||
authFollow({
|
authFollow({
|
||||||
url: 'https://web.douhuofalv.com/webview/webCode'
|
// url: 'https://web.douhuofalv.com/webview/webCode'
|
||||||
// url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
|
url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
window.location.href = res
|
window.location.href = res
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
|
|||||||
@@ -30,20 +30,20 @@ router.beforeEach((to, from, next) => {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
// 检查用户是否授权了微信
|
// 检查用户是否授权了微信
|
||||||
// if(to.name != 'webWechatIndex' && openId === ''){
|
if(to.name != 'webWechatIndex' && openId === ''){
|
||||||
// authFollow({
|
authFollow({
|
||||||
// // url: 'https://web.douhuotest.douhuofalv.com/webWechat/index'
|
url: 'https://web.douhuotest.douhuofalv.com/webWechat/index'
|
||||||
// url: 'https://web.douhuofalv.com/webWechat/index'
|
// url: 'https://web.douhuofalv.com/webWechat/index'
|
||||||
// }).then(res => {
|
}).then(res => {
|
||||||
// window.location.href = res
|
window.location.href = res
|
||||||
// }).catch(err => {
|
}).catch(err => {
|
||||||
// uni.showToast({
|
uni.showToast({
|
||||||
// title: err.message,
|
title: err.message,
|
||||||
// icon: "none"
|
icon: "none"
|
||||||
// })
|
})
|
||||||
// })
|
})
|
||||||
// return
|
return
|
||||||
// }
|
}
|
||||||
|
|
||||||
// 检查是否需要登录
|
// 检查是否需要登录
|
||||||
if(to.auth && token === ''){
|
if(to.auth && token === ''){
|
||||||
|
|||||||
Reference in New Issue
Block a user