Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
wuhongjian 2022-07-28 14:43:04 +08:00
commit e47d7cf470
3 changed files with 5 additions and 5 deletions

View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2022-03-29 16:45:25 * @Date: 2022-03-29 16:45:25
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-07-28 14:31:25 * @LastEditTime: 2022-07-28 14:42:55
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<!DOCTYPE html> <!DOCTYPE html>

View File

@ -19,10 +19,10 @@
size="large" size="large"
@search="onSearch" @search="onSearch"
/> />
<div class="search" @click="gaojisousuo"> <!-- <div class="search" @click="gaojisousuo">
<span></span> <span></span>
<span>高级搜索</span> <span>高级搜索</span>
</div> </div> -->
</div> </div>
</div> </div>
<div class="gaoji-main" v-if="!qeihuan"> <div class="gaoji-main" v-if="!qeihuan">

View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-07-12 09:42:44 * @Date: 2022-07-12 09:42:44
* @LastEditors: hisense.liangjunhua * @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-25 15:07:05 * @LastEditTime: 2022-07-28 14:13:22
* @Description:我的申请 能力申请 查看详情 * @Description:我的申请 能力申请 查看详情
--> -->
<template> <template>
@ -142,7 +142,7 @@
';' + ';' +
'视频流地址:' + '视频流地址:' +
backUrl + backUrl +
'/resource/hls/getHls/?channelId=' + 'resource/hls/getHls/?channelId=' +
val.channelId val.channelId
}} }}
</div> </div>