Skip to content

C
CFFP-HB
Commit 2e7a2bf8 by sunerhu
Options

1.修改H5 提交订单成功以后查看订单详细userId 没值问题 

2.修复退课重现问题
3.增加订单详情页面白名单
4.修改申请加盟页面一些问题
parent bcf7c42d
Showing with 144 additions and 91 deletions
components/bootpage/bootpage.vue
......@@ -14,7 +14,10 @@
<label class="radio" style="padding-right: 10rpx;">
<radio :checked="agreeFlag" @click="agreeFlag=!agreeFlag" />
</label>
<text>已阅读并同意</text><a href="#">银盾保险经纪服务协议</a><text>和</text><a href="">隐私政策</a>
<text>已阅读并同意</text>
<text class="file" @click="getFile(1)">服务协议</text>
<text>和</text>
<text class="file" @click="getFile(2)">隐私政策</text>
</view>
<view class="footer" @click="login()">
<text style="line-height: 80rpx;">登录</text>
......@@ -47,6 +50,11 @@
console.log(this.orderId, 222)
},
methods: {
getFile(type){
uni.navigateTo({
url:`/components/clause/clause?type=${type}`
})
},
sendMessage(){
const params = {
mobileNo:this.mobile,
......@@ -150,7 +158,10 @@
border-bottom: 2rpx solid #CECECE;
padding: 20rpx;
}
.file{
color: #20279B;
text-decoration: none;
}
.agree {
font-size: 28rpx;
color: #666;
......
components/courseItem/courseItem.vue
......@@ -103,6 +103,7 @@
<style lang="scss">
.itemContent {
display: flex;
height: auto;
.thumbnailBox {
width: 300rpx;
margin-right: 26rpx;
......@@ -119,15 +120,14 @@
.title {
display: flex;
width: 380rpx;
max-width: 260rpx;
justify-content: space-between;
align-items: center;
font-size: 36rpx;
font-size: 32rpx;
.detailBtn {
font-size: 24rpx;
color: #4A4A4A;
white-space: nowrap;
}
}
......
pages/application-process/basic-info.vue
......@@ -60,8 +60,9 @@
</view>
<view class="contentItem">
<text>姓名</text>
<!-- @blur="checkInput(1,applyParam.name)" -->
<input type="text" class="form-control" v-model="applyParam.name" placeholder="请输入姓名"
auto-blur=true @blur="checkInput(1,applyParam.name)" :disabled="this.display" />
auto-blur=true :disabled="this.display" />
</view>
<view class="contentItem">
<text>手机号</text>
......@@ -252,16 +253,16 @@
console.log(this.applyParam.areaId)
},
checkInput(type, code) {
if (type == 1) {
if (code && !common.nameValid(code)) {
uni.showToast({
title: '请输入真实的姓名!',
duration: 2000,
icon: 'none'
})
return;
}
}
// if (type == 1) {
// if (code && !common.nameValid(code)) {
// uni.showToast({
// title: '请输入真实的姓名!',
// duration: 2000,
// icon: 'none'
// })
// return;
// }
// }
if (type == 2) {
if (code && !common.mobileNoValid(code)) {
uni.showToast({
......@@ -435,4 +436,7 @@
<style lang="scss">
@import 'applyCommon.scss';
.form-control{
min-width: 200rpx;
}
</style>
pages/application-process/education.vue
......@@ -110,6 +110,8 @@
this.queryById(null, uni.getStorageSync('cffp_userId'))
}
})
// 移除监听事件
uni.$off('ckqueryById');
},
methods:{
educationLevelQuery(){
......@@ -122,7 +124,7 @@
},
queryById(id,userId){
api.queryById({id:id,userId:userId}).then((res)=>{
console.log(res)
console.log(res, 111)
if(res['success']){
this.applyParam = res['data']['data'];
for(let i=0;i<this.educationLevelList.length;i++){
......@@ -181,6 +183,8 @@
// url:`bank-card?id=${res['data']['id']}`
url:`bank-card`
});
// 发送广播
uni.$emit("ckqueryById",true);
}else{
uni.showToast({
title: res['message'],
......
pages/application-process/id-card.vue
......@@ -28,12 +28,11 @@
<view class="content_wrapper">
<view class="photo" v-if="!applyParam.idFrontPageOssPath" @click="upLoadPhoto('front')">
<image src="../../static/front.png" alt="身份证正面" mode="widthFix"></image>
<text class="iconfont icon-weibiaoti553" ></text>
<view class="choseBtn" >点击添加身份证正面</view>
<text class="iconfont icon-weibiaoti553"></text>
<view class="choseBtn">点击添加身份证正面</view>
</view>
<view class="content_w" v-if="applyParam.idFrontPageOssPath">
<image :src="applyParam.idFrontPageOssPath"
@click="upLoadPhoto('front')"></image>
<image :src="applyParam.idFrontPageOssPath" @click="upLoadPhoto('front')"></image>
</view>
<view class="tips">
<view>（正确示例：身份证正面，字体清晰）</view>
......@@ -43,12 +42,11 @@
<view class="content_wrapper" style="margin-top: 25px;">
<view class="photo" v-if="!applyParam.idBackPageOssPath" @click="upLoadPhoto('back')">
<image src="../../static/back.png" alt="身份证反面" mode="widthFix"></image>
<text class="iconfont icon-weibiaoti553" ></text>
<view class="choseBtn" >点击添加身份证反面</view>
<text class="iconfont icon-weibiaoti553"></text>
<view class="choseBtn">点击添加身份证反面</view>
</view>
<view class="content_w" v-if="applyParam.idBackPageOssPath">
<image :src="applyParam.idBackPageOssPath"
@click="upLoadPhoto('back')"></image>
<image :src="applyParam.idBackPageOssPath" @click="upLoadPhoto('back')"></image>
</view>
<view class="tips">
<view>（正确示例：身份证反面，字体清晰）</view>
......@@ -64,18 +62,20 @@
</template>
<script>
import { CommonUpload } from '@/util/uploaderFile';
import {
CommonUpload
} from '@/util/uploaderFile';
import api from '../../api/api';
export default{
data(){
export default {
data() {
return {
applyParam:{
idFrontPageOssPath:'',
idBackPageOssPath:'',
approvalStatus:''
applyParam: {
idFrontPageOssPath: '',
idBackPageOssPath: '',
approvalStatus: ''
},
shareId:null,
dataForm:{
shareId: null,
dataForm: {
loginId: uni.getStorageSync('cffp_userId'),
targetType: "5",
targetId: '',
......@@ -86,52 +86,62 @@
},
}
},
components:{},
onLoad(options){
components: {},
onLoad(options) {
console.log(options, 111111)
// this.shareId = options.shareId
if(uni.getStorageSync('applyId')){
this.queryById(uni.getStorageSync('applyId'),null)
}else if(options.shareId){
this.queryById(options.shareId,null)
}else{
this.queryById(null,uni.getStorageSync('cffp_userId'))
if (uni.getStorageSync('applyId')) {
this.queryById(uni.getStorageSync('applyId'), null)
} else if (options.shareId) {
this.queryById(options.shareId, null)
} else {
this.queryById(null, uni.getStorageSync('cffp_userId'))
}
},
onShow() {
uni.$on("ckqueryById", res => {
console.log('‘第三步接受广播进行刷新')
if (res == true) {
this.queryById(null, uni.getStorageSync('cffp_userId'))
}
})
uni.$off('ckqueryById');
},
methods:{
queryById(id,userId){
api.queryById({id:id,userId:userId}).then((res)=>{
methods: {
queryById(id, userId) {
api.queryById({
id: id,
userId: userId
}).then((res) => {
console.log(res)
if(res['success']){
if (res['success']) {
this.applyParam = res['data']['data'];
}
})
},
upLoadPhoto(type){
if(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2){
if(type == 'front'){
upLoadPhoto(type) {
if (this.applyParam.approvalStatus == 0 || this.applyParam.approvalStatus == 2) {
if (type == 'front') {
this.dataForm.targetNo = 2;
}
if(type == 'back'){
if (type == 'back') {
this.dataForm.targetNo = 3;
}
this.dataForm.targetId = this.applyParam.id
CommonUpload(this.dataForm).then(res => {
if(type == 'front'){
if (type == 'front') {
this.applyParam.idFrontPageOssPath = res.data.filePath;
}
if(type == 'back'){
if (type == 'back') {
this.applyParam.idBackPageOssPath = res.data.filePath;
}
console.log(this.applyParam.idBackPageOssPath, 151515)
})
}
},
saveInfo(){
if(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2){
if(!this.applyParam.idFrontPageOssPath){
saveInfo() {
if (this.applyParam.approvalStatus == 0 || this.applyParam.approvalStatus == 2) {
if (!this.applyParam.idFrontPageOssPath) {
uni.showToast({
title: '请上传身份证正面照片',
duration: 2000,
......@@ -139,7 +149,7 @@
})
return;
}
if(!this.applyParam.idBackPageOssPath){
if (!this.applyParam.idBackPageOssPath) {
uni.showToast({
title: '请上传身份证反面照片',
duration: 2000,
......@@ -149,16 +159,16 @@
}
this.applyParam = {
...this.applyParam,
operatStep:3,
operatStep: 3,
}
api.saveApplyInfo(this.applyParam).then((res)=>{
if(res['success']){
api.saveApplyInfo(this.applyParam).then((res) => {
if (res['success']) {
uni.navigateTo({
// url:`id-card?id=${res['data']['id']}`
url:`education`
url: `education`
});
uni.$emit("ckqueryById",true);
}else{
uni.$emit("ckqueryById", true);
} else {
uni.showToast({
title: res['message'],
duration: 2000,
......@@ -167,10 +177,10 @@
return;
}
})
}else{
} else {
uni.navigateTo({
// url:`id-card?id=${res['data']['id']}`
url:`education`
url: `education`
});
}
}
......@@ -180,13 +190,15 @@
<style lang="scss">
@import 'applyCommon.scss';
.content_wrapper{
.content_wrapper {
display: flex;
justify-content: center;
flex-wrap: wrap;
margin-top: 10px;
overflow: hidden;
.photo{
.photo {
text-align: center;
border: 1px #8D8D8D dashed;
border-radius: 4px;
......@@ -197,28 +209,31 @@
font-size: 12px;
color: #333;
width: 75%;
background-size:contain;
background-size: contain;
background-repeat: no-repeat;
position: relative;
.icon-weibiaoti553{
.icon-weibiaoti553 {
position: absolute;
}
.choseBtn{
.choseBtn {
position: absolute;
font-size: 13px;
bottom: 19%;
}
}
}
.content_w{
.content_w {
height: 380rpx;
width: 76%;
margin: auto;
padding-bottom: 20rpx;
}
.content_w image {
width: 100%;
height: 100%;
}
</style>
pages/application-process/signature.vue
......@@ -57,6 +57,7 @@
},
components:{eSignature},
onLoad(options) {
console.log(options, 151515)
this.shareId = options.shareId
},
onShow() {
......@@ -129,6 +130,8 @@
fail: () => {},
complete: () => {}
});
// 发送广播
uni.$emit("ckqueryById",true);
}else{
uni.showToast({
title: res['message'],
......
pages/courseDetail/courseDetail.vue
......@@ -333,6 +333,7 @@
userId: uni.getStorageSync('cffp_userId'),
packFileId: this.courseInfo.packFileId
}).then(res => {
console.log(res, 1011111111)
if (res['success']) {
this.courseInfo = res['data']['data'];
this.lecturerId = res['data']['data']['fileLecturerId'];
......
pages/myPoints/pointsDetail.vue
......@@ -8,7 +8,7 @@
<text class="iconfont icon-youjiantou"></text>
</view>
</picker>
<picker mode="date" :value="fortuneDate" :end="maxDate" fields="month" @change="bindDateChange">
<picker mode="date" :value="fortuneDate" :end="maxDate" :fields="fields" @change="bindDateChange">
<view class="uni-input">{{fortuneDate}}
<text class="iconfont icon-youjiantou"></text>
</view>
......@@ -61,6 +61,7 @@
commissionTypeIdx:0,
productType: null,
productTypeIdx:0,
fields:'Day',
cffpFortuneDateList:[],
maxDate:`${new Date().getFullYear()}-${new Date().getMonth() + 1}`,
commissionTypeList:[{dropOptionName:null,dropOptionCode:null}],
......@@ -74,7 +75,15 @@
this.productType = options.productType;
this.timeFlag = options.timeFlag;
this.commissionType = options.commissionType;
if(this.timeFlag == 'D' || this.timeFlag == 'Y'){
if(this.timeFlag == 'Y'){
this.fortuneDate = `${new Date().getFullYear()}`
this.fields = 'year'
}
if(this.timeFlag == 'M'){
this.fortuneDate = `${new Date().getFullYear()}-${new Date().getMonth() + 1}`
this.fields = 'month'
}
if(this.timeFlag == 'D'){
this.fortuneDate = `${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}`
}
this.getCommissionType();
......
pages/orderConfirm/orderConfirm.vue
......@@ -222,7 +222,6 @@
//deviceType:PC为1,移动端为2,微信为3
if(this.deviceType == 3){
//微信h5支付
console.log(this.$queue)
uni.login({
provider: 'weixin',
success: function (loginRes) {
......@@ -262,21 +261,20 @@
provider: 'alipay',
orderInfo: aliOrderString,
success: function (resp) {
console.log('success:' + JSON.stringify(resp));
uni.navigateTo({
url:`/pages/orderStatus/orderStatus?orderId=${_this.orderId}&fileId=${_this.fileId}&orderStatus=2`
url:`/pages/orderStatus/orderStatus?orderId=${_this.orderId}&fileId=${_this.fileId}&orderStatus=2&userId=${_this.userId}`
})
},
fail: function (err) {
console.log('fail:' + JSON.stringify(err));
uni.navigateTo({
url:`/pages/orderStatus/orderStatus?orderId=${_this.orderId}&fileId=${_this.fileId}&orderStatus=1`
url:`/pages/orderStatus/orderStatus?orderId=${_this.orderId}&fileId=${_this.fileId}&orderStatus=1&userId=${_this.userId}`
})
}
});
}else{
uni.navigateTo({
url:`/pages/orderStatus/orderStatus?orderId=${this.orderId}&fileId=${this.fileId}&orderStatus=2`
url:`/pages/orderStatus/orderStatus?orderId=${this.orderId}&fileId=${this.fileId}&orderStatus=2&userId=${this.userId}`
})
}
......@@ -301,8 +299,9 @@
this.amount = this.totalPrice;
if(this.deviceType == 3){
this.tipsFlag = true;
this.amount = this.totalPrice;
this.paymentBtnDisabled = false;
let url = window.location.href + `&isRedirect=1&amount=${this.amount}&jumptime=${new Date()}&isDeduction=${this.isDeduction}&deductionCore=${this.deductionCore}`;
let url = window.location.href + `&isRedirect=1&amount=${this.amount}&jumptime=${new Date()}&isDeduction=${this.isDeduction}&deductionCore=${this.deductionCore}&userId=${this.userId}`;
window.history.replaceState(null, '',url);
return;
}
......
pages/orderDetail/orderDetail.vue
......@@ -80,9 +80,10 @@
}
},
onLoad(option) {
console.log(option, 15215)
if(option.userId){
this.userId = option.userId
};
this.orderId = option.id;
console.log(this.orderId, 2222)
this.type = option.type;
this.Withdrawal = option.Withdrawal
this.commissionType = option.commissionType;
......@@ -91,6 +92,7 @@
this.userCourseInfo();
uni.$on("radiobroadcast", res => {
this.type = res.type;
this.Withdrawal = null
// 清除监听
uni.$off('radiobroadcast');
})
......
pages/orderStatus/orderStatus.vue
......@@ -19,7 +19,7 @@
<view class="course_content">
<view class="tag">
<h4>精品课程</h4>
<view @click="goToCourselist()">更多<text class="iconfont icon-youjiantou"></text></view>
<view v-if="this.userId != ''" @click="goToCourselist()">更多<text class="iconfont icon-youjiantou"></text></view>
</view>
<courselist :tagIds="[1111]" :onlyShowList="0"></courselist>
</view>
......@@ -36,14 +36,15 @@
return {
fileId:'',
orderId:'',
orderStatus:'2'
orderStatus:'2',
userId:''
};
},
methods:{
viewDetail(){
// 查看详情
uni.navigateTo({
url:`/pages/orderDetail/orderDetail?id=${this.orderId}&type=drop`
url:`/pages/orderDetail/orderDetail?id=${this.orderId}&type=drop&userId=${this.userId}`
})
},
goToCourselist(){
......@@ -65,10 +66,13 @@
}
},
onLoad(options) {
if(options.userId != "undefined"){
this.userId = options.userId;
uni.setStorageSync('cffp_userId', this.userId)
};
this.orderId = options.orderId;
this.orderStatus = options.orderStatus;
this.fileId = options.fileId;
console.log(options)
}
}
</script>
......
util/request.ts
......@@ -4,9 +4,9 @@ import {interceptor} from "./interceptor";
export default (url:string, method:any, params?:any) => {
interceptor();
return new Promise((resolve, reject) => {
// uni.showLoading({
// title: '加载中...'
// });
uni.showLoading({
title: '加载中...'
});
uni.request({
url: url,
method: method,
......@@ -20,7 +20,7 @@ export default (url:string, method:any, params?:any) => {
reject(err);
},
complete() {
// uni.hideLoading();
uni.hideLoading();
}
});
});
......
util/router.js
......@@ -3,7 +3,8 @@
const whiteList = [
'/components/login/login',
'/pages/invitationRegister/invitationlogin',
'/components/clause/clause'
'/components/clause/clause',
'/pages/orderDetail/orderDetail'
]
export default function initApp(){
uni.addInterceptor('navigateTo', {
......
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