Skip to content

C
CFFP-HB
Commit 42971a52 by sunerhu
Options

1.修复积分订单详情传参错误 

2.修复H5 分享课程登录页面userId 传参错误
3.修改 我的团队页面样式
parent 8c58a3eb
Showing with 88 additions and 60 deletions
components/listItem/listItem.vue
...@@ -12,12 +12,11 @@ ...@@ -12,12 +12,11 @@
<text v-if=" subItem.readCount > 0">{{subItem.value}}</text> <text v-if=" subItem.readCount > 0">{{subItem.value}}</text>
<text v-else> - </text> <text v-else> - </text>
</view> </view>
<view class="" v-else-if="subItem.value == '购买明细'" <view class="" v-else-if="subItem.value == '购买明细'">
@click="link(subItem.name,subItem.buyCount,listItem)">
<text v-if=" subItem.buyCount > 0">{{subItem.value}}</text> <text v-if=" subItem.buyCount > 0">{{subItem.value}}</text>
<text v-else> - </text> <text v-else> - </text>
</view> </view>
<view v-else class="" @click="link(subItem.name,1,listItem)"> <view v-else class="">
<text <text
:style="{borderColor:subItem.link ? '#2D56A7' : 'transparent'}">{{subItem.value}}</text> :style="{borderColor:subItem.link ? '#2D56A7' : 'transparent'}">{{subItem.value}}</text>
</view> </view>
......
components/myteam/lazy-tree.vue
<template> <template>
<view class="container"> <view class="container">
<view class="d-table"> <view class="d-table">
<view class="content-box"> <!-- <view class="d-box">
<view class="content-box-title" v-for="item in datatitleList"> <view class="d-td" v-for="item in datatitleList">
<span class="">{{item}}</span> <span class="">{{item}}</span>
</view> </view>
</view> </view> -->
<view class="d-tr"> <view class="d-tr">
<!-- <view class="d-th">姓名</view> <!-- <view class="d-th">姓名</view>
<view class="d-th">年龄</view> <view class="d-th">年龄</view>
...@@ -18,50 +18,47 @@ ...@@ -18,50 +18,47 @@
<!-- :class="`padding-left-${item.level * 5 + 10}`"--> <!-- :class="`padding-left-${item.level * 5 + 10}`"-->
<view class="d-td"> <view class="d-td">
<view class="" style="display: flex;"> <view class="" style="display: flex;">
<view class=""> <!-- <view class="">
<uni-icons v-if="item.hasChildren && !treeList[0]" <uni-icons v-if="item.hasChildren && !treeList[0]"
:type="checkLazy(item.id) ? 'spinner-cycle' : !checkOpen(item.id) ? 'arrowright' : 'arrowdown'" :type="checkLazy(item.id) ? 'spinner-cycle' : !checkOpen(item.id) ? 'arrowright' : 'arrowdown'"
size="12"></uni-icons> size="12"></uni-icons>
</view>
<!-- r -->
<!-- item.levelCode==A1 与 item.type == 2相关项-->
<!-- c3与type1 -->
<!-- B1与type1 -->
<!-- else -->
<!-- <view @click="open(item, i)" v-if="item.level && !item.hasChildren" style="width: 24rpx;height: 26rpx;display: inline-block;"></view> -->
<!-- <view @click="open(item, i)" :class="item.levelCode == 'B1'&& item.type ==1 ? 'content-box-title-a' : item.levelCode == 'C3' ? 'content-box-title-b':'content-box-title'">
</view> --> </view> -->
<!-- :class="`padding-left-${item.level * 5 + 10}`" --> <view class="d-td" v-if="item.levelCode == 'B1'&& item.itemType == '1'"
<!-- --> @click="open(item, i)" :style="{'margin-left':(item.level * 20)+'rpx'}">
<view class="content-box-title-a" v-if="item.levelCode == 'B1'&& item.itemType == '1'" @click="open(item, i)" :style="{'margin-left':(item.level * 20)+'rpx'}"> <view class="" style="display: flex;">
<!-- <text style="color: black;">{{item.areaCenterName}}</text> -->
<view class="" style="display: flex;align-items: center;">
<text>{{item.areaCenterName}}</text> <text>{{item.areaCenterName}}</text>
<view class="" style="width: 36rpx;height: 36rpx; margin-left: 10rpx;"> <view class="" style="width: 36rpx;height: 36rpx;margin-left: 5rpx; ">
<image style="width: 36rpx;height: 36rpx;" src="../../static/Group1665.png" mode=""></image> <image style="width: 36rpx;height: 36rpx;" src="../../static/Group1665.png"
mode=""></image>
</view> </view>
</view> </view>
</view> </view>
<view class="content-box-title-a" @click="open(item, i)" v-else-if="item.levelCode == 'C3'&& item.itemType == '1'" :style="{'margin-left':(item.level * 20)+'rpx'}"> <view class="d-td" @click="open(item, i)"
v-else-if="item.levelCode == 'C3'&& item.itemType == '1'"
:style="{'margin-left':(item.level * 20)+'rpx'}">
<!-- <text style="color: #FFFFFF;">{{item.areaCenterName}}</text> --> <!-- <text style="color: #FFFFFF;">{{item.areaCenterName}}</text> -->
<view class="" style="display: flex;align-items: center;"> <view class="" style="display: flex;">
<text>{{item.areaCenterName}}</text> <text>{{item.areaCenterName}}</text>
<view class="" style="width: 36rpx;height: 36rpx; margin-left: 10rpx;"> <view class="" style="width: 36rpx;height: 36rpx;margin-left: 5rpx; ">
<image style="width: 36rpx;height: 36rpx;" src="../../static/Group1665.png" mode=""></image> <image style="width: 36rpx;height: 36rpx;" src="../../static/Group1665.png"
mode=""></image>
</view> </view>
</view> </view>
</view> </view>
<view class="content-box-title-a" @click="open(item, i)" v-else-if="item.levelCode == 'C2'&& item.itemType == '1'" :style="{'margin-left':(item.level * 20)+'rpx'}"> <view class="d-td" @click="open(item, i)"
v-else-if="item.levelCode == 'C2'&& item.itemType == '1'"
:style="{'margin-left':(item.level * 20)+'rpx'}">
<!-- <text style="color: #FFFFFF;">{{item.areaCenterName}}</text> --> <!-- <text style="color: #FFFFFF;">{{item.areaCenterName}}</text> -->
<view class="" style="display: flex;align-items: center;"> <view class="" style="display: flex;">
<text>{{item.areaCenterName}}</text> <text>{{item.areaCenterName}}</text>
<view class="" style="width: 36rpx;height: 36rpx; margin-left: 10rpx;"> <view class="" style="width: 36rpx;height: 36rpx;margin-left: 5rpx;">
<image style="width: 36rpx;height: 36rpx;" src="../../static/Group1665.png" mode=""></image> <image style="width: 36rpx;height: 36rpx;" src="../../static/Group1665.png"
mode=""></image>
</view> </view>
</view> </view>
</view> </view>
<view class="" @click="open(item, i)" style="flex: 1;" v-else> <view class="d-td" @click="open(item, i)" v-else :style="{'margin-left':(item.level * 20)+'rpx'}">
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
<!-- <view class="content-box-title-a" @click="open(item, i)" :style="{'margin-left':(item.level * 20)+'rpx'}"> <!-- <view class="content-box-title-a" @click="open(item, i)" :style="{'margin-left':(item.level * 20)+'rpx'}">
...@@ -82,11 +79,11 @@ ...@@ -82,11 +79,11 @@
<!-- </view> --> <!-- </view> -->
</view> </view>
<view class="d-td" > <view class="d-td" style="text-align: center;">
<text v-if="item.itemType == '2'">{{ item.levelName }}</text> <text v-if="item.itemType == '2'">{{ item.levelName }}</text>
<text v-else></text> <text v-else></text>
</view> </view>
<view class="d-td" style="padding-right: 10rpx;">{{ item.count }}</view> <view class="d-td" style="text-align: center;">{{ item.count }}</view>
</view> </view>
</block> </block>
</view> </view>
...@@ -131,7 +128,7 @@ ...@@ -131,7 +128,7 @@
computed: {}, computed: {},
data() { data() {
return { return {
pleft:'60rpx', pleft: '60rpx',
list: [], list: [],
openList: [], // 被展开数组 openList: [], // 被展开数组
lazyList: [], // 加载数组 lazyList: [], // 加载数组
...@@ -223,7 +220,7 @@ ...@@ -223,7 +220,7 @@
this.openList = list; this.openList = list;
}, },
async open(item, index) { async open(item, index) {
if(item.itemType == '2'){ if (item.itemType == '2') {
return false return false
} }
try { try {
...@@ -357,24 +354,40 @@ ...@@ -357,24 +354,40 @@
display: flex; display: flex;
font-weight: 600; font-weight: 600;
align-items: center; align-items: center;
// padding: 0 20rpx;
justify-content: space-between; justify-content: space-between;
} }
.content-box-title { .content-box-title {
// padding: 5px 0; // padding: 5px 0;
flex: 1; flex: 1;
// justify-content: space-between;
align-items: center;
text-align: left;
padding: 0 20rpx;
}
.d-box {
display: flex;
justify-content: space-between; justify-content: space-between;
// padding: 0 20rpx;
font-size: 26rpx;
.d-td {
align-items: center; align-items: center;
text-align: center; padding: 5rpx 10rpx;
}
} }
.content-box-title-a { .content-box-title-a {
flex: 1; // flex: 1;
// padding: 0 20rpx;
font-size: 26rpx; font-size: 26rpx;
max-width: 246rpx; max-width: 246rpx;
min-height: 60rpx; min-height: 60rpx;
margin-top: 5rpx; margin-top: 5rpx;
line-height: 50rpx; line-height: 50rpx;
} }
.test { .test {
position: relative; position: relative;
width: 160rpx; width: 160rpx;
...@@ -414,24 +427,7 @@ ...@@ -414,24 +427,7 @@
border-bottom-color: transparent; border-bottom-color: transparent;
} }
} }
.d-box {
display: flex;
justify-content: space-between;
.d-header {
text-align: center;
font-size: 26rpx;
}
.d-td {
flex: 1;
font-size: 26rpx;
min-height: 60rpx;
margin-top: 5rpx;
line-height: 60rpx;
// padding: 10rpx 0;
}
}
.d-tr { .d-tr {
display: flex; display: flex;
......
pages/courseDetail/courseDetail.vue
...@@ -181,7 +181,6 @@ ...@@ -181,7 +181,6 @@
this.userId = val this.userId = val
// uni.setStorageSync('cffp_userId', this.userId); // uni.setStorageSync('cffp_userId', this.userId);
localStorage.setItem('h5_userId', this.userId) localStorage.setItem('h5_userId', this.userId)
this.coursesharing = null
this.getuserRead(1) this.getuserRead(1)
} else { } else {
this.sharelogin = false this.sharelogin = false
......
pages/myPoints/pointsDetail.vue
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
// 查看订单详情 // 查看订单详情
viewDetail(id){ viewDetail(id){
uni.navigateTo({ uni.navigateTo({
url:`/pages/orderDetail/orderDetail?id=${id}&commissionType=${this.commissionType}` url:`/pages/orderDetail/orderDetail?id=${id}&commissionType=${this.commissionType}&type=drop`
}) })
} }
} }
......
pages/orderConfirm/orderConfirm.vue
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
orderId:this.orderId, orderId:this.orderId,
amount:this.totalPrice, amount:this.totalPrice,
paymentMethod:this.paymentMethod, paymentMethod:this.paymentMethod,
userId:this.userId, userId:localStorage.getItem('h5_userId')?localStorage.getItem('h5_userId'):this.userId,
integralExchange:this.isDeduction ? parseFloat(this.deductionCore) : 0, integralExchange:this.isDeduction ? parseFloat(this.deductionCore) : 0,
paymentType:'' paymentType:''
} }
...@@ -260,10 +260,11 @@ ...@@ -260,10 +260,11 @@
//支付宝h5支付 //支付宝h5支付
param.paymentType = 2; param.paymentType = 2;
this.amount = this.totalPrice; this.amount = this.totalPrice;
let userId = localStorage.getItem('h5_userId')?localStorage.getItem('h5_userId'):this.userId
if(this.deviceType == 3){ if(this.deviceType == 3){
this.tipsFlag = true; this.tipsFlag = true;
this.paymentBtnDisabled = false; this.paymentBtnDisabled = false;
let url = window.location.href + `&isRedirect=1&userId=${this.userId}&amount=${this.amount}`; let url = window.location.href + `&isRedirect=1&userId=${userId}&amount=${this.amount}`;
window.history.replaceState(null, '',url); window.history.replaceState(null, '',url);
return; return;
} }
...@@ -295,7 +296,8 @@ ...@@ -295,7 +296,8 @@
}, },
// 积分查询 // 积分查询
queryByUserIdFortuneStatistic(){ queryByUserIdFortuneStatistic(){
api.queryByUserIdFortuneStatistic({userId:this.userId}).then(res=>{ let userId = localStorage.getItem('h5_userId') ? localStorage.getItem('h5_userId') : this.userId
api.queryByUserIdFortuneStatistic({userId:userId}).then(res=>{
if(res['success']){ if(res['success']){
this.intergralInfo = res['data']; this.intergralInfo = res['data'];
this.intergralInfo.preFortune = 1.0; this.intergralInfo.preFortune = 1.0;
...@@ -304,7 +306,8 @@ ...@@ -304,7 +306,8 @@
}, },
// 课程详情页面 // 课程详情页面
courseDetail(){ courseDetail(){
api.courseDetail({fileId:this.fileId,userId:this.userId}).then(res=>{ let userId = localStorage.getItem('h5_userId') ? localStorage.getItem('h5_userId') : this.userId
api.courseDetail({fileId:this.fileId,userId:userId}).then(res=>{
console.log('课程详情',res); console.log('课程详情',res);
if(res['success']){ if(res['success']){
this.courseInfoItem = res['data']['data']; this.courseInfoItem = res['data']['data'];
......
pages/personalCenter/teamMembers/members.vue
...@@ -10,6 +10,20 @@ ...@@ -10,6 +10,20 @@
</view> </view>
<view class=""> <view class="">
<view class="d-box">
<!-- <view class="d-td" v-for="item in datatitleList">
<span class="">{{item}}</span>
</view> -->
<view class="d-td">
<text>辖下组织/成员</text>
</view>
<view class="d-td">
<text>职级</text>
</view>
<view class="d-td">
<text>成员数量</text>
</view>
</view>
<lazy-tree v-if="dataList" :datatitleList="datatitleList" :dataList="dataList" type="2"></lazy-tree> <lazy-tree v-if="dataList" :datatitleList="datatitleList" :dataList="dataList" type="2"></lazy-tree>
<!-- <myteam-table :datatitleList="datatitleList" :dataList="dataList" type="1"></myteam-table> --> <!-- <myteam-table :datatitleList="datatitleList" :dataList="dataList" type="1"></myteam-table> -->
</view> </view>
...@@ -69,6 +83,23 @@ ...@@ -69,6 +83,23 @@
background: url('../../../static/Group 1623.png'); background: url('../../../static/Group 1623.png');
background-size: auto 100%; background-size: auto 100%;
} }
.d-box {
display: flex;
justify-content: space-between;
// padding: 0 20rpx;
font-size: 32rpx;
font-weight: 600;
.d-header {
text-align: center;
font-size: 26rpx;
}
.d-td {
align-items: center;
padding: 5rpx 10rpx;
}
}
.concent-text{ .concent-text{
font-size: 18px; font-size: 18px;
font-weight: 500; font-weight: 500;
......
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