|
@@ -27,7 +27,8 @@
|
|
<view class="classListFlex" v-if="aclist.length==0">
|
|
<view class="classListFlex" v-if="aclist.length==0">
|
|
|
|
|
|
</view>
|
|
</view>
|
|
- <view class="listBlock1" v-for="(i,index) in aclist" :key="index+'a'" @click="gotoDetail" :data-aid="i.acId">
|
|
|
|
|
|
+ <view class="listBlock1" v-for="(i,index) in aclist" :key="i.acId" @click="gotoDetail"
|
|
|
|
+ :data-aid="i.acId">
|
|
<view class="img cell-img">
|
|
<view class="img cell-img">
|
|
<image :src="i.pic" mode="aspectFill"></image>
|
|
<image :src="i.pic" mode="aspectFill"></image>
|
|
<image class="star" @click.stop="coll" :data-e="i" :src="pic_coll2" mode=""></image>
|
|
<image class="star" @click.stop="coll" :data-e="i" :src="pic_coll2" mode=""></image>
|
|
@@ -35,7 +36,8 @@
|
|
|
|
|
|
<view class="right">
|
|
<view class="right">
|
|
<view class="title">
|
|
<view class="title">
|
|
- <view class="bqZ-font" style="font-size: 20rpx;" :class="i.acshape=='线下活动'?'tag':'tag1'"> {{i.acshape}}</view>
|
|
|
|
|
|
+ <view class="bqZ-font" style="font-size: 20rpx;"
|
|
|
|
+ :class="i.acshape=='线下活动'?'tag':'tag1'"> {{i.acshape}}</view>
|
|
<view class="titTxt btn-font " style="font-size:34rpx ;">
|
|
<view class="titTxt btn-font " style="font-size:34rpx ;">
|
|
{{i.acName}}
|
|
{{i.acName}}
|
|
</view>
|
|
</view>
|
|
@@ -56,7 +58,7 @@
|
|
<view class="left">
|
|
<view class="left">
|
|
<view class="add fz-font">已报名{{i.bnum}}人</view>
|
|
<view class="add fz-font">已报名{{i.bnum}}人</view>
|
|
</view>
|
|
</view>
|
|
- <view class="Oright" >
|
|
|
|
|
|
+ <view class="Oright">
|
|
<view class="text">{{ i.signNum?'已报名':'报名' }}</view>
|
|
<view class="text">{{ i.signNum?'已报名':'报名' }}</view>
|
|
<view class="arrow">
|
|
<view class="arrow">
|
|
<image
|
|
<image
|
|
@@ -81,7 +83,7 @@
|
|
<scroll-view scroll-y="true" @scrolltolower="cllower" style="height: 100%;">
|
|
<scroll-view scroll-y="true" @scrolltolower="cllower" style="height: 100%;">
|
|
<view class="classListFlex">
|
|
<view class="classListFlex">
|
|
<view class="cont" @click="gotoWeb" v-for="(item, index) in classlist" :index="index"
|
|
<view class="cont" @click="gotoWeb" v-for="(item, index) in classlist" :index="index"
|
|
- :key="index" :data-kid="item.href">
|
|
|
|
|
|
+ :key="i.cid" :data-kid="item.href">
|
|
<image class="star" :src="pic_coll2" @click.stop="collcl" :data-e="item" mode="aspectFill">
|
|
<image class="star" :src="pic_coll2" @click.stop="collcl" :data-e="item" mode="aspectFill">
|
|
</image>
|
|
</image>
|
|
<image class="img" :src="item.img" mode="aspectFill" />
|
|
<image class="img" :src="item.img" mode="aspectFill" />
|
|
@@ -142,11 +144,16 @@
|
|
oid: this.$store.state.user.openid, //用户id
|
|
oid: this.$store.state.user.openid, //用户id
|
|
type: 0,
|
|
type: 0,
|
|
page: this.currentPage, //下拉获取更多的备用字段
|
|
page: this.currentPage, //下拉获取更多的备用字段
|
|
- lim: 15 //一次获取多少数据
|
|
|
|
|
|
+ lim: 30 //一次获取多少数据
|
|
}
|
|
}
|
|
console.log('data', data);
|
|
console.log('data', data);
|
|
this.$request('/selectCollAcList', 'POST', data).then(res => {
|
|
this.$request('/selectCollAcList', 'POST', data).then(res => {
|
|
console.log('获取活动数据', res);
|
|
console.log('获取活动数据', res);
|
|
|
|
+
|
|
|
|
+ if (this.currentPage == 1) {
|
|
|
|
+ this.aclist = [] //活动数据list
|
|
|
|
+ }
|
|
|
|
+
|
|
if (!res[0].length) {
|
|
if (!res[0].length) {
|
|
this.newsLoading = 2
|
|
this.newsLoading = 2
|
|
} else {
|
|
} else {
|
|
@@ -162,12 +169,15 @@
|
|
oid: this.$store.state.user.openid, //用户id
|
|
oid: this.$store.state.user.openid, //用户id
|
|
type: 1,
|
|
type: 1,
|
|
page: this.clcurrentPage, //下拉获取更多的备用字段
|
|
page: this.clcurrentPage, //下拉获取更多的备用字段
|
|
- lim: 15 //一次获取多少数据
|
|
|
|
|
|
+ lim: 30 //一次获取多少数据
|
|
}
|
|
}
|
|
this.$request('/selectOperatorTech', 'POST', data).then(res => {
|
|
this.$request('/selectOperatorTech', 'POST', data).then(res => {
|
|
console.log('获取课程数据', res);
|
|
console.log('获取课程数据', res);
|
|
// 每次调用前清零,防止push叠加错误
|
|
// 每次调用前清零,防止push叠加错误
|
|
// this.classlist = []
|
|
// this.classlist = []
|
|
|
|
+ if (this.clcurrentPage == 1) {
|
|
|
|
+ this.classlist = [] //课程数据list
|
|
|
|
+ }
|
|
|
|
|
|
if (!res[0].length) {
|
|
if (!res[0].length) {
|
|
this.clLoading = 2
|
|
this.clLoading = 2
|
|
@@ -192,7 +202,7 @@
|
|
// return console.log('aaaaaa', e.currentTarget.dataset);
|
|
// return console.log('aaaaaa', e.currentTarget.dataset);
|
|
let acid = e.currentTarget.dataset.kid
|
|
let acid = e.currentTarget.dataset.kid
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
- url: "/pages/skipone/skipone?item="+encodeURIComponent(JSON.stringify(acid))
|
|
|
|
|
|
+ url: "/pages/skipone/skipone?item=" + encodeURIComponent(JSON.stringify(acid))
|
|
// url: "/pages/skipone/skipone?url=" + encodeURIComponent(acid),
|
|
// url: "/pages/skipone/skipone?url=" + encodeURIComponent(acid),
|
|
});
|
|
});
|
|
|
|
|
|
@@ -293,8 +303,6 @@
|
|
}
|
|
}
|
|
},
|
|
},
|
|
onShow() {
|
|
onShow() {
|
|
- this.aclist = [] //活动数据list
|
|
|
|
- this.classlist = [] //课程数据list
|
|
|
|
|
|
|
|
this.clcurrentPage = 1;
|
|
this.clcurrentPage = 1;
|
|
this.currentPage = 1;
|
|
this.currentPage = 1;
|
|
@@ -573,8 +581,8 @@
|
|
margin-right: 10rpx;
|
|
margin-right: 10rpx;
|
|
color: rgba(0, 178, 182, 1);
|
|
color: rgba(0, 178, 182, 1);
|
|
line-height: 32rpx;
|
|
line-height: 32rpx;
|
|
-
|
|
|
|
-
|
|
|
|
|
|
+
|
|
|
|
+
|
|
// border: 1px #00b2b6 solid;
|
|
// border: 1px #00b2b6 solid;
|
|
// flex-shrink: 0;
|
|
// flex-shrink: 0;
|
|
// letter-spacing: 2rpx;
|
|
// letter-spacing: 2rpx;
|
|
@@ -605,7 +613,7 @@
|
|
line-height: 32rpx;
|
|
line-height: 32rpx;
|
|
border: 1px rgba(0, 86, 168, 1) solid;
|
|
border: 1px rgba(0, 86, 168, 1) solid;
|
|
color: rgba(0, 86, 168, 1);
|
|
color: rgba(0, 86, 168, 1);
|
|
-
|
|
|
|
|
|
+
|
|
// border: 1px rgba(0, 86, 168, 1) solid;
|
|
// border: 1px rgba(0, 86, 168, 1) solid;
|
|
// flex-shrink: 0;
|
|
// flex-shrink: 0;
|
|
// letter-spacing: 2rpx;
|
|
// letter-spacing: 2rpx;
|