Merge branch 'dev' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into dev

egret/resource/TextureMerger/sharecodepanel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sharecodepanel","version":5,"files":["../assets/shareCodePanel/lijiqianwang.png","../assets/shareCodePanel/copyCodeBg.png","../assets/shareCodePanel/shareWxpyqIcon.png","../assets/shareCodePanel/shareWxIcon.png","../assets/shareCodePanel/shareQqIcon.png","../assets/shareCodePanel/shareWeiboIcon.png","../assets/shareCodePanel/zhantiegeihaoyou.png"]}
\ No newline at end of file
+<<<<<<< HEAD
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sharecodepanel","version":5,"files":["..\\assets\\shareCodePanel\\lijiqianwang.png","..\\assets\\shareCodePanel\\copyCodeBg.png","..\\assets\\shareCodePanel\\shareWxpyqIcon.png","..\\assets\\shareCodePanel\\shareWxIcon.png","..\\assets\\shareCodePanel\\shareQqIcon.png","..\\assets\\shareCodePanel\\shareWeiboIcon.png","..\\assets\\shareCodePanel\\zhantiegeihaoyou.png"]}
+=======
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sharecodepanel","version":5,"files":["../assets/shareCodePanel/lijiqianwang.png","../assets/shareCodePanel/copyCodeBg.png","../assets/shareCodePanel/shareWxpyqIcon.png","../assets/shareCodePanel/shareWxIcon.png","../assets/shareCodePanel/shareQqIcon.png","../assets/shareCodePanel/shareWeiboIcon.png","../assets/shareCodePanel/zhantiegeihaoyou.png"]}
+>>>>>>> cc335fd429a254bc0a7d0e0a972062841c38abeb

egret/src/panels/ShareCodePanel.ts

@@ -75,10 +75,10 @@ const jumpFun = [
         }
     },
     function () {//跳转微博
-
+        showToast("快打开微博，粘贴给好友吧")
     },
     function () {//跳转qq
-
+        showToast("快打开QQ，粘贴给好友吧")
     },
 ]
 
@@ -142,19 +142,22 @@ class ShareCodePanel extends ComponentBase {
 
     onTouchWxBtn() {
         this.mark = 0;
-        this.codeOpr()
+        this.codeOpr();
+        NetManager.ins.showLog(getlogItem(84));
     }
     onTouchWxpyqBtn() {
         this.mark = 1;
-        this.codeOpr()
+        this.codeOpr();
     }
     onTouchWeiboBtn() {
         this.mark = 2;
-        this.codeOpr()
+        this.codeOpr();
+        NetManager.ins.showLog(getlogItem(85));
     }
     onTouchQqBtn() {
         this.mark = 3;
-        this.codeOpr()
+        this.codeOpr();
+        NetManager.ins.showLog(getlogItem(86));
     }
 
     onTouchGoBtn() {
@@ -261,6 +264,10 @@ export const showShareCodePanel = (channel: CodeChannels, shareCode?: string, ad
         initShare();
         inited = true;
     }
+    //三个渠道点击埋点
+    NetManager.ins.showLog(getlogItem(84));
+    NetManager.ins.showLog(getlogItem(85));
+    NetManager.ins.showLog(getlogItem(86));
     _share.setData({ channel, shareCode, addFun });
     layers.shareCodeLayer.visible = true;
 }