zhangjing/douhuo-h5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
唐明明
2023-09-08 11:23:48 +08:00
parent 9ea40b74e7 aaf1fafe8e
commit ed9de4abbb
6 changed files with 458 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apis/index.js
View File

@@ -9,8 +9,8 @@ import { router } from '@/router/index.js'
// 基础配置
const config = {
// apiUrl : 'https://api.douhuotest.douhuofalv.com/api/', // 测试环境
apiUrl : 'https://douhuo.douhuofalv.com/api/', // 正式环境
apiUrl : 'https://api.douhuotest.douhuofalv.com/api/', // 测试环境
// apiUrl : 'https://douhuo.douhuofalv.com/api/', // 正式环境
timeout : 60000
}

6
pages/pay/pay.vue
View File

@@ -39,7 +39,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>
@@ -217,8 +217,8 @@
}
// 获取微信授权信息-获取oppid
authFollow({
url: 'https://web.douhuofalv.com/webWechat/index'
// url: 'https://web.douhuotest.douhuofalv.com/webWechat/index'
// url: 'https://web.douhuofalv.com/webWechat/index'
url: 'https://web.douhuotest.douhuofalv.com/webWechat/index'
}).then(res => {
window.location.href = res
}).catch(err => {

14
pages/sheet/estimate.vue
View File

@@ -46,7 +46,12 @@
YGFA
</view>
</view>
<view class="labelPlan-list">
<view class="labelPlan-list" v-if="item.type == 'one'">
<text class="labelPlan-item labelPlan-content">
{{item.content}}
</text>
</view>
<view class="labelPlan-list" v-else>
<view class="labelPlan-item" v-for="(paramsItem, paramsIndex) in item.params" :key="paramsIndex">
<view class="labelPlan-item-name">{{paramsItem.title}}</view>
<view class="nowrap labelPlan-item-text">
@@ -61,9 +66,9 @@
<view class="labelNotice-name">
须知：
</view>
<view class="labelNotice-text">
<text class="labelNotice-text">
{{item.business_type.notic}}
</view>
</text>
</view>
<view class="labelNotice-btn" @click="noticeTap(index)">
<image class="labelNotice-img" :class="{active : item.noticeShow}" src="@/static/imgs/openArrow_grey.png" mode="widthFix"></image>{{item.noticeShow ? '收起' : '展开'}}
@@ -333,6 +338,9 @@
margin-left: 20rpx;
font-size: $title-size-sm - 2;
}
&.labelPlan-content {
line-height: 52rpx;
}
}
.labelNotice {
font-size: $title-size-m;

2
pages/sheet/payment.vue
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=1&trade_id=' + tradeId + '&token=' + token"
:path="'pages/pay/pay?type=h5&dev=0&trade_id=' + tradeId + '&token=' + token"
>
<script type="text/wxtag-template">
<style>

6
pages/synthesis/feePay.vue
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 => {

4
router/index.js
View File

@@ -32,8 +32,8 @@ router.beforeEach((to, from, next) => {
// 检查用户是否授权了微信
if(to.name != 'webWechatIndex' && openId === ''){
authFollow({
// url: 'https://web.douhuotest.douhuofalv.com/webWechat/index'
url: 'https://web.douhuofalv.com/webWechat/index'
url: 'https://web.douhuotest.douhuofalv.com/webWechat/index'
// url: 'https://web.douhuofalv.com/webWechat/index'
}).then(res => {
window.location.href = res
}).catch(err => {