隐藏不必要

pages/webview/index.js

@@ -20,11 +20,10 @@ Page({
     temp: '',
     live_base_url: 'rtmp://120.24.85.77:1935/hls',
     peopleCount: 5,
-    surplus: 0,
+    surplus: 50,
     type: '',
     shareStatus: 0,
     showInvitation: false,
-    sendShare: false
     // url: 'https://www.4dkankan.com/showProPC.html?m=vroMUXdx&origin=4Dplaza&sid=1046051&room_id=1596785144930&user_id=44'
   },
 

pages/webview/index.wxml

@@ -1,54 +1,54 @@
 <view class="web-view">
-	<lip-sync />
-	<auth bindlogin="onShow" />
-	
-	<!-- {{url}} -->
-	<!-- -->
-	<block wx:if="{{!hideWebView}}">
-		<web-view src="{{webviewUrl}}" bindmessage="webmessage"></web-view>
-	</block>
-	<cover-view class="mo" bindtap="hideCS" wx:if="{{showCoupon || showContact}}"></cover-view>
+  <lip-sync />
+  <auth bindlogin="onShow" />
 
-	<cover-view class="bgd" wx:if="{{sendShare}}"></cover-view>
+  <!-- {{url}} -->
+  <!-- -->
+  <block wx:if="{{!hideWebView}}">
+    <web-view src="{{webviewUrl}}" bindmessage="webmessage"></web-view>
+  </block>
+  <cover-view class="mo" bindtap="hideCS" wx:if="{{showCoupon || showContact}}"></cover-view>
 
-	<cover-view class="dialog guide-view" wx:if="{{showGuide}}">
-		<cover-view class="title">操作提示</cover-view>
-		<cover-view class="content">
-			<cover-view class="guide-item">
-				<cover-image wx:if="{{imgServer}}" src="../../static/images/gesture_roam.png"></cover-image>
-				<cover-view>
-					<cover-view class="text">行走</cover-view>
-					<cover-view class="text">点击任意方向移动</cover-view>
-				</cover-view>
-			</cover-view>
-			<cover-view class="guide-item">
-				<cover-image wx:if="{{imgServer}}" src="../../static/images/gesture_roam.png"></cover-image>
-				<cover-view>
-					<cover-view class="text">旋转视角</cover-view>
-					<cover-view class="text">左右滑动屏幕，旋转视觉</cover-view>
-				</cover-view>
-			</cover-view>
-			<cover-view class="guide-item">
-				<cover-image wx:if="{{imgServer}}" src="../../static/images/gesture_roam.png"></cover-image>
-				<cover-view>
-					<cover-view class="text">缩放</cover-view>
-					<cover-view class="text">双指滑动放大或缩小视图</cover-view>
-				</cover-view>
-			</cover-view>
-		</cover-view>
-		<cover-view class="button">
-			<button bindtap="hideGuide" class="btn">我知道了</button>
-		</cover-view>
-	</cover-view>
+  <cover-view class="bgd" wx:if="{{sendShare}}"></cover-view>
+
+  <cover-view class="dialog guide-view" wx:if="{{showGuide}}">
+    <cover-view class="title">操作提示</cover-view>
+    <cover-view class="content">
+      <cover-view class="guide-item">
+        <cover-image wx:if="{{imgServer}}" src="../../static/images/gesture_roam.png"></cover-image>
+        <cover-view>
+          <cover-view class="text">行走</cover-view>
+          <cover-view class="text">点击任意方向移动</cover-view>
+        </cover-view>
+      </cover-view>
+      <cover-view class="guide-item">
+        <cover-image wx:if="{{imgServer}}" src="../../static/images/gesture_roam.png"></cover-image>
+        <cover-view>
+          <cover-view class="text">旋转视角</cover-view>
+          <cover-view class="text">左右滑动屏幕，旋转视觉</cover-view>
+        </cover-view>
+      </cover-view>
+      <cover-view class="guide-item">
+        <cover-image wx:if="{{imgServer}}" src="../../static/images/gesture_roam.png"></cover-image>
+        <cover-view>
+          <cover-view class="text">缩放</cover-view>
+          <cover-view class="text">双指滑动放大或缩小视图</cover-view>
+        </cover-view>
+      </cover-view>
+    </cover-view>
+    <cover-view class="button">
+      <button bindtap="hideGuide" class="btn">我知道了</button>
+    </cover-view>
+  </cover-view>
 
 
-	<cover-view class="commodity-ctrl" bindtap="showCommodityFn" wx:if="{{!showCommodity && showCommodityCtrl && goodsCount > 0}}">
-		<cover-image src="../../static/images/scene_listbg@3x.png" class="bg"></cover-image>
-		<cover-image src="../../static/images/scene_shop_list.png" class="ig"></cover-image>
-		<cover-view>商品({{goodsCount > 100 ? '99+' : goodsCount}})</cover-view>
-	</cover-view>
+  <cover-view class="commodity-ctrl" bindtap="showCommodityFn" wx:if="{{!showCommodity && showCommodityCtrl && goodsCount > 0}}">
+    <cover-image src="../../static/images/scene_listbg@3x.png" class="bg"></cover-image>
+    <cover-image src="../../static/images/scene_shop_list.png" class="ig"></cover-image>
+    <cover-view>商品({{goodsCount > 100 ? '99+' : goodsCount}})</cover-view>
+  </cover-view>
 
-	<!-- <cover-view class="bottom-dialog commodity-view" wx:if="{{!showCommodity}}">
+  <!-- <cover-view class="bottom-dialog commodity-view" wx:if="{{!showCommodity}}">
 		<cover-view class="title">
 			<cover-view class="text">店铺中的商品</cover-view>
 			<cover-view class="icon" bindtap="hideComodity">
@@ -107,151 +107,151 @@
 		</cover-view>
 	</cover-view> -->
 
-	<cover-view class="bottom-dialog coupon-view" wx:if="{{showCoupon}}">
-		<cover-view class="title">
-			<cover-view class="text">店铺中的优惠券</cover-view>
-			<cover-view class="icon" bindtap="hideCoupon">
-				<cover-image src="../../static/images/list_close.png"></cover-image>
-			</cover-view>
-		</cover-view>
-		<cover-view class="layer">
-			<cover-view class="content">
-				<cover-view wx:if="{{coupons.length !== 0}}">
-					<cover-view wx:for="{{coupons}}" wx:key="{{item.id}}" class="{{item.hasReceived ? 'coupon-item' : item.number <= item.receiveNumber ? 'coupon-item diswan' : 'coupon-item'}}">
-						<cover-view class="item-before"></cover-view>
-						<cover-view class="item-after"></cover-view>
-						<cover-view class="info-before"></cover-view>
-						<cover-view class="info-after"></cover-view>
+  <cover-view class="bottom-dialog coupon-view" wx:if="{{showCoupon}}">
+    <cover-view class="title">
+      <cover-view class="text">店铺中的优惠券</cover-view>
+      <cover-view class="icon" bindtap="hideCoupon">
+        <cover-image src="../../static/images/list_close.png"></cover-image>
+      </cover-view>
+    </cover-view>
+    <cover-view class="layer">
+      <cover-view class="content">
+        <cover-view wx:if="{{coupons.length !== 0}}">
+          <cover-view wx:for="{{coupons}}" wx:key="{{item.id}}" class="{{item.hasReceived ? 'coupon-item' : item.number <= item.receiveNumber ? 'coupon-item diswan' : 'coupon-item'}}">
+            <cover-view class="item-before"></cover-view>
+            <cover-view class="item-after"></cover-view>
+            <cover-view class="info-before"></cover-view>
+            <cover-view class="info-after"></cover-view>
 
-						<cover-view class="{{item.hasReceived ? 'used' : ''}} "></cover-view>
-						<cover-view class="money">
-							<cover-view class="poa" style="{{'font-size:' + item.fontSize }}">
-								<cover-view class="money-before">￥</cover-view>
-								{{item.typeMoney}}
-								<!-- <cover-view class="money-after"></cover-view> -->
-							</cover-view>
-						</cover-view>
-						<cover-view class="info">
-							<cover-view class="full">{{item.name}}</cover-view>
-							<button>
-								{{
-                  item.sendType == 0 ? '全场赠券' : 
-                  item.sendType == 1 ? '会员赠券' : 
-                  item.sendType == 2 ? '购物赠券' : 
-                  item.sendType == 3 ? '注册赠' : ''
+            <cover-view class="{{item.hasReceived ? 'used' : ''}} "></cover-view>
+            <cover-view class="money">
+              <cover-view class="poa" style="{{'font-size:' + item.fontSize }}">
+                <cover-view class="money-before">￥</cover-view>
+                {{item.typeMoney}}
+                <!-- <cover-view class="money-after"></cover-view> -->
+              </cover-view>
+            </cover-view>
+            <cover-view class="info">
+              <cover-view class="full">{{item.name}}</cover-view>
+              <button>
+                {{
+                item.sendType == 0 ? '全场赠券' :
+                item.sendType == 1 ? '会员赠券' :
+                item.sendType == 2 ? '购物赠券' :
+                item.sendType == 3 ? '注册赠' : ''
                 }}
-							</button>
-							<cover-view class="date">{{item.useStartDate}}-{{item.useEndDate}}</cover-view>
-						</cover-view>
-						<cover-view class="oper">
-							<cover-image class="dotted" src="/static/images/img_cpline@3x.png"></cover-image>
-							<cover-image src="/static/images/img_tabs_lack.png" wx:if="{{!item.hasReceived && item.number <= item.receiveNumber}}" class="lack"></cover-image>
+              </button>
+              <cover-view class="date">{{item.useStartDate}}-{{item.useEndDate}}</cover-view>
+            </cover-view>
+            <cover-view class="oper">
+              <cover-image class="dotted" src="/static/images/img_cpline@3x.png"></cover-image>
+              <cover-image src="/static/images/img_tabs_lack.png" wx:if="{{!item.hasReceived && item.number <= item.receiveNumber}}" class="lack"></cover-image>
 
-							<cover-view wx:else bindtap="receive" data-item="{{item}}">{{item.hasReceived ? '已领取'  : item.number <= item.receiveNumber ? '' : '立即领取'}}</cover-view>
-						</cover-view>
-					</cover-view>
-				</cover-view>
-				<cover-view wx:else class="un-content">
-					<cover-view class="lay">
-						<cover-image src="/static/images/img_nocoupon@2x.png"></cover-image>
-						<cover-view class="text">暂无优惠券</cover-view>
-					</cover-view>
-				</cover-view>
-			</cover-view>
-		</cover-view>
-	</cover-view>
+              <cover-view wx:else bindtap="receive" data-item="{{item}}">{{item.hasReceived ? '已领取' : item.number <= item.receiveNumber ? '' : '立即领取' }}</cover-view>
+              </cover-view>
+            </cover-view>
+          </cover-view>
+          <cover-view wx:else class="un-content">
+            <cover-view class="lay">
+              <cover-image src="/static/images/img_nocoupon@2x.png"></cover-image>
+              <cover-view class="text">暂无优惠券</cover-view>
+            </cover-view>
+          </cover-view>
+        </cover-view>
+      </cover-view>
+    </cover-view>
 
-	<cover-view class="dialog invitation-view" wx:if="{{showInvitation}}">
-		<cover-view class="title">温馨提示</cover-view>
-		<cover-view class="content">
-			{{surplus ? '邀请好友一起逛，最多可邀请'+surplus+'位好友哦' : '邀请好友已达到上线哦'}}</cover-view>
-		<cover-view class="btns">
-			<button class="btn" wx:if="surplus">微信邀请</button>
-			<button class="cancel btn" bindtap="hideInvitation">取消</button>
-		</cover-view>
-	</cover-view>
+    <!-- <cover-view class="dialog invitation-view" wx:if="{{showInvitation}}">
+      <cover-view class="title">温馨提示</cover-view>
+      <cover-view class="content">
+        {{surplus ? '邀请好友一起逛，最多可邀请'+surplus+'位好友哦' : '邀请好友已达到上线哦'}}</cover-view>
+      <cover-view class="btns">
+        <button class="btn" wx:if="surplus">微信邀请</button>
+        <button class="cancel btn" bindtap="hideInvitation">取消</button>
+      </cover-view>
+    </cover-view> -->
 
-	<cover-view class="dialog invitation-view" wx:if="{{showEnd}}">
-		<cover-view class="title">温馨提示</cover-view>
-		<cover-view class="content">确定要结束“一起逛”吗？</cover-view>
-		<cover-view class="btns">
-			<button class="btn" bindtap="hideEnd">继续逛</button>
-			<button class="cancel btn">结束</button>
-		</cover-view>
-	</cover-view>
+    <cover-view class="dialog invitation-view" wx:if="{{showEnd}}">
+      <cover-view class="title">温馨提示</cover-view>
+      <cover-view class="content">确定要结束“一起逛”吗？</cover-view>
+      <cover-view class="btns">
+        <button class="btn" bindtap="hideEnd">继续逛</button>
+        <button class="cancel btn">结束</button>
+      </cover-view>
+    </cover-view>
 
-	<cover-view class="dialog invitation-view" wx:if="{{showAlert}}">
-		<cover-view class="title">温馨提示</cover-view>
-		<cover-view class="content">发起人已结束一起逛模式，房间即将关闭</cover-view>
-		<cover-view class="btns">
-			<button class="btn" bindtap="hideAlert">确定</button>
-		</cover-view>
-	</cover-view>
+    <cover-view class="dialog invitation-view" wx:if="{{showAlert}}">
+      <cover-view class="title">温馨提示</cover-view>
+      <cover-view class="content">发起人已结束一起逛模式，房间即将关闭</cover-view>
+      <cover-view class="btns">
+        <button class="btn" bindtap="hideAlert">确定</button>
+      </cover-view>
+    </cover-view>
 
-	<cover-view class="dialog invitation-view" wx:if="{{showPacked}}">
-		<cover-view class="title">温馨提示</cover-view>
-		<cover-view class="content">一起逛房间已满人，是否继续逛</cover-view>
-		<cover-view class="btns">
-			<button class="btn" bindtap="hidePacked">继续逛</button>
-			<button class="cancel btn">取消</button>
-		</cover-view>
-	</cover-view>
+    <cover-view class="dialog invitation-view" wx:if="{{showPacked}}">
+      <cover-view class="title">温馨提示</cover-view>
+      <cover-view class="content">一起逛房间已满人，是否继续逛</cover-view>
+      <cover-view class="btns">
+        <button class="btn" bindtap="hidePacked">继续逛</button>
+        <button class="cancel btn">取消</button>
+      </cover-view>
+    </cover-view>
 
-	<cover-view class="dialog invitation-view" wx:if="{{showIsEnd}}">
-		<cover-view class="title">温馨提示</cover-view>
-		<cover-view class="content">一起逛已结束了，是否继续逛</cover-view>
-		<cover-view class="btns">
-			<button class="btn" bindtap="hideIsEnd">继续逛</button>
-			<button class="cancel btn">取消</button>
-		</cover-view>
-	</cover-view>
+    <cover-view class="dialog invitation-view" wx:if="{{showIsEnd}}">
+      <cover-view class="title">温馨提示</cover-view>
+      <cover-view class="content">一起逛已结束了，是否继续逛</cover-view>
+      <cover-view class="btns">
+        <button class="btn" bindtap="hideIsEnd">继续逛</button>
+        <button class="cancel btn">取消</button>
+      </cover-view>
+    </cover-view>
 
-	<cover-view class="dialog concat-view" wx:if="{{showContact}}">
-		<cover-view class="icon" bindtap="hideContact">
-			<cover-image src="../../static/images/list_close.png"></cover-image>
-		</cover-view>
+    <cover-view class="dialog concat-view" wx:if="{{showContact}}">
+      <cover-view class="icon" bindtap="hideContact">
+        <cover-image src="../../static/images/list_close.png"></cover-image>
+      </cover-view>
 
-		<cover-view class="title ">联系我们</cover-view>
-		<cover-view class="item" wx:if="{{contractPhone}}">
-			<button class="btn call-phone" bindtap="callPhone">拨打电话</button>
-			<!-- <cover-view class="desc">服务时间：09:00 - 21:00</cover-view> -->
-		</cover-view>
-		<cover-view class="item">
-			<button class="cancel btn" open-type="contact" bindtap="contactKf">联系在线客服</button>
-			<cover-view class="desc tp10">联系指房宝在线客服</cover-view>
-			<!-- <cover-view class="desc tp10">服务时间：24小时</cover-view> -->
-		</cover-view>
-	</cover-view>
+      <cover-view class="title ">联系我们</cover-view>
+      <cover-view class="item" wx:if="{{contractPhone}}">
+        <button class="btn call-phone" bindtap="callPhone">拨打电话</button>
+        <!-- <cover-view class="desc">服务时间：09:00 - 21:00</cover-view> -->
+      </cover-view>
+      <cover-view class="item">
+        <button class="cancel btn" open-type="contact" bindtap="contactKf">联系在线客服</button>
+        <cover-view class="desc tp10">联系指房宝在线客服</cover-view>
+        <!-- <cover-view class="desc tp10">服务时间：24小时</cover-view> -->
+      </cover-view>
+    </cover-view>
 
-	<cover-view class="dialog invitation-view" wx:if="{{sendShare}}">
-		<cover-view class="title">温馨提示</cover-view>
-		<cover-view class="content">{{surplus ? '邀请好友一起逛，最多可邀请'+surplus+'位好友哦' : '邀请好友已达到上线哦'}}</cover-view>
-		<cover-view class="btns" wx:if="{{surplus}}">
-			<button class="btn" open-type="share">微信邀请</button>
-			<button class="cancel btn" bindtap="calcShare">取消</button>
-		</cover-view>
-		<cover-view class="btns" wx:if="{{!surplus}}">
-			<button class="btn" bindtap="calcShare">确定</button>
-		</cover-view>
-	</cover-view>
+    <cover-view class="dialog invitation-view" wx:if="{{sendShare}}">
+      <cover-view class="title">温馨提示</cover-view>
+      <cover-view class="content">{{surplus ? '邀请好友一起逛，最多可邀请'+surplus+'位好友哦' : '邀请好友已达到上线哦'}}</cover-view>
+      <cover-view class="btns" wx:if="{{surplus}}">
+        <button class="btn" open-type="share">微信邀请</button>
+        <button class="cancel btn" bindtap="calcShare">取消</button>
+      </cover-view>
+      <cover-view class="btns" wx:if="{{!surplus}}">
+        <button class="btn" bindtap="calcShare">确定</button>
+      </cover-view>
+    </cover-view>
 
-	<cover-view class="auth-user" wx:if="{{userAuth}}">
-		<cover-view class="layer">
-			<cover-view class="title">授权登录</cover-view>
-			<cover-image class="logo" src="../../static/images/img_empower_logo@2x.png"></cover-image>
-			<cover-view class="desc">四维时代网络科技有限公司申请获取以下权限</cover-view>
-			<cover-view class="content">·获得您的公开信息（昵称、头像等）</cover-view>
-			<button open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" wx:if="{{canIUse}}">授权登录</button>
-			<cover-view wx:else>请升级微信版本</cover-view>
-		</cover-view>
-	</cover-view>
-	
-	<cover-view style="position: fixed; background-color: rgba(0,0,0,0.5); color: #fff;white-space:pre-wrap;z-index:989999" wx:if="{{debugerInfo}}">
-    {{debugerInfo}}
-		<cover-view bindtap="clearDebuger">清除</cover-view>
-  </cover-view>
+    <cover-view class="auth-user" wx:if="{{userAuth}}">
+      <cover-view class="layer">
+        <cover-view class="title">授权登录</cover-view>
+        <cover-image class="logo" src="../../static/images/img_empower_logo@2x.png"></cover-image>
+        <cover-view class="desc">四维时代网络科技有限公司申请获取以下权限</cover-view>
+        <cover-view class="content">·获得您的公开信息（昵称、头像等）</cover-view>
+        <button open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" wx:if="{{canIUse}}">授权登录</button>
+        <cover-view wx:else>请升级微信版本</cover-view>
+      </cover-view>
+    </cover-view>
+
+    <cover-view style="position: fixed; background-color: rgba(0,0,0,0.5); color: #fff;white-space:pre-wrap;z-index:989999" wx:if="{{debugerInfo}}">
+      {{debugerInfo}}
+      <cover-view bindtap="clearDebuger">清除</cover-view>
+    </cover-view>
 
-	<!-- <cover-view class="dialog invitation-view">
+    <!-- <cover-view class="dialog invitation-view">
 		<cover-view bindtap="copy">{{webviewUrl}}</cover-view>
 	</cover-view> -->
 </view>

socket.js

@@ -722,7 +722,7 @@ export default {
     })
   },
   //deprecated
-  async newRoom(data) {
+  async newRoomBk(data) {
     if (data.roomId) return;
     this.stopCall()
     getApp().globalData.rtcParams = []