:bug: 账户状态state修正; :sparkles: 首页增加水印

src/main.js

@@ -71,6 +71,7 @@ import {
   Rate,
   NumberKeyboard,
   Empty,
+  Watermark,
 } from "vant";
 import { Image as VanImage } from "vant";
 import store from "./store";
@@ -166,6 +167,7 @@ app
   .use(Rate)
   .use(NumberKeyboard)
   .use(Empty)
+  .use(Watermark)
 
 app.use(router);
 app.use(store);

src/views/buyOrSell/SellConfList.vue

@@ -175,14 +175,14 @@ onMounted(async () => {
                                 </van-button>
                             </div>
 
-                            <!-- 未付款-红#F90068，付款未确认-蓝#00A2F9，双方确认-绿#23EF00，特殊取消-紫#5300EF -->
+                            <!-- 未付款-红#F90068，付款未确认-蓝#00A2F9，双方确认-绿#00CC00，特殊取消-紫#5300EF -->
                             <div class="itemRow" style="display: flex; justify-content: flex-end">
                                 <!-- 未付款 -->
                                 <span v-if="item.status === '0'">{{
                                     showStatusText(item.status)
                                     }}</span>
                                 <!-- 已确认 -->
-                                <span v-if="item.status === '1'" style="color: #23EF00">{{
+                                <span v-if="item.status === '1'" style="color: #00CC00">{{
                                     showStatusText(item.status)
                                     }}</span>
                                 <!-- 特殊取消 -->

src/views/home/HomeIndex.vue

@@ -5,8 +5,8 @@
       <s-header :name="sys ? sys.title : $t('public.homePage')" :noback="true" :isFixed="false"></s-header>
       <!-- 新闻通知 -->
       <template v-if="noticeContent.title">
-        <van-notice-bar @click="noticeClk" mode="link" :scrollable="true" color="rgba(64,77,116,1)" left-icon="volume-o"
-          :text="noticeContent.title" />
+        <van-notice-bar @click="noticeClk" mode="link" :scrollable="true" color="#ff3456" background="#F2F9FC"
+          left-icon="volume-o" :text="noticeContent.title" />
       </template>
       <!-- 灰线 -->
       <!-- <div class="intervalRow"></div> -->
@@ -25,7 +25,7 @@
           </div>
         </div>
       </div>
-      
+
       <div class="c-text-c c-text-18" style="color: #39a6fe;font-weight: bold ;">
         月K线图
       </div>
@@ -75,7 +75,6 @@
           <van-col span="8">总金额</van-col>
         </van-row>
         <van-row v-for="(item, index) in sellTop5List" :key="index" justify="center">
-          <!-- <van-col span="8">卖家{{ index + 1 }}</van-col> -->
           <van-col span="8">{{ item.userAnonymousName }}</van-col>
           <van-col span="8">{{ item.totalNum }}</van-col>
           <van-col span="8">{{ item.totalPrice }}</van-col>
@@ -93,13 +92,16 @@
       <br />
     </div>
     <!-- 新闻通知弹窗 -->
-    <kDialog :dialogTitle="$t('home.notificationPop.notification')" cancelBtnTxt="确定"
-       ref="kDialogRef" >
+    <kDialog :dialogTitle="$t('home.notificationPop.notification')" cancelBtnTxt="确定" ref="kDialogRef">
       <template #content>
         <div class="o-w" style="max-height: 50vh; overflow-y: auto" v-html="noticeContent.content"></div>
       </template>
     </kDialog>
 
+    <!-- 水印 -->
+    <van-watermark :content="watermarkVal" opacity="0.3" :gap-x="70" :gap-y="50" :height="50" rotate="2" />
+
+
   </div>
 </template>
 
@@ -135,15 +137,15 @@ async function getTop5Func() {
 const noticeContent = ref({});
 // 获取公告
 const getNotice = () => {
-  
+
   const params = {
     current: 1,
     size: 10
   }
-  getPageNotice(params).then((res)=>{
+  getPageNotice(params).then((res) => {
     noticeContent.value = res.data.data.records[0] || {};
   })
-  
+
 };
 // 通知弹窗
 const kDialogRef = ref(null);
@@ -168,6 +170,22 @@ const user = getLoginUser();
 const userName = ref(user.userName);
 const sys = ref(null);
 
+const watermarkVal = ref('')
+// 获取当前日期和时间
+const date = new Date();
+
+const year = date.getFullYear() % 100; // 获取年份的后两位
+const month = (date.getMonth() + 1).toString().padStart(2, '0'); // 月份从0开始计数，所以需要+1
+const day = date.getDate().toString().padStart(2, '0'); // 获取日期
+const hours = date.getHours().toString().padStart(2, '0'); // 获取小时
+const minutes = date.getMinutes().toString().padStart(2, '0'); // 获取分钟
+
+const formattedDate = `${year}${month}${day}${hours}${minutes}`;
+
+watermarkVal.value = user.phone + "\n" + formattedDate;
+
+// watermarkVal.value = user.phone + "~" + new Date().toISOString();
+// console.log("watermark >>>", watermarkVal.value);
 
 
 // 图表对象

src/views/taskMessage/TransactionList.vue

@@ -51,14 +51,14 @@
                                     showDateTime(item.sellerConfirmTime)
                                 }}
                             </div>
-                            <!-- 未付款-红#F90068，付款未确认-蓝#00A2F9，双方确认-绿#23EF00，特殊取消-紫#5300EF -->
+                            <!-- 未付款-红#F90068，付款未确认-蓝#00A2F9，双方确认-绿#00CC00，特殊取消-紫#5300EF -->
                             <div class="itemRow" style="display: flex; justify-content: flex-end">
                                 <!-- 未付款 -->
                                 <span v-if="item.status === '0'" style="color: #F90068">{{
                                     showStatusText(item.status)
                                     }}</span>
                                 <!-- 已确认 -->
-                                <span v-if="item.status === '1'" style="color: #23EF00">{{
+                                <span v-if="item.status === '1'" style="color: #00CC00">{{
                                     showStatusText(item.status)
                                     }}</span>
                                 <!-- 已付款，待卖家确认 -->

src/views/taskMessage/UserManageList.vue

@@ -17,17 +17,18 @@ const finished = ref(false); // 结束翻页状态
 
 // state 用户状态：1正常，2禁用，3删除
 const showStateText = (state) => {
-            if (state === '1') {
-                return "正常";
-            }
-            if (state === '2') {
-                return "禁用中";
-            }
-            if (state === '3') {
-                return "已删除";
-            }
-            return "未知";
-        };
+    if (state === '1') {
+        return "正常";
+    }
+    if (state === '2') {
+        return "禁用中";
+    }
+    if (state === '3') {
+        return "已删除";
+    }
+    return "未知";
+};
+
 
 const userManageList = ref([]); // 列表集合
 const userInfoTotal = ref(0); // 用户列表总数
@@ -128,17 +129,22 @@ onMounted(async () => {
                                     item.stockNum }}
                             </div>
 
+                            <div v-if="item.state === '1'" class="itemRow">
+                                <span class="itemTitle">账号状态:&nbsp;</span><span style="color: #00CC00">{{
+                                    showStateText(item.state)
+                                }}</span>
+                            </div>
+
                             <!-- isBan禁用：去禁用账号> -->
-                            <div class="itemRow">
+                            <div v-if="item.state === '2'" class="itemRow">
                                 <span class="itemTitle">账号状态:&nbsp;</span><span style="color: red">{{
                                     showStateText(item.state)
-                                    }}</span>
+                                }}</span>
                             </div>
                             <!-- state 用户状态：1正常，2禁用，3删除 -->
-                            <!-- // 正常情况下显示按钮，非正常情况下仅显示状态 -->
-
-                            <!-- 禁用/启用账号 -->
-                            <div v-if="item.state === '1' && isOper" class="itemRow" style="display: flex; justify-content: flex-end">
+                            <!-- 禁用账号 -->
+                            <div v-if="item.state === '1' && isOper" class="itemRow"
+                                style="display: flex; justify-content: flex-end">
                                 <van-button span="5" round type="primary" :style="{
                                     height: '2em',
                                     padding: '0 1.2em',
@@ -153,14 +159,14 @@ onMounted(async () => {
                             </div>
 
                             <div class="itemRow" style="display: flex; justify-content: flex-end">
-                                <!-- 未禁用 -->
-                                <span v-if="item.status === '1'" style="color: #4fc08d">{{
-                                    showStatusText(item.status)
-                                    }}</span>
-                                <!-- 已禁用 -->
-                                <span v-if="item.status === '2'" style="color: #ff0000">{{
-                                    showStatusText(item.status)
-                                    }}</span>
+                                <!-- 正常 -->
+                                <!-- <span v-if="item.state === '1'" style="color: #23EF00">{{
+                                    showStateText(item.state)
+                                }}</span> -->
+                                <!-- 禁用中 -->
+                                <!-- <span v-if="item.state === '2'" style="color: #ff0000">{{
+                                    showStateText(item.state)
+                                }}</span> -->
                             </div>
 
                         </div>

src/views/trading/TradingIndex.vue

@@ -63,7 +63,7 @@
           <van-col span="8">{{ item.userAnonymousName }}</van-col>
           <van-col span="8">{{ item.entrustNumber }}</van-col>
           <van-col span="8">{{ item.price }}</van-col>
-          
+
         </van-row>
       </div>
 
@@ -107,7 +107,7 @@
 
     <div style="height: 40px;"></div>
     <!-- 买卖按键 -->
-    <div class="buySellBtn">
+    <div v-if="!isAdmin" class="buySellBtn">
       <van-row justify="space-around">
         <van-col span="6"><van-button style="font-size: 20px;" color="linear-gradient(to right, #ff5ebe, #f7189d)"
             size="large" round icon="refund-o" @click="pushPageList('/tradingBuy')">买</van-button></van-col>
@@ -144,12 +144,16 @@ import {
   getBuySellList
 } from "../../service/trading/index";
 import { useRouter } from "vue-router";
+import {
+  getLoginUser,
+} from "@/common/js/utils";
 
 const router = useRouter();
 const finished = ref(false);
 const sys = ref(null);
 const loading = ref(false)
 
+const isAdmin = ref(false);
 
 // const countDownTime = ref(0);
 
@@ -210,6 +214,7 @@ onMounted(() => {
   // 加载样式
   styleUrl('trading');
   onLoad()
+  checkIsAdmin()
 });
 // 初始化
 const init = () => {
@@ -218,6 +223,12 @@ const init = () => {
   // searchParams.current = 1;
 };
 
+const user = getLoginUser();
+const checkIsAdmin = async () => {
+  if (user.phone === "12345678901") {
+    isAdmin.value = true
+  }
+}
 
 // 滚动加载
 const onLoad = () => {

src/views/user/UserIndex.vue

@@ -43,7 +43,7 @@
             <div>
               <van-field class="relationClass" v-model="cofficentForm.phone" :placeholder="$t('user.phoneNumberPlace')">
                 <template #button>
-                  <van-button type="primary" @click="mailboxChg(cofficentForm.phone, 1)">{{ $t("user.confirmLog") }}
+                  <van-button type="primary" @click="mailboxChg(cofficentForm.phone, 1)" size="small" >{{ $t("user.confirmLog") }}
                   </van-button>
                 </template>
               </van-field>
@@ -61,7 +61,7 @@
             <div>
               <van-field class="relationClass" v-model="cofficentForm.mailBox" :placeholder="$t('user.mailboxPlace')">
                 <template #button>
-                  <van-button type="primary" @click="mailboxChg(cofficentForm.mailBox, 2)">{{ $t("user.confirmLog") }}
+                  <van-button type="primary" @click="mailboxChg(cofficentForm.mailBox, 2)" size="small">{{ $t("user.confirmLog") }}
                   </van-button>
                 </template>
               </van-field>
@@ -208,7 +208,10 @@ export default {
     // 控制邮箱显示隐藏
     const mailboxShow = ref(true);
 
-    const isAdmin = ref(false);
+    const isAdmin = ref()
+
+    const adminId = ref('')
+    console.log("adminId", adminId);
 
     const checkIsAdmin = async () => {
       if (user.phone === "12345678901") {
@@ -231,6 +234,9 @@ export default {
     const cardNo = ref('');
     cardNo.value = user.cardNo;
 
+    // TODO: userInfo
+    console.log("user >>>", user.value);
+
     const starsCount = ref(Math.floor(level.value % 5));
     const moonsCount = ref(Math.floor(level.value / 5));
 
@@ -285,7 +291,7 @@ export default {
             showToast(t("user.corrPhonePlace"));
           } else {
             const params = {
-              id: user.id,
+              userId: user.id,
               phone: e,
             };
             const { data } = await updateAdmin(params);
@@ -305,7 +311,7 @@ export default {
             showToast(t("user.corrEmailPlace"));
           } else {
             const params = {
-              id: user.id,
+              userId: user.id,
               email: e,
             };
             const { data } = await updateAdmin(params);
@@ -392,7 +398,7 @@ export default {
       console.log("e", e);
       accountDetail.value.areaId = e.selectId;
       const params = {
-        id: user.id,
+        userId: user.id,
         areaId: e.selectId,
       };
       const { data } = await updateAdmin(params);