1

mer_uniapp/components/pageFooter/index.vue

@@ -73,7 +73,8 @@
 			checkColor() {
 				if (this.dataConfig) {
 					return {
-						color: this.dataConfig.themeStyleConfig.tabVal?this.dataConfig.checkColor.color[0].item:this.themeColor
+						color: '#FF6702'
+						// color: this.dataConfig.themeStyleConfig.tabVal?this.dataConfig.checkColor.color[0].item:this.themeColor
 					};
 				}
 			},
@@ -96,7 +97,7 @@
 				isCustom: '',
 				bottomNavigationList: [],
 				activeRouter: '',
-				themeColor:this.$options.filters.filterTheme(app.globalData.theme)
+				// themeColor:this.$options.filters.filterTheme(app.globalData.theme)
 			}
 		},
 		methods: {

mer_uniapp/mixins/tags.js

@@ -39,11 +39,12 @@ export default {
 			console.log(data,'data')
 			let res =[]
 			res = data.map(ite => ({label: ite.measure,checked: false,id: ite.id}))
-			this.labelList = [{
-				id: 0,
-				label: "销量排行",
-				checked: true
-			},...res]
+			// this.labelList = [{
+			// 	id: 0,
+			// 	label: "销量排行",
+			// 	checked: true
+			// },...res]
+			this.labelList = res;
 			console.log(this.labelList,'this.labelList')
 		}
 	}

mer_uniapp/pages/confession_wall/home/index.vue

@@ -255,10 +255,16 @@
 		</uni-popup>
 		<!-- 学校 -->
 		<uni-popup ref="schoolRef" :is-mask-click="false">
-			<view class="w-full flex-center" :style="{height: windowHeight + 'px'}">
+			<view class="w-full flex-center" :style="{height: windowHeight + 'px',flexDirection:'column'}">
 				<navigator hover-class='none' url='/pages/discover/discover_user/index'>
 					<image :src="`${urlDomain}crmebimage/public/store/2025/05/20/ac4f4703de5d4a8c9490e7e27c9f25b8pzzy4l1ywq.png`" mode="heightFix" style="height: 694rpx;width: 616rpx;"></image>
 				</navigator>
+				<!-- 关闭圆形图标 -->		
+				<view style="width: 80rpx;height: 80rpx;line-height: 80rpx;text-align:center; border-radius: 50%;background-color: rgba(0, 0, 0, 0.5);">
+					<text class="text-3xl" @click="this.$refs.schoolRef.close()">
+						<text class="iconfont icon-guanbi" style="color: #fff;"></text>
+					</text>
+				</view>
 			</view>
 		</uni-popup>
 	</view>

mer_uniapp/pages/game_dazi/index.vue

@@ -106,10 +106,16 @@
 		</uni-popup>
 		<!-- 学校 -->
 		<uni-popup ref="schoolRef" :is-mask-click="false">
-			<view class="w-full flex-center" :style="{height: windowHeight + 'px'}">
+			<view class="w-full flex-center" :style="{height: windowHeight + 'px',flexDirection:'column'}">
 				<navigator hover-class='none' url='/pages/discover/discover_user/index?dazi=dazi'>
 					<image :src="`${urlDomain}crmebimage/public/store/2025/05/20/ac4f4703de5d4a8c9490e7e27c9f25b8pzzy4l1ywq.png`" mode="heightFix" style="height: 694rpx;width: 616rpx;"></image>
 				</navigator>
+				<!-- 关闭圆形图标 -->		
+				<view style="width: 80rpx;height: 80rpx;line-height: 80rpx;text-align:center; border-radius: 50%;background-color: rgba(0, 0, 0, 0.5);">
+					<text class="text-3xl" @click="this.$refs.schoolRef.close()">
+						<text class="iconfont icon-guanbi" style="color: #fff;"></text>
+					</text>
+				</view>
 			</view>
 		</uni-popup>
 	</view>

mer_uniapp/pages/index/index.vue

