From d30e19e44661993d570a2b6ce696660b630a3c8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=8B=E4=BA=8E=E5=88=9D=E8=A7=81?= <752204717@qq.com>
Date: Thu, 9 May 2024 13:29:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E7=BB=91=E5=AE=9A=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/commonBookTags/shopproduct.vue |    9 +-
 .../commonBookTags/shopproductTable.vue       |   21 +-
 .../modules/course/course-add-or-update.vue   |   47 +-
 .../shop/commonBookTags/commonTags1.vue       |  758 ++++++++++
 .../shop/commonBookTags/correlation.vue       |  655 +++++++++
 .../shop/commonBookTags/operationsList.vue    | 1252 +++++++++++++++++
 .../modules/shop/commonBookTags/tags.vue      |  255 ++--
 src/views/modules/shop/curriculum.vue         |    5 -
 .../shop/shopproduct-add-or-update.vue        | 1158 ++++++++-------
 src/views/modules/shop/shopproduct.vue        |   71 +-
 10 files changed, 3565 insertions(+), 666 deletions(-)
 create mode 100644 src/views/modules/shop/commonBookTags/commonTags1.vue
 create mode 100644 src/views/modules/shop/commonBookTags/correlation.vue
 create mode 100644 src/views/modules/shop/commonBookTags/operationsList.vue

diff --git a/src/views/components/commonBookTags/shopproduct.vue b/src/views/components/commonBookTags/shopproduct.vue
index 85498cd..cc81f00 100644
--- a/src/views/components/commonBookTags/shopproduct.vue
+++ b/src/views/components/commonBookTags/shopproduct.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="width: 100%; height: 100%; margin-top: -50px">
+  <div class="commonShopproduct" :style="`width: 100%; height: 100%; margin-top: -50px`">
    
     <!-- <el-form
       :inline="true"
@@ -29,9 +29,9 @@
     <div class="search_form">
       <div class="addFormBox shopFormBox">
         <el-form ref="addForm" label-width="80px" :model="dataForm">
-          <slot name="searchFormItem" :dataForm="dataForm"></slot>
+          <slot name="searchFormItem" :dataForm="dataForm" v-if="!isNoSearch"></slot>
 
-          <el-form-item
+          <el-form-item v-if="!isNoSearch"
             label=""
             class="form_item"
             label-width="20px"
