From f8a7495e626edc22202de1752573cd4446b8b4db Mon Sep 17 00:00:00 2001
From: donghaolin <17667510818@163.com>
Date: Thu, 28 Nov 2024 08:52:22 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/gold-system/src/views/recharge/addRecharge.vue | 94 ++++++++++++++++++++--
 1 file changed, 86 insertions(+), 8 deletions(-)

diff --git a/vue/gold-system/src/views/recharge/addRecharge.vue b/vue/gold-system/src/views/recharge/addRecharge.vue
index beecab0..1e709b2 100644
--- a/vue/gold-system/src/views/recharge/addRecharge.vue
+++ b/vue/gold-system/src/views/recharge/addRecharge.vue
@@ -1,15 +1,93 @@
-<script>
-    
+<script setup>
+    import { reactive } from 'vue';
+    import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
+
 </script>
 
 <template>
-    <el-form :model="form" label-width="auto" style="max-width: 600px">
-        <el-form-item label="Activity name">
-          <el-input v-model="form.name" />
-        </el-form-item>
-    </el-form>
+  <div>
+    新增充值
+  </div>
+  <el-form :model="form" label-width="auto" style="max-width: 600px">
+    <el-form-item label="精网号">
+      <el-input  style="width: 240px;"/>
+      <el-button type="primary" @click="handleClick">查询</el-button>
+    </el-form-item>
+    <el-form-item label="活动名称">
+      <el-select v-model="value" placeholder="请选择" style="width: 240px">
+        <el-option
+          
+        />
+      </el-select>
+    </el-form-item>
+    <el-form-item label="充值金币">
+      <el-input  style="width: 200px;"/>
+      <p>免费金币</p>
+      <el-input style="width: 200px" disabled placeholder="Please input"/>
+    </el-form-item>
+    <el-form-item label="充值金额">
+      <el-select v-model="value" placeholder="货币名称" style="width: 240px">
+        <el-option
+
+        />
+      </el-select>
+      <el-input  style="width: 200px;"/>
+    </el-form-item>
+    <el-form-item label="收款方式">
+      <el-select v-model="value" placeholder="请选择" style="width: 240px">
+        <el-option
+
+        />
+      </el-select>
+    </el-form-item>
+    <el-form-item label="交款时间">
+      <el-date-picker
+        v-model="value1"
+        type="datetime"
+        placeholder="Select date and time"
+      />
+    </el-form-item>
+    <el-form-item label="交款凭证">
+      <el-upload
+      class="avatar-uploader"
+      action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
+      :show-file-list="false"
+      :on-success="handleAvatarSuccess"
+      :before-upload="beforeAvatarUpload"
+    >
+      <img v-if="imageUrl" :src="imageUrl" class="avatar" />
+      <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+    </el-upload>
+    </el-form-item>
+    <el-form-item label="备注">
+      <el-input
+    v-model="textarea"
+    style="width: 240px"
+    :rows="2"
+    type="textarea"
+    placeholder="Please input"
+  />
+    </el-form-item>
+    <el-form-item label="提交人">
+      <el-input style="width: 200px" disabled placeholder="Please input"/>
+    </el-form-item>
+  </el-form>
+  <div class="dialog-footer">
+    <el-button @click="closeAddActivityVisible">取消</el-button>
+    <el-button type="primary" @click="closeAddActivityVisible">
+        提交
+    </el-button>
+</div>
 </template>
 
-<style>
+<style scoped>
+  p{
+    margin: 0px;
+  }
+  .el-form-item {
+  margin-left: 50px;
 
+}
 </style>
\ No newline at end of file

From 6888b43ebef9095615901414aa268c76aa8597ba Mon Sep 17 00:00:00 2001
From: donghaolin <17667510818@163.com>
Date: Thu, 28 Nov 2024 10:08:38 +0800
Subject: [PATCH 2/4] 11.28

---
 vue/gold-system/src/views/managerecharge/rate.vue  | 6 ++++--
 vue/gold-system/src/views/recharge/addRecharge.vue | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/vue/gold-system/src/views/managerecharge/rate.vue b/vue/gold-system/src/views/managerecharge/rate.vue
