From 0d0e67818a45161af14114211f43aafd232a6da2 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 27 一月 2026 10:52:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/memberCoupon.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/business/memberCoupon.vue b/admin/src/views/business/memberCoupon.vue
index 71f5b44..18a6639 100644
--- a/admin/src/views/business/memberCoupon.vue
+++ b/admin/src/views/business/memberCoupon.vue
@@ -2,7 +2,7 @@
<TableLayout :permissions="['business:membercoupon:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="鐢ㄦ埛" prop="nikeName">
+ <el-form-item label="鐢ㄦ埛" prop="nikeName" >
<el-input v-model="searchForm.nikeName" placeholder="璇疯緭鍏ョ敤鎴锋樀绉�/鎵嬫満鍙� " clearable @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="浼樻儬鍒稿悕绉�" prop="name">
@@ -39,7 +39,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:membercoupon:create', 'business:membercoupon:exportExcel']">
- <li><el-button type="primary" @click="$refs.OperaMemberCouponWindow.open('鏂板缓', null)" v-permissions="['business:membercoupon:create']">瀹氬悜鍙戞斁</el-button></li>
+ <li><el-button type="primary" @click="$refs.OperaMemberCouponWindow.open('瀹氬悜鍙戞斁浼樻儬鍒�', null)" v-permissions="['business:membercoupon:create']">瀹氬悜鍙戞斁</el-button></li>
<li> <el-button type="primary" :loading="isWorking.export" v-permissions="['business:membercoupon:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
</ul>
<el-table
@@ -47,7 +47,7 @@
:data="tableData.list"
stripe
>
- <el-table-column prop="nikeName" label="鐢ㄦ埛" min-width="100px"></el-table-column>
+ <el-table-column prop="nikeName" label="鐢ㄦ埛" min-width="180px"></el-table-column>
<el-table-column prop="name" label="浼樻儬鍒稿悕绉�" min-width="100px"></el-table-column>
<el-table-column prop="couponType" label="浼樻儬鍒哥被鍨�" min-width="100px">
<template slot-scope="{row}">
--
Gitblit v1.9.3