Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd

# Conflicts:
#	yanzhu-bigscreen/public/index.html

yanzhu-bigscreen/public/index.html

@@ -14,9 +14,16 @@
 
     <link rel="stylesheet" href="css/sichuanTibet.css?v=2024103201" />
 
+<<<<<<< HEAD
+    <script
+      type="text/javascript"
+      src="https://api.map.baidu.com/api?type=webgl&v=1.0&ak=nDcjhjtaNwnVrKNIDbjibTm6i4u0k0fk"
+    ></script>
+=======
   <script
     type="text/javascript"
     src="https://api.map.baidu.com/api?v=1.0&&type=webgl&ak=nDcjhjtaNwnVrKNIDbjibTm6i4u0k0fk"></script>
+>>>>>>> 2f324e08658671aca3fac0cfad1a31289cbd8dc3
     <script src="/cdn/vue/dist/vue.js"></script>
     <script src="/cdn/element-ui/lib/index.js"></script>
     <script src="/cdn/jquery/3.5.1/jquery.min.js"></script>

yanzhu-ui-app/miniprogram/pageage/project_video/info/index.js

@@ -14,6 +14,7 @@ Page({
         ysToken: '',
         palyUrl: '',
         channelNo: 0,
+        loginName: '',
     },
 
     /**
@@ -31,7 +32,8 @@ Page({
         let _url = "rtmp://open.ys7.com/"+_dat[0]+"/"+_cha+"/live";
         this.setData({
             palyUrl: _url,
-            channelNo: _cha
+            channelNo: _cha,
+            loginName: app.globalData.userData.userName,
         });
     },
 

yanzhu-ui-app/miniprogram/pageage/project_video/info/index.wxml

@@ -19,10 +19,10 @@
 				id="ezplayer"
 				accessToken="{{ysToken}}"
 				url="{{palyUrl}}"
-				plugins="talk,voice,capture"
+				plugins="talk,voice,capture,ptz"
 				width="360"
 				height="300"
-				watermark="shuiyin"
+				watermark="{{loginName}}"
 				themeData="{'poster':'','controls':{fullScreenBtn:false,hdBtn:true}}"
 				channelNo="{{channelNo}}"
 				bind:handleError="handleError"