处理分页问题

gulpfile.js

@@ -32,14 +32,14 @@ gulp.task('create:versionCatalog', gulp.series('build', function () {
 // 替换${versionPath}/static/js/manifest.js window.SITE_CONFIG.cdnUrl占位变量
 gulp.task('replace:cdnUrl', gulp.series('create:versionCatalog', function () {
 	return gulp.src(`${versionPath}/static/js/manifest.js`)
-		.pipe($.revReplace(new RegExp(`"${require('./config').build.assetsPublicPath}"`, 'g'), 'window.SITE_CONFIG.cdnUrl + "/"'))
+		.pipe($.replace(new RegExp(`"${require('./config').build.assetsPublicPath}"`, 'g'), 'window.SITE_CONFIG.cdnUrl + "/"'))
 		.pipe(gulp.dest(`${versionPath}/static/js/`))
 }))
 
 // 替换${versionPath}/static/config/index-${env}.js window.SITE_CONFIG['version']配置变量
 gulp.task('replace:version', gulp.series('create:versionCatalog', function () {
 	return gulp.src(`${versionPath}/static/config/index-${env}.js`)
-		.pipe($.revReplace(/window.SITE_CONFIG\['version'\] = '.*'/g, `window.SITE_CONFIG['version'] = '${version}'`))
+		.pipe($.replace(/window.SITE_CONFIG\['version'\] = '.*'/g, `window.SITE_CONFIG['version'] = '${version}'`))
 		.pipe(gulp.dest(`${versionPath}/static/config/`))
 }))
 

src/api/announcement.js

@@ -0,0 +1,2 @@
+import {API1} from './classApi'
+export const $announcement=new API1('announcement')

src/api/classApi.js

@@ -25,4 +25,32 @@ class API {
 	}
 }
 
+export class API1 {
+    constructor(url) {
+        const map = {
+            add: 'POST',
+            del: 'DELETE',
+            update: 'PUT',
+            get: 'GET'
+        }
+        this.url = url
+        for (let key in map) {
+            this[key] = function (data) {
+                data = Array.isArray(data) ? data : {
+                    ...data
+                }
+                if (key === 'del') {
+                    
+                }
+                const par={ url:key==='get'?url+'/list':url, method: map[key] }
+                if(key==='get'){
+                    par.params=data
+                }else{
+                    par.data=data
+                }
+                return  $http(par)
+            }
+        }
+    }
+}
 export default API

src/api/withdraw.js

@@ -25,3 +25,16 @@ export function cashOutAuditAudit(data) {
 		data
 	});
 }
+
+/**
+ * 提现统计
+ * @param {*} params
+ * @returns
+ */
+export function summary_query(params) {
+	return $http({
+		url: "/cashOutAudit/alipay/transfer/summary/query",
+		method: "get",
+		params
+	});
+}

src/config/index.js

@@ -2,9 +2,10 @@ export const testUrl='video-admin';
 export const productUrl='dj-admin';
 
 // const baseUrl = "http://192.168.1.7:8100/czg/"
- const baseUrl = "https://video.hnsiyao.cn/czg/" //
 //  const baseUrl = "https://api.tianjinzhitongdaohe.com/czg/"
-// const baseUrl = "https://dj-api.hnsiyao.cn/czg/" // 线上
+
+ const baseUrl = "https://web-api.hnsiyao.cn/czg/" //测试
+// const baseUrl = "https://web.hnsiyao.cn/czg/" // 线上
 
 export default{
     baseUrl

src/utils/httpRequest.js

@@ -35,6 +35,7 @@ http.interceptors.request.use(config => {
 	// config.baseURL = $urlMap[$env]
 	const arr = config.url.split('czg/')
 	config.url = baseUrl + (arr.length >= 2 ? arr[1] : arr[0])
+	config.url = config.url.replace('czg//', 'czg/');
 	// config.url = "https://dj-api.hnsiyao.cn/czg/"
 	return config
 }, error => {

src/views/allocation/allocationList.vue

@@ -9,6 +9,13 @@
 					</el-table-column>
 					<el-table-column prop="value" label="内容" width="500">
 					</el-table-column>
+					<el-table-column label="是否返回给App">
+						<template slot-scope="scope">
+							<el-switch v-model="scope.row.isAppUse"
+							@change="updateAmendNotice($event,scope.row)"
+							:active-value="1" :inactive-value="0"></el-switch>
+						</template>
+					</el-table-column>
 					<el-table-column prop="createAt" label="创建时间">
 					</el-table-column>
 					<el-table-column label="操作" prop="id" width="120">
@@ -279,6 +286,10 @@
 					<el-input v-else v-model="form.value"  :rows="4" style="width:65%;"></el-input>
 					<!-- <el-input v-model="form.value" style="width:65%;"></el-input> -->
 				</el-form-item>
+
+				<el-form-item label="是否返回给App" :label-width="formLabelWidth">
+					<el-switch v-model="form.isAppUse" :active-value="1" :inactive-value="0"></el-switch>
+				</el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button @click="dialogFormVisible = false">取 消</el-button>
@@ -321,6 +332,7 @@
 					min: '',
 					value: '',
 					type: '',
+					isAppUse: false,
 				},
 				form2: {
 					id: '',
@@ -399,7 +411,7 @@
 					this.condition = 'kefu'
 					this.dataSelect()
 				}
-				
+
 			},
 			// 修改弹框
 			amend(index, rows) {
@@ -410,9 +422,37 @@
 				this.form.value = rows.value;
 				this.form.max = rows.max;
 				this.form.createAt = rows.createAt;
+				this.form.isAppUse = rows.isAppUse;
 				this.form.conditionFrom = rows.conditionFrom
 			},
+			updateAmendNotice(e,row){
+				this.$http({
+					url: this.$http.adornUrl('common/update'),
+					method: 'post',
+					data: this.$http.adornData({
+						...row,
+						isAppUse: e
+					})
+				}).then(({
+					data
+				}) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+							}
+						})
+						this.dataSelect()
+
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			},
 			// 修改
