Skip to content

C
CFFP-HB
Commit af0c1da3 by kyle
Options

Merge branch 'dev' of http://139.224.139.2:9091/chaosun/CFFP into dev

parents cba915a3 4120575a
Showing with 286 additions and 113 deletions
components/myteam/lazy-tree.vue
......@@ -2,8 +2,8 @@
<view class="container">
<view class="d-table">
<view class="content-box">
<view class="" v-for="item in datatitleList">
<span class="content-box-title">{{item}}</span>
<view class="content-box-title" v-for="item in datatitleList">
<span class="">{{item}}</span>
</view>
</view>
<view class="d-tr">
......@@ -15,18 +15,28 @@
<!-- 为了提高dom渲染效率，当list产生破坏性变动时（如删除其中一项，或者排序等）必须使用唯一确定的key，而不能使用index -->
<block v-for="(item, i) in treeList" :key="item.id">
<view class="d-box" v-if="item.level === 0 || checkOpen(item.pids[item.pids.length - 1])">
<view class="d-td" style="text-align: left;" :class="`padding-left-${item.level * 5 + 10}`">
<view class="" style="display: flex;align-items: center;">
<uni-icons
v-if="item.hasChildren"
:type="checkLazy(item.id) ? 'spinner-cycle' : !checkOpen(item.id) ? 'arrowright' : 'arrowdown'"
size="12"
></uni-icons>
<!-- -->
<view class="d-td" :class="`padding-left-${item.level * 5 + 10}`">
<view class="" style="display: flex;">
<view class="">
<uni-icons
v-if="item.hasChildren"
:type="checkLazy(item.id) ? 'spinner-cycle' : !checkOpen(item.id) ? 'arrowright' : 'arrowdown'"
size="12"
></uni-icons>
</view>
<view @click="open(item, i)" v-if="item.level && !item.hasChildren" style="width: 24rpx;height: 26rpx;display: inline-block;"></view>
<view v-else @click="open(item, i)" :class="item.levelCode == 'B1' ? 'content-box-title-a' : item.levelCode == 'C3' ? 'content-box-title-b':'content-box-title'">
<!-- -->
<text class="" style="text-align: center;font-size: 13px;line-height: 26px;">{{ item.areaCenterName || '张麻花' }}</text>
<!-- class="d-header" -->
<!-- class="d-header" -->
<!-- :class="item.levelCode == 'B1' ? 'content-box-title-a' : item.levelCode == 'C3' ? 'content-box-title-b':'content-box-title'" -->
<!-- <view > -->
<text style="color: #000;" v-if="item.levelCode == 'A1'" >{{ item.name || '张麻花' }}</text>
<text v-else >{{ item.areaCenterName || '张麻花' }}</text>
<!-- </view> -->
</view>
</view>
......@@ -34,7 +44,7 @@
<!-- </view> -->
</view>
<view class="d-td" v-if="item.levelCode == 'A1'">{{ item.levelName }}</view>
<view class="d-td">{{ item.levelName }}</view>
<view class="d-td" style="padding-right: 10rpx;">{{ item.count }}</view>
</view>
</block>
......@@ -300,44 +310,63 @@ export default {
}
.content-box-title {
padding: 5px 0;
// padding: 5px 0;
flex: 1;
justify-content: space-between;
align-items: center;
text-align: center;
}
.content-box-title{
}
.content-box-title-a {
// min-width: 100rpx;
flex: 1;
color: #FFFFFF;
background: #3F52B7;
align-items: center;
height: 26px;
width: 120px;
margin-top: 5px;
height: 80rpx;
// line-height: 80rpx;
background: url('../../static/myteam/Group1660.png');
background-size: 100%;
border-radius: 5px;
text-align: center;
background-repeat: no-repeat;
// background-color: #3F52B7;
background-size: 100%;
margin-left: 20rpx;
color: #FFFFFF;
}
.content-box-title-b{
// min-width: 100rpx;
flex: 1;
color: #FFFFFF;
/* margin: 0 10px; */
background: #3F52B7;
height: 26px;
width: 120px;
// min-height: 60rpx;
// padding: 10rpx 0;
background: url('../../static/myteam/Group1662.png');
background-size: 100%;
border-radius: 5px;
text-align: center;
color: #000000;
background-repeat: no-repeat;
background-size: 100%;
color: #000;
border-radius: 10rpx;
// border: 1rpx solid #3F52B7;
}
// .content-box-title-b{
// flex: 1;
// color: #000;
// /* margin: 0 10px; */
// // background: #3F52B7;
// // min-width: 240rpx;
// background: url('../../static/myteam/Group1662.png');
// background-repeat: no-repeat;
// background-size: 100%;
// border-radius: 5px;
// // border-top-left-radius: 820rpx;
// // border-bottom-left-radius: 40rpx;
// text-align: center;
// }
.d-box{
display: flex;
justify-content: space-between;
.d-header{
text-align: center;font-size: 26rpx;
}
.d-td{
flex: 1;
font-size: 26rpx;
min-height: 60rpx;
ling-height: 80rpx;
// padding: 10rpx 0;
}
}
.d-tr{
display: flex;
......
components/redirect_uri/redirect_uri.vue 0 → 100644
<template>
<view id="box" @click="func()">返回CFFP财富中心</view>
<view class="">
您已授权登录，请点击返回CFFP财富中心
</view>
</template>
<script>
export default{
data(){
return {
}
},
components:{},
onLoad(){
},
methods:{
func() {
console.log("点击触发99999");
// 判断是那种设备
let u = navigator.userAgent;
console.log(u);
var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1; // Android系统或者uc浏览器
var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); // iOS系统
// 如果为Android系统
if (isAndroid) {
window.location.href = "cffpUrlSdls://mdev.zuihuibi.cn/cffp/pages/withdrawal/withdrawal?auth_code=4d79e014a44841448415d715bdceIX16"; // 注意*** 这里需要修改为刚刚设置的urlscheme，auth_code需要后端拼接。auth_code只有后端才能拿到
window.setTimeout(function () {
window.location.href = "http://www.baidu.com"; // 3s后如果不能跳转到 App，则跳转到 App 的下载地址，一般是应用宝的对应的下载地址
}, 2000);
return;
}
// ios设备：原理：判断是否认识这个协议，认识则直接跳转，不认识就在这里下载appios();
if (isiOS) {
let startIndex = u.indexOf('iPhone OS') + 9;
let endIndex = u.indexOf('like Mac OS') - 1;
let num = +u.slice(startIndex, endIndex).split('_')[0]; // 计算版本号的前面数值
if (num < 9) {
window.location.href = "cffpUrlSdls://?auth_code=4d79e014a44841448415d715bdceIX16"; // 注意*** 这里需要修改为刚刚设置的urlscheme，auth_code需要后端拼接。auth_code只有后端才能拿到
} else {
window.location.href = " "; // universal link 链接
}
window.setTimeout(function () {
window.location.href = " "; // 3s后如果不能跳转到 App，则跳转到 AppStore 的下载地址
}, 3000);
return;
};
}
}
}
</script>
<style>
</style>
\ No newline at end of file
manifest.json
......@@ -48,11 +48,13 @@
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
],
"minSdkVersion" : 21
"minSdkVersion" : 21,
"schemes" : "cffpUrlSdls"
},
/* ios打包配置 */
"ios" : {
"dSYMs" : false
"dSYMs" : false,
"urltypes" : "cffpUrlSdls"
},
/* SDK配置 */
"sdkConfigs" : {
......
pages.json
......@@ -437,6 +437,13 @@
"navigationBarTitleText": "申请加盟-结果",
"enablePullDownRefresh": false
}
},{
"path" : "components/redirect_uri/redirect_uri",
"style" :
{
"navigationBarTitleText": "第三方回调页面",
"enablePullDownRefresh": false
}
}
],
......
pages/application-process/bank-card.vue
......@@ -105,9 +105,7 @@
...this.applyParam,
applyType:2,
operatStep:5,
// userId:uni.getStorageSync('cffp_userId'),
userId:42,
id:17
userId:uni.getStorageSync('cffp_userId'),
}
api.saveApplyInfo(this.applyParam).then((res)=>{
if(res['success']){
......
pages/application-process/basic-info.vue
......@@ -115,6 +115,7 @@
idNo:'',
birthday:'',
areaId:'',
approvalStatus:0
// birthday:`${new Date().getFullYear()}-${new Date().getMonth() + 1} -${new Date().getDate()}`,
},
idTypesList:[{id:null,name:'请选择'}],
......@@ -300,10 +301,8 @@
...this.applyParam,
applyType:2,
operatStep:1,
// userId:uni.getStorageSync('cffp_userId'),
userId:42,
hasCrossDistrict:0,
id:17
userId:uni.getStorageSync('cffp_userId'),
hasCrossDistrict:0
}
api.saveApplyInfo(this.applyParam).then((res)=>{
if(res['success']){
......
pages/application-process/education.vue
......@@ -161,9 +161,7 @@
...this.applyParam,
applyType:2,
operatStep:4,
// userId:uni.getStorageSync('cffp_userId'),
userId:42,
id:17,
userId:uni.getStorageSync('cffp_userId'),
}
api.saveApplyInfo(this.applyParam).then((res)=>{
if(res['success']){
......
pages/application-process/id-card.vue
......@@ -138,9 +138,7 @@
...this.applyParam,
applyType:2,
operatStep:3,
// userId:uni.getStorageSync('cffp_userId'),
userId:42,
id:17,
userId:uni.getStorageSync('cffp_userId'),
}
api.saveApplyInfo(this.applyParam).then((res)=>{
if(res['success']){
......
pages/application-process/work-experience.vue
......@@ -170,9 +170,7 @@
...this.applyParam,
applyType:2,
operatStep:2,
// userId:uni.getStorageSync('cffp_userId'),
userId:42,
id:17,
userId:uni.getStorageSync('cffp_userId'),
certificate:this.picList.join(',')
}
console.log(this.applyParam)
......
pages/invitationRegister/invitationRegister.vue
......@@ -8,7 +8,7 @@
</view>
<view class="inviteInfo">
<text>{{invitationName}}邀请您申请为</text>
<text>{{areaName}}</text>
<text>{{areaName}}{{levelaName}}</text>
</view>
<view class="register" @click="ckregister()">
<text>点击注册</text>
......@@ -21,26 +21,33 @@
data() {
return {
areaName:'',
invitationName:''
invitationName:'',
shareId:'',
levelaName:''
}
},
onLoad(options) {
console.log(options, 777)
this.getqueryById(options.shareId)
this.shareId = options.shareId
this.getqueryById()
},
methods:{
getqueryById(id){
console.log(id)
api.queryById({id}).then(res =>{
console.log(res, 77414)
getqueryById(){
api.queryById({id:this.shareId}).then(res =>{
this.areaName = res.data.data.areaName
this.invitationName = res.data.data.invitationName
this.name = res.data.data.name
this.mobileNumber = res.data.data.mobileNumber
this.levelaName = res.data.data.partnerLevel == 'B1' ?'工作室': '事业合作伙伴'
})
},
ckregister(){
let dataForm = {
name: this.name,
mobile: this.mobileNumber,
id:this.shareId
};
uni.navigateTo({
url:'/pages/invitationRegister/invitationlogin?invitationName=' + this.invitationName + '&mobileNumber=' + this.mobileNumber
url:'/pages/invitationRegister/invitationlogin?form=' + JSON.stringify(dataForm)
})
}
}
......
pages/invitationRegister/invitationlogin.vue
......@@ -16,7 +16,7 @@
</view>
<view class="login-code">
<!-- <view class="text" style="display: flex;justify-content: space-between;"> -->
<input name="form.code" placeholder="输入验证码" v-model="code" type="number" maxlength="6"/>
<input name="form.code" placeholder="输入验证码" v-model="form.code" type="number" maxlength="6"/>
<text @click="sendMessage()" :class="{'grey':disabledSendBtn}">{{sendCodeHtml}}</text>
<!-- </view> -->
......@@ -42,22 +42,20 @@
return {
imgSrc: '../../static/cffp_logo.jpg',
liginName: '登录',
code:　'',
disabledSendBtn:false,
agreeFlag:false,
remainTimes:60,
sendCodeHtml:'获取验证码',
userId: '',
form:{
name: '',
mobile: '',
code: ''
code: null
}
}
},
onLoad(option) {
console.log(option, 555)
this.form.name = option.invitationName
this.form.mobile = option.mobileNumber
onLoad(options) {
this.form =JSON.parse( options.form)
},
methods:{
sendMessage(){
......@@ -92,9 +90,43 @@
}, 1000);
},
nextstep(){
uni.navigateTo({
url:'/pages/application-process/basic-info'
console.log(this.form.code, 555)
if(this.form.code =='' ||this.form.code == null ){
uni.showToast({
title: '请输入验证码',
duration: 2000,
icon: 'none'
});
return false
}
if(this.agreeFlag == false) {
uni.showToast({
title: '请阅读并勾选银盾保险经纪服务协议和隐私条款',
duration: 2000,
icon: 'none'
});
return false
}
const params = {
loginType:'3',
...this.form
}
api.loginVerification(params).then((res)=>{
console.log(res, 5524)
if(res['success']){
this.userId = String(res['data']['userId']);
uni.navigateTo({
url:'/pages/application-process/basic-info?userId=' + this.userId
})
}else{
uni.showToast({
title: res['message'],
duration: 2000,
icon: 'none'
})
}
})
}
}
}
......
pages/inviteJoin/inviteJoin.vue
......@@ -29,8 +29,7 @@
</view>
<view class="liBox" v-if="applyIdentity == 0">
<text>工作室名称：</text>
<text><input v-model="dataForm.b1Name" class="uni-input"
placeholder="工作室名称" /></text>
<text><input v-model="dataForm.b1Name" class="uni-input" placeholder="工作室名称" /></text>
</view>
<view class="liBox">
<text>所属组织：</text>
......@@ -97,7 +96,8 @@
<text v-else-if="item.approvalStatus=='3'" class="success">邀请成功</text>
<text v-else class="fail">邀请失败</text>
</view>
<view class="liBox-footer" v-if="item.approvalStatus == 0 || item.approvalStatus== '2'" @click="reinvite(item.id)">
<view class="liBox-footer" v-if="item.approvalStatus == 0 || item.approvalStatus== '2'"
@click="reinvite(item.id)">
<text>重新邀请</text>
</view>
</view>
......@@ -132,22 +132,22 @@
<script>
import api from "@/api/api"
import common from '../../common/common';
export default {
data() {
return {
dataForm: {
applyType: '1', //申请类型邀请加盟传 1 申请加盟传 2
operatStep: '1', // 99:最后一步,1:第一步,2:为第二步该obj 为第一步
userId: '32', // 目前Id 为1
name: '', //姓名
mobileNumber: '', //被邀请人手机号
b1Name:'', // 工作室
b1Name: '', // 工作室
partnerLevel: '', //被邀请人身份
hasCrossDistrict: '', //是否跨区邀请
areaId: '', //所属组织Id
areaName: '' //所属组织名称
},
userId: '1',
userId: uni.getStorageSync('cffp_userId'),
tabType: 1,
identityArr: ['工作室', '事业伙伴'],
applyIdentity: 0,
......@@ -191,50 +191,57 @@
// 发起邀请事件
shareToggle() {
this.dataForm.partnerLevel = this.applyIdentity == 0 ? 'B1' : 'A1'
this.dataForm.hasCrossDistrict = this.isCross == true ? '1' : '0'
this.dataForm.areaId = this.queryorgList[this.index].areaId
this.dataForm.areaName = this.isCross == false ? this.queryorgList[this.index].areaName : this.dataForm.areaName
this.dataForm.userId = this.userId
this.dataForm.areaName = this.isCross == false ? this.queryorgList[this.index].areaName : this.dataForm
.areaName
// this.dataForm.b1Name = this.applyIdentity == 'B1' ? this.dataForm.b1Name : null
// if(this.applyIdentity == 'B1'){
// if(this.dataForm.b1Name ==''){
// }
// }
if (this.dataForm.name == "" || this.dataForm.mobileNumber == "" || this.dataForm.areaName =='' || this.applyIdentity == 'B1' && this.dataForm.b1Name =='') {
if (this.dataForm.name == "" || this.dataForm.mobileNumber == "" || this.dataForm.areaName == '' || this
.applyIdentity == 'B1' && this.dataForm.b1Name == '') {
uni.showToast({
title: '请将信息补充完整',
duration: 2000,
icon: 'none'
});
return false
}
if (common.mobileNoValid(this.dataForm.mobileNumber)) {
api.saveApplyInfo(this.dataForm).then(res => {
if (res['success']) {
// this.switchTab(2)
// this.$refs.share.open()
this.shareId = res.data.id
uni.navigateTo({
url: '/pages/invitationRegister/invitationRegister?shareId=' + this.shareId
})
}
uni.showToast({
title: '请将信息补充完整',
title: res['message'],
duration: 2000,
icon: 'none'
});
return false
}
})
} else {
common.errorDialog(2, '手机号校验错误')
}
api.saveApplyInfo(this.dataForm).then(res => {
if (res['success']) {
// this.switchTab(2)
// this.$refs.share.open()
this.shareId = res.data.id
uni.navigateTo({
url:'/pages/invitationRegister/invitationRegister?shareId=' + this.shareId
})
}
uni.showToast({
title: res['message'],
duration: 2000,
icon: 'none'
});
})
},
closeShare() {
this.$refs.share.close()
},
reinvite(id){
this.shareId = id
reinvite(id) {
this.shareId = id
this.$refs.share.open()
},
uniShare(type) {
console.log(type, 4455)
if (type === 1) {
uni.share({
provider: "weixin",
......@@ -437,7 +444,8 @@
}
}
.liBox-footer{
.liBox-footer {
width: 200rpx;
height: 50rpx;
color: #FFFFFF;
......@@ -447,6 +455,7 @@
border-radius: 30rpx;
background: #20269B;
}
.popup-footer {
color: #666;
font-size: 36rpx;
......
pages/personalCenter/teamMembers/members.vue
......@@ -64,8 +64,8 @@
justify-content: center;
}
.concent-title{
width: 223px;
height: 40px;
width: 446rpx;
height: 80rpx;
background: url('../../../static/Group 1623.png');
background-size: auto 100%;
}
......
pages/personalCenter/teamPerformance/teamPerformance.vue
......@@ -28,16 +28,16 @@
</view>
<view class="classtotal">
<view class="classtotal-box">
<span v-if="totalOrder" class="totalsingular">￥{{totalOrder}}</span>
<span class="totalsingular">{{totalOrder || 0}}</span>
<p>总单数</p>
</view>
<view class="classtotal-box">
<span class="totalsingular">￥{{totalCoursePrice}}</span>
<view class="classtotal-box" style="width: 40%;">
<span class="totalsingular">￥{{totalCoursePrice || 0}}</span>
<p>总销售额</p>
<p style="font-size: 5px;">温馨提示：业绩以最终核算为准</p>
<p style="font-size: 5rpx;">温馨提示：业绩以最终核算为准</p>
</view>
<view class="classtotal-box">
<span class="totalsingular">￥{{totalIncome}}</span>
<span class="totalsingular">￥{{totalIncome || 0}}</span>
<p>总销售收入</p>
</view>
</view>
......
pages/pointsExchange/pointsExchange.vue
......@@ -27,7 +27,7 @@
</view>
<view class="item">
<text>E.已退课</text>
<text @click="viewDropLists()">{{returnFortune?returnFortune:0}}积分<i class="iconfont icon-youjiantou" style="margin-right: 10rpx;"></i></text>
<text style="color: #0A2F99;" @click="viewDropLists()">{{returnFortune?returnFortune:0}}积分<i class="iconfont icon-youjiantou" style="margin-right: 10rpx;"></i></text>
</view>
</view>
<view class="total">
......
pages/pointsExchange/pointsStatus.vue
......@@ -27,7 +27,7 @@
</view>
<view class="status_item">
<text>E.已退课</text>
<text>{{returnFortune?returnFortune:0}}积分</text>
<text @click="viewDropLists()" style="color: #0A2F99;">{{returnFortune?returnFortune:0}}积分<i class="iconfont icon-youjiantou" style="margin-right: 10rpx;"></i></text>
</view>
</view>
<view class="total">
......@@ -73,6 +73,11 @@
}
})
},
viewDropLists(){
uni.navigateTo({
url:'/pages/dropLists/dropLists'
})
}
}
}
......
pages/withdrawal/withdrawal.vue
......@@ -123,19 +123,50 @@
orderNo:this.partnerTradeNo
}
api.aliWithdrawal(this.aliWithdrawalResVO).then((res)=>{
alert(JSON.stringify(res))
console.log(res)
})
},
//微信去提现
wxWithdrawal(){
// APP：
// #ifdef APP-PLUS
uni.login({
provider: 'weixin',
success: function (loginRes) {
// 登录成功
// alert(JSON.stringify(loginRes))
uni.getUserInfo({
provider: 'weixin',
success: function(info) {
// 获取用户信息成功, info.authResult保存用户信息
console.log(info)
this.wxWithdrawalResVO.openId=info.openId;
const wxWithdrawalResVO = {
...this.wxWithdrawalResVO,
userId:uni.getStorageSync('cffp_userId'),
}
api.wxWithdrawal(wxWithdrawalResVO).then((res)=>{
console.log(res)
})
}
})
},
fail: function (err) {
// 登录授权失败
// err.code是错误码
}
})
// #endif
},
confirmWithdrawal(){
if(this.paymentMethod == 1){
this.wxWithdrawal();
}
if(this.paymentMethod == 2){
let urls= this.withdrawalParam.aliAuthUrl;
// APP：
// #ifdef APP-PLUS
let urls= this.aliWithdrawalResVO.aliAuthUrl;
urls=encodeURIComponent(urls);
// 判断平台
if (plus.os.name == 'Android') {
......@@ -173,6 +204,7 @@
);
}
// this.aliWithdrawal();
// #endif
}
}
}
......
static/myteam/Group1660.png
static/myteam/Group1660.png

5.09 KB | W: | H:

static/myteam/Group1660.png

5.18 KB | W: | H:

static/myteam/Group1660.png
static/myteam/Group1660.png
static/myteam/Group1660.png
static/myteam/Group1660.png
  • 2-up
  • Swipe
  • Onion skin
static/myteam/Group1662.png
static/myteam/Group1662.png

3.85 KB | W: | H:

static/myteam/Group1662.png

4.16 KB | W: | H:

static/myteam/Group1662.png
static/myteam/Group1662.png
static/myteam/Group1662.png
static/myteam/Group1662.png
  • 2-up
  • Swipe
  • Onion skin
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