From bd4c4cc8fb2986b5fb6332871bbb39f2afa2bb11 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 30 Mar 2026 10:54:29 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=BB=BC=E5=90=88=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=81=94=E7=B3=BB=E7=94=B5=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                              |  4 ++--
 src/pages/tabbar/integrated.vue   | 27 ++++++++++++++++++++++++++-
 src/pages/tabbar/order.vue        |  2 +-
 src/pages/tabbar/selfMerchant.vue | 17 +++--------------
 src/pages/thirdApp/happyMall.vue  | 14 ++------------
 5 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/.env b/.env
index 235df28..3564bc1 100644
--- a/.env
+++ b/.env
@@ -20,8 +20,8 @@ VITE_OAUTH2_APP_CLIENT='mini:mini'
 # VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/api # 域名线上
 #VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上
 # VITE_APP_DEV_SERVICE = http://192.168.101.174:9999 # 邓-本地
-VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 # 邓-本地
-# VITE_APP_DEV_SERVICE = http://123.157.250.162:8089/api # 测试线上
+# VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 # 邓-本地
+VITE_APP_DEV_SERVICE = http://123.157.250.162:8089/api # 测试线上
 
 # --------------------------- 开发环境 图片访问基础地址 ---------------------------
 # VITE_IMAGE_DEV_PATH = https://stgl.pj.gov.cn/api # 域名线上
diff --git a/src/pages/tabbar/integrated.vue b/src/pages/tabbar/integrated.vue
index 76415d8..fa202e5 100644
--- a/src/pages/tabbar/integrated.vue
+++ b/src/pages/tabbar/integrated.vue
@@ -9,20 +9,29 @@
 					<div v-for="item in services" :key="item.name" class="service-item" @click="goPage(item)">
 						<div class="service-icon-wrapper">
 							<image :src="item.icon" class="service-icon" />
-							<view v-if="item.name === 'todo' && todoCount > 0" class="badge">{{ todoCount > 99 ? "99+" : todoCount }}</view>
+							<view v-if="item.name === 'todo' && todoCount > 0" class="badge">{{ todoCount > 99 ? "99+" :
+								todoCount }}</view>
 						</div>
 						<div class="service-label">{{ item.label }}</div>
 					</div>
 				</div>
 			</div>
 		</div>
+		<view class="position-absolute bottom-20rpx left-0 right-0 second-text-26 text-center">
+			<text>联系热线：</text>
+			<text @click="doPhone('18367908152')">18367908152</text>
+			&nbsp;
+			<text @click="doPhone('15657370065')">15657370065</text>
+		</view>
 	</crud-layout>
 </template>
 
 <script setup lang="ts">
 import { onLoad } from "@dcloudio/uni-app"
 import { ref, onMounted } from "vue"
+
 import integratedApi from "@/sheep/api/integrated"
+import { hooks } from "@@/index"
 
 const todoCount = ref(0)
 
@@ -109,6 +118,11 @@ function goPage(item) {
 		uni.navigateTo({ url: item.url })
 	}
 }
+
+// 联系客服
+const doPhone = (phone: string) => {
+	hooks.useMakePhoneCall(phone)
+}
 </script>
 
 <style scoped lang="less">
@@ -119,6 +133,7 @@ function goPage(item) {
 	margin: 32rpx 24rpx 0 24rpx;
 	padding: 0 0 8rpx 0;
 }
+
 .integrated-title {
 	font-size: 38rpx;
 	font-weight: bold;
@@ -127,6 +142,7 @@ function goPage(item) {
 	padding: 36rpx 0 24rpx 0;
 	letter-spacing: 2rpx;
 }
+
 .service-container-card {
 	background: #fff;
 	border-radius: 24rpx;
@@ -134,17 +150,20 @@ function goPage(item) {
 	margin: 24rpx;
 	padding-bottom: 32rpx;
 }
+
 .service-container {
 	padding: 32rpx 0 0 0;
 	background: transparent;
 	border-radius: 16rpx;
 }
+
 .service-grid {
 	display: flex;
 	flex-wrap: wrap;
 	justify-content: space-between;
 	padding: 0 24rpx;
 }
+
 .service-item {
 	width: 25%;
 	margin-bottom: 40rpx;
@@ -153,10 +172,12 @@ function goPage(item) {
 	align-items: center;
 	transition: transform 0.2s;
 }
+
 .service-item:hover {
 	transform: translateY(-6rpx) scale(1.06);
 	box-shadow: 0 2rpx 12rpx rgba(25, 118, 210, 0.08);
 }
+
 .service-icon-wrapper {
 	position: relative;
 	margin-bottom: 14rpx;
@@ -195,19 +216,23 @@ function goPage(item) {
 	0% {
 		transform: scale(1);
 	}
+
 	50% {
 		transform: scale(1.1);
 	}
+
 	100% {
 		transform: scale(1);
 	}
 }
+
 .service-label {
 	font-size: 28rpx;
 	color: #333;
 	text-align: center;
 	letter-spacing: 1rpx;
 }
+
 body {
 	background: #f5f6fa;
 }
diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue
index 2de54ce..5832755 100644
--- a/src/pages/tabbar/order.vue
+++ b/src/pages/tabbar/order.vue
@@ -106,7 +106,7 @@ const doRefund = (v: any) => {
 							<view>
 								<text>下单时间</text>
 								<text class="ml-10rpx">{{ hooks.useTime(v.createTime, "{y}-{m}-{d} {h}:{i}:{s}")
-									}}</text>
+								}}</text>
 							</view>
 							<view>{{ hooks.useEnum("hardwareRefundStatusEnum", v.refundStatus) }}</view>
 						</view>
diff --git a/src/pages/tabbar/selfMerchant.vue b/src/pages/tabbar/selfMerchant.vue
index e2dcd1f..c8c6fdd 100644
--- a/src/pages/tabbar/selfMerchant.vue
+++ b/src/pages/tabbar/selfMerchant.vue
@@ -36,20 +36,9 @@ const toDetail = async (v: any) => {
 
 <template>
 	<crud-layout bg="/static/page/blue-bg.png">
-		<z-paging
-			ref="pageRef"
-			height="100%"
-			:fixed="false"
-			v-model="pageHook.list"
-			:default-page-size="10"
-			safe-area-inset-bottom
-			:loading-more-enabled="true"
-			:show-scrollbar="false"
-			@query="query"
-			:auto-clean-list-when-reload="false"
-			:auto-scroll-to-top-when-reload="false"
-			@scroll="pageHook.scroll"
-		>
+		<z-paging ref="pageRef" height="100%" :fixed="false" v-model="pageHook.list" :default-page-size="10"
+			safe-area-inset-bottom :loading-more-enabled="true" :show-scrollbar="false" @query="query"
+			:auto-clean-list-when-reload="false" :auto-scroll-to-top-when-reload="false" @scroll="pageHook.scroll">
 			<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" :src="filePath(v.logoPic)" mode="aspectFill" />
diff --git a/src/pages/thirdApp/happyMall.vue b/src/pages/thirdApp/happyMall.vue
index e86392a..da5161f 100644
--- a/src/pages/thirdApp/happyMall.vue
+++ b/src/pages/thirdApp/happyMall.vue
@@ -47,18 +47,8 @@
 			<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-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>