u

project/package.json

@@ -12,18 +12,18 @@
     "mock-webpack-plugin": "^2.0.0",
     "path": "^0.12.7",
     "progress": "^2.0.0",
+    "readline": "^1.3.0",
     "ts-loader": "^4.0.0",
     "tslint": "^5.9.1",
     "typescript": "^3.5.1",
     "webpack": "^4.1.0",
     "webpack-cli": "^3.1.1",
     "webpack-dev-server": "^3.1.0",
-    "webpack-merge": "^4.1.2",
-    "readline": "^1.3.0"
+    "webpack-merge": "^4.1.2"
   },
   "dependencies": {
     "@spark/share": "^2.0.90",
-    "duiba-utils": "^1.0.9"
+    "duiba-utils": "^1.0.11"
   },
   "scripts": {
     "clearSameImg": "node scripts/clearSameImg && node scripts/flushRes",

project/src/Main.ts

@@ -6,11 +6,13 @@ import { getUrlParams } from "../module/tools/WebTool";
 import { destroyLayers, layers } from "../module/views/layers";
 import { IndexScene } from "../src/scenes/IndexScene";
 import getQueryParams from "./common/getQueryParams";
+import { getSearch } from "./getSearch";
 import { ResJson } from "./ResJson";
 import { startShare } from "./share";
 import { SkinJson } from "./SkinJson";
 import { destroyWebNetData, sendWebNet } from "./WebNet";
 import { WebNetName } from "./WebNetName";
+import {accessLog} from 'duiba-utils'
 
 
 
@@ -50,16 +52,25 @@ export class Main {
 
     private async onAddToStage() {
         if(getQueryParams().iscustom) {
-            console.log('fuck');
             sendWebNet(WebNetName.login,{
                 appId:getUrlParams("appID"),
                 unionid:'oIbvOt3D_z7AfHz9lI6VmDEeYDIk',
-                redirectUrl:'https://www.baidu.com/'
+                redirectUrl:`http://activity.m.duibatest.com.cn/projectx/pe4f11ce9/index.html?appID=19493&issharepage=${getQueryParams().issharepage}`
+            }).then(res=>{
+                location.href=res.data;
             });
             return;
         }
 
+        if(getQueryParams().issharepage == 1) {
+            console.log('分享进入')
+        }else{
+            console.log('主动进入')
+        }
+
         startShare();
+
+
         //初始化层级
         layers.init(this.stage);
         console.log("初始化层级完成")

project/src/getSearch.ts

+export const getSearch =(str)=>{
+    const arr = str.split('&');
+    const res:any = {};
+    for (const item of arr) {
+        if(!item)continue;
+        const[k,v] = item.split('=');
+        res[k]=v;
+    }
+    return res
+}
\ No newline at end of file

project/yarn.lock

@@ -1317,7 +1317,7 @@ domain-browser@^1.1.1:
   resolved "http://npm.dui88.com:80/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
   integrity sha1-PTH1AZGmdJ3RN1p/Ui6CPULlTto=
 
-duiba-utils@^1.0.6, duiba-utils@^1.0.9:
+duiba-utils@^1.0.11, duiba-utils@^1.0.6:
   version "1.0.11"
   resolved "http://npm.dui88.com:80/duiba-utils/-/duiba-utils-1.0.11.tgz#deead33f0c86bbe0063131b70ff0592da7bcb9dd"
   integrity sha512-mEKFgn+ZpaIwMFmZHiCZXJpPTPkoCZSEKKfubjJ+8edti0GbGnfrbZKvHveLu5HbvwpXCNA6xXPQDJcE12VqbA==