@@ -158,7 +158,8 @@ export default {
     "urlList",
     "isEdit",
     "currentId",
-    "currentType"
+    "currentType",
+    "isNoSearch",
   ],
   data() {
     return {
diff --git a/src/views/components/commonBookTags/shopproductTable.vue b/src/views/components/commonBookTags/shopproductTable.vue
index 166cc04..aaf18c7 100644
--- a/src/views/components/commonBookTags/shopproductTable.vue
+++ b/src/views/components/commonBookTags/shopproductTable.vue
@@ -7,6 +7,9 @@
       :visible.sync="drawer"
       destroy-on-close
       direction="rtl"
+      :append-to-body="true"
+      :modal-append-to-body="false"
+      :modal="!isNoModal"
       size="70%"
     >
       <div class="shop_drawer_box demo-drawer__content">
@@ -38,7 +41,7 @@
         </div>
         <el-table
           ref="table"
-          height="80%"
+          height="calc(100% - 120px)"
           :data="dataList"
           :row-key="getRowKeys"
           border
@@ -64,6 +67,7 @@
           <!--  -->
         </el-table>
         <el-pagination
+        style="float: right;margin-top: 20px;"
           @size-change="sizeChangeHandle"
           @current-change="currentChangeHandle"
           :current-page="pageIndex"
@@ -93,7 +97,15 @@
 // import chooseBook from './chooseBook.vue'
 // import AddOrUpdate from './shopproduct-add-or-update'
 export default {
-  props: ["defaultForm","marketIdKey", "currentType", "currentId", "title", "urlList"],
+  props: [
+    "defaultForm",
+    "marketIdKey",
+    "currentType",
+    "currentId",
+    "title",
+    "isNoModal",
+    "urlList"
+  ],
   data() {
     return {
       timer: null,
@@ -103,9 +115,7 @@ export default {
       multipleSelectionAll: [], // 所有选中的数据包含跨页数据
       multipleSelection: [], // 当前页选中的数据
       idKey: "productId", // 标识列表数据中每一行的唯一键的名称(需要按自己的数据改一下)
-      dataForm: {
-       
-      },
+      dataForm: {},
       bookMarketId: null,
       dataList: [],
       publishStatus: false,
@@ -338,6 +348,7 @@ export default {
 <style lang="less" scoped>
 .shop_drawer_box {
   padding: 20px !important;
+  padding-top: 0px !important;
   box-sizing: border-box;
   width: 100%;
   height: 100%;
diff --git a/src/views/modules/course/course-add-or-update.vue b/src/views/modules/course/course-add-or-update.vue
index 1e39c9c..c38f235 100644
--- a/src/views/modules/course/course-add-or-update.vue
+++ b/src/views/modules/course/course-add-or-update.vue
@@ -315,6 +315,9 @@ export default {
         // splits: [
         //    { required: true, message: '拆分类类型不能为空', trigger: 'blur' }
         //  ]
+      },
+      urlList: {
+        info: "/master/course/getCoursedetail"
       }
     };
   },
@@ -325,16 +328,42 @@ export default {
   methods: {
     init(row) {
       console.log("11111", row);
-      this.dataForm = row || {};
-      if (row.image != "" && row.image != null) {
-        var img = {
-          name: "",
-          url: row.image
-        };
-        var attr = [];
-        attr.push(img);
-        this.fileList = attr;
+      if (row.id) {
+        this.$http
+          .request({
+            url: this.$http.adornUrl(this.urlList.info),
+            method: "POST",
+            data: {
+              id: row.id
+            },
+            header: {
+              //默认 无 说明：请求头
+              "Content-Type": "application/json"
+            }
+          })
+
+          .then(res => {
+            console.log("result at line 452:", res);
+            if (res && res.data.code === 0) {
+              var data = res.data.course;
+              console.log("data at line 357:", data);
+
+              if (data.image != "" && data.image != null) {
+                var img = {
+                  name: "",
+                  url: data.image
+                };
+                var attr = [];
+                attr.push(img);
+                this.fileList = attr;
+              }
+              this.dataForm = { ...data };
+            }
+          });
+      } else {
+        this.dataForm = {};
       }
+
       // this.dataForm.id = row.id || 0
       // this.dataForm.title = row.title || ''
       this.visible = true;
diff --git a/src/views/modules/shop/commonBookTags/commonTags1.vue b/src/views/modules/shop/commonBookTags/commonTags1.vue
new file mode 100644
index 0000000..a3400c1
--- /dev/null
+++ b/src/views/modules/shop/commonBookTags/commonTags1.vue
@@ -0,0 +1,758 @@
+<template>
+  <div>
+    <el-drawer
+      title=""
+      :with-header="false"
+      v-if="drawer"
+      :visible.sync="drawer"
+      destroy-on-close
+      direction="rtl"
+      size="80%"
+    >
+      <div
+        class="shop_drawer_box demo-drawer__content"
+        v-loading="dataListLoading"
+      >
+        <button
+          @click="close"
+          aria-label="close drawer"
+          type="button"
+          class="el-drawer__close-btn"
+        >
+          <i class="el-dialog__close el-icon el-icon-close"></i>
+        </button>
+        <!-- <div class="addFormBox">
+          <el-form ref="addForm" label-width="80px" :model="dataForm">
+            <el-form-item label="商品名称" prop="title" class="form_item">
+              <el-input
+                size="small"
+                placeholder="请输入商品名称"
+                style="width: 100%"
+                v-model="dataForm.key"
+                clearable
+              >
+              </el-input>
+            </el-form-item>
+            <el-form-item label="商品类型" prop="goodsType" class="form_item">
+              <el-select
+                size="small"
+                v-model="dataForm.goodsType"
+                placeholder="请选择"
+                style="width: 100%"
+                clearable
+              >
+                <el-option
+                  v-for="item in goodsTypeList"
+                  :key="item.dictType"
+                  :label="item.dictValue"
+                  :value="item.dictType"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item
+              label=""
+              class="form_item"
+              label-width="20px"
+              style="width: 160px !important"
+            >
+              <el-button
+                @click="
+                  pageIndex = 1;
+                  getDataList(bookMarketId);
+                "
+                size="small"
+                >查询</el-button
+              >
+              <el-button @click="handleReset()" size="small">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </div> -->
+        <div class="addFormBox commonTreeBox" style="overflow: hidden">
+          <div class="item-box" style="" v-for="(v, i) in appList">
+            <div class="title_box" slot="center">
+              <div class="title"><span class="line"></span>{{ v.name }}</div>
+            </div>
+            <div class="item-content">
+              <el-collapse v-model="activeNames" @change="handleChange">
+                <el-collapse-item title="分类标签" :name="v.collapseLabelKey">
+                  <commonTree
+                    source="shop"
+                    sourceType="bookLabelId"
+                    :ref="`commonTree${v.key}`"
+                    :productId="productId"
+                    :dataList="dynamicArray('treeDataList', v.key)"
+                    :urlList="urlList"
+                    @submit="
+                      (ids, sourceType) =>
+                        handleSubmitShop(ids, sourceType, v.key)
+                    "
+                    @delete="
+                      (ids, sourceType) =>
+                        handleDeleteShop(ids, sourceType, v.key)
+                    "
+                  >
+                  </commonTree>
+                </el-collapse-item>
+                <el-collapse-item title="营销标签" :name="v.collapseMarketKey">
+                  <commonTreeMarket
+                    source="shop"
+                    sourceType="bookMarketId"
+                    :productId="productId"
+                    :ref="`commonTreeMarket${v.key}`"
+                    :dataList="dynamicArray('treeDataMarketList', v.key)"
+                    :urlList="urlList"
+                    @submit="
+                      (ids, sourceType) =>
+                        handleSubmitShop(ids, sourceType, v.key)
+                    "
+                    @delete="
+                      (ids, sourceType) =>
+                        handleDeleteShop(ids, sourceType, v.key)
+                    "
+                  >
+                  </commonTreeMarket>
+                </el-collapse-item>
+              </el-collapse>
+            </div>
+          </div>
+        </div>
+
+        <!-- <div class="demo-drawer__footer">
+          <div style="float: right; margin-top: 20px">
+            <el-button @click="close" size="small">取 消</el-button>
+            <el-button
+              type="primary"
+              @click="submit"
+              :loading="loading"
+              size="small"
+              >{{ loading ? "提交中 ..." : "确 定" }}</el-button
+            >
+          </div>
+        </div> -->
+        <!-- 弹窗, 新增 / 修改 -->
+        <!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" @showchooseBookf = "showchooseBookf"></add-or-update>
+      <choose-book v-if="chooseBookVisible" :bookIds = bookIds ref="chooseBook" :chooseBookVisible = chooseBookVisible @closeBookf = "closeBookf"></choose-book>   -->
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+// import chooseBook from './chooseBook.vue'
+// import AddOrUpdate from './shopproduct-add-or-update'
+import debounce from "lodash/debounce"; //导入lodash中的debounce
+import commonTree from "./tags.vue";
+import commonTreeMarket from "./tags.vue";
+import commonTreeZMZM from "./tags.vue";
+export default {
+  props: ["currentType", "currentId"],
+  data() {
+    return {
+      activeNames: [],
+      appList: [
+        {
+          name: "疯子读书",
+          key: 1,
+          collapseLabelKey: 1,
+          collapseMarketKey: 2,
+          urlList: {
+            saveBookShop: "/master/shopProduct/bindProductAndBookLabel",
+            deleteBookShop: "/master/shopProduct/unbindProductAndBookLabel",
+            saveBookShopMarket: "/master/shopProduct/bindProductAndBookMarket",
+            deleteBookShopMarket:
+              "/master/shopProduct/unbindProductAndBookMarket"
+          }
+        },
+        {
+          name: "吴门医述",
+          key: 2,
+          collapseLabelKey: 3,
+          collapseMarketKey: 4,
+          urlList: {
+            saveBookShop: "/master/shopProduct/bindProductAndMedicineLabel",
+            deleteBookShop: "/master/shopProduct/unbindProductAndMedicineLabel",
+            saveBookShopMarket:
+              "/master/shopProduct/bindProductAndMedicineMarket",
+            deleteBookShopMarket:
+              "/master/shopProduct/unbindProductAndMedicineMarket"
+          }
+        },
+        {
+          name: "众妙之门",
+          key: 3,
+          collapseLabelKey: 5,
+          collapseMarketKey: 6,
+          urlList: {
+            saveBookShop: "/master/shopProduct/bindProductAndSociologyLabel",
+            deleteBookShop:
+              "/master/shopProduct/unbindProductAndSociologyLabel",
+            saveBookShopMarket:
+              "/master/shopProduct/bindProductAndSociologyMarket",
+            deleteBookShopMarket:
+              "/master/shopProduct/unbindProductAndSociologyMarket"
+          }
+        }
+      ],
+      productId: null,
+      drawer: false,
+      loading: false,
+      multipleSelectionAll: [], // 所有选中的数据包含跨页数据
+      multipleSelection: [], // 当前页选中的数据
+      idKey: "productId", // 标识列表数据中每一行的唯一键的名称(需要按自己的数据改一下)
+      dataForm: {
+        key: ""
+      },
+      bookMarketId: null,
+      dataList: [],
+      treeDataList1: [],
+      treeDataMarketList1: [],
+      treeDataList2: [],
+      treeDataMarketList2: [],
+      treeDataList3: [],
+      treeDataMarketList3: [],
+      publishStatus: false,
+      pageIndex: 1,
+      pageSize: 10,
+      totalPage: 0,
+      dataListLoading: false,
+      dataListSelections: [],
+      addOrUpdateVisible: false,
+      chooseBookVisible: false,
+      bookIds: [],
+      goodsTypeList: [],
+      urlList: {
+        treeList: "/master/shopProduct/getProductToLabel",
+        treeMarketList: "/book/labelAndMarket/marketTree",
+        deleteBookShop: "/book/labelAndMarket/delToLable",
+        deleteBookShopMarket: "/book/labelAndMarket/delToMarket",
+        saveBookShop: "/book/labelAndMarket/saveToLabel",
+        saveBookShopMarket: "/book/labelAndMarket/saveToMarket",
+
+        getToLabelList: "/book/labelAndMarket/getToLabelList",
+        getToMarketList: "/book/labelAndMarket/getToMarketList"
+      }
+    };
+  },
+  components: {
+    commonTree,
+    commonTreeMarket,
+    commonTreeZMZM
+    // chooseBook
+  },
+  async activated() {
+    // await this.getDataList("treeList");
+    // await this.getDataList("treeMarketList");
+  },
+
+  methods: {
+    dynamicArray(type, key) {
+      console.log("key at line 228:", key);
+      // 这里可以根据条件返回 this.myArray 或 this.yourArray
+      var list = [];
+      if (type == "treeDataList") {
+        switch (key) {
+          case 1:
+            list = this.treeDataList1;
+            break;
+          case 2:
+            list = this.treeDataList2;
+            break;
+          case 3:
+            list = this.treeDataList3;
+            break;
+        }
+      } else if (type == "treeDataMarketList") {
+        switch (key) {
+          case 1:
+            list = this.treeDataMarketList1;
+            break;
+          case 2:
+            list = this.treeDataMarketList2;
+            break;
+          case 3:
+            list = this.treeDataMarketList3;
+            break;
+        }
+      }
+      console.log("list at line 258:", list, key);
+      return list;
+    },
+    handleChange(val) {
+      console.log(val);
+    },
+    handleSubmitShop: debounce(async function(ids, sourceType, key) {
+      this.dataListLoading = true;
+      console.log("🚀 ~ handleSubmitShop ~ ids:", ids);
+      var url;
+      var data = { productId: this.productId };
+      switch (sourceType) {
+        case "bookLabelId":
+          url = this.appList[key - 1].urlList.saveBookShop;
+          data.labelId = ids;
+          break;
+        case "bookMarketId":
+          url = this.appList[key - 1].urlList.saveBookShopMarket;
+          data.marketId = ids;
+          break;
+      }
+      await this.$http({
+        url: this.$http.adornUrl(`${url}`),
+        method: "post",
+        data: this.$http.adornData(data)
+      }).then(async ({ data }) => {
+        if (data && data.code === 0) {
+          // this.$message.success(data.msg);
+        } else {
+          this.$message.error(data.msg);
+        }
+        // this.dataListLoading = false;
+      });
+      this.$nextTick(async () => {
+        setTimeout(() => {
+          this.getDataList();
+        }, 200);
+        // await this.$refs[`commonTree${key}`][0].getAssociatedGoodsList(
+        //   this.urlList.getToLabelList,
+        //   "bookLabelId"
+        // );
+        // await this.$refs[`commonTreeMarket${key}`][0].getAssociatedGoodsList(
+        //   this.urlList.getToMarketList,
+        //   "bookMarketId"
+        // );
+        this.dataListLoading = false;
+      });
+    }),
+    handleDeleteShop: debounce(async function(ids, sourceType, key) {
+      console.log("key at line 289:", key);
+      this.dataListLoading = true;
+      console.log("🚀 ~ handleSubmitShop ~ ids:", ids);
+      var url;
+      var data = { productId: this.productId };
+      switch (sourceType) {
+        case "bookLabelId":
+          url = `${this.appList[key - 1].urlList.deleteBookShop}`;
+          data.labelId = ids;
+          break;
+        case "bookMarketId":
+          url = `${this.appList[key - 1].urlList.deleteBookShopMarket}`;
+          data.marketId = ids;
+          break;
+      }
+      await this.$http
+        .request({
+          url: this.$http.adornUrl(url),
+          method: "POST",
+          data: {
+            ...data
+          },
+          header: {
+            //默认 无 说明：请求头
+            "Content-Type": "application/json"
+          }
+        })
+        .then(async ({ data }) => {
+          if (data && data.code === 0) {
+            // this.$message.success(data.msg);
+          } else {
+            this.$message.error(data.msg);
+          }
+          // this.dataListLoading = false;
+        });
+      this.$nextTick(async () => {
+        setTimeout(() => {
+          this.getDataList();
+        }, 200);
+        // await this.$refs[`commonTree${key}`][0].getAssociatedGoodsList(
+        //   this.urlList.getToLabelList,
+        //   "bookLabelId"
+        // );
+        // await this.$refs[`commonTreeMarket${key}`][0].getAssociatedGoodsList(
+        //   this.urlList.getToMarketList,
+        //   "bookMarketId"
+        // );
+        this.dataListLoading = false;
+      });
+    }),
+    async getDataList() {
+      await this.$http({
+        url: this.$http.adornUrl(`${this.urlList.treeList}`),
+        method: "post",
+        data: {
+          productId: this.productId
+        }
+      }).then(({ data }) => {
+        console.log("🚀 ~ getDataList ~ data:", data);
+        if (data && data.code === 0) {
+          var allData = data.data;
+          this.treeDataList1 = allData.bookLabel;
+
+          this.treeDataList2 = allData.medicineLabel;
+          this.treeDataList3 = allData.sociologyLabel;
+          // this.treeDataList1.push({});
+
+          this.treeDataMarketList1 = allData.bookMarket;
+          this.treeDataMarketList2 = allData.medicineMarket;
+          this.treeDataMarketList3 = allData.sociologyMarket;
+
+          // this.totalPage = data.page.totalCount
+        } else {
+          this.treeDataList1 = [];
+          this.treeDataList2 = [];
+          this.treeDataList3 = [];
+
+          this.treeDataMarketList1 = [];
+          this.treeDataMarketList2 = [];
+          this.treeDataMarketList3 = [];
+
+          // this.totalPage = 0
+        }
+      });
+    },
+    handleReset() {
+      this.dataForm = {};
+      this.pageIndex = 1;
+      this.getDataList();
+    },
+    submit() {
+      var ids = this.multipleSelection.map(e => e.productId).toString(",");
+      this.$emit("submit", ids);
+      console.log(
+        "🚀 ~ submit ~ this.multipleSelection:",
+        this.multipleSelection
+      );
+    },
+
+    // 获取商品类型
+    getGoodsTypeList() {
+      this.$http({
+        url: this.$http.adornUrl("/book/sysdictdata/selectByType/goodsType"),
+        method: "get"
+      }).then(({ data }) => {
+        // console.log(data.dataList)
+        this.goodsTypeList = data.dataList;
+      });
+    },
+    handleClose(done) {
+      done();
+      // this.$confirm("确认关闭？")
+      //   .then((_) => {
+      //     done();
+      //   })
+      //   .catch((_) => {});
+    },
+    async getTreeList() {
+      this.dataListLoading = true;
+      this.$nextTick(async () => {
+        this.appList.forEach(async e => {
+          await this.$refs[`commonTree${e.key}`].getAssociatedGoodsList(
+            this.urlList.getToLabelList,
+            "bookLabelId"
+          );
+          await this.$refs[`commonTreeMarket${e.key}`].getAssociatedGoodsList(
+            this.urlList.getToMarketList,
+            "bookMarketId"
+          );
+        });
+
+        await this.getDataList("treeList");
+        await this.getDataList("treeMarketList");
+        this.dataListLoading = false;
+      });
+    },
+    async open(id) {
+      this.productId = id;
+      this.drawer = true;
+      this.dataForm = {};
+      this.appList.forEach(e => {
+        this.activeNames.push(e.collapseLabelKey);
+        this.activeNames.push(e.collapseMarketKey);
+      });
+      setTimeout(async () => {
+        await this.getDataList();
+      }, 200);
+
+      // this.pageIndex = 1;
+      // await this.getGoodsTypeList();
+    },
+    close() {
+      this.drawer = false;
+    },
+    getRowKeys(row) {
+      return row.productId;
+    },
+    handleSelectionChange(val) {
+      console.log("🚀 ~ handleSelectionChange ~ val:", val);
+      // table组件选中事件,记得加上@selection-change="handleSelectionChange"
+      this.multipleSelection = val;
+      // this.changePageCoreRecordData();
+    },
+
+    closeBookf() {
+      this.chooseBookVisible = false;
+    },
+    showchooseBookf(e) {
+      // 显示图书列表
+      this.chooseBookVisible = true;
+      // console.log(this.bookIds,'this.bookIds')
+      // this.$nextTick(() => {
+      //   this.$refs.chooseBook.getBookList()
+      //   this.bookIds = e.bookIds
+      //   })
+    },
+    // 获取数据列表
+    // async getDataList() {
+    //   var form = {
+    //     ...this.dataForm,
+    //     current: this.pageIndex,
+    //     limit: this.pageSize,
+
+    //     productId: "",
+    //   };
+    //   // this.multipleSelection=[]
+    //   if (this.currentType == "bookLabelId") {
+    //     form.bookLabelId = this.currentId;
+    //     console.log("🚀 ~ getAssociatedGoodsList ~ form:", form);
+    //   } else if (this.currentType == "bookMarketId") {
+    //     form.bookMarketId = this.currentId;
+    //     console.log("🚀 ~ getAssociatedGoodsList ~ form:", form);
+    //   }
+    //   this.dataListLoading = true;
+    //   this.clear();
+
+    //   await this.$http({
+    //     url: this.$http.adornUrl(`/book/labelAndMarket/getNotToLabelList`),
+    //     method: "post",
+    //     data: this.$http.adornData(form),
+    //   }).then(({ data }) => {
+    //     if (data && data.code === 0) {
+    //       this.dataList = data.result.records;
+    //       this.totalPage = data.result.total;
+    //     } else {
+    //       this.dataList = [];
+    //       this.totalPage = 0;
+    //     }
+    //     // setTimeout(async () => {
+    //     //   await this.setSelectRow();
+    //     // }, 200);
+    //     this.dataListLoading = false;
+    //   });
+    // },
+    clear() {
+      // this.$refs.table.clearSelection();
+      this.multipleSelection = [];
+    },
+
+    // 每页数
+    sizeChangeHandle(val) {
+      // this.changePageCoreRecordData();
+      this.pageSize = val;
+      this.pageIndex = 1;
+      this.getDataList();
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      // 改变页的时候调用一次
+      // this.changePageCoreRecordData();
+      this.pageIndex = val;
+      this.getDataList();
+    },
+    // 多选
+    selectionChangeHandle(val) {
+      this.dataListSelections = val;
+    },
+    // 新增 / 修改
+    addOrUpdateHandle(id) {
+      this.addOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(id);
+      });
+    },
+    // 删除
+    deleteHandle(id) {
+      var ids = id
+        ? [id]
+        : this.dataListSelections.map(item => {
+            return item.productId;
+          });
+      this.$confirm(
+        `确定对[id=${ids.join(",")}]进行[${id ? "删除" : "批量删除"}]操作?`,
+        "提示",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }
+      ).then(() => {
+        this.$http({
+          url: this.$http.adornUrl("/book/shopproduct/delete"),
+          method: "post",
+          data: this.$http.adornData(ids, false)
+        }).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.$message({
+              message: "操作成功",
+              type: "success",
+              duration: 1500,
+              onClose: () => {
+                this.getDataList();
+              }
+            });
+          } else {
+            this.$message.error(data.msg);
+          }
+        });
+      });
+    },
+    SwitchChange(event) {
+      /*点击时他会自动把你绑定的值变更，直接去请求数据就可以了*/
+      var parms = {
+        publishStatus: event.publishStatus,
+        productId: event.productId
+      };
+      // console.log(parms)
+      this.$http({
+        url: this.$http.adornUrl("/book/shopproduct/update"),
+        method: "post",
+        data: parms
+      })
+        .then(res => {
+          this.$message({
+            message: "成功",
+            type: "success"
+          });
+          this.loading = false;
+          this.getDataList();
+        })
+        .catch(error => {
+          this.loading = false;
+          console.log(error);
+        });
+      console.log(event);
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.shop_drawer_box {
+  padding: 20px !important;
+  box-sizing: border-box;
+  width: 100%;
+  height: 100%;
+}
+.addFormBox {
+  width: 100%;
+
+  // overflow: hidden;
+  .form_item {
+    width: 33%;
+    float: left;
+  }
+}
+::v-deep.el-drawer__header {
+  margin-bottom: 10px !important;
+}
+.commonTreeBox {
+  height: calc(100% - 10px) !important;
+  padding: 5px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding-bottom: 5px !important;
+}
+
+/deep/.tree_box {
+  width: 100% !important;
+  // min-width: 300px;
+
+  // background-color: #fff !important;
+  border: none !important;
+  border-radius: 10px;
+  padding: 15px;
+  padding-left: 0px !important ;
+  box-sizing: border-box;
+
+  .custom-tree-container {
+    border-radius: 4px !important;
+    height: calc(100% - 30px);
+    // border: 1px solid #ebeef5 !important;
+    // background-color: #fff !important;
+    overflow: hidden !important;
+    color: #303133 !important;
+    // padding: 15px;
+    transition: 0.3s !important;
+  }
+  // background: #fafafa;
+}
+/deep/.shop_drawer_box {
+  // padding-top: 0px !important ;
+}
+
+.title_box {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 20px;
+  .button_box {
+    // width: 200px;
+    float: right;
+  }
+}
+.title {
+  width: 300px;
+  min-width: 200px;
+  padding: 20px;
+  padding-bottom: 0;
+  float: left;
+  display: flex;
+  align-items: center;
+  font-weight: 600;
+  font-size: 22px;
+
+  // color: #17b3a3;
+  .line {
+    width: 4px;
+    height: 20px;
+    margin-right: 8px;
+    background: #17b3a3;
+  }
+}
+.el-drawer__close-btn {
+  position: absolute;
+  right: 10px;
+  top: 10px;
+}
+.item-box {
+  width: 32%;
+  height: 100%;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1) !important;
+  border: 1px solid #ebeef5 !important;
+}
+.item-content {
+  padding: 20px;
+  padding-top: 0;
+  overflow-y: auto;
+  height: calc(100% - 80px);
+}
+/deep/.el-collapse-item {
+  margin-bottom: 20px;
+  .el-collapse-item__header {
+    background: #17b3a3 !important;
+    height: 36px !important;
+    color: #fff;
+    font-size: 16px;
+    padding-left: 15px;
+  }
+  .el-collapse-item__wrap {
+    background: #f8f8f8 !important;
+    .el-tree {
+      background-color: transparent !important;
+    }
+  }
+}
+
+/deep/.el-collapse {
+  border-bottom: none !important;
+}
+</style>
diff --git a/src/views/modules/shop/commonBookTags/correlation.vue b/src/views/modules/shop/commonBookTags/correlation.vue
new file mode 100644
index 0000000..7eb7a6d
--- /dev/null
+++ b/src/views/modules/shop/commonBookTags/correlation.vue
@@ -0,0 +1,655 @@
+<template>
+  <div>
+    <el-drawer
+      title=""
+      :with-header="false"
+      v-if="drawer"
+      :visible.sync="drawer"
+      destroy-on-close
+      direction="rtl"
+      size="80%"
+    >
+      <div
+        class="shop_drawer_box demo-drawer__content"
+        v-loading="dataListLoading"
+      >
+        <button
+          @click="close"
+          aria-label="close drawer"
+          type="button"
+          class="el-drawer__close-btn"
+        >
+          <i class="el-dialog__close el-icon el-icon-close"></i>
+        </button>
+        <div class="addFormBox commonTreeBox" style="overflow: hidden">
+          <div class="item-box" style="">
+            <!-- <div class="title_box" slot="center">
+              <div class="title"><span class="line"></span></div>
+            </div> -->
+            <div class="item-content">
+              <el-collapse v-model="activeNames" @change="handleChange">
+                <el-collapse-item title="已关联图书列表" name="1">
+                  <commonOperationsList
+                    ref="commonOperationsBook"
+                    title="图书"
+                    source="book"
+                  >
+                  </commonOperationsList>
+                </el-collapse-item>
+                <el-collapse-item title="已关联课程列表" name="2">
+                  <commonOperationsList
+                    ref="commonOperationsCurriculum"
+                    title="课程"
+                    source="curriculum"
+                  ></commonOperationsList>
+                </el-collapse-item>
+              </el-collapse>
+            </div>
+          </div>
+        </div>
+
+        <!-- <div class="demo-drawer__footer">
+          <div style="float: right; margin-top: 20px">
+            <el-button @click="close" size="small">取 消</el-button>
+            <el-button
+              type="primary"
+              @click="submit"
+              :loading="loading"
+              size="small"
+              >{{ loading ? "提交中 ..." : "确 定" }}</el-button
+            >
+          </div>
+        </div> -->
+        <!-- 弹窗, 新增 / 修改 -->
+        <!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" @showchooseBookf = "showchooseBookf"></add-or-update>
+      <choose-book v-if="chooseBookVisible" :bookIds = bookIds ref="chooseBook" :chooseBookVisible = chooseBookVisible @closeBookf = "closeBookf"></choose-book>   -->
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+// import chooseBook from './chooseBook.vue'
+// import AddOrUpdate from './shopproduct-add-or-update'
+import debounce from "lodash/debounce"; //导入lodash中的debounce
+import commonOperationsList from "./operationsList.vue";
+
+export default {
+  props: ["currentType", "currentId"],
+  data() {
+    return {
+      activeNames: ["1", "2"],
+      appList: [
+        {
+          name: "关联图书",
+          key: 1,
+          collapseLabelKey: 1,
+          collapseMarketKey: 2,
+          urlList: {}
+        },
+        {
+          name: "关联课程",
+          key: 2,
+          collapseLabelKey: 3,
+          collapseMarketKey: 4,
+          urlList: {}
+        },
+        {
+          name: "众妙之门",
+          key: 3,
+          collapseLabelKey: 5,
+          collapseMarketKey: 6,
+          urlList: {}
+        }
+      ],
+      productId: null,
+      drawer: false,
+      loading: false,
+      multipleSelectionAll: [], // 所有选中的数据包含跨页数据
+      multipleSelection: [], // 当前页选中的数据
+      idKey: "productId", // 标识列表数据中每一行的唯一键的名称(需要按自己的数据改一下)
+      dataForm: {
+        key: ""
+      },
+      bookMarketId: null,
+      dataList: [],
+      treeDataList1: [],
+      treeDataMarketList1: [],
+      treeDataList2: [],
+      treeDataMarketList2: [],
+      treeDataList3: [],
+      treeDataMarketList3: [],
+      publishStatus: false,
+      pageIndex: 1,
+      pageSize: 10,
+      totalPage: 0,
+      dataListLoading: false,
+      dataListSelections: [],
+      addOrUpdateVisible: false,
+      chooseBookVisible: false,
+      bookIds: [],
+      goodsTypeList: [],
+      urlList: {
+        treeList: "/master/shopProduct/getProductToLabel",
+        treeMarketList: "/book/labelAndMarket/marketTree",
+        deleteBookShop: "/book/labelAndMarket/delToLable",
+        deleteBookShopMarket: "/book/labelAndMarket/delToMarket",
+        saveBookShop: "/book/labelAndMarket/saveToLabel",
+        saveBookShopMarket: "/book/labelAndMarket/saveToMarket",
+        getToLabelList: "/book/labelAndMarket/getToLabelList",
+        getToMarketList: "/book/labelAndMarket/getToMarketList"
+      }
+    };
+  },
+  components: {
+    commonOperationsList
+    // chooseBook
+  },
+  async activated() {
+    // await this.getDataList("treeList");
+    // await this.getDataList("treeMarketList");
+  },
+
+  methods: {
+    openTable(type, formName) {
+      this.$nextTick(() => {
+        this.$refs[`commonOperationsBook`][0].openTable(formName);
+      });
+    },
+    dynamicArray(type, key) {
+      console.log("key at line 228:", key);
+      // 这里可以根据条件返回 this.myArray 或 this.yourArray
+      var list = [];
+      if (type == "treeDataList") {
+        switch (key) {
+          case 1:
+            list = this.treeDataList1;
+            break;
+          case 2:
+            list = this.treeDataList2;
+            break;
+          case 3:
+            list = this.treeDataList3;
+            break;
+        }
+      } else if (type == "treeDataMarketList") {
+        switch (key) {
+          case 1:
+            list = this.treeDataMarketList1;
+            break;
+          case 2:
+            list = this.treeDataMarketList2;
+            break;
+          case 3:
+            list = this.treeDataMarketList3;
+            break;
+        }
+      }
+      console.log("list at line 258:", list, key);
+      return list;
+    },
+    handleChange(val) {
+      console.log(val);
+    },
+    handleSubmitShop: debounce(async function(ids, sourceType, key) {
+      this.dataListLoading = true;
+      console.log("🚀 ~ handleSubmitShop ~ ids:", ids);
+      var url;
+      var data = { productId: this.productId };
+      switch (sourceType) {
+        case "bookLabelId":
+          url = this.urlList.saveBookShop;
+          data.bookLabelId = ids;
+          break;
+        case "bookMarketId":
+          url = this.urlList.saveBookShopMarket;
+          data.bookMarketId = ids;
+          break;
+      }
+      await this.$http({
+        url: this.$http.adornUrl(`${url}`),
+        method: "post",
+        data: this.$http.adornData(data)
+      }).then(async ({ data }) => {
+        if (data && data.code === 0) {
+          // this.$message.success(data.msg);
+        } else {
+          this.$message.error(data.msg);
+        }
+        // this.dataListLoading = false;
+      });
+      this.$nextTick(async () => {
+        await this.$refs[`commonTree${key}`][0].getAssociatedGoodsList(
+          this.urlList.getToLabelList,
+          "bookLabelId"
+        );
+        await this.$refs[`commonTreeMarket${key}`][0].getAssociatedGoodsList(
+          this.urlList.getToMarketList,
+          "bookMarketId"
+        );
+        this.dataListLoading = false;
+      });
+    }, 200),
+    handleDeleteShop: debounce(async function(ids, sourceType, key) {
+      console.log("key at line 289:", key);
+      this.dataListLoading = true;
+      console.log("🚀 ~ handleSubmitShop ~ ids:", ids);
+      var url;
+      switch (sourceType) {
+        case "bookLabelId":
+          url = `${this.urlList.deleteBookShop}?lableId=${ids}&productId=${
+            this.productId
+          }`;
+          break;
+        case "bookMarketId":
+          url = `${
+            this.urlList.deleteBookShopMarket
+          }?marketId=${ids}&productId=${this.productId}`;
+          break;
+      }
+      await this.$http({
+        url: this.$http.adornUrl(url),
+        method: "post"
+      }).then(async ({ data }) => {
+        if (data && data.code === 0) {
+          // this.$message.success(data.msg);
+        } else {
+          this.$message.error(data.msg);
+        }
+        // this.dataListLoading = false;
+      });
+      this.$nextTick(async () => {
+        await this.$refs[`commonTree${key}`][0].getAssociatedGoodsList(
+          this.urlList.getToLabelList,
+          "bookLabelId"
+        );
+        await this.$refs[`commonTreeMarket${key}`][0].getAssociatedGoodsList(
+          this.urlList.getToMarketList,
+          "bookMarketId"
+        );
+        this.dataListLoading = false;
+      });
+    }, 200),
+    async getDataList(id) {
+      await this.$http({
+        url: this.$http.adornUrl(`${this.urlList.treeList}`),
+        method: "post",
+        data: {
+          productId: id
+        }
+      }).then(({ data }) => {
+        console.log("🚀 ~ getDataList ~ data:", data);
+        if (data && data.code === 0) {
+          var allData = data.data;
+          this.treeDataList1 = allData.bookLabel;
+
+          this.treeDataList2 = allData.medicineLabel;
+          this.treeDataList3 = allData.sociologyLabel;
+          // this.treeDataList1.push({});
+
+          this.treeDataMarketList1 = allData.bookMarket;
+          this.treeDataMarketList2 = allData.medicineMarket;
+          this.treeDataMarketList3 = allData.sociologyMarket;
+
+          // this.totalPage = data.page.totalCount
+        } else {
+          this.treeDataList1 = [];
+          this.treeDataList2 = [];
+          this.treeDataList3 = [];
+
+          this.treeDataMarketList1 = [];
+          this.treeDataMarketList2 = [];
+          this.treeDataMarketList3 = [];
+
+          // this.totalPage = 0
+        }
+      });
+    },
+    handleReset() {
+      this.dataForm = {};
+      this.pageIndex = 1;
+      this.getDataList();
+    },
+    submit() {
+      var ids = this.multipleSelection.map(e => e.productId).toString(",");
+      this.$emit("submit", ids);
+      console.log(
+        "🚀 ~ submit ~ this.multipleSelection:",
+        this.multipleSelection
+      );
+    },
+
+    // 获取商品类型
+    getGoodsTypeList() {
+      this.$http({
+        url: this.$http.adornUrl("/book/sysdictdata/selectByType/goodsType"),
+        method: "get"
+      }).then(({ data }) => {
+        // console.log(data.dataList)
+        this.goodsTypeList = data.dataList;
+      });
+    },
+    handleClose(done) {
+      done();
+      // this.$confirm("确认关闭？")
+      //   .then((_) => {
+      //     done();
+      //   })
+      //   .catch((_) => {});
+    },
+    async getTreeList() {
+      this.dataListLoading = true;
+      this.$nextTick(async () => {
+        this.appList.forEach(async e => {
+          await this.$refs[`commonTree${e.key}`].getAssociatedGoodsList(
+            this.urlList.getToLabelList,
+            "bookLabelId"
+          );
+          await this.$refs[`commonTreeMarket${e.key}`].getAssociatedGoodsList(
+            this.urlList.getToMarketList,
+            "bookMarketId"
+          );
+        });
+
+        await this.getDataList("treeList");
+        await this.getDataList("treeMarketList");
+        this.dataListLoading = false;
+      });
+    },
+    async open(id) {
+      this.activeNames = ["1", "2"];
+      this.productId = id;
+      this.drawer = true;
+      this.dataForm = {};
+      this.appList.forEach(e => {
+        this.activeNames.push(e.collapseLabelKey);
+        this.activeNames.push(e.collapseMarketKey);
+      });
+      setTimeout(async () => {
+        await this.getDataList(id);
+      }, 200);
+
+      // this.pageIndex = 1;
+      // await this.getGoodsTypeList();
+    },
+    close() {
+      this.drawer = false;
+    },
+    getRowKeys(row) {
+      return row.productId;
+    },
+    handleSelectionChange(val) {
+      console.log("🚀 ~ handleSelectionChange ~ val:", val);
+      // table组件选中事件,记得加上@selection-change="handleSelectionChange"
+      this.multipleSelection = val;
+      // this.changePageCoreRecordData();
+    },
+
+    closeBookf() {
+      this.chooseBookVisible = false;
+    },
+    showchooseBookf(e) {
+      // 显示图书列表
+      this.chooseBookVisible = true;
+      // console.log(this.bookIds,'this.bookIds')
+      // this.$nextTick(() => {
+      //   this.$refs.chooseBook.getBookList()
+      //   this.bookIds = e.bookIds
+      //   })
+    },
+    // 获取数据列表
+    // async getDataList() {
+    //   var form = {
+    //     ...this.dataForm,
+    //     current: this.pageIndex,
+    //     limit: this.pageSize,
+
+    //     productId: "",
+    //   };
+    //   // this.multipleSelection=[]
+    //   if (this.currentType == "bookLabelId") {
+    //     form.bookLabelId = this.currentId;
+    //     console.log("🚀 ~ getAssociatedGoodsList ~ form:", form);
+    //   } else if (this.currentType == "bookMarketId") {
+    //     form.bookMarketId = this.currentId;
+    //     console.log("🚀 ~ getAssociatedGoodsList ~ form:", form);
+    //   }
+    //   this.dataListLoading = true;
+    //   this.clear();
+
+    //   await this.$http({
+    //     url: this.$http.adornUrl(`/book/labelAndMarket/getNotToLabelList`),
+    //     method: "post",
+    //     data: this.$http.adornData(form),
+    //   }).then(({ data }) => {
+    //     if (data && data.code === 0) {
+    //       this.dataList = data.result.records;
+    //       this.totalPage = data.result.total;
+    //     } else {
+    //       this.dataList = [];
+    //       this.totalPage = 0;
+    //     }
+    //     // setTimeout(async () => {
+    //     //   await this.setSelectRow();
+    //     // }, 200);
+    //     this.dataListLoading = false;
+    //   });
+    // },
+    clear() {
+      // this.$refs.table.clearSelection();
+      this.multipleSelection = [];
+    },
+
+    // 每页数
+    sizeChangeHandle(val) {
+      // this.changePageCoreRecordData();
+      this.pageSize = val;
+      this.pageIndex = 1;
+      this.getDataList();
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      // 改变页的时候调用一次
+      // this.changePageCoreRecordData();
+      this.pageIndex = val;
+      this.getDataList();
+    },
+    // 多选
+    selectionChangeHandle(val) {
+      this.dataListSelections = val;
+    },
+    // 新增 / 修改
+    addOrUpdateHandle(id) {
+      this.addOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(id);
+      });
+    },
+    // 删除
+    deleteHandle(id) {
+      var ids = id
+        ? [id]
+        : this.dataListSelections.map(item => {
+            return item.productId;
+          });
+      this.$confirm(
+        `确定对[id=${ids.join(",")}]进行[${id ? "删除" : "批量删除"}]操作?`,
+        "提示",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }
+      ).then(() => {
+        this.$http({
+          url: this.$http.adornUrl("/book/shopproduct/delete"),
+          method: "post",
+          data: this.$http.adornData(ids, false)
+        }).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.$message({
+              message: "操作成功",
+              type: "success",
+              duration: 1500,
+              onClose: () => {
+                this.getDataList();
+              }
+            });
+          } else {
+            this.$message.error(data.msg);
+          }
+        });
+      });
+    },
+    SwitchChange(event) {
+      /*点击时他会自动把你绑定的值变更，直接去请求数据就可以了*/
+      var parms = {
+        publishStatus: event.publishStatus,
+        productId: event.productId
+      };
+      // console.log(parms)
+      this.$http({
+        url: this.$http.adornUrl("/book/shopproduct/update"),
+        method: "post",
+        data: parms
+      })
+        .then(res => {
+          this.$message({
+            message: "成功",
+            type: "success"
+          });
+          this.loading = false;
+          this.getDataList();
+        })
+        .catch(error => {
+          this.loading = false;
+          console.log(error);
+        });
+      console.log(event);
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.shop_drawer_box {
+  padding: 20px !important;
+  box-sizing: border-box;
+  width: 100%;
+  height: 100%;
+}
+.addFormBox {
+  width: 100%;
+
+  // overflow: hidden;
+  .form_item {
+    width: 33%;
+    float: left;
+  }
+}
+::v-deep.el-drawer__header {
+  margin-bottom: 10px !important;
+}
+.commonTreeBox {
+  height: calc(100% - 10px) !important;
+  padding: 5px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding-bottom: 5px !important;
+}
+
+/deep/.tree_box {
+  width: 100% !important;
+  // min-width: 300px;
+
+  // background-color: #fff !important;
+  border: none !important;
+  border-radius: 10px;
+  padding: 15px;
+  padding-left: 0px !important ;
+  box-sizing: border-box;
+
+  .custom-tree-container {
+    border-radius: 4px !important;
+    height: calc(100% - 30px);
+    // border: 1px solid #ebeef5 !important;
+    // background-color: #fff !important;
+    overflow: hidden !important;
+    color: #303133 !important;
+    // padding: 15px;
+    transition: 0.3s !important;
+  }
+  // background: #fafafa;
+}
+/deep/.shop_drawer_box {
+  // padding-top: 0px !important ;
+}
+
+.title_box {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 20px;
+  .button_box {
+    // width: 200px;
+    float: right;
+  }
+}
+.title {
+  width: 300px;
+  min-width: 200px;
+  padding: 20px;
+  padding-bottom: 0;
+  float: left;
+  display: flex;
+  align-items: center;
+  font-weight: 600;
+  font-size: 22px;
+
+  // color: #17b3a3;
+  .line {
+    width: 4px;
+    height: 20px;
+    margin-right: 8px;
+    background: #17b3a3;
+  }
+}
+.el-drawer__close-btn {
+  position: absolute;
+  right: 10px;
+  top: 10px;
+}
+.item-box {
+  width: 100%;
+  height: 100%;
+  // box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1) !important;
+  // border: 1px solid #ebeef5 !important;
+}
+.item-content {
+  padding: 20px;
+  padding-top: 0;
+  overflow-y: auto;
+  height: calc(100% - 80px);
+}
+/deep/.el-collapse-item {
+  margin-bottom: 20px;
+  .el-collapse-item__header {
+    background: #17b3a3 !important;
+    height: 36px !important;
+    color: #fff;
+    font-size: 16px;
+    padding-left: 15px;
+  }
+  .el-collapse-item__wrap {
+    // background: #f8f8f8 !important;
+    border-bottom: none !important;
+    .el-tree {
+      background-color: transparent !important;
+    }
+  }
+}
+
+/deep/.el-collapse {
+  border-bottom: none !important;
+}
+</style>
diff --git a/src/views/modules/shop/commonBookTags/operationsList.vue b/src/views/modules/shop/commonBookTags/operationsList.vue
new file mode 100644
index 0000000..4072348
--- /dev/null
+++ b/src/views/modules/shop/commonBookTags/operationsList.vue
@@ -0,0 +1,1252 @@
+<template>
+  <div class="mod-config" style="height: auto;margin-top: 20px;">
+    <!-- v-if="isFresh"
+      v-loading="!isFresh" -->
+    <div
+      style="width: calc(100% ); height: auto; float: right;  border: 1px solid #bababa; box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); border-radius: 10px;position: relative;"
+    >
+      <div class="border_box tree_content_box">
+        <div class="title_box" style="margin-bottom: 10px; height: 40px">
+          <div class="title" style="width: 100%;display: block;">
+            <!-- <span class="line"></span>已关联{{ title }}列表 -->
+            <el-button
+              type="primary"
+              style="margin-left: 20px;float: right !important;"
+              @click="openTable('addForm')"
+              size="mini"
+              >关联{{ title }}</el-button
+            >
+          </div>
+        </div>
+        <commonShop
+        :isNoSearch="true"
+          :defaultForm="{
+            title: '',
+            marketId: addForm.id
+          }"
+          getAssociatedGoodsListKey="marketId"
+          getAssociatedGoodsListValue="result"
+          :tableColumnList="tableColumnList"
+          :currentId="addForm.id ? addForm.id : ''"
+          currentType="bookMarketId"
+          :dataList="associatedGoodsList"
+          :urlList="urlList"
+          @delete="dataFormDelete"
+          :isEdit="isEdit"
+          ref="commonShop"
+          :style="`height: calc(100% - 50px); `"
+        >
+          <template slot="searchFormItem" slot-scope="slotProps">
+            <template v-if="source == 'curriculum'">
+              <el-form-item
+                label="课程名称"
+                prop="title"
+                class="form_item"
+                style="width: 240px;"
+              >
+                <el-input
+                  size="small"
+                  placeholder="请输入课程名称"
+                  style="width: 100%"
+                  v-model="slotProps.dataForm.title"
+                  clearable
+                >
+                </el-input> </el-form-item
+            ></template>
+            <!-- <template v-if="source == 'book'">
+              <el-form-item
+                label="图书名称1"
+                prop="name"
+                class="form_item"
+                style="width: 280px;"
+              >
+                <el-input
+                  size="small"
+                  placeholder="请输入图书名称"
+                  style="width: 100%"
+                  v-model="slotProps.dataForm.title"
+                  clearable
+                >
+                </el-input>
+              </el-form-item>
+              <el-form-item
+                label="出版社名称"
+                prop="title"
+                label-width="100px"
+                class="form_item"
+                style="width: 280px;"
+              >
+                <el-input
+                  size="small"
+                  placeholder="请输入出版社名称"
+                  style="width: 100%"
+                  v-model="slotProps.dataForm.title"
+                  clearable
+                >
+                </el-input>
+              </el-form-item>
+
+              <el-form-item
+                label="作者姓名"
+                prop="title"
+                class="form_item"
+                style="width: 280px;"
+              >
+                <el-input
+                  size="small"
+                  placeholder="请输入作者姓名"
+                  style="width: 100%"
+                  v-model="slotProps.dataForm.title"
+                  clearable
+                >
+                </el-input>
+              </el-form-item>
+            </template> -->
+
+            <!-- <el-form-item label="商品类型" prop="goodsType" class="form_item">
+            <el-select
+              size="small"
+              v-model="slotProps.dataForm.goodsType"
+              placeholder="请选择"
+              style="width: 100%;"
+              clearable
+            >
+              <el-option
+              style="padding:0 10px;box-sizing: border-box;"
+                v-for="item in goodsTypeList"
+                :key="item.dictType"
+                :label="item.dictValue"
+                :value="item.dictType"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item> -->
+          </template>
+          <template slot="tableItem" slot-scope="slotProps">
+            <template v-if="source == 'curriculum'">
+              <el-table-column
+                label="课程ID"
+                width="70"
+                align="center"
+                prop="id"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="title"
+                header-align="center"
+                align="center"
+                label="课程名称"
+              >
+              </el-table-column>
+
+              <el-table-column
+                header-align="center"
+                align="center"
+                label="课程图"
+                width="140"
+              >
+                <template slot-scope="scope">
+                  <img
+                    v-if="scope.row.image != ''"
+                    :src="scope.row.image"
+                    width="25"
+                    height="35"
+                    class="tableImg"
+                  />
+                </template>
+              </el-table-column>
+            </template>
+            <template v-if="source == 'book'">
+              <el-table-column
+                label="图书ID"
+                width="70"
+                align="center"
+                prop="id"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="name"
+                header-align="center"
+                align="center"
+                label="书名"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="authorName"
+                header-align="center"
+                align="center"
+                label="作者名称"
+              >
+              </el-table-column>
+
+              <el-table-column
+                header-align="center"
+                align="center"
+                label="插图"
+                width="180"
+              >
+                <template slot-scope="scope">
+                  <img
+                    v-if="scope.row.images != ''"
+                    :src="scope.row.images"
+                    width="25"
+                    height="35"
+                    class="tableImg"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column
+                width="180px
+      "
+                prop="state"
+                header-align="center"
+                align="center"
+                label="状态"
+              >
+                <template slot-scope="scope">
+                  <el-switch
+                    :active-value="1"
+                    :inactive-value="0"
+                    style="display: block"
+                    v-model="scope.row.state"
+                    @change="SwitchChange(scope.row)"
+                    active-color="#13ce66"
+                    inactive-color="#ff4949"
+                    active-text="上架"
+                    inactive-text="下架"
+                  >
+                  </el-switch>
+                </template>
+              </el-table-column>
+            </template>
+          </template>
+        </commonShop>
+      </div>
+    </div>
+
+    <!-- <el-form
+      :inline="true"
+      :model="dataForm"
+      @keyup.enter.native="getDataList()"
+    >
+   
+      
+    </el-form> -->
+    <commonShopTable
+      :title="title"
+      :defaultForm="{
+        title: '',
+        marketId: addForm.id
+      }"
+      :urlList="urlList"
+      :tableColumnList="tableColumnList"
+      marketIdKey="marketId"
+      :isNoModal="true"
+      ref="commonShopTable"
+      :currentId="addForm.id"
+      currentType="bookMarketId"
+      @submit="handleSubmitShopTable"
+    >
+      <template slot="searchFormItem" slot-scope="slotProps">
+        <template v-if="source == 'curriculum'">
+          <el-form-item label="课程名称" prop="title" class="form_item">
+            <el-input
+              size="small"
+              placeholder="请输入课程名称"
+              style="width: 100%"
+              v-model="slotProps.dataForm.title"
+              clearable
+            >
+            </el-input> </el-form-item
+        ></template>
+        <template v-if="source == 'book'">
+          <el-form-item
+            label="图书名称"
+            prop="bookName"
+            class="form_item"
+            style="width: 280px;"
+          >
+            <el-input
+              size="small"
+              placeholder="请输入图书名称"
+              style="width: 100%"
+              v-model="slotProps.dataForm.bookName"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+          <el-form-item
+            label="出版社名称"
+            prop="publisherName"
+            label-width="100px"
+            class="form_item"
+            style="width: 280px;"
+          >
+            <el-input
+              size="small"
+              placeholder="请输入出版社名称"
+              style="width: 100%"
+              v-model="slotProps.dataForm.publisherName"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item
+            label="作者姓名"
+            prop="authorName"
+            class="form_item"
+            style="width: 280px;"
+          >
+            <el-input
+              size="small"
+              placeholder="请输入作者姓名"
+              style="width: 100%"
+              v-model="slotProps.dataForm.authorName"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+        </template>
+
+       
+      </template>
+
+      <template slot="tableItem" slot-scope="slotProps">
+        <template v-if="source == 'curriculum'"
+          ><el-table-column label="课程ID" width="70" align="center" prop="id">
+            <!-- <template slot-scope="scope">
+            {{ (pageIndex - 1) * pageSize + scope.$index + 1 }}
+          </template> -->
+          </el-table-column>
+          <el-table-column
+            prop="title"
+            header-align="center"
+            align="center"
+            label="课程名称"
+          >
+          </el-table-column>
+
+          <el-table-column
+            header-align="center"
+            align="center"
+            label="课程图"
+            width="120"
+          >
+            <template slot-scope="scope">
+              <img
+                v-if="scope.row.image != ''"
+                :src="scope.row.image"
+                width="25"
+                height="35"
+                class="tableImg"
+              />
+            </template> </el-table-column
+        ></template>
+        <template v-if="source == 'book'">
+          <el-table-column label="图书ID" width="70" align="center" prop="id">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            header-align="center"
+            align="center"
+            label="书名"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="authorName"
+            header-align="center"
+            align="center"
+            label="作者名称"
+          >
+          </el-table-column>
+
+          <el-table-column
+            header-align="center"
+            align="center"
+            label="插图"
+            width="180"
+          >
+            <template slot-scope="scope">
+              <img
+                v-if="scope.row.images != ''"
+                :src="scope.row.images"
+                width="25"
+                height="35"
+                class="tableImg"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
+            width="180px
+      "
+            prop="state"
+            header-align="center"
+            align="center"
+            label="状态"
+          >
+            <template slot-scope="scope">
+              <el-switch
+                :active-value="1"
+                :inactive-value="0"
+                style="display: block"
+                v-model="scope.row.state"
+                disabled
+                active-color="#13ce66"
+                inactive-color="#ff4949"
+                active-text="上架"
+                inactive-text="下架"
+              >
+              </el-switch>
+            </template>
+          </el-table-column>
+        </template>
+      </template>
+    </commonShopTable>
+  </div>
+</template>
+
+<script>
+import debounce from "lodash/debounce"; //导入lodash中的debounce
+import AddOrUpdate from "@/views/components/commonBookTags/bookTagsForm.vue";
+import commonShop from "@/views/components/commonBookTags/shopproduct.vue";
+import commonShopTable from "@/views/components/commonBookTags/shopproductTable.vue";
+import commonTree from "@/views/components/commonBookTags/tags.vue";
+// import dialogComponent from './seckillprodrelation'
+export default {
+  props: ["title", "source"],
+  data() {
+    return {
+      isEdit: false,
+      checkAll: false,
+      isIndeterminate: true,
+      urlList: {
+        treeList: "/master/courseMarket/marketTree",
+        delete: "/master/courseMarket/delMarket",
+        deleteShop: "/master/courseMarket/delToMarket",
+        saveShop: "/master/courseMarket/saveToMarket",
+        add: "/master/courseMarket/saveOrUpdateMarket",
+        getAssociatedGoodsList: "/master/courseMarket/getCourseByMarketId",
+        getNotToLabelList: "/master/courseMarket/getNotToMarketList"
+      },
+      addForm: {},
+      isFresh: false,
+      dataRule: {
+        name: [
+          {
+            required: true,
+            message: "标签名称不能为空"
+            // trigger: "change",
+          }
+        ]
+      },
+      currentNode: {},
+      treeDataList: [],
+      associatedGoodsList: [], //已关联商品列表
+
+      isact: "", //当前hover的节点
+      isactTitle: "", //记录修改节点名称
+      curNode: undefined, //当前选中节点
+      isUpdateGroup: false, //是否在修改模板组
+      filterText: "",
+      indexRecord: [], //记录节点轨迹
+      isBreak: false, //是否结束循环
+      defaultProps: {
+        children: "children",
+        label: "title"
+      },
+      dataForm: {
+        key: ""
+      },
+      dataList: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPage: 0,
+      dataListLoading: false,
+      dataListSelections: [],
+      addOrUpdateVisible: false,
+      tableColumnList: [
+        { label: "商品ID", width: 70, align: "center", prop: "productId" },
+        {
+          label: "商品名称",
+          align: "center",
+          prop: "product.productName",
+          headerAlign: "center"
+        },
+        {
+          label: "价格",
+          align: "center",
+          prop: "product.price",
+          headerAlign: "center"
+        },
+        {
+          label: "活动价",
+          width: 120,
+          align: "center",
+          prop: "product.activityPrice",
+          headerAlign: "center"
+        },
+        {
+          label: "库存",
+          width: 120,
+          align: "center",
+          prop: "product.productStock",
+          headerAlign: "center"
+        },
+        {
+          label: "商品图",
+          width: 120,
+          align: "center",
+          prop: "product.productImages",
+          headerAlign: "center",
+          slot: "productImages"
+        }
+      ]
+    };
+  },
+  components: {
+    AddOrUpdate,
+    commonShop,
+    commonTree,
+    commonShopTable
+  },
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  activated() {
+    this.isEdit = false;
+    this.getDataList();
+  },
+  methods: {
+    UpNumber(e) {
+      e.target.value = e.target.value.replace(/[^\d]/g, "");
+    },
+    dataFormEdit() {
+      this.checkAll = false;
+      this.isEdit = !this.isEdit;
+    },
+    handleCheckAllChange(val) {
+      this.$nextTick(() => {
+        this.$refs.commonShop.handleCheckAllChange(val);
+      });
+    },
+    handleSubmitShopTable: debounce(async function(ids) {
+      await this.$http({
+        url: this.$http.adornUrl(`${this.urlList.saveShop}`),
+        method: "post",
+        data: this.$http.adornData({
+          courseId: ids,
+          marketId: this.addForm.id
+        })
+      }).then(async ({ data }) => {
+        if (data && data.code === 0) {
+          this.$message.success(data.msg);
+
+          if (this.$refs.commonShop) {
+            // this.$refs.commonShop.getAssociatedGoodsList.dataForm={
+            //   ...this.$refs.commonShop.getAssociatedGoodsList.dataForm,
+            //   id:this.addForm.id ? this.addForm.id : null
+            // }
+
+            this.$refs.commonShop.getAssociatedGoodsList();
+          }
+          if (this.$refs.commonShopTable) {
+            this.$refs.commonShopTable.close();
+          }
+        } else {
+          this.$message.error(data.msg);
+        }
+      });
+    }, 100),
+    openTable() {
+      this.isEdit = false;
+      this.$nextTick(() => {
+        this.$refs.commonShopTable.dataForm.marketId = this.addForm.id;
+        this.$refs.commonShopTable.open(this.addForm.id);
+      });
+    },
+    handleChangeIsLast(e) {
+      console.log("🚀 ~ handleChangeIsLast ~ e:", e);
+      this.$nextTick(() => {
+        if (e == 1) {
+          if (this.$refs.commonShop) {
+            // this.$refs.commonShop.getAssociatedGoodsList.dataForm={
+            //   ...this.$refs.commonShop.getAssociatedGoodsList.dataForm,
+            //   id:this.addForm.id ? this.addForm.id : null
+            // }
+            this.$refs.commonShop.getAssociatedGoodsList();
+          }
+        }
+      });
+    },
+
+    async getCommonShopDataList(type, id, form) {
+      this.isFresh = false;
+      this.isEdit = false;
+      this.isFresh = true;
+      console.log("🚀 ~ getCommonShopDataList ~ type, id:", type, id);
+      this.currentNode = { data: { ...form } };
+      this.addForm = form;
+
+      await this.getDataList();
+      // this.$refs.commonTree.setCurrentNodeShow();
+      this.$nextTick(() => {
+        // this.$refs.commonShop.clear();
+        // this.$refs.commonShop.bookMarketId = null;
+        if (form.isLast == 1) {
+          if (this.$refs.commonShop) {
+            // this.$refs.commonShop.getAssociatedGoodsList.dataForm={
+            //   ...this.$refs.commonShop.getAssociatedGoodsList.dataForm,
+            //   id:this.addForm.id ? this.addForm.id : null
+            // }
+            this.$refs.commonShop.getAssociatedGoodsList();
+          }
+        }
+      });
+    },
+
+    //新增修改
+    dataFormSubmit: debounce(async function(formName) {
+      //    return false
+      if (this.addForm.title == "" || !this.addForm.title) {
+        this.$message.error("请输入标签名称");
+        return false;
+      }
+      await this.$refs[formName].validate(async valid => {
+        if (valid) {
+          await this.$http({
+            url: this.$http.adornUrl(`${this.urlList.add}`),
+            method: "post",
+            data: this.$http.adornData({
+              ...this.addForm
+            })
+          }).then(async ({ data }) => {
+            if (data && data.code === 0) {
+              // var status = await this.correlationShop(data.result.id);
+              await this.getDataList();
+
+              this.$nextTick(async () => {
+                this.$refs.commonTree.setCurrentNodeShow(data.result.id);
+
+                this.addForm = data.result;
+                this.currentNode = { data: { ...data.result } };
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                  duration: 1500,
+                  onClose: () => {
+                    this.visible = false;
+                  }
+                });
+              });
+            } else {
+              this.$message.error(data.msg);
+            }
+          });
+        }
+      });
+    }, 200),
+    //新增修改
+    dataFormDelete: debounce(async function(row, deleteType) {
+      console.log("row at line 515:", row);
+      this.$confirm(
+        `确定要删除${deleteType != "all" ? "该" : "所有"}关联课程嘛?`,
+        "提示",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }
+      )
+        .then(async () => {
+          // var lableIds = row[0].bookLabelId;
+          var productIds = row[0].id;
+
+          // //    return false
+          // var selectShopArr = this.$refs.commonShop.selectShopArr;
+          // console.log(selectShopArr, "1111");
+
+          // if (selectShopArr.length == 0) {
+          //   this.$message.error("请选择已关联的商品");
+          //   return false;
+          // }
+          this.$refs.commonShop.dataListLoading = true;
+
+          await this.$http({
+            url: this.$http.adornUrl(
+              `${this.urlList.deleteShop}?marketId=${
+                this.addForm.id
+              }&courseId=${productIds}`
+            ),
+            method: "post"
+          }).then(async ({ data }) => {
+            if (data && data.code === 0) {
+              this.$message.success("删除成功");
+            } else {
+              this.$message.error(data.msg);
+            }
+            this.$nextTick(() => {
+              // this.$refs.commonShop.selectShopArr = [];
+              if (this.$refs.commonShop) {
+                //     this.$refs.commonShop.getAssociatedGoodsList.dataForm={
+                //   ...this.$refs.commonShop.getAssociatedGoodsList.dataForm,
+                //   id:this.addForm.id ? this.addForm.id : null
+                // }
+                this.$refs.commonShop.getAssociatedGoodsList();
+              }
+            });
+          });
+        })
+        .catch(() => {});
+    }, 200),
+    setCheckedKeys() {
+      this.$refs.tree.setCheckedKeys([0]);
+    },
+    changeCurrentNode(val) {
+      this.changeCurrentNode = val;
+      this.$forceUpdate();
+    },
+    handlereset() {
+      this.currentNode = null;
+      this.isFresh = false;
+      this.isFresh = true;
+    },
+    handleClickNodes(node, data, type) {
+      this.isEdit = false;
+      this.addForm = {};
+      // console.log(this.$refs.tree.handleClickNodes(), "当前选中节点");
+      console.log(node, data, "当前选中节点");
+      this.currentNode = node ? node : {};
+      this.isFresh = false;
+      this.isFresh = true;
+
+      var form = {};
+      switch (type) {
+        case "add":
+          form = { ...data };
+          break;
+        case "edit":
+          form = { ...node.data };
+          break;
+        case "addChildren":
+          form = {
+            children: [],
+            delFlag: 0,
+            isLast: 0,
+            pid: data.id,
+            sort: 0,
+            title: ""
+          };
+          break;
+      }
+      this.addForm = { ...form };
+
+      this.$nextTick(() => {
+        this.$refs.commonShop.clear();
+        // this.$refs.commonShop.bookMarketId = null;
+        this.$refs.commonShop.getDataList(type == "edit" ? form.id : "");
+      });
+    },
+    addOrUpdateHandle() {
+      var addform = {
+        children: [],
+        delFlag: 0,
+        isLast: 0,
+        pid: 0,
+        sort: 0,
+        title: ""
+      };
+      this.handleClickNodes({ data: addform }, addform, "add");
+      // if (!this.currentNode) {
+      //   this.$message.error("请先选择分类");
+      //   return;
+      // }
+    },
+
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.title.indexOf(value) !== -1;
+    },
+
+    // renderContent(h, { node, data, store }) {
+    //   return;
+    //   `<span
+    //       style="flex: 1; display: flex; align-items: center; justify-content: space-between; padding-right: 8px;"
+    //       on-mouseenter={() => this.mouseenteract(data)}
+    //       on-mouseleave={() => this.mouseleaveact(data)}
+    //     >
+    //       <span>
+    //         <span>{node.label}</span>
+    //       </span>
+    //       {this.isact == data ? (
+    //         <span>
+    //           {this.isact.typeName == "模板组" ? (
+    //             <el-button
+    //               class="m-r-10"
+    //               type="text"
+    //               icon="el-icon-edit"
+    //               on-click={() => this.handleUpdateGroup(node, data)}
+    //             ></el-button>
+    //           ) : (
+    //             <span></span>
+    //           )}
+    //           <el-button
+    //             type="text"
+    //             icon="el-icon-delete"
+    //             on-click={(e) => this.handleDelete(node, data, e)}
+    //           ></el-button>
+    //         </span>
+    //       ) : (
+    //         <span></span>
+    //       )}
+    //     </span>`;
+    // },
+    updateRenderContent(h, { node, data, store }) {
+      return `
+        <span style="flex: 1; display: flex; align-items: center; justify-content: space-between; padding-right: 8px;">
+          <span>
+            {this.isact == data ? (
+              <input
+                type="text"
+                onChange={this.handleChangeTitle.bind(this)}
+                value={node.label}
+              />
+            ) : (
+              <span>{node.label}</span>
+            )}
+          </span>
+          {this.isact == data ? (
+            <span>
+              {this.isact.typeName == "模板组" ? (
+                <span>
+                  <el-button
+                    class="m-r-10"
+                    type="text"
+                    icon="el-icon-check"
+                    on-click={() => this.updateGroup(node, data)}
+                  ></el-button>
+                  <el-button
+                    class="m-r-10"
+                    type="text"
+                    icon="el-icon-close"
+                    on-click={(e) => this.cancelUpdate(node, data, e)}
+                  ></el-button>
+                </span>
+              ) : (
+                <span></span>
+              )}
+            </span>
+          ) : (
+            <span></span>
+          )}
+        </span>`;
+    },
+    //获取鼠标进入节点的数据
+    mouseenteract(da) {
+      this.isact = da;
+    },
+    mouseleaveact(da) {
+      this.isact = "";
+    },
+    handleNodeClick(pdata) {
+      this.curNode = pdata;
+      document
+        .getElementsByClassName("el-tree-node__content")[0]
+        .setAttribute("class", "el-tree-node__content");
+    },
+    handleDelete(node, data, e) {
+      e.stopPropagation();
+      //存在则添加到子级
+      const parent = node.parent;
+      const children = parent.data.nodes || parent.data;
+      //若parent.data是对象，操作的是子级；如果是数组，操作的是最外层
+      if (Array.isArray(parent.data)) {
+        const parentIndex = parent.data.findIndex(d => d.id === data.id);
+        parent.data.splice(parentIndex, 1);
+      } else {
+        const childIndex = children.findIndex(d => d.id === data.id);
+        children.splice(childIndex, 1);
+      }
+      this.curNode = undefined;
+    },
+    //新增组
+    handleAddGroup() {
+      /**
+       *  如果模版深度最多两层，取消该部分注释
+       * //最多只有两层组 不可能添加在dept2的组上 curNode存在 并且  深度超过1
+         if (this.curNode != undefined && this.curNode.depth != 1) { 
+         this.$message.warning("不能添加超过两层");  
+         return; 
+       }
+       */
+
+      //如果isUpdateGroup 已经是true了 说明重复点击了
+      if (this.isUpdateGroup) {
+        return;
+      }
+
+      let id = ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c =>
+        (
+          c ^
+          (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (c / 4)))
+        ).toString(16)
+      );
+      let newChild = {
+        parentId: "", //如果有这个id 是插入第二层 否则是第一层 可有可无
+        text: "", //必须有 this.templateContent.tempName
+        nodes: [],
+        id: id,
+        typeName: "模板组",
+        temporaryData: "1" //用来区分临时数据
+      };
+      /* 如果模版深度最多两层，以下条件改成该部分注释
+        this.curNode && this.curNode.depth == 1 
+      */
+      this.indexRecord = [];
+      if (this.curNode) {
+        if (!this.curNode.nodes) {
+          this.$message.warning("模板不可添加");
+          return;
+        }
+        newChild.parentId = this.curNode.id;
+        /* 如果模版深度最多两层，以下条件改成该部分注释
+          const index = this.treeDataList.findIndex(
+            item => item.id == this.curNode.id
+          );
+          this.treeDataList[index].nodes.push(newChild);
+        */
+        //找到tree中的index轨迹
+        this.getTemplateTreeNode(this.curNode.id, this.treeDataList, 0);
+        //按照index轨迹插入节点
+        this.insertNode(
+          newChild,
+          this.treeDataList,
+          this.indexRecord,
+          this.indexRecord.length
+        );
+        this.isBreak = false;
+      } else if (this.curNode == undefined) {
+        //没有选中的时候 添加到最外层
+        newChild.depth = 1;
+        this.treeDataList.push(newChild);
+      }
+      //调用出updateRender的input
+      this.isact = newChild;
+      this.isUpdateGroup = true;
+    },
+    //递归遍历获得选中node
+    getTemplateTreeNode(target, list, dept) {
+      //空数组直接返回
+      if (list.length == 0) return;
+      let dataLen = list.length;
+      for (let i = 0; i < dataLen; i++) {
+        //如果不匹配
+        if (target != list[i].id) {
+          //存在nodes 遍历nodes里的节点
+          if (list[i].nodes) {
+            this.indexRecord[dept] = i;
+            let recordDept = dept + 1;
+            this.getTemplateTreeNode(target, list[i].nodes, recordDept);
+          } else {
+            //不存在nodes 继续遍历
+            continue;
+          }
+        } else {
+          //匹配，则修改下标数组
+          this.indexRecord[dept] = i;
+          this.isBreak = true;
+          break;
+        }
+        //删除不匹配的轨迹 如果已经break了说明已经找到正确的节点，就不用再删了
+        if (!this.isBreak) {
+          this.indexRecord.pop();
+        }
+      }
+    },
+    //插入节点
+    insertNode(insertChild, tree, indexArr, len) {
+      let index = indexArr.length - len;
+      if (len == 0) {
+        tree.push(insertChild);
+      } else {
+        this.insertNode(
+          insertChild,
+          tree[indexArr[index]].nodes,
+          indexArr,
+          len - 1
+        );
+      }
+    },
+    //修改组
+    handleUpdateGroup() {
+      this.isUpdateGroup = true;
+    },
+    //修改组名时获取title
+    handleChangeTitle(e) {
+      let value = e.target.value;
+      this.isactTitle = value;
+    },
+    updateGroup(node, data) {
+      //先handleChangeTitle获取title 再调用
+      setTimeout(() => {
+        if (this.isactTitle.trim() == "") {
+          this.$message.warning("名称不能为空");
+          return;
+        }
+        //修改数据组
+        this.isUpdateGroup = false;
+        const parent = node.parent;
+        const children = parent.data.nodes || parent.data;
+        const index = children.findIndex(d => d.id === data.id);
+        let temp = data;
+        temp.text = this.isactTitle;
+        children.splice(index, 1, temp);
+      }, 500);
+    },
+    cancelUpdate(node, data, e) {
+      this.$message.info("已取消");
+      this.isUpdateGroup = false;
+      //如果是插入操作 需要移除数据
+      if (this.isact.temporaryData) {
+        this.handleDelete(node, data, e);
+      }
+    },
+    // 获取数据列表
+
+    async getDataList() {
+      this.dataListLoading = true;
+      await this.$http({
+        url: this.$http.adornUrl(this.urlList.treeList),
+        method: "get"
+        // params: this.$http.adornParams({
+        //   'page': this.pageIndex,
+        //   'limit': this.pageSize,
+        //   'key': this.dataForm.key
+        // })
+      }).then(({ data }) => {
+        console.log("🚀 ~ getDataList ~ data:", data);
+        if (data && data.code === 0) {
+          this.treeDataList = data.result;
+          // this.totalPage = data.page.totalCount
+        } else {
+          this.treeDataList = [];
+          // this.totalPage = 0
+        }
+        this.dataListLoading = false;
+      });
+    },
+    // 每页数
+    sizeChangeHandle(val) {
+      this.pageSize = val;
+      this.pageIndex = 1;
+      this.getDataList();
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.pageIndex = val;
+      this.getDataList();
+    },
+    // 多选
+    selectionChangeHandle(val) {
+      this.dataListSelections = val;
+    }
+    // // 新增 / 修改
+    // addOrUpdateHandle(row) {
+    //   this.addOrUpdateVisible = true;
+    //   this.$nextTick(() => {
+    //     this.$refs.addOrUpdate.init(row);
+    //   });
+    // },
+  }
+};
+</script>
+<style lang="less" scoped>
+.tree_box {
+  width: 350px !important;
+  height: 100%;
+  float: left;
+  border: 1px solid #bababa;
+  border-radius: 10px;
+  padding: 15px;
+  box-sizing: border-box;
+  // background: #fafafa;
+}
+
+.border_box {
+  height: 100px;
+  margin-bottom: 10px;
+
+  .title_box {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 10px;
+
+    .button_box {
+      // width: 200px;
+      float: right;
+    }
+  }
+
+  .title {
+    width: 300px;
+    min-width: 200px;
+
+    float: left;
+    display: flex;
+    align-items: center;
+    font-weight: 600;
+    font-size: 16px;
+
+    // color: #17b3a3;
+    .line {
+      width: 4px;
+      height: 20px;
+      margin-right: 8px;
+      background: #17b3a3;
+    }
+  }
+}
+
+.border_box {
+  width: 100%;
+  float: right;
+  background: #fffefe;
+
+  border-radius: 10px;
+  padding: 15px 15px;
+  box-sizing: border-box;
+}
+
+.tree_content_box {
+  height: calc(100%) !important;
+  .shopFormBox {
+    width: auto !important;
+  }
+}
+
+.mod-config {
+  width: 100%;
+  height: 82vh;
+  overflow: hidden;
+}
+
+.el-tree-node__content {
+  .el-button {
+    display: none;
+  }
+}
+
+.el-tree-node__content:hover {
+  .el-button {
+    display: inline;
+  }
+}
+
+.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
+  background-color: #eaebed;
+  color: #4796ec;
+  font-weight: bold;
+}
+
+.el-tree {
+  height: 350px;
+  overflow-y: auto !important;
+
+  .el-tree-node__content span {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+  }
+}
+
+.custom-tree-node {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  padding-right: 8px;
+}
+
+// .el-card {
+//   background: none !important;
+// }
+p {
+  margin: 0;
+  margin-bottom: 10px;
+}
+
+.submitButtonBox {
+  margin-top: 20px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.submitButton {
+  float: right;
+}
+
+// .el-tree-node__content .el-button {
+//   // width: 120px !important;
+
+//   display: block !important;
+// }
+// ::v-deep .el-tree .el-tree-node__content span:nth-child(2) {
+//   width: 120px;
+//   display: flex !important;
+//   align-items: center !important;
+//   justify-content: space-between !important;
+// }
+// /deep/.el-table__row--level-1 {
+//   display: block !important;
+// }
+
+.addFormBox {
+  overflow: hidden;
+
+  .form_item {
+    width: 33%;
+    float: left;
+  }
+}
+
+.custom-tree-container {
+  height: calc(100% - 100px);
+
+  .filter-tree {
+    height: 100%;
+  }
+}
+
+.info_bg {
+  background: #e0dede;
+  height: 28px;
+  line-height: 28px;
+  padding-left: 10px;
+  // padding: 8px 5px;
+  box-sizing: border-box;
+  // margin-top: -10px;
+  border-radius: 4px;
+  font-size: 14px;
+  width: calc(100% - 120px);
+  float: left;
+}
+
+/deep/.mod-config .shopFormBox {
+  min-width: auto !important;
+  float: left !important;
+}
+
+/deep/.mod-config .el-pagination {
+  margin-top: 20px !important;
+  float: right !important;
+}
+/deep/.mod-config .commonShopproduct {
+  margin-top: -10px !important;
+  // float: right !important;
+}
+</style>
diff --git a/src/views/modules/shop/commonBookTags/tags.vue b/src/views/modules/shop/commonBookTags/tags.vue
index 9647e68..a0df49f 100644
--- a/src/views/modules/shop/commonBookTags/tags.vue
+++ b/src/views/modules/shop/commonBookTags/tags.vue
@@ -1,13 +1,21 @@
 <template>
   <div class="tree_box">
     <div style="overflow: hidden" v-if="source == 'tags'">
-      <p class="info_bg" style="overflow: hidden; white-space: nowrap; text-overflow: ellipsis">
-      
+      <p
+        class="info_bg"
+        style="overflow: hidden; white-space: nowrap; text-overflow: ellipsis"
+      >
         当前标签：<span style="color: #17b3a3; font-weight: 600">{{
-      currentNode ? currentNode.data.title : ""
-    }}</span>
+          currentNode ? currentNode.data.title : ""
+        }}</span>
       </p>
