Skip to content

C
CFFP-HB
Commit 4201cda1 by yuzhenWang
Options

发布测试

parent 721bc2e5
Showing with 614 additions and 439 deletions
index.html
......@@ -43,5 +43,18 @@
<!--app-html-->
</div>
<script type="module" src="/main.js"></script>
<!-- uni 的 SDK，必须引用。 -->
<script type="text/javascript" src="./static/uni.webview.1.5.4.js"></script>
<script type="text/javascript">
// 验证脚本是否加载成功（调试关键：控制台打印 webViewJs 确认）
const webViewJs = window.uni?.webView;
if (!webViewJs) {
console.error('uni.webview.js 加载失败！请检查路径是否正确');
} else {
console.log('uni.webview.js 加载成功', webViewJs);
// 将 webViewJs 挂载到 window 全局，供 Vue 组件访问
window.webViewJs = webViewJs;
}
</script>
</body>
</html>
\ No newline at end of file
myPackageA/applyFranchise/applyFranchise.vue
<template>
<view class="container">
<!-- 禁用弹窗 -->
<restrictedTip
ref="restrictedOrCanelTip"
:showCode="showCode"
confirmText="前往首页"
:content="restrictedOrCanelContent"
@confirm="gotoIndex()"
/>
<image
class="imgbox"
src="../assets/images/applyBg.png"
mode="widthFix"
></image>
<restrictedTip ref="restrictedOrCanelTip" :showCode="showCode" confirmText="前往首页"
:content="restrictedOrCanelContent" @confirm="gotoIndex()" />
<image class="imgbox" src="../assets/images/bg1.jpg" mode="widthFix"></image>
<view class="wapper">
<view style="flex: 1;">
<!-- <view class="header">
<view class="one">
合伙人加盟
</view>
<view class="two">
优质资源，专业服务
</view>
</view> -->
<view class="header">
<view class="headerLeft">
<view class="one">
合伙人加盟
</view>
......@@ -23,7 +23,10 @@
优质资源，专业服务
</view>
</view>
<view class="headerRight">
<image class="headerImg" src="@/static/suplogo.png" mode="widthFix"></image>
</view>
</view>
<view class="applyBox">
<view style="height: 550rpx;">
<view class="inputBox">
......@@ -31,13 +34,8 @@
<text class="require">*</text>昵称 <text class="desTxt">（用于邀请好友及统计业绩显示）</text>
</view>
<view class="">
<input
class="user-input"
maxlength="10"
type="text"
placeholder="请输入2~10个字符"
v-model="form.nickName"
/>
<input class="user-input" maxlength="10" type="text" placeholder="请输入2~10个字符"
v-model="form.nickName" />
</view>
</view>
<view class="inputBox">
......@@ -45,20 +43,10 @@
<text class="require">*</text>手机号码 <text class="desTxt">（账号唯一标识）</text>
</view>
<view class="codeBox">
<input
type="number"
class="user-input"
name="mobileNo"
placeholder="请输入手机号"
v-model="form.mobile"
maxlength="11"
:disabled="editMobile"
/>
<view
:class="{'grey':disabledSendBtn}"
@click="sendMessage()"
v-if="showVerificationCode"
>
<input type="number" class="user-input" name="mobileNo" placeholder="请输入手机号"
v-model="form.mobile" maxlength="11" :disabled="editMobile" />
<view :class="{'grey':disabledSendBtn}" @click="sendMessage()"
v-if="showVerificationCode">
{{sendCodeHtml}}
</view>
</view>
......@@ -68,14 +56,8 @@
<text class="require">*</text>验证码
</view>
<view class="">
<input
type="number"
class="user-input"
name="mobileNo"
placeholder="请输入短信验证码"
v-model="form.code"
maxlength="6"
/>
<input type="number" class="user-input" name="mobileNo" placeholder="请输入短信验证码"
v-model="form.code" maxlength="6" />
</view>
</view>
<view class="protol">
......@@ -93,29 +75,15 @@
</view>
</view>
<view class="footer">
银盾家族办公室
银盾家办
</view>
</view>
<!-- 已加盟为合伙人提示弹窗组件 -->
<everyJoinPopup
ref="everyJoinPopup"
@continue="jumpPage"
:showCanel="false"
/>
<everyJoinPopup ref="everyJoinPopup" @continue="jumpPage" :showCanel="false" />
<!-- 成功加盟为合伙人提示弹窗组件 -->
<everyJoinPopup
ref="successJoinPopup"
@continue="jumpPage(e)"
content="您已加盟为银盾家办合伙人"
twoContent='购买一单"YD家庭财务法律卡"即可升级为新锐合伙人,享受组织利益'
continueText="前往购买"
cancelText="暂不购买，继续浏览"
fontColor="#20279B"
:maskClick="false"
icon="icon-dianzan"
iconSize='80rpx'
:showCanel="true"
/>
<everyJoinPopup ref="successJoinPopup" @continue="jumpPage(e)" content="您已加盟为银盾家办合伙人"
twoContent='购买一单"财务健康智能体检"即可升级为新锐合伙人,享受组织利益' continueText="前往购买" cancelText="暂不购买，继续浏览" fontColor="#20279B"
:maskClick="false" icon="icon-dianzan" iconSize='80rpx' :showCanel="true" />
</view>
</template>
......@@ -128,52 +96,54 @@
import { initJssdkShare, setWechatShare } from '@/util/fiveshare';
import restrictedTip from '@/components/commonPopup/restrictedTip.vue';
export default {
components:{
components: {
everyJoinPopup,
restrictedTip
},
data() {
return {
companyInfo:environment.companyInfo,
shareURL:environment.shareURL,
form:{
mobile:'',
nickName:'',
code:''
companyInfo: environment.companyInfo,
shareURL: environment.shareURL,
form: {
mobile: '',
nickName: '',
code: ''
},
agreeFlag:false,
sendCodeHtml:'发送验证码',
disabledSendBtn:false,
timer:null,
remainTimes:60,
loginType:uni.getStorageSync('loginType'),
userInfo:'',
userId: uni.getStorageSync('cffp_userId'),//本人id,
InviteeUserId:'',//被邀请人id
inviteUserId:'',//邀请人id,
editNickName:false,
editMobile:false,
shareId:'',//邀请人分享得id
invitationCode:'',//邀请码
showCode:false ,//弹窗是否展示客服二维码
restrictedOrCanelContent:'', //禁用/注销展示文本
sharePosterObj:{invitationCode:'',inviteUserId:''},//通过分享海报进来
showVerificationCode:false,//验证码是否展示
agreeFlag: false,
sendCodeHtml: '发送验证码',
disabledSendBtn: false,
timer: null,
remainTimes: 60,
loginType: uni.getStorageSync('loginType'),
userInfo: '',
userId: uni.getStorageSync('cffp_userId'), //本人id,
InviteeUserId: '', //被邀请人id
inviteUserId: '', //邀请人id,
editNickName: false,
editMobile: false,
shareId: '', //邀请人分享得id
invitationCode: '', //邀请码
showCode: false, //弹窗是否展示客服二维码
restrictedOrCanelContent: '', //禁用/注销展示文本
sharePosterObj: { invitationCode: '', inviteUserId: '' }, //通过分享海报进来
showVerificationCode: false, //验证码是否展示，
}
},
onLoad(options){
if(uni.getStorageSync('loginType')){
onLoad(options) {
if (uni.getStorageSync('loginType')) {
this.loginType = uni.getStorageSync('loginType')
}
this.inviteUserId = ''
if(options.inviteUserId){
if (options.inviteUserId) {
this.inviteUserId = options.inviteUserId
}
if(options.invitationCode){
if (options.invitationCode) {
this.invitationCode = options.invitationCode
}
// 邀请链接进来的统一走注册加盟
if(options.shareId){
if (options.shareId) {
this.shareId = options.shareId
this.getqueryById(options.shareId)
// uni.clearStorageSync()
......@@ -182,56 +152,57 @@
},
onShow(){
if(uni.getStorageSync('loginType')){
onShow() {
console.log('onShowloginType', uni.getStorageSync('loginType'));
if (uni.getStorageSync('loginType')) {
this.loginType = uni.getStorageSync('loginType')
}
if(uni.getStorageSync('cffp_userInfo')){
if (uni.getStorageSync('cffp_userInfo')) {
this.userInfo = JSON.parse(uni.getStorageSync('cffp_userInfo'))
}
if(uni.getStorageSync('cffp_userId')){
if (uni.getStorageSync('cffp_userId')) {
this.userId = uni.getStorageSync('cffp_userId')
}
if(!uni.getStorageSync('loginType') || this.loginType == 'visitor'){
if (!uni.getStorageSync('loginType') || this.loginType == 'visitor') {
this.loginType = 'visitor'
this.checkToken()
}
// 非邀请状态
if(!this.shareId&&this.loginType == 'codelogin'&&this.userInfo.mobile){
if (!this.shareId && this.loginType == 'codelogin' && this.userInfo.mobile) {
this.form.mobile = this.userInfo.mobile
this.editMobile = true
this.showVerificationCode = false
}
// 非邀请状态
if(!this.shareId&&this.loginType == 'codelogin'&&!this.form.nickName){
if (!this.shareId && this.loginType == 'codelogin' && !this.form.nickName) {
this.queryInfo()
}
// 登录状态 非邀请
if(this.loginType == 'codelogin' && !this.shareId){
if (this.loginType == 'codelogin' && !this.shareId) {
// #ifdef H5
initJssdkShare(() => {
setWechatShare();
}, window.location.href);
// #endif
}else {
} else {
this.showVerificationCode = true
}
},
methods: {
gotoIndex(){
gotoIndex() {
uni.switchTab({
url:'/pages/index/index'
url: '/pages/index/index'
})
this.$refs.restrictedOrCanelTip.close()
},
// 未登录状态下需要重新获取token
checkToken(){
api.checkToken().then(res=>{
if(res['success']){}else{
api.obtainToken().then(res=>{
if(res.success){
uni.setStorageSync('uni-token',res.data['token']);
checkToken() {
api.checkToken().then(res => {
if (res['success']) {} else {
api.obtainToken().then(res => {
if (res.success) {
uni.setStorageSync('uni-token', res.data['token']);
// #ifdef H5
initJssdkShare(() => {
setWechatShare();
......@@ -242,10 +213,9 @@
}
})
},
getqueryById(shareId){
getqueryById(shareId) {
api.queryById({id:shareId}).then(res =>{
console.log('res.data.data',res.data.data);
api.queryById({ id: shareId }).then(res => {
this.form.nickName = res.data.data.name
this.form.mobile = res.data.data.mobileNumber
this.editNickName = this.editMobile = true
......@@ -256,26 +226,28 @@
// return
// }
// 之前登录过，但和申请加盟的账号不一致
if(this.userInfo&&(this.userInfo.mobile !==this.form.mobile )){
if (this.userInfo && (this.userInfo.mobile !== this.form.mobile)) {
this.showVerificationCode = true
uni.setStorageSync('loginType', 'visitor')
this.loginType = 'visitor'
return
}
if(res.data.data.isPartner&& this.loginType == 'codelogin'){
if (res.data.data.isPartner && this.loginType == 'codelogin') {
this.$refs.successJoinPopup.open()
}
})
},
jumpPage(e){
jumpPage(e) {
// e===1时，前往购买；e===2暂不购买；目前全部跳转到首页，不进行判断
uni.switchTab({
url:'/pages/index/index'
url: '/pages/index/index'
})
this.$refs.successJoinPopup.close()
this.$refs.everyJoinPopup.close()
},
getFile(type){
let typeName = type==1?'服务协议':type==2?'隐私条款':''
getFile(type) {
let typeName = type == 1 ? '服务协议' : type == 2 ? '隐私条款' : ''
dataHandling.pocessTracking(
'查看协议',
`查看${typeName}`,
......@@ -285,11 +257,11 @@
'pages/saleCourseLists/saleCourseLists'
)
uni.navigateTo({
url:`/myPackageA/ruleAndContract/clause?type=${type}`
url: `/myPackageA/ruleAndContract/clause?type=${type}`
})
},
c_agreeFlag(){
this.agreeFlag=!this.agreeFlag;
c_agreeFlag() {
this.agreeFlag = !this.agreeFlag;
},
delayTime() {
......@@ -305,90 +277,95 @@
}
}, 1000);
},
sendMessage(){
sendMessage() {
const params = {
mobileNo:this.form.mobile,
type:"1",
mobileNo: this.form.mobile,
type: "1",
source: "cffp"
}
if(common.mobileNoValid(this.form.mobile)){
if(!this.disabledSendBtn){
api.verificationCode(params).then((res)=>{
if(res['success']){
if (common.mobileNoValid(this.form.mobile)) {
if (!this.disabledSendBtn) {
api.verificationCode(params).then((res) => {
if (res['success']) {
this.delayTime()
}else{
common.errorDialog(2,res['message'])
} else {
common.errorDialog(2, res['message'])
}
})
}
}else{
common.errorDialog(2,'请填写手机号')
} else {
common.errorDialog(2, '请填写手机号')
}
},
gotoApply(){
if(uni.getStorageSync('sharePosterObj')){
gotoApply: dataHandling.debounce(function () {
uni.showLoading({
title: '申请中...'
});
if (uni.getStorageSync('sharePosterObj')) {
this.sharePosterObj = uni.getStorageSync('sharePosterObj')
}
console.log('this.sharePosterObj',this.sharePosterObj)
console.log('this.sharePosterObj', this.sharePosterObj)
// 登录并且是禁用状态
if(this.loginType == 'codelogin'&& this.userInfo.userIsActive == 2){
if (this.loginType == 'codelogin' && this.userInfo.userIsActive == 2) {
this.showCode = true
this.restrictedOrCanelContent = '您的账号处在不可用状态，请扫码添加客服咨询情况'
this.$refs.restrictedOrCanelTip.open()
return
}
// 登录并且是注销状态 前端不判断，通过申请加盟的接口判断
if(!this.form.nickName){
common.errorDialog(1,'请输入昵称');
if (!this.form.nickName) {
common.errorDialog(1, '请输入昵称');
return false;
}
if(this.form.nickName&&this.form.nickName.length<2){
common.errorDialog(1,'昵称长度为2~10个字符');
if (this.form.nickName && this.form.nickName.length < 2) {
common.errorDialog(1, '昵称长度为2~10个字符');
return
}
if(!this.form.mobile){
common.errorDialog(1,'请输入手机号');
if (!this.form.mobile) {
common.errorDialog(1, '请输入手机号');
return false;
}
if(!common.mobileNoValid(this.form.mobile)){
common.errorDialog(2,'手机号格式填写错误');
if (!common.mobileNoValid(this.form.mobile)) {
common.errorDialog(2, '手机号格式填写错误');
return false;
}
if(!this.loginType || this.loginType=== 'visitor'){
if(!this.form.code){
common.errorDialog(1,'请输入验证码');
if (!this.loginType || this.loginType === 'visitor') {
if (!this.form.code) {
common.errorDialog(1, '请输入验证码');
return false;
}
}
if(!this.agreeFlag){
if (!this.agreeFlag) {
uni.showToast({
title: '请阅读并勾选'+`${this.companyInfo.companyFullName}`+'服务协议和隐私条款',
title: '请阅读并勾选' + `${this.companyInfo.companyFullName}` + '服务协议和隐私条款',
duration: 3000,
icon: 'none'
})
return false;
}
const params = {
loginType:'3',
loginType: '3',
...this.form
}
if(this.loginType == 'codelogin'){
if (this.loginType == 'codelogin') {
this.getApply()
uni.hideLoading()
return
}
if(!this.loginType || this.loginType == 'visitor'){
api.loginVerification(params).then((res)=>{
if(res['success']){
if (!this.loginType || this.loginType == 'visitor') {
api.loginVerification(params).then((res) => {
uni.hideLoading()
if (res['success']) {
// 不能登录并且是禁用状态
if(res.data.userIsActive == 2){
if (res.data.userIsActive == 2) {
this.showCode = true
this.restrictedOrCanelContent = '您的账号处在不可用状态，请扫码添加客服咨询情况'
this.$refs.restrictedOrCanelTip.open()
return
}
this.userId = String(res['data']['userId']);
uni.setStorageSync('isLogin','1');
uni.setStorageSync('loginType','codelogin');
uni.setStorageSync('isLogin', '1');
uni.setStorageSync('loginType', 'codelogin');
uni.setStorageSync('cffp_userId', this.userId);
uni.setStorageSync('uni-token', res.data['token']);
this.queryInfo()
......@@ -403,16 +380,16 @@
// return
// }
// 是合伙人就不让在加盟
if(res.data.isPartner && res.data.partnerIsActive==1){
if (res.data.isPartner && res.data.partnerIsActive == 1) {
this.$refs.everyJoinPopup.open()
return
}
// 不是合伙人就加盟
if(!res.data.isPartner && res.data.partnerIsActive!=1){
if (!res.data.isPartner && res.data.partnerIsActive != 1) {
this.getApply()
}
}else{
} else {
uni.showToast({
title: res['message'],
duration: 2000,
......@@ -423,16 +400,116 @@
}
},
}, 500),
// gotoApply() {
// // this.loginType = uni.getStorageSync('loginType')
// if (uni.getStorageSync('sharePosterObj')) {
// this.sharePosterObj = uni.getStorageSync('sharePosterObj')
// }
// console.log('this.sharePosterObj', this.sharePosterObj)
// // 登录并且是禁用状态
// if (this.loginType == 'codelogin' && this.userInfo.userIsActive == 2) {
// this.showCode = true
// this.restrictedOrCanelContent = '您的账号处在不可用状态，请扫码添加客服咨询情况'
// this.$refs.restrictedOrCanelTip.open()
// return
// }
// // 登录并且是注销状态 前端不判断，通过申请加盟的接口判断
// if (!this.form.nickName) {
// common.errorDialog(1, '请输入昵称');
// return false;
// }
// if (this.form.nickName && this.form.nickName.length < 2) {
// common.errorDialog(1, '昵称长度为2~10个字符');
// return
// }
// if (!this.form.mobile) {
// common.errorDialog(1, '请输入手机号');
// return false;
// }
// if (!common.mobileNoValid(this.form.mobile)) {
// common.errorDialog(2, '手机号格式填写错误');
// return false;
// }
// if (!this.loginType || this.loginType === 'visitor') {
// if (!this.form.code) {
// common.errorDialog(1, '请输入验证码');
// return false;
// }
// }
// if (!this.agreeFlag) {
// uni.showToast({
// title: '请阅读并勾选' + `${this.companyInfo.companyFullName}` + '服务协议和隐私条款',
// duration: 3000,
// icon: 'none'
// })
// return false;
// }
// const params = {
// loginType: '3',
// ...this.form
// }
// if (this.loginType == 'codelogin') {
// this.getApply()
// return
// }
// if (!this.loginType || this.loginType == 'visitor') {
// api.loginVerification(params).then((res) => {
// if (res['success']) {
// // 不能登录并且是禁用状态
// if (res.data.userIsActive == 2) {
// this.showCode = true
// this.restrictedOrCanelContent = '您的账号处在不可用状态，请扫码添加客服咨询情况'
// this.$refs.restrictedOrCanelTip.open()
// return
// }
// this.userId = String(res['data']['userId']);
// uni.setStorageSync('isLogin', '1');
// uni.setStorageSync('loginType', 'codelogin');
// uni.setStorageSync('cffp_userId', this.userId);
// uni.setStorageSync('uni-token', res.data['token']);
// this.queryInfo()
// // 禁用和注销状态并存，以禁用为准
// // 已经进行过注销操作的， 弹窗提示90天内不可再次申请加盟为合伙人
// // partnerIsActive 合伙人状态：1签约，2解约，3为加盟 ；解约过的合伙人状态一直为解约，直到下次签约成功才会改变
// // 登录并且是注销状态 前端不判断，通过申请加盟的接口判断
// // if(res.data.partnerIsActive==2){
// // this.showCode = false
// // this.restrictedOrCanelContent = '90天内不可再次申请加盟为合伙人'
// // this.$refs.restrictedOrCanelTip.open()
// // return
// // }
// // 是合伙人就不让在加盟
// if (res.data.isPartner && res.data.partnerIsActive == 1) {
// this.$refs.everyJoinPopup.open()
// return
// }
// // 不是合伙人就加盟
// if (!res.data.isPartner && res.data.partnerIsActive != 1) {
// this.getApply()
// }
// } else {
// uni.showToast({
// title: res['message'],
// duration: 2000,
// icon: 'none'
// })
// }
// })
// }
// },
queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{
api.queryInfo({ userId: uni.getStorageSync('cffp_userId') }).then(res => {
// 保存用户得个人信息
if (res['success']) {
this.form.nickName = res['data']['nickName']
if(this.form.nickName){
if (this.form.nickName) {
this.editNickName = true
}else {
} else {
this.editNickName = false
}
delete res.data.commonResult
......@@ -442,39 +519,41 @@
uni.setStorageSync('cffp_userInfo', JSON.stringify(cffp_userInfo))
uni.setStorageSync('user_mobile', cffp_userInfo.mobile)
}else {
} else {
uni.setStorageSync('loginType', 'visitor')
this.loginType = 'visitor'
}
})
},
// 申请加盟
getApply(){
getApply() {
console.log('login状态', this.loginType);
let params = {}
if(this.shareId){
if (this.shareId) {
params = {
applyType:'1',
applyUserId:this.userId,
applyMobile:this.form.mobile,
inviteUserId:this.inviteUserId,
nickName:this.form.nickName,
inviterInvitationCode:this.invitationCode,
shareId:this.shareId
}
}else {
applyType: '1',
applyUserId: this.userId,
applyMobile: this.form.mobile,
inviteUserId: this.inviteUserId,
nickName: this.form.nickName,
inviterInvitationCode: this.invitationCode,
shareId: this.shareId
}
} else {
params = {
applyType:'2',
applyUserId:this.userId,
applyMobile:this.form.mobile,
nickName:this.form.nickName,
inviteUserId:this.sharePosterObj.inviteUserId,
invitationCode:this.sharePosterObj.invitationCode
applyType: '2',
applyUserId: this.userId,
applyMobile: this.form.mobile,
nickName: this.form.nickName,
inviteUserId: this.sharePosterObj.inviteUserId,
invitationCode: this.sharePosterObj.invitationCode
}
}
api.newSaveApplyInfo(params).then((res)=>{
if(res['success']){
api.newSaveApplyInfo(params).then((res) => {
if (res['success']) {
// 是合伙人就不让在加盟
if(res.data.isPartner){
if (res.data.isPartner) {
this.$refs.everyJoinPopup.open()
return
}
......@@ -487,7 +566,7 @@
'pages/saleCourseLists/saleCourseLists'
)
this.$refs.successJoinPopup.open()
}else{
} else {
// 由于注销需求，依据后端报错展示弹窗
this.showCode = false
this.restrictedOrCanelContent = res['message']
......@@ -503,17 +582,20 @@
</script>
<style lang="scss" scoped>
::v-deep .uni-radio-input{
::v-deep .uni-radio-input {
// background-color: #20279B !important;
// border-color: #20279B !important;
}
.container{
.container {
position: relative;
box-sizing: border-box;
.imgbox{
.imgbox {
display: block;
}
.wapper{
.wapper {
// background-color: pink;
box-sizing: border-box;
display: flex;
......@@ -524,77 +606,121 @@
height: 100%;
width: 100%;
padding: 0 50rpx;
.header{
// .header{
// color: #333333;
// margin-top: 140rpx;
// .one{
// font-size: 60rpx;
// font-weight: 700;
// }
// .two{
// font-size: 30rpx;
// font-weight: 500;
// }
// }
.header {
display: flex;
align-items: center;
justify-content: space-between;
color: #333333;
margin-top: 140rpx;
.one{
margin-top: 30rpx;
.one {
font-size: 60rpx;
font-weight: 700;
margin-bottom: 20rpx;
}
.two{
.two {
font-size: 30rpx;
font-weight: 500;
}
.headerRight {
width: 300rpx;
}
.applyBox{
}
.headerImg {
width: 300rpx;
height: 300rpx;
opacity: .5;
}
.applyBox {
background-color: #fff;
padding: 30rpx;
border-radius: 20rpx;
margin-top: 100rpx;
// margin-top: 100rpx;
box-sizing: border-box;
.inputBox{
.inputBox {
margin-bottom: 20rpx;
padding-bottom: 10rpx;
border-bottom: 1rpx solid #E8E8E8;
.require{
.require {
font-size: 24rpx;
color: red;
}
.desTxt{
.desTxt {
font-size: 24rpx;
color: #333333;
}
.user-input{
.user-input {
color: black;
font-size: 26rpx;
margin-top: 15rpx;
}
.codeBox{
.codeBox {
display: flex;
align-items: center;
justify-content: space-between;
color: #20279B;
font-size: 26rpx;
.grey{
color: rgba(32, 39, 155, 0.5); /* 50% 透明 */
.grey {
color: rgba(32, 39, 155, 0.5);
/* 50% 透明 */
}
}
}
.agreeBox{
.agreeBox {
padding-top: 20rpx;
font-size: 26rpx;
color:#20279B ;
color: #20279B;
}
.protol{
.protol {
display: flex;
align-items: center;
font-size: 26rpx;
.empty{
.empty {
width: 30rpx;
height: 30rpx;
border: 1rpx solid #20269B;
border-radius: 50%;
margin-right: 5rpx;
}
.icon-icon_duihao-mian{
.icon-icon_duihao-mian {
font-size: 30rpx;
color: #20269B;
margin-right: 5rpx;
}
}
.btnBox{
.btnBox {
box-sizing: border-box;
width: 80%;
text-align: center;
......@@ -606,7 +732,8 @@
margin: 0rpx 50rpx 30rpx 50rpx;
}
}
.footer{
.footer {
font-size: 28rpx;
color: rgba(0, 0, 0, .5);
width: 100%;
......@@ -616,5 +743,5 @@
letter-spacing: 8rpx;
}
}
}
}
</style>
\ No newline at end of file
pages/courseDetail/courseDetail.vue
......@@ -63,8 +63,8 @@
<view class="courseTitleContent">
<view class="courseTitle">
<view class="" style="width: 100%;">
<h4>{{courseInfo.fileSynopsis}}</h4>
<view>{{courseInfo.fileTitle}}</view>
<h4>{{courseInfo.fileTitle}}</h4>
<view>{{courseInfo.fileSynopsis}}</view>
</view>
</view>
......
pages/courselist/courselist.vue
......@@ -90,10 +90,10 @@
</view>
<view class="right">
<view class="one">
{{item.fileSynopsis}}
{{item.fileTitle}}
</view>
<view class="two">
{{item.fileTitle}}
{{item.fileSynopsis}}
</view>
<view class="three">
<text style="font-size: 28rpx;color: rgba(32, 39, 155, 1);">￥{{Number(item.coursePrice).toFixed(2)}}</text>
......
pages/index/index.vue
......@@ -575,7 +575,7 @@
if(this.cffpCourseInfos.length>0){
this.cffpCourseInfos.forEach(item=>{
item.coursePrice =Number(item.coursePrice).toFixed(2) || '0.00'
if(item.productCode&&item.productCode=='C09'){
if(item.productCode&&item.productCode=='ZNTJ'){
this.productItem = item
uni.setStorageSync('productItem',this.productItem );
}
......@@ -743,7 +743,7 @@
let result = res['data']['data'];
if(result.length>0){
result.forEach(item=>{
if(item.productCode&&item.productCode=='C09'){
if(item.productCode&&item.productCode=='ZNTJ'){
this.productItem = item
uni.setStorageSync('productItem',this.productItem );
}
......
pages/inviteJoin/inviteJoin.vue
......@@ -7,22 +7,11 @@
<!-- #ifdef H5 -->
<view class="generateImageBox" v-if="!generatedImage">
<view class="imgBox" ref="captureElement">
<img
v-if="posterImg"
class="posterImg"
@load="handleBgImageLoad"
@error="handleBgImageError"
style="display: block;"
src="@/static/images/sharePoster.png"
crossorigin="anonymous"
alt="防缓存图片"
/>
<img v-if="posterImg" class="posterImg" @load="handleBgImageLoad" @error="handleBgImageError"
style="display: block;" src="@/static/images/sharePoster.png" crossorigin="anonymous" alt="防缓存图片" />
<view class="qrcode-container">
<canvas
canvas-id="qrcode"
class="qrcode-canvas"
:style="{width: qrCodeSize + 'px', height: qrCodeSize + 'px'}"
></canvas>
<canvas canvas-id="qrcode" class="qrcode-canvas"
:style="{width: qrCodeSize + 'px', height: qrCodeSize + 'px'}"></canvas>
</view>
</view>
</view>
......@@ -39,13 +28,8 @@
<view class="liBox">
<text>昵称 <text style="font-size: 22rpx;">(被邀请人可修改)</text> ：</text>
<text>
<input
v-model="dataForm.name"
class="uni-input"
maxlength="10"
placeholder="昵称"
style="width: 300rpx;"
/>
<input v-model="dataForm.name" class="uni-input" maxlength="10" placeholder="昵称"
style="width: 300rpx;" />
</text>
</view>
<view class="liBox">
......@@ -55,16 +39,8 @@
</view>
</view>
<!-- <share></share> -->
<button
type="primary"
plain="true"
class="sendInvite"
@click="shareToggle()"
>
<loadingIcon
:loading="isLoading"
v-if="isLoading"
/>
<button type="primary" plain="true" class="sendInvite" @click="shareToggle()">
<loadingIcon :loading="isLoading" v-if="isLoading" />
<text style="margin-left: 5rpx;">发出邀请</text>
</button>
</view>
......@@ -128,12 +104,8 @@
</view>
</view>
<!-- 海报弹窗 -->
<sharePosterPop
ref="sharePosterPop"
:generatedImage="generatedImage"
@closePoster="closePoster"
btnBottom="-15%"
></sharePosterPop>
<sharePosterPop ref="sharePosterPop" :generatedImage="generatedImage" @closePoster="closePoster"
btnBottom="-15%"></sharePosterPop>
</view>
</template>
......@@ -141,20 +113,20 @@
import dataHandling from "@/util/dataHandling";
import api from "@/api/api"
import common from '../../common/common';
import {hshare ,setWechatShare,initJssdkShare} from '@/util/fiveshare';
import {baseURL,apiURL,cffpURL,companyInfo,shareURL} from "@/environments/environment";
import { hshare, setWechatShare, initJssdkShare } from '@/util/fiveshare';
import { baseURL, apiURL, cffpURL, companyInfo, shareURL } from "@/environments/environment";
import sharePosterPop from '@/components/commonPopup/sharePosterPop.vue';
import UQRCode from 'uqrcodejs';
import { elementToImage } from '@/util/htmlToImage';
import loadingIcon from '@/components/loading/loading.vue';
export default {
components:{
components: {
sharePosterPop,
loadingIcon
},
data() {
return {
companyType:companyInfo.companyType,
companyType: companyInfo.companyType,
ydLogoShare: `${shareURL}/static/suplogo.png`,
dataForm: {
applyType: '1', //申请类型邀请加盟传 1 申请加盟传 2
......@@ -183,11 +155,11 @@
partnerLevel: '',
invitationCode: '',
shareTipsFlag: false,
qrCodeUrl:'/myPackageA/applyFranchise/applyFranchise',
qrCodeSize: 80,//二维码的尺寸
generatedImage:'',//生成的海报图片
companyLogo : '../../static/suplogo.png',
posterImg:'',
qrCodeUrl: '/myPackageA/applyFranchise/applyFranchise',
qrCodeSize: 80, //二维码的尺寸
generatedImage: '', //生成的海报图片
companyLogo: '../../static/suplogo.png',
posterImg: '',
isLoading: false
};
......@@ -197,24 +169,24 @@
//this.partnerLevel = option.levelCode
this.partnerLevel = 'P1'
//this.getqueryOrgList()
if(this.companyType == '1'){
if (this.companyType == '1') {
this.ydLogoShare = `${shareURL}/static/cffp_logo.jpg`;
}else {
} else {
this.ydLogoShare = `${shareURL}/static/suplogo.png`;
}
if(companyInfo.companyType == '1'){
this.companyLogo='../../static/myteam/Group1633.png';
}else if(this.companyType == '2'){
this.companyLogo='../../static/suplogo.png';
if (companyInfo.companyType == '1') {
this.companyLogo = '../../static/myteam/Group1633.png';
} else if (this.companyType == '2') {
this.companyLogo = '../../static/suplogo.png';
}
let dataForm = JSON.parse(uni.getStorageSync('cffp_userInfo'))
this.realName = dataForm.realName || dataForm.nickName;
this.invitationCode = dataForm.invitationCode
if(!this.realName){
if (!this.realName) {
this.queryInfo();
}
},
onShow(){
onShow() {
this.isLoading = false
this.posterImg = ''
this.generatedImage = ''
......@@ -225,7 +197,7 @@
// #endif
},
onHide() {
this.$nextTick(()=>{
this.$nextTick(() => {
this.$refs.sharePosterPop.closeDropdown()
})
},
......@@ -235,15 +207,15 @@
delta: 1
})
},
queryInfo(){
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{
if(res['success']){
queryInfo() {
api.queryInfo({ userId: uni.getStorageSync('cffp_userId') }).then(res => {
if (res['success']) {
delete res.data.commonResult
const cffp_userInfo = {
...res.data
}
uni.setStorageSync('cffp_userInfo', JSON.stringify(cffp_userInfo))
this.realName = res.data.realName ||res.data.nickName ;
this.realName = res.data.realName || res.data.nickName;
this.invitationCode = res.data.invitationCode;
}
})
......@@ -322,12 +294,28 @@
// #ifdef APP-PLUS
this.$refs.share.open()
// #endif
// if (typeof wx !== 'undefined' && wx.miniProgram) {
// console.log('wx',wx.miniProgram);
// wx.miniProgram.postMessage({
// data: {
// type: 'requestShare',
// title: '银盾家办家庭财务策划师联盟邀您加入',
// desc: `${this.realName}邀您加入【家庭财策师联盟】，资源+伙伴，共赢未来！`,
// path: shareURL +
// "/myPackageA/applyFranchise/applyFranchise?shareId=" + this
// .shareId + '&invitationCode=' + this.invitationCode +
// '&inviteUserId=' + this.userId, //分享链接
// }
// });
// return
// }
//#ifdef H5
// 小程序跳cffp得分享
if(uni.getStorageSync('mpCffp')){
if (uni.getStorageSync('mpCffp')) {
this.qrCodeUrl = shareURL +
"/myPackageA/applyFranchise/applyFranchise?shareId=" +
this.shareId + '&invitationCode=' + this.invitationCode+ '&inviteUserId=' + this.userId, //分享链接
this.shareId + '&invitationCode=' + this.invitationCode + '&inviteUserId=' +
this.userId, //分享链接
this.posterImg = '@/static/images/sharePoster.png'
this.isLoading = true
return
......@@ -335,7 +323,7 @@
this.shareTipsFlag = true;
this.getshareData()
// #endif
}else{
} else {
uni.showToast({
title: res['message'],
duration: 2000,
......@@ -349,7 +337,7 @@
},
getshareData() {
if(!this.realName){
if (!this.realName) {
this.realName = ""
}
let data = {
......@@ -358,7 +346,8 @@
desc: `${this.realName}邀您加入【家庭财策师联盟】，资源+伙伴，共赢未来！`,
link: shareURL +
"/myPackageA/applyFranchise/applyFranchise?shareId=" +
this.shareId + '&invitationCode=' + this.invitationCode+ '&inviteUserId=' + this.userId, //分享链接
this.shareId + '&invitationCode=' + this.invitationCode + '&inviteUserId=' + this
.userId, //分享链接
imgUrl: this.ydLogoShare, //图片
//imgUrl: `${baseURL}/static/cffp_logo.jpg`, //图片
}
......@@ -407,10 +396,10 @@
// #endif
},
uniShare(type) {
if(!this.realName){
if (!this.realName) {
this.realName = ""
}
let typeName = type == 1?'微信好友':'朋友圈'
let typeName = type == 1 ? '微信好友' : '朋友圈'
dataHandling.pocessTracking(
'邀请',
`向${typeName}发出邀请`,
......@@ -571,7 +560,7 @@
const element = this.$refs.captureElement.$el;
// 调用工具函数生成图片
const imageData = await elementToImage(element);
this.generatedImage=imageData
this.generatedImage = imageData
this.isLoading = false
this.$refs.sharePosterPop.toggleDropdown()
......@@ -587,7 +576,7 @@
}
},
// 关闭海报弹窗
closePoster(){
closePoster() {
this.posterImg = ''
this.generatedImage = ''
}
......@@ -599,9 +588,10 @@
.container {
position: relative;
height: 100vh;
.generateImageBox{
.generateImageBox {
position: absolute;
top:-100%;
top: -100%;
z-index: -1;
border-radius: 20rpx;
width: 100%;
......@@ -612,16 +602,19 @@
align-items: center;
justify-content: center;
flex-direction: column;
.imgBox{
.imgBox {
position: relative;
width: 500rpx;
height: 900rpx;
box-sizing: border-box;
.posterImg{
.posterImg {
width: 100%;
height: 100%;
object-fit: cover;
}
.qrcode-container {
position: absolute;
bottom: 1%;
......@@ -629,7 +622,8 @@
background: #fff;
padding: 10rpx;
border-radius: 10rpx;
box-shadow: 0 0 10rpx rgba(0,0,0,0.1);
box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.1);
.qrcode-canvas {
display: block;
}
......@@ -639,6 +633,7 @@
}
.tabTitle {
color: #666666;
background-color: #fff;
......@@ -647,8 +642,10 @@
justify-content: space-around;
padding: 30rpx;
box-sizing: border-box;
text {
font-size: 26rpx;
&.actived {
color: #333;
border-bottom: 4rpx solid #20269B;
......@@ -683,6 +680,7 @@
justify-content: space-between;
align-items: center;
font-size: 26rpx;
&:last-child {
border: none;
}
......
pages/orderConfirm/orderConfirm.vue
......@@ -10,8 +10,8 @@
<!-- 课程详情 -->
<template v-if="courseInfoItem">
<view class="courseItemBox" >
<course-item :thumbnailPath="courseInfoItem.displayImage" :title="courseInfoItem.fileSynopsis"
:summaryBox="courseInfoItem.fileTitle"
<course-item :thumbnailPath="courseInfoItem.displayImage" :title="courseInfoItem.fileTitle"
:summaryBox="courseInfoItem.fileSynopsis"
:dataList="{coursePrice:courseInfoItem.coursePrice,salesNumber:courseInfoItem.salesNumber}"
:fileLecturerId="courseInfoItem.fileLecturerId" :fileId="fileId"></course-item>
</view>
......
pages/personalCenter/personalCenter.vue
......@@ -225,7 +225,7 @@
{key:'06',title:'邀请加盟',icon:'icon-yaoqing',link:'/pages/inviteJoin/inviteJoin',isOpen:true,isShow:true,identity: true},
// {title:'我的团队',icon:'icon-tuandui',link:'/pages/personalCenter/myTeam',isOpen:true,isShow:true,identity: true},
{title:'我的团队',icon:'icon-tuandui',link:'/myPackageA/myTeam/myTeam',isOpen:true,isShow:true,identity: true},
{title:'育成团队',icon:'icon-yuchengguanxi',link:'/pages/personalCenter/myTeamIncubate',isOpen:true,isShow:true,identity: true},
// {title:'育成团队',icon:'icon-yuchengguanxi',link:'/pages/personalCenter/myTeamIncubate',isOpen:true,isShow:true,identity: true},
],
},{id:'03',categoryName:'学习研讨',
children:[
......@@ -322,7 +322,8 @@
let cffpCourseInfos = res['data']['data'];
if(cffpCourseInfos.length>0){
cffpCourseInfos.forEach(item=>{
if(item.productCode&&item.productCode=='C09'){
if(item.productCode&&item.productCode=='ZNTJ'){
this.productItem = item
uni.setStorageSync('productItem',this.productItem );
}
......@@ -692,7 +693,7 @@
}
this.inviteEqrode = this.customerBasicInfo.invitationCode;
uni.setStorageSync('user_mobile', res.data.mobile)
console.log('this.mainMenuLists',this.mainMenuLists);
}else {
uni.setStorageSync('loginType','visitor')
......@@ -702,10 +703,7 @@
}
})
},
// 获取名片状态
// getCard(){
// }
// 我的名片页面
businessCard(){
if(!uni.getStorageSync('loginType')||uni.getStorageSync('loginType')=='visitor'){
......
pages/pointsExchange/pointsExchange.vue
......@@ -7,7 +7,7 @@
</view>
<!-- #endif -->
<view class="listBox" >
<view class="listBox">
<view class="first">
<view class="top">
<view class="left">
......@@ -18,22 +18,20 @@
{{yesExchangeFortune?yesExchangeFortune:'0.00'}}
</view>
</view>
<view class="right" @click="toWithdrawal()">
<view class="right" @click="toWithdrawal()" v-if="showWithdrawal">
提现
</view>
</view>
<view class="bottom">
<view class="bottomItem" v-for="score in scoreList " :key="score.id">
<!-- @click="gotoRecord(score.id)" -->
<view class="one" >
<view
@click="gotoRecord(score.id)"
style="font-size:28rpx;color: rgba(199, 199, 199, 1);"
>
<view class="one">
<view @click="gotoRecord(score.id)" style="font-size:28rpx;color: rgba(199, 199, 199, 1);">
{{score.name}}
</view>
<uni-tooltip class="item" :content="score.content" :placement="score.position">
<text class="iconfont icon-wenhao1" style="margin-left: 3rpx;color: rgba(199, 199, 199, 1);font-size: 28rpx;" ></text>
<text class="iconfont icon-wenhao1"
style="margin-left: 3rpx;color: rgba(199, 199, 199, 1);font-size: 28rpx;"></text>
</uni-tooltip>
</view>
<view class="fotter">
......@@ -44,7 +42,7 @@
</view>
</view>
<view class="" style="padding: 0 20rpx;">
<view class="two" >
<view class="two">
<view class="twoHeader">
订单收益明细
</view>
......@@ -56,13 +54,8 @@
</view>
<view class="filterBox">
<scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120">
<view
class="scroll-view-item_H uni-bg-blue"
v-for="item in commissionTypeList"
:key="item.id"
:class="{active:item.id == currentFilter.id }"
@click="changeFilter(item)"
>
<view class="scroll-view-item_H uni-bg-blue" v-for="item in commissionTypeList" :key="item.id"
:class="{active:item.id == currentFilter.id }" @click="changeFilter(item)">
{{item.dropOptionName}}
</view>
</scroll-view>
......@@ -72,20 +65,13 @@
<text style="margin-right: 10rpx;">合计</text> {{sumCommissionAmount}}
</view>
<view class="totalSelect">
<uni-data-select
v-model="selectItem"
:localdata="selectList"
@change="getDetail()"
></uni-data-select>
<uni-data-select v-model="selectItem" :localdata="selectList"
@change="getDetail()"></uni-data-select>
</view>
</view>
<view class="detailBox" v-if="cffpFortuneDateList.length>0">
<view
class="detailItem"
v-for="(item,index) in cffpFortuneDateList"
:key="index"
@click="viewDetail(item)"
>
<view class="detailItem" v-for="(item,index) in cffpFortuneDateList" :key="index"
@click="viewDetail(item)">
<view class="detailLeft">
<view class="txt">
{{item.productTypeName}}
......@@ -97,8 +83,10 @@
<view class="detailRight">
<view class="">
<view class="money">
<text v-if="item.commissionAmount&&item.commissionAmount>0">+{{item.commissionAmount}}</text>
<text v-if="item.commissionAmount&&item.commissionAmount<0" style="color: rgba(212, 48, 48, 1);">{{item.commissionAmount}}</text>
<text
v-if="item.commissionAmount&&item.commissionAmount>0">+{{item.commissionAmount}}</text>
<text v-if="item.commissionAmount&&item.commissionAmount<0"
style="color: rgba(212, 48, 48, 1);">{{item.commissionAmount}}</text>
</view>
<view style="font-weight: normal;font-size: 26rpx;color: rgba(56, 56, 56, 1);">
{{item.exchangeStatus&&item.exchangeStatus=='1'?'待结算'
......@@ -124,8 +112,9 @@
</view>
</view>
<uni-popup ref="timePopup" type="bottom" >
<customDatePop @closePop="closePop" @comfirm="comfirm" :dateParts="dateParts" :currentItem="currentItem" :childData="childData"></customDatePop>
<uni-popup ref="timePopup" type="bottom">
<customDatePop @closePop="closePop" @comfirm="comfirm" :dateParts="dateParts" :currentItem="currentItem"
:childData="childData"></customDatePop>
</uni-popup>
</view>
......@@ -137,25 +126,25 @@
import dataHandling from "@/util/dataHandling";
import { initJssdkShare, setWechatShare } from '@/util/fiveshare';
let nowTime = dataHandling.getMonthRange(dataHandling.getDateParts().year, dataHandling.getDateParts().month)
export default{
data(){
export default {
data() {
return {
yesExchangeFortune:'0.00',
notExchangeFortune:'',
inExchangeFortune:'',
alreadyExchangeFortune:'',
returnFortune:'',
totalFortune:'',
scoreList:[
{name:'总积分',value:'0.00',id:'1',position:'bottom',content:'包含已兑换＋待结算＋可兑换+兑换中的积分'},
{name:'已兑换',value:'0.00',id:'2',position:'bottom',content:'已经提取入账的积分'},
{name:'待结算',value:'0.00',id:'3',position:'left',content:'订单成交后需等待7天结算期'},
{name:'兑换中',value:'0.00',id:'4',position:'left',content:'正在审核中的积分'},
yesExchangeFortune: '0.00',
notExchangeFortune: '',
inExchangeFortune: '',
alreadyExchangeFortune: '',
returnFortune: '',
totalFortune: '',
scoreList: [
{ name: '总积分', value: '0.00', id: '1', position: 'bottom', content: '包含已兑换＋待结算＋可兑换+兑换中的积分' },
{ name: '已兑换', value: '0.00', id: '2', position: 'bottom', content: '已经提取入账的积分' },
{ name: '待结算', value: '0.00', id: '3', position: 'left', content: '订单成交后需等待7天结算期' },
{ name: '兑换中', value: '0.00', id: '4', position: 'left', content: '正在审核中的积分' },
],
commissionTypeList:[],
currentFilter:{id:'0',dropOptionCode:null},
selectItem:'0',
selectList:[
commissionTypeList: [],
currentFilter: { id: '0', dropOptionCode: null },
selectItem: '0',
selectList: [
{ value: '0', text: "全部" },
{ value: 1, text: "待结算" },
{ value: 2, text: "可兑换" },
......@@ -163,27 +152,34 @@
{ value: 4, text: "兑换中" },
{ value: 5, text: "已失效" },
],
dateParts:dataHandling.getDateParts(),
currentItem:'1',//便于弹框弹出回显是月份选择还是自定义时间
timeType:'1',//有三种，1：年月，2：上月，近三月，近半年，3：具体日期的选择
showTime:`${dataHandling.getDateParts().year}年${dataHandling.getDateParts().month}月`,
childData:{
current:'1',
year:dataHandling.getDateParts().year,
month:dataHandling.getDateParts().month,
timeType:'8',
queryDateStart:nowTime.start,
queryDateEnd:nowTime.end,
dateParts: dataHandling.getDateParts(),
currentItem: '1', //便于弹框弹出回显是月份选择还是自定义时间
timeType: '1', //有三种，1：年月，2：上月，近三月，近半年，3：具体日期的选择
showTime: `${dataHandling.getDateParts().year}年${dataHandling.getDateParts().month}月`,
childData: {
current: '1',
year: dataHandling.getDateParts().year,
month: dataHandling.getDateParts().month,
timeType: '8',
queryDateStart: nowTime.start,
queryDateEnd: nowTime.end,
},
sumCommissionAmount:'0.00',
cffpFortuneDateList:[],
sumCommissionAmount: '0.00',
cffpFortuneDateList: [],
userInfo: {},
showWithdrawal:true
}
},
components:{CustomDatePop},
onLoad(){
components: { CustomDatePop },
onLoad() {
this.userInfo = JSON.parse(uni.getStorageSync('cffp_userInfo'))
// 经销商职级p3之上的都不给提现
if(this.userInfo.levelCode&&this.userInfo.levelCode.split('')[1]>3){
this.showWithdrawal = false
}
console.log('levelCode',this.userInfo.levelCode);
},
onShow(){
onShow() {
this.queryByUserIdFortuneStatistic();
this.getCommissionType()
this.getDetail()
......@@ -193,9 +189,9 @@
}, window.location.href);
// #endif
},
methods:{
methods: {
// 查看订单详情
viewDetail(item){
viewDetail(item) {
dataHandling.pocessTracking(
'查看订单详情',
`点击查看订单详情`,
......@@ -205,43 +201,45 @@
'pages/pointsExchange/pointsExchange'
)
uni.navigateTo({
url:`/pages/orderDetail/orderDetail?id=${item.orderId}&commissionType=${item.commissionType}&type=drop`
url: `/pages/orderDetail/orderDetail?id=${item.orderId}&commissionType=${item.commissionType}&type=drop`
})
},
getDetail(){
getDetail() {
const param = {
isDtl: 1,
userId: uni.getStorageSync('cffp_userId'),
queryDateStart:this.childData.queryDateStart,
queryDateEnd:this.childData.queryDateEnd,
commissionType:this.currentFilter.dropOptionCode,
queryPage:2,
exchangeStatus:this.selectItem=='0'?'':this.selectItem,
queryDateStart: this.childData.queryDateStart,
queryDateEnd: this.childData.queryDateEnd,
commissionType: this.currentFilter.dropOptionCode,
queryPage: 2,
exchangeStatus: this.selectItem == '0' ? '' : this.selectItem,
productType: 1
}
api.findForExchangeStatisticDtl(param).then((res)=>{
if(res['success']){
api.findForExchangeStatisticDtl(param).then((res) => {
if (res['success']) {
this.cffpFortuneDateList = []
if(res['data']['cffpFortuneDeductionList']&&res['data']['cffpFortuneDeductionList'].length>0){
this.cffpFortuneDateList = res['data']['cffpFortuneDeductionList'].map(item=>{
if (res['data']['cffpFortuneDeductionList'] && res['data']['cffpFortuneDeductionList']
.length > 0) {
this.cffpFortuneDateList = res['data']['cffpFortuneDeductionList'].map(item => {
item.commissionAmount = Number(item.commissionAmount).toFixed(2)
return item
})
}
if(res['data']['sumCommissionAmount']){
if (res['data']['sumCommissionAmount']) {
this.sumCommissionAmount = Number(res['data']['sumCommissionAmount']).toFixed(2);
}else {
this.sumCommissionAmount= '0.00'
} else {
this.sumCommissionAmount = '0.00'
}
}
});
},
getCommissionType(){
api.dropOptionsQuery({code:'CFFP_Commission_Item'}).then((res)=>{
this.commissionTypeList = [{dropOptionName:'全部',dropOptionCode:null,id:'0'}].concat(res['data']['dropMasterInfoList'][0]['dropOptionsInfoList']);
getCommissionType() {
api.dropOptionsQuery({ code: 'CFFP_Commission_Item' }).then((res) => {
this.commissionTypeList = [{ dropOptionName: '全部', dropOptionCode: null, id: '0' }].concat(res[
'data']['dropMasterInfoList'][0]['dropOptionsInfoList']);
// for(let i=0;i<this.commissionTypeList.length;i++){
// if(this.commissionType == this.commissionTypeList[i]['dropOptionCode']){
// this.commissionTypeIdx = i;
......@@ -250,16 +248,16 @@
// }
})
},
closePop(){
closePop() {
this.$refs.timePopup.close()
},
//时间选择框确定事件
comfirm(obj){
console.log('obj',obj);
comfirm(obj) {
console.log('obj', obj);
this.currentItem = obj.current
// timeType 8:月份 9:三种方式的选择 10:自定义日期选择
switch (obj.timeType){
switch (obj.timeType) {
case '8':
this.showTime = `${obj.year}年${obj.month}月`
const { year, month } = obj;
......@@ -286,21 +284,21 @@
this.getDetail()
},
// 切换过滤条件
changeFilter(item){
changeFilter(item) {
this.currentFilter = item
this.getDetail()
},
maskClick(e){
maskClick(e) {
console.log('maskClick事件:', e);
},
goBack(){
goBack() {
uni.navigateBack({
delta: 1
});
},
queryByUserIdFortuneStatistic(){
api.queryByUserIdFortuneStatistic({userId:uni.getStorageSync('cffp_userId')}).then((res)=>{
if(res['success']){
queryByUserIdFortuneStatistic() {
api.queryByUserIdFortuneStatistic({ userId: uni.getStorageSync('cffp_userId') }).then((res) => {
if (res['success']) {
// //可兑换
this.yesExchangeFortune = res['data']['yesExchangeFortune'] || '0.00';
......@@ -316,11 +314,12 @@
}
})
},
toWithdrawal(){
if(!this.yesExchangeFortune || this.yesExchangeFortune==0){
toWithdrawal() {
if (!this.yesExchangeFortune || this.yesExchangeFortune == 0) {
uni.showModal({
content: `目前可兑换积分为${this.yesExchangeFortune},积分低于1分时无法兑换`,
success: function (res) {
success: function(res) {
if (res.confirm) {
console.log('用户点击确定');
} else if (res.cancel) {
......@@ -328,7 +327,7 @@
}
}
});
}else{
} else {
// uni.navigateTo({
// url:`/pages/withdrawal/withdrawal?exchangeAmount=${this.yesExchangeFortune}`
// })
......@@ -341,7 +340,7 @@
'pages/pointsExchange/pointsExchange'
)
uni.navigateTo({
url:`/myPackageA/integralExchange/exchange`
url: `/myPackageA/integralExchange/exchange`
})
}
},
......@@ -350,15 +349,15 @@
// url:'/pages/exchangeRecord/exchangeRecord'
// })
// },
viewDropLists(){
viewDropLists() {
uni.navigateTo({
url:'/pages/dropLists/dropLists'
url: '/pages/dropLists/dropLists'
})
},
gotoRecord(id){
if(id=='2'){
gotoRecord(id) {
if (id == '2') {
uni.navigateTo({
url:'/myPackageA/commission/withdrawalRecord'
url: '/myPackageA/commission/withdrawalRecord'
})
}
}
......@@ -376,30 +375,36 @@
transform: none !important;
// left: -200% !important;
}
::v-deep .uni-popup .uni-popup__wrapper{
::v-deep .uni-popup .uni-popup__wrapper {
margin: 0 !important;
}
::v-deep .uni-select__input-text{
::v-deep .uni-select__input-text {
font-size: 24rpx !important;
}
::v-deep .uni-select__selector-item{
::v-deep .uni-select__selector-item {
font-size: 22rpx !important;
}
::v-deep .uni-select__input-box{
::v-deep .uni-select__input-box {
height: 50rpx;
box-sizing: border-box;
padding:10rpx 15rpx !important;
padding: 10rpx 15rpx !important;
display: flex;
align-items: center;
}
.container{
.container {
box-sizing: border-box;
/* #ifdef H5 */
padding-top: 15rpx;
/* #endif */
padding-bottom: 20rpx;
.backArrow{
.backArrow {
background-color: #fff;
box-sizing: border-box;
display: flex;
......@@ -409,17 +414,20 @@
position: relative;
width: 100%;
margin-bottom: 10rpx;
text:nth-child(2){
text:nth-child(2) {
width: 100%;
text-align: center;
position: absolute;
}
}
.listBox{
.listBox {
padding: 10rpx 20rpx 0rpx 20rpx;
}
.first{
.first {
color: rgba(244, 239, 212, 1);
box-sizing: border-box;
......@@ -427,16 +435,19 @@
width: 100%;
padding: 30rpx;
border-radius: 10rpx;
.top{
.top {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 30rpx;
.left{
.left {
font-size: 28rpx;
width: 60%;
}
.right{
.right {
padding: 15rpx 50rpx;
background: rgba(249, 219, 165, 1);
border-radius: 50rpx;
......@@ -445,27 +456,31 @@
font-weight: 500;
}
}
.bottom{
.bottom {
box-sizing: border-box;
display: flex;
align-items: center;
justify-content: space-between;
width: 100%;
.bottomItem{
.one{
.bottomItem {
.one {
display: flex;
margin-bottom: 5rpx;
align-items: center;
justify-content: center;
}
.fotter{
.fotter {
font-size: 26rpx;
}
}
}
}
.two{
.two {
margin-top: 20rpx;
box-sizing: border-box;
background: #fff;
......@@ -473,12 +488,14 @@
padding: 20rpx 30rpx;
border-radius: 10rpx;
box-sizing: border-box;
.twoHeader{
.twoHeader {
color: rgba(46, 38, 29, 1);
font-size: 32rpx;
font-weight: 500;
}
.timeBox{
.timeBox {
display: flex;
align-items: center;
width: fit-content;
......@@ -486,21 +503,25 @@
margin: 40rpx 0;
font-size: 27rpx;
}
.filterBox{
.filterBox {
display: flex;
align-items: center;
justify-content: space-between;
.scroll-view_H {
white-space: nowrap;
width: 100%;
box-sizing: border-box;
}
.scroll-view-item {
height: 100rpx;
// line-height: 300rpx;
text-align: center;
font-size: 36rpx;
}
.scroll-view-item_H {
display: inline-block;
margin-right: 20rpx;
......@@ -511,75 +532,89 @@
color: rgba(46, 38, 29, 1);
border-radius: 8rpx;
margin-bottom: 20rpx;
&.active{
&.active {
background: rgba(32, 39, 155, 1);
color: #fff;
}
}
.scroll-view-item_H:last-child{
.scroll-view-item_H:last-child {
margin-right: 0rpx;
}
.filterItem{
.filterItem {
background: #f7f7f7;
font-size: 27rpx;
padding: 10rpx;
color: rgba(46, 38, 29, 1);
border-radius: 8rpx;
&.active{
&.active {
background: rgba(32, 39, 155, 1);
color: #fff;
}
}
}
.totalBox{
.totalBox {
display: flex;
align-items: center;
justify-content: space-between;
margin: 30rpx 0;
.totalItem{
.totalItem {
font-size: 31rpx;
font-weight: 500;
}
.totalSelect{
.totalSelect {
width: 300rpx;
}
}
.detailBox{
.detailBox {
background-color: #fcfcfc;
padding: 0rpx 30rpx;
border-radius: 10rpx;
.emptyBox{
.emptyBox {
display: flex;
align-items: center;
justify-content: center;
margin: 20rpx;
color: rgba(153, 153, 153, 1);
}
.detailItem{
.detailItem {
display: flex;
justify-content: space-between;
align-items: center;
border-bottom: 1px solid rgba(232, 232, 232, 1);
padding: 30rpx 0;
.detailLeft{
.txt{
.detailLeft {
.txt {
font-size: 29rpx;
font-weight: 500;
color: rgba(34, 34, 34, 1);
}
.date{
.date {
color: rgba(56, 56, 56, 1);
font-size: 26rpx;
margin-top: 10rpx;
}
}
.detailRight{
.detailRight {
width: 25%;
display: flex;
justify-content: space-between;
align-items: center;
.money{
.money {
font-size: 29rpx;
font-weight: 500;
color: rgba(34, 34, 34, 1);
......@@ -587,7 +622,8 @@
}
}
}
.detailItem:last-child{
.detailItem:last-child {
border: none;
}
}
......
static/uni.webview.1.5.4.js 0 → 100644
!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e=e||self).uni=n()}(this,(function(){"use strict";try{var e={};Object.defineProperty(e,"passive",{get:function(){!0}}),window.addEventListener("test-passive",null,e)}catch(e){}var n=Object.prototype.hasOwnProperty;function i(e,i){return n.call(e,i)}var t=[];function r(){return window.__dcloud_weex_postMessage||window.__dcloud_weex_}var o=function(e,n){var i={options:{timestamp:+new Date},name:e,arg:n};if(r()){if("postMessage"===e){var o={data:[n]};return window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessage(o):window.__dcloud_weex_.postMessage(JSON.stringify(o))}var a={type:"WEB_INVOKE_APPSERVICE",args:{data:i,webviewIds:t}};window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessageToService(a):window.__dcloud_weex_.postMessageToService(JSON.stringify(a))}if(!window.plus)return window.parent.postMessage({type:"WEB_INVOKE_APPSERVICE",data:i,pageId:""},"*");if(0===t.length){var d=plus.webview.currentWebview();if(!d)throw new Error("plus.webview.currentWebview() is undefined");var s=d.parent(),w="";w=s?s.id:d.id,t.push(w)}if(plus.webview.getWebviewById("__uniapp__service"))plus.webview.postMessageToUniNView({type:"WEB_INVOKE_APPSERVICE",args:{data:i,webviewIds:t}},"__uniapp__service");else{var u=JSON.stringify(i);plus.webview.getLaunchWebview().evalJS('UniPlusBridge.subscribeHandler("'.concat("WEB_INVOKE_APPSERVICE",'",').concat(u,",").concat(JSON.stringify(t),");"))}},a={navigateTo:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;o("navigateTo",{url:encodeURI(n)})},navigateBack:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.delta;o("navigateBack",{delta:parseInt(n)||1})},switchTab:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;o("switchTab",{url:encodeURI(n)})},reLaunch:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;o("reLaunch",{url:encodeURI(n)})},redirectTo:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;o("redirectTo",{url:encodeURI(n)})},getEnv:function(e){r()?e({nvue:!0}):window.plus?e({plus:!0}):e({h5:!0})},postMessage:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};o("postMessage",e.data||{})}},d=/uni-app/i.test(navigator.userAgent),s=/Html5Plus/i.test(navigator.userAgent),w=/complete|loaded|interactive/;var u=window.my&&navigator.userAgent.indexOf(["t","n","e","i","l","C","y","a","p","i","l","A"].reverse().join(""))>-1;var g=window.swan&&window.swan.webView&&/swan/i.test(navigator.userAgent);var v=window.qq&&window.qq.miniProgram&&/QQ/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var c=window.tt&&window.tt.miniProgram&&/toutiaomicroapp/i.test(navigator.userAgent);var m=window.wx&&window.wx.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var p=window.qa&&/quickapp/i.test(navigator.userAgent);var f=window.ks&&window.ks.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var l=window.tt&&window.tt.miniProgram&&/Lark|Feishu/i.test(navigator.userAgent);var _=window.jd&&window.jd.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var E=window.xhs&&window.xhs.miniProgram&&/xhsminiapp/i.test(navigator.userAgent);for(var h,P=function(){window.UniAppJSBridge=!0,document.dispatchEvent(new CustomEvent("UniAppJSBridgeReady",{bubbles:!0,cancelable:!0}))},b=[function(e){if(d||s)return window.__dcloud_weex_postMessage||window.__dcloud_weex_?document.addEventListener("DOMContentLoaded",e):window.plus&&w.test(document.readyState)?setTimeout(e,0):document.addEventListener("plusready",e),a},function(e){if(m)return window.WeixinJSBridge&&window.WeixinJSBridge.invoke?setTimeout(e,0):document.addEventListener("WeixinJSBridgeReady",e),window.wx.miniProgram},function(e){if(v)return window.QQJSBridge&&window.QQJSBridge.invoke?setTimeout(e,0):document.addEventListener("QQJSBridgeReady",e),window.qq.miniProgram},function(e){if(u){document.addEventListener("DOMContentLoaded",e);var n=window.my;return{navigateTo:n.navigateTo,navigateBack:n.navigateBack,switchTab:n.switchTab,reLaunch:n.reLaunch,redirectTo:n.redirectTo,postMessage:n.postMessage,getEnv:n.getEnv}}},function(e){if(g)return document.addEventListener("DOMContentLoaded",e),window.swan.webView},function(e){if(c)return document.addEventListener("DOMContentLoaded",e),window.tt.miniProgram},function(e){if(p){window.QaJSBridge&&window.QaJSBridge.invoke?setTimeout(e,0):document.addEventListener("QaJSBridgeReady",e);var n=window.qa;return{navigateTo:n.navigateTo,navigateBack:n.navigateBack,switchTab:n.switchTab,reLaunch:n.reLaunch,redirectTo:n.redirectTo,postMessage:n.postMessage,getEnv:n.getEnv}}},function(e){if(f)return window.WeixinJSBridge&&window.WeixinJSBridge.invoke?setTimeout(e,0):document.addEventListener("WeixinJSBridgeReady",e),window.ks.miniProgram},function(e){if(l)return document.addEventListener("DOMContentLoaded",e),window.tt.miniProgram},function(e){if(_)return window.JDJSBridgeReady&&window.JDJSBridgeReady.invoke?setTimeout(e,0):document.addEventListener("JDJSBridgeReady",e),window.jd.miniProgram},function(e){if(E)return window.xhs.miniProgram},function(e){return document.addEventListener("DOMContentLoaded",e),a}],y=0;y<b.length&&!(h=b[y](P));y++);h||(h={});var B="undefined"!=typeof uni?uni:{};if(!B.navigateTo)for(var S in h)i(h,S)&&(B[S]=h[S]);return B.webView=h,B}));
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