页面优化

hdApp/src/admin/chat/chatPage.vue

@@ -842,7 +842,7 @@ export default {
 }
 
 .message-text {
-  font-size: 28upx;
+  font-size: 32upx;
   line-height: 1.4;
   color: $fontColorMain;
 }
@@ -865,7 +865,7 @@ export default {
 }
 
 .empty-text {
-  font-size: 28upx;
+  font-size: 32upx;
   color: $fontColor3;
 }
 
@@ -889,7 +889,7 @@ export default {
 
 .message-input {
   flex: 1;
-  font-size: 28upx;
+  font-size: 32upx;
   border: none;
   background-color: transparent;
   outline: none;
@@ -912,7 +912,7 @@ export default {
   color: #ffffff;
   border: 1px solid #c9c9c9;
   border-radius: 30upx;
-  font-size: 26upx;
+  font-size: 28upx;
   transition: all 0.3s ease;
 
   &.send-active {

hdApp/src/admin/chat/list.vue

@@ -127,7 +127,7 @@ export default {
         // 判断是否是今年
         else if (year === this.currentYear) {
           // 如果是今年但不是今天或昨天，显示月日和时间，如 "09-01 12:24"
-          return chatTime.substring(5, 14); // 直接截取 "MM-DD HH:mm" 部分
+          return chatTime.substring(5, 16); // 直接截取 "MM-DD HH:mm" 部分
         }
         // 如果不是今年，显示完整日期
         else {

hdApp/src/admin/home/workbench.vue

@@ -446,9 +446,8 @@
 import { mapGetters } from "vuex";
 import { getWeixinId } from "@/api/invite";
 import { getShortUrl } from "@/api/main";
-import { getStat,getStrokeCount } from '@/api/console'
+import { getStat } from '@/api/console' //getStrokeCount 已弃用
 import { consoleIndex } from "@/api/workbench";
-import NotLogin from "@/components/not-login";
 import autoUpdateMixins from "@/mixins/autoUpdate";
 import { ghsList } from "@/api/purchase";
 import { changeDelStatus,hasMoreGhs } from "@/api/ghs";
@@ -456,7 +455,6 @@ import {currentShop} from "@/api/shop";
 import { clearLogin,hasNotice } from "@/api/admin";
 export default {
   name: "workbench",
-  components: { NotLogin },
   mixins: [autoUpdateMixins],
   data () {
     return {
@@ -473,14 +471,10 @@ export default {
         isMini:0
       },
       yesterdayIncome: 0,
-      lskd1: `${this.$constant.imgUrl}/ghs/home/lskd001.jpg`,
-      lskd2: `${this.$constant.imgUrl}/ghs/home/lskd002.jpg`,
-      lskd3: `${this.$constant.imgUrl}/ghs/home/lskd003.jpg`,
       supplierList: [],
       //登录状态 0未登录 1登录仅用到了采购 2登录用到完整功能
       loginStyle :0,
       backAction:'',
-      countStat:{systemIncome:0,systemCount:0,debtCount:0,debtIncome:0,kfWxCount:0,kfWxIncome:0},
       lookMoney:1,
       currentGhs:{},
       displaySupplierList: [],// 用于显示在弹框中的供货商列表
@@ -497,15 +491,7 @@ export default {
 		loginInfo(newVal) {
       if(!this.$util.isEmpty(newVal.admin) && newVal.admin.currentShopId > 0){
           if(!this.$util.isEmpty(newVal.onlyCg)){
-            if(Number(newVal.onlyCg) == 1){
-              this.loginStyle  = 1
-              uni.hideTabBar()
-              this.toRemindCustom()
-            }else{
-              this.loginStyle  = 2
-              uni.showTabBar()
-              this.getMallData()
-            }
+            this.handleLoginStyle(newVal.onlyCg)
           }
       }
 		}
@@ -526,15 +512,7 @@ export default {
 
       if(!this.$util.isEmpty(this.loginInfo.admin) && this.loginInfo.admin.currentShopId > 0){
           if(!this.$util.isEmpty(this.loginInfo.onlyCg)){
-            if(Number(this.loginInfo.onlyCg) == 1){
-              this.loginStyle  = 1
-              uni.hideTabBar()
-              this.toRemindCustom()
-            }else{
-              this.loginStyle  = 2
-              uni.showTabBar()
-              this.getMallData()
-            }
+            this.handleLoginStyle(this.loginInfo.onlyCg)
           }
       }
 
@@ -550,6 +528,17 @@ export default {
 		}
 	},
   methods: {
+    handleLoginStyle(onlyCg){
+      if(Number(onlyCg) == 1){
+        this.loginStyle  = 1
+        uni.hideTabBar()
+        this.toRemindCustom()
+      }else{
+        this.loginStyle  = 2
+        uni.showTabBar()
+        this.getMallData()
+      }
+    },
     getMallData(){
       getWeixinId().then(res => {
         this.getappIdList = res.data
@@ -648,10 +637,7 @@ export default {
     goMore(){
       let that = this
       let shopkeeper = this.loginInfo.staff && this.loginInfo.staff.founder == 2 //判断店主（老板）
-      let items = ['已屏蔽商家', '我已离职', '开关商城', '也要一个此商城', '修改密码', '退出登录'];
-      if(shopkeeper) {
-        items = ['已屏蔽商家', '改进建议', '开关商城', '也要一个此商城', '修改密码', '退出登录'];
-      }
+      let items = shopkeeper ? ['已屏蔽商家', '改进建议', '开关商城', '也要一个此商城', '修改密码', '退出登录'] : ['已屏蔽商家', '我已离职', '开关商城', '也要一个此商城', '修改密码', '退出登录'];
       uni.showActionSheet({
         itemList: items,
         success: function (res) {
@@ -814,7 +800,6 @@ export default {
       this.$util.pageTo(item)
     },
     init () {
-
         this.getGHSList()
 
         // #ifdef MP-WEIXIN
@@ -827,12 +812,6 @@ export default {
           this.lookMoney = res.data.lookMoney
         })
 
-        getStrokeCount().then(res=>{
-          if(res.code == 1){
-            this.countStat = res.data
-          }
-        })
-
         getStat().then(res=>{
           if(res.code == 1){
             that.overview = res.data.overview

mallApp/src/pages/chat/chatPage.vue

@@ -878,7 +878,7 @@ export default {
 }
 
 .message-text {
-  font-size: 28upx;
+  font-size: 32upx;
   line-height: 1.4;
   color: $fontColorMain;
 }
@@ -901,7 +901,7 @@ export default {
 }
 
 .empty-text {
-  font-size: 28upx;
+  font-size: 32upx;
   color: $fontColor3;
 }
 
@@ -925,7 +925,7 @@ export default {
 
 .message-input {
   flex: 1;
-  font-size: 28upx;
+  font-size: 32upx;
   border: none;
   background-color: transparent;
   outline: none;
@@ -948,7 +948,7 @@ export default {
   color: #ffffff;
   border: 1px solid #c9c9c9;
   border-radius: 30upx;
-  font-size: 26upx;
+  font-size: 30upx;
   transition: all 0.3s ease;
 
   &.send-active {

mallApp/src/pages/chat/list.vue

@@ -145,7 +145,7 @@ export default {
         // 判断是否是今年
         else if (year === this.currentYear) {
           // 如果是今年但不是今天或昨天，显示月日和时间，如 "09-01 12:24"
-          return chatTime.substring(5, 14); // 直接截取 "MM-DD HH:mm" 部分
+          return chatTime.substring(5, 16); // 直接截取 "MM-DD HH:mm" 部分
         }
         // 如果不是今年，显示完整日期
         else {