国学标签

src/views/components/commonBookTags/shopproduct.vue

@@ -1,7 +1,7 @@
 <template>
   <div
     class="commonShopproduct"
-    :style="`width: 100%; height: 100%; margin-top: -50px`"
+    :style="`width: 100%; height: 100%; margin-top: ${!isNoSearch?'-50px':'0'}`"
   >
     <!-- <el-form
       :inline="true"
@@ -286,7 +286,7 @@ export default {
       // }
 
       await this.$http({
-        url: this.$http.adornUrl(this.urlList.getAssociatedGoodsList),
+        url: this.$http.adornUrl(this.urlList.hasBindProductList),
         method: "post",
         params: this.$http.adornParams({
           ...this.defaultForm,
@@ -322,36 +322,13 @@ export default {
 
       this.dataListLoading = true;
 
-      if (this.axiosType == "raw") {
-        this.$http
-          .request({
-            url: this.$http.adornUrl(`${this.urlList.getAssociatedGoodsList}`),
-            method: "POST",
-            data: {
-              ...form
-            },
-            header: {
-              //默认 无 说明：请求头
-              "Content-Type": "application/json"
-            }
-          })
-          .then(async ({ data }) => {
-          	console.log('data at line 338:', data)
-            if (data && data.code === 0) {
-              this.associatedGoodsList = [...data[this.otherInfo.httpDataValueName]];
-
-              this.dataListLoading = false;
-            }
-          });
-      } 
-      
-    else  if (this.defaultForm.httpType == "raw") {
+      if (this.otherInfo.httpType == "raw") {
         this.$http
           .request({
             url: this.$http.adornUrl(`${this.urlList.hasBindProductList}`),
             method: "POST",
             data: {
-              productId: this.defaultForm.productId
+             ...form
             },
             header: {
               //默认 无 说明：请求头
@@ -360,7 +337,7 @@ export default {
           })
           .then(async ({ data }) => {
             if (data && data.code === 0) {
-              this.associatedGoodsList = [...data[this.defaultForm.httpDataValueName]];
+              this.associatedGoodsList = [...data[this.otherInfo.httpDataValueName]];
 
               this.dataListLoading = false;
             }

src/views/components/commonBookTags/shopproductTable.vue

@@ -246,7 +246,7 @@ export default {
       // }
       this.dataListLoading = true;
       this.clear();
-      if (this.defaultForm.httpType == "raw"||this.otherInfo.httpType == "raw") {
+      if (this.otherInfo.httpType == "raw") {
         form.page = this.pageIndex;
         this.$http
           .request({
@@ -261,9 +261,10 @@ export default {
             }
           })
           .then(({ data }) => {
+          	console.log('data at line 263:', data)
             if (data && data.code === 0) {
-              this.dataList = [...data.page[this.defaultForm.httpDataValueName]];
-              this.totalPage = data.page[this.defaultForm.httpDataTotalName];
+              this.dataList = [...data.page[this.otherInfo.httpDataValueName]];
+              this.totalPage = data.page[this.otherInfo.httpDataTotalName];
             } else {
               this.dataList = [];
               this.totalPage = 0;

src/views/components/commonBookTags/tags.vue

@@ -35,6 +35,8 @@
     <!-- :allow-drop="allowDrop" -->
     <div class="custom-tree-container">
       <el-tree
+        :draggable="false"
+        :allow-drop="false"
         :highlight-current="true"
         class="filter-tree"
         node-key="id"
@@ -43,7 +45,6 @@
         default-expand-all
         :filter-node-method="filterNode"
         ref="tree"
-        :draggable="true"
         @node-click="handleNodeClick"
         :expand-on-click-node="false"
       >
@@ -326,11 +327,10 @@ export default {
               ...this.addForm
             })
           }).then(async ({ data }) => {
-          	console.log('data at line 328:', data)
+            console.log("data at line 328:", data);
             if (data && data.code === 0) {
-              if(this.axiosResultKey){
-                
-                console.log('at line 331:',data[this.axiosResultKey] )
+              if (this.axiosResultKey) {
+                console.log("at line 331:", data[this.axiosResultKey]);
               }
               var status = await this.correlationShop(
                 data[this.axiosResultKey ? this.axiosResultKey : "result"].id