Commit b193ccdd by huSun

修改Bug

parent 16f215c7
......@@ -16,7 +16,7 @@
<input class="uni-input" name="mobileNo" placeholder="输入手机号" v-model="form.mobile" maxlength="11"/>
</view>
<view class="inputItem" v-if="loginType==='agentlogin'">
<input class="uni-input" name="mobileNo" placeholder="输入账号" v-model="account" maxlength="11"/>
<input class="uni-input" name="mobileNo" placeholder="输入账号" v-model="form.account" maxlength="11"/>
</view>
<view class="inputItem" v-if="loginType === 'codelogin' || loginType==='register' || loginType === 'resetpw'">
<input class="uni-input codeBtn" name="code" placeholder="输入验证码" v-model="form.code" type="number" maxlength="6"/>
......@@ -254,14 +254,22 @@
}
}
}else{
if(!this.account){
if(!this.form.account){
common.errorDialog(1,'请输入账号');
return false;
}
if(!common.passwordValid(this.account)){
if(!common.passwordValid(this.form.account)){
common.errorDialog(2,'账号为6-12位数字密码组合');
return false;
}
if(!this.agreeFlag){
uni.showToast({
title: '请阅读并勾选银盾保险经纪服务协议和隐私条款',
duration: 5000,
icon: 'none'
})
return false;
}
if(!this.form.password){
common.errorDialog(1,'请输入密码');
return false;
......@@ -272,7 +280,7 @@
//代理商登录
this.loginIn(4)
}
if(!this.agreeFlag){
if(!this.agreeFlag && this.loginType !='resetpw'){
uni.showToast({
title: '请阅读并勾选银盾保险经纪服务协议和隐私条款',
duration: 5000,
......
......@@ -15,8 +15,8 @@
<!-- 为了提高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" :class="`padding-left-${item.level * 5 + 10}`">
<!-- :class="`padding-left-${item.level * 5 + 10}`"-->
<view class="d-td" >
<view class="" style="display: flex;">
<view class="">
<uni-icons
......@@ -96,6 +96,11 @@ export default {
};
},
methods: {
pdleft(level){
return (
"padding-left:" +level * 5 + 10
);
},
treeToArray(nodes, ids = [0]) {
let arr = [];
if (this.isArray(nodes)) {
......@@ -319,13 +324,13 @@ export default {
.content-box-title-a {
// min-width: 100rpx;
flex: 1;
height: 80rpx;
// line-height: 80rpx;
background: url('../../static/myteam/Group1660.png');
background-repeat: no-repeat;
// background: url('../../static/myteam/Group1660.png');
// background: url('../../static/myteam/Group1660.png') no-repeat;
// background-repeat: no-repeat;
// background-color: #3F52B7;
background: #3F52B7;
background-size: 100%;
margin-left: 20rpx;
border-radius: 10rpx;
color: #FFFFFF;
}
.content-box-title-b{
......@@ -333,27 +338,16 @@ export default {
flex: 1;
// min-height: 60rpx;
// padding: 10rpx 0;
background: url('../../static/myteam/Group1662.png');
background-repeat: no-repeat;
background-size: 100%;
border: 2rpx solid #3F52B7;
border-radius: 10rpx;
// background: url('../../static/myteam/Group1662.png') no-repeat;
// 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;
......@@ -364,7 +358,8 @@ export default {
flex: 1;
font-size: 26rpx;
min-height: 60rpx;
line-height: 80rpx;
margin-top: 10rpx;
line-height: 60rpx;
// padding: 10rpx 0;
}
}
......
......@@ -9,24 +9,26 @@
<view class="content-sam-box">
<view class="" v-for="(pointItem,index) in dataList" :key="index">
<view class="content-sa" style=" " v-if="felTyle == 'achievement'">
<view class="content-box-title" style="display: flex;align-items: center;">
<view style="" :class="index == 0 ?'cornermarker': index == 1 ? 'cornermarkertwo' : index == 2 ? 'cornermarkerthree' : 'cornermarkerother'">
<text style="font-size: 8rpx;line-height: 20rpx;">{{index + 1}}</text>
<view class="content-box-title" style="display: flex;align-items: center;margin-left: 6rpx;flex: 1;">
<view style=""
:class="index == 0 ?'cornermarker': index == 1 ? 'cornermarkertwo' : index == 2 ? 'cornermarkerthree' : 'cornermarkerother'">
<text style="font-size: 20rpx;line-height: 20rpx;">{{index + 1}}</text>
</view>
<view>{{pointItem.name }}</view>
</view>
<view class="content-box-title">
<span style="text-overflow: ellipsis;
<view style="margin-left: 8rpx;text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;">{{pointItem.areaCenterName }}</span>
white-space: nowrap;">{{pointItem.name }}</view>
</view>
<view class="content-box-title" style="text-overflow: ellipsis;overflow: hidden;
white-space: nowrap;max-width: 150rpx;">
<span>{{pointItem.areaCenterName }}</span>
</view>
<view class="content-box-title" >
<view class="content-box-title">
<span style="color:#FF0000;">{{pointItem.orderNum }}</span>
</view>
<view class="content-box-title" >
<view class="content-box-title">
<span style="color:#FF0000;">{{pointItem.coursePrice}}</span>
</view>
<view class="content-box-title" >
<view class="content-box-title">
<span style="color:#FF0000;">{{pointItem.courseIncome}}</span>
</view>
</view>
......@@ -170,14 +172,18 @@
align-items: center;
justify-content: space-between;
}
.content-sa{
.content-sa {
display: flex;
}
}
.content-box-title {
padding: 5rpx 0;
flex: 1;
align-items: center;
text-align: center;
border-bottom: 1rpx solid #F2F2F2;
padding: 20rpx 0;
}
......@@ -189,37 +195,41 @@
padding: 10rpx 0;
color: #333333;
border-bottom: 1rpx solid #F2F2F2;; */
font-size: 13rpx;
font-size: 24rpx;
}
.cornermarker {
width: 30rpx;height: 30rpx;
width: 30rpx;
height: 30rpx;
color: #FFFFFF;
background: #C50021;
border-radius: 50%;
}
.cornermarkertwo {
width: 30rpx;height: 30rpx;
width: 30rpx;
height: 30rpx;
color: #FFFFFF;
background: #FBB03B;
text-align: center;
border-radius: 50%;
}
.cornermarkerthree {
width: 30rpx;height: 30rpx;
width: 30rpx;
height: 30rpx;
color: #FFFFFF;
background: #3161A8;
text-align: center;
border-radius: 50%;
}
.cornermarkerother {
width: 10rpx;
width: 30rpx;
height: 30rpx;
color: #FFFFFF;
height: 10rpx;
background: #D5DDE9;
margin: 0 10rrpx 0 auto;
text-align: center;
line-height: 10rpx;
border-radius: 50%;
}
......
......@@ -72,7 +72,7 @@
components:{courseItem},
data() {
return {
userId:'1',
userId: uni.getStorageSync('cffp_userId'),
orderNo:'',
afterSalesFlag:'',
courseInfoItem:{},
......@@ -86,6 +86,7 @@
};
},
methods:{
goDetail(){
uni.navigateTo({
url:'/pages/receiptCycleDesc/receiptCycleDesc'
......
......@@ -21,7 +21,7 @@
},
data() {
return {
userId:'1',
userId: uni.getStorageSync('cffp_userId'),
userCourses:[],
afterSalesFlag:3
};
......
......@@ -82,7 +82,7 @@
courseInfoItem:{},
fileId:null,
orderId:null,
userId:'1',
userId: uni.getStorageSync('cffp_userId'),
dropInfo:{},
dropIndex:0,
dropReasons:['']
......
......@@ -87,7 +87,7 @@
data() {
return {
certificateInfo:{},
userId:'1',
userId: uni.getStorageSync('cffp_userId'),
status:"",
userSignupId:""
};
......
......@@ -20,7 +20,7 @@
lists:[],
fileId:'',
type:'1',
userId:'1'
userId: uni.getStorageSync('cffp_userId')
}
},
methods: {
......
<template>
<view class="container">
<view class="shareheader" style="">
<view class="">
<!-- <text>1</text> -->
</view>
<view class="" >
<img src="../../static/share.png" alt="">
</view>
</view>
<!-- 课程banner图 -->
<view class="courseBannerBox">
<video id="myVideo" :src="courseInfo.filePathOss"
......@@ -101,7 +110,7 @@
courseInfo:{},
relatedCoursesLists:[],
orderId:'',
userId:'1',
userId: uni.getStorageSync('cffp_userId'),
shareUserId:'',
shareCode:'',
shareReadId:'',
......@@ -367,6 +376,17 @@
}
}
}
.shareheader{
display: flex;justify-content: space-between;
align-items: center;
height: 60rpx;
// border: 1rpx solid #999;
}
.image{
width: 30rpx;
height: 30rpx;
}
.courseProBox{
.tab{
display: flex;
......
......@@ -30,7 +30,7 @@
export default {
data() {
return {
userId:'1',
userId: uni.getStorageSync('cffp_userId'),
dropLists:[]
}
},
......
......@@ -77,7 +77,8 @@
announcementInfo:null,
tagIds:123,
currentPage:'index',
carouselList:[]
carouselList:[],
userId: uni.getStorageSync('cffp_userId')
}
},
components:{
......@@ -107,7 +108,7 @@
},
queryAreaCenterInfo(){
api.queryAreaCenterInfo({userId:1}).then((res)=>{
api.queryAreaCenterInfo({userId:this.userId}).then((res)=>{
if(res['success']){
this.cffpUserInfo = res['data'];
// this.cffpUserInfo.logo = res['logo'];
......
......@@ -132,7 +132,7 @@
components:{charts},
data() {
return {
userId:'1',
userId: uni.getStorageSync('cffp_userId'),
userStudyCountList:{},
userCoursePackBarList:{},
userStudyTimeList:{},
......
......@@ -58,6 +58,7 @@
tabType:1,
signupInfos:[],
userCertificates:[],
userId: uni.getStorageSync('cffp_userId')
};
},
methods:{
......@@ -70,7 +71,7 @@
}
},
querySignupList(){
api.querySignupList({userId:1}).then(res=>{
api.querySignupList({userId:this.userId}).then(res=>{
console.log(res);
if(res['success']){
this.signupInfos = res['data']['signupInfos']
......@@ -80,7 +81,7 @@
userCertificateList(){
const param = {
queryType:1,
userId:1
userId: uni.getStorageSync('cffp_userId')
}
api.userCertificateList(param).then(res=>{
console.log(res);
......
......@@ -52,7 +52,7 @@
return {
tabType:1,
userStudyLists:[],
userId:'1'
userId: uni.getStorageSync('cffp_userId')
}
},
methods: {
......
......@@ -104,8 +104,8 @@
findByUserIdForFortuneStatistic(){
const param = {
isDtl:2,
// userId:uni.getStorageSync('cffp_userId'),
userId: 1,
userId:uni.getStorageSync('cffp_userId'),
// userId: 1,
fortuneDate:this.fortuneDate,
timeFlag:this.timeFlag
}
......
......@@ -107,7 +107,7 @@
// }
const param = {
isDtl: 1,
userId: 1,
userId: uni.getStorageSync('cffp_userId'),
fortuneDate: "2022-12",
timeFlag: "M",
commissionType:"A01",
......
......@@ -129,7 +129,7 @@
popupTitle:'积分抵扣规则',
popupType:1,
isDeduction:false,
userId:'1',
userId: uni.getStorageSync('cffp_userId'),
intergralInfo:{},
orderId:'1',
paymentBtnDisabled:false
......
......@@ -27,7 +27,7 @@
export default {
data() {
return {
userId:'1',
userId: uni.getStorageSync('cffp_userId'),
orderId:'',
fileId:'',
orderInfoList:[
......
<template>
<view class="conent">
<view class="input-row">
<text>183****9247</text>
<text>{{usermobile}}</text>
</view>
<view class="input-row">
<input maxlength="11" type="text" v-model="form.password" placeholder="请输入新密码" />
......@@ -29,7 +29,7 @@
code:'',
password:'',
},
usermobile:uni.getStorageSync('user_mobile'),
code: '',
countdown: '60',
timer: null,
......
......@@ -47,6 +47,7 @@
<style lang="scss">
.container{
height: 100%;
background: #FFFFFF;
}
.liBox{
display: flex;
......@@ -61,6 +62,6 @@
font-size: 16px;
font-weight: 400;
border-bottom:3px transparent solid;
border-image:linear-gradient(to right,#FA882F,#FFCCCC) 0.5 10;
// border-image:linear-gradient(to right,#FA882F,#FFCCCC) 0.5 10;
}
</style>
\ No newline at end of file
......@@ -3,21 +3,21 @@
<!-- 头部信息 -->
<view class="basicInfoBox">
<view class="avatar">
<image :src="customerBasicInfo.headPicture" alt="" srcset="" mode="widthFix"></image>
<image :src="customerBasicInfo.headPicture?customerBasicInfo.headPicture:'../../static/myteam/Group1633.png'" alt="" srcset="" mode="widthFix"></image>
</view>
<view class="infoBox">
<view class="firstLineBox">
<view>
<strong>{{customerBasicInfo.realName}}</strong>
<text class="csTag">{{customerBasicInfo.partnerType}}</text>
<text class="csTag">{{customerBasicInfo.partnerType || 'CFFP财富中心'}}</text>
</view>
<view class="personalInfoBtn" @click="userinfo()">
<text>个人资料</text>
<i class="iconfont icon-bianji"></i>
</view>
</view>
<view>昵称:{{customerBasicInfo.nickName}}</view>
<view>{{customerBasicInfo.userDescription}}</view>
<view>昵称:{{customerBasicInfo.nickName || 'CFFP财富中心'}}</view>
<view>{{customerBasicInfo.userDescription || 'CFFP财富中心'}}</view>
</view>
</view>
<!-- 主要菜单 -->
......@@ -78,7 +78,7 @@
export default {
data() {
return {
userId:'1',
userId: uni.getStorageSync('cffp_userId'),
inviteEqrode:'',
currentPage:'personalCenter',
customerBasicInfo:{},
......@@ -182,6 +182,7 @@
if(res['success']){
this.customerBasicInfo = res['data'];
this.inviteEqrode = this.customerBasicInfo.invitationCode;
uni.setStorageSync('user_mobile', res.data.mobile)
}else{
uni.showToast({
title: res['message'],
......
......@@ -27,7 +27,7 @@
title: '手机号绑定',
icon: '',
link: '',
contentType:"183****9247",
contentType:uni.getStorageSync('user_mobile'),
isOpen: true,
isShow: true,
isTips: false,
......
......@@ -37,6 +37,7 @@
tabType: 1,
userStudyLists: [],
userId: '1111',
// uni.getStorageSync('cffp_userId')
count:'',
directList: null, //直属团队数组
raiseList: null, //所辖团队数组
......@@ -101,6 +102,7 @@
text-align: center;
margin-bottom: 20px;
padding-top: 50px;
background: #FFFFFF;
.tabTitle {
color: #666666;
......
......@@ -41,7 +41,7 @@
<view class="classtotal-box" style="width: 40%;">
<span class="totalsingular">{{totalCoursePrice || 0}}</span>
<p>总销售额</p>
<p style="font-size: 5rpx;">温馨提示:业绩以最终核算为准</p>
<p style="font-size: 18rpx;white-space:nowrap">温馨提示:业绩以最终核算为准</p>
</view>
<view class="classtotal-box">
<span class="totalsingular">{{totalIncome || 0}}</span>
......@@ -107,7 +107,7 @@
}
],
CffpOrgInfoReqVO: {
userId: '1',
userId: uni.getStorageSync('cffp_userId'),
startDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1}`,
endDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1}`,
queryType: '',
......@@ -153,16 +153,18 @@
this.CffpOrgInfoReqVO.queryType = this.teamtype + 1
api.queryTeamAchievement(this.CffpOrgInfoReqVO).then(res => {
if (res) {
this.dataList = res.data.list
// this.dataList = res.data.list
this.totalOrder = res.data.totalOrder
this.totalCoursePrice = res.data.totalCoursePrice
this.totalIncome = res.data.totalIncome
// var dataForm = {
// courseIncome: 20,
// coursePrice: 1455555555,
// orderNum: 2
// }
// this.dataList.push(dataForm)
var dataForm = {
courseIncome:'1040',
coursePrice: '1040',
areaCenterName:'区域二级服务中心',
orderNum: '200',
name: '张柚子'
}
this.dataList.push(dataForm)
}
})
},
......
......@@ -2,17 +2,19 @@
<view class="content">
<view class="header">
<view class="headportrait" @click="uploadAvatar()">
<image :src="optionForm.headPicture ? optionForm.headPicture :'../../static/myteam/Group1633.png'" mode=""></image>
<image :src="optionForm.headPicture ? optionForm.headPicture :'../../static/myteam/Group1633.png'"
mode=""></image>
</view>
</view>
<view class="band">
<view class="contentItem">
<text>真实名称</text>
<input class="user-input" v-model="optionForm.realName" type="text" placeholder="请输入姓名"/>
<input class="user-input" v-model="optionForm.realName" type="text" placeholder="请输入姓名" />
</view>
<view class="contentItem">
<text>昵称</text>
<input class="user-input" v-model="optionForm.nickName" maxlength="10" type="text" placeholder="请输入3~10个字符"/>
<input class="user-input" v-model="optionForm.nickName" maxlength="10" type="text"
placeholder="请输入3~10个字符" />
</view>
<view class="contentItem">
<text>个人简介</text>
......@@ -21,6 +23,7 @@
</view>
<view class="footer">
<button class="user-button" @tap="submitinfo">保存</button>
<button class="user-button" @tap="awaken">唤醒App</button>
</view>
</view>
</template>
......@@ -33,7 +36,7 @@
export default {
data() {
return {
dataForm:{
dataForm: {
loginId: "1",
targetType: "5",
targetId: "1",
......@@ -41,14 +44,79 @@
targetUseFor: "12",
targetSeq: "0"
},
optionForm:{}
optionForm: {}
}
},
onLoad(options) {
this.optionForm = JSON.parse(options.customerBasicInfo)
console.log(this.optionForm, 7777)
},
methods:{
methods: {
awaken() {
let u = navigator.userAgent;
var isWeixin = u.toLowerCase().indexOf('micromessenger') !== -1; // 微信内
if (isWeixin) {
alert('请在浏览器中打开')
return false;
}
const platform = uni.getSystemInfoSync().platform;
if (platform === 'ios') {
this.ios()
}
if (platform === 'android') {
this.android()
}
},
ios() {
uni.showLoading({
title: '加载中...'
});
const currentTime = +(new Date());
window.location.href = "cffpapp"; //找ios工程师要 UrlSchemes
//启动间隔20ms运行的定时器,并检测累计消耗时间是否超过3000ms,超过则结束
let _count = 0,
timer;
timer = setInterval(function() {
_count++;
const endTime = +(new Date()) - currentTime;
if (_count >= 100 || endTime > 3000) {
uni.hideLoading()
clearInterval(timer);
let hidden = window.document.hidden || window.document.mozHidden || window.document
.msHidden || window.document.webkitHidden;
if (typeof hidden == "undefined" || hidden == false) {
//App store下载地址
window.location.href = "https://www.baidu.com"; //下载地址 可以直接跳转到appstore的
}
}
}, 20);
},
android() {
uni.showLoading({
title: '加载中...'
});
const currentTime = new Date().getTime();
window.location.href = "cffpapp://"; //找android工程师要 UrlSchemes
// 启动间隔20ms运行的定时器,并检测累计消耗时间是否超过2000ms,超时则结束
let _count = 0,
timer;
timer = setInterval(() => {
_count++;
const endTime = new Date().getTime() - currentTime;
if (_count >= 200 || endTime > 5000) {
uni.hideLoading()
clearInterval(timer);
let hidden = window.document.hidden || window.document.mozHidden || window.document
.msHidden || window.document.webkitHidden;
if (typeof hidden == "undefined" || hidden == false) {
//App store下载地址
window.location.href = "https://www.baidu.com"; //下载地址
}
}
}, 20)
},
uploadAvatar(event) {
let that = this;
CommonUpload(that.dataForm).then(res => {
......@@ -56,7 +124,7 @@
})
},
// 修改个人资料接口
submitinfo(){
submitinfo() {
let UserRequestVO = {
id: 1,
realName: this.optionForm.realName,
......@@ -64,8 +132,8 @@
headPicture: this.optionForm.headPicture,
userDescription: this.optionForm.userDescription
}
api.updateinfo(UserRequestVO).then(res =>{
if(res.success) {
api.updateinfo(UserRequestVO).then(res => {
if (res.success) {
uni.showToast({
title: res['message'],
duration: 2000,
......@@ -74,7 +142,7 @@
uni.$emit("handClick", {
data: this.optionForm
});
setTimeout(()=>{
setTimeout(() => {
uni.navigateBack({
delta: 1
})
......@@ -91,18 +159,23 @@
.content {
width: 100vw;
}
.user-input{
.user-input {
text-align: right;
}
.user-textarea{
border: 1px solid #C7C7C7;width: 540rpx;
.user-textarea {
border: 1px solid #C7C7C7;
width: 540rpx;
height: 270rpx;
border-radius: 10rpx;
}
.band{
.band {
margin: 0 20rpx;
font-size: 26rpx;
}
}
.header {
display: flex;
justify-content: center;
......@@ -114,32 +187,36 @@
/* border: 1rpx solid aqua; */
border-radius: 50%;
}
.headportrait image{
.headportrait image {
width: 100%;
height: 100%;
border-radius: 50%;
}
/* .headportrait-img {
/* .headportrait-img {
width: 260rpx;
height: 260rpx;
border-radius: 50%;
background-size: cover;
background-repeat: no-repeat center;
} */
.contentItem{
.contentItem {
margin-top: 40rpx;
display: flex;
justify-content: space-between;
border-bottom: 2rpx solid #E4E4E4;
padding: 20rpx;
}
.footer{
.footer {
width: 500rpx;
height: 80rpx;
opacity: 1;
margin: 80rpx auto;
}
.user-button{
.user-button {
color: #FFFFFF;
background: #20269B;
border-radius: 80px;
......
......@@ -79,7 +79,7 @@
return {
queryDate:`${new Date().getFullYear()}-${new Date().getMonth() + 1}`,
maxDate:`${new Date().getFullYear()}-${new Date().getMonth() + 1}`,
userId:'1',
userId: uni.getStorageSync('cffp_userId'),
coursesCountInfos:{},
userCourses:[],
userShareCourseOrders:[],
......
......@@ -90,8 +90,8 @@
methods:{
goFortuneWithdrawal(){
const param = {
// userId:uni.getStorageSync('cffp_userId'),
userId:1,
userId:uni.getStorageSync('cffp_userId'),
// userId:1,
exchangeAmount:this.exchangeAmount,
partnerTradeNo:this.partnerTradeNo?this.partnerTradeNo:null
}
......

4.16 KB | W: | H:

5.21 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