修改没好商城跳转

src/App.vue

@@ -121,7 +121,7 @@ const tabbar: TabbarItem[] = [
 		text: "我的",
 		iconPath: "/static/tabbar/my.png",
 		selectedIconPath: "/static/tabbar/my-select.png",
-		launchParam: ["canteen", "selfMerchant", "onlineShop", "coopMerchant", "invitation"],
+		launchParam: ["canteen", "selfMerchant", "onlineShop", "coopMerchant"],
 		auth: ["user", "merchant", "doorAdmin"],
 	},
 ]

src/pages.json

@@ -429,9 +429,9 @@
 			"root": "pages/thirdApp",
 			"pages": [
 				{
-					"path": "thirdAppList",
+					"path": "happyMall",
 					"style": {
-						"navigationBarTitleText": "第三方应用"
+						"navigationBarTitleText": "美好商城"
 					}
 				}
 			]

src/pages/tabbar/index.vue

@@ -99,7 +99,7 @@ const jumpByParam = async () => {
 		const userRole = uni.getStorageSync("userRole") // 获取用户角色
 
 		if (!launchParam) return uni.hideTabBar()
-		if (launchParam == "thirdApp") return uni.reLaunch({ url: "/pages/thirdApp/thirdAppList" })
+		if (launchParam == "thirdApp") return uni.reLaunch({ url: "/pages/thirdApp/happyMall" })
 
 		switch (userRole) {
 			case "merchant":

src/pages/tabbar/my.vue

@@ -405,7 +405,7 @@ const initMenuConfig = () => {
 			{ text: "dev-外来人员就餐", icon: "/static/icon/service_1.png", router: "/pages/apply/foreign-list" },
 			{ text: "dev-跨单位就餐", icon: "/static/icon/service_1.png", router: "/pages/apply/stride-list" },
 			{ text: "dev-包厢预定", icon: "/static/icon/service_4.png", router: "/pages/boxes/apply-list" },
-			{ text: "dev-第三方应用", icon: "/static/icon/login.png", router: "/pages/thirdApp/thirdAppList" },
+			{ text: "dev-第三方应用", icon: "/static/icon/login.png", router: "/pages/thirdApp/happyMall" },
 			{ text: "dev-登录", icon: "/static/icon/login.png", router: "/pages/user/login" },
 			{ text: "dev-角色选择", icon: "/static/icon/login.png", router: "/pages/user/userRole" },
 			{ text: "dev-意见反馈", icon: "/static/icon/service_5.png", router: "/pages/integrated/feedback/index" },

src/pages/thirdApp/happyMall.vue

@@ -1,6 +1,6 @@
 <template>
-	<crud-layout bg="/static/page/blue-bg.png">
-		<z-paging
+	<crud-layout mainIsScroll bg="/static/page/blue-bg.png">
+		<!-- <z-paging
 			ref="pageRef"
 			height="100%"
 			:fixed="false"
@@ -13,8 +13,8 @@
 			:auto-clean-list-when-reload="false"
 			:auto-scroll-to-top-when-reload="false"
 			@scroll="pageHook.scroll"
-		>
-			<view class="h-20rpx" />
+		> -->
+		<!-- <view class="h-20rpx" />
 			<view class="flex-row card p-20rpx m-b-20rpx" v-for="(v, i) in pageHook.list" :key="i" @tap="toDetail(v)">
 				<image class="w-180rpx h-180rpx rounded-12rpx my-auto" :src="filePath(v.logoPic)" mode="aspectFill" />
 				<view class="flex-1 flex-col m-l-20rpx">
@@ -38,59 +38,71 @@
 						</view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 
-			<tm-modal
-				v-model:show="state.show"
-				:overlayClick="false"
-				title="注意"
-				position="bottom"
-				height="auto"
-				:showCancel="true"
-				cancelText="取消"
-				confirmText="继续访问"
-				@confirm="thirdAppJump()"
-				@cancel="state.show = false"
-			>
-				<tm-text font-size="30" color="#999999">
-					您即将离开智慧后勤应用并跳转到第三方应用，请注意个人隐私和账号财产安全。您通过第三方服务页面主动提供给第三方商户的个人信息，相关信息保护责任由第三方商户承担。
-				</tm-text>
-			</tm-modal>
-		</z-paging>
+		<view class="w-full text-center mt-20">
+			<image src="@/static/page/happyMall.png" class="rounded-full w-1/3" mode="widthFix" />
+			<view>美好商城</view>
+			<view class="h-100rpx" />
+			<tm-button @click="show = true">继续跳转</tm-button>
+		</view>
+
+		<tm-modal
+			v-model:show="show"
+			:overlayClick="false"
+			title="注意"
+			position="bottom"
+			height="auto"
+			:showCancel="true"
+			cancelText="取消"
+			confirmText="继续访问"
+			@confirm="thirdAppJump()"
+			@cancel="show = false"
+		>
+			<tm-text font-size="30" color="#999999">
+				您即将离开智慧后勤应用并跳转到第三方应用，请注意个人隐私和账号财产安全。您通过第三方服务页面主动提供给第三方商户的个人信息，相关信息保护责任由第三方商户承担。
+			</tm-text>
+		</tm-modal>
+		<!-- </z-paging> -->
 	</crud-layout>
 </template>
 
 <script setup lang="ts">
-import { ref, reactive } from "vue"
-import { onShow } from "@dcloudio/uni-app"
+import { ref } from "vue"
+import { onLoad } from "@dcloudio/uni-app"
 import { hooks } from "@@/index"
 import { merchantApi } from "@@/api"
-import { filePath } from "@@/utils/file"
+// import { filePath } from "@@/utils/file"
 
-const params = reactive<any>({
-	type: "4",
-})
+// const params = reactive<any>({
+// 	type: "4",
+// })
 
-const state = reactive({
-	show: false,
-})
+const show = ref(false)
 
-onShow(() => {
-	if (pageRef.value) pageRef.value.reload(false)
-})
-
-const pageRef = ref<any>(null)
-const pageHook = hooks.usePage(pageRef, merchantApi.page, null, "data.records")
-const query = (page: number, pagesize: number) => {
-	pageHook.startPage(page, pagesize, false, params)
-}
-
-const toDetail = async (v: any) => {
+onLoad(async () => {
 	const isLogin = await hooks.useCheckLogin()
 	if (isLogin) {
-		state.show = true
+		show.value = true
 	}
-}
+})
+
+// onShow(() => {
+// 	if (pageRef.value) pageRef.value.reload(false)
+// })
+
+// const pageRef = ref<any>(null)
+// const pageHook = hooks.usePage(pageRef, merchantApi.page, null, "data.records")
+// const query = (page: number, pagesize: number) => {
+// 	pageHook.startPage(page, pagesize, false, params)
+// }
+
+// const toDetail = async (v: any) => {
+// 	const isLogin = await hooks.useCheckLogin()
+// 	if (isLogin) {
+// 		state.show = true
+// 	}
+// }
 
 // 确认或拒绝协议
 const thirdAppJump = async () => {
@@ -98,7 +110,7 @@ const thirdAppJump = async () => {
 		uni.showLoading({ title: "跳转中", mask: true })
 		const res: any = await merchantApi.lbLogin()
 		if (res.code == 0) {
-			state.show = false
+			show.value = false
 			if (!res.data) return uni.showToast({ title: "url错误", icon: "none" })
 			window.location.href = res.data
 		}