瀏覽代碼

☑1. 后台举报投诉
☑2. 店铺的门头照logo新增字段
☑3. 协议那个分类按表里的重新归类一下type
☑4. 广告表ad调整,后台管理系统适配

罗永浩 3 月之前
父節點
當前提交
08acefbae4

+ 13 - 0
addons/admin/src/views/store/store.vue

@@ -71,6 +71,13 @@
 				<template slot-scope="{index}">
 					<el-table-column type="selection" width="45" align="center" fixed="left" />
 					<el-table-column prop="id" label="ID" width="60" align="center" fixed="left" show-overflow-tooltip />
+					<el-table-column label="门头照" width="100" align="center">
+						<template slot-scope="{row}">
+							<el-image v-if="row.logo" :src="row.logo" style="width: 60px; height: 60px;" fit="cover"
+								:preview-src-list="[row.logo]" />
+							<span v-else>-</span>
+						</template>
+					</el-table-column>
 					<el-table-column prop="name" label="商家名称" min-width="150" show-overflow-tooltip />
 					<el-table-column prop="category_name" label="商家分类" min-width="120" show-overflow-tooltip />
 					<el-table-column prop="real_name" label="联系姓名" min-width="120" show-overflow-tooltip />
@@ -153,6 +160,12 @@
 							<span>{{ infoForm.address || '未填写' }}</span>
 						</el-form-item>
 					</el-col>
+					<el-col :sm="24" v-if="infoForm.logo">
+						<el-form-item label="门头照:">
+							<el-image :src="infoForm.logo" style="width: 200px; height: auto;"
+								:preview-src-list="[infoForm.logo]" />
+						</el-form-item>
+					</el-col>
 					<el-col :sm="12">
 						<el-form-item label="入驻时间:">
 							<span>{{ infoForm.create_time }}</span>

+ 202 - 39
addons/admin/src/views/system/ad/index.vue

@@ -5,16 +5,34 @@
       <el-form :model="table.where" label-width="90px" class="ele-form-search"
                @keyup.enter.native="$refs.table.reload()" @submit.native.prevent>
         <el-row :gutter="15">
-          <el-col :md="6" :sm="12">
+          <el-col :md="4" :sm="12">
             <el-form-item label="广告标题:">
               <el-input v-model="table.where.title" placeholder="请输入广告标题" clearable/>
             </el-form-item>
           </el-col>
+          <el-col :md="4" :sm="12">
+            <el-form-item label="广告位置:">
+              <el-select v-model="table.where.position" placeholder="请选择广告位置" clearable class="ele-block">
+                <el-option label="全部" :value="0"/>
+                <el-option label="主页轮播图" :value="1"/>
+                <el-option label="会员中心占位图" :value="2"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :md="4" :sm="12">
+            <el-form-item label="状态:">
+              <el-select v-model="table.where.status" placeholder="请选择状态" clearable class="ele-block">
+                <el-option label="全部" :value="0"/>
+                <el-option label="在用" :value="1"/>
+                <el-option label="停用" :value="2"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :md="6" :sm="12">
             <div class="ele-form-actions">
               <el-button type="primary" @click="$refs.table.reload()" icon="el-icon-search" class="ele-btn-icon">查询
               </el-button>
-              <el-button @click="(table.where={})&&$refs.table.reload()">重置</el-button>
+              <el-button @click="handleReset">重置</el-button>
             </div>
           </el-col>
         </el-row>
@@ -33,23 +51,51 @@
           <el-table-column type="index" :index="index" label="编号" width="60" align="center" fixed="left" show-overflow-tooltip/>
           <el-table-column label="广告封面" min-width="100" align="center">
             <template slot-scope="{row}">
-              <el-avatar shape="square" :size="25" :src="row.cover"/>
+              <el-image v-if="row.cover" :src="row.cover" style="width: 60px; height: 60px;" fit="cover"
+                :preview-src-list="[row.cover]" />
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="title" label="广告标题" sortable="custom" show-overflow-tooltip min-width="150"/>
+          <el-table-column prop="description" label="广告描述" show-overflow-tooltip min-width="150"/>
+          <el-table-column prop="position" label="广告位置" sortable="custom" show-overflow-tooltip min-width="120" align="center">
+            <template slot-scope="{row}">
+              <el-tag v-if="row.position == 1" type="success" size="small">主页轮播图</el-tag>
+              <el-tag v-else-if="row.position == 2" type="info" size="small">会员中心占位图</el-tag>
+              <span v-else>-</span>
             </template>
           </el-table-column>
-          <el-table-column prop="title" label="广告标题" sortable="custom" show-overflow-tooltip min-width="200"/>
-          <el-table-column prop="position" label="所属广告位" sortable="custom" show-overflow-tooltip min-width="200">
+          <el-table-column label="跳转类型" min-width="100" align="center">
             <template slot-scope="{row}">
-             <span class="ele-text-primary" v-if="row.position == 1">首页</span>
+              <el-tag v-if="row.link_type == 1" type="primary" size="small">默认</el-tag>
+              <el-tag v-else-if="row.link_type == 2" type="warning" size="small">小程序</el-tag>
             </template>
           </el-table-column>
-          <el-table-column prop="url" label="广告地址" show-overflow-tooltip min-width="200" align="center"/>
-          <el-table-column prop="status" label="状态" sortable min-width="100">
+          <el-table-column prop="url" label="广告链接" show-overflow-tooltip min-width="180" align="center"/>
+          <el-table-column label="尺寸" min-width="100" align="center">
             <template slot-scope="{row}">
-              <ele-dot :type="['danger', 'success'][row.status]" :ripple="row.status===0"
-                        :text="['禁用','正常'][row.status]"/>
+              <span v-if="row.width && row.height">{{ row.width }}x{{ row.height }}</span>
+              <span v-else>-</span>
             </template>
           </el-table-column>
-          <el-table-column prop="sort" label="排序" sortable="custom" show-overflow-tooltip/>
+          <el-table-column label="投放时间" show-overflow-tooltip min-width="180" align="center">
+            <template slot-scope="{row}">
+              <div v-if="row.start_time">
+                <div>{{ row.start_time }}</div>
+                <div style="color: #909399;">至</div>
+                <div>{{ row.end_time || '长期' }}</div>
+              </div>
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="view_num" label="点击次数" sortable="custom" min-width="100" align="center"/>
+          <el-table-column prop="status" label="状态" sortable min-width="80" align="center">
+            <template slot-scope="{row}">
+              <el-switch v-model="row.status" @change="editStatus(row)" :active-value="1" :inactive-value="2"
+                active-color="#13ce66" inactive-color="#ff4949" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="sort" label="排序" sortable="custom" show-overflow-tooltip min-width="80" align="center"/>
           <el-table-column label="创建时间" sortable="custom" show-overflow-tooltip min-width="160">
             <template slot-scope="{row}">{{ row.create_time | toDateString }}</template>
           </el-table-column>
@@ -65,41 +111,106 @@
       </ele-data-table>
     </el-card>
     <!-- 编辑弹窗 -->
-    <el-dialog :title="editForm.id?'修改广告':'修改广告'" :visible.sync="showEdit" width="700px"
-               @closed="editForm={status: 1,position: 1}" :destroy-on-close="true" custom-class="ele-dialog-form" :lock-scroll="false">
-      <el-form :model="editForm" ref="editForm" :rules="editRules" label-width="100px">
-        <el-form-item label="广告图片:">
-          <uploadImage :limit="1" v-model="editForm.cover"></uploadImage>
-        </el-form-item>
+    <el-dialog :title="editForm.id?'修改广告':'添加广告'" :visible.sync="showEdit" width="800px"
+               @closed="editForm={status: 1,position: 1,link_type: 1,sort: 125}" :destroy-on-close="true" custom-class="ele-dialog-form" :lock-scroll="false">
+      <el-form :model="editForm" ref="editForm" :rules="editRules" label-width="120px">
         <el-row :gutter="15">
           <el-col :sm="12">
             <el-form-item label="广告标题:" prop="title">
               <el-input v-model="editForm.title" placeholder="请输入广告标题" clearable/>
             </el-form-item>
-            <el-form-item label="广告URL:" prop="url">
-              <el-input v-model="editForm.url" placeholder="请输入广告URL" clearable/>
+          </el-col>
+          <el-col :sm="12">
+            <el-form-item label="广告位置:" prop="position">
+              <el-select v-model="editForm.position" placeholder="请选择广告位置" class="ele-block" clearable>
+                <el-option label="主页轮播图" :value="1"/>
+                <el-option label="会员中心占位图" :value="2"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-form-item label="广告图片:" prop="cover">
+          <uploadImage :limit="1" v-model="editForm.cover"></uploadImage>
+          <div style="color: #909399; font-size: 12px; margin-top: 5px;">建议尺寸:根据广告位置选择合适尺寸</div>
+        </el-form-item>
+
+        <el-form-item label="广告描述:">
+          <el-input v-model="editForm.description" type="textarea" :rows="3" placeholder="请输入广告描述(选填)" maxlength="150" show-word-limit/>
+        </el-form-item>
+
+        <el-row :gutter="15">
+          <el-col :sm="12">
+            <el-form-item label="跳转类型:" prop="link_type">
+              <el-radio-group v-model="editForm.link_type">
+                <el-radio :label="1">默认链接</el-radio>
+                <el-radio :label="2">小程序</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :sm="12">
+            <el-form-item label="广告状态:" prop="status">
+              <el-radio-group v-model="editForm.status">
+                <el-radio :label="1">在用</el-radio>
+                <el-radio :label="2">停用</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-form-item v-if="editForm.link_type == 1" label="广告链接:" prop="url">
+          <el-input v-model="editForm.url" placeholder="请输入广告链接URL" clearable/>
+        </el-form-item>
+
+        <el-row :gutter="15" v-if="editForm.link_type == 2">
+          <el-col :sm="12">
+            <el-form-item label="小程序APPID:" prop="mp_appid">
+              <el-input v-model="editForm.mp_appid" placeholder="请输入小程序APPID" clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :sm="12">
+            <el-form-item label="小程序页面:" prop="url">
+              <el-input v-model="editForm.url" placeholder="请输入小程序页面路径" clearable/>
             </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="15">
