修改部分样式问题，新增解析转义，修改buyer端没有第三方登录问题

manager/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;
+}
+
 
 /**
  * 订单来源

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

@@ -4,9 +4,10 @@
       <div class="mb_10">
         <Button @click="addParent" icon="md-add">添加一级分类</Button>
       </div>
-      <Table :load-data="handleLoadData" row-key="id" :loading="loading" :data="tableData" :columns="columns">
+      <Table class="table" :load-data="handleLoadData" row-key="id" :loading="loading" :data="tableData"
+        :columns="columns">
         <template slot="action" slot-scope="scope">
-          <Dropdown v-show="scope.row.level == 2"   trigger="click">
+          <Dropdown v-show="scope.row.level == 2" trigger="click">
             <Button size="small">
               绑定
               <Icon type="ios-arrow-down"></Icon>
@@ -19,7 +20,7 @@
           </Dropdown>
 
           &nbsp;
-          <Dropdown  trigger="click">
+          <Dropdown trigger="click">
             <Button size="small">
               操作
               <Icon type="ios-arrow-down"></Icon>
@@ -32,7 +33,8 @@
             </DropdownMenu>
           </Dropdown>
           &nbsp;
-          <Button v-show="scope.row.level != 2" type="primary" @click="addChildren(scope.row)" size="small" icon="md-add" style="margin-right: 5px">添加子分类
+          <Button v-show="scope.row.level != 2" type="primary" @click="addChildren(scope.row)" size="small"
+            icon="md-add" style="margin-right: 5px">添加子分类
           </Button>
         </template>
 
@@ -41,7 +43,8 @@
         </template>
 
         <template slot="deleteFlag" slot-scope="{row}">
-          <Tag :class="{'ml_10': row.deleteFlag}" :color="row.deleteFlag == false ? 'success' : 'error'">{{row.deleteFlag == false ? '正常启用' : '禁用'}}</Tag>
+          <Tag :class="{'ml_10': row.deleteFlag}" :color="row.deleteFlag == false ? 'success' : 'error'">
+            {{row.deleteFlag == false ? '正常启用' : '禁用'}}</Tag>
         </template>
       </Table>
 
@@ -107,7 +110,7 @@
         </div>
       </Modal>
     </Card>
-    
+
   </div>
 </template>
 <script>
@@ -126,15 +129,15 @@ import {
 } from "@/api/goods";
 
 import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
-import {regular} from "@/utils";
+import { regular } from "@/utils";
 export default {
   name: "goods-category",
   components: {
-    uploadPicInput
+    uploadPicInput,
   },
   data() {
     return {
-      submitLoading:false, //加载状态
+      submitLoading: false, //加载状态
       categoryList: [], // 分类列表
       loading: false, // 加载状态
       brands: [], //品牌集合
@@ -168,9 +171,9 @@ export default {
       // 表单验证规则
       formValidate: {
         commissionRate: [
-          {required: true, message: '请填写佣金比例'},
-          {pattern: regular.Integer, message: "佣金比例不能为负"},
-        ]
+          { required: true, message: "请填写佣金比例" },
+          { pattern: regular.Integer, message: "佣金比例不能为负" },
+        ],
       },
       columns: [
         {
@@ -189,7 +192,6 @@ export default {
           slot: "commissionRate",
         },
         {
-          fixed: "right",
           title: "操作",
           key: "action",
 
@@ -466,4 +468,11 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-</style>
+/deep/ .ivu-table-wrapper {
+  overflow: auto;
+}
+.table {
+  min-height: 100vh;
+  height: auto;
+}
+</style>

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

@@ -88,7 +88,7 @@ export default {
   overflow-y: auto;
 }
 .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: #ed3f14;
+    color: $theme_color;
 }
 /deep/.ivu-menu-vertical .ivu-menu-item-group-title {
     height: 40px;

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

@@ -195,9 +195,12 @@ export default {
       this.$emit("on-change", this.data);
     },
   },
-  watch: {
-    value(val) {
-      this.setData(val);
+ watch: {
+    value: {
+      handler: function (val) {
+        // 赋值给富文本
+        this.setData(this.$options.filters.enCode(val));
+      },
     },
   },
   mounted() {