Merge branch 'master' into eu

.gitignore

@@ -23,3 +23,5 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+dist-eu.zip
+dist.zip

src/views/index.vue

@@ -190,9 +190,18 @@ export default {
       pageHeight: "",
       _isMobile: false,
       scale: 0,
-      lying: 0
+      lying: 0,
+      config: {
+        apiKey: "DLab-BFAR-Coach-000001",
+        region: "eu",
+        completeUrl: "https://bfai-service-eu.d-lab-services.danone.com/demo/#/complete",
+        incompleteUrl: "https://bfai-service-eu.d-lab-services.danone.com/demo/#/",
+        sdkUrl: "https://bfai-service-eu.d-lab-services.danone.com/sdk/#/"
+      },
+      usagetrackingkey: "",
     };
   },    
+
   components: {
     lightButton
   },
@@ -907,23 +916,23 @@ export default {
       console.log(import.meta.env);
 
       if (camera) {
-        let apiKey = "DLab-BFAR-Coach-000001";
+        let apiKey = this.config.apiKey;
         let env = import.meta.env.VITE_TRACKING_ENV;
         console.log(env);
         let aiParams = {
           env: env,
-          apiKey: apiKey,
-          region: "eu"
+          apiKey: this.usagetrackingkey ? this.usagetrackingkey : apiKey,
+          region: this.config.region
         };
         localStorage.setItem("aiParams", JSON.stringify(aiParams));
         let openDev = this.$route.query.openDev;
         localStorage.setItem(
           "completeUrl",
-          "https://bfai-service-eu.d-lab-services.danone.com/demo/#/complete"
+          this.config.completeUrl
         );
-        localStorage.setItem("incompleteUrl", "https://bfai-service-eu.d-lab-services.danone.com/demo/#/");
+        localStorage.setItem("incompleteUrl", this.config.incompleteUrl);
         let url =
-          "https://bfai-service-eu.d-lab-services.danone.com/sdk/#/?lying=" +
+          this.config.sdkUrl + "?lying=" +
           this.lying;
         if (openDev) {
           url = url + "&openDev=true";
@@ -951,6 +960,11 @@ export default {
     }
   },
   created() {
+    let usagetrackingkey = "";
+    if (this.$route.query.usagetrackingkey != null) {
+      usagetrackingkey = this.$route.query.usagetrackingkey;
+    }
+    this.usagetrackingkey = usagetrackingkey;
     let lying = 0; // 默认0 为坐姿
     if (this.$route.query.lying != null) {
       lying = ~~this.$route.query.lying;

src/views/startIndex.vue

@@ -140,11 +140,19 @@ export default {
     },
     clickGestureItem(val) {
       let lying = Number(val.code);
-      this.$router.push({
-        path: "/introduce",
-        query: {
+      let usagetrackingkey = "";
+      if (this.$route.query.usagetrackingkey != null) {
+        usagetrackingkey = this.$route.query.usagetrackingkey;
+      }
+      let query = {
         lying: lying
       }
+      if (usagetrackingkey) {
+        query.usagetrackingkey = usagetrackingkey;
+      }
+      this.$router.push({
+        path: "/introduce",
+        query: query
       });
     }
   },