nyx weapp: 功能更新

1. 实现多播放窗口

nyx weapp: 功能更新
1. 实现多播放窗口
8d728f61 · jscat · 465d59c3 · 8d728f61 · 8d728f61 · 8d728f61
Commit 8d728f61 authored Nov 25, 2020 by jscat
--- a/app/nyx-dev/app.json
+++ b/app/nyx-dev/app.json
 {
  "pages": [        
-    "pages/activity/activity",
-    "pages/share/share",
    "pages/live/live",
    "pages/live/live-info/live-info",        
+    "pages/activity/activity",
+    "pages/share/share",
    "pages/mall/order/order",  
    "pages/activity/activity-list/activity-list",
  	"pages/my/my-members/my-members",    

--- a/app/nyx-dev/pages/live/live-info/live-info.js
+++ b/app/nyx-dev/pages/live/live-info/live-info.js
--- a/app/nyx-dev/pages/live/live-info/live-info.wxml
+++ b/app/nyx-dev/pages/live/live-info/live-info.wxml
-<wxs module="tutil" src="./../../../utils/date.wxs"></wxs>
-
+<!--pages/share/share.wxml-->
 <view class="page">
-
-  <!-- 图片 -->
-  <scroll-view class="scroll-view_H" scroll-x scroll-with-animation style="width: 100%;height: 100%;">
-      <block wx:for="{{activityInfo.note_image}}"  wx:key="unique" wx:for-index="id" wx:for-item="item">
-        <view class="scroll_item">
-          <image src="{{item}}" mode="widthFix"/>
-        </view>
-      </block>
-  </scroll-view>
-
-  <!-- 文字内容 -->
-  <view class="note">
-    <view class="note-price" style="font-weight: bold">      
-      <view class="clone">
-        <view class="clone-left">￥{{products[curIndex].unitPrice}}</view>
-
-        <!-- start 点赞 like -->
-        <block>
-          <view class="clone-right" bindtap="onSubmitLike" data-id='{{activityInfo.activity_id}}'>
-            <view class="note-column" style="font-size: 24rpx;font-weight:normal;color: #000;align-items:center">
-              <image src="{{likeUrl}}"></image>
-              {{activityInfo.num_like}}
+<!-- start key view -->
+<view class="page__hd" style="position:fixed; top:0;width: 750rpx;">
+  <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>
+  <!-- start_of_tab-content -->
+  <scroll-view scroll-y="true" scroll-top="0">
+  <view class="tab-content" style="height:{{keyHeight}}rpx;">    
+    <view class="rank-info" wx:for="{{rankData}}" 
+              wx:key="{{item.id}}" data-id="{{item.id}}" data-index="{{index}}" 
+              bindtap="switchCategory">
+      <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>
-        </block>
-        <!-- end 点赞 like -->
-        <!-- start 克隆 -->
-        <block wx:if="{{members.length > 0}}">
-          <view class="clone-right" bindtap="onClickClone" data-id='{{activityInfo.activity_id}}'>
-            <view class="note-column" style="font-size: 24rpx;font-weight:normal;color: #000;align-items:center;margin-left: 10rpx;">
-              <image src="../../../icon/activity/clone.png"></image>
-              克隆
      </view>
    </view> 
-        </block>
-        <!-- end 克隆 -->
  </view>
+  </scroll-view>
+  <!-- end_of_tab-content -->
+</view>

-    </view>
+<!--end key view -->

-    <view class="note-content" style="display: flex; flex-direction: column">
-      <span>主题: {{activityInfo.title}}</span>
-      <span>类别: 
-        <view class="cate-list {{curIndex==index?'on':''}}" wx:for="{{products}}" 
-          wx:for-item="sub_item" wx:key="{{index}}" data-index="{{index}}" bindtap="switchCategory">
-            {{sub_item.productDesc}}
+<!--公屏view-->
+<view style="height:{{chatHeight}}rpx;position:fixed; bottom:0;">
+<view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd">{{streamer_name}}</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" >
+  <!-- 消息列表 -->
+  <view class="chat {{item.type=='L'?'chat-l':'chat-r'}}" wx:for="{{messageList}}" wx:for-item="item">
+    <!-- <view class="c-date">2019年3月23日 15:33</view> -->
+    <view class="message-list">
+      <view class="avater {{item.type=='R'?'avater-r':''}}">
+      <!-- refer https://www.jianshu.com/p/7ad22e35b556 -->
+        <image src='{{item.avater}}' bindtouchstart='touchstart_long' bindtouchend='touchEnd' data-id="{{item.nickName}}"></image>
+        <view class="{{item.type=='R'?'nick-name-r':'nick-name-l'}}" wx:if="{{item.type=='L'}}">{{item.nickName}}</view>
+        <view class="{{item.type=='R'?'nick-name-r':'nick-name-l'}}" wx:if="{{item.type=='R'}}">{{item.nickName}}</view>
      </view>
-      </span>
-
-      <!-- 日期 -->
-      <span>日期: {{tutil.formatDate_ymdw_today_interval(activityInfo.start_datetime, activityInfo.end_datetime)}}</span>
-
-      <!-- 时间 -->
-      <span>时间: {{tutil.formatDate_hm_interval(activityInfo.start_datetime, activityInfo.end_datetime)}}</span>
-
-      <span>地点: {{activityInfo.address_name}}</span>
+      <view class="chat-con {{item.type=='L'?'chat-con-l':'chat-con-r'}} ">
+        <rich-text wx:if="{{item.messageType=='txt'}}" nodes="{{item.con}}"></rich-text>
+        <image class="message-img" mode="widthFix" bindtap="imagePreview" data-src="{{item.con}}" wx:if="{{item.messageType=='img'}}" src="{{item.con}}"></image>
      </view>
-    <view class="note-content">
-      <text>内容: {{activityInfo.content}}</text>
    </view>
  </view>
+</view>
+</scroll-view>
+</view>

-  <!-- 企业信息 -->
-  <view class="note-row">
-      <view class="note-column-left align justify">
-        <image class="writer-image" src="{{activityInfo.member_logo}}"/>
-      </view>
-      <view class="note-column" style="margin-right: 4%">
-        <span class="name">{{activityInfo.member_name}}</span>
-        <span class="name">{{activityInfo.member_slogan}}</span>
-      </view>
+<!-- 消息输入 -->
+<view class="message-input" style="position:absolute; bottom:{{bottom_val}}rpx">
+  <input class="{{isShowAdd?'':'showSend'}}" placeholder="请输入内容" type="text" value="{{messageInputVal}}" cursor-spacing="20" bindinput='messageInput' confirm-type="send" bindconfirm="messageSend" bindfocus="inputFocus" bindblur="inputBlur" adjust-position="{{false}}" />
+  <button bindtap="messageSend" wx:if="{{!isShowAdd}}">发送</button>
+  <image mode="widthFix" class="input-img {{isShowAdd?'':'showAdd'}}" src='../../../icon/chat/face1.png' id="face" bindtap="openEmotion"></image>
+  <image mode="widthFix" class="input-img" wx:if="{{isShowAdd}}" src='../../../icon/chat/add1.png' id="add" bindtap="openMedia"></image>
+  <!-- 媒体文件选择 -->
+  <view class="media-box" wx:if="{{isMedia}}">
+    <view class="media-list" bindtap="selectImg">
+      <image mode="widthFix" class="media-img" src='../../../icon/chat/img2.png'></image>
+      <view>相册图片</view>
+    </view>
+    <view class="media-list" bindtap="selectCamera">
+      <image mode="widthFix" class="media-img" src='../../../icon/chat/cam2.png'></image>
+      <view>相机拍照</view>
+    </view>
+  </view>  
+  <!-- 表情文件 -->
+  <view class="emotion-box" wx:if="{{isEmotion}}">
+    <swiper class="home-swiper" indicator-dots="true" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" indicator-dots="{{indicatorDots}}">
+      <swiper-item class="emotion-list">
+        <block wx:for-items="{{emotionArr}}" wx:key='index' wx:if="{{index<23}}">
+          <image bindtap="selectEmotion" data-txt="{{item.text}}" src="{{emotionHost+item.name}}.png" class="slide-image" />
+        </block>
+        <image src="../../../icon/chat/delete.png" bindtap="deleteVal" class="slide-image" />
+      </swiper-item>
+      <swiper-item class="emotion-list">
+        <block wx:for-items="{{emotionArr}}" wx:key='index' wx:if="{{index>=23&&index<46}}">
+          <image bindtap="selectEmotion" data-txt="{{item.text}}" src="{{emotionHost+item.name}}.png" class="slide-image" />
+        </block>
+        <image src="../../../icon/chat/delete.png" bindtap="deleteVal" class="slide-image" />
+      </swiper-item>
+       <swiper-item class="emotion-list">
+        <block wx:for-items="{{emotionArr}}" wx:key='index' wx:if="{{index>=46&&index<69}}">
+          <image bindtap="selectEmotion" data-txt="{{item.text}}" src="{{emotionHost+item.name}}.png" class="slide-image" />
+        </block>
+        <image src="../../../icon/chat/delete.png" bindtap="deleteVal" class="slide-image" />
+      </swiper-item>
+       <swiper-item class="emotion-list">
+        <block wx:for-items="{{emotionArr}}" wx:key='index' wx:if="{{index>=69&&index<92}}">
+          <image bindtap="selectEmotion" data-txt="{{item.text}}" src="{{emotionHost+item.name}}.png" class="slide-image" />
+        </block>
+        <image src="../../../icon/chat/delete.png" bindtap="deleteVal" class="slide-image" />
+      </swiper-item> 
+    </swiper>
  </view>
+</view>

-  <view class="bottom_placeholder"></view>
-
-  <!-- start bottom-->
-  <!-- refer to https://www.jb51.net/article/129438.htm -->
-  <view class="page__bd">
-    <view class="weui-tabbar">
-        <view class="weui-tabbar__item" bindtap="toHome">
-            <view style="position: relative;display:inline-block;">
-              <image src="../../../icon/index.png" class="weui-tabbar__icon" style="width: 48rpx; height:48rpx"></image>
-            </view>
-            <view class="weui-tabbar__label">首页</view>
-        </view>
-        <view class="weui-tabbar__item">
-            <view style="position: relative;display:inline-block;">
-              <button class="share" open-type="share"></button>
-              <image src="../../../icon/activity/share.png" class="weui-tabbar__icon" style="width: 48rpx; height:48rpx"></image>
-            </view>
-            <view class="weui-tabbar__label">分享</view>
-        </view>
-        <!-- todo toBuy 因为现在还没跟商家谈妥 -->
-        <!-- <view class="weui-tabbar__item">
-            <view style="position: relative;display:inline-block;">
-              <button class="button-red" bindtap="toBuy">立即购买</button>
-            </view>
-        </view> -->
-        <!-- toOrder 仅仅是先预定 -->
-        <view class="weui-tabbar__item">
-            <view style="position: relative;display:inline-block;">
-              <button class="button-red" bindtap="toOrder">立即预定</button>
-            </view>
-        </view>        
-    </view>
-  </view>
-  <!-- end bottom-->

 </view>
+
+
+
--- a/app/nyx-dev/pages/live/live-info/live-info.wxss
+++ b/app/nyx-dev/pages/live/live-info/live-info.wxss
-.scroll-view_H{
-    position: relative;
-    width: 100%;
-    text-align: center;
-    transform: scale(1); 
-    white-space: nowrap;
+.page{
+  height: 100vh;
+  background: #F4F8FB;
 }
-.scroll_item {
-  position: relative;
-  width: 100%;
-  height: 100%;
-  margin: 0;
-  transform-origin: 50% 0;
-  left: 0%;
-  display: inline-block;
-  /* border-radius: 20rpx !important ; */
-  overflow: hidden;
-  /* transform: scale(0.9); */
+.weui-cell__hd {
+  font-size: 0;
+}
+.weui-cell__hd image {
+  width: 100rpx;
+  height: 100rpx;
+  margin-right: 18px;
+  margin-left: 5px;
  vertical-align: middle;
-  /* top: 0%; */
-  /* height: 72%; */
-  background-color: #fff;
- }
-.scroll_item:first-child{
-    margin: 0%;
-    left: 0;
-}
-.scroll_item:last-child{
-    margin: 0;
-    left: 0;
-}
-.scroll_item.selected{
-     /* transform: scale(0.9); */
-     border: solid 0px #ffcd54;
-}
-.scroll_item image {
-    width: 100%;
-    float: left;
-    margin-top: 0;
 }
-.note{
-  width: 100%;
-  /* position: fixed; */
-  background: #fff;
-  border-radius: 5rpx;
-  float: left;
-  margin-top: 20rpx;
-  margin-bottom: 20rpx;
-}
-
-.note-title{
-  font-size: 30rpx;
-  margin-left: 5%;
-  margin-right: 5%;
-  margin-top: 0;
-  text-align:justify;
-}
-
-.note-price{
-  font-size: 16px;
-  margin-left: 5%;
-  margin-right: 5%;
-  margin-top: 0;
-  text-align:justify;
-  color: #FF6600;
-}
-
-
-.note-content{
-  font-size: 32rpx;
-
-  /* 后期用于 '展开' 功能 */
-  /* overflow : hidden;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-line-clamp: 4;
-  -webkit-box-orient: vertical; */
-  margin-left: 5%;
-  margin-right: 4%;
-  /* margin-top: 20rpx; */
-  text-align:justify;
-}
-.note-row{
-  width: 100%;
-  display: flex;
-  flex-direction: row;
-  margin-bottom: 30rpx;
-  margin-top: 30rpx;  
+.weui-cell__ft_in-access {
+  padding-right:13px;
+  position:relative;
 }
-.note-column{
+.userInfo{
+  width: 100%;
  display: flex;
  flex-direction: column;
-  margin-left: 30rpx;
+  align-items: center;
+  justify-content: center;
+  overflow: hidden;
 }
-.note-column-left{
-  width : 140rpx;
-  margin-left: 5%;
-  display: flex;
+.thumb{
+  width: 120rpx;
+  height: 120rpx;
+  border-radius: 50%;
+  overflow: hidden;
 }
-.writer-image{
-  width: 140rpx;
-  height: 140rpx;
+.name{
+  margin: 30rpx;
 }

-/* start bottom style */
- .column {
-  display: flex;
-  flex-direction: column;
- }
- .row {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
- }
- .bottom_line {
-  width: 100%;
-  height: 2rpx;
-  background: lightgray;
- }
+/* 公屏 */
+/*轮播控件 - start*/

- .bottom_placeholder {
-  position: relative;
-  width: 100%;
-  height: 160rpx;
-  line-height: 10rpx;
- }
+.home-swiper {
+width: 100%;
+height: 400rpx;
+}

- .bottom_total {
-  position: fixed;
-  display: flex;
-  flex-direction: column;
-  bottom: 0;
-  width: 100%;
-  height: 160rpx;
-  line-height: 10rpx;
-  background: white;
- }
- .button-red {
-  background-color: #f44336; /* 红色 */
-  font-size: 14px;
- }
- .button-brown {
-  background-color: #D1A96E; /* 红色 */
- }
- button {
-  color: white;
-  text-align: center;
-  font-size:32rpx;
-  height: 2.6em;
-  line-height: 2.6em;
- }
-
- .placeholder{
-  margin-left: 20rpx;
-  margin-right: 20rpx;
-  text-align: center;
-  /* vertical-align: middle; */
-  padding: 0 10px;
-  line-height: 2.3em;
-  color: rgba(0,0,0);
-}
-/* justify-content: center;(水平居中)  align-items: center;(垂直居中) */
-.justify{
-  justify-content: center;
+.slide-image {
+width: 100%;
+height: 100%;
 }
-.align{
-  align-items: center;
+
+/*轮播控件 - end*/
+
+.wrapper {
+padding-top: 20rpx;
+padding-bottom: 100rpx;
 }

-.list .items{
-  display: flex;
-  flex-direction: column;
-  text-align: center;
-  align-items: center;
+.message-list {
+margin: 10rpx 30rpx 30rpx;
 }
-.items image{
-  width: 60rpx;
-  height: 60rpx;
-  margin-top: 20rpx;
-  font-size: 0;
+
+.chat {
+height: 100%;
+display: flex;
+flex-direction: column;
+justify-content: space-between;
+box-sizing: border-box;
+}
+
+.chat-con {
+padding: 20rpx;
+border-radius: 8rpx;
+font-size: 30rpx;
+color: #333;
+position: relative;
 }
-.items text{
-  /* display: block; */
-  text-align: center;
-  margin-top: 0rpx;
-  margin-bottom: 20rpx;
-  padding: 0rpx;
-  font-size: 28rpx;
+
+/* left-message */
+
+.chat-l {
+align-items: flex-start;
 }

-.list{
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  margin-left: 30rpx;
-  margin-right: 30rpx;
-  margin-top: 20rpx;
-}
- /* end bottom style */
-
- /* 分享按钮 */
-.share {
-  position: absolute;
-  background-size: 50rpx 50rpx;
-  opacity: 0;
-  border:none;
-}
-
-/* 克隆图片 */
-.clone{width: 100%; display: flex; margin-top: 0rpx; align-items: center;}
-.clone-left{width: 80%; }
-.cloner-right{width: 20%;}
-.clone-right image{
-    width: 40rpx;
-    height: 40rpx;
-    font-size: 0;
-  }
-
-  .weui-tabbar{
-    position:fixed;
-    bottom:0;
-    left:0;
-    right:0;
-  }
-
-  .cate-list{
-    display: inline;
-    /* margin: 15rpx 22rpx; */
-    text-align: center;
-    font-size: 32rpx;
-    /* color: #9d9d9d; */
-    background: #F4F4F4;
-    margin-right: 20rpx;
-    padding-right: 10rpx;
-    padding-top: 10rpx;
-    padding-bottom: 10rpx;
-  }
-  .cate-list.on {
-    color: #FF6600;
-    font-weight: bold;
-    /* 
-      border:1px solid #FF6600;
-      border-radius: 6rpx; 
-    */
-  }
+.avater {
+width: 90rpx;
+height: 90rpx;
+position: relative;
+}
+
+.avater>image {
+width: 100%;
+height: 100%;
+display: block;
+border-radius: 10%;
+}
+
+.chat-con-l {
+background-color: #fff;
+margin-left: 120rpx;
+margin-top: -50rpx;
+}
+
+.chat-con-l::after {
+content: '';
+border-width: 20rpx;
+border-style: solid;
+border-color: transparent #fff transparent transparent;
+position: absolute;
+top: 18rpx;
+left: -28rpx;
+}
+
+/* right-message */
+
+.chat-r {
+align-items: flex-end;
+}
+
+.chat-con-r {
+background-color: #7dca4a;
+margin-right: 120rpx;
+margin-top: 35rpx;
+}
+
+.chat-con-r::after {
+content: '';
+border-width: 20rpx;
+border-style: solid;
+border-color: transparent transparent transparent #7dca4a;
+position: absolute;
+top: 18rpx;
+right: -28rpx;
+}
+
+.avater-r {
+float: right;
+}
+
+/* input-message */
+
+.message-input {
+position: fixed;
+bottom: 0;
+width: 100%;
+background-color: #efefef;
+padding: 20rpx 0 0;
+z-index: 99;
+}
+
+.message-input>input {
+font-size: 30rpx;
+border: solid #ddd 1rpx;
+width: 71%;
+min-height: 60rpx;
+height: 100%;
+margin-left: 20rpx;
+padding: 5rpx 10rpx;
+border-radius: 8rpx;
+margin-bottom: 15rpx;
+color: #333;
+background-color: #fff;
+}
+
+.showSend{
+width:65% !important;
+}
+
+.showAdd {
+left:73% !important;
+}
+
+.message-input>button {
+width: 100rpx;
+height: 60rpx;
+background-color: #7dca4a;
+font-size: 28rpx;
+color: #fff;
+margin-top: -82rpx;
+float: right;
+margin-right: 20rpx;
+padding: 0;
+line-height: 60rpx;
+}
+
+.input-m {
+width: 500rpx;
+max-width: 500rpx;
+height: 70rpx;
+max-height: 70rpx;
+border: solid red 1px;
+margin-left: 80rpx;
+position: relative;
+display: inline-block;
+top: -80rpx;
+overflow-y: scroll;
+background-color: #fff;
+}
+
+.c-date {
+font-size: 26rpx;
+color: #999;
+padding: 10rpx 0 30rpx;
+text-align: center;
+width: 100%;
+}
+
+.message-input .input-img {
+width: 60rpx;
+height: 60rpx;
+}
+
+#rec {
+position: absolute;
+top: 26rpx;
+left: 10rpx;
+}
+
+#face {
+position: absolute;
+top: 20rpx;
+left: 80%;
+}
+
+#add {
+position: absolute;
+top: 20rpx;
+left: 90%;
+}
+
+.nick-name-l {
+position: absolute;
+top: -2%;
+left: 138%;
+z-index: 2;
+font-size: 24rpx;
+color: #666;
+width: 200rpx;
+}
+
+.nick-name-r {
+position: absolute;
+top: -10%;
+right: -25%;
+z-index: 2;
+font-size: 24rpx;
+color: #666;
+width: 200rpx;
+}

+.media-img {
+width: 120rpx;
+height: 120rpx;
+display: inline-block;
+}
+
+.media-box {
+background-color: #f0f0f0;
+border-top: solid #e1e1e1 1rpx;
+
+}
+
+.media-list {
+width: 150rpx;
+height: 150rpx;
+padding: 10px;
+text-align: center;
+display: inline-block;
+}
+
+.media-list>view {
+font-size: 26rpx;
+color: #666;
+}
+
+.emotion-box {
+background-color: #f0f0f0;
+padding-bottom: 40rpx;
+border-top: solid #e1e1e1 1rpx;
+
+}
+
+.emotion-list {
+margin: 20rpx auto 0;
+text-align: center;
+}
+
+.emotion-list>image {
+width: 55rpx;
+height: 55rpx;
+margin: 15rpx 30rpx;
+}
+.emotion-padd {
+padding-bottom: 77% !important;
+}
+.media-padd{
+padding-bottom: 42% !important;
+}
+.message-img {
+width: 300rpx;
+height: 200rpx;
+display: inline-block;
+vertical-align: middle;
+}
+
+.tab-title{
+height: 60rpx;
+background: #fff;
+border-top: 1px solid #fafafa; 
+padding: 16rpx; 
+line-height: 60rpx;
+display:flex;
+flex-direction: row;
+}
+.tab-title view{
+flex:auto;
+text-align:center;
+}
+.tab-content{
+height: 60rpx;
+background: #fff;
+padding: 16rpx;
+}
+.rank-info{
+background: #fff;
+}
+.border-tottom{
+border-bottom:1rpx solid red;
+}
+.show{display:block;}
+.hidden{display:none;}
+
+/* rank-info */
+.rank{width: 100%; display: flex; margin-top: 0rpx; align-items: center;}
+/* .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-right{width: 50%; display: flex; padding-left:100rpx;}
+.rank-right image{
+width: 40rpx;
+height: 40rpx;
+font-size: 0;
+}
+.rank-row{
+display: flex;
+flex-direction: row;
+}
\ No newline at end of file
--- a/app/nyx-dev/pages/live/live.js
+++ b/app/nyx-dev/pages/live/live.js
@@ -60,6 +60,25 @@ Page({
    //活动类型
    activityType: "00-饮事",

+    lives: [
+      {
+        sid: "134",
+        note_image: "https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/wx72555e77d9e5cee2.o6zAJszSNHnFKy8FTV5dg-Z7XDzQ.WaSJaxPezrVxcdaf58fbf674e7d3be131826ff708fa6.jpg",
+        title: "巅峰赛第一",
+        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 不混",
+        num_watcher: 2040,
+        streamer_name: "六尾【混子】",            
+        streamer_logo: "../../icon/icon_avatar3.png"
+      }, 
+    ],
+
  },

  switchCategory(e) {

--- a/app/nyx-dev/pages/live/live.wxml
+++ b/app/nyx-dev/pages/live/live.wxml
 <wxs module="tutil" src="./../../utils/date.wxs"></wxs>

+<!--
+  现场模快
+  需求重点: 谁看, 看什么, 
+  需求目标: 专业+好玩  
+  Req1-11_25 
+  1. 现场标签: 图片, 名字, 在看人数, 主播
+  2. 搜索形式: 城市 + 搜索框(店名)
+  3. 展示形式: 我关注的人(id), 在看自动倒序()
+  4. 播放形式: 图文
+ -->
+
 <view class="page">
  <!-- 搜索框 -->
  <!--refer https://blog.csdn.net/weixin_44022446/article/details/86438015  -->
@@ -74,13 +85,6 @@
  </view>

  <!-- 导航栏 -->
-  <view class="navBar" >
-    <scroll-view class="navBar-box" scroll-x="true" style="white-space: nowrap; display:flex ">
-        <view class="cate-list {{curIndex==index?'on':''}}" wx:for="{{category}}" 
-              wx:key="{{item.id}}" data-id="{{item.id}}" data-index="{{index}}" 
-              bindtap="switchCategory">{{item.name}}</view>
-    </scroll-view>
-  </view>

  <!-- 文章列表 -->
  <!--
@@ -92,33 +96,28 @@

  -->
  <!-- Content: refer to 有品·优惠券 + 点评(可使用) -->
-  <view class="coupon-list" wx:for="{{activities}}" wx:for-item="item" wx:key="{{index}}">
-    <view class="item stamp stamp01" style="192rpx;">
+  <view class="coupon-list" wx:for="{{lives}}" wx:for-item="item" wx:key="{{index}}">
+    <view class="item stamp stamp01">
        <!-- 商品信息 -->
        <view class="note-row">
-          <navigator url='{{item.url}}&num_like={{item.num_like}}' >
-            <image class="writer-image" src="{{item.note_image[0]}}"/>
+          <navigator url='live-info/live-info?sid={{item.sid}}&streamer_name={{item.streamer_name}}' >
+            <image class="writer-image" src="{{item.note_image}}"/>
          </navigator>
            <view class="note-column">
-              <navigator url='{{item.url}}&num_like={{item.num_like}}' >
+              <navigator url='live-info/live-info?sid={{item.sid}}&streamer_name={{item.streamer_name}}' >
              <!-- 商家信息 -->
              <text>{{item.title}}</text>
              <!-- 商品价格 -->
              <span>
                <view class="price-row">
-                  <view class="sub-price">￥{{item.unit_price}}</view>
+                  <view class="sub-price">{{item.num_watcher}}人在看</view>
                </view>
              </span>
-              <!-- 活动日期 -->
-              <span class="desc">
-                {{tutil.formatDate_mdw_interval(item.start_datetime, item.end_datetime)}}
-              </span>
              </navigator>
-              <!-- 活动点赞 -->
-              <!-- <span>{{tutil.formatNumberLike(item.num_like)}}</span> -->
              <!-- 商家名称 -->
              <view class="note-row align">                
-                <view class="desc-member-left">{{item.member_name}}</view>
+                <view class="desc-member-left">
+                <image src="{{item.note_image}}"/>{{item.streamer_name}}</view>
                <!-- todo 店铺功能尚未实现 -->
                <!-- <view class="desc-member-right">进店 ></view> -->
              </view>

--- a/app/nyx-dev/pages/live/live.wxss
+++ b/app/nyx-dev/pages/live/live.wxss
@@ -66,8 +66,8 @@
 }

 /* coupon css */
-.coupon-list{width: 100%; margin:  0 auto}
-.coupon-list .item{width: 100%; height: 300rpx;}
+.coupon-list{width: 100%; margin:  0 auto; padding-top: 10rpx;}
+.coupon-list .item{width: 100%;}
 .coupon-list .item .float-li{width: 100%; height: 100%; border-right: 2rpx dashed rgba(255,255,255,.3)}
 .coupon-list .item .float-li-right{width: 220rpx; padding-right: 20rpx; height:100%; color: #fff}

@@ -384,6 +384,11 @@
  color: #a7a7a7;
  margin-right: 20rpx;
 }
+.desc-member-left image{
+  width: 40rpx;
+  height: 40rpx;
+  font-size: 0;
+}

 .desc-member-right {
  font-size: 30rpx;

--- a/app/nyx-dev/pages/share/share.js
+++ b/app/nyx-dev/pages/share/share.js
@@ -48,7 +48,7 @@ Page({
    //格式示例数据，可为空
    allContentList: [],
    num: 0,
-    sid: "key",
+    sid: "mall",
    chatUserInfo: {},
    scrollTop: 0,

@@ -379,7 +379,7 @@ Page({
 * 生命周期函数--监听页面卸载
 */
  onUnload: function () {
-    //app.closeSocket();
+    app.closeSocket();
    console.log('===onUnload webSocket 连接关闭事件。')
  },