@@ -156,7 +156,9 @@
 
 
 		</view>
-
+		<!-- 底部导航距离，做兼容处理的-->
+		<view v-if="bottomNavigationIsCustom" class="footerBottom"></view>
+		<pageFooter></pageFooter>
 	</view>
 </template>
 
@@ -177,11 +179,15 @@
 	} from '@/config/cache';
 	import Cache from '@/utils/cache';
 	import tags from '../../mixins/tags';
+	import pageFooter from "@/components/pageFooter/index.vue";
 	var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
 	let app = getApp();
 	export default {
 		mixins:[tags],
-		computed: mapGetters(['isLogin']),
+		computed: mapGetters(['isLogin','bottomNavigationIsCustom']),
+		components:{
+			pageFooter
+		},
 		data() {
 			return {
 				statusBarHeight: app.globalData.statusBarHeight,

mer_uniapp/pages/order/index.vue

@@ -70,6 +70,9 @@
 			<view class="flex-center no-data-tip" v-if="loadTitle">{{loadTitle}}</view>
 		</view>
 	    <emptyPage v-else title="暂无订单～" :imgSrc="urlDomain+'crmebimage/presets/noShopper.png'"></emptyPage>
+				<!-- 底部导航距离，做兼容处理的-->
+		<view v-if="bottomNavigationIsCustom" class="footerBottom"></view>
+		<pageFooter></pageFooter>
 	</view>
 </template>
 
@@ -89,12 +92,14 @@
 	import {
 		tokenIsExistApi
 	} from '@/api/api.js';
+	import pageFooter from "@/components/pageFooter/index.vue";
 	var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
 	let app = getApp();
 	export default {
 		components: {
 			emptyPage,
-			PriceChange
+			PriceChange,
+			pageFooter
 		},
 		data() {
 			return {

mer_uniapp/pages/order_addcart/order_addcart.vue

@@ -247,7 +247,7 @@
 			<text v-show="popupShow" class="iconfont icon-guanbi5" @click="popupShow = false"></text>
 		</view>
 		<view class="mask" v-show="popupShow" @touchmove.stop.prevent="moveStop" @click="popupShow = false"></view>
-		<!-- <pageFooter></pageFooter> -->
+		<pageFooter></pageFooter>
 	</view>
 </template>
 

mer_uniapp/pages/trade_fair/home/index.vue

@@ -105,10 +105,16 @@
 		</uni-popup>
 		<!-- 学校 -->
 		<uni-popup ref="schoolRef" :is-mask-click="false">
-			<view class="w-full flex-center" :style="{height: windowHeight + 'px'}">
+			<view class="w-full flex-center" :style="{height: windowHeight + 'px',flexDirection:'column'}">
 				<navigator hover-class='none' url='/pages/trade_fair/trade_fair_user/index'>
 					<image :src="`${urlDomain}crmebimage/public/store/2025/05/20/ac4f4703de5d4a8c9490e7e27c9f25b8pzzy4l1ywq.png`" mode="heightFix" style="height: 694rpx;width: 616rpx;"></image>
 				</navigator>
+				<!-- 关闭圆形图标 -->		
+				<view style="width: 80rpx;height: 80rpx;line-height: 80rpx;text-align:center; border-radius: 50%;background-color: rgba(0, 0, 0, 0.5);">
+					<text class="text-3xl" @click="this.$refs.schoolRef.close()">
+						<text class="iconfont icon-guanbi" style="color: #fff;"></text>
+					</text>
+				</view>
 			</view>
 		</uni-popup>
 	</view>

mer_uniapp/pages/user/index.vue

@@ -192,6 +192,9 @@
 				</view>
 			</view>
 		</uni-popup>
+				<!-- 底部导航距离，做兼容处理的-->
+		<view v-if="bottomNavigationIsCustom" class="footerBottom"></view>
+		<pageFooter></pageFooter>
 	</view>
 </template>
 <script>