3/17 logo更换1.0

src/layout/components/Sidebar/Logo.vue

@@ -3,13 +3,13 @@
        :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo"/>
+        <img v-if="logo" :src="logo" class="sidebar-logo" />
         <h1 v-show="false" v-else class="sidebar-title"
             :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">
           {{ title }} </h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo"/>
+        <img v-if="logo" :src="logo" class="sidebar-logo" />
         <h1 v-show="false" class="sidebar-title"
             :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">
           {{ title }} </h1>
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import logoImg from '@/assets/logo/logo.png'
+import logoImg from '@/assets/logo/wyLogo.png'
 import variables from '@/assets/styles/variables.scss'
 
 export default {
@@ -72,8 +72,8 @@ export default {
 
     & .sidebar-logo {
       width: 100px;
-      height: 100px;
-      margin-top: 12px;
+      height: 60px;
+      margin-top: 23px;
       vertical-align: middle;
       margin-right: 12px;
     }

src/store/modules/user.js

@@ -98,7 +98,7 @@ const user = {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
           const user = res.data
-          const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/glxplogo.png") : user.avatar;
+          const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/logo/tx.png") : user.avatar;
           if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
             commit('SET_ROLES', res.data.roles)
             commit('SET_PERMISSIONS', res.data.permissions)

src/views/collect/CollectOrderTabs.vue

@@ -2,7 +2,7 @@
   <div>
     <el-row :gutter="0" v-if="isLinkDisabled" style="margin-top: 15px">
       <el-col :span="2" align="left">
-        <img v-if="logo" :src="logo" class="sidebar-logo"/>
+        <img v-if="logo" :src="logo" class="sidebar-logo" />
       </el-col>
 
       <div>
@@ -324,7 +324,7 @@
 </template>
 
 <script>
-import logoImg from '@/assets/logo/logo_dm.png'
+import logoImg from '@/assets/logo/wyLogo.png'
 import DealOrder from '@/views/collect/DealOrder.vue'
 import DealOrderPre from '@/views/collect/DealOrderPre.vue'
 import ConfirmDrugDealOrder from '@/views/collect/ConfirmDrugDealOrder.vue'
@@ -1160,7 +1160,7 @@ export default {
 <style lang="css" scoped>
 .sidebar-logo {
   width: 80px;
-  height: 60px;
+  height: 40px;
   vertical-align: middle;
   margin-left: 25px;
 }

src/views/collect/DealOrder.vue

@@ -1747,17 +1747,29 @@ export default {
       })
     },
 
-    addKeyboardShortcut() {
-      window.addEventListener('key', this.handleKeyboardShortcut);
-    },
-    removeKeyboardShortcut() {
-      window.removeEventListener('key', this.handleKeyboardShortcut);
-    },
     handleKeydown(event){
-      if (event.key === 'F9' ||  event.keyCode === 120) {
-        event.preventDefault(); // 阻止默认行为
-        this.finishOrder()
+      if (this.formData.billNo != null){
+        if (event.key === 'F9' ||  event.keyCode === 120) {
+          event.preventDefault(); // 阻止默认行为
+          this.finishOrder()
+        }
+        if (event.key === 'F10' || event.keyCode === 121) {
+          event.preventDefault(); // 阻止默认行为（如果有的话）
+          // this.push();
+          cancelOrder(this.formData).then(res => {
+            this.loading = false
+            if (res.code == 20000) {
+              const audio = new Audio(require('@/assets/audioFiles/colser.mp3'));
+              audio.play();
+              this.overdeleteCode()
+              this.reset()
+            }
+          }).catch(() => {
+            this.loading = false
+          })
+        }
       }
+
     },
     handleKeyboardShortcut(event) {
       if (event.key === 'F9' || event.keyCode === 120) { // keyCode 120 是 F9 的键码

src/views/myLogin.vue

@@ -18,15 +18,14 @@
       <el-card class="box-card">
         <div style="text-align: center; margin-top: 10px">
           <div v-if="webLogo == ''">
-            <img alt="element-logo" src="@/assets/logo/logo.png">
+            <img alt="element-logo" src="@/assets/logo/wyLogo.png"  width="160" height="80">
           </div>
           <div v-else>
             <img alt="element-logo" :src="webLogo">
           </div>
 
-          <!--<img alt="element-logo" src= "@/assets/logo/logo.png"/>-->
         </div>
-        <h3 class="title">用户登录</h3>
+        <h3 class="title" style="margin-top: 20px">用户登录</h3>
         <el-form-item prop="username" class="item" style="margin-top: -20px">
           <el-input
             placeholder="账号"

src/views/tool/build/index.vue

@@ -147,7 +147,7 @@ import { makeUpHtml, vueTemplate, vueScript, cssStyle } from '@/utils/generator/
 import { makeUpJs } from '@/utils/generator/js'
 import { makeUpCss } from '@/utils/generator/css'
 import drawingDefault from '@/utils/generator/drawingDefault'
-import logo from '@/assets/logo/logo.png'
+import logo from '@/assets/logo/tx.png'
 import CodeTypeDialog from './CodeTypeDialog'
 import DraggableItem from './DraggableItem'