+          <el-col :sm="8">
+            <el-form-item label="广告宽度:">
+              <el-input-number v-model="editForm.width" controls-position="right" :min="0"
+                                placeholder="宽度(px)" class="ele-fluid ele-text-left"/>
+            </el-form-item>
+          </el-col>
+          <el-col :sm="8">
+            <el-form-item label="广告高度:">
+              <el-input-number v-model="editForm.height" controls-position="right" :min="0"
+                                placeholder="高度(px)" class="ele-fluid ele-text-left"/>
+            </el-form-item>
+          </el-col>
+          <el-col :sm="8">
             <el-form-item label="排序号:" prop="sort">
               <el-input-number v-model="editForm.sort" controls-position="right" :min="0"
-                                placeholder="请输入排序号" class="ele-fluid ele-text-left"/>
+                                placeholder="排序号" class="ele-fluid ele-text-left"/>
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <el-row :gutter="15">
           <el-col :sm="12">
-            <el-form-item label="广告位" prop="position" :rules="{
-                    required: true, message: '所属广告位不能为空', trigger: 'change'
-                  }">
-              <el-select v-model="editForm.position" placeholder="请选择广告位" class="ele-block" clearable>
-                <el-option label="首页轮播" :value="1"/>
-              </el-select>
+            <el-form-item label="开始时间:" prop="start_time">
+              <el-date-picker v-model="editForm.start_time" type="datetime" placeholder="选择开始时间"
+                class="ele-block" value-format="yyyy-MM-dd HH:mm:ss" />
             </el-form-item>
-            <el-form-item label="广告状态:">
-              <el-radio-group v-model="editForm.status">
-                <el-radio :label="1">正常</el-radio>
-                <el-radio :label="2">禁用</el-radio>
-              </el-radio-group>
+          </el-col>
+          <el-col :sm="12">
+            <el-form-item label="结束时间:">
+              <el-date-picker v-model="editForm.end_time" type="datetime" placeholder="选择结束时间(不选则长期有效)"
+                class="ele-block" value-format="yyyy-MM-dd HH:mm:ss" />
             </el-form-item>
           </el-col>
         </el-row>
+
       </el-form>
       <div slot="footer">
         <el-button @click="showEdit=false">取消</el-button>
