wotokol-edm 1.1.68 → 1.1.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wotokol-edm",
-  "version": "1.1.68",
+  "version": "1.1.70",
   "description": "",
   "main": "wotokol-edm.common.js",
   "scripts": {

package/wotokol-edm.common.js

@@ -89604,8 +89604,8 @@ function signatureAlgorithmForJava(_0x54486a, _0x235110, _0x247160, _0x4454df, _
       hmacBytes: _0xf8244e,
       timestamp: _0x811d5e["timestamp"]
     };
-  console.log("-------验签");
-  console.log(_0x278e25);
+  // console.log("-------验签");
+  // console.log(_0x278e25);
   return _0x39978f;
 }
 function objKeySort(_0x59d16c) {
@@ -91146,33 +91146,8 @@ var lib = __webpack_require__(6153);
 
 
 //注册skywalking
-skywalking_client_js.register({
-  service: 'wotohubService',
-  //应用名称	
-  serviceVersion: '10.1.0',
-  //应用版本号
-  traceSDKInternal: true,
-  //追踪sdk
-  pagePath: location.href,
-  //当前路由地址
-  useFmp: true,
-  //use first meaningful paint
-  collector: location.origin,
-  // report serve
-  jsErrors: true,
-  // vue, js and promise errors
-  apiErrors: true,
-  resourceErrors: true,
-  autoTracePerf: true,
-  // trace performance detail
-  enableSPA: true,
-  detailMode: true,
-  noTraceOrigins: [],
-  vue: (external_commonjs_vue_commonjs2_vue_root_Vue_default()) //vue实例
-});
-//上报错误信息方法
-function reportFrameErrors(error) {
-  skywalking_client_js.reportFrameErrors({
+if (({"NODE_ENV":"production","BASE_URL":"/"}).VUE_APP_ENV !== 'dev') {
+  skywalking_client_js.register({
     service: 'wotohubService',
     //应用名称	
     serviceVersion: '10.1.0',
@@ -91194,41 +91169,72 @@ function reportFrameErrors(error) {
     enableSPA: true,
     detailMode: true,
     noTraceOrigins: [],
-    traceTimeInterval: 60000,
-    // 1min
     vue: (external_commonjs_vue_commonjs2_vue_root_Vue_default()) //vue实例
-  }, error);
+  });
+}
+//上报错误信息方法
+function reportFrameErrors(error) {
+  if (({"NODE_ENV":"production","BASE_URL":"/"}).VUE_APP_ENV !== 'dev') {
+    skywalking_client_js.reportFrameErrors({
+      service: 'wotohubService',
+      //应用名称	
+      serviceVersion: '10.1.0',
+      //应用版本号
+      traceSDKInternal: true,
+      //追踪sdk
+      pagePath: location.href,
+      //当前路由地址
+      useFmp: true,
+      //use first meaningful paint
+      collector: location.origin,
+      // report serve
+      jsErrors: true,
+      // vue, js and promise errors
+      apiErrors: true,
+      resourceErrors: true,
+      autoTracePerf: true,
+      // trace performance detail
+      enableSPA: true,
+      detailMode: true,
+      noTraceOrigins: [],
+      traceTimeInterval: 60000,
+      // 1min
+      vue: (external_commonjs_vue_commonjs2_vue_root_Vue_default()) //vue实例
+    }, error);
+  }
 }
 
 //上报错误信息方法
 function setPerformance() {
-  //路由上报到skywalking
-  ClientMonitor.setPerformance({
-    service: 'wotohubService',
-    //应用名称	
-    serviceVersion: '10.1.0',
-    //应用版本号
-    traceSDKInternal: true,
-    //追踪sdk
-    pagePath: location.href,
-    //当前路由地址
-    useFmp: true,
-    //use first meaningful paint
-    collector: location.origin,
-    // report serve
-    jsErrors: true,
-    // vue, js and promise errors
-    apiErrors: true,
-    resourceErrors: true,
-    autoTracePerf: true,
-    // trace performance detail
-    enableSPA: true,
-    detailMode: true,
-    noTraceOrigins: [],
-    traceTimeInterval: 60000,
-    // 1min
-    vue: Vue //vue实例
-  });
+  if (({"NODE_ENV":"production","BASE_URL":"/"}).VUE_APP_ENV !== 'dev') {
+    //路由上报到skywalking
+    ClientMonitor.setPerformance({
+      service: 'wotohubService',
+      //应用名称	
+      serviceVersion: '10.1.0',
+      //应用版本号
+      traceSDKInternal: true,
+      //追踪sdk
+      pagePath: location.href,
+      //当前路由地址
+      useFmp: true,
+      //use first meaningful paint
+      collector: location.origin,
+      // report serve
+      jsErrors: true,
+      // vue, js and promise errors
+      apiErrors: true,
+      resourceErrors: true,
+      autoTracePerf: true,
+      // trace performance detail
+      enableSPA: true,
+      detailMode: true,
+      noTraceOrigins: [],
+      traceTimeInterval: 60000,
+      // 1min
+      vue: Vue //vue实例
+    });
+  }
 }
 ;// ./src/utils/request-login.js
 
@@ -109664,8 +109670,8 @@ var detail_component = normalizeComponent(
 )
 
 /* harmony default export */ var detail = (detail_component.exports);
-;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/write-email/index.vue?vue&type=template&id=1ddcb21d&scoped=true
-var write_emailvue_type_template_id_1ddcb21d_scoped_true_render = function render() {
+;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/write-email/index.vue?vue&type=template&id=2b35de0e&scoped=true
+var write_emailvue_type_template_id_2b35de0e_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -110427,7 +110433,7 @@ var write_emailvue_type_template_id_1ddcb21d_scoped_true_render = function rende
     }
   }) : _vm._e()], 1);
 };
