Skip to content

N
nyx
Commit 73dea9dc by jscat
Options

nyx weapp: 页面更新 

1. 调整live及share的前端
parent bc9013b6
正在显示 包含 131 行增加 和 165 行删除
app/nyx-dev/config.js
......@@ -3,7 +3,7 @@
// env = 0; //本地java测试，需要启动java后台
// env = 1; //阿里云服务器测试版本
// env = 2; //阿里云服务器生产版本
var env = 1;
var env = 0;
var debug = 0; //是否打印调试信息
var host_key = "https://fun.hisuhong.com";
......@@ -82,5 +82,6 @@ var config={
image_url: host_key + "/images/",
redis_update_like_url: host_key + "/api/nyx/redis/update/like",
redis_query_like_url: host_key + "/api/nyx/redis/search/like",
live_query_url: host_key + "/api/nyx/live/query",
}
module.exports=config;
\ No newline at end of file
app/nyx-dev/pages/live/live-info/live-info.js
......@@ -47,7 +47,7 @@ Page({
//格式示例数据，可为空
allContentList: [],
num: 0,
sid: "key",
sid: "",
chatUserInfo: {},
scrollTop: 0,
......@@ -70,6 +70,7 @@ Page({
*/
selected : '@',
likeUrl: "../../../icon/activity/like_selected.png", // like图标的url
redUrl: "../../../icon/live/red.png", // 在线图标的url
//directly to redis
rankData_raw_like: {
'@叁年间' : 100,
......@@ -96,6 +97,8 @@ Page({
tabBarHeight: 0,
streamer_name: "",
title: "",
num_watcher: "",
},
......@@ -149,13 +152,17 @@ Page({
//step2: 获取上一页面传入的数据
var sid = _this.__data__.sid
var streamer_name = _this.__data__.streamer_name
var title = _this.__data__.title
var num_watcher = _this.__data__.num_watcher
if ( options.sid != "")
{
sid = options.sid;
title = options.title;
num_watcher = options.num_watcher;
streamer_name = options.streamer_name;
}
_this.setData({ sid, streamer_name })
_this.setData({ sid, streamer_name, title, num_watcher })
//初始化socket
if (app.globalData.socketTask.readyState != 1 && app.globalData.socketTask.readyState != 0) {
......
app/nyx-dev/pages/live/live-info/live-info.wxml
<!--pages/share/share.wxml-->
<view class="page">
<!-- 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="{{selected=='@'?'border-tottom':'default'}}" id="@" bindtap="selected">热度商家榜</view>
<view class="{{selected=='#'?'border-tottom':'default'}}" id="#" bindtap="selected">活跃主播榜</view>
......@@ -15,7 +15,7 @@
<view class="rank">
<view class="rank-left">{{item.name}}</view>
<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>
......@@ -27,10 +27,16 @@
<!--end key 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__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>
<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" >
<!-- 消息列表 -->
......
app/nyx-dev/pages/live/live-info/live-info.wxss
......@@ -55,7 +55,7 @@ padding-bottom: 100rpx;
}
.message-list {
margin: 10rpx 30rpx 30rpx;
margin: 10rpx 32rpx 32rpx 32rpx;
}
.chat {
......@@ -305,7 +305,7 @@ vertical-align: middle;
height: 60rpx;
background: #fff;
border-top: 1px solid #fafafa;
padding: 16rpx;
padding: 16rpx 32rpx 16rpx 32rpx;
line-height: 60rpx;
display:flex;
flex-direction: row;
......@@ -315,9 +315,9 @@ flex:auto;
text-align:center;
}
.tab-content{
height: 60rpx;
background: #fff;
padding: 16rpx;
height: 60rpx;
background: #fff;
padding: 16rpx 0rpx 16rpx 16rpx; /* top right bottom (left)*/
}
.rank-info{
background: #fff;
......@@ -342,4 +342,21 @@ font-size: 0;
.rank-row{
display: flex;
flex-direction: row;
}
\ No newline at end of file
align-items: center;
}
/* 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
......@@ -23,21 +23,6 @@ Page({
city: "",
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,
pageIndex: 1, //分页搜索的page index
......@@ -57,46 +42,34 @@ Page({
//二维码信息
qRCodeMsg: "",
//活动类型
activityType: "00-饮事",
//现场类型
liveType: "",
lives: [
{
sid: "134",
note_image: "https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/wx72555e77d9e5cee2.o6zAJszSNHnFKy8FTV5dg-Z7XDzQ.WaSJaxPezrVxcdaf58fbf674e7d3be131826ff708fa6.jpg",
title: "巅峰赛第一",
city: "上海",
address: "静安南京西某地",
num_watcher: 1029,
streamer_name: "Azz·口袋",
streamer_logo: "../../icon/icon_avatar3.png"
},
{
sid: "123",
note_image: "https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/wx72555e77d9e5cee2.o6zAJszSNHnFKy8FTV5dg-Z7XDzQ.WaSJaxPezrVxcdaf58fbf674e7d3be131826ff708fa6.jpg",
title: "单排84-101 把把C 不混",
city: "上海",
address: "老码头",
num_watcher: 2040,
streamer_name: "六尾【混子】",
streamer_logo: "../../icon/icon_avatar3.png"
},
// {
// sid: "134",
// note_image: "https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/wx72555e77d9e5cee2.o6zAJszSNHnFKy8FTV5dg-Z7XDzQ.WaSJaxPezrVxcdaf58fbf674e7d3be131826ff708fa6.jpg",
// title: "巅峰赛第一",
// city: "上海",
// address: "静安南京西某地",
// num_watcher: 1029,
// streamer_name: "Azz·口袋",
// streamer_logo: "../../icon/icon_avatar3.png"
// },
// {
// sid: "123",
// note_image: "https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/wx72555e77d9e5cee2.o6zAJszSNHnFKy8FTV5dg-Z7XDzQ.WaSJaxPezrVxcdaf58fbf674e7d3be131826ff708fa6.jpg",
// title: "单排84-101 把把C 不混",
// city: "上海",
// address: "老码头",
// num_watcher: 2040,
// streamer_name: "六尾【混子】",
// 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) {
wx.navigateTo({
......@@ -208,43 +181,18 @@ Page({
)
// step5 初始载入四个推荐的活动 - local page
if(_this.__data__.activities.length == 0)
// step5 初始载入四个直播的活动 - local page
if(_this.__data__.lives.length == 0)
{
var switchId = app.globalData.switchId
var curIndex = switchId != ""? switchId : _this.__data__.curIndex
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,
});
app.globalData.switchId = ""
var liveType = _this.__data__.liveType
_this.getActivities(0, 1, 4, strCity, activityType, strCategory, strSearch);
_this.getLives(0, 1, 4, strCity, liveType, strSearch);
}
// step6 event 订阅, 主要接受activity-info.js里 emit 发送的消息 local page
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 窗口初始化
// step6 窗口初始化
var device = wx.getSystemInfoSync()
//self.device = app.globalData.myDevice
// jscat miniprogram default width is 750rpx
......@@ -331,7 +279,7 @@ Page({
console.log('加载更多')
setTimeout(() => {
_this.getActivities(1, pageIndex, 4, strCity, activityType, strCategory, strSearch);
//_this.getActivities(1, pageIndex, 4, strCity, activityType, strCategory, strSearch);
}, 1000)
}
else {
......@@ -350,7 +298,7 @@ Page({
* 用户自定义函数
*
*/
// 获取Activities数据
// 获取Lives数据
// scrollType: 是否是翻页
/*
搜索逻辑:
......@@ -358,15 +306,14 @@ Page({
2. tab, tag=strSearch
3. 新增的search tab, '搜索'tab的时候，需要转换为搜索的关键词(_this.__data__.strSearch)
*/
getActivities: function (scrollType, pageNum, pageCount, strCity, activityType, strCategory, strSearch) {
getLives: function (scrollType, pageNum, pageCount, strCity, liveType, strSearch) {
var _this = this;
// 如果是"推荐"和"搜索"，需要单独处理
// '搜索'tab的时候, 需要转换为搜索的关键词(_this.__data__.strSearch)
var query_url = '&title=' + strSearch + '&orderType=' + strCategory + '&city=' + strCity
+ '&activityType=' + activityType
var strUrl = config.activity_query_url + "?pageCount=" + pageCount
var query_url = '&title=' + strSearch + '&city=' + strCity
+ '&liveType=' + liveType
var strUrl = config.live_query_url + "?pageCount=" + pageCount
+ "&pageNum=" + pageNum + query_url
config.debug == 1 ? console.log("===strUrl is: \"" + strUrl + "\"") : ""
wx.request({
......@@ -386,67 +333,33 @@ Page({
}
for (var i = 0; i < res.data.data.length; i++) {
var index_id = i + _this.__data__.activities.length
var result = {}
result["activity_id"] = res.data.data[i].activityId
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["live_id"] = res.data.data[i].liveId
result["title"] = res.data.data[i].title
result["num_like"] = res.data.data[i].numLike
result["content"] = res.data.data[i].content
result["quiz"] = res.data.data[i].quiz
result["point"] = res.data.data[i].point
result["address_name"] = res.data.data[i].addressName
result["product_desc"] = res.data.data[i].productDesc
result["unit_price"] = res.data.data[i].unitPrice.toFixed(2)
result["city"] = res.data.data[i].city
result["address"] = res.data.data[i].address
result["num_watcher"] = res.data.data[i].numWatcher
result["max_watcher"] = res.data.data[i].maxWatcher
result["streamer_name"] = res.data.data[i].nyxName
result["avatarUrl"] = res.data.data[i].avatarUrl
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
result["start_datetime"] = start_datetime
result["end_datetime"] = end_datetime
var url_quiz = "../activity/quiz-info/quiz-info?"
+"activity_id="+result["activity_id"]
+"&index_id="+index_id
+"&note_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
+"&note_image="+res.data.data[i].noteImage //传递原始string数据, List不正确
var url_live = "../live/live-info/live-info?"
+"sid="+result["live_id"]
+"&title="+result["title"]
+"&content="+result["content"]
+"&address_name="+result["address_name"]
+"&unit_price="+result["unit_price"]
+"&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
+"&num_watcher="+result["num_watcher"]
+"&streamer_name="+result["streamer_name"]
result["url_live"] = url_live
list.push(result)
}
//进行翻页设置（加载更多）
if (scrollType == 1) {
var activitiesList = _this.__data__.activities;
list = activitiesList.concat(list)
var livesList = _this.__data__.lives;
list = livesList.concat(list)
}
_this.setData({
activities: list,
lives: list,
pageIndex: pageNum + 1,
isHideLoadMore: bisHideLoadMoreType,
})
......@@ -477,7 +390,7 @@ Page({
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({
var strCategory = _this.__data__.category[curIndex].order
var activityType = _this.__data__.activityType
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({
strSearch: strSearch,
......@@ -631,7 +544,7 @@ Page({
var strCategory = _this.__data__.category[curIndex].order
var strSearch = _this.__data__.strSearch
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
......@@ -84,11 +84,11 @@
<view class="item stamp stamp01">
<!-- 商品信息 -->
<view class="note-row">
<navigator url='live-info/live-info?sid={{item.sid}}&streamer_name={{item.streamer_name}}' >
<navigator url='{{item.url_live}}' >
<image class="writer-image" src="{{item.note_image}}"/>
</navigator>
<view class="note-column">
<navigator url='live-info/live-info?sid={{item.sid}}&streamer_name={{item.streamer_name}}' >
<navigator url='{{item.url_live}}' >
<!-- 商家信息 -->
<text>{{item.title}}</text>
<!-- 商品价格 -->
......@@ -101,7 +101,7 @@
<!-- 商家名称 -->
<view class="note-row align">
<view class="desc-member-left">
<image src="{{item.note_image}}"/>{{item.streamer_name}}</view>
<image src="{{item.avatarUrl}}"/>{{item.streamer_name}}</view>
<!-- todo 店铺功能尚未实现 -->
<!-- <view class="desc-member-right">进店 ></view> -->
</view>
......
app/nyx-dev/pages/share/share.js
......@@ -71,6 +71,7 @@ Page({
*/
selected : '@',
likeUrl: "../../icon/activity/like_selected.png", // like图标的url
redUrl: "../../icon/live/red.png", // 在线图标的url
//directly to redis
rankData_raw_like: {
'@叁年间' : 100,
......
app/nyx-dev/pages/share/share.wxml
<!--pages/share/share.wxml-->
<view class="page">
<!-- 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="{{selected=='@'?'border-tottom':'default'}}" id="@" bindtap="selected">热度商家榜</view>
<view class="{{selected=='#'?'border-tottom':'default'}}" id="#" bindtap="selected">活跃主播榜</view>
......@@ -27,9 +27,14 @@
<!--end key 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__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>
<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" >
......
app/nyx-dev/pages/share/share.wxss
......@@ -305,7 +305,7 @@
height: 60rpx;
background: #fff;
border-top: 1px solid #fafafa;
padding: 16rpx;
padding: 16rpx 32rpx 16rpx 32rpx;
line-height: 60rpx;
display:flex;
flex-direction: row;
......@@ -317,7 +317,7 @@
.tab-content{
height: 60rpx;
background: #fff;
padding: 16rpx;
padding: 16rpx 0rpx 16rpx 16rpx; /* top right bottom (left)*/
}
.rank-info{
background: #fff;
......@@ -329,10 +329,10 @@
.hidden{display:none;}
/* 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-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 image{
width: 40rpx;
......@@ -342,4 +342,21 @@
.rank-row{
display: flex;
flex-direction: row;
}
\ No newline at end of file
align-items: center;
}
/* 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 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论