Skip to content

C
CFFP-HB
Commit cac1af8d by wenyang
Options

流程优化1

parent ae678867
Showing with 120 additions and 98 deletions
androidPrivacy.json
......@@ -2,12 +2,12 @@
"version" : "1",
"prompt" : "template",
"title" : "服务协议和隐私政策",
"message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://m.cffp.org.cn/cffp/components/clause/clause?type=1&isBack=1\">《服务协议》</a>和<a href=\"https://m.cffp.org.cn/cffp/components/clause/clause?type=2&isBack=1\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
"message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://app.ydhomeoffice.cn/components/clause/clause?type=1&isBack=1\">《服务协议》</a>和<a href=\"https://app.ydhomeoffice.cn/components/clause/clause?type=2&isBack=1\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
"buttonAccept" : "同意并接受",
"buttonRefuse" : "暂不同意",
"second" : {
"title" : "确认提示",
"message" : "　　进入应用前，你需先同意<a href=\"https://m.cffp.org.cn/cffp/components/clause/clause?type=1&isBack=1\">《服务协议》</a>和<a href=\"https://m.cffp.org.cn/cffp/components/clause/clause?type=2&isBack=1\">《隐私政策》</a>，否则将退出应用。",
"message" : "　　进入应用前，你需先同意<a href=\"https://app.ydhomeoffice.cn/components/clause/clause?type=1&isBack=1\">《服务协议》</a>和<a href=\"https://app.ydhomeoffice.cn/components/clause/clause?type=2&isBack=1\">《隐私政策》</a>，否则将退出应用。",
"buttonAccept" : "同意并继续",
"buttonRefuse" : "退出应用"
},
......
api/api.ts
......@@ -263,6 +263,10 @@ export default {
queryById(params){
return request(`${cffpURL}/partner/queryById`, "POST",params)
},
//查询开行信息
bankQry(params){
return request(`${apiURL}/metadata/bankQry`, "POST",params)
},
//支付宝去提现
aliWithdrawal(params){
return request(`${apiURL}/aliPay/aliWithdrawal`, "POST", params)
......
components/carousel/carousel.vue
......@@ -30,10 +30,10 @@
if (!url) {
return false
} else {
let index = url.indexOf('/cffp/pages/');
let index = url.indexOf('/appYdhomeoffice/pages/');
if (index != -1) {
uni.navigateTo({
url: url.substring(index + 5, url.length)
url: url.substring(index + 16, url.length)
})
} else {
// #ifdef H5
......
components/login/login.vue
......@@ -5,7 +5,7 @@
</view>
<view class="logo">
<image :src="imgSrc" alt="logo" srcset="" class="iconBox" mode="widthFix"></image>
<view>欢迎登录使用银盾家办APP</view>
<view>欢迎登录使用{{companyName}}APP</view>
</view>
<view class="content">
<view class="login_title">
......@@ -81,6 +81,7 @@
export default {
data() {
return {
companyName : companyInfo.companyName,
// 登陆方式初始化为验证码登录
loginType: 'codelogin',
passwordFlag:false,
......
pages/application-process/application-result.vue
......@@ -20,6 +20,9 @@
<view class="wrapper">
<view class="iconfont icon-gou"></view>
<h4>{{approvalStatus==3?'审批通过':'您已提交成功'}}</h4>
<view class="result" v-if="this.partnerLevel=='P1' && approvalStatus==3">
欢迎您加入{{companyName}} ！
</view>
<view class="result" v-if="this.partnerLevel=='A1' && approvalStatus==3">
恭喜您成为 {{areaName}} 事业伙伴！
</view>
......@@ -30,12 +33,15 @@
欢迎您加入{{areaName}}！
</view>
<view class="">
<view class="" style="text-align: center;color: #20269B;" v-if="isH5">
<view class="home" @click="toHome()">
返回首页,开启新的篇章 >
</view>
<!-- <view class="" style="text-align: center;color: #20269B;" v-if="isH5">
<text>请前往应用商店下载App</text>
</view>
<view class="home" v-else @click="toHome()">
返回首页 >
</view>
返回首页,开启新的篇章 >
</view> -->
</view>
</view>
</view>
......@@ -43,9 +49,11 @@
<script>
import api from '@/api/api';
import {companyInfo} from "@/environments/environment";
export default{
data(){
return {
companyName: companyInfo.companyName,
partnerLevel:null,
areaName:null,
approvalStatus:null,
......
pages/application-process/bank-card.vue
......@@ -64,6 +64,7 @@
shareId: null,
sureBankAccountId: '',
applyParam: {},
bankList:{},
backForm: {
bankAccountOpening: '',
bankAccountId: '',
......@@ -74,6 +75,7 @@
components: {},
onLoad(options) {
this.shareId = options.shareId
this.bankQry();
},
onShow() {
uni.showLoading({
......@@ -119,6 +121,17 @@
uni.hideLoading()
})
},
bankQry(id, userId) {
api.bankQry({
insurerId: '888',
userId: userId
}).then((res) => {
if (res['success']) {
this.bankList = res['data']['bankList'];
console.log(this.bankList);
}
})
},
//去除输入空格
checkInput(str) {
str = str.replace(/\s*/g, "");
......
pages/application-process/basic-info.vue
......@@ -317,8 +317,6 @@
if (this.applyParam.inviterInvitationCode) {
this.Invitationcodetype = true
}
//this.queryOrgList();
for (let m = 0; m < this.identityArr.length; m++) {
if (this.applyParam.partnerLevel == this.identityArr[m].partnerLevel) {
this.identityIdx = m;
......@@ -335,8 +333,6 @@
.applyParam.applyType == '1') {
this.display = true
}
} else {
//this.queryOrgList();
}
})
},
......@@ -411,6 +407,14 @@
icon: 'none'
})
return;
}else{
// uni.showToast({
// title: '未满18岁不可申请',
// duration: 2000,
// icon: 'none'
// })
// return;
}
this.applyParam = {
...this.applyParam,
......
pages/application-process/personal-statement.vue
......@@ -135,14 +135,22 @@
const selectedPersonalStatement = this.dropOptionsInfoList.filter((item) => {
return item.status == 1;
});
if (!selectedPersonalStatement.length) {
if (!selectedPersonalStatement.length && selectedPersonalStatement.length < this.dropOptionsInfoList.length) {
uni.showToast({
title: '请选择至少一项个人声明！',
title: '需全部符合条件才可申请加盟',
duration: 2000,
icon: 'none'
})
return;
}
// if (!selectedPersonalStatement.length) {
// uni.showToast({
// title: '请选择至少一项个人声明！',
// duration: 2000,
// icon: 'none'
// })
// return;
// }
this.personalStatementList = [];
for (let i = 0; i < selectedPersonalStatement.length; i++) {
this.personalStatementList.push(selectedPersonalStatement[i]['dropOptionName']);
......
pages/courseDetail/courseDetail.vue
......@@ -340,13 +340,9 @@
//app分享
// #ifdef APP-PLUS
let dataWXform = {
href: baseURL + "/cffp/pages/courseDetail/courseDetail?fileId=" + this.fileId +
href: baseURL + "/pages/courseDetail/courseDetail?fileId=" + this.fileId +
'&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode + '&shareUserId=' +
this.userId + '&jumpUrl=' + jumptime + "&",
// href: "https://mdev.zuihuibi.cn/cffp/pages/courseDetail/courseDetail?fileId=" + this.fileId +
// '&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode + '&shareUserId=' +
// this.userId + '&jumpUrl=' + jumptime + "&",
title: this.courseInfo.fileTitle,
summary: `加入我们开启学习之旅`,
imageUrl: this.courseInfo.displayImage,
......@@ -684,7 +680,7 @@
let data = {
title: this.courseInfo.fileTitle,
desc: '加入我们开启学习之旅',
link:"https://" + window.location.host + "/cffp/pages/courseDetail/courseDetail?fileId=" + this.fileId +
link:"https://" + window.location.host + "/pages/courseDetail/courseDetail?fileId=" + this.fileId +
'&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode + '&shareUserId=' +
this.userId + '&jumpUrl=' + jumptime + "&", //分享链接
imgUrl: this.courseInfo.displayImage, //图片
......@@ -747,7 +743,7 @@
userId: uni.getStorageSync('cffp_userId'),
businessType: '1', // 分享类型
businessId: this.fileId, // 课程Id
shareUrl: "https://" + window.location.host + "/cffp/pages/courseDetail/courseDetail?fileId=" + this.fileId +
shareUrl: "https://" + window.location.host + "/pages/courseDetail/courseDetail?fileId=" + this.fileId +
'&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode + '&shareUserId=' +
this.userId + '&jumpUrl=' + jumptime + "&", // 分享链接
shareType: '2', // 分享类型(1:图片分享; 2:链接分享)
......@@ -775,6 +771,14 @@
if (e.detail.source == 'touch') {
this.current = e.detail.current
}
},
queryInfo(){
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{
if(res['success']){
uni.setStorageSync('userinfodataForm', res.data);
this.realName = res.data.realName;
}
})
}
},
onLoad(option) {
......@@ -792,16 +796,19 @@
this.getuserRead()
let endTime = Date.parse(new Date()) / 1000;
let startTime = uni.getStorageSync('h5_startTime')
if (endTime - startTime > 3600 * 24) {
uni.setStorageSync('cffp_userId', '')
uni.setStorageSync('isLogin','')
uni.setStorageSync('loginType','')
}
// if (endTime - startTime > 3600 * 24) {
// uni.setStorageSync('cffp_userId', '')
// uni.setStorageSync('isLogin','')
// uni.setStorageSync('loginType','')
// }
uni.setStorageSync('h5_coursesharing', this.coursesharing);
this.getshareData()
}
let dataForm = uni.getStorageSync('userinfodataForm')
this.realName = dataForm.realName
this.realName = dataForm.realName;
if(!this.realName){
this.queryInfo();
}
// this.switchTab(1);
},
onShow() {
......
pages/invitationRegister/invitationRegister.vue
......@@ -2,9 +2,9 @@
<view class="container">
<view class="logo">
<view class="" style="width: 120rpx;">
<image src="../../static/cffp_logo.png" alt="" mode="widthFix"></image>
<image :src="imgSrc" alt="" mode="widthFix"></image>
</view>
<text>欢迎使用CFFP</text>
<text>欢迎使用{{areaName}}</text>
</view>
<view class="inviteInfo">
<text>{{invitationName}}邀请您申请为</text>
......@@ -22,6 +22,8 @@
data() {
return {
areaName: companyInfo.companyName,
imgSrc:'../../static/yd_Logo.png',
//imgSrc: '../../static/cffp_logo.png',
invitationName:'',
shareId:'',
levelaName:'',
......
pages/invitationRegister/invitationlogin.vue
......@@ -2,7 +2,7 @@
<view class="content">
<view class="logo">
<image :src="imgSrc" alt="logo" srcset="" class="iconBox" mode="widthFix"></image>
<view>欢迎登录使用CFFP</view>
<view>欢迎登录使用{{areaName}}</view>
</view>
<view class="content-login">
<view class="login_title">
......@@ -44,7 +44,9 @@
export default {
data() {
return {
imgSrc: '../../static/cffp_logo.png',
areaName: companyInfo.companyName,
imgSrc:'../../static/yd_Logo.png',
//imgSrc: '../../static/cffp_logo.png',
liginName: '登录',
disabledSendBtn:false,
agreeFlag:false,
......
pages/inviteJoin/inviteJoin.vue
......@@ -143,14 +143,8 @@
<script>
import api from "@/api/api"
import common from '../../common/common';
import {
hshare
} from '@/util/fiveshare';
import {
baseURL,
apiURL,
cffpURL
} from "@/environments/environment";
import {hshare } from '@/util/fiveshare';
import {baseURL,apiURL,cffpURL} from "@/environments/environment";
export default {
data() {
return {
......@@ -188,8 +182,11 @@
this.partnerLevel = 'P1'
//this.getqueryOrgList()
let dataForm = uni.getStorageSync('userinfodataForm')
this.realName = dataForm.realName
this.realName = dataForm.realName;
this.invitationCode = dataForm.invitationCode
if(!this.realName){
this.queryInfo();
}
},
methods: {
goBack() {
......@@ -197,18 +194,15 @@
delta: 1
})
},
// 暂时废弃
// blueInput(name) {
// console.log(name, 1251515)
// if (!common.nameValid(name)) {
// uni.showToast({
// title: '请输入真实的姓名!',
// duration: 2000,
// icon: 'none'
// })
// return;
// }
// },
queryInfo(){
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{
if(res['success']){
uni.setStorageSync('userinfodataForm', res.data);
this.realName = res.data.realName;
this.invitationCode = res.data.invitationCode;
}
})
},
queryorgchange(e) {
this.orgindex = e.detail.value
},
......@@ -219,17 +213,13 @@
getqueryOrgList() {
let CffpAreaQueryReqVO = {
userId: this.userId,
partnerLevel: '',
// this.applyIdentity == 0 ? 'A1' : 'B1'
partnerLevel: ''
}
api.queryOrgList(CffpAreaQueryReqVO).then(res => {
if (res['success']) {
this.queryorgList = res.data.cffpAreaQuerys
this.orgList = res.data.cffpAreaQuerys
this.changeorgkey()
// this.orgList = res.data.cffpAreaQuerys.map((x) => x.areaName)
// console.log(this.orgList, 22225)
}
})
},
......@@ -246,7 +236,6 @@
changeorgkey() {
let that = this
let orgKey = that.applyIdentity == 0 ? 'B1' : 'A1'
// that.orgdataList = []
that.queryList = that.orgList.map((item) => {
if (item.partnerLevel == orgKey || item.partnerLevel == 'ALL') {
return item
......@@ -279,10 +268,6 @@
// #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()
......@@ -301,13 +286,18 @@
},
getshareData() {
if(!this.realName){
this.realName = ""
}
let data = {
title: '银盾家办家庭财务策划师联盟邀您加入',
desc: `我是家庭财务策划师${this.realName}正在使用银盾家办，点击即刻加入！`,
//desc: `我是家庭财务策划师${this.realName}正在使用银盾家办，点击即刻加入！`,
desc: `${this.realName}邀您加入【家庭财策师联盟】，资源+伙伴，共赢未来！`,
link: "https://" + window.location.host +
"/cffp/pages/invitationRegister/invitationRegister?shareId=" +
"/pages/invitationRegister/invitationRegister?shareId=" +
this.shareId + '&invitationCode=' + this.invitationCode, //分享链接
imgUrl: `${baseURL}/cffp/static/cffp_logo.jpg`, //图片
imgUrl: `${baseURL}/static/yd_Logo.png`, //图片
//imgUrl: `${baseURL}/static/cffp_logo.jpg`, //图片
}
//安卓机型获取当前页面路径
let url = window.location.href.split('#')[0];
......@@ -321,7 +311,6 @@
url = window.sessionStorage.getItem('firstEntryUrl').split('#')[0];
}
}
// let url = window.location.href.split('#')[0]
hshare(data, url)
},
closeShare() {
......@@ -339,15 +328,19 @@
// #endif
},
uniShare(type) {
//console.log(`${baseURL}/cffp/static/cffp_logo.jpg`)
if(!this.realName){
this.realName = ""
}
uni.share({
provider: "weixin",
scene: type === 1 ? "WXSceneSession" : "WXSceneTimeline",
type: 0,
href: `${baseURL}/cffp/pages/invitationRegister/invitationRegister?shareId=${this.shareId}&invitationCode=${this.invitationCode}`,
href: `${baseURL}/pages/invitationRegister/invitationRegister?shareId=${this.shareId}&invitationCode=${this.invitationCode}`,
title: "银盾家办家庭财务策划师联盟邀您加入",
summary: `我是家庭财务策划师${this.realName}正在使用银盾家办，点击下载即刻加入！`,
imageUrl: `${baseURL}/cffp/static/cffp_logo.jpg`,
//summary: `我是家庭财务策划师${this.realName}正在使用银盾家办，点击下载即刻加入！`,
summary: `${this.realName}邀您加入【家庭财策师联盟】，资源+伙伴，共赢未来！`,
imageUrl: `${baseURL}/static/yd_Logo.png`, //图片
//imageUrl: `${baseURL}/static/cffp_logo.jpg`,
success: function(res) {
console.log("success:" + JSON.stringify(res));
},
......@@ -355,24 +348,6 @@
console.log("fail:" + JSON.stringify(err));
}
});
// else if (type === 2) {
// uni.share({
// provider: "weixin",
// scene: ,
// type: 0,
// href: "https://mdev.zuihuibi.cn/cffp/pages/invitationRegister/invitationRegister?shareId=" +
// this.shareId,
// title: "银盾家办家庭财务策划师联盟邀您加入",
// summary: `我是家庭财务策划师${this.realName}正在使用银盾家办，点击下载即刻加入！`,
// imageUrl: "https://mdev.zuihuibi.cn/cffp/static/cffp_logo.jpg",
// success: function(res) {
// console.log("success:" + JSON.stringify(res));
// },
// fail: function(err) {
// console.log("fail:" + JSON.stringify(err));
// }
// });
// }
},
queryInviteList() {
api.queryInviteList({
......@@ -383,8 +358,6 @@
}
})
},
}
}
</script>
......
pages/orderDetail/orderDetail.vue
......@@ -19,7 +19,7 @@
<!-- 退课 -->
<view class="dropClassBox" v-if="Withdrawal=='1' && orderDetail.isRefund == '1'&& type == 'drop'">
<!-- <view class="dropClassBox" v-if="Withdrawal=='1' && orderDetail.operationStatus == '1'&& type == 'drop'"> -->
<view class="dropBtn" @click="dropClasses()">退课</view>
<view class="dropBtn" @click="dropClasses()">退款</view>
</view>
</view>
</view>
......@@ -52,7 +52,7 @@
},
{
id: 3,
name: '课程类型',
name: '订单类型',
value: '/',
type: 'string',
alias: 'courseClassify',
......@@ -60,7 +60,7 @@
},
{
id: 4,
name: '课程名称',
name: '商品名称',
value: '/',
type: 'string',
alias: 'fileTitle',
......@@ -76,7 +76,7 @@
},
{
id: 6,
name: '课程讲师',
name: '商品讲师',
value: '/',
type: 'string',
alias: 'lecturerName',
......@@ -84,7 +84,7 @@
},
{
id: 7,
name: '课程现价',
name: '订单现价',
value: '/',
type: 'currency',
alias: 'orderPrice',
......@@ -126,7 +126,7 @@
},
{
id: 12,
name: '课程状态',
name: '订单状态',
value: '/',
type: 'string',
alias: 'courseStatusName',
......@@ -134,7 +134,7 @@
},
{
id: 13,
name: '观看截至',
name: '订单有效期至',
value: '/',
type: 'string',
alias: 'effectiveEndDate',
......
pages/withdrawal/withdrawal.vue
......@@ -146,7 +146,7 @@
// #ifdef APP-PLUS
let aliWithdrawalResVOParam = {
...this.aliWithdrawalResVO,
dataSource:1,
dataSource:2,
orderNo:this.partnerTradeNo,
amount:this.exchangeAmount,
userId:uni.getStorageSync('cffp_userId'),
......
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