+
 			amendNoticeTo() {
 				this.$http({
 					url: this.$http.adornUrl('common/update'),
@@ -424,7 +464,8 @@
 						'min': this.form.min,
 						'max': this.form.max,
 						'createAt': this.form.createAt,
-						'conditionFrom': this.form.conditionFrom
+						'conditionFrom': this.form.conditionFrom,
+						isAppUse: this.form.isAppUse
 					})
 				}).then(({
 					data
@@ -436,9 +477,10 @@
 							type: 'success',
 							duration: 1500,
 							onClose: () => {
-								this.dataSelect()
 							}
 						})
+						this.dataSelect()
+
 					} else {
 						this.$message.error(data.msg)
 					}

src/views/app/app.vue

@@ -404,7 +404,7 @@ export default {
       console.log(data);
       const date = new Date();
       const houzhui = "." + data.name.substr(data.name.lastIndexOf(".") + 1);
-      const isTest=config.baseUrl.includes('dj-api.hnsiyao.cn')?false:true
+      const isTest=config.baseUrl.includes('web.hnsiyao.cn')?false:true
       const appName=isTest?'test-duanju':'sy-duanju'
       const name = "app/" + appName + houzhui;
       console.log(name);

src/views/common/home.vue

@@ -116,6 +116,7 @@
           </el-option> </el-select
         >&nbsp;&nbsp;&nbsp;
         <el-date-picker
+          v-if="flag == 1"
           style="width: 200px; margin-left: 10px"
           v-model="info.stockDate"
           align="right"
@@ -421,31 +422,24 @@
                 </div>
               </div>
             </el-col>
-			<el-col :span="6" class="cards">
+            <el-col :span="6" class="cards">
               <div class="box">
                 <div class="box_num">
                   <div class="box_color">提现次数</div>
                   <div class="text_color">
                     <span>{{
-                      orderStat.cashCount
-                        ? orderStat.cashCount
-                        : 0
-                    }}</span
-                    >
+                      orderStat.cashCount ? orderStat.cashCount : 0
+                    }}</span>
                   </div>
                 </div>
               </div>
             </el-col>
-			<el-col :span="6" class="cards">
+            <el-col :span="6" class="cards">
               <div class="box">
                 <div class="box_num">
                   <div class="box_color">提现总金额</div>
                   <div class="text_color">
-                    <span>{{
-                      orderStat.cashSum
-                        ? orderStat.cashSum
-                        : 0
-                    }}</span
+                    <span>{{ orderStat.cashSum ? orderStat.cashSum : 0 }}</span
                     >元
                   </div>
                 </div>

src/views/finance/components/withdraw-manage.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-form inline>
+        <el-form inline @submit.native.prevent="queryHandle">
             <el-form-item label="用户ID">
                 <el-input v-model="query.userId" placeholder="请输入用户ID" />
             </el-form-item>
@@ -31,8 +31,7 @@
             </el-form-item>
             <el-form-item label="日期">
                 <el-date-picker v-model="timeValue" type="datetimerange" range-separator="至" start-placeholder="开始日期"
-                    end-placeholder="结束日期" @change="changeTime"
-                    :default-time="['00:00:00', '23:59:59']">
+                    end-placeholder="结束日期" @change="changeTime" :default-time="['00:00:00', '23:59:59']">
                 </el-date-picker>
             </el-form-item>
             <el-form-item>
@@ -41,38 +40,37 @@
             </el-form-item>
         </el-form>
         <el-table v-loading="tableData.loading" :data="tableData.list" border stripe>
-            <el-table-column label="提现申请ID" prop="id"></el-table-column>
-            <el-table-column label="用户id" prop="userId"></el-table-column>
-            <el-table-column label="用户名" prop="userName"></el-table-column>
-            <el-table-column label="提现金额" prop="money">
+            <el-table-column label="ID" prop="id" width="80"></el-table-column>
+            <el-table-column label="用户ID" prop="userId" width="100"></el-table-column>
+            <el-table-column label="用户名" prop="userName" width="150"></el-table-column>
+            <el-table-column label="提现信息">
                 <template slot-scope="scope">
-                    ￥{{ scope.row.money }}
+                    <div>提现金额：￥{{ scope.row.money }}</div>
+                    <div>手续费：￥{{ scope.row.rate }}</div>
+                    <div style="margin-top: 6px;">
+                        提现类型：
+                        <span v-if="scope.row.userType == 1">用户提现</span>
+                        <span v-if="scope.row.userType == 2">代理提现</span>
+                    </div>
+                    <div>订单编号：{{ scope.row.orderNumber }}</div>
                 </template>
             </el-table-column>
-            <el-table-column label="手续费" prop="rate">
+            <el-table-column label="提现统计" width="200">
                 <template slot-scope="scope">
-                    ￥{{ scope.row.rate }}
+                    <div>成功提现金额：￥{{ scope.row.total }}</div>
+                    <div>成功提现次数：{{ scope.row.count }}</div>
+                    <div style="margin-top: 6px;">待审提现金额合计：￥{{ scope.row.verifyTotal }}</div>
+                    <div>待审提现申请笔数：{{ scope.row.verifyCount }}</div>
                 </template>
             </el-table-column>
-            <el-table-column label="是否转账" prop="isOut"></el-table-column>
-            <el-table-column label="会员编号" prop="relationId"></el-table-column>
-            <el-table-column label="支付宝信息" prop="zhifubao">
+            <el-table-column label="支付宝信息" prop="zhifubao" width="200">
                 <template slot-scope="scope">
                     {{ scope.row.zhifubaoName }} / {{ scope.row.zhifubao }}
                 </template>
             </el-table-column>
-            <el-table-column label="订单编号" prop="orderNumber"></el-table-column>
-            <el-table-column label="订单编号" prop="orderNumber"></el-table-column>
-            <el-table-column label="代理用户id" prop="sysUserId"></el-table-column>
-            <el-table-column label="提现类型" prop="userType">
-                <template slot-scope="scope">
-                    <span v-if="scope.row.userType == 1">用户提现</span>
-                    <span v-if="scope.row.userType == 2">代理提现</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="申请时间" prop="createAt"></el-table-column>
-            <el-table-column label="转账时间" prop="outAt"></el-table-column>
-            <el-table-column label="状态" prop="state">
+            <el-table-column label="申请时间" prop="createAt" width="200"></el-table-column>
+            <el-table-column label="转账时间" prop="outAt" width="200"></el-table-column>
+            <el-table-column label="状态" prop="state" width="200">
                 <template slot-scope="scope">
                     <el-tag type="warning" v-if="scope.row.state == 0" disable-transitions>
                         待转账
@@ -80,18 +78,20 @@
                     <el-tag type="success" v-if="scope.row.state == 1" disable-transitions>
                         成功
                     </el-tag>
-                    <template v-if="scope.row.state == 2">
-                        <el-tag type="danger" disable-transitions>
-                            失败
-                        </el-tag>
-                        原因: {{ scope.row.refund }}
-                    </template>
+                    <div style="display: flex;flex-direction: column;" v-if="scope.row.state == 2">
+                        <div>
+                            <el-tag type="danger" disable-transitions>
+                                失败
+                            </el-tag>
+                        </div>
+                        <div>原因：{{ scope.row.refund }}</div>
+                    </div>
                     <el-tag type="warning" v-if="scope.row.state == 3" disable-transitions>
                         待审核
                     </el-tag>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" width="100" fixed="right">
+            <el-table-column label="操作" align="center" width="100" fixed="right">
                 <template slot-scope="scope">
                     <el-button type="text" size="mini" @click="deliverHandle(scope.row)" v-if="scope.row.state == 3">
                         待审核
@@ -158,7 +158,8 @@ export default {
             form: {
                 id: "",
                 isAgree: "1",
-                refund: ""
+                refund: "",
+                userId:''
             },
             rules: {
                 isAgree: [],
@@ -180,6 +181,7 @@ export default {
         // 打开发放奖品弹窗
         deliverHandle(row) {
             this.form.id = row.id;
+            this.form.userId = row.userId
             this.visible = true;
         },
         // 提交发放奖品
@@ -205,7 +207,7 @@ export default {
         },
         // 开始查询
         queryHandle() {
-            this.page = 1;
+            this.tableData.page = 1;
             this.cashOutAuditPage();
         },
         // 重置查询

src/views/finance/components/withdrawTotal.vue

@@ -0,0 +1,277 @@
+<template>
+    <div>
+        <el-form inline @submit.native.prevent="queryHandle">
+            <!-- <el-form-item label="用户ID">
+                <el-input v-model="query.userId" placeholder="请输入用户ID" />
+            </el-form-item>
+            <el-form-item label="用户名">
+                <el-input v-model="query.userName" placeholder="请输入用户名" />
+            </el-form-item>
+            <el-form-item label="支付宝账号">
+                <el-input v-model="query.zhifubao" placeholder="请输入支付宝账号" />
+            </el-form-item> -->
+            <el-form-item>
+                <el-input v-model="query.alipayAccountName" placeholder="请输入支付宝账户姓名查询" />
+            </el-form-item>
+            <!-- <el-form-item label="提现类型">
+                <el-select v-model="query.userType">
+                    <el-option label="全部" value=""></el-option>
+                    <el-option label="用户提现" value="1"></el-option>
+                    <el-option label="分销商提现" value="2"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="状态">
+                <el-select v-model="query.state">
+                    <el-option label="全部" value=""></el-option>
+                    <el-option label="待转账" value="0"></el-option>
+                    <el-option label="成功" value="1"></el-option>
+                    <el-option label="失败" value="2"></el-option>
+                    <el-option label="待审核" value="3"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="日期">
+                <el-date-picker v-model="timeValue" type="datetimerange" range-separator="至" start-placeholder="开始日期"
+                    end-placeholder="结束日期" @change="changeTime" :default-time="['00:00:00', '23:59:59']">
+                </el-date-picker>
+            </el-form-item> -->
+            <el-form-item>
+                <el-button type="primary" @click="queryHandle">查询</el-button>
+                <el-button @click="resetHandle">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <el-row>
+            <el-col :span="6" class="cards">
+                <div class="box">
+                    <div class="box_num">
+                        <div class="box_color">成功提现次数合计</div>
+                        <div class="text_color">
+                            <span>{{ count }}</span>
+                        </div>
+                    </div>
+                </div>
+            </el-col>
+            <el-col :span="6" class="cards">
+                <div class="box">
+                    <div class="box_num">
+                        <div class="box_color">成功提现金额合计</div>
+                        <div class="text_color">
+                            <span>{{ totalMoney }}</span>元
+                        </div>
+                    </div>
+                </div>
+            </el-col>
+        </el-row>
+        <el-table v-loading="tableData.loading" :data="tableData.list" border stripe>
+            <el-table-column label="用户ID" prop="userId"></el-table-column>
+            <el-table-column label="用户名" prop="userName"></el-table-column>
+            <el-table-column label="手机号" prop="phone"></el-table-column>
+            <el-table-column label="邀请码" prop="inviterCode"></el-table-column>
+            <el-table-column label="提现小计" prop="subTotal">
+                <template slot-scope="scope">
+                    <div>提现金额：￥{{ scope.row.subTotal }}</div>
+                    <div>提现次数：{{ scope.row.subCount }}</div>
+                </template>
+            </el-table-column>
+            <el-table-column label="支付宝信息" prop="zhifubao">
+                <template slot-scope="scope">
+                    {{ scope.row.zhifubaoName }} / {{ scope.row.zhifubao }}
+                </template>
+            </el-table-column>
+        </el-table>
+        <!-- <div class="pagination">
+            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                :page-sizes="[10, 20, 30, 40]" :page-size="tableData.limit" :current-page="tableData.page"
+                layout="total" :total="tableData.total">
+            </el-pagination>
+        </div> -->
+        <el-dialog title="提现审核" width="600px" :visible.sync="visible" @close="onClose">
+            <el-form :model="form" :rules="rules" ref="form" label-width="80px" label-position="left">
+                <el-form-item label="审核" prop="isAgree">
+                    <el-radio-group v-model="form.isAgree">
+                        <el-radio label="1"> 同意 </el-radio>
+                        <el-radio label="0"> 拒绝 </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="备注" prop="refund" v-if="form.isAgree == 0">
+                    <el-input v-model="form.refund" placeholder="拒绝原因"></el-input>
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <div class="dialog-footer" style="display: flex; justify-content: flex-end;">
+                    <el-button size="small" @click="visible = false"> 取 消 </el-button>
+                    <el-button size="small" type="primary" :loading="confirmLoading"
+                        @click="confirmHandle">确定</el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import { summary_query } from "@/api/withdraw.js";
+export default {
+    data() {
+        return {
+            timeValue: [],
+            query: {
+                userId: "",
+                userName: "",
+                userType: '',
+                zhifubao: "",
+                zhifubaoName: "",
+                state: "",
+                startTime: "",
+                endTime: "",
+                alipayAccountName: ""
+            },
+            resetQuery: {},
+            count: 0,
+            totalMoney: 0,
+            tableData: {
+                page: 1,
+                limit: 10,
+                total: 0,
+                list: [],
+                loading: false
+            },
+            visible: false,
+            confirmLoading: false,
+            form: {
+                id: "",
+                isAgree: "1",
+                refund: ""
+            },
+            rules: {
+                isAgree: [],
+                refund: [
+                    { required: true, message: "请输入拒绝原因", trigger: "blur" }
+                ]
+            }
+        };
+    },
+    mounted() {
+        this.resetQuery = { ...this.query };
+        this.getTableData();
+    },
+    methods: {
+        // 关闭弹窗, 重置表单
+        onClose() {
+            this.$refs.form.resetFields();
+        },
+        // 打开发放奖品弹窗
+        deliverHandle(row) {
+            this.form.id = row.id;
+            this.visible = true;
+        },
+        // 提交发放奖品
+        confirmHandle() {
+            this.$refs.form.validate(async valid => {
+                if (valid) {
+                    this.confirmLoading = true;
+                    try {
+                        const { data } = await cashOutAuditAudit(this.form);
+                        if (data.code == 0) {
+                            this.$message.success("审核成功");
+                            this.visible = false;
+                            this.getTableData();
+                        } else {
+                            this.$message.error(data.msg || "审核失败");
+                        }
+                    } catch (error) {
+                        console.log(error);
+                    }
+                    this.confirmLoading = false;
+                }
+            });
+        },
+        // 开始查询
+        queryHandle() {
+            this.tableData.page = 1;
+            this.getTableData();
+        },
+        // 重置查询
+        resetHandle() {
+            this.query = { ...this.resetQuery };
+            this.timeValue = [];
+            this.getTableData();
+        },
+        // 确认选择日期
+        changeTime() {
+            if (this.timeValue.length == 2) {
+                this.query.startTime = this.timeValue[0];
+                this.query.endTime = this.timeValue[1];
+            } else {
+                this.query.startTime = "";
+                this.query.endTime = "";
+            }
+        },
+        // 分页数量
+        handleSizeChange(size) {
+            this.tableData.limit = size;
+            this.getTableData();
+        },
+        // 分页
+        handleCurrentChange(val) {
+            this.tableData.page = val;
+            this.getTableData();
+        },
+        // 获取列表
+        async getTableData() {
+            try {
+                this.tableData.loading = true;
+                const { data } = await summary_query({
+                    ...this.query
+                });
+                this.tableData.loading = false;
+                this.tableData.list = data.data.list;
+                this.tableData.total = data.data.count;
+
+                this.count = data.data.count;
+                this.totalMoney = data.data.sum;
+            } catch (error) {
+                this.tableData.loading = false;
+
+                this.tableData.list = [];
+                this.tableData.total = 0;
+
+                this.count = 0;
+                this.totalMoney = 0;
+
+                console.log('error===', error);
+            }
+        }
+    }
+};
+</script>
+
+<style scoped lang="scss">
+.box {
+    padding: 44px;
+    border: 1px solid #eee;
+    margin: 0 15px 25px 0;
+}
+
+.box_num {
+    font-size: 14px;
+    color: #66b1ff;
+}
+
+.box_num .box_color {
+    color: #333;
+    font-size: 14px;
+    margin-bottom: 15px;
+}
+
+.box_num div span {
+    font-size: 20px;
+    margin-left: 5px;
+}
+
+.text_color {
+    color: #4f9dec;
+}
+
+.text_color span {
+    margin-right: 5px;
+}
+</style>

src/views/finance/financeList.vue

@@ -4,6 +4,9 @@
       <el-tab-pane label="提现审核" name="withdraw">
         <WithdrawManage></WithdrawManage>
       </el-tab-pane>
+      <el-tab-pane label="支付宝提现统计" name="withdrawTotal">
+        <WithdrawTotal></WithdrawTotal>
+      </el-tab-pane>
       <!-- 拒绝弹框 -->
       <!-- <el-tab-pane label="提现管理" name="first">
         <div style="margin: 5px; display: inline-block">
@@ -562,9 +565,10 @@ import $disc from "@/api/disc-spinning.js";
 import popAddZhuanpan from "./components/pop-add-zhuanpan.vue";
 import popAddRedPack from "./components/pop-add-redPack.vue";
 import WithdrawManage from "./components/withdraw-manage.vue";
+import WithdrawTotal from './components/withdrawTotal.vue';
 import { $redPackApi } from "@/api/red-pack.js";
 export default {
-  components: { popAddZhuanpan, popAddRedPack, WithdrawManage },
+  components: { popAddZhuanpan, popAddRedPack, WithdrawManage, WithdrawTotal },
   data() {
     return {
       zhuanPanType: 1,
@@ -649,6 +653,7 @@ export default {
       sumMoneyByTime: "",
       money: "",
       activeName: "withdraw",
+      // activeName: 'withdrawTotal',
       formLabelWidth: "200px",
       dialogFormVisible: false,
       dialogFormVisible1: false,

src/views/message/components/pop-add-message.vue

@@ -0,0 +1,123 @@
+<template>
+  <el-dialog :title="title" width="500px" :visible.sync="dialogVisible" @close="diaClose"
+    :close-on-click-modal="true">
+    <div >
+      <el-form ref="form" :rules="rules" :model="form" label-width="100px">
+        <el-form-item label="标题"  prop="title">
+          <el-input v-model="form.title"></el-input>
+        </el-form-item>
+        <el-form-item label="内容"  prop="content">
+          <el-input v-model="form.content" type="textarea"></el-input>
+        </el-form-item>
+        <el-form-item label="状态" required>
+          <el-switch v-model="form.state" :active-value="1" :inactive-value="0"></el-switch>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <div class="dialog-footer">
+      <el-button @click="diaClose">取 消</el-button>
+      <el-button type="primary" @click="confirm">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import {$announcement as  $api} from "@/api/announcement.js";
+
+export default {
+  data() {
+    return {
+      dialogVisible: false,
+      title: "",
+      rules: {
+        title: [{ required: true, message: "请输入公告标题", trigger: "blur" }],
+        content: [{ required: true, message: "请输入公告内容", trigger: "blur" }],
+      },
+      form: {
+        title:'',
+        content:'',
+        state:1,
+      },
+    };
+  },
+  methods: {
+    open(item) {
+      console.log(item);
+      this.dialogVisible = true;
+      Object.assign(this.form, item);
+      this.title = item ? "修改公告" : "添加公告";
+    },
+    diaClose() {
+      this.dialogVisible = false;
+      this.form = {
+        title:'',
+        content:'',
+        state:1,
+      };
+      this.$refs.form.resetFields();
+    },
+    async confirm() {
+      if (!this.form.title) {
+        return this.$message.error("请输入公告标题");
+      }
+      if (!this.form.content) {
+        return this.$message.error("请输入公告内容");
+      }
+      this.submit();
+    },
+    async submit() {
+      let res = { data: { code: 1 } };
+      const submitForm = {
+        ...this.form,
+      };
+      if (this.form.id) {
+        res = await $api.update(submitForm);
+      } else {
+        res = await $api.add(submitForm);
+      }
+      console.log(res);
+      const { data } = res;
+      if (data.code == 0) {
+        this.$message.success(this.form.id ? "修改成功" : "添加成功");
+        this.$emit("refresh");
+        this.diaClose();
+      } else {
+        this.$message.error(data.msg);
+      }
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.el-form-item__label {
+  text-align: left;
+}
+
+::v-deep .el-form-item__label {
+  text-align: left;
+}
+
+.dialog-footer {
+  padding-top: 20px;
+  display: flex;
+  justify-content: flex-end;
+}
+
+.upload-file-box {
+  border-radius: 6px;
+  width: 148px;
+  height: 148px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  overflow: hidden;
+  border: 1px solid #c0c4cc;
+
+  img {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+  }
+}
+</style>

src/views/message/message.vue

@@ -1,135 +1,266 @@
 <template>
-	<el-tabs v-model="activeName" @tab-click="handleClick">
-		<el-tab-pane label="公告中心" name="first">
-			<div style="float: right;margin-right:2%;">
-				<el-button style="margin: 10px 0;" :disabled="!isAuth('message:add')" size="mini" type="primary"
-					icon="document" @click="addNotice">添加公告</el-button>
-			</div>
-			<el-table v-loading="tableDataLoading" :data="tableData.list">
-				<el-table-column prop="id" label="编号" width="80">
-				</el-table-column>
-				<el-table-column prop="title" label="标题">
-				</el-table-column>
-				<el-table-column prop="url" label="链接">
-				</el-table-column>
-				<el-table-column prop="type" label="类型">
-					<template slot-scope="scope">
-						<span style="color: #4f9dec;cursor: pointer;" v-if="scope.row.type === 'url' ">链接</span>
-						<span style="color: #4f9dec;cursor: pointer;" v-if="scope.row.type === 'word' ">文本</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="createAt" label="创建时间">
-				</el-table-column>
-				<el-table-column label="操作" width="150">
-					<template slot-scope="scope">
-						<el-button size="mini" type="primary" :disabled="!isAuth('message:update')"
-							@click="updates(scope.$index, scope.row)">修改
-						</el-button>
-						<el-button size="mini" type="danger" :disabled="!isAuth('message:delete')"
-							@click="deletes(scope.row)">删除
-						</el-button>
-					</template>
-				</el-table-column>
-			</el-table>
-			<div style="text-align: center;margin-top: 10px;">
-				<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-					:page-sizes="[5, 10, 15, 20]" :page-size="limit" :current-page="page"
-					layout="total,sizes, prev, pager, next,jumper" :total="tableData.totalElements">
-				</el-pagination>
-			</div>
-			<!-- 添加弹框 -->
-			<el-dialog title="添加公告" :visible.sync="dialogFormVisible" center>
-				<div style="margin-bottom: 10px;">
-					<span style="width: 200px;display: inline-block;text-align: right;">标题：</span>
-					<el-input style="width:50%;" v-model="title" placeholder="请输入公告标题"></el-input>
-				</div>
-				<div style="margin-bottom: 10px;" v-if="type=='url'">
-					<span style="width: 200px;display: inline-block;text-align: right;">链接：</span>
-					<el-input style="width: 50%;" v-model="url" placeholder="请输入公告链接"></el-input>
-				</div>
-				<div style="margin-bottom: 10px;">
-					<span style="width: 200px;display: inline-block;text-align: right;">类型：</span>
-					<el-select v-model="type" placeholder="请选择公告类型" style="width:50%;">
-						<el-option v-for="item in types" :key="item.value" :label="item.label" :value="item.value">
-						</el-option>
-					</el-select>
-				</div>
-				<div slot="footer" class="dialog-footer">
-					<el-button @click="dialogFormVisible = false">取 消</el-button>
-					<el-button type="primary" @click="releasNoticeTo()">确 定</el-button>
-				</div>
-			</el-dialog>
-			<!-- 修改弹框 -->
-			<el-dialog title="修改" :visible.sync="dialogFormVisible1" center>
-				<el-form :model="form">
-					<el-form-item label="标题：" :label-width="formLabelWidth">
-						<el-input v-model="form.title" style="width:65%;"></el-input>
-					</el-form-item>
-					<el-form-item label="链接：" :label-width="formLabelWidth">
-						<el-input v-model="form.url" style="width:65%;"></el-input>
-					</el-form-item>
-					<el-form-item label="类型：" :label-width="formLabelWidth">
-						<el-select v-model="form.type" placeholder="请选择类型" style="width:65%;">
-							<el-option v-for="item in types" :key="item.value" :label="item.label" :value="item.value">
-							</el-option>
-						</el-select>
-					</el-form-item>
-				</el-form>
-				<div slot="footer" class="dialog-footer">
-					<el-button @click="dialogFormVisible1 = false">取 消</el-button>
-					<el-button type="primary" @click="amendNoticeTo()">确 定</el-button>
-				</div>
-			</el-dialog>
-		</el-tab-pane>
-		<el-tab-pane label="用户反馈" name="two">
-			<el-table v-loading="tableDataLoading" :data="tableData.list">
-				<el-table-column prop="id" label="编号" width="80">
-				</el-table-column>
-				<el-table-column prop="title" label="联系方式">
-				</el-table-column>
-				<el-table-column prop="content" label="内容">
-				</el-table-column>
-				<el-table-column prop="createAt" label="创建时间" width="160">
-				</el-table-column>
-			</el-table>
-			<div style="text-align: center;margin-top: 10px;">
-				<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-					:page-sizes="[10, 20, 30, 40]" :page-size="limit" :current-page="page"
-					layout="total,sizes, prev, pager, next,jumper" :total="tableData.totalCount">
-				</el-pagination>
-			</div>
-		</el-tab-pane>
-		<el-tab-pane label="用户消息" name="fourth">
-			<div style="float: right;margin-right:2%;">
-				<el-button style='margin: 10px 0;' :disabled="!isAuth('message:push')" size="mini" type="primary"
-					icon="document" @click="magNotice">消息推送</el-button>
-			</div>
-			<el-table v-loading="tableDataLoading" :data="tableData.list">
-				<el-table-column prop="id" label="编号" width="80">
-				</el-table-column>
-				<el-table-column prop="userName" label="用户名称">
-				</el-table-column>
-				<el-table-column prop="title" label="消息标题">
-				</el-table-column>
-				<el-table-column prop="content" label="消息内容">
-				</el-table-column>
-				<el-table-column prop="createAt" label="创建时间">
-				</el-table-column>
-				<el-table-column label="操作">
-					<template slot-scope="scope">
-						<el-button size="mini" type="primary" @click="updataDetails(scope.row)">用户详情
-						</el-button>
-					</template>
-				</el-table-column>
-			</el-table>
-			<div style="text-align: center;margin-top: 10px;">
-				<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-					:page-sizes="[10, 20, 30, 40]" :page-size="limit" :current-page="page"
-					layout="total,sizes, prev, pager, next,jumper" :total="tableData.totalCount">
-				</el-pagination>
-			</div>
-		</el-tab-pane>
-		<!-- <el-tab-pane label="消息推送" name="seventh">
+  <div>
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="首页弹窗公告" name="dialogMessage">
+        <div style="float: right; margin-right: 2%">
+          <el-button
+            style="margin: 10px 0"
+            :disabled="!isAuth('message:add')"
+            size="mini"
+            type="primary"
+            icon="document"
+            @click="refPopAddMessageOpen()"
+            >添加公告</el-button
+          >
+        </div>
+        <el-table v-loading="tableDataLoading" :data="tableData.list">
+          <el-table-column prop="id" label="编号" width="80"> </el-table-column>
+          <el-table-column prop="title" label="标题"> </el-table-column>
+          <el-table-column prop="content" label="内容"> </el-table-column>
+          <el-table-column prop="content" label="是否启用">
+            <template slot-scope="scope">
+				<el-switch :value="scope.row.state" :active-value="1" :inactive-value="0" @change="dialogMessageUpdate($event, scope.row)"> </el-switch>
+			</template>
+			 </el-table-column>
+          <el-table-column prop="createTime" label="创建时间"> </el-table-column>
+          <el-table-column label="操作" width="150">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="primary"
+                :disabled="!isAuth('message:update')"
+                @click="refPopAddMessageOpen( scope.row)"
+                >修改
+              </el-button>
+              <el-button
+                size="mini"
+                type="danger"
+                :disabled="!isAuth('message:delete')"
+                @click="dialogMessagedeletes(scope.row)"
+                >删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style="text-align: center; margin-top: 10px" v-if="false">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[5, 10, 15, 20]"
+            :page-size="limit"
+            :current-page="page"
+            layout="total,sizes, prev, pager, next,jumper"
+            :total="tableData.totalElements"
+          >
+          </el-pagination>
+        </div>
+		<pop-add-message ref="refPopAddMessage" @refresh="getDialogMessage"></pop-add-message>
+
+      </el-tab-pane>
+      <el-tab-pane label="公告中心" name="first">
+        <div style="float: right; margin-right: 2%">
+          <el-button
+            style="margin: 10px 0"
+            :disabled="!isAuth('message:add')"
+            size="mini"
+            type="primary"
+            icon="document"
+            @click="addNotice"
+            >添加公告</el-button
+          >
+        </div>
+        <el-table v-loading="tableDataLoading" :data="tableData.list">
+          <el-table-column prop="id" label="编号" width="80"> </el-table-column>
+          <el-table-column prop="title" label="标题"> </el-table-column>
+          <el-table-column prop="url" label="链接"> </el-table-column>
+          <el-table-column prop="type" label="类型">
+            <template slot-scope="scope">
+              <span
+                style="color: #4f9dec; cursor: pointer"
+                v-if="scope.row.type === 'url'"
+                >链接</span
+              >
+              <span
+                style="color: #4f9dec; cursor: pointer"
+                v-if="scope.row.type === 'word'"
+                >文本</span
+              >
+            </template>
+          </el-table-column>
+          <el-table-column prop="createAt" label="创建时间"> </el-table-column>
+          <el-table-column label="操作" width="150">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="primary"
+                :disabled="!isAuth('message:update')"
+                @click="updates(scope.$index, scope.row)"
+                >修改
+              </el-button>
+              <el-button
+                size="mini"
+                type="danger"
+                :disabled="!isAuth('message:delete')"
+                @click="deletes(scope.row)"
+                >删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style="text-align: center; margin-top: 10px">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[5, 10, 15, 20]"
+            :page-size="limit"
+            :current-page="page"
+            layout="total,sizes, prev, pager, next,jumper"
+            :total="tableData.totalElements"
+          >
+          </el-pagination>
+        </div>
+        <!-- 添加弹框 -->
+        <el-dialog title="添加公告" :visible.sync="dialogFormVisible" center>
+          <div style="margin-bottom: 10px">
+            <span style="width: 200px; display: inline-block; text-align: right"
+              >标题：</span
+            >
+            <el-input
+              style="width: 50%"
+              v-model="title"
+              placeholder="请输入公告标题"
+            ></el-input>
+          </div>
+          <div style="margin-bottom: 10px" v-if="type == 'url'">
+            <span style="width: 200px; display: inline-block; text-align: right"
+              >链接：</span
+            >
+            <el-input
+              style="width: 50%"
+              v-model="url"
+              placeholder="请输入公告链接"
+            ></el-input>
+          </div>
+          <div style="margin-bottom: 10px">
+            <span style="width: 200px; display: inline-block; text-align: right"
+              >类型：</span
+            >
+            <el-select
+              v-model="type"
+              placeholder="请选择公告类型"
+              style="width: 50%"
+            >
+              <el-option
+                v-for="item in types"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </div>
+          <div slot="footer" class="dialog-footer">
+            <el-button @click="dialogFormVisible = false">取 消</el-button>
+            <el-button type="primary" @click="releasNoticeTo()"
+              >确 定</el-button
+            >
+          </div>
+        </el-dialog>
+        <!-- 修改弹框 -->
+        <el-dialog title="修改" :visible.sync="dialogFormVisible1" center>
+          <el-form :model="form">
+            <el-form-item label="标题：" :label-width="formLabelWidth">
+              <el-input v-model="form.title" style="width: 65%"></el-input>
+            </el-form-item>
+            <el-form-item label="链接：" :label-width="formLabelWidth">
+              <el-input v-model="form.url" style="width: 65%"></el-input>
+            </el-form-item>
+            <el-form-item label="类型：" :label-width="formLabelWidth">
+              <el-select
+                v-model="form.type"
+                placeholder="请选择类型"
+                style="width: 65%"
+              >
+                <el-option
+                  v-for="item in types"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-form>
+          <div slot="footer" class="dialog-footer">
+            <el-button @click="dialogFormVisible1 = false">取 消</el-button>
+            <el-button type="primary" @click="amendNoticeTo()">确 定</el-button>
+          </div>
+        </el-dialog>
+      </el-tab-pane>
+      <el-tab-pane label="用户反馈" name="two">
+        <el-table v-loading="tableDataLoading" :data="tableData.list">
+          <el-table-column prop="id" label="编号" width="80"> </el-table-column>
+          <el-table-column prop="title" label="联系方式"> </el-table-column>
+          <el-table-column prop="content" label="内容"> </el-table-column>
+          <el-table-column prop="createAt" label="创建时间" width="160">
+          </el-table-column>
+        </el-table>
+        <div style="text-align: center; margin-top: 10px">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="limit"
+            :current-page="page"
+            layout="total,sizes, prev, pager, next,jumper"
+            :total="tableData.totalCount"
+          >
+          </el-pagination>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="用户消息" name="fourth">
+        <div style="float: right; margin-right: 2%">
+          <el-button
+            style="margin: 10px 0"
+            :disabled="!isAuth('message:push')"
+            size="mini"
+            type="primary"
+            icon="document"
+            @click="magNotice"
+            >消息推送</el-button
+          >
+        </div>
+        <el-table v-loading="tableDataLoading" :data="tableData.list">
+          <el-table-column prop="id" label="编号" width="80"> </el-table-column>
+          <el-table-column prop="userName" label="用户名称"> </el-table-column>
+          <el-table-column prop="title" label="消息标题"> </el-table-column>
+          <el-table-column prop="content" label="消息内容"> </el-table-column>
+          <el-table-column prop="createAt" label="创建时间"> </el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="primary"
+                @click="updataDetails(scope.row)"
+                >用户详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style="text-align: center; margin-top: 10px">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="limit"
+            :current-page="page"
+            layout="total,sizes, prev, pager, next,jumper"
+            :total="tableData.totalCount"
+          >
+          </el-pagination>
+        </div>
+      </el-tab-pane>
+      <!-- <el-tab-pane label="消息推送" name="seventh">
 			<el-table v-loading="tableDataLoading" :data="tableData.list">
 				<el-table-column fixed prop="id" label="编号" width="80">
 				</el-table-column>
@@ -155,39 +286,77 @@
 				</el-pagination>
 			</div>
 		</el-tab-pane> -->
-		<!-- 消息推送 -->
-		<el-dialog title="消息推送" :visible.sync="dialogFormVisible2" center>
-			<div style="margin-bottom: 10px;">
-				<span style="width: 200px;display: inline-block;text-align: right;">类型：</span>
-				<el-select v-model="flag" placeholder="请选择类型" style="width:50%">
-					<el-option v-for="item in flags" :key="item.value" :label="item.label" :value="item.value">
-					</el-option>
-				</el-select>&nbsp;&nbsp;&nbsp;&nbsp;
-			</div>
-			<div style="margin-bottom: 10px;" v-if="flag == 1">
-				<span style="width: 200px;display: inline-block;text-align: right;">用户手机号：</span>
-				<el-input style="width: 50%;" v-model="phone" placeholder="请输入用户手机号"></el-input>
-			</div>
-			<div style="margin-bottom: 10px;">
-				<span style="width: 200px;display: inline-block;text-align: right;">消息标题：</span>
-				<el-input style="width: 50%;" v-model="title" placeholder="请输入消息标题"></el-input>
-			</div>
-			<div style="margin-bottom: 10px;">
-				<span
-					style="width: 200px;display: inline-block;text-align: right;position: relative;top: -65px;">消息内容：</span>
-				<el-input style="width: 50%;" type="textarea" rows="4" v-model="content" placeholder="请输入消息内容">
-				</el-input>
-			</div>
-			<div slot="footer" class="dialog-footer">
-				<el-button @click="dialogFormVisible2 = false">取 消</el-button>
-				<el-button type="primary" @click="magNoticeTo()">确 定</el-button>
-			</div>
-		</el-dialog>
-	</el-tabs>
+      <!-- 消息推送 -->
+      <el-dialog title="消息推送" :visible.sync="dialogFormVisible2" center>
+        <div style="margin-bottom: 10px">
+          <span style="width: 200px; display: inline-block; text-align: right"
+            >类型：</span
+          >
+          <el-select v-model="flag" placeholder="请选择类型" style="width: 50%">
+            <el-option
+              v-for="item in flags"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option> </el-select
+          >&nbsp;&nbsp;&nbsp;&nbsp;
+        </div>
+        <div style="margin-bottom: 10px" v-if="flag == 1">
+          <span style="width: 200px; display: inline-block; text-align: right"
+            >用户手机号：</span
+          >
+          <el-input
+            style="width: 50%"
+            v-model="phone"
+            placeholder="请输入用户手机号"
+          ></el-input>
+        </div>
+        <div style="margin-bottom: 10px">
+          <span style="width: 200px; display: inline-block; text-align: right"
+            >消息标题：</span
+          >
+          <el-input
+            style="width: 50%"
+            v-model="title"
+            placeholder="请输入消息标题"
+          ></el-input>
+        </div>
+        <div style="margin-bottom: 10px">
+          <span
+            style="
+              width: 200px;
+              display: inline-block;
+              text-align: right;
+              position: relative;
+              top: -65px;
+            "
+            >消息内容：</span
+          >
+          <el-input
+            style="width: 50%"
+            type="textarea"
+            rows="4"
+            v-model="content"
+            placeholder="请输入消息内容"
+          >
+          </el-input>
+        </div>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="dialogFormVisible2 = false">取 消</el-button>
+          <el-button type="primary" @click="magNoticeTo()">确 定</el-button>
+        </div>
+      </el-dialog>
+    </el-tabs>
+
+  </div>
 </template>
 
 <script>
+import {$announcement} from '@/api/announcement';
+import  popAddMessage from './components/pop-add-message.vue';
 	export default {
+		components:{popAddMessage},
 		data() {
 			return {
 				limit: 10,
@@ -235,7 +404,7 @@
 					}
 				],
 				formLabelWidth: '200px',
-				activeName: 'first',
+				activeName: 'dialogMessage',
 				tableDataLoading: false,
 				dialogFormVisible1: false,
 				dialogFormVisible2: false,
@@ -244,6 +413,36 @@
 			}
 		},
 		methods: {
+			dialogMessageUpdate(e,item){
+				$announcement.update({...item,state:e}).then(({
+					data
+				}) => {
+					this.getDialogMessage()
+				})
+			},
+			// 删除首页弹窗公告
+			dialogMessagedeletes(row) {
+				let delid = row.id
+				this.$confirm(`确定删除此条信息?`, '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(() => {
+					$announcement.del({id:delid}).then(({
+						data
+					}) => {
+						this.$message({
+							message: '删除成功',
+							type: 'success',
+							duration: 1500
+						})
+						this.getDialogMessage()	
+					})
+				}).catch(() => {})
+			},
+			refPopAddMessageOpen(item){
+				this.$refs.refPopAddMessage.open(item)
+			},
 			// 详情跳转
 			updataDetails(row) {
 				this.$router.push({
@@ -261,7 +460,24 @@
 				this.page = val;
 				this.dataSelect()
 			},
+			getDialogMessage() {
+				this.tableDataLoading = true
+				$announcement.get({
+					page: this.page,
+					limit: this.limit
+				}).then(({data}) => {
+					console.log(data)
+					this.tableDataLoading = false
+					this.tableData = {list:data.data}
+				})
+			},
 			handleClick(tab, event) {
+				if (tab._props.label == '首页弹窗公告') {
+					this.page = 1
+					this.limit = 10
+					this.state = 1
+					this.getDialogMessage()
+				}
 				if (tab._props.label == '公告中心') {
 					this.page = 1
 					this.limit = 10
@@ -404,6 +620,10 @@
 			},
 			// 获取数据列表
 			dataSelect() {
+				if(this.activeName == 'dialogMessage'){
+					this.getDialogMessage()
+					return
+				}
 				this.tableDataLoading = true
 				this.$http({
 					url: this.$http.adornUrl(`message/page/${this.state}/${this.page}/${this.limit}`),
@@ -583,5 +803,4 @@
 </script>
 
 <style>
-
 </style>

src/views/renwu/components/pop-gift-list.vue

@@ -139,7 +139,7 @@ export default {
         limit: this.limit,
       });
       this.tableData = data.data.records;
-      this.total = data.data.total;
+      this.total = data.data.totalCount;
     },
     del(item) {
       this.$confirm("是否删除该任务?", "提示", {

src/views/renwu/index.vue

@@ -118,8 +118,8 @@ export default {
         this.$message.error(res.data.msg || '修改失败')
       }
     },
-    handleSizeChange() {
-      this.page = 1;
+    handleSizeChange(limit) {
+      this.limit = limit;
       this.init();
     },
     handleCurrentChange(val) {
@@ -127,8 +127,8 @@ export default {
       this.init();
     },
     returnJumpTypeName(type) {
-      console.log(type)
-      console.log($jumpType[type])
+      // console.log(type)
+      // console.log($jumpType[type])
       return $jumpType[type] ? $jumpType[type] : "";
     },
     returnTypeName(type) {
@@ -141,7 +141,7 @@ export default {
         limit: this.limit,
       });
       this.tableData = data.data.records;
-      this.total = data.data.total;
+      this.total = data.data.totalCount;
     },
     del(item) {
       this.$confirm("是否删除该任务?", "提示", {

src/views/riderTop/riderTop.vue

@@ -57,7 +57,7 @@
 		<div style="text-align: center;margin-top: 10px;">
 			<el-pagination @size-change="handleSizeChange1" @current-change="handleCurrentChange1"
 				:page-sizes="[10, 20, 30, 40]" :page-size="size" :current-page="page"
-				layout="total,sizes, prev, pager, next,jumper" :total="homeData.total">
+				layout="total,sizes, prev, pager, next,jumper" :total="homeData.totalCount">
 			</el-pagination>
 		</div>