Update Logo调整

SERVER/YanZhongXYH/xyh-common/src/main/java/cn/xyh/common/helper/LoginHelper.java

@@ -169,7 +169,10 @@ public class LoginHelper {
     public static void updateAmPublic(String amPublic) {
         LoginUser loginUser = getLoginUser();
         loginUser.setAmPublic(amPublic);
-        SaHolder.getStorage().set(LOGIN_USER_KEY, loginUser);
+        SaSession session = StpUtil.getTokenSession();
+        if (!ObjectUtil.isNull(session)) {
+            session.set(LOGIN_USER_KEY, loginUser);
+        }
     }
 
     /**

SERVER/YanZhongXYH/xyh-system/src/main/java/cn/xyh/amActivity/service/impl/AmAlumnusServiceImpl.java

@@ -113,10 +113,11 @@ public class AmAlumnusServiceImpl implements IAmAlumnusService {
         dvo.setMyFollowCount(amFollowService.queryMyFollowCount(amId));
         dvo.setFollowMeCount(amFollowService.queryFollowMeCount(amId));
         dvo.setVisitMeCount(amVisitService.queryVisitMeCount(amId));
-        //System.out.println("LoginHelper.getAmPublic(): " + LoginHelper.getAmPublic());
-        if (LoginHelper.getAmPublic() == null || LoginHelper.getAmPublic().equals(AmAlumnus.PUBLIC_STATUS_PRIVATE)
+        // System.out.println("LoginHelper.getAmPublic(): " + LoginHelper.getAmPublic() + " === " + vo.getAmPublic() + "  ===  " + dvo.getIsFriend());
+        String amPublic = LoginHelper.getAmPublic();
+        if (amPublic == null || amPublic.equals(AmAlumnus.PUBLIC_STATUS_PRIVATE)
                 || vo.getAmPublic().equals(AmAlumnus.PUBLIC_STATUS_PRIVATE) ||
-                LoginHelper.getAmPublic().equals(AmAlumnus.PUBLIC_STATUS_FRIENDLY) && !dvo.getIsFriend()) {
+                amPublic.equals(AmAlumnus.PUBLIC_STATUS_FRIENDLY) && !dvo.getIsFriend()) {
             dvo.setPhonenumber("****");
             dvo.setEmail("****");
             dvo.setQq("****");

UI/XYH.APP/src/components/vber/share/vb-share.vue

@@ -30,15 +30,15 @@ function handleShare(scene:"WXSceneSession"|"WXSceneTimeline"|"WXSceneFavorite")
 
 </script>
 <template>
-  <view v-if="type+1==10" class="d-flex">
+  <view v-if="type>=0" class="d-flex">
     <button v-if="type==0||type==1" open-type="share" class="btn-share" title="分享给好友" @click="handleShare('WXSceneSession')">
       <vb-icon name="share-fill" size="22" class="text-vb"></vb-icon>
     </button>
     <button v-if="type==0||type==2" open-type="share" class="btn-share" title="分享到朋友圈" @click="handleShare('WXSceneTimeline')">
       <vb-icon name="pengyouquan" size="22" class="text-vb"></vb-icon>
     </button>
-    <button v-if="type==0||type==3" open-type="share" class="btn-share" title="分享到收藏" @click="handleShare('WXSceneFavorite')">
+    <!-- <button v-if="type==0||type==3" open-type="share" class="btn-share" title="分享到收藏" @click="handleShare('WXSceneFavorite')">
       <vb-icon name="favorite-1" size="22" class="text-vb"></vb-icon>
-    </button>
+    </button> -->
   </view>
 </template>

UI/XYH.APP/src/core/config/index.ts

@@ -1,9 +1,9 @@
 // 应用全局配置
 export default {
   //baseUrl: "/api",
-  //baseUrl: "https://www.shvber.com/vberYzxyh",
+  baseUrl: "https://www.shvber.com/vberYzxyh",
   //baseUrl: "http://shvber.com:5151",
-  //baseUrl: 'http://localhost:5051',
+  // baseUrl: 'http://localhost:5051',
   // 应用信息
   appInfo: {
     // 应用名称

UI/XYH.APP/src/pages-sub/activity/detail.vue

@@ -61,7 +61,7 @@
         <view class="py-5 fs-20 font-bold">{{ activity.title }}</view>
         <view class="d-flex justify-between  align-center">
           <view class="flex-column">
-            <view class="text-gray-5  py-10 ps-5">{{ activity.categoryName }}</view>
+            <view class="py-10 ps-5 text-gray-5">{{ activity.categoryName }}</view>
             <view class="py-5 ">
             <view class="text-gray-8 d-fcv">
               <i class="iconfont icon-home-fill text-gray-8 pe-5 fs-20"></i>
@@ -69,7 +69,7 @@
             </view>
           </view>
           </view>
-          <vb-share :title="activity.title" :path="`/sub-page/activity/detail?id=${activity.activityId}`" :type="1"></vb-share>
+          <vb-share :title="activity.title" :path="`/sub-page/activity/detail?id=${activity.activityId}`" :type="0"></vb-share>
         </view>
         <view class="my-10 p-10 br-8 bg-gray-2">
           <view class="activity-text">
@@ -259,6 +259,8 @@ const qrType = ref("AD")
 const qrLogo = ref("/static/logos/yz_logo.png")
 const qrSize = ref(300)
 const showQrCodeBox = ref(false)
+
+
 const qrcode = computed(() => {
   return {
     id: qrType.value + activityId.value,
@@ -439,6 +441,7 @@ onLoad((e:any) => {
 onShow(loadData)
 </script>
 
+
 <style scoped lang="scss">
 .activity-text{
   display: flex;

UI/XYH.APP/src/pages-sub/help/detail.vue

@@ -20,7 +20,7 @@
             </view>
           </view>
           </view>
-          <vb-share :title="help.title" :path="`/sub-page/help/detail?id=${help.helpId}`" :type="1"></vb-share>
+          <vb-share :title="help.title" :path="`/sub-page/help/detail?id=${help.helpId}`" :type="0"></vb-share>
         </view>
         <view class="my-10 p-10 br-8 bg-gray-2">
           <view class="help-text">

UI/XYH.APP/src/pages-sub/news/detail.vue

@@ -7,7 +7,7 @@
           <view class="d-fcv py-10 ps-5 text-gray-5">
           {{ formatDate(news.date, "YYYY-MM-DD") }} {{ news.categoryName }}
           </view>
-          <vb-share :title="news.title" :path="`/sub-page/news/detail?id=${news.newsId}`" :type="1"></vb-share>
+          <vb-share :title="news.title" :path="`/sub-page/news/detail?id=${news.newsId}`" :type="0"></vb-share>
         </view>
         <view class="my-5">
           <rich-text :nodes="news.content"></rich-text>

UI/XYH.VUE/src/layouts/main/extras/Extras.vue

@@ -1,12 +1,12 @@
 <script setup lang="ts">
 // import Customize from "@/layouts/main/extras/_Customize.vue"
-import HelpDrawer from "@/layouts/main/extras/_HelpDrawer.vue"
+// import HelpDrawer from "@/layouts/main/extras/_HelpDrawer.vue"
 import ScrollTop from "@/layouts/main/extras/_ScrollTop.vue"
-import ToolButtons from "@/layouts/main/extras/_ToolButtons.vue"
+// import ToolButtons from "@/layouts/main/extras/_ToolButtons.vue"
 </script>
 <template>
 	<!-- <Customize></Customize> -->
-	<HelpDrawer></HelpDrawer>
+	<!-- <HelpDrawer></HelpDrawer> -->
 	<ScrollTop></ScrollTop>
-	<ToolButtons></ToolButtons>
+	<!-- <ToolButtons></ToolButtons> -->
 </template>

UI/XYH.VUE/src/views/amActivity/activity/index.vue

@@ -514,7 +514,7 @@ function handleHot(row: any) {
 	message
 		.confirm("确认要" + text + " [" + row.title + "] 的活动？")
 		.then(() => {
-			apis.amActivity.activityApi.topActivity(row.activityId, row.isHot).then(() => {
+			apis.amActivity.activityApi.hotActivity(row.activityId, row.isHot).then(() => {
 				message.msgSuccess(text + "成功")
 				handleQuery()
 			})
@@ -744,7 +744,7 @@ onMounted(init)
 				<span v-else>{{ row.address }}</span>
 			</template>
 			<template #isHead="{ row }">
-				<el-tag v-if="row.isHead > 0" type="success">{{ row.isHead }}</el-tag>
+				<el-tag v-if="row.isHead > 0" type="success">是</el-tag>
 				<el-tag v-else type="info">否</el-tag>
 				<span class="ms-2">
 					<vb-tooltip