diff --git a/src/api/system/coupon.js b/src/api/system/coupon.js
index 9b81337..2a6ef03 100644
--- a/src/api/system/coupon.js
+++ b/src/api/system/coupon.js
@@ -42,3 +42,12 @@ export function delCoupon(couponId) {
     method: 'delete'
   })
 }
+
+// 派发优惠券
+export function issueCoupon(data) {
+  return request({
+    url: '/system/coupon/issue',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/views/system/coupon/index.vue b/src/views/system/coupon/index.vue
index 7fea81b..2689b55 100644
--- a/src/views/system/coupon/index.vue
+++ b/src/views/system/coupon/index.vue
@@ -84,6 +84,7 @@
     <el-table v-loading="loading" :data="couponList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="优惠券id" align="center" prop="couponId" />
+      <el-table-column label="运营区" align="center" prop="areaName" />
       <el-table-column label="名称" align="center" prop="name" />
       <el-table-column label="类型" align="center" prop="type">
         <template slot-scope="scope">
@@ -96,16 +97,28 @@
         </template>
       </el-table-column>
       <el-table-column label="折扣比例" align="center" prop="discountPercent" :formatter="formatDiscountPercent"/>
-      <el-table-column label="运营区" align="center" prop="areaName" />
       <el-table-column label="抵扣金额" align="center" prop="discountAmount"  :formatter="formatDiscountAmount"/>
       <el-table-column label="零售价" align="center" prop="retailPrice"  :formatter="formatRetailPrice"/>
+      <el-table-column label="原价" align="center" prop="originalPrice"  :formatter="formatOriginalPrice"/>
+      <el-table-column label="有效期" align="center" >
+        <template slot-scope="scope">
+          {{ formatValidity(scope.row.validityValue, scope.row.validityUnit) }}
+        </template>
+      </el-table-column>
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-present"
+            @click="distributeCoupons(scope.row)"
+            v-hasPermi="['system:coupon:present']"
+          >派发</el-button>
           <el-button
             size="mini"
             type="text"
@@ -178,6 +191,9 @@
         <el-form-item label="零售价" prop="retailPrice">
           <el-input-number v-model='form.retailPrice' :precision="2" :step="0.1" />元
         </el-form-item>
+        <el-form-item label="原价" prop="originalPrice">
+          <el-input-number v-model='form.originalPrice' :precision="2" :step="0.1" />元
+        </el-form-item>
         <el-row>
           <el-col :span="12">
             <el-form-item label="是否热门" prop="isHot">
@@ -185,36 +201,103 @@
             </el-form-item>
           </el-col>
         </el-row>
-<!--        <el-form-item label="有效时间" prop="expirationTime">-->
-<!--          <el-date-picker clearable-->
-<!--            v-model="form.expirationTime"-->
-<!--            type="date"-->
-<!--            value-format="yyyy-MM-dd HH:mm:ss"-->
-<!--            placeholder="请选择有效时间">-->
-<!--          </el-date-picker>-->
-<!--        </el-form-item>-->
+        <el-form-item label="描述" prop="descr">
+          <el-input v-model="form.descr" type="textarea" placeholder="用于前端展示" />
+        </el-form-item>
+        <el-form-item label="有效期" prop="validityValue">
+          <el-input v-model="form.validityValue" placeholder="请输入有效期" type="number">
+            <template #append>
+              <el-select v-model="form.validityUnit" placeholder="请选择时间单位" style="width: 6em">
+                <el-option
+                  v-for="dict in dict.type.et_validity_unit"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </template>
+          </el-input>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :title="title3" :visible.sync="open3" width="1000px" append-to-body>
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="手机号码" prop="phonenumber">
+          <el-input
+            v-model="queryParams.phonenumber"
+            placeholder="请输入手机号码"
+            clearable
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQueryUser">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+
+      <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange2">
+        <el-table-column type="selection" width="50" align="center" />
+        <el-table-column label="用户名称" align="center" key="userName" prop="userName" width="100" />
+        <el-table-column label="手机号" align="center" key="phonenumber" prop="phonenumber" width="100" />
+        <el-table-column label="移动端" align="center" key="appName" prop="appName" width="120" />
+        <el-table-column label="最后登录时间" align="center" prop="createTime" width="160">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.loginDate) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="注册时间" align="center" prop="createTime" width="160">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" align="center" key="status" >
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.status"
+              active-value="0"
+              inactive-value="1"
+              @change="handleStatusChange(scope.row)"
+            ></el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否实名" align="center" prop="isAuthentication">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.et_user_is_authentication" :value="scope.row.isAuthentication" />
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitIssueForm">派 发</el-button>
+        <el-button @click="cancel3">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listCoupon, getCoupon, delCoupon, addCoupon, updateCoupon } from "@/api/system/coupon";
+  import { listCoupon, getCoupon, delCoupon, addCoupon, updateCoupon, issueCoupon } from '@/api/system/coupon'
 import { optionselect as getAreaOptionselect } from '@/api/system/area'
+import { changeUserStatus, listUser } from '@/api/user/user'
 
 export default {
   name: "Coupon",
-  dicts: ['et_coupon_type', 'et_coupon_status','et_coupon_time_limit','sys_normal_disable'],
+  dicts: ['et_coupon_type', 'et_coupon_status','et_coupon_time_limit','sys_normal_disable','et_validity_unit','et_user_is_authentication'],
   data() {
     return {
       // 遮罩层
       loading: true,
       // 选中数组
       ids: [],
+      userIds: [],
+      couponId: null,
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -227,10 +310,16 @@ export default {
       couponList: [],
       // 弹出层标题
       title: "",
+      title3: "",
       // 是否显示弹出层
       open: false,
+      open3: false,
       // 分区列表
       areaOptions:[],
+      // 日期范围
+      dateRange: [],
+      // 用户表格数据
+      userList: null,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -241,6 +330,10 @@ export default {
         userId: null,
         discountAmount: null,
         retailPrice: null,
+        originalPrice: null,
+        descr: null,
+        validityValue: null,
+        validityUnit: null,
         expirationTime: null,
         status: null
       },
@@ -248,9 +341,24 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        // userId: [
-        //   { required: true, message: "用户不能为空", trigger: "blur" }
-        // ],
+        areaId: [
+          { required: true, message: '运营区不能为空', trigger: 'blur' },
+        ],
+        name: [
+          { required: true, message: '名称不能为空', trigger: 'blur' },
+        ],
+        type: [
+          { required: true, message: '类型不能为空', trigger: 'change' },
+        ],
+        retailPrice: [
+          { required: true, message: '零售价不能为空', trigger: 'blur' },
+        ],
+        validityValue: [
+          { required: true, message: '有效期值不能为空', trigger: 'blur' },
+        ],
+        validityUnit: [
+          { required: true, message: '有效期单位不能为空', trigger: 'change' },
+        ],
       }
     };
   },
@@ -261,6 +369,30 @@ export default {
     });
   },
   methods: {
+    // 用户状态修改
+    handleStatusChange(row) {
+      let text = row.status === "0" ? "启用" : "停用";
+      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
+        return changeUserStatus(row.userId, row.status);
+      }).then(() => {
+        this.$modal.msgSuccess(text + "成功");
+      }).catch(function() {
+        row.status = row.status === "0" ? "1" : "0";
+      });
+    },
+    /** 派发优惠券 */
+    distributeCoupons(row){
+      this.couponId = row.couponId;
+      this.reset();
+      this.open3 = true;
+      this.title3 = "派发优惠券";
+      this.resetQuery();
+      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+          this.userList = response.rows;
+          this.total = response.total;
+        }
+      );
+    },
     // 方法：将 discountPercent 转换为整数格式用于显示
     convertDiscountPercentToInteger() {
       // 判断 discountPercent 是否为空或不是数值
@@ -270,6 +402,20 @@ export default {
         this.form.discountPercent = ''; // 如果为空或不是数值，设为默认显示
       }
     },