-      <el-button type="primary" @click="addOrUpdateHandle()" style="float: right" size="mini">新增顶级标签</el-button>
+      <el-button
+        type="primary"
+        @click="addOrUpdateHandle()"
+        style="float: right"
+        size="mini"
+        >新增顶级标签</el-button
+      >
     </div>
     <!-- <p v-if="source == 'shop'" class="select_box" style="">
       <el-checkbox
@@ -26,24 +34,48 @@
     <!-- show-checkbox -->
     <!-- :allow-drop="allowDrop" -->
     <div class="custom-tree-container">
-      <el-tree :highlight-current="true" class="filter-tree" node-key="id" :data="treeDataList" :props="defaultProps"
-        default-expand-all :filter-node-method="filterNode" ref="tree" :draggable="true" @node-click="handleNodeClick"
-        :expand-on-click-node="false">
+      <el-tree
+        :highlight-current="true"
+        class="filter-tree"
+        node-key="id"
+        :data="treeDataList"
+        :props="defaultProps"
+        default-expand-all
+        :filter-node-method="filterNode"
+        ref="tree"
+        :draggable="true"
+        @node-click="handleNodeClick"
+        :expand-on-click-node="false"
+      >
         <!-- @click="handleClickNodes(node, data)" -->
-        <span class="custom-tree-node" slot-scope="{ node, data }" @click="
-      source == 'tags'
-        ? handleClickNodes(node, data, 'edit')
-        : ''
-      "  :class="`${currentNode&&currentNode.data.id==data.id?'isSelect':''}`" style=" padding-left: 5px;
- box-sizing: border-box;">
+        <span
+          class="custom-tree-node"
+          slot-scope="{ node, data }"
+          @click="source == 'tags' ? handleClickNodes(node, data, 'edit') : ''"
+          :class="
+            `${currentNode && currentNode.data.id == data.id ? 'isSelect' : ''}`
+          "
+          style=" padding-left: 5px;
+ box-sizing: border-box;"
+        >
           <!-- @change="(e) => selectShop(data, e)" -->