-var write_emailvue_type_template_id_1ddcb21d_scoped_true_staticRenderFns = [function () {
+var write_emailvue_type_template_id_2b35de0e_scoped_true_staticRenderFns = [function () {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -110448,7 +110454,7 @@ var write_emailvue_type_template_id_1ddcb21d_scoped_true_staticRenderFns = [func
   }, [_c('span', [_vm._v("$4.98")]), _vm._v(" /per ordered item ")]);
 }];
 
-;// ./src/package/write-email/index.vue?vue&type=template&id=1ddcb21d&scoped=true
+;// ./src/package/write-email/index.vue?vue&type=template&id=2b35de0e&scoped=true
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.set.difference.v2.js
 var es_set_difference_v2 = __webpack_require__(7642);
@@ -112739,8 +112745,8 @@ var checkMail_component = normalizeComponent(
 )
 
 /* harmony default export */ var checkMail = (checkMail_component.exports);
-;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/write-email/components/chooseMailNew.vue?vue&type=template&id=278d81cb
-var chooseMailNewvue_type_template_id_278d81cb_render = function render() {
+;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/write-email/components/chooseMailNew.vue?vue&type=template&id=7d7d63d9
+var chooseMailNewvue_type_template_id_7d7d63d9_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -113319,7 +113325,7 @@ var chooseMailNewvue_type_template_id_278d81cb_render = function render() {
     }
   }, [_vm._v(_vm._s(_vm.$i18n.t("setMail.confirm_unbinding")))])], 1)])], 1);
 };
-var chooseMailNewvue_type_template_id_278d81cb_staticRenderFns = [];
+var chooseMailNewvue_type_template_id_7d7d63d9_staticRenderFns = [];
 
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/write-email/components/chooseMailNew.vue?vue&type=script&lang=js
 
@@ -113475,6 +113481,12 @@ var chooseMailNewvue_type_template_id_278d81cb_staticRenderFns = [];
       reloadTimer: null
     };
   },
+  computed: {
+    // gmail 授权回调地址-new
+    redirectUriGmail() {
+      return encodeURIComponent(this.currentEnv == "https://k8s-pre.wotohub.com" ? "https://k8s-mail.wotokol.com" : "https://mail.wotokol.com") + "%2FgmailBind";
+    }
+  },
   created() {
     this.radio = this.currentSetEmail;
     // 如果是企业邮箱授权跳转过来的
@@ -113487,6 +113499,10 @@ var chooseMailNewvue_type_template_id_278d81cb_staticRenderFns = [];
         this.handleOutLookAuth();
       }
     }
+    if (this.$route.query.from && this.$route.query.from === "bindGmailPage") {
+      // 如果是从绑定gmail中间页过来，则需要清除缓存
+      this.clearEmailStorage();
+    }
     this.queryIsBindGmail(); // 查询是否绑定了 gmail 邮箱
     this.getBusinessEMails(); // 获取已经绑定的企业邮箱列表
     this.getBusinessTemplates(); // 获取企业邮箱模版列表
