Skip to content

C
CFFP-HB
Commit 243bf075 by sunchao
Options

分享&提现bug修复&上传计划书中途退出提示取消

parent deef2849
Showing with 152 additions and 19 deletions
components/menuList/menuList.vue
...@@ -72,8 +72,7 @@ ...@@ -72,8 +72,7 @@
margin: 50rpx auto 0; margin: 50rpx auto 0;
.ulBox { .ulBox {
padding: 0 20rpx; padding: 20rpx;
.liBox { .liBox {
display: flex; display: flex;
align-items: center; align-items: center;
......
components/uploadFile/uploadFile.vue
...@@ -124,6 +124,9 @@ ...@@ -124,6 +124,9 @@
}, 2000) }, 2000)
}, },
onBackPress() {
uni.hideLoading();
},
methods: { methods: {
// 某文件上传结束回调(成功失败都回调) // 某文件上传结束回调(成功失败都回调)
onuploadEnd(item) { onuploadEnd(item) {
......
main.js
...@@ -18,3 +18,5 @@ export function createApp() { ...@@ -18,3 +18,5 @@ export function createApp() {
} }
} }
// #endif // #endif
window.sessionStorage.setItem('firstEntryUrl',window.location.href.split('#')[0])
\ No newline at end of file
pages/authentication-query/authentication-result.vue
<template> <template>
<view class="container" style="padding-top: 60rpx;background: #fff;"> <view class="container" style="padding-top: 60rpx;background: #fff;">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;" <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"
:style="{top:queryType==1? '16rpx':'-10rpx'}"></text> :style="{top:queryType==1? '16rpx':'20rpx'}"></text>
<view class="others" v-if="queryType == 2"> <view class="others" v-if="queryType == 2">
<text>身份信息</text> <text>身份信息</text>
<view class="others_item"> <view class="others_item">
......
pages/certifyDetail/certifyDetail.vue
...@@ -98,6 +98,9 @@ ...@@ -98,6 +98,9 @@
this.userSignupId = options.userSignupId this.userSignupId = options.userSignupId
this.queryCertificateInfo(options.certificateId,this.userSignupId) this.queryCertificateInfo(options.certificateId,this.userSignupId)
}, },
onShow() {
uni.hideLoading();
},
methods:{ methods:{
goBack(){ goBack(){
uni.navigateBack({ uni.navigateBack({
...@@ -169,10 +172,15 @@ ...@@ -169,10 +172,15 @@
}, },
tokefu(){ tokefu(){
let url = 'http://q.url.cn/abkzV9?_type=wpa&qidian=true' // URL是要跳转的外部地址 作为参数 let url = 'http://q.url.cn/abkzV9?_type=wpa&qidian=true' // URL是要跳转的外部地址 作为参数
// #ifdef APP-PLUS
uni.navigateTo({ uni.navigateTo({
url: '/components/webview?url=' + url url: '/components/webview?url=' + url
// page.json定义的路径 传url 到webview界面去接收 实现跳转 // page.json定义的路径 传url 到webview界面去接收 实现跳转
}) })
// #endif
// #ifdef H5
window.location.href = url;
// #endif
} }
} }
} }
......
pages/certifyDetail/uploadinformation.vue
...@@ -101,7 +101,9 @@ ...@@ -101,7 +101,9 @@
onShow() { onShow() {
this.geterpInitialize() this.geterpInitialize()
}, },
onBackPress() {
uni.hideLoading();
},
methods: { methods: {
goBack(){ goBack(){
uni.navigateBack({ uni.navigateBack({
......
pages/courseDetail/courseDetail.vue
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</uni-popup> </uni-popup>
</view> </view>
<view class="" style="width: 40rpx;height: 40rpx;padding-right: 20rpx;"> <view class="" style="width: 40rpx;height: 40rpx;padding-right: 20rpx;">
<image class="image" @click="reinvite" src="../../static/fastentry/Slice122.png" mode=""></image> <image class="image" @click="reinvite()" src="../../static/fastentry/Slice122.png" mode=""></image>
</view> </view>
<view class="" style="width: 40rpx;height: 40rpx; "> <view class="" style="width: 40rpx;height: 40rpx; ">
<image class="image" @click="shareToggle" src="../../static/fastentry/Slice12.png" mode=""></image> <image class="image" @click="shareToggle" src="../../static/fastentry/Slice12.png" mode=""></image>
...@@ -125,9 +125,8 @@ ...@@ -125,9 +125,8 @@
<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 style="margin-bottom:30rpx">请点击右上角菜单</view>
<view style="line-height: 60rpx;"> <view>分享给朋友</view>
戳这里，点击按钮，使用系统浏览器打开页面完成支付，完成后请返回微信，到【销售课程】下，查看购买订单。</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -294,7 +293,7 @@ ...@@ -294,7 +293,7 @@
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 = {
href: "https://mdev.zuihuibi.cn/cffp/pages/courseDetail/courseDetail?fileId=" + this.fileId + href: "https://" + window.location.host + "/cffp/pages/courseDetail/courseDetail?fileId=" + this.fileId +
'&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode + '&shareUserId=' + '&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode + '&shareUserId=' +
this.userId + '&jumpUrl=' + jumptime + "&", this.userId + '&jumpUrl=' + jumptime + "&",
title: this.courseInfo.fileTitle, title: this.courseInfo.fileTitle,
...@@ -305,8 +304,10 @@ ...@@ -305,8 +304,10 @@
} }
this.$refs.sharewx.open(dataWXform) this.$refs.sharewx.open(dataWXform)
// #endif // #endif
//#ifdef H5
//#ifdef H5
this.shareTipsFlag = true;
this.getshareData()
// #endif // #endif
}, },
shareToggle() { shareToggle() {
...@@ -619,7 +620,19 @@ ...@@ -619,7 +620,19 @@
link: window.location.href, //分享链接 link: window.location.href, //分享链接
imgUrl: this.courseInfo.displayImage, //图片 imgUrl: this.courseInfo.displayImage, //图片
} }
var url = window.location.href.split('#')[0] //安卓机型获取当前页面路径
let url = window.location.href.split('#')[0];
//ios机型获取当前页面路径
let ua = navigator.userAgent.toLowerCase();
let isWeixin = ua.indexOf('micromessenger') !== -1;
if (isWeixin) {
let isiOS = /(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent); //ios终端
if (isiOS && window.sessionStorage.getItem('firstEntryUrl')) {
url = window.sessionStorage.getItem('firstEntryUrl').split('#')[0];
}
}
// let url = window.location.href.split('#')[0]
hshare(data, url) hshare(data, url)
}, },
// 唤醒app 测试 // 唤醒app 测试
...@@ -995,7 +1008,7 @@ ...@@ -995,7 +1008,7 @@
} }
.tips { .tips {
margin-top: 20%; margin-top: 30%;
padding: 0 30px; padding: 0 30px;
} }
} }
......
pages/index/index.vue
...@@ -211,10 +211,15 @@ ...@@ -211,10 +211,15 @@
}, },
tokefu() { tokefu() {
let url = 'http://q.url.cn/abkzV9?_type=wpa&qidian=true' // URL是要跳转的外部地址 作为参数 let url = 'http://q.url.cn/abkzV9?_type=wpa&qidian=true' // URL是要跳转的外部地址 作为参数
// #ifdef APP-PLUS
uni.navigateTo({ uni.navigateTo({
url: '/components/webview?url=' + url url: '/components/webview?url=' + url
// page.json定义的路径 传url 到webview界面去接收 实现跳转 // page.json定义的路径 传url 到webview界面去接收 实现跳转
}) })
// #endif
// #ifdef H5
window.location.href = url;
// #endif
}, },
featureSelect(featureItem) { featureSelect(featureItem) {
console.log(featureItem) console.log(featureItem)
......
pages/inviteJoin/inviteJoin.vue
...@@ -125,12 +125,22 @@ ...@@ -125,12 +125,22 @@
</view> </view>
</uni-popup> </uni-popup>
</view> </view>
<view class="markBox" @click="shareTipsFlag=false" v-if="shareTipsFlag">
<view class="guideImgBox">
<image src="../../static/Group132.png" mode="widthFix"></image>
<view class="tips">
<view style="margin-bottom:30rpx">请点击右上角菜单</view>
<view>分享给朋友</view>
</view>
</view>
</view>
</view> </view>
</template> </template>
<script> <script>
import api from "@/api/api" import api from "@/api/api"
import common from '../../common/common'; import common from '../../common/common';
import {hshare} from '@/util/fiveshare';
export default { export default {
data() { data() {
return { return {
...@@ -159,7 +169,8 @@ ...@@ -159,7 +169,8 @@
shareId: '', shareId: '',
realName: '', realName: '',
partnerLevel: '', partnerLevel: '',
invitationCode: '' invitationCode: '',
shareTipsFlag:false
}; };
}, },
onLoad(option) { onLoad(option) {
...@@ -251,12 +262,18 @@ ...@@ -251,12 +262,18 @@
if (common.mobileNoValid(this.dataForm.mobileNumber)) { if (common.mobileNoValid(this.dataForm.mobileNumber)) {
api.saveApplyInfo(this.dataForm).then(res => { api.saveApplyInfo(this.dataForm).then(res => {
if (res['success']) { if (res['success']) {
this.shareId = res.data.id this.shareId = res.data.id;
// #ifdef APP-PLUS
this.$refs.share.open() this.$refs.share.open()
// #endif
// uni.navigateTo({ // uni.navigateTo({
// url: '/pages/invitationRegister/invitationRegister?shareId=' + this.shareId + // url: '/pages/invitationRegister/invitationRegister?shareId=' + this.shareId +
// '&invitationCode=' + this.invitationCode + '&hasCrossDistrict=' + this.dataForm.hasCrossDistrict // '&invitationCode=' + this.invitationCode + '&hasCrossDistrict=' + this.dataForm.hasCrossDistrict
// }) // })
//#ifdef H5
this.shareTipsFlag = true;
this.getshareData()
// #endif
} }
uni.showToast({ uni.showToast({
title: res['message'], title: res['message'],
...@@ -269,19 +286,48 @@ ...@@ -269,19 +286,48 @@
} }
}, },
getshareData() {
let data = {
title: 'CFFP家庭财务策划师联盟邀您加入',
desc: `我是家庭财务策划师${this.realName}正在使用CFFP财富中心，点击即刻加入！`,
link: "https://" + window.location.host + "/cffp/pages/invitationRegister/invitationRegister?shareId=" +
this.shareId + '&invitationCode=' + this.invitationCode, //分享链接
imgUrl: "https://mdev.zuihuibi.cn/cffp/static/cffp_logo.jpg", //图片
}
//安卓机型获取当前页面路径
let url = window.location.href.split('#')[0];
//ios机型获取当前页面路径
let ua = navigator.userAgent.toLowerCase();
let isWeixin = ua.indexOf('micromessenger') !== -1;
if (isWeixin) {
let isiOS = /(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent); //ios终端
if (isiOS && window.sessionStorage.getItem('firstEntryUrl')) {
url = window.sessionStorage.getItem('firstEntryUrl').split('#')[0];
}
}
// let url = window.location.href.split('#')[0]
hshare(data, url)
},
closeShare() { closeShare() {
this.$refs.share.close() this.$refs.share.close()
}, },
reinvite(id) { reinvite(id) {
this.shareId = id this.shareId = id
// #ifdef APP-PLUS
this.$refs.share.open() this.$refs.share.open()
// #endif
//#ifdef H5
this.shareTipsFlag = true;
this.getshareData()
// #endif
}, },
uniShare(type) { uniShare(type) {
uni.share({ uni.share({
provider: "weixin", provider: "weixin",
scene: type === 1 ? "WXSceneSession" : "WXSceneTimeline", scene: type === 1 ? "WXSceneSession" : "WXSceneTimeline",
type: 0, type: 0,
href: "https://mdev.zuihuibi.cn/cffp/pages/invitationRegister/invitationRegister?shareId=" + href:"https://" + window.location.host + "/cffp/pages/invitationRegister/invitationRegister?shareId=" +
this.shareId + '&invitationCode=' + this.invitationCode, this.shareId + '&invitationCode=' + this.invitationCode,
title: "CFFP家庭财务策划师联盟邀您加入", title: "CFFP家庭财务策划师联盟邀您加入",
summary: `我是家庭财务策划师${this.realName}正在使用CFFP财富中心，点击下载即刻加入！`, summary: `我是家庭财务策划师${this.realName}正在使用CFFP财富中心，点击下载即刻加入！`,
...@@ -501,5 +547,33 @@ ...@@ -501,5 +547,33 @@
padding-top: 36rpx; padding-top: 36rpx;
} }
.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: 30%;
padding: 0 30px;
}
}
} }
</style> </style>
pages/orderDetail/orderDetail.vue
<template> <template>
<view class="container" style="padding-top: 30rpx;"> <view class="container" style="padding-top: 50rpx;">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 16rpx;"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 16rpx;"></text>
<view class="orderInfoContent"> <view class="orderInfoContent">
<view class="ulBox"> <view class="ulBox">
......
pages/personalCenter/myTeam.vue
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
justify-content: space-between; justify-content: space-between;
border-bottom: 1px solid #E6E6E6; border-bottom: 1px solid #E6E6E6;
height: 92rpx; height: 92rpx;
margin-top: 20rpx;
.infoBox { .infoBox {
display: flex; display: flex;
align-items: center; align-items: center;
......
pages/pointsExchange/pointsExchange.vue
...@@ -88,9 +88,22 @@ ...@@ -88,9 +88,22 @@
}) })
}, },
toWithdrawal(){ toWithdrawal(){
if(!this.yesExchangeFortune || this.yesExchangeFortune==0){
uni.showModal({
content: '金额低于1元时无法提现',
success: function (res) {
if (res.confirm) {
console.log('用户点击确定');
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
}else{
uni.navigateTo({ uni.navigateTo({
url:`/pages/withdrawal/withdrawal?exchangeAmount=${this.yesExchangeFortune}` url:`/pages/withdrawal/withdrawal?exchangeAmount=${this.yesExchangeFortune}`
}) })
}
}, },
toRecord(){ toRecord(){
uni.navigateTo({ uni.navigateTo({
......
pages/withdrawal/withdrawal.vue
...@@ -219,6 +219,19 @@ ...@@ -219,6 +219,19 @@
// #endif // #endif
}, },
confirmWithdrawal(){ confirmWithdrawal(){
if(!this.exchangeAmount || this.exchangeAmount==0){
uni.showModal({
content: '金额低于1元时无法提现',
success: function (res) {
if (res.confirm) {
console.log('用户点击确定');
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
return false;
}
//#ifdef H5 //#ifdef H5
this.aliWithdrawal(); this.aliWithdrawal();
//#endif //#endif
......
util/fiveshare.ts
...@@ -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: true,//调试的时候需要 在app上回弹出errmg:config ok 的时候就证明没问题了 这时候就可以改为false debug: false,//调试的时候需要 在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,//随机串
......
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