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

.buildrc.js

@@ -15,6 +15,7 @@ module.exports = {
         '/hdtool/*': 'http://localhost:3000',
         '/activityPlugin/*': 'http://localhost:3000',
         '/aaw/*': 'http://localhost:3000',
+        '/wechatShare/*': 'http://localhost:3000',
         '/summer/*': 'http://localhost:3000'
     }
 }
\ No newline at end of file

egret/index.html

@@ -47,6 +47,7 @@
     <script src="libs/aes.js"></script>
     <script src="libs/pad-zeropadding.js"></script>
     <script>
+          window['registerWX']=(result)=>{console.log(result)}
         window['price1']=1;
         window['price2']=2;
         window['price3']=3;

egret/libs/new_wx/MainBase.ts

@@ -236,6 +236,11 @@ export default class MainBase extends eui.UILayer {
                 Buried.init();
                 
                 SceneCtrl.instance.change(ModuleTypes.START_SCENE, this.svgaList);
+
+                NetManager.ins.getShareInfo(()=>{
+                    const result = DataManager.ins.getData('getShareInfo');
+                    window['registerWX'](result);
+                });
             }
         }
 

egret/libs/tw/manager/NetManager.ts

@@ -814,7 +814,21 @@ export class NetManager extends ABNetManager {
         };
         this.send(net);
     }
-
+    public getShareInfo(callback: Function, ): void {
+        const net: INetData = {
+            name: 'getShareInfo',
+            uri: '/wechatShare/getShareInfo/v2',
+            type: 'get',
+            hideMsg: true,
+            dataType: 'json',
+            param: {
+                wxdebug: false,
+                url: location.href
+            },
+            callback: callback
+        };
+        this.send(net);
+    }
     public imgUrl(callback: Function, img64: string): void {
         const net: INetData = {
             name: 'imgURL',

mock/config.js

 const path = require('path');
 const config = {
+    '/wechatShare/getShareInfo/v2': {
+        data: './happyclear/openTreasureBox.json'
+    },
     '/customActivity/happyclear/openTreasureBox': {
         data: './happyclear/openTreasureBox.json'
     },