Commit 9f77c064 by sunchao

返回键&公众号提前不需要调授权接口&分享代码部分调试

parent 7de33871
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
if(this.agreeFlag == false) { if(this.agreeFlag == false) {
uni.showToast({ uni.showToast({
title: '请阅读并勾选银盾保险经纪服务协议和隐私条款', title: '请阅读并勾选江苏赢盾财务顾问有限公司服务协议和隐私条款',
duration: 2000, duration: 2000,
icon: 'none' icon: 'none'
}); });
......
...@@ -271,7 +271,7 @@ ...@@ -271,7 +271,7 @@
} }
if(!this.agreeFlag){ if(!this.agreeFlag){
uni.showToast({ uni.showToast({
title: '请阅读并勾选银盾保险经纪服务协议和隐私条款', title: '请阅读并勾选江苏赢盾财务顾问有限公司服务协议和隐私条款',
duration: 5000, duration: 5000,
icon: 'none' icon: 'none'
}) })
...@@ -289,7 +289,7 @@ ...@@ -289,7 +289,7 @@
} }
if(!this.agreeFlag && this.loginType !='resetpw'){ if(!this.agreeFlag && this.loginType !='resetpw'){
uni.showToast({ uni.showToast({
title: '请阅读并勾选银盾保险经纪服务协议和隐私条款', title: '请阅读并勾选江苏赢盾财务顾问有限公司服务协议和隐私条款',
duration: 5000, duration: 5000,
icon: 'none' icon: 'none'
}) })
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<script src="https://res2.wx.qq.com/open/js/jweixin-1.6.0.js"></script> <script src="https://res2.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
<!-- 移动端调试 --> <!-- 移动端调试 -->
<script type="text/javascript" src="//cdn.jsdelivr.net/npm/eruda"></script> <script type="text/javascript" src="//cdn.jsdelivr.net/npm/eruda"></script>
<!-- <script>eruda.init();</script> --> <script>eruda.init();</script>
</head> </head>
<body> <body>
<div id="app"> <div id="app">
......
<template> <template>
<view class="container"> <view class="container">
<view class="top">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text>
<text>退单详情</text>
</view>
<view class="returnCountsContainer"> <view class="returnCountsContainer">
<view class="left"> <view class="left">
<h3>{{courseInfoItem.orderStatusName}}</h3> <h3>{{courseInfoItem.orderStatusName}}</h3>
...@@ -86,7 +90,11 @@ ...@@ -86,7 +90,11 @@
}; };
}, },
methods:{ methods:{
goBack(){
uni.navigateBack({
delta: 1
})
},
goDetail(){ goDetail(){
uni.navigateTo({ uni.navigateTo({
url:'/pages/receiptCycleDesc/receiptCycleDesc' url:'/pages/receiptCycleDesc/receiptCycleDesc'
...@@ -134,11 +142,25 @@ ...@@ -134,11 +142,25 @@
<style lang="scss"> <style lang="scss">
.container{ .container{
height:100%; height:100%;
padding: 10rpx 20rpx; .top{
display: flex;
height: 80rpx;
justify-content: space-between;
align-items: center;
position: relative;
width: 100%;
margin: 0 auto;
background: #fff;
text:nth-child(2){
width: 100%;
text-align: center;
position: absolute;
}
}
.returnCountsContainer,.returnProcessContainer,.returnDetailContainer{ .returnCountsContainer,.returnProcessContainer,.returnDetailContainer{
background-color: #fff; background-color: #fff;
padding: 20rpx; padding: 20rpx 40rpx;
margin-bottom: 10rpx; margin: 10rpx auto;
h4{ h4{
font-size: 32rpx; font-size: 32rpx;
color: #333; color: #333;
......
<template> <template>
<view class="container"> <view class="container">
<view class="top">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text>
<text>我的售后</text>
</view>
<h4 class="noListTip" v-if="userCourses.length <=0 ">暂无售后</h4> <h4 class="noListTip" v-if="userCourses.length <=0 ">暂无售后</h4>
<view class="ulBox" v-if="userCourses.length > 0"> <view class="ulBox" v-if="userCourses.length > 0">
<view class="liBox" v-for="item in userCourses" :key="item.orderId"> <view class="liBox" v-for="item in userCourses" :key="item.orderId">
...@@ -28,6 +32,11 @@ ...@@ -28,6 +32,11 @@
}; };
}, },
methods:{ methods:{
goBack(){
uni.navigateBack({
delta: 1
})
},
goDetail(item){ goDetail(item){
uni.navigateTo({ uni.navigateTo({
url:`/pages/afterSaleDetail/afterSaleDetail?orderNo=${item.orderNo}&afterSalesFlag=${this.afterSalesFlag}` url:`/pages/afterSaleDetail/afterSaleDetail?orderNo=${item.orderNo}&afterSalesFlag=${this.afterSalesFlag}`
...@@ -55,12 +64,27 @@ ...@@ -55,12 +64,27 @@
<style lang="scss"> <style lang="scss">
.container{ .container{
height: 100%; height: 100%;
.top{
display: flex;
height: 80rpx;
justify-content: space-between;
align-items: center;
position: relative;
width: 100%;
margin: 0 auto;
background: #fff;
text:nth-child(2){
width: 100%;
text-align: center;
position: absolute;
}
}
.ulBox{ .ulBox{
padding: 10rpx 20rpx; margin-top: 20rpx;
.liBox{ .liBox{
background-color: #fff; background-color: #fff;
margin-bottom: 20rpx; margin-bottom: 20rpx;
padding: 18rpx 10rpx; padding: 36rpx 30rpx;
.statusBox{ .statusBox{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
......
...@@ -76,13 +76,6 @@ ...@@ -76,13 +76,6 @@
width: 100%; width: 100%;
margin: 0 auto; margin: 0 auto;
background: #fff; background: #fff;
.zuojiantou{
display: inline-block;
transform: rotate(180deg);
font-size: 30rpx;
z-index: 1;
position: absolute;
}
text:nth-child(2){ text:nth-child(2){
width: 100%; width: 100%;
text-align: center; text-align: center;
......
...@@ -33,10 +33,8 @@ ...@@ -33,10 +33,8 @@
<view class="" style="text-align: center;color: #20269B;" v-if="isH5"> <view class="" style="text-align: center;color: #20269B;" v-if="isH5">
<text>请前往应用商店下载App</text> <text>请前往应用商店下载App</text>
</view> </view>
<view class="" v-else> <view class="home" v-else @click="toHome()">
<navigator url="../index/index"> 返回首页 >
返回首页 >
</navigator>
</view> </view>
</view> </view>
</view> </view>
...@@ -75,19 +73,25 @@ ...@@ -75,19 +73,25 @@
} }
}, },
methods:{ methods:{
queryById(id, userId) { queryById(id, userId) {
api.queryById({ api.queryById({
id: id, id: id,
userId: userId userId: userId
}).then((res) => { }).then((res) => {
console.log(res) console.log(res)
if (res['success']) { if (res['success']) {
// this.applyParam = res['data']['data']; // this.applyParam = res['data']['data'];
this.approvalStatus = res.data.data.approvalStatus this.approvalStatus = res.data.data.approvalStatus
this.partnerLevel = res.data.data.partnerLevel this.partnerLevel = res.data.data.partnerLevel
} }
}) })
}, },
toHome(){
uni.switchTab({
url:'/pages/index/index'
})
}
} }
} }
...@@ -113,5 +117,9 @@ ...@@ -113,5 +117,9 @@
color: #20269B; color: #20269B;
font-size: 36rpx; font-size: 36rpx;
} }
.home{
color: #20269B;
text-align: center;
}
} }
</style> </style>
\ No newline at end of file
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<view class="content"> <view class="content">
<view class="contentDetail employ"> <view class="contentDetail employ">
<view class="contentItem"> <view class="contentItem">
<text>职业类型1</text> <text>职业类型</text>
<picker @change="changeIndustry" :value="industryIdx" :range="industry" <picker @change="changeIndustry" :value="industryIdx" :range="industry"
range-key="industryName" range-key="industryName"
:disabled="this.workform.approvalStatus!= 0 && this.workform.approvalStatus != 2"> :disabled="this.workform.approvalStatus!= 0 && this.workform.approvalStatus != 2">
......
...@@ -4,32 +4,32 @@ ...@@ -4,32 +4,32 @@
<view class="band"> <view class="band">
<view class="contentItem"> <view class="contentItem">
<text>姓名:</text> <text>姓名:</text>
<input v-model="openForm.userNameChinese" class="user-input" type="text" placeholder="请输入姓名" /> <input v-model="openForm.userNameChinese" class="user-input" type="text" placeholder="请输入姓名" :disabled="status == 3"/>
</view> </view>
<view class="contentItem"> <view class="contentItem">
<text>英文名:</text> <text>英文名:</text>
<input class="user-input" v-model="openForm.userNameEnglish" maxlength="10" type="text" <input class="user-input" v-model="openForm.userNameEnglish" maxlength="10" type="text"
placeholder="请输入英文名" /> placeholder="请输入英文名" :disabled="status == 3"/>
</view> </view>
<view class="contentItem"> <view class="contentItem">
<text>手机号</text> <text>手机号</text>
<!-- userTel --> <!-- userTel -->
<text v-if="openForm.userTel == ''">{{openForm.userTel}}</text> <text v-if="openForm.userTel == ''">{{openForm.userTel}}</text>
<input v-else class="user-input" v-model="openForm.userTel" maxlength="10" type="text" <input v-else class="user-input" v-model="openForm.userTel" maxlength="10" type="text"
placeholder="请输入手机号" /> placeholder="请输入手机号" :disabled="status == 3"/>
</view> </view>
<view class="contentItem"> <view class="contentItem">
<text>证件类型</text> <text>证件类型</text>
<!-- <input v-model="openForm.userIdType" class="user-input" maxlength="10" type="text" <!-- <input v-model="openForm.userIdType" class="user-input" maxlength="10" type="text"
placeholder="请输入证件类型" /> --> placeholder="请输入证件类型" /> -->
<picker v-if="erplizeList " @change="bindPickerChange($event,erplizeList)" :value="index" <picker v-if="erplizeList " @change="bindPickerChange($event,erplizeList)" :value="index"
:range="erplizeList" range-key="name"> :range="erplizeList" range-key="name" :disabled="status == 3">
<view style="background-color: white;">{{ erplizeList[index].name }}</view> <view style="background-color: white;">{{ erplizeList[index].name }}</view>
</picker> </picker>
</view> </view>
<view class="contentItem"> <view class="contentItem">
<text>证件号</text> <text>证件号</text>
<input v-model="openForm.userIdNo" class="user-input" maxlength="20" type="text" placeholder="请输入证件号" /> <input v-model="openForm.userIdNo" class="user-input" maxlength="20" type="text" placeholder="请输入证件号" :disabled="status == 3"/>
</view> </view>
<view class="" style="margin-top: 20rpx;"> <view class="" style="margin-top: 20rpx;">
<text>上传计划书</text> <text>上传计划书</text>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</view> </view>
<text style="margin-left: 10rpx;" @click="exportTo">{{openForm.fileName}}</text> <text style="margin-left: 10rpx;" @click="exportTo">{{openForm.fileName}}</text>
</view> </view>
<view class="uploadpdf"> <view class="uploadpdf" v-if="status != 3">
<view class="uploadimg"> <view class="uploadimg">
<text class="iconfont icon-weibiaoti553"></text> <text class="iconfont icon-weibiaoti553"></text>
<p>点击添加计划书</p> <p>点击添加计划书</p>
......
<template> <template>
<view> <view>
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: -40rpx;"></text>
<template v-if="title"> <template v-if="title">
<view><list-item :title="title" :lists="lists"></list-item></view> <view style="margin-top: 50rpx;"><list-item :title="title" :lists="lists"></list-item></view>
<view v-if="lists.length<=0" style="text-align: center;margin-top: 40rpx;">暂无{{typeName}}记录</view> <view v-if="lists.length<=0" style="text-align: center;margin-top: 40rpx;">暂无{{typeName}}记录</view>
</template> </template>
</view> </view>
...@@ -28,6 +29,11 @@ ...@@ -28,6 +29,11 @@
} }
}, },
methods: { methods: {
goBack() {
uni.navigateBack({
delta: 1
});
},
queryLists(obj){ queryLists(obj){
const params = { const params = {
userId:this.userId, userId:this.userId,
......
<template> <template>
<view class="container"> <view class="container">
<view class="shareheader" style="" v-if="coursesharing != 1"> <view class="shareheader" style="" v-if="coursesharing != 1 || deviceType==3">
<view class="iconfont icon-youjiantou" style="margin-left: 30rpx;" @click="goBack()"> <view class="iconfont icon-youjiantou" style="margin-left: 30rpx;" @click="goBack()">
</view> </view>
<view class="share-entrance"> <view class="share-entrance">
...@@ -121,6 +121,16 @@ ...@@ -121,6 +121,16 @@
</view> </view>
<boot-page v-if="sharelogin" ref="sharelogin" @close="close"></boot-page> <boot-page v-if="sharelogin" ref="sharelogin" @close="close"></boot-page>
<uni-share-wx ref="sharewx"></uni-share-wx> <uni-share-wx ref="sharewx"></uni-share-wx>
<view class="markBox" @click="shareTipsFlag=false" v-if="shareTipsFlag">
<view class="guideImgBox">
<image src="../../static/Group132.png" mode="widthFix"></image>
<view class="tips">
<!-- <view class="text-center">请点击右上角菜单</view> -->
<view style="line-height: 60rpx;">
戳这里,点击按钮,使用系统浏览器打开页面完成支付,完成后请返回微信,到【销售课程】下,查看购买订单。</view>
</view>
</view>
</view>
</view> </view>
</template> </template>
...@@ -130,12 +140,9 @@ ...@@ -130,12 +140,9 @@
import BootPage from "@/components/bootpage/bootpage.vue"; import BootPage from "@/components/bootpage/bootpage.vue";
import UniShareWx from "@/uni_modules/uni-share-wx/index.vue"; import UniShareWx from "@/uni_modules/uni-share-wx/index.vue";
import dataHandling from "@/util/dataHandling"; import dataHandling from "@/util/dataHandling";
import { import {hshare} from '@/util/fiveshare';
hshare import {nanoid} from 'nanoid';
} from '@/util/fiveshare' import common from '../../common/common';
import {
nanoid
} from 'nanoid';
export default { export default {
components: { components: {
UniShareWx, UniShareWx,
...@@ -181,7 +188,9 @@ ...@@ -181,7 +188,9 @@
android: 'https://a.app.qq.com/o/simple.jsp?pkgname=com.xiaoxiao.shihaoo', android: 'https://a.app.qq.com/o/simple.jsp?pkgname=com.xiaoxiao.shihaoo',
ios: 'https://apps.apple.com/cn/app/%E6%98%AF%E5%A5%BD/id1457958161', ios: 'https://apps.apple.com/cn/app/%E6%98%AF%E5%A5%BD/id1457958161',
scheme: 'com.qdxxzy.user://' scheme: 'com.qdxxzy.user://'
} },
deviceType:null,
shareTipsFlag:false
}; };
}, },
methods: { methods: {
...@@ -280,6 +289,8 @@ ...@@ -280,6 +289,8 @@
}, },
// 打开微信分享啊 // 打开微信分享啊
reinvite() { reinvite() {
//app分享
// #ifdef APP-PLUS
const shareCode = nanoid() + this.userId const shareCode = nanoid() + this.userId
const jumptime = Date.parse(new Date()) / 1000 const jumptime = Date.parse(new Date()) / 1000
let dataWXform = { let dataWXform = {
...@@ -293,16 +304,27 @@ ...@@ -293,16 +304,27 @@
shareCode: shareCode shareCode: shareCode
} }
this.$refs.sharewx.open(dataWXform) this.$refs.sharewx.open(dataWXform)
// #endif
//#ifdef H5
// #endif
}, },
shareToggle() { shareToggle() {
this.sliceshare = true this.sliceshare = true
this.$refs.share.open() this.$refs.share.open()
}, },
sharechange(val) { sharechange(val) {
console.log(val, 423) console.log(val)
uni.navigateTo({ if(val.index != 3){
url: val.item.link uni.switchTab({
}) url: val.item.link
})
}else{
uni.navigateTo({
url: val.item.link
})
}
}, },
// 订单保存 // 订单保存
saveOrder() { saveOrder() {
...@@ -629,7 +651,8 @@ ...@@ -629,7 +651,8 @@
}, },
onLoad(option) { onLoad(option) {
this.fileId = option.fileId; this.fileId = option.fileId;
this.courseInfo.packFileId = option.packFileId this.courseInfo.packFileId = option.packFileId;
this.deviceType = common.checkDeviceType();
if (option.coursesharing) { if (option.coursesharing) {
this.userId = '' this.userId = ''
this.coursesharing = option.coursesharing this.coursesharing = option.coursesharing
...@@ -654,6 +677,7 @@ ...@@ -654,6 +677,7 @@
onShow() { onShow() {
this.switchTab(1); this.switchTab(1);
this.loginType = uni.getStorageSync('loginType') this.loginType = uni.getStorageSync('loginType')
uni.setStorageSync('entryUrl',window.location.href.split('#')[0])
}, },
mounted() { mounted() {
let _this = this; let _this = this;
...@@ -898,7 +922,6 @@ ...@@ -898,7 +922,6 @@
font-size: 16rpx; font-size: 16rpx;
margin-left: 10rpx; margin-left: 10rpx;
} }
.totalCourseCount { .totalCourseCount {
color: #20269B; color: #20269B;
font-size: 24rpx; font-size: 24rpx;
...@@ -948,4 +971,32 @@ ...@@ -948,4 +971,32 @@
} }
} }
} }
.markBox {
position: fixed;
left: 0;
top: 0;
bottom: 0;
right: 0;
width: 100%;
height: 100%;
color: #fff;
display: flex;
justify-content: flex-end;
z-index: 100000;
background: rgba(0, 0, 0, 0.8);
.guideImgBox {
margin: 20px auto;
uni-image {
width: 25% !important;
position: absolute;
right: 0;
top: 0;
}
}
.tips {
margin-top: 20%;
padding: 0 30px;
}
}
</style> </style>
...@@ -57,8 +57,8 @@ ...@@ -57,8 +57,8 @@
</view> </view>
</view> </view>
</view> </view>
<view class="" style="text-align: center;color: #666666;font-size: 24rpx;"> <view class="" style="text-align: center;color: #666666;font-size: 24rpx;margin-top: 20rpx;">
银盾保险经纪有限公司提供技术支持 江苏赢盾财务顾问有限公司提供
</view> </view>
<!-- <tabBar :currentPage="currentPage"></tabBar> --> <!-- <tabBar :currentPage="currentPage"></tabBar> -->
</view> </view>
...@@ -172,7 +172,6 @@ ...@@ -172,7 +172,6 @@
}, },
onLoad() { onLoad() {
if (uni.getStorageSync('isLogin')) { if (uni.getStorageSync('isLogin')) {
console.log('游客登录')
this.queryAreaCenterInfo(); this.queryAreaCenterInfo();
this.announcementQuery(); this.announcementQuery();
} else { } else {
...@@ -293,7 +292,7 @@ ...@@ -293,7 +292,7 @@
}).then((res) => { }).then((res) => {
this.announcementInfo = res['data']['announcementInfoList'] ? res['data'][ this.announcementInfo = res['data']['announcementInfoList'] ? res['data'][
'announcementInfoList' 'announcementInfoList'
][0]['title'] : '银盾公告' ][0]['title'] : '江苏赢盾财务顾问有限公司公告'
}) })
}, },
getIntroduce(type) { getIntroduce(type) {
...@@ -323,8 +322,7 @@ ...@@ -323,8 +322,7 @@
<style lang="scss"> <style lang="scss">
.container { .container {
padding: 30rpx; padding: 30rpx 30rpx 20rpx;
.top { .top {
.compony { .compony {
display: flex; display: flex;
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
<view class="agree"> <view class="agree">
<label class="radio" style="padding-right: 10rpx;"> <label class="radio" style="padding-right: 10rpx;">
<radio :checked="agreeFlag" @click="agreeFlag=!agreeFlag"/></label> <radio :checked="agreeFlag" @click="agreeFlag=!agreeFlag"/></label>
<!-- <text>已阅读并同意</text><a href="#">银盾保险经纪服务协议</a><text></text><a href="">隐私政策</a> -->
<text>已阅读并同意</text> <text>已阅读并同意</text>
<text class="file" @click="getFile(1)">服务协议</text> <text class="file" @click="getFile(1)">服务协议</text>
<text></text> <text></text>
...@@ -116,7 +115,7 @@ ...@@ -116,7 +115,7 @@
} }
if(this.agreeFlag == false) { if(this.agreeFlag == false) {
uni.showToast({ uni.showToast({
title: '请阅读并勾选银盾保险经纪服务协议和隐私条款', title: '请阅读并勾选江苏赢盾财务顾问有限公司服务协议和隐私条款',
duration: 2000, duration: 2000,
icon: 'none' icon: 'none'
}); });
......
<template> <template>
<view class="padding-top container"> <view class="padding-top container">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 40rpx;;left: 20rpx;"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 20rpx;"></text>
<!-- tab选项 --> <!-- tab选项 -->
<view class="tabTitle"> <view class="tabTitle">
<text :class="{'actived': tabType===1}" @click="switchTab(1)">基本信息</text> <text :class="{'actived': tabType===1}" @click="switchTab(1)">基本信息</text>
......
...@@ -154,8 +154,9 @@ ...@@ -154,8 +154,9 @@
<view class="guideImgBox"> <view class="guideImgBox">
<image src="../../static/Group132.png" mode="widthFix"></image> <image src="../../static/Group132.png" mode="widthFix"></image>
<view class="tips"> <view class="tips">
<view class="text-center">请点击右上角菜单</view> <!-- <view class="text-center">请点击右上角菜单</view> -->
<view>因微信屏蔽支付宝的支付请求,请使用浏览器打开页面完成支付。在浏览器内支付完成后,请返回微信,到我的订单下,以检测支付结果。</view> <view style="line-height: 60rpx;">戳这里,点击<text class="iconfont icon-liulanqi"></text>
按钮,使用系统浏览器打开页面完成支付,完成后请返回微信,到【销售课程】下,查看购买订单。</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -319,7 +320,6 @@ ...@@ -319,7 +320,6 @@
//#ifdef H5 //#ifdef H5
//支付宝h5支付 //支付宝h5支付
console.log(JSON.stringify(param))
param.paymentType = 2; param.paymentType = 2;
this.amount = this.totalPrice; this.amount = this.totalPrice;
if (this.deviceType == 3) { if (this.deviceType == 3) {
...@@ -756,6 +756,29 @@ ...@@ -756,6 +756,29 @@
justify-content: flex-end; justify-content: flex-end;
z-index: 100000; z-index: 100000;
background: rgba(0, 0, 0, 0.8); background: rgba(0, 0, 0, 0.8);
.icon-liulanqi{
margin: 0px 10rpx;
color: #3b43d5;
background: #fff;
padding: 6rpx;
border-radius: 8rpx;
font-size: 36rpx;
}
.guideImgBox {
margin: 20px auto;
uni-image {
width: 25% !important;
position: absolute;
right: 0;
top: 0;
}
}
.tips {
margin-top: 20%;
padding: 0 30px;
}
} }
// .iconfont { // .iconfont {
...@@ -765,23 +788,6 @@ ...@@ -765,23 +788,6 @@
// top: 2px; // top: 2px;
// font-weight: bold; // font-weight: bold;
// } // }
.guideImgBox {
margin: 20px auto;
uni-image {
width: 25% !important;
position: absolute;
right: 0;
top: 0;
}
}
.tips {
margin-top: 20%;
padding: 0 30px;
}
.tips p { .tips p {
font-size: 18px; font-size: 18px;
margin-top: 10px; margin-top: 10px;
......
<template> <template>
<view class="container"> <view class="container" style="padding-top: 30rpx;">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 16rpx;"></text>
<view class="orderInfoContent"> <view class="orderInfoContent">
<view class="ulBox"> <view class="ulBox">
<view v-for="item in orderInfoList.filter(item=>item.pageArea===1)" :key="item.id" class="liBox"> <view v-for="item in orderInfoList.filter(item=>item.pageArea===1)" :key="item.id" class="liBox">
...@@ -146,6 +147,11 @@ ...@@ -146,6 +147,11 @@
}; };
}, },
methods: { methods: {
goBack() {
uni.navigateBack({
delta: 1
});
},
userCourseInfo() { userCourseInfo() {
const param = { const param = {
userId: this.userId, userId: this.userId,
......
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
<view class="course_content"> <view class="course_content">
<view class="tag"> <view class="tag">
<h4>精品课程</h4> <h4>精品课程</h4>
<view v-if="this.isRedirect == 1" @click="goToCourselist()">更多<text class="iconfont icon-youjiantou"></text></view> <view @click="goToCourselist()">更多<text class="iconfont icon-youjiantou"></text></view>
<!-- <view v-if="this.isRedirect == 1" @click="goToCourselist()">更多<text class="iconfont icon-youjiantou"></text></view> -->
</view> </view>
<view class="ulBox" v-if="cffpCourseInfos.length>0"> <view class="ulBox" v-if="cffpCourseInfos.length>0">
<view class="liBox" v-for="item in cffpCourseInfos" :key="item.fileId" @click="goDetail(item)"> <view class="liBox" v-for="item in cffpCourseInfos" :key="item.fileId" @click="goDetail(item)">
...@@ -75,8 +76,6 @@ ...@@ -75,8 +76,6 @@
}) })
}, },
continuePay(){ continuePay(){
console.log('fileId',this.fileId)
console.log('orderId',this.orderId)
uni.navigateTo({ uni.navigateTo({
url:`/pages/orderConfirm/orderConfirm?fileId=${this.fileId}&orderId=${this.orderId}` url:`/pages/orderConfirm/orderConfirm?fileId=${this.fileId}&orderId=${this.orderId}`
}) })
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<view class="" style="display: align-self: end;"> <view class="" style="display: align-self: end;">
<span><text style="color: #2D56A7;" @click="getFile(1)">《服务协议》 | </text><text style="color: #2D56A7;" @click="getFile(1)">《隐私政策》</text></span> <span><text style="color: #2D56A7;" @click="getFile(1)">《服务协议》 | </text><text style="color: #2D56A7;" @click="getFile(1)">《隐私政策》</text></span>
<p class="footer-text" style="margin: 10px 0;">客服电话:400:921-9029</p> <p class="footer-text" style="margin: 10px 0;">客服电话:400:921-9029</p>
<p class="footer-text">银盾保险经纪有限公司提供</p> <p class="footer-text">江苏赢盾财务顾问有限公司提供</p>
</view> </view>
</view> </view>
</view> </view>
......
<template> <template>
<view class="content"> <view class="content">
<view class="header"> <view class="header">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text>
<view class="header-time" style=""> <view class="header-time" style="">
<time-picker @change="change" fields="month" :icon="true"> <time-picker @change="change" fields="month" :icon="true">
</time-picker> </time-picker>
...@@ -124,6 +125,11 @@ ...@@ -124,6 +125,11 @@
this.getqueryTeamAchievement() this.getqueryTeamAchievement()
}, },
methods: { methods: {
goBack(){
uni.navigateBack({
delta: 1
})
},
bindPickerChange(e) { bindPickerChange(e) {
this.index = e.detail.value this.index = e.detail.value
this.montdindex = 0 this.montdindex = 0
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<view class="record" @click="toRecord()"> <view class="record" @click="toRecord()">
兑换记录 兑换记录
</view> </view>
<view class="btn" @click="toWithdrawal()"> <view class="btn" @click="toWithdrawal()" style="bottom: 30rpx;">
去提现 去提现
</view> </view>
</view> </view>
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</view> </view>
</view> </view>
<view class="paymentItem" @click="selectPaymentMethod(1)"> <!-- <view class="paymentItem" @click="selectPaymentMethod(1)">
<view> <view>
<i class="iconfont icon-py_weixinzhifu"></i> <i class="iconfont icon-py_weixinzhifu"></i>
<text>微信钱包</text> <text>微信钱包</text>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<view class="selectRadio" :class="{'actived':paymentMethod===1}"> <view class="selectRadio" :class="{'actived':paymentMethod===1}">
<i class="iconfont icon-duihao"></i> <i class="iconfont icon-duihao"></i>
</view> </view>
</view> </view> -->
<view class="tips_wrapper"> <view class="tips_wrapper">
<view class=""> <view class="">
提示: 提示:
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
3、如需帮助,请联系CFFP财富中心客服电话:12345678; 3、如需帮助,请联系CFFP财富中心客服电话:12345678;
</view> </view>
</view> </view>
<view class="btn" @click="confirmWithdrawal()" :class="{'gray':readonlyFlag}"> <view class="btn" @click="confirmWithdrawal()" :class="{'gray':readonlyFlag}" style="bottom: 30rpx;">
确认提现 确认提现
</view> </view>
</view> </view>
...@@ -69,6 +69,7 @@ ...@@ -69,6 +69,7 @@
<script> <script>
import api from '../../api/api'; import api from '../../api/api';
import common from '../../common/common';
export default{ export default{
data(){ data(){
return { return {
...@@ -79,11 +80,13 @@ ...@@ -79,11 +80,13 @@
paymentMethod:2,//初始化支付宝提现 paymentMethod:2,//初始化支付宝提现
aliWithdrawalResVO:null, aliWithdrawalResVO:null,
wxWithdrawalResVO:null, wxWithdrawalResVO:null,
readonlyFlag:false readonlyFlag:false,
deviceType:null
} }
}, },
components:{}, components:{},
onLoad(options){ onLoad(options){
this.deviceType = common.checkDeviceType();
this.exchangeAmount = options.exchangeAmount; this.exchangeAmount = options.exchangeAmount;
this.partnerTradeNo = options.partnerTradeNo; this.partnerTradeNo = options.partnerTradeNo;
this.goFortuneWithdrawal() this.goFortuneWithdrawal()
...@@ -130,7 +133,19 @@ ...@@ -130,7 +133,19 @@
//支付宝去提现 //支付宝去提现
aliWithdrawal(){ aliWithdrawal(){
this.readonlyFlag = true; this.readonlyFlag = true;
api.aliWithdrawal(this.aliWithdrawalResVO).then((res)=>{ //#ifdef H5
let aliWithdrawalResVOParam = {
...this.aliWithdrawalResVO,
dataSource:2
}
//#endif
// #ifdef APP-PLUS
let aliWithdrawalResVOParam = {
...this.aliWithdrawalResVO,
dataSource:1
}
//#endif
api.aliWithdrawal(aliWithdrawalResVOParam).then((res)=>{
this.readonlyFlag = false; this.readonlyFlag = false;
if(res['success']){ if(res['success']){
uni.showModal({ uni.showModal({
...@@ -191,6 +206,11 @@ ...@@ -191,6 +206,11 @@
// #endif // #endif
}, },
confirmWithdrawal(){ confirmWithdrawal(){
//#ifdef H5
this.aliWithdrawal();
//#endif
// APP:
// #ifdef APP-PLUS
if(!this.readonlyFlag){ if(!this.readonlyFlag){
this.readonlyFlag = true; this.readonlyFlag = true;
this.aliWithdrawalResVO = { this.aliWithdrawalResVO = {
...@@ -199,80 +219,81 @@ ...@@ -199,80 +219,81 @@
amount:this.exchangeAmount, amount:this.exchangeAmount,
userId:uni.getStorageSync('cffp_userId'), userId:uni.getStorageSync('cffp_userId'),
} }
console.log(this.aliWithdrawalResVO)
api.isAuth(this.aliWithdrawalResVO).then((res)=>{ api.isAuth(this.aliWithdrawalResVO).then((res)=>{
this.readonlyFlag = false; this.readonlyFlag = false;
if(res['success']){ if(res['success']){
this.aliWithdrawalResVO.aliUserId = res['data']['aliUserId']; this.aliWithdrawalResVO.aliUserId = res['data']['aliUserId'];
if(res['data']['isAuth'] == 1){ if(res['data']['isAuth'] == 1){
if(this.paymentMethod == 1){ if(this.paymentMethod == 1){
this.wxWithdrawal(); this.wxWithdrawal();
} }
if(this.paymentMethod == 2){ if(this.paymentMethod == 2){
// APP: // APP:
// #ifdef APP-PLUS // #ifdef APP-PLUS
let urls= this.aliWithdrawalResVO.aliAuthUrl; let urls= this.aliWithdrawalResVO.aliAuthUrl;
urls=encodeURIComponent(urls); urls=encodeURIComponent(urls);
// 判断平台 // 判断平台
if (plus.os.name == 'Android') { if (plus.os.name == 'Android') {
plus.runtime.openURL( plus.runtime.openURL(
'alipays://platformapi/startapp?appId=20000067&url=' + urls, 'alipays://platformapi/startapp?appId=20000067&url=' + urls,
res => { res => {
//这里写打开URL地址失败后的处理 //这里写打开URL地址失败后的处理
console.log(res); console.log(res);
uni.showModal({ uni.showModal({
content: '本机未检测到对应客户端,是否打开浏览器访问页面?', content: '本机未检测到对应客户端,是否打开浏览器访问页面?',
success: function (res) { success: function (res) {
if (res.confirm) { if (res.confirm) {
//plus.runtime.openURL(); //plus.runtime.openURL();
} }
} }
}); });
}, },
'com.eg.android.AlipayGphone' 'com.eg.android.AlipayGphone'
); );
} else if (plus.os.name == 'iOS') { } else if (plus.os.name == 'iOS') {
plus.runtime.openURL( plus.runtime.openURL(
'alipay://platformapi/startapp?appId=20000067&url=' + urls, 'alipay://platformapi/startapp?appId=20000067&url=' + urls,
res => { res => {
console.log(res); console.log(res);
uni.showModal({ uni.showModal({
content: '本机未检测到对应客户端,是否打开浏览器访问页面?', content: '本机未检测到对应客户端,是否打开浏览器访问页面?',
success: function (res) { success: function (res) {
if (res.confirm) { if (res.confirm) {
//plus.runtime.openURL(url); //plus.runtime.openURL(url);
} }
} }
}); });
}, },
'com.eg.android.AlipayGphone' 'com.eg.android.AlipayGphone'
); );
}
// #endif
}
}else{
if(this.paymentMethod == 1){
this.wxWithdrawal();
}
if(this.paymentMethod == 2){
this.aliWithdrawal();
} }
// #endif
} }
}else{ }else{
if(this.paymentMethod == 1){ uni.showModal({
this.wxWithdrawal(); content: res['message'],
} success: function (res) {
if(this.paymentMethod == 2){ if (res.confirm) {
this.aliWithdrawal(); console.log('用户点击确定');
} } else if (res.cancel) {
console.log('用户点击取消');
}
}
});
} }
}else{ });
uni.showModal({ }
content: res['message'], // #endif
success: function (res) {
if (res.confirm) {
console.log('用户点击确定');
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
}
});
}
} }
} }
} }
......
<template> <template>
<view> <view>
<view class="wrapper"> <view class="wrapper">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 30rpx;"></text>
<view class="banner"> <view class="banner">
<!--头部技术支持组件--> <!--头部技术支持组件-->
<!-- <commonHead></commonHead> --> <!-- <commonHead></commonHead> -->
...@@ -202,6 +203,11 @@ ...@@ -202,6 +203,11 @@
} }
}, },
methods: { methods: {
goBack(){
uni.navigateTo({
url:'/pages/product/finance-calculator'
})
},
init() { init() {
this.$refs.chart.init(echarts, chart => { this.$refs.chart.init(echarts, chart => {
chart.setOption(this.option); chart.setOption(this.option);
......
<template> <template>
<view class="wrapper"> <view class="wrapper">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 30rpx;"></text>
<view class="banner"> <view class="banner">
<!--头部技术支持组件--> <!--头部技术支持组件-->
<!-- <commonHead></commonHead> --> <!-- <commonHead></commonHead> -->
...@@ -352,6 +353,11 @@ ...@@ -352,6 +353,11 @@
this.provCityQry(); this.provCityQry();
}, },
methods:{ methods:{
goBack(){
uni.navigateTo({
url:'/pages/product/finance-calculator'
})
},
init() { init() {
this.$refs.chart.init(echarts, chart => { this.$refs.chart.init(echarts, chart => {
chart.setOption(this.option); chart.setOption(this.option);
......
<template> <template>
<!-- 已关注公众号用户 --> <!-- 已关注公众号用户 -->
<view class="content"> <view class="content">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 30rpx;"></text>
<view class="banner"> <view class="banner">
<image src="/static/images/policyIrrBanner.png" mode="widthFix"></image> <image src="/static/images/policyIrrBanner.png" mode="widthFix"></image>
<!-- 使用说明 --> <!-- 使用说明 -->
...@@ -255,6 +256,11 @@ ...@@ -255,6 +256,11 @@
} }
}, },
methods: { methods: {
goBack(){
uni.navigateTo({
url:'/pages/product/finance-calculator'
})
},
checkToken(){ checkToken(){
api.checkToken().then(res=>{ api.checkToken().then(res=>{
if(res['success']){}else{ if(res['success']){}else{
......
...@@ -55,6 +55,18 @@ ...@@ -55,6 +55,18 @@
<ul class="icon_lists dib-box"> <ul class="icon_lists dib-box">
<li class="dib"> <li class="dib">
<span class="icon iconfont">&#xe68f;</span>
<div class="name">浏览器</div>
<div class="code-name">&amp;#xe68f;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe60b;</span>
<div class="name">排序</div>
<div class="code-name">&amp;#xe60b;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe62e;</span> <span class="icon iconfont">&#xe62e;</span>
<div class="name">沙漏</div> <div class="name">沙漏</div>
<div class="code-name">&amp;#xe62e;</div> <div class="code-name">&amp;#xe62e;</div>
...@@ -300,9 +312,9 @@ ...@@ -300,9 +312,9 @@
<pre><code class="language-css" <pre><code class="language-css"
>@font-face { >@font-face {
font-family: 'iconfont'; font-family: 'iconfont';
src: url('iconfont.woff2?t=1669254238919') format('woff2'), src: url('iconfont.woff2?t=1673599044897') format('woff2'),
url('iconfont.woff?t=1669254238919') format('woff'), url('iconfont.woff?t=1673599044897') format('woff'),
url('iconfont.ttf?t=1669254238919') format('truetype'); url('iconfont.ttf?t=1673599044897') format('truetype');
} }
</code></pre> </code></pre>
<h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3> <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
...@@ -329,6 +341,24 @@ ...@@ -329,6 +341,24 @@
<ul class="icon_lists dib-box"> <ul class="icon_lists dib-box">
<li class="dib"> <li class="dib">
<span class="icon iconfont icon-liulanqi"></span>
<div class="name">
浏览器
</div>
<div class="code-name">.icon-liulanqi
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-paixu"></span>
<div class="name">
排序
</div>
<div class="code-name">.icon-paixu
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-shalou"></span> <span class="icon iconfont icon-shalou"></span>
<div class="name"> <div class="name">
沙漏 沙漏
...@@ -699,6 +729,22 @@ ...@@ -699,6 +729,22 @@
<li class="dib"> <li class="dib">
<svg class="icon svg-icon" aria-hidden="true"> <svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-liulanqi"></use>
</svg>
<div class="name">浏览器</div>
<div class="code-name">#icon-liulanqi</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-paixu"></use>
</svg>
<div class="name">排序</div>
<div class="code-name">#icon-paixu</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-shalou"></use> <use xlink:href="#icon-shalou"></use>
</svg> </svg>
<div class="name">沙漏</div> <div class="name">沙漏</div>
......
@font-face { @font-face {
font-family: "iconfont"; /* Project id 3749283 */ font-family: "iconfont"; /* Project id 3749283 */
src: url('iconfont.woff2?t=1669254238919') format('woff2'), src: url('iconfont.woff2?t=1673599044897') format('woff2'),
url('iconfont.woff?t=1669254238919') format('woff'), url('iconfont.woff?t=1673599044897') format('woff'),
url('iconfont.ttf?t=1669254238919') format('truetype'); url('iconfont.ttf?t=1673599044897') format('truetype');
} }
.iconfont { .iconfont {
...@@ -13,6 +13,14 @@ ...@@ -13,6 +13,14 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-liulanqi:before {
content: "\e68f";
}
.icon-paixu:before {
content: "\e60b";
}
.icon-shalou:before { .icon-shalou:before {
content: "\e62e"; content: "\e62e";
} }
......
...@@ -6,6 +6,20 @@ ...@@ -6,6 +6,20 @@
"description": "", "description": "",
"glyphs": [ "glyphs": [
{ {
"icon_id": "3216618",
"name": "浏览器",
"font_class": "liulanqi",
"unicode": "e68f",
"unicode_decimal": 59023
},
{
"icon_id": "7423",
"name": "排序",
"font_class": "paixu",
"unicode": "e60b",
"unicode_decimal": 58891
},
{
"icon_id": "2023263", "icon_id": "2023263",
"name": "沙漏", "name": "沙漏",
"font_class": "shalou", "font_class": "shalou",
......
No preview for this file type
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
<script> <script>
import api from "@/api/api"; import api from "@/api/api";
import { hshare } from '@/util/fiveshare'
import { import {
nanoid nanoid
} from 'nanoid'; } from 'nanoid';
...@@ -40,6 +41,25 @@ ...@@ -40,6 +41,25 @@
} }
}, },
methods: { methods: {
getshareData() {
let data = {
title: this.WXdata.title,
desc: '加入我们开启学习之旅',
link: window.location.href, //分享链接
imgUrl: this.WXdata.imageUrl, //图片
}
// let url;
// if (navigator.userAgent.indexOf('iPhone') !== -1) {
// // IOS 记录微信菜单打开时的url
// url = uni.getStorageSync('entryUrl');
// } else {
// // 安卓 记录当前使用SDK的页面的url
// const { href } = window.location;
// url = href.split('#')[0];
// }
var url = window.location.href.split('#')[0]
hshare(data, url)
},
open(option) { open(option) {
console.log(option, 155) console.log(option, 155)
this.WXdata = option this.WXdata = option
...@@ -54,6 +74,7 @@ ...@@ -54,6 +74,7 @@
this.$refs.sharewx.close() this.$refs.sharewx.close()
}, },
uniShare(type) { uniShare(type) {
// #ifdef APP-PLUS
let that = this let that = this
this.closeShare() this.closeShare()
this.submitsuessc(type) this.submitsuessc(type)
...@@ -75,6 +96,10 @@ ...@@ -75,6 +96,10 @@
console.log("fail:" + JSON.stringify(err)); console.log("fail:" + JSON.stringify(err));
} }
}); });
// #endif
// #ifdef H5
this.getshareData()
// #endif
// if (type === 1) { // if (type === 1) {
// let that = this; // let that = this;
// uni.downloadFile({ // uni.downloadFile({
......
...@@ -21,7 +21,7 @@ export function initJssdkShare(callback, url) { ...@@ -21,7 +21,7 @@ export function initJssdkShare(callback, url) {
// @ts-ignore // @ts-ignore
api.Wxshare(WxConfigRequestVO).then(res => { api.Wxshare(WxConfigRequestVO).then(res => {
jWeixin.config({ jWeixin.config({
debug: false,//调试的时候需要 在app上回弹出errmg:config ok 的时候就证明没问题了 这时候就可以改为false debug: true,//调试的时候需要 在app上回弹出errmg:config ok 的时候就证明没问题了 这时候就可以改为false
appId: res.data.appId,//appid appId: res.data.appId,//appid
timestamp: res.data.timestamp,//时间戳 timestamp: res.data.timestamp,//时间戳
nonceStr: res.data.nonceStr,//随机串 nonceStr: res.data.nonceStr,//随机串
...@@ -35,10 +35,13 @@ export function initJssdkShare(callback, url) { ...@@ -35,10 +35,13 @@ export function initJssdkShare(callback, url) {
} }
// data是穿的参数 url是当前页面的链接 // data是穿的参数 url是当前页面的链接
export function hshare(data,url){ export function hshare(data,url){
console.log(data)
// initJssdkShare(data, url) // initJssdkShare(data, url)
initJssdkShare(function(){ initJssdkShare(function(){
console.log(1)
jWeixin.ready(function(){ jWeixin.ready(function(){
console.log(data); console.log(2)
var sharedata={ var sharedata={
title: data.title, //标题 title: data.title, //标题
desc: data.desc, //描述 desc: data.desc, //描述
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment