活动

src/views/activity/component/addActivity.vue

@@ -590,7 +590,7 @@ export default {
           phone_number:this.form.phoneNumber,
           group:this.form.group,
           start_member_sum:this.form.startMemberSum,
-          member_sum:this.form.member_sum,
+          member_sum:this.form.memberSum,
           content:this.form.content,
           great_services:this.form.greatServices,
           // money:this.form.money,

src/views/activity/component/showActiveOrder.vue

@@ -63,15 +63,25 @@ export default {
             width: 120
           },
           {
-            prop: "address",
+            prop: "area",
             label: "区域",
             width: 120
           },
+          {
+            prop: "address",
+            label: "地址",
+            width: 120
+          },
           {
             prop: "budget_date",
             label: "预产期",
             // width: 120
-          }
+          },
+          {
+            prop: "hospital",
+            label: "建卡医院",
+            width: 120
+          },
       ],
     }
   },

src/views/productService/components/addProduct.vue

@@ -194,6 +194,10 @@
     </xy-dialog>
 
     <Modal v-model="isShowMerchantSelect" title="所属商户选择">
+      <div class="searchMerchants">
+        <el-input type="text" v-model="merchantKeyword" placeholder="请输入关键词查找商户"></el-input>
+        <el-button type="primary" @click="searchMerchants">查询</el-button>
+      </div>
       <Table size="small" highlight-row ref="currentRowTable" :columns="merchantTable" :data="merchants"
         @on-current-change="merchantSelect" />
       <Page :current="merchantIndex" :total="merchantTotal" simple
@@ -339,6 +343,7 @@
             sortable: true
           }
         ],
+        merchantKeyword:"",
         merchantIndex: 1,
         merchantTotal: 0,
       }
@@ -407,11 +412,15 @@
       async getMerchants() {
         const res = await merchantIndex({
           page_size: 10,
-          page: this.merchantIndex
+          page: this.merchantIndex,
+          keyword:this.merchantKeyword
         })
         this.merchantTotal = res.total
         this.merchants = res.data
       },
+      searchMerchants(){
+        this.getMerchants()
+      },
       merchantPageChange(e) {
         this.merchantIndex = e
         this.getMerchants()
@@ -514,6 +523,15 @@
       text-align: left !important;
     }
   }
+  .searchMerchants{
+    display: flex;
+    justify-content: space-between;
+    margin-bottom:16px;
+    .el-input{
+      width:80%
+    }
+  }
+
 </style>
 
 <style>

vue.config.js

@@ -25,7 +25,7 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   publicPath: '/admin/',
-  outputDir: '/Users/liuxiangyu/Work/yunyubang/yunyubang-service/public/admin',
+  outputDir: '/Users/mac/Documents/朗业/2022/y-孕育邦/后端代码/yunyubang/public/admin',
   assetsDir: 'static',
   css: {
     loaderOptions: { // 向 CSS 相关的 loader 传递选项