Compare commits

...

3 Commits

Author SHA1 Message Date
4422d72901 Merge branch 'master' of https://git.yuzhankeji.cn/zhangjing/douhuo-h5 2023-07-12 10:30:58 +08:00
9d6ba3efe0 最新代码,测试环境 2023-07-12 10:30:37 +08:00
850df0c9e6 测试环境 2023-07-11 14:53:48 +08:00
20 changed files with 8139 additions and 8139 deletions

View File

@@ -579,8 +579,8 @@
officialGeneral(){
// 获取微信授权信息
authFollow({
url: 'https://web.douhuofalv.com/webview/webCode'
// url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
// url: 'https://web.douhuofalv.com/webview/webCode'
url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
}).then(res => {
window.location.href = res
}).catch(err => {

View File

@@ -78,8 +78,8 @@
judgeGeneral(){
// 获取微信授权信息
authFollow({
url: 'https://web.douhuofalv.com/webview/webCode'
// url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
// url: 'https://web.douhuofalv.com/webview/webCode'
url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
}).then(res => {
window.location.href = res
}).catch(err => {

View File

@@ -95,8 +95,8 @@
judgeGeneral(){
// 获取微信授权信息
authFollow({
// url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
url: 'https://web.douhuofalv.com/webview/webCode'
url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
// url: 'https://web.douhuofalv.com/webview/webCode'
}).then(res => {
window.location.href = res
}).catch(err => {

View File

@@ -78,8 +78,8 @@
judgeGeneral(){
// 获取微信授权信息
authFollow({
url: 'https://web.douhuofalv.com/webview/webCode',
// url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
// url: 'https://web.douhuofalv.com/webview/webCode',
url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
}).then(res => {
window.location.href = res
}).catch(err => {

View File

@@ -94,8 +94,8 @@
realName({
front_card: this.frontCard.path,
back_card : this.backCard.path,
redirect_url: "https://web.douhuofalv.com/sheet/authSuccess",
// redirect_url: "https://web.douhuotest.douhuofalv.com/sheet/authSuccess"
// redirect_url: "https://web.douhuofalv.com/sheet/authSuccess",
redirect_url: "https://web.douhuotest.douhuofalv.com/sheet/authSuccess"
}).then(res => {
this.realData = res.certification
this.authShortUrl = res.sign.authShortUrl

View File

@@ -558,8 +558,8 @@
// 去签约
contractClick(id) {
contractGo(id, {
redirect_url: "https://web.douhuofalv.com/user/index",
// redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
// redirect_url: "https://web.douhuofalv.com/user/index",
redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
app_scheme : ''
}).then(res => {
// let faceUrl = encodeURIComponent(res.sign_url)

View File

@@ -81,8 +81,8 @@
judgeGeneral(){
// 获取微信授权信息
authFollow({
url: 'https://web.douhuofalv.com/webview/webCode',
// url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
// url: 'https://web.douhuofalv.com/webview/webCode',
url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
}).then(res => {
window.location.href = res
}).catch(err => {

View File

@@ -71,7 +71,7 @@
<!-- web.douhuotest.douhuofalv dev=0是线上 dev=1是线下 -->
<wx-open-launch-weapp
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">
<style>

View File

@@ -42,7 +42,7 @@
<!-- douhuotest dev=0是线上 dev=1是线下 -->
<wx-open-launch-weapp
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">
<style>
@@ -289,8 +289,8 @@
// 获取微信授权信息-获取oppid
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.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
}).then(res => {
window.location.href = res
}).catch(err => {

View File

@@ -436,8 +436,8 @@
// 去签约
contractClick() {
contractGo(this.$Route.query.id, {
redirect_url: "https://web.douhuofalv.com/user/index",
// redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
// redirect_url: "https://web.douhuofalv.com/user/index",
redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
app_scheme : ''
}).then(res => {
// let faceUrl = encodeURIComponent(res.sign_url)

View File

@@ -231,8 +231,8 @@
judgeGeneral(){
// 获取微信授权信息
authFollow({
url: 'https://web.douhuofalv.com/webview/webCode'
// url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
// url: 'https://web.douhuofalv.com/webview/webCode'
url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
}).then(res => {
window.location.href = res
}).catch(err => {

View File

@@ -240,8 +240,8 @@
esignUrl({
order_id : id,
order_type: type,
redirect_url: "https://web.douhuofalv.com/user/index",
// redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
// redirect_url: "https://web.douhuofalv.com/user/index",
redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
channel : 'h5',
app_scheme : ''
}).then(res => {

View File

@@ -210,8 +210,8 @@
judgeGeneral(){
// 获取微信授权信息
authFollow({
url: 'https://web.douhuofalv.com/webview/webCode'
// url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
// url: 'https://web.douhuofalv.com/webview/webCode'
url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
}).then(res => {
window.location.href = res
}).catch(err => {

View File

@@ -219,8 +219,8 @@
esignUrl({
order_id : id,
order_type: type,
redirect_url: "https://web.douhuofalv.com/user/index",
// redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
// redirect_url: "https://web.douhuofalv.com/user/index",
redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
channel : 'h5',
app_scheme : ''
}).then(res => {

View File

@@ -61,7 +61,7 @@
<!-- web.douhuotest.douhuofalv dev=0是线上 dev=1是线下 -->
<wx-open-launch-weapp
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">
<style>
@@ -349,8 +349,8 @@
// 获取微信授权信息-获取oppid
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.douhuotest.douhuofalv.com/webWechat/index?id=' + this.orderId + '&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
}).then(res => {
window.location.href = res
}).catch(err => {

View File

@@ -243,8 +243,8 @@
judgeGeneral(){
// 获取微信授权信息
authFollow({
url: 'https://web.douhuofalv.com/webview/webCode'
// url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
// url: 'https://web.douhuofalv.com/webview/webCode'
url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
}).then(res => {
window.location.href = res
}).catch(err => {

View File

@@ -268,8 +268,8 @@
judgeGeneral(){
// 获取微信授权信息
authFollow({
url: 'https://web.douhuofalv.com/webview/webCode'
// url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
// url: 'https://web.douhuofalv.com/webview/webCode'
url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
}).then(res => {
window.location.href = res
}).catch(err => {

View File

@@ -218,8 +218,8 @@
esignUrl({
order_id : id,
order_type: type,
redirect_url: "https://web.douhuofalv.com/user/index",
// redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
// redirect_url: "https://web.douhuofalv.com/user/index",
redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
channel : 'h5',
app_scheme : ''
}).then(res => {

View File

@@ -273,8 +273,8 @@
judgeGeneral(){
// 获取微信授权信息
authFollow({
url: 'https://web.douhuofalv.com/webview/webCode'
// url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
// url: 'https://web.douhuofalv.com/webview/webCode'
url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
}).then(res => {
window.location.href = res
}).catch(err => {

View File

@@ -30,20 +30,20 @@ router.beforeEach((to, from, next) => {
return
}
// 检查用户是否授权了微信
// if(to.name != 'webWechatIndex' && openId === ''){
// authFollow({
// // url: 'https://web.douhuotest.douhuofalv.com/webWechat/index'
if(to.name != 'webWechatIndex' && openId === ''){
authFollow({
url: 'https://web.douhuotest.douhuofalv.com/webWechat/index'
// url: 'https://web.douhuofalv.com/webWechat/index'
// }).then(res => {
// window.location.href = res
// }).catch(err => {
// uni.showToast({
// title: err.message,
// icon: "none"
// })
// })
// return
// }
}).then(res => {
window.location.href = res
}).catch(err => {
uni.showToast({
title: err.message,
icon: "none"
})
})
return
}
// 检查是否需要登录
if(to.auth && token === ''){