From b567e56b603632f2ee66e5ba80a65211d8d7f68f Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Mon, 18 Mar 2024 06:46:08 +0800
Subject: [PATCH] chore: adjust page styles

---
 api/service/mj/service.go                   |  2 +-
 new-ui/projects/web/src/views/Knowledge.vue |  4 +-
 web/src/router.js                           |  8 ++--
 web/src/views/Home.vue                      |  4 +-
 web/src/views/ImageMj.vue                   | 24 ++++++------
 web/src/views/ImageSd.vue                   | 12 +++---
 web/src/views/Knowledge.vue                 | 41 ---------------------
 web/src/views/Login.vue                     |  7 ++--
 web/src/views/PowerLog.vue                  | 31 ++++++++++++++++
 web/src/views/admin/Order.vue               |  2 +-
 web/src/views/admin/SysConfig.vue           |  3 +-
 11 files changed, 62 insertions(+), 76 deletions(-)
 delete mode 100644 web/src/views/Knowledge.vue
 create mode 100644 web/src/views/PowerLog.vue

diff --git a/api/service/mj/service.go b/api/service/mj/service.go
index ab0abbf0..0cc686e0 100644
--- a/api/service/mj/service.go
+++ b/api/service/mj/service.go
@@ -95,7 +95,7 @@ func (s *Service) Run() {
 			}
 			continue
 		}
-
+		logger.Infof("Task Executed: %+v", task)
 		// lock the task until the execute timeout
 		s.taskStartTimes[int(task.Id)] = time.Now()
 		atomic.AddInt32(&s.handledTaskNum, 1)
diff --git a/new-ui/projects/web/src/views/Knowledge.vue b/new-ui/projects/web/src/views/Knowledge.vue
index 247be5da..f8e63a49 100644
--- a/new-ui/projects/web/src/views/Knowledge.vue
+++ b/new-ui/projects/web/src/views/Knowledge.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="page-knowledge" :style="{ height: winHeight + 'px' }">
+  <div class="power-log" :style="{ height: winHeight + 'px' }">
     <div class="inner">
       <h1>会员知识库搜索</h1>
       <h2>页面正在紧锣密鼓开发中，敬请期待！</h2>
@@ -14,7 +14,7 @@ const winHeight = ref(window.innerHeight)
 </script>
 
 <style lang="stylus" scoped>
-.page-knowledge {
+.power-log {
   display: flex;
   justify-content: center;
   align-items center
diff --git a/web/src/router.js b/web/src/router.js
index 80a4bded..6c30c3ca 100644
--- a/web/src/router.js
+++ b/web/src/router.js
@@ -51,10 +51,10 @@ const routes = [
                 component: () => import('@/views/Invitation.vue'),
             },
             {
-                name: 'knowledge',
-                path: '/knowledge',
-                meta: {title: '我的知识库'},
-                component: () => import('@/views/Knowledge.vue'),
+                name: 'powerLog',
+                path: '/powerLog',
+                meta: {title: '消费日志'},
+                component: () => import('@/views/PowerLog.vue'),
             },
         ]
     },
diff --git a/web/src/views/Home.vue b/web/src/views/Home.vue
index 471c9387..21015148 100644
--- a/web/src/views/Home.vue
+++ b/web/src/views/Home.vue
@@ -31,8 +31,6 @@
 <script setup>
 
 import {useRouter} from "vue-router";
-import {checkSession} from "@/action/session";
-import {isMobile} from "@/utils/libs";
 import {ref} from "vue";
 
 const router = useRouter();
@@ -43,7 +41,7 @@ const navs = ref([
   {path: "/sd", icon_path: "/images/sd.png", title: "SD 绘画"},
   {path: "/apps", icon: "menu", title: "应用中心"},
   {path: "/images-wall", icon: "image-list", title: "作品展示"},
-  {path: "/knowledge", icon: "book", title: "知识库"},
+  {path: "/powerLog", icon: "log", title: "消费日志"},
   {path: "/member", icon: "vip-user", title: "会员计划"},
   {path: "/invite", icon: "share", title: "推广计划"},
 ])
diff --git a/web/src/views/ImageMj.vue b/web/src/views/ImageMj.vue
index 6ecae7a5..504a33cb 100644
--- a/web/src/views/ImageMj.vue
+++ b/web/src/views/ImageMj.vue
@@ -340,7 +340,7 @@
               <div class="submit-btn">
                 <el-button color="#47fff1" :dark="false" @click="generate" round>立即生成</el-button>
                 <div class="text-info">
