Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
N
nyx
概览
Overview
Details
Activity
Cycle Analytics
版本库
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
问题
0
Issues
0
列表
Board
标记
里程碑
合并请求
0
Merge Requests
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
Snippets
成员
Collapse sidebar
Close sidebar
活动
图像
聊天
创建新问题
作业
提交
Issue Boards
Open sidebar
发现
nyx
Commits
73dea9dc
Commit
73dea9dc
authored
Nov 27, 2020
by
jscat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nyx weapp: 页面更新
1. 调整live及share的前端
parent
bc9013b6
隐藏空白字符变更
内嵌
并排
正在显示
10 个修改的文件
包含
131 行增加
和
165 行删除
+131
-165
app/nyx-dev/config.js
+3
-1
app/nyx-dev/icon/live/red.png
+0
-0
app/nyx-dev/pages/live/live-info/live-info.js
+9
-2
app/nyx-dev/pages/live/live-info/live-info.wxml
+10
-4
app/nyx-dev/pages/live/live-info/live-info.wxss
+23
-7
app/nyx-dev/pages/live/live.js
+52
-139
app/nyx-dev/pages/live/live.wxml
+3
-3
app/nyx-dev/pages/share/share.js
+1
-0
app/nyx-dev/pages/share/share.wxml
+8
-3
app/nyx-dev/pages/share/share.wxss
+22
-6
没有找到文件。
app/nyx-dev/config.js
查看文件 @
73dea9dc
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
// env = 0; //本地java测试,需要启动java后台
// env = 0; //本地java测试,需要启动java后台
// env = 1; //阿里云服务器测试版本
// env = 1; //阿里云服务器测试版本
// env = 2; //阿里云服务器生产版本
// env = 2; //阿里云服务器生产版本
var
env
=
1
;
var
env
=
0
;
var
debug
=
0
;
//是否打印调试信息
var
debug
=
0
;
//是否打印调试信息
var
host_key
=
"https://fun.hisuhong.com"
;
var
host_key
=
"https://fun.hisuhong.com"
;
...
@@ -82,5 +82,6 @@ var config={
...
@@ -82,5 +82,6 @@ var config={
image_url
:
host_key
+
"/images/"
,
image_url
:
host_key
+
"/images/"
,
redis_update_like_url
:
host_key
+
"/api/nyx/redis/update/like"
,
redis_update_like_url
:
host_key
+
"/api/nyx/redis/update/like"
,
redis_query_like_url
:
host_key
+
"/api/nyx/redis/search/like"
,
redis_query_like_url
:
host_key
+
"/api/nyx/redis/search/like"
,
live_query_url
:
host_key
+
"/api/nyx/live/query"
,
}
}
module
.
exports
=
config
;
module
.
exports
=
config
;
\ No newline at end of file
app/nyx-dev/icon/live/red.png
0 → 100644
查看文件 @
73dea9dc
3.01 KB
app/nyx-dev/pages/live/live-info/live-info.js
查看文件 @
73dea9dc
...
@@ -47,7 +47,7 @@ Page({
...
@@ -47,7 +47,7 @@ Page({
//格式示例数据,可为空
//格式示例数据,可为空
allContentList
:
[],
allContentList
:
[],
num
:
0
,
num
:
0
,
sid
:
"
key
"
,
sid
:
""
,
chatUserInfo
:
{},
chatUserInfo
:
{},
scrollTop
:
0
,
scrollTop
:
0
,
...
@@ -70,6 +70,7 @@ Page({
...
@@ -70,6 +70,7 @@ Page({
*/
*/
selected
:
'@'
,
selected
:
'@'
,
likeUrl
:
"../../../icon/activity/like_selected.png"
,
// like图标的url
likeUrl
:
"../../../icon/activity/like_selected.png"
,
// like图标的url
redUrl
:
"../../../icon/live/red.png"
,
// 在线图标的url
//directly to redis
//directly to redis
rankData_raw_like
:
{
rankData_raw_like
:
{
'@叁年间'
:
100
,
'@叁年间'
:
100
,
...
@@ -96,6 +97,8 @@ Page({
...
@@ -96,6 +97,8 @@ Page({
tabBarHeight
:
0
,
tabBarHeight
:
0
,
streamer_name
:
""
,
streamer_name
:
""
,
title
:
""
,
num_watcher
:
""
,
},
},
...
@@ -149,13 +152,17 @@ Page({
...
@@ -149,13 +152,17 @@ Page({
//step2: 获取上一页面传入的数据
//step2: 获取上一页面传入的数据
var
sid
=
_this
.
__data__
.
sid
var
sid
=
_this
.
__data__
.
sid
var
streamer_name
=
_this
.
__data__
.
streamer_name
var
streamer_name
=
_this
.
__data__
.
streamer_name
var
title
=
_this
.
__data__
.
title
var
num_watcher
=
_this
.
__data__
.
num_watcher
if
(
options
.
sid
!=
""
)
if
(
options
.
sid
!=
""
)
{
{
sid
=
options
.
sid
;
sid
=
options
.
sid
;
title
=
options
.
title
;
num_watcher
=
options
.
num_watcher
;
streamer_name
=
options
.
streamer_name
;
streamer_name
=
options
.
streamer_name
;
}
}
_this
.
setData
({
sid
,
streamer_name
})
_this
.
setData
({
sid
,
streamer_name
,
title
,
num_watcher
})
//初始化socket
//初始化socket
if
(
app
.
globalData
.
socketTask
.
readyState
!=
1
&&
app
.
globalData
.
socketTask
.
readyState
!=
0
)
{
if
(
app
.
globalData
.
socketTask
.
readyState
!=
1
&&
app
.
globalData
.
socketTask
.
readyState
!=
0
)
{
...
...
app/nyx-dev/pages/live/live-info/live-info.wxml
查看文件 @
73dea9dc
<!--pages/share/share.wxml-->
<!--pages/share/share.wxml-->
<view class="page">
<view class="page">
<!-- start key view -->
<!-- start key view -->
<view class="page__hd" style="position:fixed; top:0;width:
750rpx
;">
<view class="page__hd" style="position:fixed; top:0;width:
100%
;">
<view class="tab-title">
<view class="tab-title">
<view class="{{selected=='@'?'border-tottom':'default'}}" id="@" bindtap="selected">热度商家榜</view>
<view class="{{selected=='@'?'border-tottom':'default'}}" id="@" bindtap="selected">热度商家榜</view>
<view class="{{selected=='#'?'border-tottom':'default'}}" id="#" bindtap="selected">活跃主播榜</view>
<view class="{{selected=='#'?'border-tottom':'default'}}" id="#" bindtap="selected">活跃主播榜</view>
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
<view class="rank">
<view class="rank">
<view class="rank-left">{{item.name}}</view>
<view class="rank-left">{{item.name}}</view>
<view class="rank-right">
<view class="rank-right">
<view class="rank-row"><image src="{{likeUrl}}"></image> {{item.like}}</view>
<view class="rank-row"><image src="{{likeUrl}}"></image> {{item.like}}
在线
</view>
</view>
</view>
</view>
</view>
</view>
</view>
...
@@ -27,10 +27,16 @@
...
@@ -27,10 +27,16 @@
<!--end key view -->
<!--end key view -->
<!--公屏view-->
<!--公屏view-->
<view style="height:{{chatHeight}}rpx;position:fixed; bottom:0;">
<view style="height:{{chatHeight}}rpx;position:fixed; bottom:0;
width:100%
">
<view class="weui-cell weui-cell_access">
<view class="weui-cell weui-cell_access">
<view class="weui-cell__bd">{{streamer_name}}</view>
<view class="live">
<view class="live-left">{{title}}</view>
<view class="live-right">
<view class="live-row"><image src="{{redUrl}}"></image> {{num_watcher}}在线</view>
</view>
</view>
</view>
</view>
<scroll-view scroll-y="true" scroll-top="{{scrollTop}}" style="height:{{chatHeight-80}}rpx;position:fixed; bottom:0;">
<scroll-view scroll-y="true" scroll-top="{{scrollTop}}" style="height:{{chatHeight-80}}rpx;position:fixed; bottom:0;">
<view class="wrapper {{isShowAdd?'media-padd':''}} {{isEmotion?'emotion-padd':''}}" id="wrapperCon" bindtap="cancelShow" >
<view class="wrapper {{isShowAdd?'media-padd':''}} {{isEmotion?'emotion-padd':''}}" id="wrapperCon" bindtap="cancelShow" >
<!-- 消息列表 -->
<!-- 消息列表 -->
...
...
app/nyx-dev/pages/live/live-info/live-info.wxss
查看文件 @
73dea9dc
...
@@ -55,7 +55,7 @@ padding-bottom: 100rpx;
...
@@ -55,7 +55,7 @@ padding-bottom: 100rpx;
}
}
.message-list {
.message-list {
margin: 10rpx 3
0rpx 30
rpx;
margin: 10rpx 3
2rpx 32rpx 32
rpx;
}
}
.chat {
.chat {
...
@@ -305,7 +305,7 @@ vertical-align: middle;
...
@@ -305,7 +305,7 @@ vertical-align: middle;
height: 60rpx;
height: 60rpx;
background: #fff;
background: #fff;
border-top: 1px solid #fafafa;
border-top: 1px solid #fafafa;
padding: 16rpx;
padding: 16rpx
32rpx 16rpx 32rpx
;
line-height: 60rpx;
line-height: 60rpx;
display:flex;
display:flex;
flex-direction: row;
flex-direction: row;
...
@@ -315,9 +315,9 @@ flex:auto;
...
@@ -315,9 +315,9 @@ flex:auto;
text-align:center;
text-align:center;
}
}
.tab-content{
.tab-content{
height: 60rpx;
height: 60rpx;
background: #fff;
background: #fff;
padding: 16rpx;
padding: 16rpx 0rpx 16rpx 16rpx; /* top right bottom (left)*/
}
}
.rank-info{
.rank-info{
background: #fff;
background: #fff;
...
@@ -342,4 +342,21 @@ font-size: 0;
...
@@ -342,4 +342,21 @@ font-size: 0;
.rank-row{
.rank-row{
display: flex;
display: flex;
flex-direction: row;
flex-direction: row;
}
align-items: center;
\ No newline at end of file
}
/* live-info */
/* top right bottom; 缺少了left,根据原则,则left的值有right来代替 */
.live{width: 100%; display: flex; margin-top: 0rpx; align-items: center;margin-bottom: 12rpx;}
.live-left{width: 65%; }
.live-right{width: 35%; display: flex;}
.live-right image{
width: 40rpx;
height: 40rpx;
font-size: 0;
}
.live-row{
display: flex;
flex-direction: row;
align-items: center;
}
app/nyx-dev/pages/live/live.js
查看文件 @
73dea9dc
...
@@ -23,21 +23,6 @@ Page({
...
@@ -23,21 +23,6 @@ Page({
city
:
""
,
city
:
""
,
county
:
""
,
county
:
""
,
category
:
[
// 导航栏内容数据
{
name
:
'点赞'
,
order
:
'like'
},
{
name
:
'价格'
,
order
:
'price'
},
{
name
:
'最新'
,
order
:
'nearest'
},
],
curIndex
:
0
,
// 给选中的tab加粗
activities
:
[],
// {
// note_image: [ "https://1.jpg", "https://2.jpg"],
// title: "一天",
// like: 10,
// writer_name: "无敌花木兰",
// writer_image: "../../icon/icon_avatar3.png"
// },
//分页加载部分
//分页加载部分
isHideLoadMore
:
false
,
isHideLoadMore
:
false
,
pageIndex
:
1
,
//分页搜索的page index
pageIndex
:
1
,
//分页搜索的page index
...
@@ -57,46 +42,34 @@ Page({
...
@@ -57,46 +42,34 @@ Page({
//二维码信息
//二维码信息
qRCodeMsg
:
""
,
qRCodeMsg
:
""
,
//
活动
类型
//
现场
类型
activityType
:
"00-饮事
"
,
liveType
:
"
"
,
lives
:
[
lives
:
[
{
//
{
sid
:
"134"
,
//
sid: "134",
note_image
:
"https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/wx72555e77d9e5cee2.o6zAJszSNHnFKy8FTV5dg-Z7XDzQ.WaSJaxPezrVxcdaf58fbf674e7d3be131826ff708fa6.jpg"
,
//
note_image: "https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/wx72555e77d9e5cee2.o6zAJszSNHnFKy8FTV5dg-Z7XDzQ.WaSJaxPezrVxcdaf58fbf674e7d3be131826ff708fa6.jpg",
title
:
"巅峰赛第一"
,
//
title: "巅峰赛第一",
city
:
"上海"
,
//
city: "上海",
address
:
"静安南京西某地"
,
//
address: "静安南京西某地",
num_watcher
:
1029
,
//
num_watcher: 1029,
streamer_name
:
"Azz·口袋"
,
//
streamer_name: "Azz·口袋",
streamer_logo
:
"../../icon/icon_avatar3.png"
//
streamer_logo: "../../icon/icon_avatar3.png"
},
//
},
{
//
{
sid
:
"123"
,
//
sid: "123",
note_image
:
"https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/wx72555e77d9e5cee2.o6zAJszSNHnFKy8FTV5dg-Z7XDzQ.WaSJaxPezrVxcdaf58fbf674e7d3be131826ff708fa6.jpg"
,
//
note_image: "https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/wx72555e77d9e5cee2.o6zAJszSNHnFKy8FTV5dg-Z7XDzQ.WaSJaxPezrVxcdaf58fbf674e7d3be131826ff708fa6.jpg",
title
:
"单排84-101 把把C 不混"
,
//
title: "单排84-101 把把C 不混",
city
:
"上海"
,
//
city: "上海",
address
:
"老码头"
,
//
address: "老码头",
num_watcher
:
2040
,
//
num_watcher: 2040,
streamer_name
:
"六尾【混子】"
,
//
streamer_name: "六尾【混子】",
streamer_logo
:
"../../icon/icon_avatar3.png"
//
streamer_logo: "../../icon/icon_avatar3.png"
},
//
},
],
],
},
},
switchCategory
(
e
)
{
var
_this
=
this
;
var
curIndex
=
e
.
currentTarget
.
dataset
.
index
?
e
.
currentTarget
.
dataset
.
index
:
0
var
strCity
=
_this
.
__data__
.
city
var
strCategory
=
_this
.
__data__
.
category
[
curIndex
].
order
var
strSearch
=
_this
.
__data__
.
strSearch
var
activityType
=
_this
.
__data__
.
activityType
this
.
setData
({
curIndex
:
curIndex
,
})
_this
.
getActivities
(
0
,
1
,
4
,
strCity
,
activityType
,
strCategory
,
strSearch
);
},
// 搜索点击事件
// 搜索点击事件
entrySearch
(
e
)
{
entrySearch
(
e
)
{
wx
.
navigateTo
({
wx
.
navigateTo
({
...
@@ -208,43 +181,18 @@ Page({
...
@@ -208,43 +181,18 @@ Page({
)
)
// step5 初始载入四个
推荐
的活动 - local page
// step5 初始载入四个
直播
的活动 - local page
if
(
_this
.
__data__
.
activiti
es
.
length
==
0
)
if
(
_this
.
__data__
.
liv
es
.
length
==
0
)
{
{
var
switchId
=
app
.
globalData
.
switchId
var
curIndex
=
switchId
!=
""
?
switchId
:
_this
.
__data__
.
curIndex
var
strCity
=
_this
.
__data__
.
city
var
strCity
=
_this
.
__data__
.
city
var
strCategory
=
_this
.
__data__
.
category
[
curIndex
].
order
var
strSearch
=
_this
.
__data__
.
strSearch
var
strSearch
=
_this
.
__data__
.
strSearch
var
activityType
=
_this
.
__data__
.
activityType
var
liveType
=
_this
.
__data__
.
liveType
this
.
setData
({
curIndex
:
curIndex
,
});
app
.
globalData
.
switchId
=
""
_this
.
get
Activities
(
0
,
1
,
4
,
strCity
,
activityType
,
strCategory
,
strSearch
);
_this
.
get
Lives
(
0
,
1
,
4
,
strCity
,
liveType
,
strSearch
);
}
}
// step6 event 订阅, 主要接受activity-info.js里 emit 发送的消息 local page
// step6 窗口初始化
event
.
on
(
'LikeChanged'
,
this
,
function
(
data
)
{
var
activity_id
=
data
[
'activity_id'
]
var
num_like
=
data
[
'num_like'
]
var
activities
=
_this
.
__data__
.
activities
;
for
(
var
i
=
0
;
i
<
activities
.
length
;
i
++
)
{
if
(
activity_id
==
activities
[
i
][
'activity_id'
])
{
activities
[
i
][
'num_like'
]
=
num_like
}
}
_this
.
setData
({
activities
:
activities
,
})
})
// step7 窗口初始化
var
device
=
wx
.
getSystemInfoSync
()
var
device
=
wx
.
getSystemInfoSync
()
//self.device = app.globalData.myDevice
//self.device = app.globalData.myDevice
// jscat miniprogram default width is 750rpx
// jscat miniprogram default width is 750rpx
...
@@ -331,7 +279,7 @@ Page({
...
@@ -331,7 +279,7 @@ Page({
console
.
log
(
'加载更多'
)
console
.
log
(
'加载更多'
)
setTimeout
(()
=>
{
setTimeout
(()
=>
{
_this
.
getActivities
(
1
,
pageIndex
,
4
,
strCity
,
activityType
,
strCategory
,
strSearch
);
//
_this.getActivities(1, pageIndex, 4, strCity, activityType, strCategory, strSearch);
},
1000
)
},
1000
)
}
}
else
{
else
{
...
@@ -350,7 +298,7 @@ Page({
...
@@ -350,7 +298,7 @@ Page({
* 用户自定义函数
* 用户自定义函数
*
*
*/
*/
// 获取
Activiti
es数据
// 获取
Liv
es数据
// scrollType: 是否是翻页
// scrollType: 是否是翻页
/*
/*
搜索逻辑:
搜索逻辑:
...
@@ -358,15 +306,14 @@ Page({
...
@@ -358,15 +306,14 @@ Page({
2. tab, tag=strSearch
2. tab, tag=strSearch
3. 新增的search tab, '搜索'tab的时候,需要转换为搜索的关键词(_this.__data__.strSearch)
3. 新增的search tab, '搜索'tab的时候,需要转换为搜索的关键词(_this.__data__.strSearch)
*/
*/
get
Activities
:
function
(
scrollType
,
pageNum
,
pageCount
,
strCity
,
activityType
,
strCategory
,
strSearch
)
{
get
Lives
:
function
(
scrollType
,
pageNum
,
pageCount
,
strCity
,
liveType
,
strSearch
)
{
var
_this
=
this
;
var
_this
=
this
;
// 如果是"推荐"和"搜索",需要单独处理
// 如果是"推荐"和"搜索",需要单独处理
// '搜索'tab的时候, 需要转换为搜索的关键词(_this.__data__.strSearch)
// '搜索'tab的时候, 需要转换为搜索的关键词(_this.__data__.strSearch)
var
query_url
=
'&title='
+
strSearch
+
'&orderType='
+
strCategory
+
'&city='
+
strCity
var
query_url
=
'&title='
+
strSearch
+
'&city='
+
strCity
+
'&activityType='
+
activityType
+
'&liveType='
+
liveType
var
strUrl
=
config
.
live_query_url
+
"?pageCount="
+
pageCount
var
strUrl
=
config
.
activity_query_url
+
"?pageCount="
+
pageCount
+
"&pageNum="
+
pageNum
+
query_url
+
"&pageNum="
+
pageNum
+
query_url
config
.
debug
==
1
?
console
.
log
(
"===strUrl is:
\"
"
+
strUrl
+
"
\"
"
)
:
""
config
.
debug
==
1
?
console
.
log
(
"===strUrl is:
\"
"
+
strUrl
+
"
\"
"
)
:
""
wx
.
request
({
wx
.
request
({
...
@@ -386,67 +333,33 @@ Page({
...
@@ -386,67 +333,33 @@ Page({
}
}
for
(
var
i
=
0
;
i
<
res
.
data
.
data
.
length
;
i
++
)
{
for
(
var
i
=
0
;
i
<
res
.
data
.
data
.
length
;
i
++
)
{
var
index_id
=
i
+
_this
.
__data__
.
activities
.
length
var
result
=
{}
var
result
=
{}
result
[
"activity_id"
]
=
res
.
data
.
data
[
i
].
activityId
result
[
"live_id"
]
=
res
.
data
.
data
[
i
].
liveId
result
[
"member_name"
]
=
res
.
data
.
data
[
i
].
memberName
result
[
"member_slogan"
]
=
res
.
data
.
data
[
i
].
memberSlogan
result
[
"member_id"
]
=
res
.
data
.
data
[
i
].
memberId
result
[
"member_status"
]
=
res
.
data
.
data
[
i
].
memberStatus
result
[
"member_logo"
]
=
res
.
data
.
data
[
i
].
memberLogo
result
[
"tag"
]
=
res
.
data
.
data
[
i
].
tag
result
[
"title"
]
=
res
.
data
.
data
[
i
].
title
result
[
"title"
]
=
res
.
data
.
data
[
i
].
title
result
[
"num_like"
]
=
res
.
data
.
data
[
i
].
numLike
result
[
"city"
]
=
res
.
data
.
data
[
i
].
city
result
[
"content"
]
=
res
.
data
.
data
[
i
].
content
result
[
"address"
]
=
res
.
data
.
data
[
i
].
address
result
[
"quiz"
]
=
res
.
data
.
data
[
i
].
quiz
result
[
"num_watcher"
]
=
res
.
data
.
data
[
i
].
numWatcher
result
[
"point"
]
=
res
.
data
.
data
[
i
].
point
result
[
"max_watcher"
]
=
res
.
data
.
data
[
i
].
maxWatcher
result
[
"address_name"
]
=
res
.
data
.
data
[
i
].
addressName
result
[
"streamer_name"
]
=
res
.
data
.
data
[
i
].
nyxName
result
[
"product_desc"
]
=
res
.
data
.
data
[
i
].
productDesc
result
[
"avatarUrl"
]
=
res
.
data
.
data
[
i
].
avatarUrl
result
[
"unit_price"
]
=
res
.
data
.
data
[
i
].
unitPrice
.
toFixed
(
2
)
result
[
"note_image"
]
=
res
.
data
.
data
[
i
].
noteImage
.
split
(
"::"
)
result
[
"note_image"
]
=
res
.
data
.
data
[
i
].
noteImage
.
split
(
"::"
)
var
start_datetime
=
res
.
data
.
data
[
i
].
startDatetime
var
end_datetime
=
res
.
data
.
data
[
i
].
endDatetime
var
url_live
=
"../live/live-info/live-info?"
result
[
"start_datetime"
]
=
start_datetime
+
"sid="
+
result
[
"live_id"
]
result
[
"end_datetime"
]
=
end_datetime
var
url_quiz
=
"../activity/quiz-info/quiz-info?"
+
"activity_id="
+
result
[
"activity_id"
]
+
"&index_id="
+
index_id
+
"¬e_image="
+
res
.
data
.
data
[
i
].
noteImage
//传递原始string数据, List不正确
+
"&title="
+
result
[
"title"
]
+
"&content="
+
result
[
"content"
]
+
"&quiz="
+
result
[
"quiz"
]
+
"&point="
+
result
[
"point"
]
+
"&member_id="
+
result
[
"member_id"
]
+
"&member_name="
+
result
[
"member_name"
]
+
"&member_slogan="
+
result
[
"member_slogan"
]
+
"&member_logo="
+
result
[
"member_logo"
]
var
url_activity
=
"../activity/activity-info/activity-info?"
+
"activity_id="
+
result
[
"activity_id"
]
+
"&index_id="
+
index_id
+
"¬e_image="
+
res
.
data
.
data
[
i
].
noteImage
//传递原始string数据, List不正确
+
"&title="
+
result
[
"title"
]
+
"&title="
+
result
[
"title"
]
+
"&content="
+
result
[
"content"
]
+
"&num_watcher="
+
result
[
"num_watcher"
]
+
"&address_name="
+
result
[
"address_name"
]
+
"&streamer_name="
+
result
[
"streamer_name"
]
+
"&unit_price="
+
result
[
"unit_price"
]
result
[
"url_live"
]
=
url_live
+
"&product_desc="
+
result
[
"product_desc"
]
+
"&member_id="
+
result
[
"member_id"
]
+
"&member_name="
+
result
[
"member_name"
]
+
"&member_slogan="
+
result
[
"member_slogan"
]
+
"&member_logo="
+
result
[
"member_logo"
]
+
"&start_datetime="
+
result
[
"start_datetime"
]
+
"&end_datetime="
+
result
[
"end_datetime"
]
result
[
"url"
]
=
result
[
"tag"
]
==
'竞答'
?
url_quiz
:
url_activity
list
.
push
(
result
)
list
.
push
(
result
)
}
}
//进行翻页设置(加载更多)
//进行翻页设置(加载更多)
if
(
scrollType
==
1
)
{
if
(
scrollType
==
1
)
{
var
activitiesList
=
_this
.
__data__
.
activiti
es
;
var
livesList
=
_this
.
__data__
.
liv
es
;
list
=
activiti
esList
.
concat
(
list
)
list
=
liv
esList
.
concat
(
list
)
}
}
_this
.
setData
({
_this
.
setData
({
activiti
es
:
list
,
liv
es
:
list
,
pageIndex
:
pageNum
+
1
,
pageIndex
:
pageNum
+
1
,
isHideLoadMore
:
bisHideLoadMoreType
,
isHideLoadMore
:
bisHideLoadMoreType
,
})
})
...
@@ -477,7 +390,7 @@ Page({
...
@@ -477,7 +390,7 @@ Page({
inputShowed
:
false
,
inputShowed
:
false
,
});
});
_this
.
getActivities
(
0
,
1
,
4
,
strCity
,
activityType
,
strCategory
,
strSearch
);
//
_this.getActivities(0, 1, 4, strCity, activityType, strCategory, strSearch);
},
},
// * 删除输入字符串
// * 删除输入字符串
...
@@ -496,7 +409,7 @@ Page({
...
@@ -496,7 +409,7 @@ Page({
var
strCategory
=
_this
.
__data__
.
category
[
curIndex
].
order
var
strCategory
=
_this
.
__data__
.
category
[
curIndex
].
order
var
activityType
=
_this
.
__data__
.
activityType
var
activityType
=
_this
.
__data__
.
activityType
console
.
log
(
"===input search text_"
+
strSearch
)
console
.
log
(
"===input search text_"
+
strSearch
)
_this
.
getActivities
(
0
,
1
,
4
,
strCity
,
activityType
,
strCategory
,
strSearch
);
//
_this.getActivities(0, 1, 4, strCity, activityType, strCategory, strSearch);
_this
.
setData
({
_this
.
setData
({
strSearch
:
strSearch
,
strSearch
:
strSearch
,
...
@@ -631,7 +544,7 @@ Page({
...
@@ -631,7 +544,7 @@ Page({
var
strCategory
=
_this
.
__data__
.
category
[
curIndex
].
order
var
strCategory
=
_this
.
__data__
.
category
[
curIndex
].
order
var
strSearch
=
_this
.
__data__
.
strSearch
var
strSearch
=
_this
.
__data__
.
strSearch
var
activityType
=
_this
.
__data__
.
activityType
var
activityType
=
_this
.
__data__
.
activityType
_this
.
getActivities
(
0
,
1
,
4
,
strCity
,
activityType
,
strCategory
,
strSearch
);
//
_this.getActivities(0, 1, 4, strCity, activityType, strCategory, strSearch);
},
},
...
...
app/nyx-dev/pages/live/live.wxml
查看文件 @
73dea9dc
...
@@ -84,11 +84,11 @@
...
@@ -84,11 +84,11 @@
<view class="item stamp stamp01">
<view class="item stamp stamp01">
<!-- 商品信息 -->
<!-- 商品信息 -->
<view class="note-row">
<view class="note-row">
<navigator url='
live-info/live-info?sid={{item.sid}}&streamer_name={{item.streamer_nam
e}}' >
<navigator url='
{{item.url_liv
e}}' >
<image class="writer-image" src="{{item.note_image}}"/>
<image class="writer-image" src="{{item.note_image}}"/>
</navigator>
</navigator>
<view class="note-column">
<view class="note-column">
<navigator url='
live-info/live-info?sid={{item.sid}}&streamer_name={{item.streamer_nam
e}}' >
<navigator url='
{{item.url_liv
e}}' >
<!-- 商家信息 -->
<!-- 商家信息 -->
<text>{{item.title}}</text>
<text>{{item.title}}</text>
<!-- 商品价格 -->
<!-- 商品价格 -->
...
@@ -101,7 +101,7 @@
...
@@ -101,7 +101,7 @@
<!-- 商家名称 -->
<!-- 商家名称 -->
<view class="note-row align">
<view class="note-row align">
<view class="desc-member-left">
<view class="desc-member-left">
<image src="{{item.
note_image
}}"/>{{item.streamer_name}}</view>
<image src="{{item.
avatarUrl
}}"/>{{item.streamer_name}}</view>
<!-- todo 店铺功能尚未实现 -->
<!-- todo 店铺功能尚未实现 -->
<!-- <view class="desc-member-right">进店 ></view> -->
<!-- <view class="desc-member-right">进店 ></view> -->
</view>
</view>
...
...
app/nyx-dev/pages/share/share.js
查看文件 @
73dea9dc
...
@@ -71,6 +71,7 @@ Page({
...
@@ -71,6 +71,7 @@ Page({
*/
*/
selected
:
'@'
,
selected
:
'@'
,
likeUrl
:
"../../icon/activity/like_selected.png"
,
// like图标的url
likeUrl
:
"../../icon/activity/like_selected.png"
,
// like图标的url
redUrl
:
"../../icon/live/red.png"
,
// 在线图标的url
//directly to redis
//directly to redis
rankData_raw_like
:
{
rankData_raw_like
:
{
'@叁年间'
:
100
,
'@叁年间'
:
100
,
...
...
app/nyx-dev/pages/share/share.wxml
查看文件 @
73dea9dc
<!--pages/share/share.wxml-->
<!--pages/share/share.wxml-->
<view class="page">
<view class="page">
<!-- start key view -->
<!-- start key view -->
<view class="page__hd" style="position:fixed; top:0;width:
750rpx
;">
<view class="page__hd" style="position:fixed; top:0;width:
100%
;">
<view class="tab-title">
<view class="tab-title">
<view class="{{selected=='@'?'border-tottom':'default'}}" id="@" bindtap="selected">热度商家榜</view>
<view class="{{selected=='@'?'border-tottom':'default'}}" id="@" bindtap="selected">热度商家榜</view>
<view class="{{selected=='#'?'border-tottom':'default'}}" id="#" bindtap="selected">活跃主播榜</view>
<view class="{{selected=='#'?'border-tottom':'default'}}" id="#" bindtap="selected">活跃主播榜</view>
...
@@ -27,9 +27,14 @@
...
@@ -27,9 +27,14 @@
<!--end key view -->
<!--end key view -->
<!--公屏view-->
<!--公屏view-->
<view style="height:{{chatHeight}}rpx;position:fixed; bottom:0;">
<view style="height:{{chatHeight}}rpx;position:fixed; bottom:0;
width: 100%
">
<view class="weui-cell weui-cell_access">
<view class="weui-cell weui-cell_access">
<view class="weui-cell__bd">公屏发言</view>
<view class="live">
<view class="live-left">公屏发言</view>
<view class="live-right">
<view class="live-row"><image src="{{redUrl}}"></image>100在线</view>
</view>
</view>
</view>
</view>
<scroll-view scroll-y="true" scroll-top="{{scrollTop}}" style="height:{{chatHeight-80}}rpx;position:fixed; bottom:0;">
<scroll-view scroll-y="true" scroll-top="{{scrollTop}}" style="height:{{chatHeight-80}}rpx;position:fixed; bottom:0;">
<view class="wrapper {{isShowAdd?'media-padd':''}} {{isEmotion?'emotion-padd':''}}" id="wrapperCon" bindtap="cancelShow" >
<view class="wrapper {{isShowAdd?'media-padd':''}} {{isEmotion?'emotion-padd':''}}" id="wrapperCon" bindtap="cancelShow" >
...
...
app/nyx-dev/pages/share/share.wxss
查看文件 @
73dea9dc
...
@@ -305,7 +305,7 @@
...
@@ -305,7 +305,7 @@
height: 60rpx;
height: 60rpx;
background: #fff;
background: #fff;
border-top: 1px solid #fafafa;
border-top: 1px solid #fafafa;
padding: 16rpx;
padding: 16rpx
32rpx 16rpx 32rpx
;
line-height: 60rpx;
line-height: 60rpx;
display:flex;
display:flex;
flex-direction: row;
flex-direction: row;
...
@@ -317,7 +317,7 @@
...
@@ -317,7 +317,7 @@
.tab-content{
.tab-content{
height: 60rpx;
height: 60rpx;
background: #fff;
background: #fff;
padding: 16rpx
;
padding: 16rpx
0rpx 16rpx 16rpx; /* top right bottom (left)*/
}
}
.rank-info{
.rank-info{
background: #fff;
background: #fff;
...
@@ -329,10 +329,10 @@
...
@@ -329,10 +329,10 @@
.hidden{display:none;}
.hidden{display:none;}
/* rank-info */
/* rank-info */
.rank{width: 100%; display: flex; margin-top: 0rpx; align-items: center;}
.rank{width: 100%; display: flex; margin-top: 0rpx; align-items: center;
margin-bottom: 12rpx;
}
/* .rank-left{width: 50%; text-align: center;}
/* .rank-left{width: 50%; text-align: center;}
.rank-right{width: 50%; display: flex; justify-content: center;} */
.rank-right{width: 50%; display: flex; justify-content: center;} */
.rank-left{width: 50%; padding-left:100rpx;
margin-bottom: 12rpx;
}
.rank-left{width: 50%; padding-left:100rpx;}
.rank-right{width: 50%; display: flex; padding-left:100rpx;}
.rank-right{width: 50%; display: flex; padding-left:100rpx;}
.rank-right image{
.rank-right image{
width: 40rpx;
width: 40rpx;
...
@@ -342,4 +342,21 @@
...
@@ -342,4 +342,21 @@
.rank-row{
.rank-row{
display: flex;
display: flex;
flex-direction: row;
flex-direction: row;
}
align-items: center;
\ No newline at end of file
}
/* live-info */
/* top right bottom; 缺少了left,根据原则,则left的值有right来代替 */
.live{width: 100%; display: flex; margin-top: 0rpx; align-items: center;}
.live-left{width: 50%; padding-right: 116rpx;}
.live-right{width: 50%; display: flex; padding-left: 100rpx;}
.live-right image{
width: 40rpx;
height: 40rpx;
font-size: 0;
}
.live-row{
display: flex;
flex-direction: row;
align-items: center;
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论