From d4de62bba7b61a858b05493a8e4a3bcc11018ff0 Mon Sep 17 00:00:00 2001
From: donghaolin <17667510818@163.com>
Date: Thu, 28 Nov 2024 15:22:28 +0800
Subject: [PATCH 1/2] =?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/managerecharge/rate.vue  | 127 ++++++++++++++++-----
 vue/gold-system/src/views/recharge/addRecharge.vue |  99 ++++++++++++----
 2 files changed, 174 insertions(+), 52 deletions(-)

diff --git a/vue/gold-system/src/views/managerecharge/rate.vue b/vue/gold-system/src/views/managerecharge/rate.vue
index 89e4047..82a2979 100644
--- a/vue/gold-system/src/views/managerecharge/rate.vue
+++ b/vue/gold-system/src/views/managerecharge/rate.vue
@@ -2,7 +2,15 @@
   import { ref } from 'vue'
   import { ElMessageBox } from 'element-plus'
   const regeAdd = ref(false)
+  const regeEdit = ref(false)
 
+  const rateList = ref([])
+  // 查询方法
+  const handleSearch = () => {
+    // 假数据
+    rateList.value = tableData
+  }
+  const rateAdd = ref({})
   // 添加方法
   const add = () => {
     ElMessageBox.confirm('确认添加？').then(() => {
@@ -11,6 +19,16 @@
       regeAdd.value = false
     })
   }
