Merge branch 'webTest' into testToMerge

src/WebsiteManagement/marketproductMag/index.vue

@@ -46,6 +46,17 @@
           }}
         </div>
       </div>
+      <div v-else-if="scope.data.column.columnname === 'classmx'">
+        <span v-if="scope.data.column.data.class && scope.data.column.data[scope.data.column.columnname]">
+          {{$t(scope.data.column.data.class) + '/' + $t(scope.data.column.data.classmx)}}
+        </span>
+        <span v-else-if="scope.data.column.data.class && !scope.data.column.data[scope.data.column.columnname]">
+          {{$t(scope.data.column.data.class)}}
+        </span>
+        <span v-else>
+          --
+        </span>
+      </div>
       <div v-else>
         {{
           $t(scope.data.column.data[[scope.data.column.columnname]])

src/WebsiteManagement/marketproductMag/modules/detail.vue

@@ -132,9 +132,11 @@ export default {
         },
       });
       this.detailInfo = res.data;
-      this.$refs.technicalparam.innerHTML = res.data.technicalparam;
-      this.$refs.materialdescription.innerHTML = res.data.materialdescription;
-      this.$refs.contentstr.innerHTML = res.data.content;
+      setTimeout(()=>{
+        this.$refs.technicalparam.innerHTML = res.data.technicalparam;
+        this.$refs.materialdescription.innerHTML = res.data.materialdescription;
+        this.$refs.contentstr.innerHTML = res.data.content;
+      },500)
     },
     async statusChange() {
       const res = await this.$api.requested({