index 120f115..89e4047 100644
--- a/vue/gold-system/src/views/managerecharge/rate.vue
+++ b/vue/gold-system/src/views/managerecharge/rate.vue
@@ -132,10 +132,12 @@
         <el-form-item label="提交人:">
           <el-input  style="width: 240px;"/>
         </el-form-item>
-        <el-form-item>
+        <el-form-item >
+          <div class="dialog-footer">
           <el-button  type="primary" @click="add">添加</el-button>
           <el-button @click="regeAdd = false">取消</el-button>
-        </el-form-item>
+          </div>
+      </el-form-item>
       </el-form>
       </template>
     </el-dialog>
diff --git a/vue/gold-system/src/views/recharge/addRecharge.vue b/vue/gold-system/src/views/recharge/addRecharge.vue
index 1e709b2..1d0aa58 100644
--- a/vue/gold-system/src/views/recharge/addRecharge.vue
+++ b/vue/gold-system/src/views/recharge/addRecharge.vue
@@ -80,6 +80,9 @@ import { Plus } from '@element-plus/icons-vue'
         提交
     </el-button>
 </div>
+<div>
+  
+</div>
 </template>
 
 <style scoped>

From ad9e1838b8f48ec99312a31da4dfb4fa9a084c9a Mon Sep 17 00:00:00 2001
From: donghaolin <17667510818@163.com>
Date: Thu, 28 Nov 2024 10:15:33 +0800
Subject: [PATCH 3/4] 11

---
 vue/gold-system/src/assets/css/common.css          |  26 +++
 vue/gold-system/src/main.ts                        |   1 +
 .../src/views/managerecharge/activity.vue          |  57 ++---
 .../src/views/recharge/adminRecharge.vue           | 246 ++++++++++++++++++++-
 4 files changed, 293 insertions(+), 37 deletions(-)
 create mode 100644 vue/gold-system/src/assets/css/common.css

diff --git a/vue/gold-system/src/assets/css/common.css b/vue/gold-system/src/assets/css/common.css
new file mode 100644
index 0000000..0df6ed2
--- /dev/null
+++ b/vue/gold-system/src/assets/css/common.css
@@ -0,0 +1,26 @@
+.green-dot {
+    margin: 7px 5px 0px 0px;
+    width: 10px;
+    height: 10px;
+    border-radius: 50%;
+    display: block;
+    background-color: green;
+}
+
+.red-dot {
+    margin: 7px 5px 0px 0px;
+    width: 10px;
+    height: 10px;
+    border-radius: 50%;
+    display: block;
+    background-color: red;
+}
+
+.grey-dot {
+    margin: 7px 5px 0px 0px;
+    width: 10px;
+    height: 10px;
+    border-radius: 50%;
+    display: block;
+    background-color: grey;
+}
\ No newline at end of file
diff --git a/vue/gold-system/src/main.ts b/vue/gold-system/src/main.ts
index d55fa21..68a9507 100644
--- a/vue/gold-system/src/main.ts
+++ b/vue/gold-system/src/main.ts
@@ -4,6 +4,7 @@ import router from './router'
 import ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
 import * as ElementPlusIconsVue from '@element-plus/icons-vue'
+import './assets/css/common.css'; // 引入公共CSS文件
 
 const app = createApp(App)
 
diff --git a/vue/gold-system/src/views/managerecharge/activity.vue b/vue/gold-system/src/views/managerecharge/activity.vue
index cc6e9f2..bf4c19d 100644
--- a/vue/gold-system/src/views/managerecharge/activity.vue
+++ b/vue/gold-system/src/views/managerecharge/activity.vue
@@ -59,6 +59,17 @@ const tableData = [
     },
 
 ]
