1

src/api/member/active/index.js

@@ -18,6 +18,15 @@ export function attendActive(data) {
   })
 }
 
+// 获得营销活动分页
+export function joinActive(params) {
+  return request({
+    url: '/base/customer-active/list',
+    method: 'get',
+    params
+  })
+}
+
 // 更新营销活动
 export function updateActiveMain(data) {
   return request({

src/views/base/customer/CustomerMember.vue

@@ -3,7 +3,7 @@
     <!--  会员信息  -->
     <el-row>
       <el-col  :span="18">
-        <el-card style="height: 165px; overflow: hidden;" >
+        <el-card style="height: 170px; overflow: hidden;" >
           <div slot="header" class="clearfix">
             <span style="font-weight: bold; font-size: 16px;">{{ formData.levelName }}</span>
           </div>
@@ -77,7 +77,7 @@
         </el-card>
       </el-col>
       <el-col  :span="6">
-        <el-card style="height: 165px; overflow: hidden;" >
+        <el-card style="height: 170px; overflow: hidden;" >
           <div slot="header" class="clearfix">
             <span style="font-weight: bold; font-size: 16px;">余额/积分</span>
           </div>
@@ -179,15 +179,25 @@
             <span>{{ parseTime(scope.row.endTime) }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="是否可重复参与" align="center" prop="endTime" width="150">
+          <template v-slot="scope">
+            <span v-if="scope.row.isParticipate == '1'">可重复参与</span>
+            <span v-else>不可重复参与</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="参与情况" align="center" prop="endTime" width="150">
+          <template v-slot="scope">
+            <span v-if="scope.row.isJoin == '1'">已参与</span>
+            <span v-else>未参与</span>
+          </template>
+        </el-table-column>
         <el-table-column width="100" label="操作" align="center" class-name="small-padding fixed-width">
           <template v-slot="scope">
-            <el-button size="mini" type="text" icon="el-icon-present" @click="openActive(scope.row)">参与活动</el-button>
+            <el-button :disabled="scope.row.isParticipate != '1' && scope.row.isJoin == '1'" size="mini" type="text" icon="el-icon-present" @click="openActive(scope.row)">参与活动</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <!-- 分页组件 -->
-      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                  @pagination="getActiveList"/>
+
     </el-card>
     <ReceiveCouponForm @success="getById(param.id)"  ref="receiveCouponForm"/>
     <RuchForm @success="getById(param.id)"  ref="RuchFormRef"/>
@@ -217,15 +227,15 @@ export default {
       total: 0,
       // 查询参数
       queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        isNow:'1'
+        isNow:'1',
+        cusId:'',
       },
     };
   },
   created() {
     const row = this.$route.query.row
     this.param = row
+    this.queryParams.cusId = row.id
     this.getById(row.id)
     this.getActiveList()
 
@@ -240,9 +250,8 @@ export default {
     async getActiveList() {
       try {
         this.loading = true;
-        const res = await ActiveMainApi.getActiveMainPage(this.queryParams);
-        this.list = res.data.records;
-        this.total = res.data.total;
+        const res = await ActiveMainApi.joinActive(this.queryParams);
+        this.list = res.data;
       } finally {
         this.loading = false;
       }

src/views/base/customer/index.vue

@@ -11,7 +11,6 @@
         <CorpCustomer :typeCode="activeName" ref="corpRef" />
       </el-tab-pane>
     </el-tabs>
-
   </div>
 </template>
 

src/views/repair/orderinfo/index.vue

@@ -26,13 +26,7 @@
 
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-                   :loading="exportLoading"
-                   v-hasPermi="['repair:order-info:export']">导出
-        </el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>
     </el-row>
 
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">