营销产品bug修复

src/WebsiteManagement/marketproductMag/index.vue

@@ -15,7 +15,7 @@
         <el-select
           class="inline-24"
           v-model="whereSelect.isonsale"
-          placeholder="请选择类型"
+          placeholder="请选择状态"
           @change="selectChange"
           size="small"
           clearable

src/WebsiteManagement/marketproductMag/modules/add.vue

@@ -44,7 +44,7 @@
                 <div style="margin-top: 10px; min-height: 200px !important">
                   <myEditor
                     ref="technicalparam"
-                    height="200px"
+                    height="360px"
                     :content="form.technicalparam"
                     :id="form.sa_fadid"
                   ></myEditor>
@@ -57,7 +57,7 @@
                 <div style="margin-top: 10px; min-height: 200px !important">
                   <myEditor
                     ref="materialdescription"
-                    height="200px"
+                    height="360px"
                     :content="form.materialdescription"
                     :id="form.sa_fadid"
                   ></myEditor>
@@ -70,7 +70,7 @@
                 <div style="margin-top: 10px; min-height: 200px !important">
                   <myEditor
                     ref="contentstr"
-                    height="200px"
+                    height="360px"
                     :content="form.contentstr"
                     :id="form.sa_fadid"
                   ></myEditor>

src/WebsiteManagement/marketproductMag/modules/detail.vue

@@ -41,6 +41,8 @@
             <el-button
               size="small"
               type="primary"
+              class="inline-16"
+              style="margin-right: 25px"
               @click="statusChange"
               v-if="tool.checkAuth($route.name, 'update')"
               >{{ detailInfo.isonsale == 0 ? "发布" : "取消发布" }}</el-button
@@ -164,8 +166,9 @@ export default {
 .content {
   border: 1px solid #9ca3af;
   margin-top: 10px;
-  max-height: 200px;
+  max-height: 500px;
   width: 100%;
+  overflow: auto;
 }
 
 .fwb {

src/WebsiteManagement/marketproductMag/modules/edit.vue

@@ -39,7 +39,7 @@
                 <div style="margin-top: 10px; min-height: 200px !important">
                   <myEditor
                     ref="technicalparam"
-                    height="200px"
+                    height="360px"
                     :content="form.technicalparam"
                     :id="form.sa_fadid"
                   ></myEditor>
@@ -52,7 +52,7 @@
                 <div style="margin-top: 10px; min-height: 200px !important">
                   <myEditor
                     ref="materialdescription"
-                    height="200px"
+                    height="360px"
                     :content="form.materialdescription"
                     :id="form.sa_fadid"
                   ></myEditor>
@@ -65,7 +65,7 @@
                 <div style="margin-top: 10px; min-height: 200px !important">
                   <myEditor
                     ref="contentstr"
-                    height="200px"
+                    height="360px"
                     :content="form.contentstr"
                     :id="form.sa_fadid"
                   ></myEditor>
@@ -157,6 +157,13 @@ export default {
       },
     };
   },
+  updated() {
+    console.log(this.form)
+    console.log(this.$refs)
+    if (this.$refs.technicalparam)   this.$refs.technicalparam.innerHTML = this.form.technicalparam;
+    if (this.$refs.materialdescription)   this.$refs.materialdescription.innerHTML = this.form.materialdescription;
+    if (this.$refs.contentstr)   this.$refs.contentstr.innerHTML = this.form.contentstr;
+  },
   methods: {
     async editBtn() {
       const res = await this.$api.requested({
@@ -172,11 +179,13 @@ export default {
         this.dialogFormVisible = true;
         this.form = res.data;
         this.form.contentstr = res.data.content;
-        this.form.isonsale = this.form.isonsale == 1 ? "1" : "0";
-        this.$refs.technicalparam.innerHTML = this.form.technicalparam;
-        this.$refs.materialdescription.innerHTML =
-          this.form.materialdescription;
-        this.$refs.contentstr.innerHTML = this.form.contentstr;
+        this.form.isonsale = res.data.isonsale == 1 ? "1" : "0";
+        console.log(this.$refs)
+        console.log(this.$refs.technicalparam)
+
+        /*this.$refs.technicalparam.innerHTML = res.data.technicalparam;
+        this.$refs.materialdescription.innerHTML = res.data.materialdescription;
+        this.$refs.contentstr.innerHTML = res.data.contentstr;*/
       }
     },
     onSubmit() {
@@ -221,10 +230,11 @@ export default {
     },
     onClose() {
       this.loading = false;
+      this.dialogFormVisible = false
       this.$refs.form.resetFields();
-      this.$refs.technicalparam.html = "";
-      this.$refs.materialdescription.html = "";
-      this.$refs.contentstr.html = "";
+      this.$refs.technicalparam.html = this.form.technicalparam;
+      this.$refs.materialdescription.html = this.form.materialdescription;
+      this.$refs.contentstr.html = this.form.contentstr;
       this.$emit("onSuccess");
     },
   },

src/router/index.js

@@ -23,6 +23,7 @@ let routes = [
     name: 'login',
     component: () => import(/* webpackChunkName: "about" */ '@/views/login/login.vue')
   },
+
   // {
   //   path: '/accounts',
   //   name: 'accounts',
@@ -129,7 +130,12 @@ let routes = [
         component: () => import(/* webpackChunkName: "about" */ '@/views/clueData/index')
       }
       ]
-  }
+  },
+  {
+    path: '/bridge',
+    name: 'bridge',
+    component: () => import(/* webpackChunkName: "about" */ '@/views/bridge/bridge.vue')
+  },
 ];
 
 routes[2].children = [...routes[2].children,...HManagement,...SManagement,...HDrpManagement,...SDrpManagement,...WebsiteManagement]