+    formatValidity(value, unit) {
+      if (value == null || unit == null) {
+        return '';
+      }
+      const unitLabel = this.dict.type.et_validity_unit.find(item => item.value === unit)?.label || '';
+      const formattedUnitLabel = (unitLabel === '月' || unitLabel === '季度') ? `个${unitLabel}` : unitLabel;
+      return formattedUnitLabel ? `${value}${formattedUnitLabel}` : '';
+    },
+    formatOriginalPrice(row){
+      if (row.originalPrice === null || row.originalPrice === '') {
+        return '';
+      }
+      return row.originalPrice + '元';
+    },
     formatRetailPrice(row){
       if (row.retailPrice === null || row.retailPrice === '') {
         return '';
@@ -303,6 +449,11 @@ export default {
       this.open = false;
       this.reset();
     },
+    // 取消按钮
+    cancel3() {
+      this.open3 = false;
+      this.reset();
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -323,6 +474,14 @@ export default {
       this.queryParams.pageNum = 1;
       this.getList();
     },
+    handleQueryUser(){
+      this.loading = true;
+      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+          this.userList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+    },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
@@ -334,6 +493,11 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
+    handleSelectionChange2(selection) {
+      this.userIds = selection.map(item => item.userId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
@@ -379,6 +543,16 @@ export default {
         }
       });
     },
+    /** 提交派发 */
+    submitIssueForm() {
+      const userId = this.userIds;
+      // console.log("userId---------------",userId)
+      // console.log("this.couponId============",this.couponId)
+      issueCoupon({userIds:userId, couponId:this.couponId}).then(response => {
+        this.open3 = false;
+        this.$modal.msgSuccess("派发成功");
+      });
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const couponIds = row.couponId || this.ids;
diff --git a/src/views/user/user/index.vue b/src/views/user/user/index.vue
index a04dac6..686d992 100644
--- a/src/views/user/user/index.vue
+++ b/src/views/user/user/index.vue
@@ -145,22 +145,22 @@
               <dict-tag :options="dict.type.et_user_is_authentication" :value="scope.row.isAuthentication" />
             </template>
           </el-table-column>
-          <el-table-column
-            label="操作"
-            align="center"
-            width="240"
-            class-name="small-padding fixed-width">
-            <template slot-scope="scope">
-              <el-button
-                size="mini"
-                plain
-                type="text"
-                icon="el-icon-present"
-                @click="distributeCoupons(scope.row)"
-                v-hasPermi="['system:user:edit']"
-              >派发优惠券</el-button>
-            </template>
-          </el-table-column>
+<!--          <el-table-column-->
+<!--            label="操作"-->
+<!--            align="center"-->
+<!--            width="240"-->
+<!--            class-name="small-padding fixed-width">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-button-->
+<!--                size="mini"-->
+<!--                plain-->
+<!--                type="text"-->
+<!--                icon="el-icon-present"-->
+<!--                @click="distributeCoupons(scope.row)"-->
+<!--                v-hasPermi="['system:user:edit']"-->
+<!--              >派发优惠券</el-button>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
         </el-table>
 
         <pagination
@@ -318,6 +318,7 @@
         </el-form-item>
       <el-table v-loading="loading" :data="couponList" @selection-change="handleSelectionChange2">
         <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="运营区" align="center" prop="areaName" />
         <el-table-column label="类型" align="center" prop="type">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.et_coupon_type" :value="scope.row.type"/>
@@ -329,14 +330,9 @@
           </template>
         </el-table-column>
         <el-table-column label="折扣比例" align="center" prop="discountPercent" :formatter="formatDiscountPercent"/>
-        <el-table-column label="运营区" align="center" prop="areaName" />
-        <el-table-column label="用户" align="center" prop="userName" width="120"/>
         <el-table-column label="抵扣金额" align="center" prop="discountAmount"  :formatter="formatDiscountAmount"/>
-        <el-table-column label="有效期" align="center" prop="validityValue" width="180">
-          <template slot-scope="scope">
-            <span>{{ formatValidity(scope.row)}}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="零售价" align="center" prop="retailPrice"  :formatter="formatRetailPrice"/>
+        <el-table-column label="原价" align="center" prop="originalPrice"  :formatter="formatOriginalPrice"/>
         <el-table-column label="状态" align="center" prop="status">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
@@ -519,6 +515,18 @@ export default {
         this.areaOptions = response.data;
       });
     },
+    formatOriginalPrice(row){
+      if (row.originalPrice === null || row.originalPrice === '') {
+        return '';
+      }
+      return row.originalPrice + '元';
+    },
+    formatRetailPrice(row){
+      if (row.retailPrice === null || row.retailPrice === '') {
+        return '';
+      }
+      return row.retailPrice + '元';
+    },
     formatValidity(row){
       let selectDictLabel = this.selectDictLabel(this.dict.type.et_validity_unit, row.validityUnit)
       if (selectDictLabel != null) {