-          <span style="display: flex; align-items: center" ><el-checkbox @change=" selectShop(data)"
-              :value="selectArr.includes(data.id)" v-if="data.isLast == 1 && source == 'shop'"
-              style="margin-right: 10px"></el-checkbox>{{ node.label }}</span>
+          <span style="display: flex; align-items: center"
+            ><el-checkbox
+              @change="selectShop(data)"
+              :value="data.select"
+              v-if="data.isLast == 1 && source == 'shop'"
+              style="margin-right: 10px"
+            ></el-checkbox
+            >{{ node.label }}</span
+          >
           <span v-if="source == 'tags'">
             <!-- v-if="node.level <= 1" -->
-            <el-button type="text" size="mini" @click.stop="handleClickNodes(node, data, 'addChildren')"
-              v-if="data.isLast != 1">
+            <el-button
+              type="text"
+              size="mini"
+              @click.stop="handleClickNodes(node, data, 'addChildren')"
+              v-if="data.isLast != 1"
+            >
               添加下级
             </el-button>
             <!-- <el-button
@@ -55,7 +87,12 @@
                 </el-button> -->
 
             <!-- v-if="node.childNodes.length == 0" -->
-            <el-button type="text" size="mini" @click.stop="remove(data)" style="color: rgb(235 92 92);">
+            <el-button
+              type="text"
+              size="mini"
+              @click.stop="remove(data)"
+              style="color: rgb(235 92 92);"
+            >
               删除
             </el-button>
           </span>
