From 7c9962a45d8d3b0b66b7a988549ce0563245bd17 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: Fri, 22 Nov 2024 17:38:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appManage/advertisement-add-or-update.vue |  3 +-
 .../modules/appManage/shopproductTable.vue    | 29 ++++++++++---------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/views/modules/appManage/advertisement-add-or-update.vue b/src/views/modules/appManage/advertisement-add-or-update.vue
index 1cc5104..6083849 100644
--- a/src/views/modules/appManage/advertisement-add-or-update.vue
+++ b/src/views/modules/appManage/advertisement-add-or-update.vue
@@ -17,7 +17,7 @@
         label-width="80px"
       >
         <el-form-item label="发布APP" prop="title">
-          <el-select v-model="dataForm.appType" placeholder="请选择">
+          <el-select v-model="dataForm.appType" placeholder="请选择" @change="selectType">
             <el-option
               v-for="item in APPList"
               :key="item.value"
@@ -129,6 +129,7 @@
       <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
     </span>
     <commonShopTable
+    :type="dataForm.appType"
       ref="commonShopTable"
       currentType="courseLinkPro"
       @submit="bindProduct"
diff --git a/src/views/modules/appManage/shopproductTable.vue b/src/views/modules/appManage/shopproductTable.vue
index 42478cb..b416aca 100644
--- a/src/views/modules/appManage/shopproductTable.vue
+++ b/src/views/modules/appManage/shopproductTable.vue
@@ -6,8 +6,8 @@
       <div class="shop_drawer_box demo-drawer__content">
         <div class="addFormBox">
           <el-form ref="addForm" label-width="80px" :model="dataForm">
-            <el-form-item label="商品名称" prop="productName" class="form_item">
-              <el-input size="small" placeholder="请输入商品名称" style="width: 100%" v-model="dataForm.productName" clearable>
+            <el-form-item label="商品名称" prop="keywords" class="form_item">
+              <el-input size="small" placeholder="请输入商品名称" style="width: 100%" v-model="dataForm.keywords" clearable>
               </el-input>
             </el-form-item>
             <!-- <el-form-item label="商品类型" prop="goodsType" class="form_item">
@@ -86,7 +86,7 @@
 <script>
 
 export default {
-  props: ["currentType", "currentId"],
+  props: ["currentType", "currentId","type"],
   data() {
     return {
       timer: null,
@@ -96,8 +96,8 @@ export default {
       multipleSelection: [], // 当前页选中的数据
       idKey: "productId", // 标识列表数据中每一行的唯一键的名称(需要按自己的数据改一下)
       dataForm: {
-        productName: "",
-        goodsType: "",
+        keywords: "",
+        
       },
       currentRow:null,
       bookMarketId: null,
@@ -123,8 +123,8 @@ export default {
   },
   methods: {
     handleReset() {
-      this.dataForm = {  productName: "",
-        goodsType: "",};
+      this.dataForm = {  keywords: "",
+      };
       this.pageIndex = 1;
       this.getDataList();
     },
@@ -157,8 +157,8 @@ export default {
     },
     async open() {
       this.drawer = true;
-      this.dataForm = {  productName: "",
-        goodsType: "",};
+      this.dataForm = {  keywords: "",
+       };
       this.pageIndex = 1;
       // await this.getGoodsTypeList();
       await this.getDataList();
@@ -199,8 +199,9 @@ export default {
     // 获取数据列表
     async getDataList() {
       var form = {
+       type: this.type,
         ...this.dataForm,
-        current: this.pageIndex,
+        page: this.pageIndex,
         limit: this.pageSize,
 
         // productId: "",
@@ -210,15 +211,15 @@ export default {
      
       this.dataListLoading = true;
       this.clear();
-
+      
       await this.$http({
-        url: this.$http.adornUrl(`/master/shopProduct/listByPage`),
+        url: this.$http.adornUrl(`/master/shopProduct/getProductForApp`),
         method: "post",
         data: this.$http.adornData(form),
       }).then(({ data }) => {
         if (data && data.code === 0) {
-          this.dataList = data.result.records;
-          this.totalPage = data.result.total;
+          this.dataList = data.page.records;
+          this.totalPage = data.page.total;
         } else {
           this.dataList = [];
           this.totalPage = 0;