+
+//分页对象
+const getObj = ref({
+    page: 1,
+    size: 10,
+})
+//分页总条目
+const total = ref(100)
+
+
+//新增活动弹出框
 const addActivityVisible = ref(false)
 //打开新增活动弹出框
 const openAddActivityVisible = function () {
@@ -76,10 +87,10 @@ const addActicity = function () {
 const form = reactive({
     activityName: '',
     freeGold: '',
-    rechargeRatio:'',
-    startTime:'',
-    endTime:'',
-    adminName:'',
+    rechargeRatio: '',
+    startTime: '',
+    endTime: '',
+    adminName: '',
 })
 
 
@@ -162,6 +173,11 @@ const Delete = function (index, row) {
                         </el-table-column>
                     </el-table>
                 </div>
+
+                <!-- 分页 -->
+                <el-pagination background
+                    layout="prev, pager, next" :total="total" />
+
             </el-card>
         </el-col>
     </el-row>
@@ -172,7 +188,7 @@ const Delete = function (index, row) {
             <el-form :model="form" label-width="auto" style="max-width: 600px">
 
                 <el-form-item label="活动名称">
-                    <el-input v-model="form.activityName" placeholder="请输入活动名称"/>
+                    <el-input v-model="form.activityName" placeholder="请输入活动名称" />
                 </el-form-item>
 
                 <el-form-item label="免费金币">
@@ -183,7 +199,7 @@ const Delete = function (index, row) {
                 </el-form-item>
 
                 <el-form-item label="免费金币兑换比">
-                    <el-input v-model="form.rechargeRatio" placeholder="请输入" style="width: 80px;"/>：1
+                    <el-input v-model="form.rechargeRatio" placeholder="请输入" style="width: 80px;" />：1
                     <div style="color: grey;">(提示：当前规则每10新币可兑换1免费金币)</div>
                 </el-form-item>
 
@@ -194,9 +210,9 @@ const Delete = function (index, row) {
                 <el-form-item label="结束时间">
                     <el-time-picker v-model="form.endTime" />
                 </el-form-item>
-                
+
                 <el-form-item label="添加人">
-                    <el-input v-model="form.adminName" disabled/>
+                    <el-input v-model="form.adminName" disabled />
                 </el-form-item>
 
             </el-form>
@@ -212,32 +228,7 @@ const Delete = function (index, row) {
 </template>
 
 <style scoped>
-.green-dot {
-    margin: 7px 5px 0px 0px;
-    width: 10px;
-    height: 10px;
-    border-radius: 50%;
-    display: block;
-    background-color: green;
-}
 
-.red-dot {
-    margin: 7px 5px 0px 0px;
-    width: 10px;
-    height: 10px;
-    border-radius: 50%;
-    display: block;
-    background-color: red;
-}
-
-.grey-dot {
-    margin: 7px 5px 0px 0px;
-    width: 10px;
-    height: 10px;
-    border-radius: 50%;
-    display: block;
-    background-color: grey;
-}
 
 .status {
     display: flex;
diff --git a/vue/gold-system/src/views/recharge/adminRecharge.vue b/vue/gold-system/src/views/recharge/adminRecharge.vue
index 61e8b33..9b74540 100644
--- a/vue/gold-system/src/views/recharge/adminRecharge.vue
+++ b/vue/gold-system/src/views/recharge/adminRecharge.vue
@@ -1,13 +1,251 @@
 <script setup>
-    
+import { ref, onMounted, reactive, computed } from "vue";
+import ElementPlus from "element-plus";
+
+const tableData = [
+    {
+        activityName: '这是活动名称',
+        startTime: '2023-12-22 00:00:00',
+        endTime: '2024-12-22 23:59:59',
+        rechargeRatio: '10:1',
+        address: '进行中',
+        adminName: '张三',
+        createTime: '2023-01-01 00:00:00',
+    },
+    {
+        activityName: '这是活动名称2',
+        startTime: '2023-12-22 00:00:00',
+        endTime: '2024-12-22 23:59:59',
+        rechargeRatio: '5:1',
+        address: '进行中',
+        adminName: '张三',
+        createTime: '2023-01-01 00:00:00',
+    },
+    {
+        activityName: '这是活动名称3',
+        startTime: '2024-12-22 00:00:00',
+        endTime: '2025-12-22 23:59:59',
+        rechargeRatio: '10:1',
+        address: '未开始',
+        adminName: '张三',
+        createTime: '2023-01-01 00:00:00',
+    },
+    {
+        activityName: '这是活动名称4',
+        startTime: '2024-12-22 00:00:00',
+        endTime: '2025-12-22 23:59:59',
+        rechargeRatio: '5:1',
+        address: '未开始',
+        adminName: '张三',
+        createTime: '2023-01-01 00:00:00',
+    },
+    {
+        activityName: '这是活动名称5',
+        startTime: '2023-01-01 00:00:00',
+        endTime: '2023-12-22 23:59:59',
+        rechargeRatio: '10:1',
+        address: '已结束',
+        adminName: '张三',
+        createTime: '2023-01-01 00:00:00',
+    },
+    {
+        activityName: '这是活动名称6',
+        startTime: '2023-01-01 00:00:00',
+        endTime: '2023-12-22 23:59:59',
+        rechargeRatio: '5:1',
+        address: '已结束',
+        adminName: '张三',
+        createTime: '2023-01-01 00:00:00',
+    },
+
+]
+
+//分页对象
+const getObj = ref({
+    page: 1,
+    size: 10,
+})
+//分页总条目
+const total = ref(100)
+
+
+const form = reactive({
+    activityName: '',
+    freeGold: '',
+    rechargeRatio: '',
+    startTime: '',
+    endTime: '',
+    adminName: '',
+})
+
+
+const Delete = function (index, row) {
+    console.log(index, row)
+}
+
 </script>
 
 <template>
-    <div>
-        <h1>Admin Recharge</h1>
-    </div>
+    <el-row>
+        <el-col>
+            <el-card style="margin-bottom: 20px">
+                <div class="head-card">
+                    <table>
+                        <tr>
+                            <td>
+                                <div class="head-card-element">
+                                    <el-text class="mx-1" size="large">活动名称：</el-text>
+                                    <el-input v-model="input" style="width: 240px" clearable />
+                                </div>
+                            </td>
+                            <td>
+                                <div class="head-card-element">
+                                    <el-text class="mx-1" size="large">充值方式：</el-text>
+                                    <el-input v-model="input" style="width: 240px" clearable />
+                                </div>
+                            </td>
+                            <td>
+                                <div class="head-card-element">
+                                    <el-text class="mx-1" size="large">所属地区：</el-text>
+                                    <el-input v-model="input" style="width: 240px" placeholder="请输入活动名称" clearable />
+                                </div>
+                            </td>
+                        </tr>
+                        
+                        <tr>
+                            <td>
+                                <div class="head-card-element">
+                                    <el-text class="mx-1" size="large">充值时间：</el-text>
+                                    <el-time-picker v-model="value1" is-range range-separator="至"
+                                        start-placeholder="起始时间" end-placeholder="结束时间" />
+                                </div>
+                            </td>
+                            <td>
+                                <div class="head-card-btn">
+                                    <el-button>重置</el-button>
+                                    <el-button type="primary">查询</el-button>
+                                </div>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            </el-card>
+        </el-col>
+    </el-row>
+    <el-row>
+        <el-col>
+            <el-card>
+                <div>
+                    <el-table :data="tableData" style="width: 100%">
+                        <el-table-column prop="activityName" label="活动名称" />
+                        <el-table-column prop="startTime" label="开始时间" />
+                        <el-table-column prop="endTime" label="结束时间" />
+                        <el-table-column prop="rechargeRatio" label="免费兑换比" />
+                        <el-table-column prop="address" label="状态">
+                            <template #default="scope">
+                                <div class="status">
+                                    <span v-if="scope.row.address === '进行中'">
+                                        <span class="green-dot"></span>
+                                    </span>
+                                    <span v-if="scope.row.address === '未开始'">
+                                        <span class="red-dot"></span>
+                                    </span>
+                                    <span v-if="scope.row.address === '已结束'">
+                                        <span class="grey-dot"></span>
+                                    </span>
+                                    <span>{{ scope.row.address }}</span>
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="adminName" label="添加人" />
+                        <el-table-column prop="createTime" label="添加时间" />
+                        <el-table-column prop="operation" label="操作">
+                            <template #default="scope">
+                                <el-popconfirm title="确定将此条活动删除吗？">
+                                    <template #reference>
+                                        <el-button type="primary" text @click="Delete(scope.$index, scope.row)">
+                                            删除
+                                        </el-button>
+                                    </template>
+                                    <template #actions="{ confirm, cancel }">
+                                        <el-button size="small" @click="cancel">取消</el-button>
+                                        <el-button type="primary" size="small" @click="confirm">
+                                            确定
+                                        </el-button>
+                                    </template>
+                                </el-popconfirm>
+                            </template>
+
+                        </el-table-column>
+                    </el-table>
+                </div>
+
+                <!-- 分页 -->
+                <el-pagination background layout="prev, pager, next" :total="total" />
+
+            </el-card>
+        </el-col>
+    </el-row>
+
+    <el-dialog v-model="addActivityVisible" title="新增活动" width="500" :before-close="closeAddActivityVisible">
+        <template #footer>
+
+            <el-form :model="form" label-width="auto" style="max-width: 600px">
+
+                <el-form-item label="活动名称">
+                    <el-input v-model="form.activityName" placeholder="请输入活动名称" />
+                </el-form-item>
+
+                <el-form-item label="免费金币">
+                    <el-radio-group v-model="form.freeGold">
+                        <el-radio value="0">无赠送</el-radio>
+                        <el-radio value="1">有赠送</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+                <el-form-item label="免费金币兑换比">
+                    <el-input v-model="form.rechargeRatio" placeholder="请输入" style="width: 80px;" />：1
+                    <div style="color: grey;">(提示：当前规则每10新币可兑换1免费金币)</div>
+                </el-form-item>
+
+                <el-form-item label="开始时间">
+                    <el-time-picker v-model="form.startTime" />
+                </el-form-item>
+
+                <el-form-item label="结束时间">
+                    <el-time-picker v-model="form.endTime" />
+                </el-form-item>
+
+                <el-form-item label="添加人">
+                    <el-input v-model="form.adminName" disabled />
+                </el-form-item>
+
+            </el-form>
+
+            <div class="dialog-footer">
+                <el-button @click="closeAddActivityVisible">取消</el-button>
+                <el-button type="primary" @click="closeAddActivityVisible">
+                    提交
+                </el-button>
+            </div>
+        </template>
+    </el-dialog>
 </template>
 
 <style scoped>
+.status {
+    display: flex;
+}
+
+.head-card {
+    display: flex;
+}
+
+.head-card-element {
+    margin-right: 20px;
+}
 
+.head-card-btn {
+    margin-left: auto;
+}
 </style>
\ No newline at end of file

From 3d9285e5c9571c2781748fdb1c27ab47117910db Mon Sep 17 00:00:00 2001
From: donghaolin <17667510818@163.com>
Date: Thu, 28 Nov 2024 10:25:02 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/gold-system/src/views/recharge/addRecharge.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/vue/gold-system/src/views/recharge/addRecharge.vue b/vue/gold-system/src/views/recharge/addRecharge.vue
index f3d2011..1d0aa58 100644
--- a/vue/gold-system/src/views/recharge/addRecharge.vue
+++ b/vue/gold-system/src/views/recharge/addRecharge.vue
@@ -7,7 +7,6 @@ import { Plus } from '@element-plus/icons-vue'
 </script>
 
 <template>
-<<<<<<< HEAD
   <div>
     新增充值
   </div>
@@ -84,9 +83,6 @@ import { Plus } from '@element-plus/icons-vue'
 <div>
   
 </div>
-=======
-    <h1>Add Recharge</h1>
->>>>>>> 1779301c1263a097fb8b7b909a618d3670373ff6
 </template>
 
 <style scoped>