Commit 870fcba7 by sunerhu

修改了一些Bug

parent 6ebf43fd
......@@ -64,6 +64,7 @@
<style>
@import "@/static/font/iconfont.css";
@import './common/uni.css';
/*每个页面公共css */
uni-page-body{
height: 100%;
......
/* page {
height: 100%;
width: 100%;
background-color: #F8F8F8;
}
*/
.container {
/* height: 100%;
width: 100%; */
padding-top: 10%;
}
.ptop {
padding-top: 10%;
}
\ No newline at end of file
......@@ -156,8 +156,11 @@
uni.setStorageSync('isLogin','1')
uni.setStorageSync('cffp_userId',this.userId);
uni.setStorageSync('loginType',this.loginType)
uni.navigateTo({
url:'/pages/index/index'
// uni.navigateTo({
// url:'/pages/index/index'
// })
uni.reLaunch({
url: '/pages/index/index'
})
}else{
uni.showToast({
......
......@@ -30,7 +30,10 @@
methods: {
navTo(item) {
if (item.link != this.currentPage) {
uni.navigateTo({
// uni.navigateTo({
// url:`/pages/${item.link}/${item.link}`
// })
uni.reLaunch({
url:`/pages/${item.link}/${item.link}`
})
}
......
......@@ -49,12 +49,12 @@
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
],
"minSdkVersion" : 21,
"schemes" : "cffpapp"
"schemes" : "cffpapp,hbuilder"
},
/* ios打包配置 */
"ios" : {
"dSYMs" : false,
"urltypes" : "cffpapp"
"urltypes" : "cffpapp,hbuilder"
},
/* SDK配置 */
"sdkConfigs" : {
......
......@@ -22,6 +22,13 @@
"path" : "pages/courseDetail/courseDetail",
"style" :
{
"navigationBarTitleText": "SFP",
"enablePullDownRefresh": false
}
},{
"path" : "pages/product/product",
"style" :
{
"navigationBarTitleText": "课程详情",
"enablePullDownRefresh": false
}
......@@ -439,6 +446,15 @@
}
}
,{
"path" : "pages/product/finance-calculator",
"style" :
{
"navigationBarTitleText": "pages/product/finance-calculator",
"enablePullDownRefresh": false
}
}
],
// "tabBar": {
// "color": "#7A7E83", // tab 上的文字默认颜色
......
......@@ -142,6 +142,9 @@
// let curRoute = routes[routes.length - 1].route // 获取当前页面路由,也就是最后一个打开的页面路由
// console.log('当前路由地址',curRoute)
},
mounted() {
this.queryById()
},
methods:{
erpInitialize(){
api.erpInitialize({}).then((res)=>{
......
......@@ -62,6 +62,14 @@
}
},
confirmSearch(){
if(this.queryType == null) {
uni.showToast({
title: '请选择查询类型',
duration: 2000,
icon: 'none'
})
return;
}
if(this.queryType == 2){
if(!this.userName){
uni.showToast({
......
......@@ -13,7 +13,9 @@
<view class="contentItem">
<text>手机号</text>
<!-- userTel -->
<text>{{openForm.userTel}}</text>
<text v-if="openForm.userTel == ''">{{openForm.userTel}}</text>
<input v-else class="user-input" v-model="openForm.userTel" maxlength="10" type="text"
placeholder="请输入手机号" />
</view>
<view class="contentItem">
<text>证件类型</text>
......@@ -73,7 +75,7 @@
},
openForm: {
signupId: '',
userTel: '183****9247',
userTel: uni.getStorageSync('user_mobile'),
userIdType: '1'
},
index: 0,
......@@ -97,7 +99,10 @@
userSignUpId:this.openForm.signupId
}
let res = await api.querySignUpInfo(UserSignUpInfoQueryRequestVO)
console.log(res, 74274)
this.openForm = res.data
this.openForm.userTel = res.data.userTel? res.data.userTel:uni.getStorageSync('user_mobile')
console.log(this.openForm.userTel)
this.openForm.signupId = res.data.id
},
exportTo(){
......
......@@ -5,18 +5,25 @@
<view class="iconfont icon-youjiantou" @click="goBack()">
</view>
<view class="share-entrance">
<view>
<uni-popup ref="share" type="top" safeArea backgroundColor="#fff">
<uni-popup-share @select="sharechange"></uni-popup-share>
<view style="z-index: 99999;">
<uni-popup ref="share" type="top" safeArea backgroundColor="#fff" :maskClick='true' @change="maskClick">
<uni-popup-share @select="sharechange" ></uni-popup-share>
</uni-popup>
</view>
<img @click="reinvite" src="../../static/fastentry/Slice122.png" alt="">
<img @click="shareToggle" src="../../static/fastentry/Slice12.png" alt="">
<!-- <img @click="reinvite" src="../../static/fastentry/Slice122.png" alt="">
<img @click="shareToggle" src="../../static/fastentry/Slice12.png" alt=""> -->
<view class="" style="width: 50rpx;height: 50rpx;padding-right: 20rpx;">
<image class="image" @click="reinvite" src="../../static/fastentry/Slice122.png" mode="" ></image>
</view>
<view class="" style="width: 50rpx;height: 50rpx; ">
<image class="image" @click="shareToggle" src="../../static/fastentry/Slice12.png" mode=""></image>
</view>
</view>
</view>
<!-- 课程banner图 -->
<view class="courseBannerBox">
<!-- v-show="!sliceshare" -->
<view class="courseBannerBox" v-show="!sliceshare">
<video id="myVideo" :src="courseInfo.filePathOss" :initial-time="videoPlaybackInfo.maxViewTime"
object-fit="contain" class="videoBox" :poster="courseInfo.fileFirstImage" :title="courseInfo.fileTitle"
@loadedmetadata="loadedmetadata" @play="playVideo" @pause="pause" @ended="ended"
......@@ -154,6 +161,7 @@
viewTime: 0,
timer: null,
loginType: '',
sliceshare: false,
nonRequiredCount: 0,
requiredCount: 0
};
......@@ -163,6 +171,10 @@
console.log(12121232)
uni.navigateBack(1)
},
// 监听空白关闭
maskClick(val){
this.sliceshare = val.show
},
// 打开微信分享啊
reinvite() {
this.$refs.sharewx.open()
......@@ -172,6 +184,7 @@
this.$refs.sharewx.close()
},
shareToggle() {
this.sliceshare = true
this.$refs.share.open()
},
sharechange(val){
......@@ -438,7 +451,7 @@
background-color: #ebebeb;
display: flex;
justify-content: center;
z-index: 1;
.videoBox {
max-width: 100%;
height: 100%;
......@@ -485,20 +498,20 @@
display: inline-block;
transform: rotate(180deg);
font-size: 30rpx;
// width: 50rpx;
// height: 50rpx;
z-index: 1;
}
.share-entrance{
width: 120rpx;
display: flex;
justify-content: space-between;
align-items: center;
img{
width: 40rpx;
height: 40rpx;
.image{
width: 50rpx;
height: 50rpx;
margin-top: 10rpx;
margin-right: 25rpx;
}
}
// border: 1rpx solid #999;
}
......
<template>
<view class="container">
<view class="record_wrapper">
<view class="record_wrapper" v-if="cffpFortuneDeductionList">
<view class="recordContent" v-for="(item,index) in cffpFortuneDeductionList" :key="index">
<image :src="item.deductionUrl" mode="widthFix"></image>
<view class="detail">
......@@ -15,6 +15,7 @@
</view>
</view>
</view>
<view style="text-align: center;color: #cacaca;">暂无数据!</view>
</view>
</template>
......@@ -23,7 +24,8 @@
export default{
data(){
return {
cffpFortuneDeductionList:[]
userId: uni.getStorageSync('cffp_userId'),
cffpFortuneDeductionList:[],
}
},
components:{},
......@@ -32,7 +34,7 @@
},
methods:{
findByUserIdForWithdralHis(){
api.findByUserIdForWithdralHis({userId:1}).then((res)=>{
api.findByUserIdForWithdralHis({userId:this.userId}).then((res)=>{
console.log(res)
if(res['success']){
this.cffpFortuneDeductionList = res['data']['cffpFortuneDeductionList']
......
<template>
<view class="container">
<view class="padding-top container">
<!-- tab选项 -->
<view class="tabTitle">
<text :class="{'actived': tabType===1}" @click="switchTab(1)">基本信息</text>
......@@ -36,8 +36,8 @@
<text>
<input v-if="isCross==true" v-model="dataForm.areaName" class="uni-input"
placeholder="请填写组织名称" />
<picker v-else @change="bindPChange" :value="index" :range="orgList">
<view class="uni-input">{{ orgList[index]}}</view>
<picker v-else @change="bindPChange" :value="index" :range="orgdataList">
<view class="uni-input">{{ orgdataList[index]}}</view>
</picker>
</text>
</view>
......@@ -156,6 +156,7 @@
isCross: true,
inviteLists: [],
orgList: [],
orgdataList:[],
queryorgList: [],
shareId: ''
};
......@@ -171,12 +172,17 @@
getqueryOrgList() {
let CffpAreaQueryReqVO = {
userId: this.userId,
partnerLevel: this.applyIdentity == 0 ? 'A1' : 'B1'
partnerLevel: '',
// this.applyIdentity == 0 ? 'A1' : 'B1'
}
api.queryOrgList(CffpAreaQueryReqVO).then(res => {
if (res['success']) {
this.queryorgList = res.data.cffpAreaQuerys
this.orgList = res.data.cffpAreaQuerys.map((x) => x.areaName)
this.orgList = res.data.cffpAreaQuerys
this.changeorgkey()
// this.orgList = res.data.cffpAreaQuerys.map((x) => x.areaName)
// console.log(this.orgList, 22225)
}
})
},
......@@ -188,11 +194,27 @@
},
bindPickerChange: function(e) {
this.applyIdentity = e.detail.value
this.changeorgkey()
},
changeorgkey(){
let that = this
let orgKey = that.applyIdentity == 0 ? 'B1' : 'A1'
that.orgdataList = []
for(var i=0; i< that.orgList.length; i++){
if (that.orgList[i].partnerLevel == orgKey || that.orgList[i].partnerLevel == 'All') {
return that.orgdataList.push(that.orgList[i].areaName)
}
}
// this.orgdataList = this.orgList.filter((x) => {
// if (x.partnerLevel == orgKey || x.partnerLevel == 'All') {
// return x.areaName
// }
// })
// this.orgList = this.orgdataList.map((x) => x.areaName)
},
// 发起邀请事件
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
......@@ -218,11 +240,11 @@
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
})
this.$refs.share.open()
// uni.navigateTo({
// url: '/pages/invitationRegister/invitationRegister?shareId=' + this.shareId
// })
}
uni.showToast({
title: res['message'],
......@@ -248,7 +270,8 @@
provider: "weixin",
scene: "WXSceneSession",
type: 0,
href: "https://mdev.zuihuibi.cn/cffp/?id=" + this.shareId,
href: "https://mdev.zuihuibi.cn/cffp/pages/invitationRegister/invitationRegister?shareId=" +
this.shareId,
title: "uni-app分享",
summary: "我正在使用HBuilderX开发uni-app,赶紧跟我一起来体验!",
imageUrl: "https://mdev.zuihuibi.cn/cffp/static/cffp_logo.jpg",
......@@ -264,7 +287,8 @@
provider: "weixin",
scene: "WXSceneTimeline",
type: 0,
href: "https://mdev.zuihuibi.cn/cffp/?id=" + this.shareId,
href: "https://mdev.zuihuibi.cn/cffp/pages/invitationRegister/invitationRegister?shareId=" +
this.shareId,
title: "uni-app分享",
summary: "我正在使用HBuilderX开发uni-app,赶紧跟我一起来体验!",
imageUrl: "https://mdev.zuihuibi.cn/cffp/static/cffp_logo.jpg",
......
......@@ -22,7 +22,7 @@
<i class="iconfont icon-youjiantou"></i>
</view>
</view>
</view>
</view>s
</view>
<!-- 没有报名项目 -->
<view class="noSign" v-if="signupInfos.length==0">
......@@ -58,7 +58,7 @@
tabType:1,
signupInfos:[],
userCertificates:[],
userId: uni.getStorageSync('cffp_userId')
userId: uni.getStorageSync('user_mobile')
};
},
methods:{
......@@ -81,10 +81,9 @@
userCertificateList(){
const param = {
queryType:1,
userId: uni.getStorageSync('cffp_userId')
userId: this.userId
}
api.userCertificateList(param).then(res=>{
console.log(res);
if(res['success']){
this.userCertificates = res['data']['userCertificates']
}
......
......@@ -216,7 +216,7 @@
},
// 课程详情页面
courseDetail(){
api.courseDetail({fileId:this.fileId,userId:1}).then(res=>{
api.courseDetail({fileId:this.fileId,userId:this.userId}).then(res=>{
console.log('课程详情',res);
if(res['success']){
this.courseInfoItem = res['data']['data'];
......
......@@ -36,8 +36,7 @@
return {
tabType: 1,
userStudyLists: [],
userId: '1111',
// uni.getStorageSync('cffp_userId')
userId: uni.getStorageSync('cffp_userId'),
count:'',
directList: null, //直属团队数组
raiseList: null, //所辖团队数组
......
......@@ -48,6 +48,7 @@
},
onLoad(options) {
this.optionForm = JSON.parse(options.customerBasicInfo)
console.log(this.optionForm, 7777)
},
methods: {
uploadAvatar(event) {
......@@ -59,7 +60,7 @@
// 修改个人资料接口
submitinfo() {
let UserRequestVO = {
id: 1,
id: uni.getStorageSync('cffp_userId'),
realName: this.optionForm.realName,
nickName: this.optionForm.nickName,
headPicture: this.optionForm.headPicture,
......
......@@ -68,8 +68,8 @@
},
methods:{
queryByUserIdFortuneStatistic(){
// uni.getStorageSync('cffp_userId')
api.queryByUserIdFortuneStatistic({userId:1}).then((res)=>{
api.queryByUserIdFortuneStatistic({userId:uni.getStorageSync('cffp_userId')}).then((res)=>{
console.log(res, 55454)
if(res['success']){
this.yesExchangeFortune = res['data']['yesExchangeFortune'];
this.notExchangeFortune = res['data']['notExchangeFortune'];
......
<template>
<view>
<menu-list v-if="menuList != 'undefined '" :menuList="minorMenuLists"></menu-list>
</view>
</template>
<script>
import MenuList from "@/components/menuList/menuList.vue"
export default {
components:{ MenuList },
data() {
return {
minorMenuLists: [{
title: '房贷推销计算器',
icon: 'shareEcode',
link: '',
isOpen: true,
isShow: true,
isTips: false,
},
{
title: '现金流计算器',
icon: 'card',
link: '',
isOpen: true,
isShow: true,
isTips: true,
},
{
title: '货币时间价值计算器',
icon: 'myCertify',
link: '',
isOpen: true,
isShow: true,
isTips: false,
},
{
title: '保单利率计算器',
icon: 'myCertify',
link: '',
isOpen: true,
isShow: true,
isTips: false,
},
]
}
}
}
</script>
<style>
</style>
<template>
<view class="container">
<view class="header">
<view class="" style="width: 60rpx;height: 60rpx;">
<image style="width: 60rpx;height: 60rpx;" src="../../static/tabbar/sfp_active.png" mode=""></image>
</view>
<text>SFP</text>
</view>
<view class="content-box">
<view class="content" v-for="(item,index) in remList" :key="index" style="width: 50%;justify-content: center;">
<view class="">
<view class="content-box-item" @click="gotobach(item)">
<view class="" style="width: 60rpx;height: 60rpx;text-align: center;padding-bottom: 10rpx;">
<image style="width: 60rpx;height: 60rpx;" :src="item.icon" mode=""></image>
</view>
<text>{{item.text}}</text>
</view>
</view>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
remList: [{
link:'',
icon: '../../static/SFP/Slice63.png',
text: 'SFP智能财策'
},
{
link:'',
icon: '../../static/SFP/Slice65.png',
text: '产品库'
},
{
link:'/pages/product/finance-calculator',
icon: '../../static/SFP/Slice64.png',
text: '金融计算器'
},
{
link:'',
icon: '../../static/SFP/Slice62.png',
text: '法律工具'
}
]
}
},
methods:{
gotobach(item){
if(item.link == ''){
uni.showToast({
title: '此功能暂未开放!',
duration: 2000,
icon: 'none'
});
return false
}
uni.navigateTo({
url:item.link
})
}
}
}
</script>
<style lang="scss">
.header {
display: flex;
justify-content: center;
align-items: center;
}
.content-box{
display: flex;width: 100%;flex-wrap: wrap;
margin-top: 40rpx;
}
.content {
display: flex;
.content-box-item{
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
padding: 20rpx 0;
}
}
</style>
<template>
<view class="uni-popup-share">
<view class="uni-share-title"><text class="uni-share-title-text">{{shareTitleText}}</text></view>
<view class="uni-share-content">
<view class="uni-share-content-box">
<view class="uni-share-content-item" v-for="(item,index) in bottomData" :key="index" @click.stop="select(item,index)">
<!-- <image class="uni-share-image" :src="item.icon" mode="aspectFill"></image> -->
<img class="uni-share-image" :src="item.icon" alt="">
<text class="uni-share-text">{{item.text}}</text>
<!-- <image style="width: 40rpx;height: 40rpx;" class="uni-share-image" :src="item.icon" mode=""></image> -->
<!-- <span :class="item.icon"></span> -->
<view :class="item.icon">
</view>
<view class="">
<text class="uni-share-text">{{item.text}}</text>
</view>
</view>
</view>
</view>
<!-- <image src="" mode=""></image> -->
<view class="uni-share-button-box">
<!-- <view class="uni-share-button-box">
<button class="uni-share-button" @click="close">{{cancelText}}</button>
</view>
</view> -->
</view>
</template>
......@@ -43,25 +48,25 @@
return {
bottomData: [{
text: '首页',
icon: '../../../../static/fastentry/homepage.png',
icon: 'iconfont icon-shouye',
name: 'home',
link:'/pages/index/index'
},
{
text: '搜索',
icon: '../../../../static/fastentry/search.png',
icon: 'iconfont icon-sousuo',
name: 'searh',
link:''
link:'/pages/index/index'
},
{
text: '我的',
icon: '../../../../static/fastentry/user.png',
icon: 'iconfont icon-wode',
name: 'user',
link:'/pages/personalCenter/personalCenter'
},
{
text: '消息',
icon: '../../../../static/fastentry/news.png',
icon: 'iconfont icon-xiaoxi',
name: 'news',
link:'/pages/systemMsg/system_msg'
},
......@@ -104,6 +109,7 @@
*/
close() {
if(this.beforeClose) return
this.$emit('close', false)
this.popup.close()
}
}
......
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