wotokol-edm 1.1.35 → 1.1.37

package/package.json

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

package/wotokol-edm.common.js

@@ -13659,7 +13659,7 @@ module.exports = __webpack_require__(3555);
 /* 15 */
 /***/ (function(module, exports) {
 
-module.exports = __webpack_require__(3938);
+module.exports = __webpack_require__(1557);
 
 /***/ }),
 /* 16 */
@@ -62314,7 +62314,7 @@ main.install = function (Vue) {
 /***/ 16:
 /***/ (function(module, exports) {
 
-module.exports = __webpack_require__(3938);
+module.exports = __webpack_require__(1557);
 
 /***/ }),
 
@@ -62561,7 +62561,7 @@ module.exports = __webpack_require__(94);
 /***/ 16:
 /***/ (function(module, exports) {
 
-module.exports = __webpack_require__(3938);
+module.exports = __webpack_require__(1557);
 
 /***/ }),
 
@@ -77837,7 +77837,7 @@ exports["default"] = PopupManager;
 
 /***/ }),
 
-/***/ 3938:
+/***/ 1557:
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -85274,7 +85274,7 @@ if (typeof window !== 'undefined') {
 var esnext_iterator_constructor = __webpack_require__(8992);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/esnext.iterator.for-each.js
 var esnext_iterator_for_each = __webpack_require__(3949);
-;// ./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/edm-button/index.vue?vue&type=template&id=555c635a&scoped=true
+;// ./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/edm-button/index.vue?vue&type=template&id=64f9b484&scoped=true
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -91211,14 +91211,16 @@ async function test_test(params) {
       localStorage.setItem("sourceApp", "hub");
       loginHUB({
         // 模拟 hub 登陆 测试账号
-        mobileOrEmail: "13262005357",
-        password: "123123123"
+        // mobileOrEmail: "13262005357",
+        // password: "123123123"
         // mobileOrEmail: "18846078060",
         // password: "asd123456"
         // mobileOrEmail: "18767117493",
         // password: "tm123456789"
         // mobileOrEmail: "15658187195",
         // password: "wotu987412365"
+        mobileOrEmail: "18270829507",
+        password: "tm123456789"
       }).then(res => {
         if (res) {
           alert("登陆成功");
@@ -91368,7 +91370,7 @@ var component = normalizeComponent(
   staticRenderFns,
   false,
   null,
-  "555c635a",
+  "64f9b484",
   null
   
 )
@@ -109225,8 +109227,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=33a7014c&scoped=true
-var write_emailvue_type_template_id_33a7014c_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=7135fb5a&scoped=true
+var write_emailvue_type_template_id_7135fb5a_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -109983,7 +109985,7 @@ var write_emailvue_type_template_id_33a7014c_scoped_true_render = function rende
     }
   }) : _vm._e()], 1);
 };
-var write_emailvue_type_template_id_33a7014c_scoped_true_staticRenderFns = [function () {
+var write_emailvue_type_template_id_7135fb5a_scoped_true_staticRenderFns = [function () {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -110004,7 +110006,7 @@ var write_emailvue_type_template_id_33a7014c_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=33a7014c&scoped=true
+;// ./src/package/write-email/index.vue?vue&type=template&id=7135fb5a&scoped=true
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.set.difference.v2.js
 var es_set_difference_v2 = __webpack_require__(7642);
@@ -123393,22 +123395,30 @@ var saveMailTempDialog_component = normalizeComponent(
             if (detailObj.attachmentRes && detailObj.attachmentRes.length) detailObj.attachmentRes.forEach(item => {
               delete item.id;
             });
-            // 获取模版详情
-            this.mailList.forEach(mail => {
-              if (mail.active) {
-                mail.subject = detailObj.mailSubject;
-                mail.templateId = detailObj.id;
-                mail.fileList = detailObj.attachmentRes;
-                if (mail.setContent) {
-                  mail.setContent(detailObj.content);
-                }
-              }
-            });
+
             // 商品卡相关逻辑
             if (detailObj.content) {
               let productCardStart = detailObj.content.indexOf("<product-card");
               let productCardEnd = detailObj.content.indexOf("</product-card>");
               let productCardHtml = detailObj.content.slice(productCardStart, productCardEnd + 15);
+              // 剔除商品卡相关dom
+              let contentHtml = '';
+              if (productCardStart > -1 && productCardEnd > -1) {
+                contentHtml = detailObj.content.slice(0, productCardStart) + detailObj.content.slice(productCardEnd + 15);
+              } else {
+                contentHtml = detailObj.content;
+              }
+              // 回显模版详情
+              this.mailList.forEach(mail => {
+                if (mail.active) {
+                  mail.subject = detailObj.mailSubject;
+                  mail.templateId = detailObj.id;
+                  mail.fileList = detailObj.attachmentRes;
+                  if (mail.setContent) {
+                    mail.setContent(contentHtml);
+                  }
+                }
+              });
               const cardIdsMatch = productCardHtml.match(/cardids="([^"]+)"/);
               if (cardIdsMatch && cardIdsMatch[1]) {
                 const cardIds = cardIdsMatch[1]; // 获取匹配到的cardids值
@@ -123758,15 +123768,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=33a7014c&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=7135fb5a&prod&lang=scss&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./src/package/write-email/index.vue?vue&type=style&index=0&id=33a7014c&prod&lang=scss&scoped=true
+;// ./src/package/write-email/index.vue?vue&type=style&index=0&id=7135fb5a&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=33a7014c&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=7135fb5a&prod&lang=scss
 // extracted by mini-css-extract-plugin
 
-;// ./src/package/write-email/index.vue?vue&type=style&index=1&id=33a7014c&prod&lang=scss
+;// ./src/package/write-email/index.vue?vue&type=style&index=1&id=7135fb5a&prod&lang=scss
 
 ;// ./src/package/write-email/index.vue
 
@@ -123780,11 +123790,11 @@ var saveMailTempDialog_component = normalizeComponent(
 
 var write_email_component = normalizeComponent(
   package_write_emailvue_type_script_lang_js,
-  write_emailvue_type_template_id_33a7014c_scoped_true_render,
-  write_emailvue_type_template_id_33a7014c_scoped_true_staticRenderFns,
+  write_emailvue_type_template_id_7135fb5a_scoped_true_render,
+  write_emailvue_type_template_id_7135fb5a_scoped_true_staticRenderFns,
   false,
   null,
-  "33a7014c",
+  "7135fb5a",
   null
   
 )