Commit 4e7aaaaf by sunerhu

1.修复团队显示数据

2.修复邀请加盟数据不正确
3.修复积分来源详情未传参
parent 7dd5c120
...@@ -37,10 +37,10 @@ ...@@ -37,10 +37,10 @@
<text style="color: black;">{{item.areaCenterName}}</text> <text style="color: black;">{{item.areaCenterName}}</text>
</view> </view>
<view class="content-box-title-b" @click="open(item, i)" v-else-if="item.levelCode == 'C3'&& item.itemType == '1'" :style="{'margin-left':(item.level * 20)+'rpx'}"> <view class="content-box-title-b" @click="open(item, i)" v-else-if="item.levelCode == 'C3'&& item.itemType == '1'" :style="{'margin-left':(item.level * 20)+'rpx'}">
<text style="color: black;">{{item.areaCenterName}}</text> <text style="color: #FFFFFF;">{{item.areaCenterName}}</text>
</view> </view>
<view class="content-box-title-b" @click="open(item, i)" v-else-if="item.levelCode == 'C2'&& item.itemType == '1'" :style="{'margin-left':(item.level * 20)+'rpx'}"> <view class="content-box-title-b" @click="open(item, i)" v-else-if="item.levelCode == 'C2'&& item.itemType == '1'" :style="{'margin-left':(item.level * 20)+'rpx'}">
<text style="color: black;">{{item.areaCenterName}}</text> <text style="color: #FFFFFF;">{{item.areaCenterName}}</text>
</view> </view>
<view @click="open(item, i)" style="flex: 1;" v-else> <view @click="open(item, i)" style="flex: 1;" v-else>
<text>{{item.name}}</text> <text>{{item.name}}</text>
...@@ -187,6 +187,7 @@ ...@@ -187,6 +187,7 @@
}, },
checkLazy(id) { checkLazy(id) {
console.log(id, 1515515) console.log(id, 1515515)
console.log(this.lazyList, 1515)
return ~this.lazyList.findIndex(o => o === id); return ~this.lazyList.findIndex(o => o === id);
}, },
checkOpen(id) { checkOpen(id) {
...@@ -194,6 +195,7 @@ ...@@ -194,6 +195,7 @@
}, },
syncOpen(ids) { syncOpen(ids) {
console.log(ids, 15155)
const list = []; const list = [];
ids.forEach(o => { ids.forEach(o => {
this.openList.forEach(o1 => { this.openList.forEach(o1 => {
...@@ -203,8 +205,7 @@ ...@@ -203,8 +205,7 @@
this.openList = list; this.openList = list;
}, },
async open(item, index) { async open(item, index) {
console.log(item, 581515) if(item.itemType == '2'){
if(index == 0 || item.itemType == '2'){
return false return false
} }
try { try {
......
...@@ -16,6 +16,10 @@ ...@@ -16,6 +16,10 @@
<text @click="viewDetail(item)" class="dropStatus">{{item.orderStatus}}<i class="iconfont icon-youjiantou" style="margin-left: 5rpx;font-size: 26rpx;"></i></text> <text @click="viewDetail(item)" class="dropStatus">{{item.orderStatus}}<i class="iconfont icon-youjiantou" style="margin-left: 5rpx;font-size: 26rpx;"></i></text>
</view> </view>
<view class="ulBox"> <view class="ulBox">
<text>积分来源:</text>
<text>{{item.commissionTypeContent}}</text>
</view>
<view class="ulBox">
<text>退课积分:</text> <text>退课积分:</text>
<text>{{Math.abs(item.commissionAmount)}}</text> <text>{{Math.abs(item.commissionAmount)}}</text>
</view> </view>
...@@ -40,7 +44,7 @@ ...@@ -40,7 +44,7 @@
methods: { methods: {
viewDetail(item){ viewDetail(item){
uni.navigateTo({ uni.navigateTo({
url:`/pages/orderDetail/orderDetail?id=${item.orderId}&type=drop` url:`/pages/orderDetail/orderDetail?id=${item.orderId}&type=drop&commissionType=${item.commissionType}`
}) })
}, },
queryDropCourseList(){ queryDropCourseList(){
......
...@@ -249,11 +249,11 @@ ...@@ -249,11 +249,11 @@
api.saveApplyInfo(this.dataForm).then(res => { api.saveApplyInfo(this.dataForm).then(res => {
if (res['success']) { if (res['success']) {
this.shareId = res.data.id this.shareId = res.data.id
// this.$refs.share.open() this.$refs.share.open()
uni.navigateTo({ // uni.navigateTo({
url: '/pages/invitationRegister/invitationRegister?shareId=' + this.shareId + // url: '/pages/invitationRegister/invitationRegister?shareId=' + this.shareId +
'&invitationCode=' + this.invitationCode + '&hasCrossDistrict=' + this.dataForm.hasCrossDistrict // '&invitationCode=' + this.invitationCode + '&hasCrossDistrict=' + this.dataForm.hasCrossDistrict
}) // })
} }
uni.showToast({ uni.showToast({
title: res['message'], title: res['message'],
......
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