From 6c6538898b6374c6e00b88d9dc5d944997a0e396 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 12 Sep 2025 16:08:30 +0800
Subject: [PATCH] sc

---
 src/api/gds/appletUser.js                     |   9 +-
 .../GDS/appletUser/components/gdsUsers.vue    |  19 +--
 .../appletUser/components/gdsVipRecord.vue    |  14 +-
 src/views/GDS/course/chapter.vue              | 150 +++++++++++++++++-
 src/views/GDS/course/index.vue                |  16 +-
 5 files changed, 179 insertions(+), 29 deletions(-)

diff --git a/src/api/gds/appletUser.js b/src/api/gds/appletUser.js
index 8d056dc..a3a7890 100644
--- a/src/api/gds/appletUser.js
+++ b/src/api/gds/appletUser.js
@@ -40,7 +40,14 @@ export const getVipType = async (id) => {
 
 export const addUserMember = async (data) => {
   return await request.post({
-    url: '/admin-api/applet/sinology/sys/user-member/add',
+    url: '/admin-api/applet/sinology/sys/user/add',
     data
   })
 }
+
+export const searchVipRecord = async (params) => {
+  return await request.get({
+    url: '/admin-api/applet/sinology/memberLog/page',
+    params
+  })
+}
diff --git a/src/views/GDS/appletUser/components/gdsUsers.vue b/src/views/GDS/appletUser/components/gdsUsers.vue
index c8bdf51..ee55ce7 100644
--- a/src/views/GDS/appletUser/components/gdsUsers.vue
+++ b/src/views/GDS/appletUser/components/gdsUsers.vue
@@ -11,7 +11,7 @@
       </el-form-item>
       <el-form-item>
         <el-date-picker
-          v-model="searchForm.createDate"
+          v-model="searchForm.createTime"
           type="daterange"
           range-separator="-"
           value-format="YYYY-MM-DD"
@@ -29,7 +29,7 @@
       <el-table-column type="index" width="50" />
       <el-table-column label="头像" width="80">
         <template #default="scope">
-          <img :src="scope.row.avatar" width="50" height="50" />
+          <el-avatar icon="el-icon-user-solid" shape="circle" :src="scope.row.avatar" fit="fill" />
         </template>
       </el-table-column>
       <el-table-column label="昵称" prop="userName" min-width="120" />
@@ -42,8 +42,8 @@
         :formatter="(row) => (row.sex === 1 ? '男' : '女')"
       />
       <el-table-column label="注册日期" prop="createTime" min-width="120" />
-      <el-table-column label="会员类型" prop="createTime" min-width="120" />
-      <el-table-column label="会员截止日期" prop="createTime" min-width="120" />
+      <el-table-column label="会员类型" prop="memberName" min-width="120" />
+      <el-table-column label="会员截止日期" prop="endDate" min-width="120" />
       <!-- 操作 -->
       <el-table-column label="操作" width="120">
         <template #default="{ row }">
@@ -93,9 +93,10 @@ import { getVipTypeList } from '@/api/gds/appletUser'
 const message = useMessage()
 
 const searchForm = ref({
-  distributionld: undefined,
   phone: '',
-  createDate: [],
+  createTime: [],
+  createTimeBegin: undefined,
+  createTimeEnd: undefined,
   pageNo: 1,
   pageSize: 20
 })
@@ -117,9 +118,9 @@ const total = ref(0)
 const getList = async () => {
   loading.value = true
   try {
-    if (searchForm.value.createDate && searchForm.value.createDate.length > 0) {
-      searchForm.value.createTimeBegin = searchForm.value.createDate[0] + ' 00:00:00'
-      searchForm.value.createTimeEnd = searchForm.value.createDate[1] + ' 23:59:59'
+    if (searchForm.value.createTime && searchForm.value.createTime.length > 0) {
+      searchForm.value.createTimeBegin = searchForm.value.createTime[0] + ' 00:00:00'
+      searchForm.value.createTimeEnd = searchForm.value.createTime[1] + ' 23:59:59'
     } else {
       searchForm.value.createTimeBegin = undefined
       searchForm.value.createTimeEnd = undefined
diff --git a/src/views/GDS/appletUser/components/gdsVipRecord.vue b/src/views/GDS/appletUser/components/gdsVipRecord.vue
index 1752a0e..a7a1c91 100644
--- a/src/views/GDS/appletUser/components/gdsVipRecord.vue
+++ b/src/views/GDS/appletUser/components/gdsVipRecord.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script setup name="VipUser">
-import { getVipTypeList } from '@/api/gds/appletUser'
+import { getVipTypeList, searchVipRecord } from '@/api/gds/appletUser'
 const searchForm = ref({
   memberId: undefined,
   phone: undefined,
@@ -69,12 +69,12 @@ function searchList() {
 }
 
 function getList() {
-  // loading.value = true
-  // getUserMemberList(searchForm.value).then((response) => {
-  //   tableList.value = response.list
-  //   total.value = response.total
-  //   loading.value = false
-  // })
+  loading.value = true
+  searchVipRecord(searchForm.value).then((response) => {
+    tableList.value = response.list
+    total.value = response.total
+    loading.value = false
+  })
 }
 </script>
 
diff --git a/src/views/GDS/course/chapter.vue b/src/views/GDS/course/chapter.vue
index c63533e..b019740 100644
--- a/src/views/GDS/course/chapter.vue
+++ b/src/views/GDS/course/chapter.vue
@@ -27,7 +27,7 @@
       max-height="calc(100vh - 320px)"
     >
       <el-table-column type="index" width="55" align="center" />
-      <el-table-column label="章节序号" align="left" prop="chapterIndex" width="80" />
+      <el-table-column label="章节序号" align="left" prop="chapterIndex" width="140" />
       <el-table-column label="章节名" align="left" prop="chapterName" min-width="140" />
       <el-table-column label="作者" align="center" prop="author" min-width="100" />
       <el-table-column label="是否付费" align="center" width="100">
@@ -38,11 +38,34 @@
       </el-table-column>
       <el-table-column label="章节内容" :width="90">
         <template #default="{ row }">
-          <el-popover placement="right" width="500px" trigger="click" v-if="row.content">
+          <el-popover placement="right" width="300px" trigger="click" v-if="row.content">
             <template #reference>
-              <el-button type="primary" style="padding: 0" text>点击查看</el-button>
+              <el-button type="primary" style="padding: 0" text>预览</el-button>
             </template>
-            <div v-dompurify-html="row.content" style="max-height: 800px; overflow-y: auto"></div>
+            <!--  -->
+            <div class="iphone-frame">
+              <!-- 屏幕边框（无内容） -->
+              <div class="iphone-screen-border">
+                <div v-dompurify-html="row.content"></div>
+              </div>
+
+              <!-- 顶部摄像头/听筒区域 -->
+              <div class="iphone-camera-bar">
+                <div class="camera-dot"></div>
+                <div class="earpiece"></div>
+                <div class="camera-dot"></div>
+              </div>
+
+              <!-- 左侧电源键 -->
+              <div class="iphone-power-btn"></div>
+
+              <!-- 右侧音量键 -->
+              <div class="iphone-volume-btn volume-up"></div>
+              <div class="iphone-volume-btn volume-down"></div>
+
+              <!-- 底部Home键 -->
+              <div class="iphone-home-btn"></div>
+            </div>
           </el-popover>
         </template>
       </el-table-column>
@@ -50,7 +73,7 @@
       <el-table-column label="发布时间" align="center" prop="publicTime" min-width="100" />
       <el-table-column label="浏览数" align="center" prop="browseCount" width="100" />
       <el-table-column label="点赞数" align="center" prop="goodCount" width="100" />
-      <el-table-column label="收藏数" align="center" prop="likeCount" width="100" />
+      <el-table-column label="收藏数" align="center" prop="collectCount" width="100" />
       <el-table-column label="操作" align="center" width="140">
         <template #default="{ row }">
           <el-button type="primary" link @click.stop="handleEdit(row)"> 修改 </el-button>
@@ -84,10 +107,16 @@
         <el-form-item label="作者">
           <el-input v-model="form.author" placeholder="请输入" />
         </el-form-item>
+        <el-form-item label="是否付费">
+          <el-radio-group v-model="form.isFree">
+            <el-radio :label="true" :value="true">免费</el-radio>
+            <el-radio :label="false" :value="false">付费</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="发布状态">
           <el-radio-group v-model="form.status">
-            <el-radio :label="1">发布</el-radio>
-            <el-radio :label="2">不发布</el-radio>
+            <el-radio :label="1" :vlaue="1">发布</el-radio>
+            <el-radio :label="2" :value="2">不发布</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="章节内容" prop="content">
@@ -166,6 +195,7 @@ function resetForm() {
   form.value = {
     lessonName: '',
     image: '',
+    isFree: false,
     introduction: '',
     author: '',
     status: 2
@@ -208,4 +238,108 @@ onMounted(() => {
 })
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+/* 手机框主体 - 核心样式 */
+.iphone-frame {
+  /* 机身比例（参考iPhone 14） */
+  width: 280px;
+  height: 580px;
+  /* 机身样式 */
+  background-color: #1c1c1e; /* 默认黑色 */
+  border-radius: 42px; /* 机身大圆角 */
+  border: 8px solid #1c1c1e; /* 边框厚度，增强立体感 */
+  box-shadow: 0 10px 30px rgba(0, 0, 0, 0.3), inset 0 0 0 1px rgba(255, 255, 255, 0.1); /* 外阴影+内阴影增强质感 */
+  position: relative;
+}
+
+/* 屏幕区域（仅边框，无内容） */
+.iphone-screen-border {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 20px 10px;
+  margin: 6px; /* 屏幕与机身边框间距 */
+  border-radius: 36px; /* 屏幕圆角（比机身小） */
+  background-color: #fff; /* 模拟屏幕黑边 */
+  overflow-y: auto;
+  scrollbar-width: none; /* 隐藏滚动条，保留功能 */
+  -ms-overflow-style: none; /* 针对 IE 和 Edge */
+  ::-webkit-scrollbar {
+    display: none;
+  }
+}
+
+/* 顶部摄像头区域（刘海简化版） */
+.iphone-camera-bar {
+  position: absolute;
+  top: -8px; /* 与机身边框对齐 */
+  left: 50%;
+  transform: translateX(-50%);
+  width: 110px;
+  height: 26px;
+  background-color: #1c1c1e; /* 与机身同色，隐藏接缝 */
+  border-bottom-left-radius: 16px;
+  border-bottom-right-radius: 16px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+}
+/* 摄像头/听筒细节 */
+.camera-dot {
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  background-color: gray; /* 深灰，模拟摄像头 */
+}
+.earpiece {
+  width: 30px;
+  height: 6px;
+  border-radius: 3px;
+  background-color: gray; /* 模拟听筒 */
+}
+
+/* 侧边按键 - 电源键（左侧） */
+.iphone-power-btn {
+  position: absolute;
+  left: -8px; /* 与机身边框对齐 */
+  top: 120px;
+  width: 8px;
+  height: 40px;
+  background-color: gray; /* 按键颜色（比机身浅） */
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+
+/* 侧边按键 - 音量键（右侧） */
+.iphone-volume-btn {
+  position: absolute;
+  right: -8px; /* 与机身边框对齐 */
+  width: 8px;
+  height: 32px;
+  background-color: gray;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+.volume-up {
+  top: 100px;
+}
+.volume-down {
+  top: 150px;
+}
+
+/* 底部Home键（圆形） */
+.iphone-home-btn {
+  position: absolute;
+  bottom: 20px;
+  left: 50%;
+  transform: translateX(-50%);
+  width: 40px;
+  height: 40px;
+  border-radius: 50%;
+  border: 2px solid #3a3a3c; /* 按键边框 */
+  background-color: #1c1c1e; /* 与机身同色 */
+}
+</style>
diff --git a/src/views/GDS/course/index.vue b/src/views/GDS/course/index.vue
index fd288e5..7a1c2fd 100644
--- a/src/views/GDS/course/index.vue
+++ b/src/views/GDS/course/index.vue
@@ -57,11 +57,19 @@
       <el-table-column label="作者" align="center" prop="author" min-width="100" />
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="100" />
       <el-table-column label="发布时间" align="center" prop="publicTime" min-width="100" />
-      <el-table-column label="浏览数" align="center" prop="chapterName" min-width="100" />
-      <el-table-column label="点赞数" align="center" prop="chapterName" min-width="100" />
-      <el-table-column label="收藏数" align="center" prop="chapterName" min-width="100" />
-      <el-table-column label="操作" align="center" width="140">
+      <el-table-column label="浏览数" align="center" prop="browseCount" min-width="100" />
+      <el-table-column label="点赞数" align="center" prop="goodCount" min-width="100" />
+      <el-table-column label="收藏数" align="center" prop="collectCount" min-width="100" />
+      <el-table-column label="操作" align="center" width="200">
         <template #default="scope">
+          <el-button
+            type="primary"
+            link
+            @click.stop="handleRowClick(scope.row)"
+            v-hasPermi="['GDS:course:edit']"
+          >
+            课程章节
+          </el-button>
           <el-button
             type="primary"
             link