@@ -69,7 +106,7 @@
 // import dialogComponent from './seckillprodrelation'
 import debounce from "lodash/debounce"; //导入lodash中的debounce
 export default {
-  props: ["dataList", "urlList", "source", "productId", 'sourceType'],
+  props: ["dataList", "urlList", "source", "productId", "sourceType"],
   data() {
     return {
       currentNode: null,
@@ -78,8 +115,8 @@ export default {
       selectArr: [],
       defaultProps: {
         children: "children",
-        label: "title",
-      },
+        label: "title"
+      }
     };
   },
   components: {},
@@ -91,13 +128,13 @@ export default {
       handler(newVal, oldVal) {
         // this.$emit('changeCurrentNode',this.currentNode)
       },
-    
-    deep: true
+
+      deep: true
     },
-   
+
     filterText(val) {
       this.$refs.tree.filter(val);
-    },
+    }
   },
   activated() {
     console.log("🚀 ~ activated ~ this.currentNode:", this.currentNode, "9999");
@@ -128,17 +165,17 @@ export default {
           limit: 99999999,
           // productName: "",
           productId: this.productId,
-          ...form,
+          ...form
           // bookLabelId: bookLabelId,
-        }),
+        })
       }).then(async ({ data }) => {
         if (data && data.code === 0) {
           if (idType == "bookLabelId") {
-            this.selectArr = data.result.records.map((e) => {
+            this.selectArr = data.result.records.map(e => {
               return e.bookLabelId;
             });
           } else if (idType == "bookMarketId") {
-            this.selectArr = data.result.records.map((e) => {
+            this.selectArr = data.result.records.map(e => {
               return e.bookMarketId;
             });
           }
@@ -179,21 +216,11 @@ export default {
       }
       this.$forceUpdate();
     },
-    selectShop: debounce(async function (v, status) {
+    selectShop: debounce(async function(v, status) {
       console.log("🚀 ~ selectShop ~ status:", status);
-
-      // if (this.selectArr.includes(v.id)) {
-      //   // this.selectArr = this.selectArr.filter(function (item) {
-      //   //   return item !== v.id;
-      //   // });
-      // } else {
-      //   // this.selectArr.push(v.id);
-      // }
       console.log("🚀 ~ selectShop ~ v:", v);
 
-      console.log("🚀 ~ selectShop ~ this.selectShopArr999:", this.selectArr);
-
-      if (this.selectArr.includes(v.id)) {
+      if (v.select) {
         this.$emit("delete", v.id, this.sourceType);
       } else {
         this.$emit("submit", v.id, this.sourceType);
@@ -209,25 +236,28 @@ export default {
     //   this.$forceUpdate();
     // },
     async setCurrentNodeShow(id) {
-      console.log("🚀 ~ setCurrentNodeShow ~ id222:", id, this.currentNode)
+      console.log("🚀 ~ setCurrentNodeShow ~ id222:", id, this.currentNode);
 
-      var newNodeData = {}
+      var newNodeData = {};
       if (id) {
         newNodeData = await this.$refs.tree.getNode(id);
       } else {
         newNodeData = {
           data: {}
-        }
+        };
       }
- this.currentNode = newNodeData;
+      this.currentNode = newNodeData;
       this.$forceUpdate();
       this.$nextTick(() => {
         this.$refs.tree.setCurrentKey(id);
         this.$refs.tree.setCheckedKeys([id]);
-      })
-      await this.$emit("handleClickNodes", newNodeData, newNodeData.data, "edit");
-     
-
+      });
+      await this.$emit(
+        "handleClickNodes",
+        newNodeData,
+        newNodeData.data,
+        "edit"
+      );
     },
     allowDrop(draggingNode, dropNode, type) {
       console.log(draggingNode.level, dropNode.level);
@@ -242,7 +272,7 @@ export default {
     async correlationShop(bookLabelId) {
       var status;
       var productId = this.$refs.commonShop.multipleSelection.map(
-        (e) => e.productId
+        e => e.productId
       );
       console.log("🚀 ~ correlationShop ~ productId:", productId);
       await this.$http({
@@ -250,8 +280,8 @@ export default {
         method: "post",
         data: this.$http.adornData({
           productId: productId.toString(","),
-          bookLabelId: bookLabelId,
-        }),
+          bookLabelId: bookLabelId
+        })
       }).then(async ({ data }) => {
         if (data && data.code === 0) {
           status = true;
@@ -263,20 +293,20 @@ export default {
       return status;
     },
     //新增修改
-    dataFormSubmit: debounce(async function (formName) {
+    dataFormSubmit: debounce(async function(formName) {
       //    return false
       if (this.addForm.title == "") {
         this.$message.error("请输入标签名称");
         return false;
       }
-      await this.$refs[formName].validate(async (valid) => {
+      await this.$refs[formName].validate(async valid => {
         if (valid) {
           await this.$http({
             url: this.$http.adornUrl(`${this.urlList.add}`),
             method: "post",
             data: this.$http.adornData({
-              ...this.addForm,
-            }),
+              ...this.addForm
+            })
           }).then(async ({ data }) => {
             if (data && data.code === 0) {
               var status = await this.correlationShop(data.result.id);
@@ -305,7 +335,7 @@ export default {
                     //  this.addForm={}
 
                     // this.$emit("refreshDataList");
-                  },
+                  }
                 });
               }
             } else {
@@ -324,14 +354,20 @@ export default {
       this.isFresh = true;
     },
     async handleClickNodes(node, data, type) {
-      console.log("🚀 ~ handleClickNodes11111 ~ node, data, type:", node, data, type)
+      console.log(
+        "🚀 ~ handleClickNodes11111 ~ node, data, type:",
+        node,
+        data,
+        type
+      );
       this.addForm = {};
       // console.log(this.$refs.tree.handleClickNodes(), "当前选中节点");
       console.log(node, data, "当前选中节点");
+     
       this.currentNode = node;
       this.isFresh = false;
       this.isFresh = true;
-      this.$forceUpdate()
+      this.$forceUpdate();
       var form = {};
 
       if (this.source == "shop") {
@@ -351,7 +387,7 @@ export default {
               isLast: 0,
               pid: data.id,
               sort: 0,
-              title: "",
+              title: ""
             };
             break;
         }
@@ -371,14 +407,13 @@ export default {
       }
     },
     addOrUpdateHandle() {
-
       var addform = {
         children: [],
         delFlag: 0,
         isLast: 0,
         pid: 0,
         sort: 0,
-        title: "",
+        title: ""
       };
       this.handleClickNodes({ data: addform }, addform, "add");
       // if (!this.currentNode) {
@@ -392,37 +427,37 @@ export default {
       this.$confirm(`是否删除标签【${data.title}】？`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning",
+        type: "warning"
       })
         .then(async () => {
+          that
+            .$http({
+              url: that.$http.adornUrl(`${that.urlList.delete}?id=` + data.id),
+              method: "post",
+              data: {}
+            })
+            .then(async ({ data }) => {
+              if (data && data.code === 0) {
+                that.$message({
+                  type: "success",
+                  message: "删除成功!"
+                });
+              } else {
+                this.$message.error(data.msg);
+                return false;
+              }
 
-          that.$http({
-            url: that.$http.adornUrl(`${that.urlList.delete}?id=` + data.id),
-            method: "post",
-            data: {},
-          }).then(async ({ data }) => {
-            if (data && data.code === 0) {
-              that.$message({
-              type: "success",
-              message: "删除成功!",
+              that.currentNode = null;
+              that.isFresh = false;
+              that.addForm = {};
+              that.$nextTick(() => {
+                that.isFresh = true;
+              });
+              await that.addOrUpdateHandle();
+              // this.expandedkey = [node.parent.data.catId]
             });
-          } else {
-            this.$message.error(data.msg);
-            return false
-          
-          }
-           
-            that.currentNode = null;
-            that.isFresh = false;
-            that.addForm = {};
-            that.$nextTick(() => {
-              that.isFresh = true;
-            });
-            await that.addOrUpdateHandle();
-            // this.expandedkey = [node.parent.data.catId]
-          });
         })
-        .catch(() => { });
+        .catch(() => {});
     },
     filterNode(value, data) {
       if (!value) return true;
@@ -522,10 +557,10 @@ export default {
       const children = parent.data.nodes || parent.data;
       //若parent.data是对象，操作的是子级；如果是数组，操作的是最外层
       if (Array.isArray(parent.data)) {
-        const parentIndex = parent.data.findIndex((d) => d.id === data.id);
+        const parentIndex = parent.data.findIndex(d => d.id === data.id);
         parent.data.splice(parentIndex, 1);
       } else {
-        const childIndex = children.findIndex((d) => d.id === data.id);
+        const childIndex = children.findIndex(d => d.id === data.id);
         children.splice(childIndex, 1);
       }
       this.curNode = undefined;
@@ -546,7 +581,7 @@ export default {
         return;
       }
 
-      let id = ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, (c) =>
+      let id = ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c =>
         (
           c ^
           (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (c / 4)))
@@ -558,7 +593,7 @@ export default {
         nodes: [],
         id: id,
         typeName: "模板组",
-        temporaryData: "1", //用来区分临时数据
+        temporaryData: "1" //用来区分临时数据
       };
       /* 如果模版深度最多两层，以下条件改成该部分注释
           this.curNode && this.curNode.depth == 1 
@@ -658,7 +693,7 @@ export default {
         this.isUpdateGroup = false;
         const parent = node.parent;
         const children = parent.data.nodes || parent.data;
-        const index = children.findIndex((d) => d.id === data.id);
+        const index = children.findIndex(d => d.id === data.id);
         let temp = data;
         temp.text = this.isactTitle;
         children.splice(index, 1, temp);
@@ -678,7 +713,7 @@ export default {
       this.dataListLoading = true;
       await this.$http({
         url: this.$http.adornUrl("/book/labelAndMarket/labelTree"),
-        method: "get",
+        method: "get"
         // params: this.$http.adornParams({
         //   'page': this.pageIndex,
         //   'limit': this.pageSize,
@@ -710,7 +745,7 @@ export default {
     // 多选
     selectionChangeHandle(val) {
       this.dataListSelections = val;
-    },
+    }
     // // 新增 / 修改
     // addOrUpdateHandle(row) {
     //   this.addOrUpdateVisible = true;
@@ -718,26 +753,31 @@ export default {
     //     this.$refs.addOrUpdate.init(row);
     //   });
     // },
-  },
+  }
 };
 </script>
 <style lang="less" scoped>
-/deep/ .filter-tree .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
+/deep/
+  .filter-tree
+  .el-tree--highlight-current
+  .el-tree-node.is-current
+  > .el-tree-node__content {
   // 设置颜色
   // background-color: #baf !important;
 }
 
-/deep/ .filter-tree .el-tree-node:focus>.el-tree-node__content {
+/deep/ .filter-tree .el-tree-node:focus > .el-tree-node__content {
   background-color: transparent !important;
   // color: #17b3a3 !important;
 }
 
-/deep/.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
+/deep/.el-tree--highlight-current
+  .el-tree-node.is-current
+  > .el-tree-node__content {
   background-color: transparent !important;
   // color: #17b3a3 !important;
 }
 
-
 /deep/.filter-tree .el-tree-node__content .el-button {
   display: inline-block !important;
 }
@@ -812,7 +852,7 @@ export default {
   }
 }
 
-.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
+.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
   background-color: #eaebed;
   color: #4796ec;
   font-weight: bold;
@@ -920,9 +960,8 @@ p {
 .el-tree-node__content:active {
   background-color: unset;
 }
-.isSelect{
-
- /* 自定义角度渐变 */
-background-image: linear-gradient(-45deg, #fff, #b0f3ec);
+.isSelect {
+  /* 自定义角度渐变 */
+  background-image: linear-gradient(-45deg, #fff, #b0f3ec);
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/modules/shop/curriculum.vue b/src/views/modules/shop/curriculum.vue
index a61bbdd..857e55a 100644
--- a/src/views/modules/shop/curriculum.vue
+++ b/src/views/modules/shop/curriculum.vue
@@ -443,11 +443,6 @@ export default {
               }
             })
 
-            // this.$http({
-            //   url: this.$http.adornUrl(`/master/shopProduct/getProductDetail/${this.dataForm.productId}`),
-            //   method: 'get',
-            //   params: this.$http.adornParams()
-            // })
 
             .then(res => {
               console.log("result at line 452:", res);
diff --git a/src/views/modules/shop/shopproduct-add-or-update.vue b/src/views/modules/shop/shopproduct-add-or-update.vue
index 3900fc0..ecb7304 100644
--- a/src/views/modules/shop/shopproduct-add-or-update.vue
+++ b/src/views/modules/shop/shopproduct-add-or-update.vue
@@ -1,40 +1,64 @@
 <template>
-  <el-dialog :title="!dataForm.productId ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible"
-    @close="handlereset" lock-scroll width="750px">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="100px">
+  <el-dialog
+    :title="!dataForm.productId ? '新增' : '修改'"
+    :close-on-click-modal="false"
+    :visible.sync="visible"
+    @close="handlereset"
+    lock-scroll
+    width="750px"
+  >
+    <el-form
+      :model="dataForm"
+      :rules="dataRule"
+      ref="dataForm"
+      label-width="100px"
+    >
       <el-form-item label="所属分类" prop="poids">
-        <el-cascader v-model="dataForm.poids" :options="categorys" :props="props" clearable></el-cascader>
+        <el-cascader
+          v-model="dataForm.poids"
+          :options="categorys"
+          :props="props"
+          clearable
+        ></el-cascader>
       </el-form-item>
       <el-form-item label="商品类型" prop="goodsType">
         <el-select v-model="dataForm.goodsType" placeholder="请选择">
-          <el-option v-for="item in goodsTypeList" :key="item.dictType" :label="item.dictValue" :value="item.dictType">
+          <el-option
+            v-for="item in goodsTypeList"
+            :key="item.dictType"
+            :label="item.dictValue"
+            :value="item.dictType"
+          >
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="商品名称" prop="productName">
-        <el-input v-model="dataForm.productName" placeholder="商品名称"></el-input>
+        <el-input
+          v-model="dataForm.productName"
+          placeholder="商品名称"
+        ></el-input>
       </el-form-item>
       <el-form-item label="商品标签" prop="tags">
-        <el-checkbox-group v-model="dataForm.tags" @change="handleCheckedCitiesChange">
-          <el-checkbox v-for="item in tagList" :label="item.splId" :key="item.splId">{{item.labelName}}</el-checkbox>
+        <el-checkbox-group
+          v-model="dataForm.tags"
+          @change="handleCheckedCitiesChange"
+        >
+          <el-checkbox
+            v-for="item in tagList"
+            :label="item.splId"
+            :key="item.splId"
+            >{{ item.labelName }}</el-checkbox
+          >
         </el-checkbox-group>
       </el-form-item>
-      <!-- 关联的图书ids -->     
-      <el-form-item label="关联图书" prop="Books">        
-        <el-table
-          :data="dataForm.Books"
-          stripe
-          style="width: 100%">
-          <el-table-column
-            prop="name"  label="图书名"  >
-          </el-table-column>
-          <el-table-column
-             prop="images"
-            label="封面图"            
-           >
-           <template slot-scope="scope">
-                    <img :src="scope.row.images" width="100" height="100">
-                </template>
+      <!-- 关联的图书ids -->
+      <el-form-item label="关联图书" prop="Books">
+        <el-table :data="dataForm.Books" stripe style="width: 100%">
+          <el-table-column prop="name" label="图书名"> </el-table-column>
+          <el-table-column prop="images" label="封面图">
+            <template slot-scope="scope">
+              <img :src="scope.row.images" width="100" height="100" />
+            </template>
           </el-table-column>
           <!-- <el-table-column
              prop="images"
@@ -43,52 +67,112 @@
           </el-table-column> -->
           <el-table-column width="180">
             <template slot-scope="scope">
-              <el-button type="danger" @click="deliteBook(scope.$index)">删除</el-button>
-            </template>            
+              <el-button type="danger" @click.native="deliteBook(scope.$index)"
+                >删除</el-button
+              >
+            </template>
           </el-table-column>
         </el-table>
         <div style="text-align: center;">
-          <el-button type="primary" size="mini" plain @click="showChooseBook">添加</el-button>
+          <el-button
+            type="primary"
+            size="mini"
+            plain
+            @click.native="showChooseBook"
+            >添加</el-button
+          >
         </div>
-      </el-form-item> 
+      </el-form-item>
       <el-form-item label="商品图" prop="productImages">
-        <el-upload :limit="dataForm.limitCountImg" class="el-uploadfeng "
-          :class="{ uoloadSty: dataForm.showBtnDealImg, disUoloadSty: dataForm.noneBtnImg }"
-          :action="baseUrl + '/oss/fileoss'" list-type="picture-card" :on-preview="handlePictureCardPreview"
-          :file-list="fileList" :on-success="handlePicSuccess" accept=".jpeg,.jpg,.gif,.png" :on-remove="handleRemove">
+        <el-upload
+          :limit="dataForm.limitCountImg"
+          class="el-uploadfeng "
+          :class="{
+            uoloadSty: dataForm.showBtnDealImg,
+            disUoloadSty: dataForm.noneBtnImg
+          }"
+          :action="baseUrl + '/oss/fileoss'"
+          list-type="picture-card"
+          :on-preview="handlePictureCardPreview"
+          :file-list="fileList"
+          :on-success="handlePicSuccess"
+          accept=".jpeg,.jpg,.gif,.png"
+          :on-remove="handleRemove"
+        >
           <i class="el-icon-plus"></i>
         </el-upload>
         <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
-          <img width="100%" :src="dataForm.productImages" alt="">
+          <img width="100%" :src="dataForm.productImages" alt="" />
         </el-dialog>
       </el-form-item>
       <el-form-item label="商品轮播图" prop="productImageList">
-        <el-upload :limit="5" class="el-uploadfeng noneBtnImg" 
-          :class="{ uoloadSty: dataForm.showBtnDealImg, disUoloadSty: dataForm.noneBtnImg }"
-          :action="baseUrl + '/oss/fileoss'" list-type="picture-card" :on-preview="handlePictureCardPreview"
-          :file-list="swiperfileList" :on-success="bannerHandlePicSuccess" accept=".jpeg,.jpg,.gif,.png"
-          :on-remove="bannerHandleRemove">
+        <el-upload
+          :limit="5"
+          class="el-uploadfeng noneBtnImg"
+          :class="{
+            uoloadSty: dataForm.showBtnDealImg,
+            disUoloadSty: dataForm.noneBtnImg
+          }"
+          :action="baseUrl + '/oss/fileoss'"
+          list-type="picture-card"
+          :on-preview="handlePictureCardPreview"
+          :file-list="swiperfileList"
+          :on-success="bannerHandlePicSuccess"
+          accept=".jpeg,.jpg,.gif,.png"
+          :on-remove="bannerHandleRemove"
+        >
           <i class="el-icon-plus"></i>
         </el-upload>
         <!-- <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
             <img width="100%" :src="dataForm.productImageList" alt="">
           </el-dialog> -->
-        <span>图片尺寸：600*600px，支持图片类型：.jpeg,.jpg,.gif,.png， 最多上传5张图片</span>
+        <span
+          >图片尺寸：600*600px，支持图片类型：.jpeg,.jpg,.gif,.png，
+          最多上传5张图片</span
+        >
       </el-form-item>
       <div>
-        <el-form-item label="商品价格" prop="price" style="width: 50%; float: left;">
+        <el-form-item
+          label="商品价格"
+          prop="price"
+          style="width: 50%; float: left;"
+        >
           <el-input v-model="dataForm.price" placeholder="活动价"></el-input>
         </el-form-item>
-        <el-form-item label="活动价" prop="hDprice" style="width: 50%; float: left;">
-          <el-input v-model="dataForm.hDprice" placeholder="商品价格"></el-input>
+        <el-form-item
+          label="活动价"
+          prop="hDprice"
+          style="width: 50%; float: left;"
+        >
+          <el-input
+            v-model="dataForm.hDprice"
+            placeholder="商品价格"
+          ></el-input>
           <span style="color: #999;">值为0或者不填，则没有活动价格</span>
         </el-form-item>
-        <el-form-item label="商品重量" prop="weight" style="width: 50%; float: right;">
-          <el-input style="width: 80%;" v-model="dataForm.weight" placeholder="商品重量"></el-input><span
-            style="display: inline-block; float: right; width: 10%;">克</span>
+        <el-form-item
+          label="商品重量"
+          prop="weight"
+          style="width: 50%; float: right;"
+        >
+          <el-input
+            style="width: 80%;"
+            v-model="dataForm.weight"
+            placeholder="商品重量"
+          ></el-input
+          ><span style="display: inline-block; float: right; width: 10%;"
+            >克</span
+          >
         </el-form-item>
-        <el-form-item label="商品库存" prop="productStock" style="width: 50%; float: right;">
-          <el-input v-model="dataForm.productStock" placeholder="商品库存"></el-input>
+        <el-form-item
+          label="商品库存"
+          prop="productStock"
+          style="width: 50%; float: right;"
+        >
+          <el-input
+            v-model="dataForm.productStock"
+            placeholder="商品库存"
+          ></el-input>
         </el-form-item>
       </div>
       <!-- <el-form-item label="上架状态" prop="publishStatus">
@@ -142,12 +226,24 @@
         </el-form-item>
       </div>
       <el-form-item label="商品详情" prop="productDetails">
-        <el-upload class="avatar-uploader" :action="baseUrl + '/oss/fileoss'" accept=".jpeg,.jpg,.gif,.png" :show-file-list="false" :on-success="contentUploadSuccess" >
+        <el-upload
+          class="avatar-uploader"
+          :action="baseUrl + '/oss/fileoss'"
+          accept=".jpeg,.jpg,.gif,.png"
+          :show-file-list="false"
+          :on-success="contentUploadSuccess"
+        >
         </el-upload>
-        <quill-editor v-model="dataForm.productDetails" ref="myQuillEditor" :options="editorOption"
-          @blur="onEditorBlur($event)" @focus="onEditorFocus($event)" 
-          @ready="onEditorReady($event)" class="shangpin_editor">
-        </quill-editor>        
+        <quill-editor
+          v-model="dataForm.productDetails"
+          ref="myQuillEditor"
+          :options="editorOption"
+          @blur="onEditorBlur($event)"
+          @focus="onEditorFocus($event)"
+          @ready="onEditorReady($event)"
+          class="shangpin_editor"
+        >
+        </quill-editor>
       </el-form-item>
       <!-- <el-form-item label="排序" prop="sort">
         <el-input v-model="dataForm.sort" placeholder="排序"></el-input>
@@ -157,546 +253,570 @@
       <el-button @click="handlereset">取消</el-button>
       <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
     </span>
-  </el-dialog>  
+  </el-dialog>
 </template>
 
 <script>
-  import {
-    quillEditor
-  } from 'vue-quill-editor'
-  import global from '../../common/common.vue' //引入共用组间
+import { quillEditor } from "vue-quill-editor";
+import global from "../../common/common.vue"; //引入共用组间
 
-  import 'quill/dist/quill.core.css'
-  import 'quill/dist/quill.snow.css'
-  import 'quill/dist/quill.bubble.css'
-  const toolbarOptions = [
-  ['bold', 'italic', 'underline', 'strike'],        // 加粗，斜体，下划线，删除线
-  ['blockquote', 'code-block'],                      //引用，代码块
-  [{ 'header': 1 }, { 'header': 2 }],               // 几级标题
-  [{ 'list': 'ordered' }, { 'list': 'bullet' }],     // 有序列表，无序列表
-  [{ 'script': 'sub' }, { 'script': 'super' }],      // 下角标，上角标
-  [{ 'indent': '-1' }, { 'indent': '+1' }],          // 缩进
-  [{ 'direction': 'rtl' }],                         // 文字输入方向
-  [{ 'size': ['small', false, 'large', 'huge'] }],  // 字体大小
-  [{ 'header': [1, 2, 3, 4, 5, 6, false] }],// 标题
-  [{ 'color': [] }, { 'background': [] }],          // 颜色选择
-  [{ 'font': ['SimSun', 'SimHei', 'Microsoft-YaHei', 'KaiTi', 'FangSong', 'Arial'] }],// 字体
-  [{ 'align': [] }], // 居中
-  ['clean'],                                       // 清除样式,
-  ['link', 'image'],  // 上传图片、上传视频
-]
+import "quill/dist/quill.core.css";
+import "quill/dist/quill.snow.css";
+import "quill/dist/quill.bubble.css";
+const toolbarOptions = [
+  ["bold", "italic", "underline", "strike"], // 加粗，斜体，下划线，删除线
+  ["blockquote", "code-block"], //引用，代码块
+  [{ header: 1 }, { header: 2 }], // 几级标题
+  [{ list: "ordered" }, { list: "bullet" }], // 有序列表，无序列表
+  [{ script: "sub" }, { script: "super" }], // 下角标，上角标
+  [{ indent: "-1" }, { indent: "+1" }], // 缩进
+  [{ direction: "rtl" }], // 文字输入方向
+  [{ size: ["small", false, "large", "huge"] }], // 字体大小
+  [{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题
+  [{ color: [] }, { background: [] }], // 颜色选择
+  [
+    {
+      font: [
+        "SimSun",
+        "SimHei",
+        "Microsoft-YaHei",
+        "KaiTi",
+        "FangSong",
+        "Arial"
+      ]
+    }
+  ], // 字体
+  [{ align: [] }], // 居中
+  ["clean"], // 清除样式,
+  ["link", "image"] // 上传图片、上传视频
+];
 
-  export default {
-    data() {
-      return {
-        pointMemery:[], // 花生币操作记录
-        baseUrl: global.baseUrl,
-        goodsTypeList: [],
-        visible: false,
-        categorys: [],
-        fileList: [], // 封面图
-        swiperfileList: [],
-        dialogVisible: false,
-        props: {
-          value: "catId",
-          label: "name",
-          children: "children",
-          checkStrictly: true
-        },
-        dataForm: {
-          tags:[], // 商品标签
-          hDprice: 0, // 活动价
-          productId: 0,
-          limitCountImg: 1, // 图片数量
-          productImageList: '', // 轮播图
-          showBtnDealImg: true,
-          noneBtnImg: false,
-          productName: '',
-          productStock: null, // 商品库存
-          price: '',
-          author: '',
-          publisher: '',
-          weight: '',
-          pubDate: '',
-          // format: '', // 开本
-          isFreeMail: 1, // 是否包邮
-          // pageNum: '',
-          // quality: '', // 内文用纸
-          isNew:0,
-          sumSales: null, // 总销量
-          publishStatus: '',
-          productPid: '',
-          productImages: '',
-          createTime: '',
-          updateTime: '',
-          delFlag: '',
-          sort: '',
-          goodsType: '', // 商品类型
-          poids: [],
-          
-          Books: [] // 关联的图书
+export default {
+  data() {
+    return {
+      pointMemery: [], // 花生币操作记录
+      baseUrl: global.baseUrl,
+      goodsTypeList: [],
+      visible: false,
+      categorys: [],
+      fileList: [], // 封面图
+      swiperfileList: [],
+      dialogVisible: false,
+      props: {
+        value: "catId",
+        label: "name",
+        children: "children",
+        checkStrictly: true
+      },
+      dataForm: {
+        tags: [], // 商品标签
+        hDprice: 0, // 活动价
+        productId: 0,
+        limitCountImg: 1, // 图片数量
+        productImageList: "", // 轮播图
+        showBtnDealImg: true,
+        noneBtnImg: false,
+        productName: "",
+        productStock: null, // 商品库存
+        price: "",
+        author: "",
+        publisher: "",
+        weight: "",
+        pubDate: "",
+        // format: '', // 开本
+        isFreeMail: 1, // 是否包邮
+        // pageNum: '',
+        // quality: '', // 内文用纸
+        isNew: 0,
+        sumSales: null, // 总销量
+        publishStatus: "",
+        productPid: "",
+        productImages: "",
+        createTime: "",
+        updateTime: "",
+        delFlag: "",
+        sort: "",
+        goodsType: "", // 商品类型
+        poids: [],
 
-        },
-        bookidsd:[],
-        dataRule: {
-          productName: [{
+        Books: [] // 关联的图书
+      },
+      bookidsd: [],
+      dataRule: {
+        productName: [
+          {
             required: true,
-            message: '商品名称不能为空',
-            trigger: 'blur'
-          }],
-          price: [{
+            message: "商品名称不能为空",
+            trigger: "blur"
+          }
+        ],
+        price: [
+          {
             required: true,
-            message: '商品价格不能为空',
-            trigger: 'blur'
-          }],
-          weight: [{
+            message: "商品价格不能为空",
+            trigger: "blur"
+          }
+        ],
+        weight: [
+          {
             required: true,
-            message: '商品重量不能为空',
-            trigger: 'blur'
-          }],
-          goodsType: [{
+            message: "商品重量不能为空",
+            trigger: "blur"
+          }
+        ],
+        goodsType: [
+          {
             required: true,
-            message: '商品类型不能为空',
-            trigger: 'blur'
-          }],
-          poids: [{
+            message: "商品类型不能为空",
+            trigger: "blur"
+          }
+        ],
+        poids: [
+          {
             required: true,
-            message: '商品父id不能为空',
-            trigger: 'blur'
-          }],
-          productImages: [{
+            message: "商品父id不能为空",
+            trigger: "blur"
+          }
+        ],
+        productImages: [
+          {
             required: true,
-            message: '商品图不能为空',
-            trigger: 'blur'
-          }],
-          // productDetails: [{
-          //   required: true,
-          //   message: '商品详情不能为空',
-          //   trigger: 'blur'
-          // }],
-          productStock: [{
+            message: "商品图不能为空",
+            trigger: "blur"
+          }
+        ],
+        // productDetails: [{
+        //   required: true,
+        //   message: '商品详情不能为空',
+        //   trigger: 'blur'
+        // }],
+        productStock: [
+          {
             required: true,
-            message: '商品库存不能为空',
-            trigger: 'blur'
-          }],
-          // updateTime: [
-          //   { required: true, message: '更新时间不能为空', trigger: 'blur' }
-          // ],
-          // delFlag: [
-          //   { required: true, message: '删除标记不能为空', trigger: 'blur' }
-          // ],
-          // sort: [
-          //   { required: true, message: '排序不能为空', trigger: 'blur' }
-          // ]
-        },
-        // 富文本编辑器配置
-        editorOption: {
-          modules: {
-            history: {
-              delay: 1000,
-              maxStack: 50,
-              userOnly: false
-            },
-            toolbar: {
-              container: toolbarOptions,
-              handlers: {
-                image: function (value) {
-                  if (value) {
-                    // 调用element的图片上传组件
-                    document.querySelector('.avatar-uploader input').click()
-                  } else {
-                    this.quill.format('image', false)
-                  }
+            message: "商品库存不能为空",
+            trigger: "blur"
+          }
+        ]
+        // updateTime: [
+        //   { required: true, message: '更新时间不能为空', trigger: 'blur' }
+        // ],
+        // delFlag: [
+        //   { required: true, message: '删除标记不能为空', trigger: 'blur' }
+        // ],
+        // sort: [
+        //   { required: true, message: '排序不能为空', trigger: 'blur' }
+        // ]
+      },
+      // 富文本编辑器配置
+      editorOption: {
+        modules: {
+          history: {
+            delay: 1000,
+            maxStack: 50,
+            userOnly: false
+          },
+          toolbar: {
+            container: toolbarOptions,
+            handlers: {
+              image: function(value) {
+                if (value) {
+                  // 调用element的图片上传组件
+                  document.querySelector(".avatar-uploader input").click();
+                } else {
+                  this.quill.format("image", false);
                 }
               }
-            },
-          },
-          placeholder: '请输入正文',
-          
+            }
+          }
         },
-        tagList:[]
-      }
-    },
-    created() {
-      this.getTreeList()
-      this.getTags()
-    },
+        placeholder: "请输入正文"
+      },
+      tagList: []
+    };
+  },
+  created() {
+    this.getTreeList();
+    this.getTags();
+  },
   methods: {
-    contentUploadSuccess(res, file) { 
-     // console.log(res)
-      let quill = this.$refs.myQuillEditor.quill
+    contentUploadSuccess(res, file) {
+      // console.log(res)
+      let quill = this.$refs.myQuillEditor.quill;
       // 如果上传成功
       if (res) {
         // 获取光标所在位置
         let length = quill.getSelection().index;
         // 插入图片，res为服务器返回的图片链接地址
-        quill.insertEmbed(length, 'image', res.url)
+        quill.insertEmbed(length, "image", res.url);
         // 调整光标到最后
-        quill.setSelection(length + 1)
+        quill.setSelection(length + 1);
       } else {
         // 提示信息，需引入Message
-        this.$message.error('图片插入失败！')
+        this.$message.error("图片插入失败！");
       }
-
     },
     handleCheckedCitiesChange(value) {
-      // console.log(value, 'value')     
-      },
+      // console.log(value, 'value')
+    },
     // 获取商品标签
-    getTags() {       
-        this.$http({
-          url: this.$http.adornUrl('/book/label/getLabels'),
-          method: 'post'          
-        }).then(({data}) => {
-          if (data && data.code === 0) {
-            this.tagList = data.result.labels
-            // this.totalPage = data.page.totalCount
-          } else {
-            this.tagList = []
-            // this.totalPage = 0
-          }
-          
-        })
+    getTags() {
+      this.$http({
+        url: this.$http.adornUrl("/book/label/getLabels"),
+        method: "post"
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.tagList = data.result.labels;
+          // this.totalPage = data.page.totalCount
+        } else {
+          this.tagList = [];
+          // this.totalPage = 0
+        }
+      });
     },
-    showChooseBook() { 
-      // 显示图书列表  
-      this.$emit("showchooseBookf", { 'bookIds': this.dataForm.Books });   
+    showChooseBook() {
+      // 显示图书列表
+      this.$emit("showchooseBookf", { bookIds: this.dataForm.Books });
+
       // console.log('发送指令')
-      this.$bus.$emit("showchooseBook", { 'bookIds': this.dataForm.Books });
+      this.$bus.$emit("showchooseBook", { bookIds: this.dataForm.Books });
     },
-      init(id) {
-        this.dataForm.productId = id || 0
-        this.visible = true
-        this.getTags()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].resetFields()
-          if (this.dataForm.productId) {
-            this.$http({
-              url: this.$http.adornUrl(`/book/shopproduct/info/${this.dataForm.productId}`),
-              method: 'get',
-              params: this.$http.adornParams()
-            }).then(({
-              data
-            }) => {
-              if (data && data.code === 0) {
-                this.dataForm.tags = data.labels
-                // console.log('收到的值', this.dataForm.tags)
-                this.dataForm.productName = data.shopProduct.productName
-                this.dataForm.price = data.shopProduct.price
-                this.dataForm.goodsType = data.shopProduct.goodsType
-                this.dataForm.weight = data.shopProduct.weight
-                this.dataForm.publishStatus = data.shopProduct.publishStatus
-                this.dataForm.productPid = data.shopProduct.productPid
-                this.dataForm.productImages = data.shopProduct.productImages
-                this.dataForm.createTime = data.shopProduct.createTime
-                this.dataForm.updateTime = data.shopProduct.updateTime
-                this.dataForm.delFlag = data.shopProduct.delFlag
-                this.dataForm.sort = data.shopProduct.sort
-                this.dataForm.publisher = data.shopProduct.publisher
-                this.dataForm.author = data.shopProduct.author
-                this.dataForm.pubDate = data.shopProduct.pubDate
-                // this.dataForm.pageNum = data.shopProduct.pageNum
-                // this.dataForm.quality = data.shopProduct.quality
-                // this.dataForm.format = data.shopProduct.format
-                this.dataForm.isFreeMail = data.shopProduct.isFreeMail
-                this.dataForm.isNew = data.shopProduct.isNew
-                this.dataForm.productDetails = data.shopProduct.productDetails
-                this.dataForm.poids = data.shopProduct.poids
-                this.dataForm.productStock = data.shopProduct.productStock
-                this.dataForm.hDprice = data.shopProduct.activityPrice
-                let arrArr = []
+    init(id) {
+      this.dataForm.productId = id || 0;
+      this.visible = true;
+      this.getTags();
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.dataForm.productId) {
+          this.$http({
+            url: this.$http.adornUrl(
+              `/book/shopproduct/info/${this.dataForm.productId}`
+            ),
+            method: "get",
+            params: this.$http.adornParams()
+          }).then(({ data }) => {
+            if (data && data.code === 0) {
+              this.dataForm.tags = data.labels;
+              // console.log('收到的值', this.dataForm.tags)
+              this.dataForm.productName = data.shopProduct.productName;
+              this.dataForm.price = data.shopProduct.price;
+              this.dataForm.goodsType = data.shopProduct.goodsType;
+              this.dataForm.weight = data.shopProduct.weight;
+              this.dataForm.publishStatus = data.shopProduct.publishStatus;
+              this.dataForm.productPid = data.shopProduct.productPid;
+              this.dataForm.productImages = data.shopProduct.productImages;
+              this.dataForm.createTime = data.shopProduct.createTime;
+              this.dataForm.updateTime = data.shopProduct.updateTime;
+              this.dataForm.delFlag = data.shopProduct.delFlag;
+              this.dataForm.sort = data.shopProduct.sort;
+              this.dataForm.publisher = data.shopProduct.publisher;
+              this.dataForm.author = data.shopProduct.author;
+              this.dataForm.pubDate = data.shopProduct.pubDate;
+              // this.dataForm.pageNum = data.shopProduct.pageNum
+              // this.dataForm.quality = data.shopProduct.quality
+              // this.dataForm.format = data.shopProduct.format
+              this.dataForm.isFreeMail = data.shopProduct.isFreeMail;
+              this.dataForm.isNew = data.shopProduct.isNew;
+              this.dataForm.productDetails = data.shopProduct.productDetails;
+              this.dataForm.poids = data.shopProduct.poids;
+              this.dataForm.productStock = data.shopProduct.productStock;
+              this.dataForm.hDprice = data.shopProduct.activityPrice;
+              let arrArr = [];
 
-                if (data.shopProduct.bookidsimages !== '') {
-                  this.dataForm.Books = data.shopProduct.bookidsimages
-                }
-                
-                sessionStorage.setItem('Books', JSON.stringify(this.dataForm.Books))
+              if (data.shopProduct.bookidsimages !== "") {
+                this.dataForm.Books = data.shopProduct.bookidsimages;
+              }
 
-                if (data.shopProduct.productImages != "") {
-                  var img = {
-                    name: '',
-                    url: data.shopProduct.productImages
-                  }
-                  var attr = []
-                  attr.push(img)
-                  this.fileList = attr
-                }
+              sessionStorage.setItem(
+                "Books",
+                JSON.stringify(this.dataForm.Books)
+              );
 
-                if (data.shopProduct.productImageList == null || data.shopProduct.productImageList[0] == '' ||
-                  data.shopProduct.productImageList == "") {
-                  this.swiperfileList = []
-                  // console.log('走这')
-                }else {
+              if (data.shopProduct.productImages != "") {
+                var img = {
+                  name: "",
+                  url: data.shopProduct.productImages
+                };
+                var attr = [];
+                attr.push(img);
+                this.fileList = attr;
+              }
+
+              if (
+                data.shopProduct.productImageList == null ||
+                data.shopProduct.productImageList[0] == "" ||
+                data.shopProduct.productImageList == ""
+              ) {
+                this.swiperfileList = [];
+                // console.log('走这')
+              } else {
                 // 有轮播图
                 // console.log(data.shopProduct.productImageList)
-                let arr = []
-                let arr1 = []
+                let arr = [];
+                let arr1 = [];
 
-                arr = data.shopProduct.productImageList.split(',');
+                arr = data.shopProduct.productImageList.split(",");
                 // console.log(arr, '处理后得轮播图数组')
                 arr.forEach((item, index) => {
                   arr1.push({
                     name: index,
                     url: item
-                  })
+                  });
                 });
-                this.swiperfileList = arr1
+                this.swiperfileList = arr1;
               }
-              } 
-            })
-          }
-        })
-      },
-      // 获取商品类型
-      getGoodsTypeList() {
-        this.$http({
-          url: this.$http.adornUrl('/book/sysdictdata/selectByType/goodsType'),
-          method: 'get',
-        }).then(({
-          data
-        }) => {
-          // console.log(data.dataList)
-          this.goodsTypeList = data.dataList
-        })
+            }
+          });
+        }
+      });
     },
-      // 删除图书
-    deliteBook(index) { 
-      this.dataForm.Books.splice(index, 1)
-      sessionStorage.setItem('Books',JSON.stringify(this.dataForm.Books))
+    // 获取商品类型
+    getGoodsTypeList() {
+      this.$http({
+        url: this.$http.adornUrl("/book/sysdictdata/selectByType/goodsType"),
+        method: "get"
+      }).then(({ data }) => {
+        // console.log(data.dataList)
+        this.goodsTypeList = data.dataList;
+      });
     },
-      dealImgChange(file, fileList) {
-        this.dataForm.noneBtnImg = fileList.length >= this.dataForm.limitCountImg;
-      },
-      // 表单提交
+    // 删除图书
+    deliteBook(index) {
+      this.dataForm.Books.splice(index, 1);
+      sessionStorage.setItem("Books", JSON.stringify(this.dataForm.Books));
+    },
+    dealImgChange(file, fileList) {
+      this.dataForm.noneBtnImg = fileList.length >= this.dataForm.limitCountImg;
+    },
+    // 表单提交
     dataFormSubmit() {
-      this.getBookIds()
+      this.getBookIds();
       // console.log(this.bookidsd,'this.bookidsd')
       //    return false
-        this.$refs['dataForm'].validate((valid) => {
-          this.dataForm.productImageList = this.getStringImgUrl()
-          var bookIDS = this.getBookIds()
-          //  console.log(this.dataForm.productImageList)
-          if (valid) {
-            if (!this.dataForm.hDprice || this.dataForm.hDprice == 0) {
-              // console.log('没有值')
-              this.dataForm.hDprice = 0
-             }
-           
-            this.$http({
-              url: this.$http.adornUrl(`/book/shopproduct/${!this.dataForm.productId ? 'save' : 'update'}`),
-              method: 'post',
-              data: this.$http.adornData({
-                'productId': this.dataForm.productId || undefined,
-                'productName': this.dataForm.productName,
-                'price': this.dataForm.price,
-                'weight': this.dataForm.weight,
-                'publishStatus': this.dataForm.publishStatus,
-                'productPid': this.dataForm.poids[this.dataForm.poids.length - 1],
-                'productImages': this.dataForm.productImages,
-                'productImageList': this.dataForm.productImageList,
-                'createTime': this.dataForm.createTime,
-                'updateTime': this.dataForm.updateTime,
-                'delFlag': this.dataForm.delFlag,
-                'sort': this.dataForm.sort,
-                'goodsType': this.dataForm.goodsType,
-                'productDetails': this.dataForm.productDetails,
-                'author': this.dataForm.author,
-                'publisher': this.dataForm.publisher,
-                'pubDate': this.dataForm.pubDate,
-                'shoproudLabels': this.dataForm.tags,
-                // 'format': this.dataForm.format, // 开本
-                'isFreeMail': this.dataForm.isFreeMail,
-                'isNew' : this.dataForm.isNew,
-                // 'pageNum': this.dataForm.pageNum,
-                // 'quality': this.dataForm.quality, // 内文用纸
-                'productStock': this.dataForm.productStock, // 库存
-                'activityPrice': this.dataForm.hDprice,
-                'bookids': this.bookidsd,     // 关联的图书[12,13,45]
-                // 'bookidsimages': this.dataForm.Books     // 关联的图书对象
-              })
-            }).then(({
-              data
-            }) => {
-              if (data && data.code === 0) {
-                this.$message({
-                  message: '操作成功',
-                  type: 'success',
-                  duration: 1500,
-                  onClose: () => {
-                    this.visible = false
-                    this.$refs['dataForm'].resetFields()
-                    // this.$refs['dataForm'].reset()
-                    this.$emit('refreshDataList')
-                  }
-                })
-              } else {
-                this.$message.error(data.msg)
-              }
-            })
+      this.$refs["dataForm"].validate(valid => {
+        this.dataForm.productImageList = this.getStringImgUrl();
+        var bookIDS = this.getBookIds();
+        //  console.log(this.dataForm.productImageList)
+        if (valid) {
+          if (!this.dataForm.hDprice || this.dataForm.hDprice == 0) {
+            // console.log('没有值')
+            this.dataForm.hDprice = 0;
           }
-        })
-      },
-      changeTime(e) {
-        console.log(e)
+
+          this.$http({
+            url: this.$http.adornUrl(
+              `/book/shopproduct/${
+                !this.dataForm.productId ? "save" : "update"
+              }`
+            ),
+            method: "post",
+            data: this.$http.adornData({
+              productId: this.dataForm.productId || undefined,
+              productName: this.dataForm.productName,
+              price: this.dataForm.price,
+              weight: this.dataForm.weight,
+              publishStatus: this.dataForm.publishStatus,
+              productPid: this.dataForm.poids[this.dataForm.poids.length - 1],
+              productImages: this.dataForm.productImages,
+              productImageList: this.dataForm.productImageList,
+              createTime: this.dataForm.createTime,
+              updateTime: this.dataForm.updateTime,
+              delFlag: this.dataForm.delFlag,
+              sort: this.dataForm.sort,
+              goodsType: this.dataForm.goodsType,
+              productDetails: this.dataForm.productDetails,
+              author: this.dataForm.author,
+              publisher: this.dataForm.publisher,
+              pubDate: this.dataForm.pubDate,
+              shoproudLabels: this.dataForm.tags,
+              // 'format': this.dataForm.format, // 开本
+              isFreeMail: this.dataForm.isFreeMail,
+              isNew: this.dataForm.isNew,
+              // 'pageNum': this.dataForm.pageNum,
+              // 'quality': this.dataForm.quality, // 内文用纸
+              productStock: this.dataForm.productStock, // 库存
+              activityPrice: this.dataForm.hDprice,
+              bookids: this.bookidsd // 关联的图书[12,13,45]
+              // 'bookidsimages': this.dataForm.Books     // 关联的图书对象
+            })
+          }).then(({ data }) => {
+            if (data && data.code === 0) {
+              this.$message({
+                message: "操作成功",
+                type: "success",
+                duration: 1500,
+                onClose: () => {
+                  this.visible = false;
+                  this.$refs["dataForm"].resetFields();
+                  // this.$refs['dataForm'].reset()
+                  this.$emit("refreshDataList");
+                }
+              });
+            } else {
+              this.$message.error(data.msg);
+            }
+          });
+        }
+      });
     },
-    getBookIds() { 
+    changeTime(e) {
+      console.log(e);
+    },
+    getBookIds() {
       // 图书ids
-    //  console.log(this.dataForm.Books,'Books')
-      this.bookidsd = this.dataForm.Books.map(item => { 
-          return item.id
-      })
+      //  console.log(this.dataForm.Books,'Books')
+      this.bookidsd = this.dataForm.Books.map(item => {
+        return item.id;
+      });
     },
-      getTreeList() {
-        this.$http({
-          url: this.$http.adornUrl(`/book/shopcategory/listTree`),
-          method: 'get',
-          params: this.$http.adornParams()
-        }).then(({
-          data
-        }) => {
-          this.categorys = data.data;
-        })
-      },
-      handlePictureCardPreview(file) {
-        this.dataForm.productImages = file.url;
-        this.dialogVisible = true;
-      },
-      bannerHandlePicSuccess(res, file) {
-        // 轮播图上传成功
-        if (res.msg == "success") {
-          this.swiperfileList.push({
-            name: file.name,
-            url: res.url
-          })
-          // console.log(this.swiperfileList)
-          this.$message.success("上传成功");
-        } else {
-          this.$message.error("上传失败");
-        }
-      },
-      // 字符串图片地址
-      getStringImgUrl() {
-        let arr = this.swiperfileList.map(item => item.url)
-        if (arr.length <= 0) {
-          return null
-        } else {
-          return arr.toString()
-        }
-      },
-      handlePicSuccess(res, file) {
-        // console.log(res,'res')
-        if (res.msg == "success") {
-          this.dataForm.productImages = res.url;
-          this.fileList.push({
-            name: file.name,
-            url: res.url
-          })
-          //  console.log(this.dataForm.productImages,'productImages')
-          this.$message.success("上传成功");
-        } else {
-          this.$message.error("上传失败");
-        }
-      },
-      bannerHandleRemove(file, fileList) {
-        // 轮播图删除操作
-        this.swiperfileList = fileList
-      },
-      handleRemove(file, fileList) {
-        this.dataForm.productImages = '';
-        this.fileList = []
-        this.dataForm.noneBtnImg = fileList.length >= this.dataForm.limitCountImg;
-      },
-      handlereset() {
-        this.fileList = [],       
-          this.visible = false
-          this.dataForm.tagList = []
-          this.dataForm.Books = []
-        this.swiperfileList = []
-        this.$refs['dataForm'].resetFields()
-        sessionStorage.setItem('Books', JSON.stringify([]))
-        // this.$refs['dataForm'].reset()
-      },
-      // 失去焦点事件
-      onEditorBlur(quill) {
-      //  console.log('editor blur!', quill)       
-      },
-      // 获得焦点事件
-      onEditorFocus(quill) {
-        //console.log('editor focus!', quill)
-      },
-      // 准备富文本编辑器
-      onEditorReady(quill) {
-       // console.log('editor ready!', quill)
-      },
-      
+    getTreeList() {
+      this.$http({
+        url: this.$http.adornUrl(`/book/shopcategory/listTree`),
+        method: "get",
+        params: this.$http.adornParams()
+      }).then(({ data }) => {
+        this.categorys = data.data;
+      });
     },
-    components: {
-      quillEditor
+    handlePictureCardPreview(file) {
+      this.dataForm.productImages = file.url;
+      this.dialogVisible = true;
+    },
+    bannerHandlePicSuccess(res, file) {
+      // 轮播图上传成功
+      if (res.msg == "success") {
+        this.swiperfileList.push({
+          name: file.name,
+          url: res.url
+        });
+        // console.log(this.swiperfileList)
+        this.$message.success("上传成功");
+      } else {
+        this.$message.error("上传失败");
+      }
+    },
+    // 字符串图片地址
+    getStringImgUrl() {
+      let arr = this.swiperfileList.map(item => item.url);
+      if (arr.length <= 0) {
+        return null;
+      } else {
+        return arr.toString();
+      }
+    },
+    handlePicSuccess(res, file) {
+      // console.log(res,'res')
+      if (res.msg == "success") {
+        this.dataForm.productImages = res.url;
+        this.fileList.push({
+          name: file.name,
+          url: res.url
+        });
+        //  console.log(this.dataForm.productImages,'productImages')
+        this.$message.success("上传成功");
+      } else {
+        this.$message.error("上传失败");
+      }
+    },
+    bannerHandleRemove(file, fileList) {
+      // 轮播图删除操作
+      this.swiperfileList = fileList;
+    },
+    handleRemove(file, fileList) {
+      this.dataForm.productImages = "";
+      this.fileList = [];
+      this.dataForm.noneBtnImg = fileList.length >= this.dataForm.limitCountImg;
+    },
+    handlereset() {
+      (this.fileList = []), (this.visible = false);
+      this.dataForm.tagList = [];
+      this.dataForm.Books = [];
+      this.swiperfileList = [];
+      this.$refs["dataForm"].resetFields();
+      sessionStorage.setItem("Books", JSON.stringify([]));
+      // this.$refs['dataForm'].reset()
+    },
+    // 失去焦点事件
+    onEditorBlur(quill) {
+      //  console.log('editor blur!', quill)
+    },
+    // 获得焦点事件
+    onEditorFocus(quill) {
+      //console.log('editor focus!', quill)
+    },
+    // 准备富文本编辑器
+    onEditorReady(quill) {
+      // console.log('editor ready!', quill)
+    }
+  },
+  components: {
+    quillEditor
   },
   mounted() {
-    this.$bus.$on("haveBookIds", (data) => {  
-        sessionStorage.setItem('Books', JSON.stringify(data.bookIds))   
+    this.$bus.$on("haveBookIds", data => {
+      sessionStorage.setItem("Books", JSON.stringify(data.bookIds));
       //  console.log('haveBookIds',data)
-      //console.log(data.bookIds, '收到的数据') 
-      var newarr = []
-      var ids = [] //哨兵数组
-      if (data.bookIds && data.bookIds.length > 0) {     
-        ids[0] = data.bookIds[0].id
-        newarr[0] = data.bookIds[0]
+      //console.log(data.bookIds, '收到的数据')
+      var newarr = [];
+      var ids = []; //哨兵数组
+      if (data.bookIds && data.bookIds.length > 0) {
+        ids[0] = data.bookIds[0].id;
+        newarr[0] = data.bookIds[0];
         //   console.log(ids,'ids')
-          //  newarr.push(data.bookIds[0])
-          for (let index = 0; index < data.bookIds.length; index++) {
-            if (!ids.includes(data.bookIds[index].id)) {
+        //  newarr.push(data.bookIds[0])
+        for (let index = 0; index < data.bookIds.length; index++) {
+          if (!ids.includes(data.bookIds[index].id)) {
             // console.log(data.bookIds[index].id, 'data.bookIds[index].id')
-              newarr.push(data.bookIds[index])
-              ids.push(data.bookIds[index].id)
-            }          
+            newarr.push(data.bookIds[index]);
+            ids.push(data.bookIds[index].id);
           }
+        }
       }
-        //  console.log(newarr,'newarr',ids)
-        data.bookIds.length > 0 ? this.dataForm.Books = newarr : this.dataForm.Books = []
-      });
+      //  console.log(newarr,'newarr',ids)
+      data.bookIds.length > 0
+        ? (this.dataForm.Books = newarr)
+        : (this.dataForm.Books = []);
+    });
   },
 
-    watch: {
-      visible: {
-        handler(val, oldVal) {
-          this.getGoodsTypeList()
-        },
-        deep: true
+  watch: {
+    visible: {
+      handler(val, oldVal) {
+        this.getGoodsTypeList();
       },
+      deep: true
     }
   }
+};
 </script>
 
 <style lang="less">
-  // .disUoloadSty {
-  //   .el-upload--picture-card {
-  //     display: none;
-  //     /* 上传按钮隐藏 */
-  //   }
-  // }
+// .disUoloadSty {
+//   .el-upload--picture-card {
+//     display: none;
+//     /* 上传按钮隐藏 */
+//   }
+// }
 
-  // .el-form-item {
-  //   /deep/ .el-form-item__label {
-  //     font-size: 12px;
-  //   }
-  // }
+// .el-form-item {
+//   /deep/ .el-form-item__label {
+//     font-size: 12px;
+//   }
+// }
 
-  .el-uploadfeng {
-   .el-upload-list__item {
-      width: 95px;
-      height: 95px;
-    }
-
-    .el-upload--picture-card {
-      width: 95px;
-      height: 95px;
-      line-height: 95px;
-    }
+.el-uploadfeng {
+  .el-upload-list__item {
+    width: 95px;
+    height: 95px;
   }
 
-  .shangpin_editor .ql-editor {
-    height: 150px;
+  .el-upload--picture-card {
+    width: 95px;
+    height: 95px;
+    line-height: 95px;
   }
+}
+
+.shangpin_editor .ql-editor {
+  height: 150px;
+}
 </style>
diff --git a/src/views/modules/shop/shopproduct.vue b/src/views/modules/shop/shopproduct.vue
index aac1652..d757a9c 100644
--- a/src/views/modules/shop/shopproduct.vue
+++ b/src/views/modules/shop/shopproduct.vue
@@ -88,7 +88,7 @@
         fixed="right"
         header-align="center"
         align="center"
-        width="180"
+        width="240"
         label="操作"
       >
         <template slot-scope="scope">
@@ -101,21 +101,51 @@
           <el-button
             type="text"
             size="small"
-            @click="handleEditCurriculum(scope.row.productId)"
-            >修改课程</el-button
-          >
-          <el-button
-            type="text"
-            size="small"
-            @click="handleEditTags(scope.row.productId)"
-            >修改标签</el-button
-          >
+           @click.native="handleEditCurriculum(scope.row.productId)"
+            >新版修改</el-button
+          > 
           <el-button
+            style="color:red"
             type="text"
             size="small"
             @click="deleteHandle(scope.row.productId)"
             >删除</el-button
           >
+          <el-dropdown>
+            <el-button
+            type="text"
+            size="small"
+           
+            >更多操作<i class="el-icon-arrow-down el-icon--right"></i></el-button
+          >
+            <!-- <span type="primary" size="mini" class="el-dropdown-link">
+              更多操作<i class="el-icon-arrow-down el-icon--right"></i>
+            </span> -->
+            <el-dropdown-menu slot="dropdown">
+              <!-- <el-dropdown-item
+                @click.native="addOrUpdateHandle(scope.row.productId)"
+                >修改</el-dropdown-item
+              >
+              <el-dropdown-item
+                @click.native="handleEditCurriculum(scope.row.productId)"
+                >新版修改</el-dropdown-item
+              > -->
+              
+              <el-dropdown-item
+                @click.native="handleEditCorrelation(scope.row.productId)"
+                >关联绑定</el-dropdown-item
+              >
+              <el-dropdown-item
+                @click.native="handleEditTags(scope.row.productId)"
+                >修改标签</el-dropdown-item
+              >
+              <!-- <el-dropdown-item  style="color:red"
+                @click.native="deleteHandle(scope.row.productId)"
+                >删除</el-dropdown-item
+              > -->
+            </el-dropdown-menu>
+          </el-dropdown>
+         
         </template>
       </el-table-column>
     </el-table>
@@ -137,7 +167,6 @@
       @showchooseBookf="showchooseBookf"
     ></add-or-update>
 
-
     <curriculum
       v-if="curriculumVisible"
       ref="curriculum"
@@ -145,16 +174,17 @@
       @showchooseBookf="showchooseBookf"
     ></curriculum>
 
-
-
     <add-or-update
       v-if="addOrUpdateVisible"
       ref="addOrUpdate"
       @refreshDataList="getDataList"
       @showchooseBookf="showchooseBookf"
     ></add-or-update>
-    
+
     <commonTags ref="commonTags"></commonTags>
+    <correlation ref="correlation"></correlation>
+    <choose-book v-if="chooseBookVisible" :bookIds = bookIds ref="chooseBook" :chooseBookVisible = chooseBookVisible @closeBookf = "closeBookf"></choose-book>   -->
+     
   </div>
 </template>
 
@@ -163,7 +193,9 @@ import chooseBook from "./chooseBook.vue";
 import curriculum from "./curriculum.vue";
 import AddOrUpdate from "./shopproduct-add-or-update";
 // import AddOrUpdate from "./shopproduct-add-or-update";
-import commonTags from "./commonBookTags/commonTags.vue";
+import commonTree from "@/views/components/commonBookTags/tags.vue";
+import commonTags from "./commonBookTags/commonTags1.vue";
+import correlation from "./commonBookTags/correlation.vue";
 export default {
   data() {
     return {
@@ -187,7 +219,8 @@ export default {
     curriculum,
     AddOrUpdate,
     chooseBook,
-    commonTags
+    commonTags,
+    correlation
   },
   activated() {
     this.getDataList();
@@ -198,6 +231,11 @@ export default {
         this.$refs.commonTags.open(id);
       });
     },
+    handleEditCorrelation(id) {
+      this.$nextTick(() => {
+        this.$refs.correlation.open(id);
+      });
+    },
     closeBookf() {
       this.chooseBookVisible = false;
     },
@@ -249,6 +287,7 @@ export default {
     },
     // 新增 / 修改
     addOrUpdateHandle(id) {
+      console.log(11111111111111111);
       this.addOrUpdateVisible = true;
       this.$nextTick(() => {
         this.$refs.addOrUpdate.init(id);