htc 1 день назад
Родитель
Сommit
7a1ff08d3e

+ 3 - 1
common/api/baseApi.js

@@ -1,7 +1,9 @@
 const BaseApi = 'https://sxsn.ringzle.com/happytree-app/app' //线上
+const BaseApi2 = 'https://sxsn.ringzle.com/happytree-admin' //线上
 // const BaseApi = 'https://sxsn.ringzle.com/happytree-app/app' //开发
 // const BaseApi = 'http://192.168.2.19:9013/happytree-app/app' //李勇
 
 export {
-	BaseApi
+	BaseApi,
+	BaseApi2
 }

+ 3 - 3
components/pages/nonprofitActivety/index.vue

@@ -6,7 +6,7 @@
 				<view class="na-top-left-status">{{statusCfg[item.activeState]}}</view>
 			</view>
 			<view class="na-top-right">
-				<p>{{item.activityName||''}}</p>
+				<view class="p">{{item.activityName||''}}</view>
 				<view class="tip adf">
 					<view class="tip-left adfac">
 						<image src="https://transcend.ringzle.com/xiaozhi-app/profile/2025/09/11/201a4250-24a4-412d-9ec9-fc58071d10ea.png"></image>
@@ -26,7 +26,7 @@
 		</view>
 		<view class="na-bottom adfacjb">
 			<view class="na-bottom-left adf">
-				已报名&nbsp;&nbsp;<strong>{{item.recruitmentNow}}</strong>/{{item.recruitmentMax===0?'无限制':(item.recruitmentMax+'&nbsp;&nbsp;')}}
+				已报名&nbsp;&nbsp;<strong>{{item.recruitmentNow}}</strong>/{{item.recruitmentMax===0?'无限制':(item.recruitmentMax+'&nbsp;&nbsp;')}}
 			</view>
 			<!-- <view class="na-bottom-right" @click.stop="toApply">立即报名</view> -->
 		</view>
@@ -100,7 +100,7 @@
 				width: calc(100% - 158rpx);
 				padding-left: 20rpx;
 				box-sizing: border-box;
-				&>p{
+				.p{
 					font-family: PingFang-SC, PingFang-SC;
 					font-weight: bold;
 					font-size: 32rpx;

+ 1 - 1
manifest.json

@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxb412ad17f77c75c6",
+        "appid" : "wxb9a6bbfcc8449c16",
         "setting" : {
             "urlCheck" : false,
             "minified" : true

+ 15 - 2
pagesHome/allActivity.vue

@@ -63,7 +63,8 @@
 				<ActivityArea @confirm="areaConfirm"></ActivityArea>
 			</view>
 		</view>
-		<view class="window" :style="{'top':topAll+'px','height':'calc(100vh - '+topAll+'px)'}" v-if="allShow">
+		<view class="window nbg" :style="{'top':topAll+'px','height':'calc(100vh - '+topAll+'px)'}" v-if="allShow">
+			<view class="window-bg" @click="handleAll"></view>
 			<view class="window-all">
 				<view class="pre" v-for="(t,i) in typeList2" :key="i" @click="changeType2(t,t.name,i)">{{t.name}}</view>
 			</view>
@@ -167,7 +168,7 @@
 		// scrollLeft.value = 0;
 		timeShow.value = false;
 		placeShow.value = false;
-		allShow.value = true;
+		allShow.value = !allShow.value;
 	}
 	
 	const changeWindowTime = (wtindex,text) => {
@@ -425,6 +426,7 @@
 			display: flex;
 			flex-wrap: wrap;
 			justify-content: space-between;
+			border-radius: 0 0 24rpx 24rpx;
 			.pre{
 				width: calc(100% / 3 - 12rpx);
 				height: 59rpx;
@@ -439,5 +441,16 @@
 				margin-top: 24rpx;
 			}
 		}
+		
+		&.nbg{
+			background: none;
+		}
+		&-bg{
+			width: 100%;
+			height: 100%;
+			background: rgba(0, 0, 0, .4);
+			position: absolute;
+			z-index: -1;
+		}
 	}
 </style>

+ 2 - 2
pagesHome/fillNonprofitArchives.vue

@@ -48,7 +48,7 @@
 
 <script setup name="">
 	import CusHeader from '@/components/CusHeader/index.vue'
-	import { BaseApi } from '../common/api/baseApi';
+	import { BaseApi2 } from '../common/api/baseApi';
 	import { onLoad } from '@dcloudio/uni-app'
 	import { ref, getCurrentInstance } from 'vue'
 	const { proxy } = getCurrentInstance()
@@ -88,7 +88,7 @@
 	const uploadFilePromise = (url) => {
 	  return new Promise((resolve, reject) => {
 	    let a = uni.uploadFile({
-	      url: BaseApi+'/uploadFile',
+	      url: BaseApi2+'/upload',
 	      filePath: url,
 	      name: 'file',
 	      success: (res) => {

+ 2 - 2
pagesMy/information.vue

@@ -49,7 +49,7 @@
 </template>
 
 <script setup name="">
-	import { BaseApi } from '../common/api/baseApi';
+	import { BaseApi2 } from '../common/api/baseApi';
 	import CusHeader from '@/components/CusHeader/index.vue'
 	import { ref, onMounted, getCurrentInstance } from 'vue'
 	const { proxy } = getCurrentInstance()
@@ -112,7 +112,7 @@
 	const uploadFilePromise = (url) => {
 	  return new Promise((resolve, reject) => {
 	    let a = uni.uploadFile({
-	      url: BaseApi+'/uploadFile',
+	      url: BaseApi2+'/upload',
 	      filePath: url,
 	      name: 'file',
 	      success: (res) => {