Skip to content

C
CFFP-HB
Commit 74c4c563 by sunchao
Options

阅读id&分享id&申请加盟所属组织bug修复

parent 2801a043
Showing with 131 additions and 97 deletions
api/api.ts
...@@ -304,5 +304,9 @@ export default { ...@@ -304,5 +304,9 @@ export default {
// 用户阅读 // 用户阅读
userRead(params){ userRead(params){
return request(`${apiURL}/cffp/share/userRead`, "POST", params) return request(`${apiURL}/cffp/share/userRead`, "POST", params)
},
//支付宝网页支付
aliWapPay(params){
return request(`${apiURL}/aliPay/aliWapPay`, "POST", params)
} }
} }
components/login/login.vue
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<text>已阅读并同意</text><a href="#">银盾保险经纪服务协议</a><text>和</text><a href="">隐私政策</a> <text>已阅读并同意</text><a href="#">银盾保险经纪服务协议</a><text>和</text><a href="">隐私政策</a>
</view> </view>
<view class="login_btn" @click="loginInCheck()" v-if="loginType!='resetpw'"> <view class="login_btn" @click="loginInCheck()" v-if="loginType!='resetpw'">
{{loginType=='register'?'注册':'登录'}} {{loginType=='register'?'注册':'登录'}} {{this.loginType}}
</view> </view>
<view class="login_btn" v-if="loginType=='resetpw'" @click="loginInCheck()"> <view class="login_btn" v-if="loginType=='resetpw'" @click="loginInCheck()">
保存 保存
......
pages/application-process/application-result.vue
...@@ -19,13 +19,16 @@ ...@@ -19,13 +19,16 @@
</view> </view>
<view class="wrapper"> <view class="wrapper">
<view class="iconfont icon-gou"></view> <view class="iconfont icon-gou"></view>
<h4>您已提交成功</h4> <h4>{{approvalStatus==3?'审批通过':'您已提交成功'}}</h4>
<view class="result" v-if="this.partnerLevel=='A1'"> <view class="result" v-if="this.partnerLevel=='A1' && approvalStatus==3">
恭喜您成为 {{areaName}} 事业伙伴！ 恭喜您成为 {{areaName}} 事业伙伴！
</view> </view>
<view class="result" v-if="this.partnerLevel=='B1'"> <view class="result" v-if="this.partnerLevel=='B1' && approvalStatus!=3">
您的申请已进入人工审核，请耐心等待！ 您的申请已进入人工审核，请耐心等待！
</view> </view>
<view class="result" v-if="this.partnerLevel=='B1' && approvalStatus==3">
欢迎您加入{{areaName}}！
</view>
<navigator url="../index/index"> <navigator url="../index/index">
返回首页 > 返回首页 >
</navigator> </navigator>
...@@ -38,13 +41,15 @@ ...@@ -38,13 +41,15 @@
data(){ data(){
return { return {
partnerLevel:null, partnerLevel:null,
areaName:null areaName:null,
approvalStatus:null
} }
}, },
components:{}, components:{},
onLoad(options){ onLoad(options){
this.areaName = options.areaName; this.areaName = options.areaName;
this.partnerLevel = options.partnerLevel; this.partnerLevel = options.partnerLevel;
this.approvalStatus = options.approvalStatus;
}, },
methods:{ methods:{
......
pages/application-process/basic-info.vue
...@@ -138,7 +138,6 @@ ...@@ -138,7 +138,6 @@
components:{}, components:{},
onLoad(options){ onLoad(options){
this.erpInitialize(); this.erpInitialize();
this.queryOrgList();
// let routes = getCurrentPages(); // 获取当前打开过的页面路由数组 // let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
// let curRoute = routes[routes.length - 1].route // 获取当前页面路由，也就是最后一个打开的页面路由 // let curRoute = routes[routes.length - 1].route // 获取当前页面路由，也就是最后一个打开的页面路由
// console.log('当前路由地址',curRoute) // console.log('当前路由地址',curRoute)
...@@ -158,7 +157,7 @@ ...@@ -158,7 +157,7 @@
}else{ }else{
this.queryById(null,uni.getStorageSync('cffp_userId')) this.queryById(null,uni.getStorageSync('cffp_userId'))
} }
},500) },100)
}, },
methods:{ methods:{
erpInitialize(){ erpInitialize(){
...@@ -180,6 +179,12 @@ ...@@ -180,6 +179,12 @@
console.log(res) console.log(res)
if(res['success']){ if(res['success']){
this.cffpAreaQuerys = this.cffpAreaQuerys.concat(res['data']['cffpAreaQuerys']) this.cffpAreaQuerys = this.cffpAreaQuerys.concat(res['data']['cffpAreaQuerys'])
for(let j=0;j<this.cffpAreaQuerys.length;j++){
if(this.applyParam.areaId == this.cffpAreaQuerys[j].areaId){
this.areaIdIdx = j;
console.log(j)
}
}
} }
}) })
}, },
...@@ -253,17 +258,20 @@ ...@@ -253,17 +258,20 @@
api.queryById({id:id,userId:userId}).then((res)=>{ api.queryById({id:id,userId:userId}).then((res)=>{
if(res['success']){ if(res['success']){
this.applyParam = res['data']['data']; this.applyParam = res['data']['data'];
this.queryOrgList();
for(let m=0;m<this.identityArr.length;m++){
if(this.applyParam.partnerLevel == this.identityArr[m].partnerLevel){
this.identityIdx = m;
}
}
for(let i=0;i<this.idTypesList.length;i++){ for(let i=0;i<this.idTypesList.length;i++){
if(this.applyParam.idType == this.idTypesList[i].name){ if(this.applyParam.idType == this.idTypesList[i].name){
this.idTypeIdx = i; this.idTypeIdx = i;
} }
} }
for(let j=0;j<this.cffpAreaQuerys.length;j++){
if(this.applyParam.areaId == this.cffpAreaQuerys[j].areaId){ }else{
this.areaIdIdx = j; this.queryOrgList();
console.log(j)
}
}
} }
}) })
}, },
......
pages/application-process/signature.vue
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
}) })
}else{ }else{
uni.navigateTo({ uni.navigateTo({
url: `application-result?partnerLevel=${this.applyParam.partnerLevel}&areaName=${this.applyParam.areaName}`, url: `application-result?partnerLevel=${this.applyParam.partnerLevel}&areaName=${this.applyParam.areaName}&approvalStatus=${this.applyParam.approvalStatus}`,
success: res => {}, success: res => {},
fail: () => {}, fail: () => {},
complete: () => {} complete: () => {}
......
pages/commonDetail/commonDetail.vue
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<view> <view>
<template v-if="title"> <template v-if="title">
<view><list-item :title="title" :lists="lists"></list-item></view> <view><list-item :title="title" :lists="lists"></list-item></view>
<view v-if="lists.length<=0" style="text-align: center;margin-top: 40rpx;">暂无{{typeName}}记录</view>
</template> </template>
<!-- -->
</view> </view>
</template> </template>
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
lists:[], lists:[],
fileId:'', fileId:'',
type:'1', type:'1',
userId: uni.getStorageSync('cffp_userId') userId: uni.getStorageSync('cffp_userId'),
typeName:''
} }
}, },
methods: { methods: {
...@@ -57,6 +58,7 @@ ...@@ -57,6 +58,7 @@
mounted() { mounted() {
console.log('mounted') console.log('mounted')
if(this.type=='1'){ if(this.type=='1'){
this.typeName = '分享';
this.title = [ this.title = [
{no:1,name:'分享时间',width: '40%'}, {no:1,name:'分享时间',width: '40%'},
{no:2,name:'分享链接',width: '35%'}, {no:2,name:'分享链接',width: '35%'},
...@@ -70,11 +72,12 @@ ...@@ -70,11 +72,12 @@
children:[ children:[
{no:1,name:'分享时间',width: '40%',value:'',link:null,alias:'shareDate'}, {no:1,name:'分享时间',width: '40%',value:'',link:null,alias:'shareDate'},
{no:2,name:'分享链接',width: '35%',value:'',link:null,alias:'shareUrl'}, {no:2,name:'分享链接',width: '35%',value:'',link:null,alias:'shareUrl'},
{no:3,name:'阅读明细',width: '25%',value:'阅读明细',link:`/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=2`}, {no:3,name:'阅读明细',width: '25%',value:'阅读明细',link:`/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=2&shareId=`,needParam:true},
] ]
} }
); );
}else if(this.type=='2'){ }else if(this.type=='2'){
this.typeName = '阅读';
this.title = [ this.title = [
{no:1,name:'用户',width: '20%'}, {no:1,name:'用户',width: '20%'},
{no:2,name:'阅读链接',width: '30%'}, {no:2,name:'阅读链接',width: '30%'},
...@@ -90,11 +93,12 @@ ...@@ -90,11 +93,12 @@
{no:1,name:'用户',width: '20%',value:'',link:null,alias:'readName'}, {no:1,name:'用户',width: '20%',value:'',link:null,alias:'readName'},
{no:2,name:'阅读链接',width: '30%',value:'',link:null,alias:'readUrl'}, {no:2,name:'阅读链接',width: '30%',value:'',link:null,alias:'readUrl'},
{no:3,name:'阅读时间',width: '25%',value:'',link:null,alias:'readDate'}, {no:3,name:'阅读时间',width: '25%',value:'',link:null,alias:'readDate'},
{no:3,name:'购买明细',width: '25%',value:'购买明细',link:`/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=3`}, {no:3,name:'购买明细',width: '25%',value:'购买明细',link:`/pages/commonDetail/commonDetail?fileId=${this.fileId}&type=3&readId=`,needParam:true},
] ]
} }
); );
}else if(this.type=='3'){ }else if(this.type=='3'){
this.typeName = '购买';
this.title = [ this.title = [
{no:1,name:'用户',width: '30%'}, {no:1,name:'用户',width: '30%'},
{no:2,name:'阅读链接',width: '30%'}, {no:2,name:'阅读链接',width: '30%'},
......
pages/orderConfirm/orderConfirm.vue
...@@ -175,6 +175,8 @@ ...@@ -175,6 +175,8 @@
this.paymentBtnDisabled = false; this.paymentBtnDisabled = false;
}) })
}else if(this.paymentMethod==2){ }else if(this.paymentMethod==2){
// APP：
// #ifdef APP-PLUS
api.aliAppPay(param).then(res=>{ api.aliAppPay(param).then(res=>{
if(res['success']){ if(res['success']){
const aliOrderString = res['data']['aliOrderString']; const aliOrderString = res['data']['aliOrderString'];
...@@ -216,7 +218,8 @@ ...@@ -216,7 +218,8 @@
}); });
} }
}) })
// #endif
} }
}, },
......
pages/withdrawal/withdrawal.vue
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
3、如需帮助，请联系CFFP财富中心客服电话:12345678; 3、如需帮助，请联系CFFP财富中心客服电话:12345678;
</view> </view>
</view> </view>
<view class="btn" @click="confirmWithdrawal()"> <view class="btn" @click="confirmWithdrawal()" :class="{'gray':readonlyFlag}">
确认提现 确认提现
</view> </view>
</view> </view>
...@@ -78,7 +78,8 @@ ...@@ -78,7 +78,8 @@
noTaxAmount:null, noTaxAmount:null,
paymentMethod:2,//初始化支付宝提现 paymentMethod:2,//初始化支付宝提现
aliWithdrawalResVO:null, aliWithdrawalResVO:null,
wxWithdrawalResVO:null wxWithdrawalResVO:null,
readonlyFlag:false
} }
}, },
components:{}, components:{},
...@@ -128,8 +129,10 @@ ...@@ -128,8 +129,10 @@
}, },
//支付宝去提现 //支付宝去提现
aliWithdrawal(){ aliWithdrawal(){
this.readonlyFlag = true;
api.aliWithdrawal(this.aliWithdrawalResVO).then((res)=>{ api.aliWithdrawal(this.aliWithdrawalResVO).then((res)=>{
if(res['success']){ if(res['success']){
this.readonlyFlag = false;
uni.showModal({ uni.showModal({
content: '提现成功！', content: '提现成功！',
success: function (res) { success: function (res) {
...@@ -188,85 +191,89 @@ ...@@ -188,85 +191,89 @@
// #endif // #endif
}, },
confirmWithdrawal(){ confirmWithdrawal(){
this.aliWithdrawalResVO = { if(!this.readonlyFlag){
...this.aliWithdrawalResVO, this.readonlyFlag = true;
orderNo:this.partnerTradeNo, this.aliWithdrawalResVO = {
amount:this.exchangeAmount, ...this.aliWithdrawalResVO,
userId:uni.getStorageSync('cffp_userId'), orderNo:this.partnerTradeNo,
} amount:this.exchangeAmount,
console.log(this.aliWithdrawalResVO) userId:uni.getStorageSync('cffp_userId'),
api.isAuth(this.aliWithdrawalResVO).then((res)=>{ }
console.log(res) console.log(this.aliWithdrawalResVO)
if(res['success']){ api.isAuth(this.aliWithdrawalResVO).then((res)=>{
this.aliWithdrawalResVO.aliUserId = res['data']['aliUserId']; console.log(res)
if(res['data']['isAuth'] == 1){ if(res['success']){
if(this.paymentMethod == 1){ this.aliWithdrawalResVO.aliUserId = res['data']['aliUserId'];
this.wxWithdrawal(); if(res['data']['isAuth'] == 1){
} if(this.paymentMethod == 1){
if(this.paymentMethod == 2){ this.wxWithdrawal();
// APP： }
// #ifdef APP-PLUS if(this.paymentMethod == 2){
let urls= this.aliWithdrawalResVO.aliAuthUrl; // APP：
urls=encodeURIComponent(urls); // #ifdef APP-PLUS
// 判断平台 let urls= this.aliWithdrawalResVO.aliAuthUrl;
if (plus.os.name == 'Android') { urls=encodeURIComponent(urls);
plus.runtime.openURL( // 判断平台
'alipays://platformapi/startapp?appId=20000067&url=' + urls, if (plus.os.name == 'Android') {
res => { plus.runtime.openURL(
//这里写打开URL地址失败后的处理 'alipays://platformapi/startapp?appId=20000067&url=' + urls,
console.log(res); res => {
uni.showModal({ //这里写打开URL地址失败后的处理
content: '本机未检测到对应客户端，是否打开浏览器访问页面？', console.log(res);
success: function (res) { uni.showModal({
if (res.confirm) { content: '本机未检测到对应客户端，是否打开浏览器访问页面？',
//plus.runtime.openURL(); success: function (res) {
} if (res.confirm) {
} //plus.runtime.openURL();
}); }
}, }
'com.eg.android.AlipayGphone' });
); },
} else if (plus.os.name == 'iOS') { 'com.eg.android.AlipayGphone'
plus.runtime.openURL( );
'alipay://platformapi/startapp?appId=20000067&url=' + urls, } else if (plus.os.name == 'iOS') {
res => { plus.runtime.openURL(
console.log(res); 'alipay://platformapi/startapp?appId=20000067&url=' + urls,
uni.showModal({ res => {
content: '本机未检测到对应客户端，是否打开浏览器访问页面？', console.log(res);
success: function (res) { uni.showModal({
if (res.confirm) { content: '本机未检测到对应客户端，是否打开浏览器访问页面？',
//plus.runtime.openURL(url); success: function (res) {
} if (res.confirm) {
} //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{
} this.readonlyFlag = false;
}else{ uni.showModal({
if(this.paymentMethod == 1){ content: res['message'],
this.wxWithdrawal(); success: function (res) {
} if (res.confirm) {
if(this.paymentMethod == 2){ console.log('用户点击确定');
this.aliWithdrawal(); } else if (res.cancel) {
} console.log('用户点击取消');
}
} }
}else{ });
uni.showModal({
content: res['message'],
success: function (res) {
if (res.confirm) {
console.log('用户点击确定');
} else if (res.cancel) {
console.log('用户点击取消');
}
} }
}); });
} }
});
} }
} }
} }
...@@ -291,6 +298,9 @@ ...@@ -291,6 +298,9 @@
background: #fff; background: #fff;
margin: 20rpx auto; margin: 20rpx auto;
padding:0 30rpx; padding:0 30rpx;
.btn.gray{
background: #666;
}
.item{ .item{
display: flex; display: flex;
padding: 20rpx 0; padding: 20rpx 0;
......
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