src/views/bridge/bridge.vue

@@ -0,0 +1,107 @@
+<template>
+<div class=''>
+  <div class="flex-loading">
+    <div style="text-align:center">
+      <div class="loading"></div>
+      <p class="almm" style="margin-top:40px;color:rgb(100, 108, 255)">正在接入营销系统...</p>
+    </div>
+  </div>
+</div>
+</template>
+<script>
+  export default {
+    data () {
+      return {
+
+      }
+    },
+    methods:{
+      getQueryParamFromHash(paramName) {  
+        // 获取哈希后的字符串，包括'#'  
+        var hash = window.location.hash.substring(1);  
+      
+        // 检查哈希后是否跟有查询字符串  
+        var queryString = hash.split('?')[1];  
+      
+        if (!queryString) {  
+            // 如果没有查询字符串，则返回null或undefined  
+            return null;  
+        }  
+      
+        // 将查询字符串分割成键值对数组  
+        var params = queryString.split('&').reduce(function(acc, pair) {  
+            var [key, value] = pair.split('=');  
+            acc[decodeURIComponent(key)] = decodeURIComponent(value);  
+            return acc;  
+        }, {});  
+      
+        // 返回特定参数的值  
+        return params[paramName] || null;  
+      },
+      autoLogin () {
+        let account_list = JSON.parse(localStorage.getItem('loginInfo')).resultobject.account_list
+        setTimeout(() => {
+          sessionStorage.setItem('account_list',JSON.stringify(account_list))
+          sessionStorage.setItem('active_account',JSON.stringify(account_list[0]))
+          this.basicData.query_userauth().then(()=>{
+            this.basicData.querySite_Parameter()
+            this.$router.push({name:this.getQueryParamFromHash('path')})
+            this.getAccountInfo()
+          })
+        }, 1000);
+        
+      }
+    },
+    mounted(){
+      this.autoLogin()
+    }
+  }
+</script>
+<style scoped >
+.flex-loading{
+  height: 100vh;
+  width: 100vw;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  background-image: url(@/assets/bg.png);
+  background-size: cover;
+}
+.loading {
+  position: relative;
+  width: 205px;
+  perspective: 200px;
+  text-align: center;
+}
+
+.loading:before,
+.loading:after {
+  position: absolute;
+  width: 20px;
+  height: 20px;
+  content: "";
+  animation: jumping 0.5s infinite alternate;
+  background: rgba(0, 0, 0, 0);
+}
+
+.loading:before {
+  left: 55%;
+}
+
+.loading:after {
+  right: 55%;
+  animation-delay: 0.15s;
+}
+@keyframes jumping {
+  0% {
+    transform: scale(1) translateY(0px) rotateX(0deg);
+    box-shadow: 0 0 0 rgba(0, 0, 0, 0);
+  }
+
+  100% {
+    transform: scale(1.2) translateY(-25px) rotateX(45deg);
+    background: rgb(100, 108, 255);
+    box-shadow: 0 25px 40px #000;
+  }
+}
+</style>