Skip to content

C
CFFP-HB
Commit 243bf075 by sunchao
Options

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

parent deef2849
Showing with 160 additions and 28 deletions
components/menuList/menuList.vue
......@@ -72,8 +72,7 @@
margin: 50rpx auto 0;
.ulBox {
padding: 0 20rpx;
padding: 20rpx;
.liBox {
display: flex;
align-items: center;
......
components/uploadFile/uploadFile.vue
......@@ -124,6 +124,9 @@
}, 2000)
},
onBackPress() {
uni.hideLoading();
},
methods: {
// 某文件上传结束回调(成功失败都回调)
onuploadEnd(item) {
......
main.js
......@@ -17,4 +17,6 @@ export function createApp() {
app
}
}
// #endif
\ No newline at end of file
// #endif
window.sessionStorage.setItem('firstEntryUrl',window.location.href.split('#')[0])
\ No newline at end of file
pages/authentication-query/authentication-result.vue
<template>
<view class="container" style="padding-top: 60rpx;background: #fff;">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"
:style="{top:queryType==1? '16rpx':'-10rpx'}"></text>
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"
:style="{top:queryType==1? '16rpx':'20rpx'}"></text>
<view class="others" v-if="queryType == 2">
<text>身份信息</text>
<view class="others_item">
......
pages/certifyDetail/certifyDetail.vue
......@@ -98,6 +98,9 @@
this.userSignupId = options.userSignupId
this.queryCertificateInfo(options.certificateId,this.userSignupId)
},
onShow() {
uni.hideLoading();
},
methods:{
goBack(){
uni.navigateBack({
......@@ -168,11 +171,16 @@
return dataHandling.dateFormat(val,'yyyy-MM-dd')
},
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({
url: '/components/webview?url=' + url
// page.json定义的路径 传url 到webview界面去接收 实现跳转
url: '/components/webview?url=' + url
// page.json定义的路径 传url 到webview界面去接收 实现跳转
})
// #endif
// #ifdef H5
window.location.href = url;
// #endif
}
}
}
......
pages/certifyDetail/uploadinformation.vue
......@@ -101,7 +101,9 @@
onShow() {
this.geterpInitialize()
},
onBackPress() {
uni.hideLoading();
},
methods: {
goBack(){
uni.navigateBack({
......
pages/courseDetail/courseDetail.vue
......@@ -11,7 +11,7 @@
</uni-popup>
</view>
<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 class="" style="width: 40rpx;height: 40rpx; ">
<image class="image" @click="shareToggle" src="../../static/fastentry/Slice12.png" mode=""></image>
......@@ -125,9 +125,8 @@
<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 style="margin-bottom:30rpx">请点击右上角菜单</view>
<view>分享给朋友</view>
</view>
</view>
</view>
......@@ -294,7 +293,7 @@
const shareCode = nanoid() + this.userId
const jumptime = Date.parse(new Date()) / 1000
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=' +
this.userId + '&jumpUrl=' + jumptime + "&",
title: this.courseInfo.fileTitle,
......@@ -305,8 +304,10 @@
}
this.$refs.sharewx.open(dataWXform)
// #endif
//#ifdef H5
//#ifdef H5
this.shareTipsFlag = true;
this.getshareData()
// #endif
},
shareToggle() {
......@@ -619,7 +620,19 @@
link: window.location.href, //分享链接
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)
},
// 唤醒app 测试
......@@ -995,7 +1008,7 @@
}
.tips {
margin-top: 20%;
margin-top: 30%;
padding: 0 30px;
}
}
......
pages/index/index.vue
......@@ -211,10 +211,15 @@
},
tokefu() {
let url = 'http://q.url.cn/abkzV9?_type=wpa&qidian=true' // URL是要跳转的外部地址 作为参数
// #ifdef APP-PLUS
uni.navigateTo({
url: '/components/webview?url=' + url
// page.json定义的路径 传url 到webview界面去接收 实现跳转
})
// #endif
// #ifdef H5
window.location.href = url;
// #endif
},
featureSelect(featureItem) {
console.log(featureItem)
......
pages/inviteJoin/inviteJoin.vue
......@@ -125,12 +125,22 @@
</view>
</uni-popup>
</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>
</template>
<script>
import api from "@/api/api"
import common from '../../common/common';
import {hshare} from '@/util/fiveshare';
export default {
data() {
return {
......@@ -159,7 +169,8 @@
shareId: '',
realName: '',
partnerLevel: '',
invitationCode: ''
invitationCode: '',
shareTipsFlag:false
};
},
onLoad(option) {
......@@ -251,12 +262,18 @@
if (common.mobileNoValid(this.dataForm.mobileNumber)) {
api.saveApplyInfo(this.dataForm).then(res => {
if (res['success']) {
this.shareId = res.data.id
this.shareId = res.data.id;
// #ifdef APP-PLUS
this.$refs.share.open()
// #endif
// uni.navigateTo({
// url: '/pages/invitationRegister/invitationRegister?shareId=' + this.shareId +
// '&invitationCode=' + this.invitationCode + '&hasCrossDistrict=' + this.dataForm.hasCrossDistrict
// })
//#ifdef H5
this.shareTipsFlag = true;
this.getshareData()
// #endif
}
uni.showToast({
title: res['message'],
......@@ -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() {
this.$refs.share.close()
},
reinvite(id) {
this.shareId = id
// #ifdef APP-PLUS
this.$refs.share.open()
// #endif
//#ifdef H5
this.shareTipsFlag = true;
this.getshareData()
// #endif
},
uniShare(type) {
uni.share({
provider: "weixin",
scene: type === 1 ? "WXSceneSession" : "WXSceneTimeline",
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,
title: "CFFP家庭财务策划师联盟邀您加入",
summary: `我是家庭财务策划师${this.realName}正在使用CFFP财富中心，点击下载即刻加入！`,
......@@ -500,6 +546,34 @@
align-items: center;
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>
pages/orderDetail/orderDetail.vue
<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>
<view class="orderInfoContent">
<view class="ulBox">
......
pages/personalCenter/myTeam.vue
......@@ -78,7 +78,7 @@
justify-content: space-between;
border-bottom: 1px solid #E6E6E6;
height: 92rpx;
margin-top: 20rpx;
.infoBox {
display: flex;
align-items: center;
......
pages/pointsExchange/pointsExchange.vue
......@@ -88,9 +88,22 @@
})
},
toWithdrawal(){
uni.navigateTo({
url:`/pages/withdrawal/withdrawal?exchangeAmount=${this.yesExchangeFortune}`
})
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({
url:`/pages/withdrawal/withdrawal?exchangeAmount=${this.yesExchangeFortune}`
})
}
},
toRecord(){
uni.navigateTo({
......
pages/withdrawal/withdrawal.vue
......@@ -219,6 +219,19 @@
// #endif
},
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
this.aliWithdrawal();
//#endif
......
util/fiveshare.ts
......@@ -21,7 +21,7 @@ export function initJssdkShare(callback, url) {
// @ts-ignore
api.Wxshare(WxConfigRequestVO).then(res => {
jWeixin.config({
debug: true,//调试的时候需要 在app上回弹出errmg:config ok 的时候就证明没问题了 这时候就可以改为false
debug: false,//调试的时候需要 在app上回弹出errmg:config ok 的时候就证明没问题了 这时候就可以改为false
appId: res.data.appId,//appid
timestamp: res.data.timestamp,//时间戳
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