-                  <el-tag type="success">绘图可用额度：{{ imgCalls }}</el-tag>
+                  <el-tag type="success">绘图可用额度：{{ power }}</el-tag>
                 </div>
               </div>
             </el-form>
@@ -580,7 +580,7 @@ const runningJobs = ref([])
 const finishedJobs = ref([])
 
 const socket = ref(null)
-const imgCalls = ref(0)
+const power = ref(0)
 const translating = ref(false)
 const userId = ref(0)
 
@@ -653,7 +653,9 @@ const connect = () => {
   _socket.addEventListener('message', event => {
     if (event.data instanceof Blob) {
       fetchRunningJobs()
-      fetchFinishJobs(1)
+      isOver.value = false
+      page.value = 1
+      fetchFinishJobs(page.value)
     }
   });
 
@@ -665,7 +667,7 @@ const connect = () => {
 const clipboard = ref(null)
 onMounted(() => {
   checkSession().then(user => {
-    imgCalls.value = user['img_calls']
+    power.value = user['power']
     userId.value = user.id
 
     fetchRunningJobs()
@@ -704,7 +706,7 @@ const fetchRunningJobs = () => {
           type: 'error',
           duration: 0,
         })
-        imgCalls.value += 1
+        power.value += 1
         continue
       }
       _jobs.push(jobs[i])
@@ -717,6 +719,9 @@ const fetchRunningJobs = () => {
 
 
 const handleScrollEnd = () => {
+  if (isOver.value === true) {
+    return
+  }
   page.value += 1
   fetchFinishJobs(page.value)
 };
@@ -726,11 +731,6 @@ const pageSize = ref(15)
 const isOver = ref(false)
 const loading = ref(false)
 const fetchFinishJobs = (page) => {
-  if (isOver.value === true) {
-    ElMessage.info("全部数据加载完毕！")
-    return
-  }
-
   loading.value = true
   // 获取已完成的任务
   httpGet(`/api/mj/jobs?status=1&page=${page}&page_size=${pageSize.value}`).then(res => {
@@ -813,7 +813,7 @@ const generate = () => {
   params.value.img_arr = imgList.value
   httpPost("/api/mj/image", params.value).then(() => {
     ElMessage.success("绘画任务推送成功，请耐心等待任务执行...")
-    imgCalls.value -= 1
+    power.value -= 1
   }).catch(e => {
     ElMessage.error("任务推送失败：" + e.message)
   })
@@ -839,7 +839,7 @@ const send = (url, index, item) => {
     prompt: item.prompt,
   }).then(() => {
     ElMessage.success("任务推送成功，请耐心等待任务执行...")
-    imgCalls.value -= 1
+    power.value -= 1
   }).catch(e => {
     ElMessage.error("任务推送失败：" + e.message)
   })
diff --git a/web/src/views/ImageSd.vue b/web/src/views/ImageSd.vue
index 67ef00fe..5b2a9c66 100644
--- a/web/src/views/ImageSd.vue
+++ b/web/src/views/ImageSd.vue
@@ -620,7 +620,9 @@ const connect = () => {
   _socket.addEventListener('message', event => {
     if (event.data instanceof Blob) {
       fetchRunningJobs()
-      fetchFinishJobs(1)
+      isOver.value = false
+      page.value = 1
+      fetchFinishJobs(page.value)
     }
   });
 
@@ -679,6 +681,9 @@ const fetchRunningJobs = (userId) => {
 }
 
 const handleScrollEnd = () => {
+  if (isOver.value === true) {
+    return
+  }
   page.value += 1
   fetchFinishJobs(page.value)
 }
@@ -689,11 +694,6 @@ const isOver = ref(false)
 const loading = ref(false)
 // 获取已完成的任务
 const fetchFinishJobs = (page) => {
-  if (isOver.value === true) {
-    ElMessage.info("全部数据加载完毕！")
-    return
-  }
-
   loading.value = true
   httpGet(`/api/sd/jobs?status=1&page=${page}&page_size=${pageSize.value}`).then(res => {
     if (res.data.length < pageSize.value) {
diff --git a/web/src/views/Knowledge.vue b/web/src/views/Knowledge.vue
deleted file mode 100644
index 247be5da..00000000
--- a/web/src/views/Knowledge.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <div class="page-knowledge" :style="{ height: winHeight + 'px' }">
-    <div class="inner">
-      <h1>会员知识库搜索</h1>
-      <h2>页面正在紧锣密鼓开发中，敬请期待！</h2>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import {ref} from "vue"
-
-const winHeight = ref(window.innerHeight)
-</script>
-
-<style lang="stylus" scoped>
-.page-knowledge {
-  display: flex;
-  justify-content: center;
-  align-items center
-  background-color: #282c34;
-
-  .inner {
-    text-align center
-
-    h1 {
-      color: #202020;
-      font-size: 80px;
-      font-weight: bold;
-      letter-spacing: 0.1em;
-      text-shadow: -1px -1px 1px #111111, 2px 2px 1px #363636;
-    }
-
-    h2 {
-      color #ffffff;
-      font-weight: bold;
-    }
-  }
-
-}
-</style>
diff --git a/web/src/views/Login.vue b/web/src/views/Login.vue
index c4d3af0e..c021b5f2 100644
--- a/web/src/views/Login.vue
+++ b/web/src/views/Login.vue
@@ -9,7 +9,7 @@
         <div class="header">{{ title }}</div>
         <div class="content">
           <div class="block">
-            <el-input placeholder="手机号/邮箱地址" size="large" v-model="username" autocomplete="off" autofocus
+            <el-input placeholder="账号" size="large" v-model="username" autocomplete="off" autofocus
                       @keyup="handleKeyup">
               <template #prefix>
                 <el-icon>
@@ -20,7 +20,7 @@
           </div>
 
           <div class="block">
-            <el-input placeholder="请输入密码" size="large" v-model="password" show-password autocomplete="off"
+            <el-input placeholder="密码" size="large" v-model="password" show-password autocomplete="off"
                       @keyup="handleKeyup">
               <template #prefix>
                 <el-icon>
@@ -52,7 +52,7 @@
 
 <script setup>
 
-import {onMounted, onUnmounted, ref} from "vue";
+import {ref} from "vue";
 import {Lock, UserFilled} from "@element-plus/icons-vue";
 import {httpPost} from "@/utils/http";
 import {ElMessage} from "element-plus";
@@ -61,7 +61,6 @@ import FooterBar from "@/components/FooterBar.vue";
 import {isMobile} from "@/utils/libs";
 import {checkSession} from "@/action/session";
 import {setUserToken} from "@/store/session";
-import {validateEmail, validateMobile} from "@/utils/validate";
 import {prevRoute} from "@/router";
 import ResetPass from "@/components/ResetPass.vue";
 
diff --git a/web/src/views/PowerLog.vue b/web/src/views/PowerLog.vue
new file mode 100644
index 00000000..2f96f0cb
--- /dev/null
+++ b/web/src/views/PowerLog.vue
@@ -0,0 +1,31 @@
+<template>
+  <div class="power-log" :style="{ height: winHeight + 'px' }">
+    <div class="inner">
+      <h2>消费日志</h2>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import {ref} from "vue"
+
+const winHeight = ref(window.innerHeight)
+</script>
+
+<style lang="stylus" scoped>
+.power-log {
+  display: flex;
+  justify-content: center;
+  background-color: #282c34;
+  color #ffffff
+
+  .inner {
+    display flex
+    justify-content left
+    width 100%
+    padding 0 20px 20px 20px
+
+  }
+
+}
+</style>
diff --git a/web/src/views/admin/Order.vue b/web/src/views/admin/Order.vue
index 7de04225..9b76e4a9 100644
--- a/web/src/views/admin/Order.vue
+++ b/web/src/views/admin/Order.vue
@@ -17,7 +17,7 @@
           end-placeholder="结束日期"
           format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
-          style="margin-right: 10px;width: 200px; position: relative;top:3px;"
+          style="margin: 0 10px;width: 200px; position: relative;top:3px;"
       />
       <el-button type="primary" :icon="Search" @click="fetchData">搜索</el-button>
     </div>
diff --git a/web/src/views/admin/SysConfig.vue b/web/src/views/admin/SysConfig.vue
index 293299e8..caf97e7c 100644
--- a/web/src/views/admin/SysConfig.vue
+++ b/web/src/views/admin/SysConfig.vue
@@ -268,8 +268,7 @@ const save = function (key) {
   if (key === 'system') {
     systemFormRef.value.validate((valid) => {
       if (valid) {
-        system.value['img_call_price'] = parseFloat(system.value['img_call_price']) ?? 0
-        system.value['chat_call_price'] = parseFloat(system.value['chat_call_price']) ?? 0
+        system.value['power_price'] = parseFloat(system.value['power_price']) ?? 0
         httpPost('/api/admin/config/update', {key: key, config: system.value}).then(() => {
           ElMessage.success("操作成功！")
         }).catch(e => {