@@ -113710,7 +113726,15 @@ var chooseMailNewvue_type_template_id_278d81cb_staticRenderFns = [];
           gmail: this.gmailValInput
         }).then(res => {
           if (res.code === "0") {
-            let url = `https://accounts.google.com/o/oauth2/auth?response_type=code&access_type=offline&client_id=478743684976-2e3nlm97t528lb0gn44notvkdacnjii9.apps.googleusercontent.com&redirect_uri=${this.redirectUri}&state=null&scope=${this.scopeVal}&approval_prompt=force&include_granted_scopes=true`;
+            let url = "";
+            if (res.data) {
+              // 已经绑定过Gmail，走老的授权通道
+              url = `https://accounts.google.com/o/oauth2/auth?response_type=code&access_type=offline&client_id=478743684976-2e3nlm97t528lb0gn44notvkdacnjii9.apps.googleusercontent.com&redirect_uri=${this.redirectUri}&state=null&scope=${this.scopeVal}&approval_prompt=force&include_granted_scopes=true`;
+            } else {
+              // 新Gmail授权通道
+              const user_info = JSON.parse(localStorage.getItem("user_info") || "{}");
+              url = `${this.currentEnv == "https://k8s-pre.wotohub.com" ? "https://k8s-mail.wotokol.com" : "https://mail.wotokol.com"}/login?` + `middleToken=${localStorage.getItem("token")}&user_id=${user_info.user_id}&nick_name=${user_info.nick_name}&company=${user_info.company}&phone=${user_info.phone}&vip=${user_info.vip}`;
+            }
             window.location.href = url;
           } else {
             this.$message.error(res.message);
@@ -113720,7 +113744,7 @@ var chooseMailNewvue_type_template_id_278d81cb_staticRenderFns = [];
         this.$message.warning(`${this.$i18n.t("setMail.tip10")}`);
       }
     },
-    // 处理Gmail授权回调
+    // 处理Gmail授权回调-old
     handleGmailAuth() {
       this.authLoading = true;
       authGmail({
@@ -113989,10 +114013,10 @@ var chooseMailNewvue_type_template_id_278d81cb_staticRenderFns = [];
 });
 ;// ./src/package/write-email/components/chooseMailNew.vue?vue&type=script&lang=js
  /* harmony default export */ var components_chooseMailNewvue_type_script_lang_js = (chooseMailNewvue_type_script_lang_js); 
-;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/write-email/components/chooseMailNew.vue?vue&type=style&index=0&id=278d81cb&prod&lang=scss
+;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/write-email/components/chooseMailNew.vue?vue&type=style&index=0&id=7d7d63d9&prod&lang=scss
 // extracted by mini-css-extract-plugin
 
-;// ./src/package/write-email/components/chooseMailNew.vue?vue&type=style&index=0&id=278d81cb&prod&lang=scss
+;// ./src/package/write-email/components/chooseMailNew.vue?vue&type=style&index=0&id=7d7d63d9&prod&lang=scss
 
 ;// ./src/package/write-email/components/chooseMailNew.vue
 
@@ -114005,8 +114029,8 @@ var chooseMailNewvue_type_template_id_278d81cb_staticRenderFns = [];
 
 var chooseMailNew_component = normalizeComponent(
   components_chooseMailNewvue_type_script_lang_js,
-  chooseMailNewvue_type_template_id_278d81cb_render,
-  chooseMailNewvue_type_template_id_278d81cb_staticRenderFns,
+  chooseMailNewvue_type_template_id_7d7d63d9_render,
+  chooseMailNewvue_type_template_id_7d7d63d9_staticRenderFns,
   false,
   null,
   null,
@@ -122848,7 +122872,7 @@ var saveMailTempDialog_component = normalizeComponent(
     };
   },
   created() {
-    window.onbeforeunload = function (e) {
+    window.onbeforeunload = e => {
       e = e || window.event;
       return this.$t("edm5.v76");
     };
@@ -124324,15 +124348,15 @@ var saveMailTempDialog_component = normalizeComponent(
 });
 ;// ./src/package/write-email/index.vue?vue&type=script&lang=js
  /* harmony default export */ var package_write_emailvue_type_script_lang_js = (write_emailvue_type_script_lang_js); 
-;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/write-email/index.vue?vue&type=style&index=0&id=1ddcb21d&prod&lang=scss&scoped=true
+;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/write-email/index.vue?vue&type=style&index=0&id=2b35de0e&prod&lang=scss&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./src/package/write-email/index.vue?vue&type=style&index=0&id=1ddcb21d&prod&lang=scss&scoped=true
+;// ./src/package/write-email/index.vue?vue&type=style&index=0&id=2b35de0e&prod&lang=scss&scoped=true
 
-;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/write-email/index.vue?vue&type=style&index=1&id=1ddcb21d&prod&lang=scss
+;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/write-email/index.vue?vue&type=style&index=1&id=2b35de0e&prod&lang=scss
 // extracted by mini-css-extract-plugin
 
-;// ./src/package/write-email/index.vue?vue&type=style&index=1&id=1ddcb21d&prod&lang=scss
+;// ./src/package/write-email/index.vue?vue&type=style&index=1&id=2b35de0e&prod&lang=scss
 
 ;// ./src/package/write-email/index.vue
 
@@ -124346,11 +124370,11 @@ var saveMailTempDialog_component = normalizeComponent(
 
 var write_email_component = normalizeComponent(
   package_write_emailvue_type_script_lang_js,
-  write_emailvue_type_template_id_1ddcb21d_scoped_true_render,
-  write_emailvue_type_template_id_1ddcb21d_scoped_true_staticRenderFns,
+  write_emailvue_type_template_id_2b35de0e_scoped_true_render,
+  write_emailvue_type_template_id_2b35de0e_scoped_true_staticRenderFns,
   false,
   null,
-  "1ddcb21d",
+  "2b35de0e",
   null
   
 )