Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui into dev-gl

seller/docker.sh

@@ -1 +1 @@
-docker build -t registry.cn-beijing.aliyuncs.com/lili-images/seller-ui-4.2.0:0.0.2 .
+docker build -t registry.cn-beijing.aliyuncs.com/lili-images/seller-ui:4.2.2.1 .

seller/src/main.js

@@ -8,8 +8,6 @@ import vueQr from "vue-qr";
 import App from "./App";
 import { router } from "./router/index";
 import store from "./store";
-import config from '@/config/index'
-
 import {
   getRequest,
   postRequest,
@@ -50,8 +48,8 @@ Vue.prototype.setStore = setStore;
 Vue.prototype.getStore = getStore;
 Vue.prototype.removeStore = removeStore;
 Vue.prototype.md5 = md5;
-const PC_URL = config.PC_URL; // 跳转买家端地址 pc端
-const WAP_URL = config.WAP_URL; // 跳转买家端地址 wap端
+const PC_URL = BASE.PC_URL; // 跳转买家端地址 pc端
+const WAP_URL = BASE.WAP_URL; // 跳转买家端地址 wap端
 Vue.prototype.linkTo = function(goodsId, skuId) {
   // 跳转买家端商品
   window.open(

seller/src/utils/filters.js

@@ -15,6 +15,23 @@ export function unitPrice(val, unit, location) {
   }
   return (unit || "") + price;
 }
+// 转义 
+export function enCode(v1) {
+  var entry = {
+    "'": "'",
+    "&lt;": "<",
+    "&gt;": ">",
+    "&#40;": "(",
+    "&#41;": ")"
+  };
+
+  v1 = v1.replace(/(&#39;)|(&lt;)|(&gt;)|(&#40;)|(&#41;)|\s/gi, function($0) {
+    return entry[$0] || $0;
+  });
+
+  return v1;
+}
+
 
 /**
  * 订单来源

seller/src/views/goods/goods-manage/category.vue

@@ -250,4 +250,11 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+/deep/ .ivu-table-wrapper {
+  overflow: auto;
+}
+.table {
+  min-height: 100vh;
+  height: auto;
+}
 </style>

seller/src/views/goods/goods-seller/goodsOperationSec.vue

@@ -166,7 +166,7 @@
                               <img v-if="previewPicture !== ''" :src="previewPicture" />
                             </div>
                             <Divider />
-                            <vuedraggable :list="selectedSku.images" :animation="200" style="display:inline-block;">
+                            <vuedraggable  :list="selectedSku.images" :animation="200" style="display:inline-block;">
                               <div class="sku-upload-list" v-for="(img, __index) in selectedSku.images" :key="__index">
                                 <template>
                                   <img :src="img.url" />
@@ -900,13 +900,13 @@ export default {
         });
       });
 
-      this.baseInfoForm.goodsType != "VIRTUAL_GOODS";
-
-      pushData.push(
-        {
+     this.baseInfoForm.goodsType != "VIRTUAL_GOODS"
+        ? pushData.push({
           title: "重量",
           slot: "weight",
-        },
+        })
+        : "";
+      pushData.push(
         {
           title: "货号",
           slot: "sn",
@@ -928,7 +928,6 @@ export default {
           slot: "images",
         }
       );
-      this.baseInfoForm.goodsType != "VIRTUAL_GOODS" ? pushData.shift() : "";
 
       this.skuTableColumn = pushData;
       //克隆所有渲染的数据

seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue

@@ -73,3 +73,8 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+.ivu-menu-dark.ivu-menu-vertical .ivu-menu-item-active:not(.ivu-menu-submenu), .ivu-menu-dark.ivu-menu-vertical .ivu-menu-submenu-title-active:not(.ivu-menu-submenu){
+    color: $theme_color;
+}
+</style>

seller/src/views/my-components/lili/editor.vue

@@ -194,10 +194,10 @@ export default {
     },
   },
   watch: {
-    value: {
+   value: {
       handler: function (val) {
         // 赋值给富文本
-        this.setData(val);
+        this.setData(this.$options.filters.enCode(val));
       },
     },
   },