+  // 编辑方法
+  const edit = () => {
+    ElMessageBox.confirm('确认修改？').then(() => {
+      regeEdit.value = false
+    }).catch(() => {
+      regeEdit.value = false
+    })
+  }
+  // 删除方法
+
 
   // 假数据
   const tableData = [
@@ -47,46 +65,49 @@
 </script>
 
 <template>
-    <div class="common-layout">
-        <el-container>
-          <el-header >
-            <el-card style="max-width: 100%">
+  <!-- 这是主页面 -->
+  <el-row>
+    <el-col>
+            <el-card >
               <!-- 这是时间 -->
             <div class="demo-range">
               时间：
-              <el-time-picker
-                v-model="value1"
-                is-range
-                range-separator="To"
-                start-placeholder="Start time"
-                end-placeholder="End time"
+              <el-date-picker
+        v-model="value1"
+        type="daterange"
+        range-separator="至"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        :size="size"
               />
               <!-- 按钮 -->
               <el-button class="button-item" type="primary" style="float:right" @click="handleSearch">查询</el-button>
               <el-button class="button-item"  style="float:right" @click="handledelete">重置</el-button>
-              
-              
             </div>
-          </el-card>
-            
-          </el-header>
-          <el-main>
+            </el-card>
+
+          </el-col>
+        </el-row>
+  
+
+    <el-row>
+      <el-col>
             <el-card class="box-card" style="max-width: 100%">
               <!-- 添加 -->
             <div class="add-item">
-              <el-button type="primary" @click=" regeAdd = true">新增</el-button>
+              <el-button style="color: #048EFB; border:1px solid #048EFB" @click=" regeAdd = true">新增汇率</el-button>
             </div>
             <!-- 表格 -->
             <div>
-              <el-table :data="tableData" style="width: 100%" >
+              <el-table :data="rateList" style="width: 100%" >
                 <el-table-column prop="currency" label="货币名称" :span="4" />
                 <el-table-column prop="exchangeRate" label="汇率" :span="4"/>
                 <el-table-column prop="createTime" label="添加时间" :span="4"/>
                 <el-table-column prop="updateTime" label="更新时间" :span="4"/>
                 <el-table-column prop="updateName" label="更新人" :span="4"/>
                 <el-table-column label="操作" :span="4">
-                  <el-button type="text" @click="handleEdit(index)">编辑</el-button>
-                  <el-button type="text" @click="handleDelete(index)">删除</el-button>
+                  <el-button type="text" @click="regeEdit = true">编辑</el-button>
+                  <el-button type="text" @click="deleteRate">删除</el-button>
                 </el-table-column>
               </el-table>
             </div>
@@ -95,11 +116,9 @@
               <el-pagination background layout="prev, pager, next" :total="1000" />
              </div>
             </el-card>
-            
-
-          </el-main>
-        </el-container>
-      </div>
+          
+        </el-col>
+      </el-row>
 
       <!-- 这是添加弹窗 -->
       <el-dialog
@@ -111,7 +130,7 @@
         <el-form
         ref="ruleFormRef"
         style="max-width: 600px"
-        :model="ruleForm"
+        :model="rateAdd"
         :rules="rules"
         label-width="auto"
         class="demo-ruleForm"
@@ -119,30 +138,74 @@
         status-icon
       >
         <el-form-item label="货币名称:">
-          <el-select v-model="value" placeholder="请选择" style="width: 240px">
+          <el-select v-model="rateAdd.currency" placeholder="请选择" style="width: 240px">
             <el-option
               
             />
           </el-select>
         </el-form-item>
         <el-form-item label="汇率:">
-          <el-input  style="width: 120px;"/><p class="unit">:1</p>
+          <el-input v-model="rateAdd.exchangeRate" style="width: 120px;"/><p class="unit">:1</p>
           <p>(提示：当前规则每 5 元人民币可兑换 1 新币)</p>
         </el-form-item>
         <el-form-item label="提交人:">
-          <el-input  style="width: 240px;"/>
+          <el-input v-model="rateAdd.updateName" style="width: 240px;"/>
         </el-form-item>
         <el-form-item >
           <div class="dialog-footer">
-          <el-button  type="primary" @click="add">添加</el-button>
+          <el-button  type="primary" @click="edit">添加</el-button>
           <el-button @click="regeAdd = false">取消</el-button>
           </div>
       </el-form-item>
       </el-form>
       </template>
     </el-dialog>
+
+     <!-- 这是编辑弹窗 -->
+     <el-dialog
+     v-model="regeEdit"
+     title="新增汇率"
+     width="500"
+   >
+     <template #footer>
+       <el-form
+       ref="ruleFormRef"
+       style="max-width: 600px"
+       :model="ruleForm"
+       :rules="rules"
+       label-width="auto"
+       class="demo-ruleForm"
+       :size="formSize"
+       status-icon
+     >
+       <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: 120px;"/><p class="unit">:1</p>
+         <p>(提示：当前规则每 5 元人民币可兑换 1 新币)</p>
+       </el-form-item>
+       <el-form-item label="提交人:">
+         <el-input  style="width: 240px;"/>
+       </el-form-item>
+       <el-form-item >
+         <div class="dialog-footer">
+         <el-button  type="primary" @click="edit">修改</el-button>
+         <el-button @click="regeEdit = false">取消</el-button>
+         </div>
+     </el-form-item>
+     </el-form>
+     </template>
+   </el-dialog>
+
+
 </template>
 
+
 <style scoped>
 
 p{
@@ -180,5 +243,7 @@ p{
 .unit{
   margin-left: 10px;
 }
-
+.el-card{
+  padding: 0px;
+}
 </style>
\ No newline at end of file
diff --git a/vue/gold-system/src/views/recharge/addRecharge.vue b/vue/gold-system/src/views/recharge/addRecharge.vue
index 1d0aa58..713c70a 100644
--- a/vue/gold-system/src/views/recharge/addRecharge.vue
+++ b/vue/gold-system/src/views/recharge/addRecharge.vue
@@ -4,39 +4,45 @@
 import { ElMessage } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
 
+// 这是添加充值信息的表单
+const addRecharge = ref({});
+
 </script>
 
 <template>
   <div>
     新增充值
   </div>
-  <el-form :model="form" label-width="auto" style="max-width: 600px">
+
+  <el-form :model="addRecharge" 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-input v-model="homilyId" style="width: 220px;"/>
+      <el-button type="primary" @click="handleClick" style="margin-left: 20px;">查询</el-button>
     </el-form-item>
     <el-form-item label="活动名称">
-      <el-select v-model="value" placeholder="请选择" style="width: 240px">
+      <el-select v-model="activityId" placeholder="请选择" style="width: 300px">
         <el-option
           
         />
       </el-select>
     </el-form-item>
     <el-form-item label="充值金币">
-      <el-input  style="width: 200px;"/>
+      <el-input v-model="paidGold" style="width: 100px;"/>
+      <p style="margin-right: 20px;">个</p>
       <p>免费金币</p>
-      <el-input style="width: 200px" disabled placeholder="Please input"/>
+      <el-input v-model="freeGold" style="width: 100px" />
+      <p>个</p>
     </el-form-item>
     <el-form-item label="充值金额">
-      <el-select v-model="value" placeholder="货币名称" style="width: 240px">
+      <el-select  placeholder="货币名称" style="width: 70px;margin-right: 5px;">
         <el-option
 
         />
       </el-select>
-      <el-input  style="width: 200px;"/>
+      <el-input v-model="rechargeGold" style="width: 225px;"/>
     </el-form-item>
     <el-form-item label="收款方式">
-      <el-select v-model="value" placeholder="请选择" style="width: 240px">
+      <el-select v-model="rechargeWay" placeholder="请选择" style="width: 300px">
         <el-option
 
         />
@@ -44,9 +50,9 @@ import { Plus } from '@element-plus/icons-vue'
     </el-form-item>
     <el-form-item label="交款时间">
       <el-date-picker
-        v-model="value1"
+        v-model="rechargeTime"
         type="datetime"
-        placeholder="Select date and time"
+        style="width: 300px;"
       />
     </el-form-item>
     <el-form-item label="交款凭证">
@@ -60,29 +66,80 @@ import { Plus } from '@element-plus/icons-vue'
       <img v-if="imageUrl" :src="imageUrl" class="avatar" />
       <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
     </el-upload>
+    <p style="margin-left: 10px;color: rgb(177, 176, 176);">仅支持.jpg .png格式，文件≤1MB</p>
     </el-form-item>
     <el-form-item label="备注">
       <el-input
-    v-model="textarea"
-    style="width: 240px"
+    v-model="remark"
+    style="width: 300px"
     :rows="2"
+    maxlength="100"
+    show-word-limit
     type="textarea"
-    placeholder="Please input"
   />
+      
     </el-form-item>
     <el-form-item label="提交人">
-      <el-input style="width: 200px" disabled placeholder="Please input"/>
+      <el-input style="width: 300px" disabled placeholder="提交人姓名"/>
     </el-form-item>
   </el-form>
-  <div class="dialog-footer">
-    <el-button @click="closeAddActivityVisible">取消</el-button>
+  
+    <el-button @click="closeAddActivityVisible" style="margin-left: 280px;">取消</el-button>
     <el-button type="primary" @click="closeAddActivityVisible">
         提交
     </el-button>
-</div>
-<div>
-  
-</div>
+
+   <!-- 客户信息栏 -->
+   <el-card style="width: 700px;float: right;margin-top: -470px;margin-right: 100px;">
+    <el-form :model="user" label-width="auto" style="max-width: 600px" label-position="left">
+     <el-text size="large" style="margin-left: 20px;">客户信息</el-text>
+      <el-row style="margin-top: 20px;">
+        <el-col :span="12">
+      <el-form-item label="姓名" >
+      </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="历史金币总数" >
+          </el-form-item>
+            </el-col>
+        <el-col :span="12">
+      <el-form-item label="精网号" >
+      </el-form-item>
+    </el-col>
+    <el-col :span="12">
+      <el-form-item label="当前金币总数" >
+      </el-form-item>
+        </el-col>
+    <el-col :span="12">
+      <el-form-item label="首次充值日期">
+      </el-form-item>
+    </el-col>
+    <el-col :span="12">
+      <el-form-item label="充值次数" >
+      </el-form-item>
+        </el-col>
+    <el-col :span="12">
+      <el-form-item label="负责客服" >
+      </el-form-item>
+    </el-col>
+    <el-col :span="12">
+      <el-form-item label="消费次数" >
+      </el-form-item>
+        </el-col>
+    <el-col :span="12">
+      <el-form-item label="所属门店" >
+      </el-form-item>
+    </el-col>
+    <el-col :span="12">
+      <el-form-item label="待审核" >
+      </el-form-item>
+        </el-col>
+    </el-row>
+
+     
+
+    </el-form>
+  </el-card>
 </template>
 
 <style scoped>

From 618fb3225e469d532dba7e85cc1104318c3f8f04 Mon Sep 17 00:00:00 2001
From: donghaolin <17667510818@163.com>
Date: Thu, 28 Nov 2024 16:19:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=86=99axios=E8=AF=B7=E6=B1=82=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=89=93=E4=B8=8D=E5=BC=80=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/gold-system/src/views/managerecharge/rate.vue  |  2 +-
 vue/gold-system/src/views/recharge/addRecharge.vue | 35 +++++++++++++++-------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/vue/gold-system/src/views/managerecharge/rate.vue b/vue/gold-system/src/views/managerecharge/rate.vue
index 82a2979..cbe3322 100644
--- a/vue/gold-system/src/views/managerecharge/rate.vue
+++ b/vue/gold-system/src/views/managerecharge/rate.vue
@@ -81,7 +81,7 @@
         :size="size"
               />
               <!-- 按钮 -->
-              <el-button class="button-item" type="primary" style="float:right" @click="handleSearch">查询</el-button>
+              <el-button class="button-item" type="primary" style="float:right" @click="handleSearchByTime">查询</el-button>
               <el-button class="button-item"  style="float:right" @click="handledelete">重置</el-button>
             </div>
             </el-card>
diff --git a/vue/gold-system/src/views/recharge/addRecharge.vue b/vue/gold-system/src/views/recharge/addRecharge.vue
index 713c70a..7c1c329 100644
--- a/vue/gold-system/src/views/recharge/addRecharge.vue
+++ b/vue/gold-system/src/views/recharge/addRecharge.vue
@@ -1,12 +1,24 @@
 <script setup>
     import { reactive } from 'vue';
     import { ref } from 'vue'
-import { ElMessage } from 'element-plus'
-import { Plus } from '@element-plus/icons-vue'
+    import { ElMessage } from 'element-plus'
+    import { Plus } from '@element-plus/icons-vue'
+    import axios from 'axios'
+
+    
+
+
 
 // 这是添加充值信息的表单
-const addRecharge = ref({});
+const addRecharge = ref({ homilyId:'1'});
 
+async function  getUser(){
+const user = await axios({
+  URL: 'http://192.168.8.93:10020/recharge/user',
+  method: 'post',
+  data: { homilyId: addRecharge.homilyId }
+})
+}
 </script>
 
 <template>
@@ -16,21 +28,21 @@ const addRecharge = ref({});
 
   <el-form :model="addRecharge" label-width="auto" style="max-width: 600px">
     <el-form-item label="精网号">
-      <el-input v-model="homilyId" style="width: 220px;"/>
-      <el-button type="primary" @click="handleClick" style="margin-left: 20px;">查询</el-button>
+      <el-input v-model="addRecharge.homilyId" style="width: 220px;" />
+      <el-button type="primary" @click="getUser" style="margin-left: 20px;">查询</el-button>
     </el-form-item>
     <el-form-item label="活动名称">
-      <el-select v-model="activityId" placeholder="请选择" style="width: 300px">
+      <el-select v-model="addRecharge.activityId" placeholder="请选择" style="width: 300px">
         <el-option
           
         />
       </el-select>
     </el-form-item>
     <el-form-item label="充值金币">
-      <el-input v-model="paidGold" style="width: 100px;"/>
+      <el-input v-model="addRecharge.paidGold" style="width: 100px;"/>
       <p style="margin-right: 20px;">个</p>
       <p>免费金币</p>
-      <el-input v-model="freeGold" style="width: 100px" />
+      <el-input v-model="addRecharge.freeGold" style="width: 100px" />
       <p>个</p>
     </el-form-item>
     <el-form-item label="充值金额">
@@ -42,7 +54,7 @@ const addRecharge = ref({});
       <el-input v-model="rechargeGold" style="width: 225px;"/>
     </el-form-item>
     <el-form-item label="收款方式">
-      <el-select v-model="rechargeWay" placeholder="请选择" style="width: 300px">
+      <el-select v-model="addRecharge.rechargeWay" placeholder="请选择" style="width: 300px">
         <el-option
 
         />
@@ -50,7 +62,7 @@ const addRecharge = ref({});
     </el-form-item>
     <el-form-item label="交款时间">
       <el-date-picker
-        v-model="rechargeTime"
+        v-model="addRecharge.rechargeTime"
         type="datetime"
         style="width: 300px;"
       />
@@ -70,7 +82,7 @@ const addRecharge = ref({});
     </el-form-item>
     <el-form-item label="备注">
       <el-input
-    v-model="remark"
+    v-model="addRecharge.remark"
     style="width: 300px"
     :rows="2"
     maxlength="100"
@@ -96,6 +108,7 @@ const addRecharge = ref({});
       <el-row style="margin-top: 20px;">
         <el-col :span="12">
       <el-form-item label="姓名" >
+        <p></p>
       </el-form-item>
         </el-col>
         <el-col :span="12">