Skip to content

C
CFFP-HB
Commit c69fffff by sunerhu
Options

1.修复H5 页面签名时晃动问题 

2.修复视频不能全屏问题
3.修复申请加盟进入第一步不加载接口问题
4.修复上传图片不成功问题。
parent ee9cb564
Showing with 23 additions and 15 deletions
pages/application-process/basic-info.vue
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
// } // }
}, },
mounted() { onShow() {
if (this.shareId) { if (this.shareId) {
this.queryById(this.shareId, null) this.queryById(this.shareId, null)
} else if (uni.getStorageSync('applyId')) { } else if (uni.getStorageSync('applyId')) {
...@@ -212,13 +212,14 @@ ...@@ -212,13 +212,14 @@
}, },
queryOrgList() { queryOrgList() {
const param = { const param = {
userId:uni.getStorageSync('H5_cffpUserId') ? uni.getStorageSync('H5_cffpUserId') :this.userId, userId:this.userId,
partnerLevel: this.applyParam.partnerLevel partnerLevel: this.applyParam.partnerLevel
} }
console.log(param) console.log(param)
api.queryOrgList(param).then((res) => { api.queryOrgList(param).then((res) => {
console.log(res) console.log(res)
if (res['success']) { if (res['success']) {
this.cffpAreaQuerys = []
this.cffpAreaQuerys = this.cffpAreaQuerys.concat(res['data']['cffpAreaQuerys']) this.cffpAreaQuerys = this.cffpAreaQuerys.concat(res['data']['cffpAreaQuerys'])
for (let j = 0; j < this.cffpAreaQuerys.length; j++) { for (let j = 0; j < this.cffpAreaQuerys.length; j++) {
if (this.applyParam.areaId == this.cffpAreaQuerys[j].areaId) { if (this.applyParam.areaId == this.cffpAreaQuerys[j].areaId) {
...@@ -396,7 +397,7 @@ ...@@ -396,7 +397,7 @@
...this.applyParam, ...this.applyParam,
applyType: this.applyParam.inviterInvitationCode? '1': '2', applyType: this.applyParam.inviterInvitationCode? '1': '2',
operatStep: 1, operatStep: 1,
userId:uni.getStorageSync('H5_cffpUserId') ? uni.getStorageSync('H5_cffpUserId') : this.userId, userId:this.userId,
hasCrossDistrict: this.applyParam.hasCrossDistrict?this.applyParam.hasCrossDistrict: '0' hasCrossDistrict: this.applyParam.hasCrossDistrict?this.applyParam.hasCrossDistrict: '0'
} }
api.saveApplyInfo(this.applyParam).then((res) => { api.saveApplyInfo(this.applyParam).then((res) => {
......
pages/application-process/contract.vue
...@@ -129,6 +129,7 @@ ...@@ -129,6 +129,7 @@
}, },
readContract(contractItem) { readContract(contractItem) {
console.log(contractItem, 1515)
if(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2){ if(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2){
if (contractItem.confirmStatus == 1) { if (contractItem.confirmStatus == 1) {
contractItem.confirmStatus = 0; contractItem.confirmStatus = 0;
...@@ -178,7 +179,7 @@ ...@@ -178,7 +179,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
@import 'applyCommon.scss'; @import 'applyCommon.scss';
.container { .container {
background-color: #FBFBFB; background-color: #FBFBFB;
...@@ -219,6 +220,7 @@ ...@@ -219,6 +220,7 @@
.contract{ .contract{
overflow: hidden; overflow: hidden;
padding: 10px; padding: 10px;
font-size: 20rpx;
} }
.agree{ .agree{
width: 100%; width: 100%;
......
pages/application-process/signature.vue
<template class="sign"> <template class="sign">
<view class="container" style="margin-bottom: 0;"> <view class="container" style="margin-bottom: 0;" >
<view class="page"> <view class="page">
<text class="num actived pass">1</text> <text class="num actived pass">1</text>
<text class="line line_pass"></text> <text class="line line_pass"></text>
...@@ -64,17 +64,22 @@ ...@@ -64,17 +64,22 @@
}else{ }else{
this.queryById(null,uni.getStorageSync('cffp_userId')) this.queryById(null,uni.getStorageSync('cffp_userId'))
} }
// this.norebound() },
mounted() {
this.norebound()
}, },
methods: { methods: {
// 禁止微信浏览器回弹效果 // 禁止微信浏览器回弹效果
// norebound(){ norebound(){
// // #ifdef H5 // #ifdef H5
// document.body.addEventListener("touchmove",function(e) // document.body.addEventListener("touchmove",function(e)
// e.preventDefault(); // e.preventDefault();
// ,passive:false) // ,passive:false)
// // #endif document.body.addEventListener('touchmove', function(e) {
// }, e.preventDefault()
}, { passive: false })
// #endif
},
save(){ save(){
if(this.applyParam.personalSignOssPath){ if(this.applyParam.personalSignOssPath){
this.saveApplyInfo(); this.saveApplyInfo();
......
pages/courseDetail/courseDetail.vue
...@@ -558,7 +558,7 @@ ...@@ -558,7 +558,7 @@
padding: 0; padding: 0;
} }
.courseBannerBox { .courseBannerBox {
min-height: 320rpx; // min-height: 300rpx;
// margin-top: 20rpx; // margin-top: 20rpx;
background-color: #ebebeb; background-color: #ebebeb;
display: flex; display: flex;
...@@ -569,6 +569,7 @@ ...@@ -569,6 +569,7 @@
width: 100vw; width: 100vw;
// width: 100%; // width: 100%;
// max-width: 100%; // max-width: 100%;
min-height: 320rpx;
height: 100%; height: 100%;
} }
} }
......
pages/invitationRegister/invitationlogin.vue
...@@ -122,7 +122,8 @@ ...@@ -122,7 +122,8 @@
console.log(res, 5454) console.log(res, 5454)
this.userId = String(res['data']['userId']); this.userId = String(res['data']['userId']);
uni.setStorageSync('isLogin','1') uni.setStorageSync('isLogin','1')
uni.setStorageSync('H5_cffpUserId', this.userId) uni.setStorageSync('cffp_userId', this.userId)
// uni.setStorageSync('H5_cffpUserId', this.userId)
uni.navigateTo({ uni.navigateTo({
url:'/pages/application-process/basic-info?userId=' + this.userId + '&shareId=' + this.form.id url:'/pages/application-process/basic-info?userId=' + this.userId + '&shareId=' + this.form.id
}) })
......
pages/personalCenter/system/settings.vue
...@@ -55,10 +55,10 @@ import MenuList from "@/components/menuList/menuList.vue" ...@@ -55,10 +55,10 @@ import MenuList from "@/components/menuList/menuList.vue"
showCancel: true, showCancel: true,
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
uni.clearStorageSync();
uni.reLaunch({ uni.reLaunch({
url:'/components/login/login' url:'/components/login/login'
}) })
uni.clearStorageSync();
uni.showToast({ uni.showToast({
title: '操作成功', title: '操作成功',
icon: 'none' icon: 'none'
......
util/uploaderFile.ts
...@@ -97,8 +97,6 @@ export function uploadFilepdf(params) { ...@@ -97,8 +97,6 @@ export function uploadFilepdf(params) {
}, },
success: (res) => { success: (res) => {
console.log(res, 54854) console.log(res, 54854)
// let data = JSON.parse(res.data)
// that.headUrl = data.data.link
let data = JSON.parse(res.data) let data = JSON.parse(res.data)
if(data.success == true){ if(data.success == true){
data.name = name data.name = name
......
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