|
@@ -21,19 +21,19 @@
|
|
|
<view class="list_count">
|
|
|
<view class="imageBox">
|
|
|
<swiper v-if="noteDetails.type ===1 && noteDetails.image && noteDetails.image.split(',').length>1" :indicator-dots="indicatorDots"
|
|
|
- indicator-active-color="#e93323" :circular="circular" :interval="interval" :duration="duration" :style="{height:heightH + 'px'}">
|
|
|
+ indicator-active-color="#e93323" :circular="circular" :interval="interval" :duration="duration" :style="{height:imageH + 'px'}">
|
|
|
<block v-for="(item,index) in noteDetails.image.split(',')" :key='index'>
|
|
|
<swiper-item class="cover">
|
|
|
<!-- <image class="w-full" show-menu-by-longpress :src="item"
|
|
|
:mode="isAuto ? 'aspectFill' : 'heightFix'" :style="{height:imageH + 'px'}"
|
|
|
@tap="proview(item)"></image> -->
|
|
|
- <easy-loadimage mode="heightFix" :image-src="item" :style="{height:heightH + 'px'}"></easy-loadimage>
|
|
|
+ <easy-loadimage mode="heightFix" :image-src="item" :style="{height:imageH + 'px'}"></easy-loadimage>
|
|
|
</swiper-item>
|
|
|
</block>
|
|
|
</swiper>
|
|
|
<view v-if="noteDetails.type ===2 || (noteDetails.type ===1 &¬eDetails.image && noteDetails.image.split(',').length===1)">
|
|
|
- <view class="cover" @click="goDetail(noteDetails)" :style="{height:heightH + 'px'}">
|
|
|
- <easy-loadimage mode="heightFix" :image-src="noteDetails.cover" :style="{height:heightH + 'px'}"></easy-loadimage>
|
|
|
+ <view class="cover" @click="goDetail(noteDetails)" :style="{height:imageH + 'px'}">
|
|
|
+ <easy-loadimage mode="heightFix" :image-src="noteDetails.cover" :style="{height:imageH + 'px'}"></easy-loadimage>
|
|
|
<view v-if="noteDetails.type ===2" class="circle">
|
|
|
<text class="iconfont icon-24gf-play"></text>
|
|
|
</view>
|
|
@@ -45,7 +45,8 @@
|
|
|
<view class="product_info">
|
|
|
<view class="noteTitle flex-between-center">
|
|
|
<view>{{noteDetails.title}}</view>
|
|
|
- <view v-if="dazi && noteDetails.authorId !== uid" class="dazi-info" @tap="onJoin">加入</view>
|
|
|
+ <view v-if="dazi && noteDetails.authorId !== uid && !noteDetails.userIsJoin" class="dazi-info" @tap="onJoin">加入</view>
|
|
|
+ <view v-if="dazi && noteDetails.authorId !== uid && noteDetails.userIsJoin" class="dazi-info" @tap="onJoinColse">取消</view>
|
|
|
</view>
|
|
|
<view>
|
|
|
<view class="text" v-if="noteDetails.isMore || (noteDetails.content && noteDetails.content.length<=70)">
|
|
@@ -152,7 +153,8 @@
|
|
|
<uni-popup type="bottom" ref="manageRef">
|
|
|
<view class="manage">
|
|
|
<popup-header title="内容管理" @close="closeManage"></popup-header>
|
|
|
- <navigator hover-class="none" :url="'/pages/discover/discover_release/index?noteId='+noteDetails.id + '&dazi=' + dazi" class="items">
|
|
|
+ <navigator hover-class="none" :url="'/pages/discover/discover_release/index?noteId='+noteDetails.id + '&dazi=' + dazi"
|
|
|
+ class="items">
|
|
|
<text>编辑</text>
|
|
|
</navigator>
|
|
|
<view class="items" @click.stop="deleteTopic(noteDetails)">
|
|
@@ -307,7 +309,6 @@
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
- this.computedHeight()
|
|
|
}
|
|
|
}
|
|
|
},
|
|
@@ -547,27 +548,21 @@
|
|
|
});
|
|
|
}
|
|
|
},
|
|
|
- // 计算图片高度
|
|
|
- computedHeight() {
|
|
|
- let that = this;
|
|
|
- if (this.noteDetails.image) {
|
|
|
- let windowWidth = uni.getSystemInfoSync().windowWidth;
|
|
|
- uni.getImageInfo({
|
|
|
- src: that.$util.setDomain(this.noteDetails.image.split(',')[0]),
|
|
|
- success: (image) => {
|
|
|
- let imageH = parseInt(image.height * windowWidth / image.width);
|
|
|
- if (imageH > 500) {
|
|
|
- this.heightH = 500;
|
|
|
- } else {
|
|
|
- this.heightH = imageH;
|
|
|
- }
|
|
|
- }
|
|
|
- })
|
|
|
- }
|
|
|
- },
|
|
|
onJoin() {
|
|
|
this.$refs.joinDialog.open()
|
|
|
},
|
|
|
+ onJoinColse() {
|
|
|
+ myGameJoinIdApi(this.noteDetails.id).then(res => {
|
|
|
+ that.$util.Tips({
|
|
|
+ title: '取消成功'
|
|
|
+ });
|
|
|
+ }).catch(err => {
|
|
|
+ uni.showToast({
|
|
|
+ title: err,
|
|
|
+ icon: 'none'
|
|
|
+ })
|
|
|
+ });
|
|
|
+ },
|
|
|
handleInputClose() {
|
|
|
this.$refs.joinDialog.close()
|
|
|
},
|
|
@@ -582,19 +577,16 @@
|
|
|
success: function(res) {
|
|
|
console.log('条码类型:' + res.scanType);
|
|
|
console.log('条码内容:' + res.result);
|
|
|
- uni.navigateTo({
|
|
|
- url: res.result
|
|
|
- });
|
|
|
let that = this;
|
|
|
- myGameJoinIdApi(noteDetails.id).then(res => {
|
|
|
+ setTimeout(function() {
|
|
|
+ uni.navigateTo({
|
|
|
+ url: res.result
|
|
|
+ });
|
|
|
+ }, 1000);
|
|
|
+ myGameJoinIdApi(that.noteDetails.id).then(res => {
|
|
|
that.$util.Tips({
|
|
|
title: '加入成功'
|
|
|
});
|
|
|
- setTimeout(function() {
|
|
|
- uni.redirectTo({
|
|
|
- url: `/pages/discover/discover_user/index?dazi=${that.dazi}`
|
|
|
- })
|
|
|
- }, 1000);
|
|
|
}).catch(err => {
|
|
|
uni.showToast({
|
|
|
title: err,
|