From b88734477e6d549403ad61b26970b13b343cc088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Sat, 15 Feb 2025 02:53:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/favicon2.ico                           | Bin 643 -> 0 bytes
 src/api/app/appBszxBm/model/index.ts          |   1 +
 src/api/app/appBszxPay/model/index.ts         |   1 +
 src/api/cms/cmsArticle/model/index.ts         |   8 ++++
 src/layout/components/header-tools.vue        |   4 +-
 src/layout/index.vue                          |   2 +-
 src/views/app/appBszxBm/components/search.vue |  37 ++++++++++++++++++
 src/views/app/appBszxBm/index.vue             |   1 +
 .../app/appBszxPay/components/search.vue      |  37 ++++++++++++++++++
 src/views/app/appBszxPay/index.vue            |   1 +
 .../cms/cmsArticle/components/articleEdit.vue |  28 ++++++++++++-
 src/views/cms/cmsArticle/index.vue            |   2 +-
 src/views/cms/cmsNavigation/index.vue         |   5 +--
 13 files changed, 118 insertions(+), 9 deletions(-)
 delete mode 100644 public/favicon2.ico

diff --git a/public/favicon2.ico b/public/favicon2.ico
deleted file mode 100644
index 8ab72365e3bf50be6a018b9ce385dc0bf8cf8be7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 643
zcmV-}0(|`d0096201yxW0000W0Br&Q02TlM0EtjeM-2)Z3IG5A4M|8uQUCw|5C8xG
z5C{eU001BJ|6u?C00d`2O+f$vv5yP<VFdsH00DDSM?wIu&K&6g001CkNK#Dz0D2|>
z0Dy!50Qvv`0D$NK0Cg|`0P0`>06Lfe02gqax=}m;00HYsL_t(Ijop$xYgADXhMzh2
z?%v&mWV0smBN9Q4g#qyg_y=NPBc#wYq99l(S_xLBwGbg)T1$hKXeC&Qwu)gD10q6V
zNMaJ*yLb1VdtQs(Y?^d-4h++r_nA2}FZ`e3JDvMJ%jDY~`A#qMT;6+y5Y8Sb5}2l^
z%f<Sp!rF$4^(}2Ze605JXBAmnMcV47_wwFrPZ#$AQ&VNVev`Ro3na{}`(W}owAxsn
zV}dX|h?Qcz_lo1#`T*vxop;R?%=L((e&Y)Iok9rU3ox*xgrW$X?N1<Z?C>55LIF|K
zg>-U^oL^6uz&Yx3mm&8M3Ig3m2A~H|L@R~OpK$jkR4Wii(ECQeN~l_<7^qUJj~IXp
zGq)4QYEUY{;1E1ofW{a2)PQCanrXMTQfPcdKURq@%#7|YvD_@{?T3qY=EN%o20(Rq
z{u0_L_#E=QcO!$Og6(A2?c^!3{0;zT^~oIhU9Eh($M-cDABCY|sMTR)6b_BUkqJ;0
zQs$`)tuR(<?M+|;)1^Cyt?JGRJB={{Rz|^@WRiqJj<F3iz&_g2!iItNmk5rlw`yu9
z6U6Q)SdE|r3W!`rVB5T{68%}_+2Zb=xDV)?X?8Z!c2Z%mR-wqc9!bb8i!xpu%Z&MO
dppE|}{sOYf>!>ng!ASrB002ovPDHLkV1kdf5@G-V

diff --git a/src/api/app/appBszxBm/model/index.ts b/src/api/app/appBszxBm/model/index.ts
index fb04ebb..5305fb6 100644
--- a/src/api/app/appBszxBm/model/index.ts
+++ b/src/api/app/appBszxBm/model/index.ts
@@ -59,5 +59,6 @@ export interface AppBszxBm {
  */
 export interface AppBszxBmParam extends PageParam {
   id?: number;
+  formId?: number;
   keywords?: string;
 }
diff --git a/src/api/app/appBszxPay/model/index.ts b/src/api/app/appBszxPay/model/index.ts
index 8692581..8ef0b7b 100644
--- a/src/api/app/appBszxPay/model/index.ts
+++ b/src/api/app/appBszxPay/model/index.ts
@@ -59,5 +59,6 @@ export interface AppBszxPay {
  */
 export interface AppBszxPayParam extends PageParam {
   id?: number;
+  formId?: number;
   keywords?: string;
 }
diff --git a/src/api/cms/cmsArticle/model/index.ts b/src/api/cms/cmsArticle/model/index.ts
index bc3a786..78abea8 100644
--- a/src/api/cms/cmsArticle/model/index.ts
+++ b/src/api/cms/cmsArticle/model/index.ts
@@ -37,6 +37,12 @@ export interface CmsArticle {
   virtualViews?: number;
   // 实际阅读量
   actualViews?: number;
+  // 活动价格
+  price?: number;
+  // 活动开始时间
+  startTime?: string;
+  // 活动结束时间
+  endTime?: string;
   // 浏览权限(0公开 1会员 2密码)
   permission?: number;
   // 访问密码
@@ -105,6 +111,8 @@ export interface CmsArticle {
   qrcode?: string;
   // 文章路径
   url?: string;
+  value?: any;
+  label?: string;
 }
 
 /**
diff --git a/src/layout/components/header-tools.vue b/src/layout/components/header-tools.vue
index d07b4c7..fab80c5 100644
--- a/src/layout/components/header-tools.vue
+++ b/src/layout/components/header-tools.vue
@@ -43,12 +43,12 @@
       <a-dropdown placement="bottom" :overlay-style="{ minWidth: '280px' }">
         <div class="ele-admin-header-avatar">
           <a-avatar :src="loginUser.logo">
-            <template v-if="!merchantAvatar" #icon>
+            <template v-if="!loginUser.logo" #icon>
               <user-outlined />
             </template>
           </a-avatar>
           <span :class="{ 'hidden-sm-and-down': styleResponsive }">
-            {{ loginUser.tenantName }}
+           {{ loginUser.tenantName }}
           </span>
           <down-outlined style="margin-left: 6px" />
         </div>
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 96b53cc..84b915f 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -133,7 +133,7 @@
 
   const themeStore = useThemeStore();
   // 网站名称
-  const projectName = t('layout.system');
+  const projectName = localStorage.getItem('TenantName') || t('layout.system');
   // 网站LOGO
   const logoPath = 'https://oss.wsdns.cn/20250127/5804668e47bf4b58ad0f29f3d8a36da2.png';
 
diff --git a/src/views/app/appBszxBm/components/search.vue b/src/views/app/appBszxBm/components/search.vue
index 51356a1..38bb874 100644
--- a/src/views/app/appBszxBm/components/search.vue
+++ b/src/views/app/appBszxBm/components/search.vue
@@ -1,6 +1,18 @@
 <!-- 搜索表单 -->
 <template>
   <a-space :size="10" style="flex-wrap: wrap">
+    <a-tree-select
+      allow-clear
+      :tree-data="articles"
+      tree-default-expand-all
+      style="width: 280px"
+      :listHeight="700"
+      placeholder="按活动筛选"
+      :value="where.formId || undefined"
+      :dropdown-style="{ overflow: 'auto' }"
+      @update:value="(value?: number) => (where.formId = value)"
+      @change="onCategoryId"
+    />
     <a-input-search
       allow-clear
       placeholder="请输入关键词"
@@ -20,6 +32,8 @@
   import {AppBszxBm, AppBszxBmParam} from "@/api/app/appBszxBm/model";
   import useSearch from "@/utils/use-search";
   import {listAppBszxBm} from "@/api/app/appBszxBm";
+  import {listCmsArticle} from "@/api/cms/cmsArticle";
+  import {CmsArticle} from "@/api/cms/cmsArticle/model";
 
   const props = withDefaults(
     defineProps<{
@@ -40,9 +54,12 @@
   const { where } = useSearch<AppBszxBmParam>({
     id: undefined,
     keywords: '',
+    formId: undefined,
     userId: undefined
   });
 
+  const articles = ref<CmsArticle[]>([]);
+
   const reload = () => {
     emit('search', where);
   };
@@ -133,6 +150,26 @@
 
   };
 
+  const query = () => {
+    listCmsArticle({
+      model: 'bm'
+    }).then((res) => {
+      articles.value = res.map(d => {
+        d.value = d.articleId;
+        d.label = d.title;
+        return d;
+      });
+    })
+  }
+
+  // 按分类查询
+  const onCategoryId = (id: number) => {
+    where.formId = id;
+    emit('search', where);
+  };
+
+  query();
+
   watch(
     () => props.selection,
     () => {}
diff --git a/src/views/app/appBszxBm/index.vue b/src/views/app/appBszxBm/index.vue
index 41e84b6..59ec689 100644
--- a/src/views/app/appBszxBm/index.vue
+++ b/src/views/app/appBszxBm/index.vue
@@ -140,6 +140,7 @@
       key: 'sex',
       width: 90,
       align: 'center',
+      customRender: ({ text }) => ['未知','男','女'][text]
     },
     {
       title: '班级',
diff --git a/src/views/app/appBszxPay/components/search.vue b/src/views/app/appBszxPay/components/search.vue
index be27ca8..cf8927e 100644
--- a/src/views/app/appBszxPay/components/search.vue
+++ b/src/views/app/appBszxPay/components/search.vue
@@ -1,6 +1,18 @@
 <!-- 搜索表单 -->
 <template>
   <a-space :size="10" style="flex-wrap: wrap">
+    <a-tree-select
+      allow-clear
+      :tree-data="articles"
+      tree-default-expand-all
+      style="width: 280px"
+      :listHeight="700"
+      placeholder="按活动筛选"
+      :value="where.formId || undefined"
+      :dropdown-style="{ overflow: 'auto' }"
+      @update:value="(value?: number) => (where.formId = value)"
+      @change="onCategoryId"
+    />
     <a-input-search
       allow-clear
       placeholder="请输入关键词"
@@ -21,6 +33,8 @@
   import {AppBszxPayParam} from "@/api/app/appBszxPay/model";
   import {AppBszxBm} from "@/api/app/appBszxBm/model";
   import {listAppBszxPay} from "@/api/app/appBszxPay";
+  import {CmsArticle} from "@/api/cms/cmsArticle/model";
+  import {listCmsArticle} from "@/api/cms/cmsArticle";
 
   const props = withDefaults(
     defineProps<{
@@ -41,9 +55,12 @@
   const { where } = useSearch<AppBszxPayParam>({
     id: undefined,
     keywords: '',
+    formId: undefined,
     userId: undefined
   });
 
+  const articles = ref<CmsArticle[]>([]);
+
   const reload = () => {
     emit('search', where);
   };
@@ -134,6 +151,26 @@
 
   };
 
+  // 按分类查询
+  const onCategoryId = (id: number) => {
+    where.formId = id;
+    emit('search', where);
+  };
+
+  const query = () => {
+    listCmsArticle({
+      model: 'pay'
+    }).then((res) => {
+      articles.value = res.map(d => {
+        d.value = d.articleId;
+        d.label = d.title;
+        return d;
+      });
+    })
+  }
+
+  query();
+
   watch(
     () => props.selection,
     () => {}
diff --git a/src/views/app/appBszxPay/index.vue b/src/views/app/appBszxPay/index.vue
index 062fac5..b511497 100644
--- a/src/views/app/appBszxPay/index.vue
+++ b/src/views/app/appBszxPay/index.vue
@@ -126,6 +126,7 @@
       dataIndex: 'sex',
       key: 'sex',
       align: 'center',
+      customRender: ({ text }) => ['未知', '男', '女'][text]
     },
     {
       title: '手机号码',
diff --git a/src/views/cms/cmsArticle/components/articleEdit.vue b/src/views/cms/cmsArticle/components/articleEdit.vue
index 2dc5f0a..8682a5d 100644
--- a/src/views/cms/cmsArticle/components/articleEdit.vue
+++ b/src/views/cms/cmsArticle/components/articleEdit.vue
@@ -122,6 +122,18 @@
                   v-model:value="form.overview"
                 />
               </a-form-item>
+              <a-form-item label="价格" name="price">
+                <a-input-number
+                  :min="0"
+                  :max="999999999"
+                  style="width: 206px"
+                  placeholder="请输入价格"
+                  v-model:value="form.price"
+                />
+              </a-form-item>
+              <a-form-item label="开始结束时间" name="startTime">
+                <a-range-picker v-model:value="dateRange" value-format="YYYY-MM-DD HH:mm:ss" />
+              </a-form-item>
               <a-form-item label="文章来源" name="source">
                 <source-select
                   v-model:value="form.source"
@@ -230,6 +242,8 @@
   const files = ref<ItemType[]>([]);
   const category = ref<string[]>([]);
   const password = ref();
+  // 日期范围选择
+  const dateRange = ref<[string, string]>(['', '']);
   const lang = localStorage.getItem('i18n-lang');
 
   // 用户信息
@@ -262,6 +276,10 @@
     virtualViews: 0,
     // 实际阅读量
     actualViews: 0,
+    // 价格
+    price: 0,
+    startTime: undefined,
+    endTime: undefined,
     recommend: undefined,
     translation: true,
     permission: 0,
@@ -276,7 +294,7 @@
     // 备注
     comments: undefined,
     // 状态
-    status: 1,
+    status: 0,
     // 创建时间
     createTime: '',
     // 更新时间
@@ -438,6 +456,11 @@
           ...form,
           content: content.value
         };
+        const [createTimeStart, createTimeEnd] = dateRange.value;
+        if(createTimeEnd && createTimeStart){
+          formData.startTime = createTimeStart;
+          formData.endTime = createTimeEnd;
+        }
         const saveOrUpdate = isUpdate.value ? updateCmsArticle : addCmsArticle;
         saveOrUpdate(formData)
           .then((msg) => {
@@ -493,6 +516,9 @@
             }else {
               form.tags = undefined;
             }
+            if(data.endTime){
+              dateRange.value = [`${data.startTime}`, `${data.endTime}`]
+            }
             if(data.files){
               const arr = JSON.parse(data.files)
               arr.map((url:string) => {
diff --git a/src/views/cms/cmsArticle/index.vue b/src/views/cms/cmsArticle/index.vue
index d832b29..d697351 100644
--- a/src/views/cms/cmsArticle/index.vue
+++ b/src/views/cms/cmsArticle/index.vue
@@ -394,7 +394,7 @@
           if (!d.component) {
             d.disabled = true;
           }
-          if(d.model == 'index' || d.model == 'page' || d.model == 'order'){
+          if(d.model == 'index' || d.model == 'page' || d.model == 'order' || d.model == 'links'){
             d.disabled = true;
           }
           return d;
diff --git a/src/views/cms/cmsNavigation/index.vue b/src/views/cms/cmsNavigation/index.vue
index b77cf85..e828be3 100644
--- a/src/views/cms/cmsNavigation/index.vue
+++ b/src/views/cms/cmsNavigation/index.vue
@@ -88,10 +88,7 @@
           <template v-else-if="column.key === 'title'">
             <a-space>
               <a-avatar v-if="record.icon" :size="22" :src="record.icon" />
-<!--              <span class="cursor-pointer" v-if="isDirectory(record)">{{-->
-<!--                  record.title-->
-<!--                }}</span>-->
-              <a class="cursor-pointer text-black" :href="navTo(record,'',true)" target="_blank">{{ record.title }}</a>
+              <span class="text-black">{{ record.title }}</span>
             </a-space>
           </template>
           <template v-if="column.key === 'banner'">