@@ -120,21 +231,50 @@ export default {
       table: {url: '/ad/index', where: {}},  // 表格配置
       choose: [],  // 表格选中数据
       showEdit: false,  // 是否显示表单弹窗
-      editForm: {status:1,position: 1},  // 表单数据
+      editForm: {status:1,position: 1,link_type: 1,sort: 125},  // 表单数据
       editRules: {  // 表单验证规则
         title: [
           {required: true, message: '请输入广告标题', trigger: 'blur'}
         ],
         position: [
-          {required: true, message: '请选择所属广告位', trigger: 'blur'}
+          {required: true, message: '请选择广告位置', trigger: 'change'}
         ],
-        type: [
-          {required: true, message: '请选择广告类型', trigger: 'blur'}
+        cover: [
+          {required: true, message: '请上传广告图片', trigger: 'change'}
         ],
-
+        link_type: [
+          {required: true, message: '请选择跳转类型', trigger: 'change'}
+        ],
+        url: [
+          {
+            validator: (rule, value, callback) => {
+              if (this.editForm.link_type == 1 && !value) {
+                callback(new Error('请输入广告链接'));
+              } else if (this.editForm.link_type == 2 && !value) {
+                callback(new Error('请输入小程序页面路径'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'blur'
+          }
+        ],
+        mp_appid: [
+          {
+            validator: (rule, value, callback) => {
+              if (this.editForm.link_type == 2 && !value) {
+                callback(new Error('请输入小程序APPID'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'blur'
+          }
+        ],
+        start_time: [
+          {required: true, message: '请选择开始时间', trigger: 'change'}
+        ]
       },
-      // 广告位列表
-      adSortList:[],
     }
   },
   computed: {
@@ -144,6 +284,11 @@ export default {
 
   },
   methods: {
+    /* 重置搜索 */
+    handleReset() {
+      this.table.where = {};
+      this.$refs.table.reload();
+    },
     /* 显示编辑 */
     edit(row) {
       this.editForm = Object.assign({}, row);
@@ -172,6 +317,24 @@ export default {
         }
       });
     },
+    /* 修改状态 */
+    editStatus(row) {
+      this.$message.closeAll();
+      const loading = this.$loading({ lock: true });
+      this.$http.post('/ad/status', { id: row.id, status: row.status }).then(res => {
+        loading.close();
+        if (res.data.code === 0) {
+          this.$message({ type: 'success', message: res.data.msg });
+        } else {
+          row.status = row.status === 1 ? 2 : 1;
+          this.$message.error(res.data.msg);
+        }
+      }).catch(e => {
+        loading.close();
+        row.status = row.status === 1 ? 2 : 1;
+        this.$message.error(e.message);
+      });
+    },
     /* 删除 */
     remove(row) {
       if (!row) {  // 批量删除
@@ -216,4 +379,4 @@ export default {
 .ele-block >>> .el-upload, .ele-block >>> .el-upload-dragger {
   width: 100%;
 }
-</style>
+</style>

+ 352 - 35
addons/admin/src/views/system/complaint/index.vue

@@ -73,37 +73,115 @@
 		</el-card>
 
 		<!-- 查看详情弹窗 -->
-		<el-dialog title="投诉详情" :visible.sync="showDetail" width="700px" :destroy-on-close="true"
-			custom-class="ele-dialog-form">
+		<el-dialog title="投诉详情" :visible.sync="showDetail" width="800px" :destroy-on-close="true"
+			custom-class="complaint-detail-dialog" top="5vh">
 			<div v-if="detailData.id" class="detail-content">
-				<el-descriptions :column="2" border>
-					<el-descriptions-item label="ID">{{ detailData.id }}</el-descriptions-item>
-					<el-descriptions-item label="状态">
-						<el-tag v-if="detailData.status === 1" type="warning">待处理</el-tag>
-						<el-tag v-else-if="detailData.status === 2" type="success">已处理</el-tag>
-					</el-descriptions-item>
-					<el-descriptions-item label="姓名">{{ detailData.realname }}</el-descriptions-item>
-					<el-descriptions-item label="联系电话">{{ detailData.mobile }}</el-descriptions-item>
-					<el-descriptions-item label="用户昵称" :span="2">{{ detailData.user_name || '-' }}</el-descriptions-item>
-					<el-descriptions-item label="反馈内容" :span="2">
-						<div style="white-space: pre-wrap;">{{ detailData.content }}</div>
-					</el-descriptions-item>
-					<el-descriptions-item label="图片" :span="2" v-if="detailData.albums_array && detailData.albums_array.length > 0">
-						<div class="image-list">
-							<el-image v-for="(img, index) in detailData.albums_array" :key="index" :src="img"
-								style="width: 100px; height: 100px; margin-right: 10px;" fit="cover"
-								:preview-src-list="detailData.albums_array" />
+				<!-- 头部信息卡片 -->
+				<div class="detail-header">
+					<div class="header-item">
+						<div class="header-label">投诉ID</div>
+						<div class="header-value">#{{ detailData.id }}</div>
+					</div>
+					<div class="header-item">
+						<div class="header-label">状态</div>
+						<div class="header-value">
+							<el-tag v-if="detailData.status === 1" type="warning" size="medium">待处理</el-tag>
+							<el-tag v-else-if="detailData.status === 2" type="success" size="medium">已处理</el-tag>
 						</div>
-					</el-descriptions-item>
-					<el-descriptions-item label="处理备注" :span="2" v-if="detailData.remark">
-						<div style="white-space: pre-wrap;">{{ detailData.remark }}</div>
-					</el-descriptions-item>
-					<el-descriptions-item label="提交时间">{{ detailData.create_time }}</el-descriptions-item>
-					<el-descriptions-item label="更新时间">{{ detailData.update_time }}</el-descriptions-item>
-				</el-descriptions>
+					</div>
+					<div class="header-item">
+						<div class="header-label">提交时间</div>
+						<div class="header-value">{{ detailData.create_time }}</div>
+					</div>
+				</div>
+
+				<!-- 用户信息 -->
+				<div class="detail-section">
+					<div class="section-title">
+						<i class="el-icon-user"></i> 用户信息
+					</div>
+					<div class="info-card">
+						<div class="info-row">
+							<div class="info-item">
+								<div class="info-label">姓名</div>
+								<div class="info-value">{{ detailData.realname }}</div>
+							</div>
+							<div class="info-item">
+								<div class="info-label">联系电话</div>
+								<div class="info-value">{{ detailData.mobile }}</div>
+							</div>
+						</div>
+						<div class="info-row">
+							<div class="info-item full-width">
+								<div class="info-label">用户昵称</div>
+								<div class="info-value">{{ detailData.user_name || '-' }}</div>
+							</div>
+						</div>
+					</div>
+				</div>
+
+				<!-- 反馈内容 -->
+				<div class="detail-section">
+					<div class="section-title">
+						<i class="el-icon-chat-line-square"></i> 反馈内容
+					</div>
+					<div class="content-box">
+						{{ detailData.content }}
+					</div>
+				</div>
+
+				<!-- 图片 -->
+				<div class="detail-section" v-if="detailData.albums_array && detailData.albums_array.length > 0">
+					<div class="section-title">
+						<i class="el-icon-picture"></i> 相关图片
+					</div>
+					<div class="image-gallery">
+						<el-image v-for="(img, index) in detailData.albums_array" :key="index" :src="img"
+							class="gallery-image" fit="cover" :preview-src-list="detailData.albums_array">
+							<div slot="error" class="image-slot">
+								<i class="el-icon-picture-outline"></i>
+							</div>
+						</el-image>
+					</div>
+				</div>
+
+				<!-- 处理信息 -->
+				<div class="detail-section" v-if="detailData.remark">
+					<div class="section-title">
+						<i class="el-icon-document"></i> 处理备注
+					</div>
+					<div class="remark-box">
+						{{ detailData.remark }}
+					</div>
+				</div>
+
+				<!-- 时间信息 -->
+				<div class="detail-section">
+					<div class="section-title">
+						<i class="el-icon-time"></i> 时间信息
+					</div>
+					<div class="info-card">
+						<div class="info-row">
+							<div class="info-item">
+								<div class="info-label">
+									<i class="el-icon-time"></i> 提交时间
+								</div>
+								<div class="info-value">{{ detailData.create_time }}</div>
+							</div>
+							<div class="info-item">
+								<div class="info-label">
+									<i class="el-icon-time"></i> 更新时间
+								</div>
+								<div class="info-value">{{ detailData.update_time }}</div>
+							</div>
+						</div>
+					</div>
+				</div>
 			</div>
-			<div slot="footer">
-				<el-button @click="showDetail = false">关闭</el-button>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" size="medium" @click="showDetail = false">
+					<i class="el-icon-check"></i> 关闭
+				</el-button>
 			</div>
 		</el-dialog>
 
@@ -250,21 +328,260 @@ export default {
 };
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .status-tabs {
 	margin-bottom: 15px;
+
+	::v-deep .el-tabs__header {
+		margin: 0 0 15px;
+	}
 }
 
-.status-tabs>>>.el-tabs__header {
-	margin: 0 0 15px;
+// 详情弹窗样式
+::v-deep .complaint-detail-dialog {
+	.el-dialog__header {
+		background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+		padding: 20px;
+
+		.el-dialog__title {
+			color: white;
+			font-size: 18px;
+			font-weight: bold;
+		}
+
+		.el-dialog__headerbtn .el-dialog__close {
+			color: white;
+			font-size: 20px;
+
+			&:hover {
+				color: #f0f0f0;
+			}
+		}
+	}
+
+	.el-dialog__body {
+		padding: 20px;
+		background: #f5f7fa;
+		max-height: 70vh;
+		overflow-y: auto;
+
+		// 美化滚动条
+		&::-webkit-scrollbar {
+			width: 6px;
+		}
+
+		&::-webkit-scrollbar-thumb {
+			background-color: #dcdfe6;
+			border-radius: 3px;
+
+			&:hover {
+				background-color: #c0c4cc;
+			}
+		}
+	}
+
+	.el-dialog__footer {
+		padding: 15px 20px;
+		background: #fff;
+		border-top: 1px solid #e4e7ed;
+	}
 }
 
 .detail-content {
-	padding: 10px;
+	.detail-header {
+		display: flex;
+		justify-content: space-around;
+		margin-bottom: 20px;
+		background: white;
+		border-radius: 8px;
+		padding: 20px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+
+		.header-item {
+			text-align: center;
+			flex: 1;
+
+			&:not(:last-child) {
+				border-right: 1px solid #e4e7ed;
+			}
+
+			.header-label {
+				font-size: 13px;
+				color: #909399;
+				margin-bottom: 10px;
+			}
+
+			.header-value {
+				font-size: 16px;
+				font-weight: bold;
+				color: #303133;
+			}
+		}
+	}
+
+	.detail-section {
+		margin-bottom: 25px;
+
+		.section-title {
+			font-size: 16px;
+			font-weight: bold;
+			color: #303133;
+			margin-bottom: 15px;
+			padding: 8px 0 8px 12px;
+			border-left: 4px solid #409eff;
+
+			i {
+				margin-right: 8px;
+				color: #409eff;
+				font-size: 18px;
+			}
+		}
+
+		::v-deep .el-descriptions {
+			background: white;
+			border-radius: 8px;
+			overflow: hidden;
+			box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+
+			.el-descriptions-item__label {
+				background: #fafafa;
+				font-weight: 500;
+				color: #606266;
+				padding: 15px 20px !important;
+			}
+
+			.el-descriptions-item__content {
+				color: #303133;
+				padding: 15px 20px !important;
+			}
+		}
+
+		.info-card {
+			background: white;
+			border-radius: 8px;
+			box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+			overflow: hidden;
+
+			.info-row {
+				display: flex;
+				border-bottom: 1px solid #ebeef5;
+
+				&:last-child {
+					border-bottom: none;
+				}
+
+				.info-item {
+					flex: 1;
+					display: flex;
+					border-right: 1px solid #ebeef5;
+
+					&:last-child {
+						border-right: none;
+					}
+
+					&.full-width {
+						flex: 1 0 100%;
+					}
+
+					.info-label {
+						background: #fafafa;
+						padding: 15px 20px;
+						font-weight: 500;
+						color: #606266;
+						min-width: 120px;
+						display: flex;
+						align-items: center;
+
+						i {
+							margin-right: 5px;
+						}
+					}
+
+					.info-value {
+						padding: 15px 20px;
+						color: #303133;
+						flex: 1;
+						display: flex;
+						align-items: center;
+					}
+				}
+			}
+		}
+
+		.content-box {
+			background: white;
+			border-radius: 8px;
+			padding: 25px;
+			box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+			line-height: 2;
+			color: #606266;
+			font-size: 14px;
+			white-space: pre-wrap;
+			word-break: break-all;
+			min-height: 80px;
+		}
+
+		.remark-box {
+			background: #fff9e6;
+			border-radius: 8px;
+			padding: 25px;
+			box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+			line-height: 2;
+			color: #606266;
+			font-size: 14px;
+			white-space: pre-wrap;
+			word-break: break-all;
+			border-left: 4px solid #e6a23c;
+			min-height: 80px;
+		}
+
+		.image-gallery {
+			display: flex;
+			flex-wrap: wrap;
+			gap: 15px;
+			background: white;
+			border-radius: 8px;
+			padding: 20px;
+			box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+
+			.gallery-image {
+				width: 140px;
+				height: 140px;
+				border-radius: 8px;
+				overflow: hidden;
+				cursor: pointer;
+				transition: transform 0.3s;
+				box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+
+				&:hover {
+					transform: scale(1.05);
+					box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+				}
+
+				.image-slot {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					width: 100%;
+					height: 100%;
+					background: #f5f7fa;
+					color: #909399;
+					font-size: 30px;
+				}
+			}
+		}
+	}
 }
 
-.image-list {
-	display: flex;
-	flex-wrap: wrap;
+.dialog-footer {
+	text-align: center;
+
+	.el-button {
+		min-width: 120px;
+
+		i {
+			margin-right: 5px;
+		}
+	}
 }
 </style>

+ 9 - 0
app/Http/Controllers/Admin/AdController.php

@@ -34,4 +34,13 @@ class AdController extends Backend
         parent::__construct();
         $this->service = new AdService();
     }
+
+    /**
+     * 修改状态
+     */
+    public function status()
+    {
+        $result = $this->service->status();
+        return json($result);
+    }
 }

+ 1 - 0
app/Models/ComplaintModel.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;

+ 98 - 3
app/Services/Common/AdService.php

@@ -75,16 +75,111 @@ class AdService extends BaseService
     public function edit()
     {
         $data = request()->all();
+
         // 图片处理
         if(isset($data['cover'])){
             $data['cover'] = get_image_path($data['cover']);
         }
 
-        // 结束时间
-        if (isset($data['end_time'])) {
+        // 开始时间处理
+        if (isset($data['start_time']) && $data['start_time']) {
+            $data['start_time'] = strtotime($data['start_time']);
+        }
+
+        // 结束时间处理
+        if (isset($data['end_time']) && $data['end_time']) {
             $data['end_time'] = strtotime($data['end_time']);
+        } else {
+            $data['end_time'] = 0; // 0 表示长期有效
+        }
+
+        // 如果是默认链接类型,清空小程序相关字段
+        if (isset($data['link_type']) && $data['link_type'] == 1) {
+            $data['mp_appid'] = '';
+        }
+
+        return parent::edit($data);
+    }
+
+    /**
+     * 修改状态
+     */
+    public function status()
+    {
+        $params = request()->all();
+        $id = isset($params['id']) ? intval($params['id']) : 0;
+        $status = isset($params['status']) ? intval($params['status']) : 0;
+
+        if (!$id) {
+            return ['code' => 1, 'msg' => 'ID不能为空'];
+        }
+
+        if (!$status || ($status != 1 && $status != 2)) {
+            return ['code' => 1, 'msg' => '状态参数错误'];
+        }
+
+        $result = $this->model->where('id', $id)->update([
+            'status' => $status,
+            'update_time' => time()
+        ]);
+
+        if ($result !== false) {
+            return ['code' => 0, 'msg' => '状态修改成功'];
         }
-        return parent::edit($data); // TODO: Change the autogenerated stub
+
+        return ['code' => 1, 'msg' => '状态修改失败'];
+    }
+
+    /**
+     * 获取数据列表(重写以支持更多字段)
+     */
+    public function getDataList($params, $pageSize = 15)
+    {
+        $query = $this->model->where('mark', 1);
+
+        // 标题搜索
+        if (isset($params['title']) && $params['title']) {
+            $query->where('title', 'like', '%' . $params['title'] . '%');
+        }
+
+        // 位置筛选
+        if (isset($params['position']) && $params['position'] > 0) {
+            $query->where('position', $params['position']);
+        }
+
+        // 状态筛选
+        if (isset($params['status']) && $params['status'] > 0) {
+            $query->where('status', $params['status']);
+        }
+
+        $list = $query->orderBy('sort', 'desc')
+            ->orderBy('id', 'desc')
+            ->paginate($pageSize);
+
+        $list = $list ? $list->toArray() : [];
+
+        // 格式化数据
+        if ($list && isset($list['data'])) {
+            foreach ($list['data'] as &$item) {
+                // 处理图片
+                if (isset($item['cover']) && $item['cover']) {
+                    $item['cover'] = get_image_url($item['cover']);
+                }
+
+                // 处理时间
+                $item['create_time'] = $item['create_time'] ? date('Y-m-d H:i:s', $item['create_time']) : '';
+                $item['update_time'] = $item['update_time'] ? date('Y-m-d H:i:s', $item['update_time']) : '';
+                $item['start_time'] = $item['start_time'] ? date('Y-m-d H:i:s', $item['start_time']) : '';
+                $item['end_time'] = $item['end_time'] ? date('Y-m-d H:i:s', $item['end_time']) : '';
+            }
+        }
+
+        return [
+            'msg' => '操作成功',
+            'code' => 0,
+            'data' => $list['data'] ?? [],
+            'count' => $list['total'] ?? 0,
+        ];
     }
 
 }

+ 83 - 49
app/Services/Common/ComplaintService.php

@@ -31,62 +31,82 @@ class ComplaintService extends BaseService
      */
     public function getDataList($params, $pageSize = 15)
     {
-        $query = $this->model->where('mark', 1);
+        try {
+            $query = $this->model->where('mark', 1);
 
-        // 状态筛选
-        if (isset($params['status']) && $params['status'] !== '') {
-            $query->where('status', $params['status']);
-        }
-
-        // 关键词搜索
-        if (isset($params['keyword']) && $params['keyword']) {
-            $keyword = $params['keyword'];
-            $query->where(function ($q) use ($keyword) {
-                $q->where('realname', 'like', '%' . $keyword . '%')
-                    ->orWhere('mobile', 'like', '%' . $keyword . '%')
-                    ->orWhere('content', 'like', '%' . $keyword . '%');
-            });
-        }
-
-        $list = $query->with(['user'])
-            ->orderBy('id', 'desc')
-            ->paginate($pageSize);
-
-        $list = $list ? $list->toArray() : [];
+            // 状态筛选
+            if (isset($params['status']) && $params['status'] !== '') {
+                $query->where('status', $params['status']);
+            }
 
-        if ($list && isset($list['data'])) {
-            foreach ($list['data'] as &$item) {
-                $item['create_time'] = $item['create_time'] ? date('Y-m-d H:i:s', $item['create_time']) : '';
-                $item['update_time'] = $item['update_time'] ? date('Y-m-d H:i:s', $item['update_time']) : '';
+            // 关键词搜索
+            if (isset($params['keyword']) && $params['keyword']) {
+                $keyword = $params['keyword'];
+                $query->where(function ($q) use ($keyword) {
+                    $q->where('realname', 'like', '%' . $keyword . '%')
+                        ->orWhere('mobile', 'like', '%' . $keyword . '%')
+                        ->orWhere('content', 'like', '%' . $keyword . '%');
+                });
+            }
 
-                // 处理图片
-                if (!empty($item['albums'])) {
-                    $albums = json_decode($item['albums'], true);
-                    if (is_array($albums)) {
-                        $item['albums_array'] = array_map(function($url) {
-                            return get_image_url($url);
-                        }, $albums);
+            $list = $query->with(['user'])
+                ->orderBy('id', 'desc')
+                ->paginate($pageSize);
+
+            $list = $list ? $list->toArray() : [];
+
+            if ($list && isset($list['data'])) {
+                foreach ($list['data'] as &$item) {
+                    $item['create_time'] = $item['create_time'] ? date('Y-m-d H:i:s', $item['create_time']) : '';
+                    $item['update_time'] = $item['update_time'] ? date('Y-m-d H:i:s', $item['update_time']) : '';
+
+                    // 处理图片
+                    if (!empty($item['albums'])) {
+                        $albums = json_decode($item['albums'], true);
+                        if (is_array($albums)) {
+                            $item['albums_array'] = array_map(function($album) {
+                                // 如果是对象格式 {"url": "..."}
+                                if (is_array($album) && isset($album['url'])) {
+                                    return get_image_url($album['url']);
+                                }
+                                // 如果是字符串格式
+                                return get_image_url($album);
+                            }, $albums);
+                        } else {
+                            $item['albums_array'] = [];
+                        }
                     } else {
                         $item['albums_array'] = [];
                     }
-                } else {
-                    $item['albums_array'] = [];
-                }
 
-                // 状态文本
-                $item['status_text'] = $this->getStatusText($item['status']);
+                    // 状态文本
+                    $item['status_text'] = $this->getStatusText($item['status']);
 
-                // 用户昵称
-                $item['user_name'] = $item['user']['nickname'] ?? '-';
+                    // 用户信息
+                    if (isset($item['user']) && !empty($item['user'])) {
+                        $item['user_name'] = $item['user']['nickname'] ?? $item['user']['username'] ?? '-';
+                        $item['user_avatar'] = isset($item['user']['avatar']) ? get_image_url($item['user']['avatar']) : '';
+                    } else {
+                        $item['user_name'] = '-';
+                        $item['user_avatar'] = '';
+                    }
+                }
             }
-        }
 
-        return [
-            'msg' => '操作成功',
-            'code' => 0,
-            'data' => $list['data'] ?? [],
-            'count' => $list['total'] ?? 0,
-        ];
+            return [
+                'msg' => '操作成功',
+                'code' => 0,
+                'data' => $list['data'] ?? [],
+                'count' => $list['total'] ?? 0,
+            ];
+        } catch (\Exception $e) {
+            return [
+                'msg' => '查询失败: ' . $e->getMessage(),
+                'code' => 1,
+                'data' => [],
+                'count' => 0,
+            ];
+        }
     }
 
     /**
@@ -200,7 +220,7 @@ class ComplaintService extends BaseService
      */
     public function getInfo($id)
     {
-        $info = $this->model->where('id', $id)->where('mark', 1)->first();
+        $info = $this->model->with(['user'])->where('id', $id)->where('mark', 1)->first();
         if (!$info) {
             return ['code' => 1, 'msg' => '数据不存在'];
         }
@@ -211,8 +231,13 @@ class ComplaintService extends BaseService
         if (!empty($info['albums'])) {
             $albums = json_decode($info['albums'], true);
             if (is_array($albums)) {
-                $info['albums_array'] = array_map(function($url) {
-                    return get_image_url($url);
+                $info['albums_array'] = array_map(function($album) {
+                    // 如果是对象格式 {"url": "..."}
+                    if (is_array($album) && isset($album['url'])) {
+                        return get_image_url($album['url']);
+                    }
+                    // 如果是字符串格式
+                    return get_image_url($album);
                 }, $albums);
             } else {
                 $info['albums_array'] = [];
@@ -221,6 +246,15 @@ class ComplaintService extends BaseService
             $info['albums_array'] = [];
         }
 
+        // 用户信息
+        if (isset($info['user']) && !empty($info['user'])) {
+            $info['user_name'] = $info['user']['nickname'] ?? $info['user']['username'] ?? '-';
+            $info['user_avatar'] = isset($info['user']['avatar']) ? get_image_url($info['user']['avatar']) : '';
+        } else {
+            $info['user_name'] = '-';
+            $info['user_avatar'] = '';
+        }
+
         return ['code' => 0, 'data' => $info];
     }
 }

+ 7 - 0
app/Services/Common/StoreService.php

@@ -105,6 +105,10 @@ class StoreService extends BaseService
                 $item['user_status'] = isset($item['user']['status']) ? $item['user']['status'] : 1;
                 $item['member_status'] = isset($item['member']['status']) ? $item['member']['status'] : 1;
                 $item['category_name'] = isset($item['category']['name']) ? $item['category']['name'] : '未分类';
+                // 处理门头照图片
+                if (isset($item['logo']) && $item['logo']) {
+                    $item['logo'] = get_image_url($item['logo']);
+                }
                 // 添加余额信息
                 $item['balance'] = isset($item['member']['balance']) ? $item['member']['balance'] : 0;
                 // 添加会员状态信息
@@ -373,6 +377,9 @@ class StoreService extends BaseService
                 $info = $store->toArray();
 
                 // 处理图片
+                if (isset($info['logo'])) {
+                    $info['logo'] = get_image_url($info['logo']);
+                }
                 if (isset($info['business_license'])) {
                     $info['business_license'] = get_image_url($info['business_license']);
                 }

+ 1 - 0
routes/web.php

@@ -178,6 +178,7 @@ Route::post('/balanceLogs/deleteAll', [\App\Http\Controllers\Admin\BalanceLogsCo
 Route::get('/ad/index', [AdController::class, 'index']);
 Route::get('/ad/info', [AdController::class, 'info']);
 Route::post('/ad/edit', [AdController::class, 'edit']);
+Route::post('/ad/status', [AdController::class, 'status']);
 Route::post('/ad/delete', [AdController::class, 'delete']);
 
 // 会员管理