合并代码
This commit is contained in:
parent
8c141f0d9a
commit
53990198d5
|
@ -32,7 +32,7 @@
|
|||
})
|
||||
|
||||
// 腾讯im登录
|
||||
util.loginTencent(userinfo)
|
||||
// util.loginTencent(userinfo)
|
||||
util.getUserinfo()
|
||||
}
|
||||
}
|
||||
|
|
|
@ -524,7 +524,7 @@
|
|||
v-else-if="item.isLike == 3" @click="handleLike(index, 1)" />
|
||||
</view>
|
||||
<view class="txt mt10">
|
||||
<text class="text">{{ item.likes }}</text>
|
||||
<text class="text">{{ item.publicLikeCount }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
@ -534,7 +534,7 @@
|
|||
<view class="col">
|
||||
<image class="wh50" src="@/static/indexMsg.png" mode="aspectFit" />
|
||||
<view class="txt mt10">
|
||||
<text class="text">{{ item.comment }}</text>
|
||||
<text class="text">{{ item.commentCount }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
@ -546,7 +546,7 @@
|
|||
v-if="item.isCollect" />
|
||||
<image class="wh50" src="@/static/indexCollect.png" mode="aspectFit" v-else />
|
||||
<view class="txt mt10">
|
||||
<text class="text">{{ item.collect }}</text>
|
||||
<text class="text">{{ item.favoriteCount }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
|
@ -712,14 +712,20 @@
|
|||
<list class="listBox f1" :show-scrollbar="false" @touchstart="onTouchstart($event,index)"
|
||||
@touchend="onTouchend($event,index)" @loadmore="item.getMoreList">
|
||||
<cell class="cell" :style="[{height: viewSize.height + 'px'}]" :ref="`cellRef` + index"
|
||||
v-for="(secItem,secIndex) in item.listData()" :key="secIndex" @click.stop>
|
||||
v-for="(secItem,secIndex) in item.listData()" :key="secItem.id" @click.stop>
|
||||
<!-- <template v-if="index >= current[tabIndex] - 1 && index <= current[tabIndex] + 1">
|
||||
<view class="pa t0 l0 r0 b0 fmid" :style="{zIndex: 99,}">
|
||||
<text class="f32 cfff">{{current[tabIndex]}}</text>
|
||||
<text class="f32 cfff">{{index}}</text>
|
||||
</view> -->
|
||||
<!-- 视频 -->
|
||||
<indexVideo :ref="'videoRef' + index" :tabIndex="index" :current="current[index]"
|
||||
<indexVideo :ref="'videoRef' + index" :tabIndex="index" :current="current[tabIndex]"
|
||||
:width="viewSize.width" :height="viewSize.height" :item="secItem" :index="secIndex"
|
||||
@showTime="handleShowTime" @showComment="handleShowCommentAlt"
|
||||
@showCollect="handleShowCollectAlt" @showShareFirend="handleShowShareFirend"
|
||||
@onPlay="handleVideoOnPlay" @onPause="handleVideoOnPause" @like="videoLike"
|
||||
@longtap="$refs.moreMenuRef.open(secItem)" />
|
||||
<!-- </template> -->
|
||||
</cell>
|
||||
</list>
|
||||
</view>
|
||||
|
|
|
@ -359,7 +359,7 @@
|
|||
}).then(rs => {
|
||||
if (rs.code == 200) {
|
||||
util.alert({
|
||||
content: data.isDraft == 0 ? '视频发布成功,请等待后台审核' : '保存草稿成功',
|
||||
content: data.status == 1 ? '视频发布成功,请等待后台审核' : '保存草稿成功',
|
||||
showCancel: false,
|
||||
confirmText: '我知道了',
|
||||
}).then(rs => {
|
||||
|
|
|
@ -140,10 +140,8 @@ https://cloud.tencent.com/document/product/269/64506
|
|||
17625025837@139.com
|
||||
jy3456789@A
|
||||
|
||||
|
||||
http://1.94.221.165:3000/JY_document/jiuyi-documents/src/branch/main/%E4%B9%9D%E4%BA%BFPRD&%E4%BB%BB%E5%8A%A1%E5%88%86%E8%A7%A3.md
|
||||
|
||||
|
||||
http://1.94.221.165:3000/JY_document/jiuyi-documents/src/branch/main/%E4%B9%9D%E4%BA%BF%E5%90%8E%E5%8F%B0%E7%AE%A1%E7%90%86PRD&%E4%BB%BB%E5%8A%A1%E5%88%86%E8%A7%A3.md
|
||||
后台任务拆解
|
||||
任务拆解账号
|
||||
|
|
|
@ -14,8 +14,8 @@ export default defineConfig({
|
|||
changeOrigin: true,
|
||||
},
|
||||
"/user": {
|
||||
target: "http://192.168.1.241:8080",
|
||||
// target: "http://7fee92ac.r22.cpolar.top",
|
||||
// target: "http://192.168.1.241:8080",
|
||||
target: "http://7fee92ac.r22.cpolar.top",
|
||||
changeOrigin: true,
|
||||
},
|
||||
"/coreplay": {
|
||||
|
@ -27,8 +27,8 @@ export default defineConfig({
|
|||
changeOrigin: true,
|
||||
},
|
||||
"/video": {
|
||||
target: "http://192.168.1.241:8080",
|
||||
// target: "http://7fee92ac.r22.cpolar.top",
|
||||
// target: "http://192.168.1.241:8080",
|
||||
target: "http://7fee92ac.r22.cpolar.top",
|
||||
changeOrigin: true,
|
||||
},
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue