From 95154dec62c8ccc31fa2ce523055716a92dbe024 Mon Sep 17 00:00:00 2001
From: damonyuan <404054358@qq.com>
Date: Sat, 16 Nov 2024 00:11:57 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=85=AC=E4=BC=97=E5=8F=B7=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E5=AE=9D=E6=94=AF=E4=BB=98=E8=B7=B3=E8=BD=AC=E5=88=B0?=
 =?UTF-8?q?PC=20=E7=95=8C=E9=9D=A2=E7=9A=84bug=20fix=20=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=AE=BE=E7=BD=AE=E8=83=8C=E6=99=AF=E8=89=B2?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E7=94=9F=E6=95=88=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/service/impl/PayServiceImpl.java    |   2 +-
 .../widgets/user-info/user-info.vue           |   8 +-
 uniapp/src/pages/user/user.vue                | 131 ++++++++++--------
 3 files changed, 83 insertions(+), 58 deletions(-)

diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java
index 3feeb562..07bda45e 100644
--- a/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java
+++ b/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java
@@ -302,7 +302,7 @@ public class PayServiceImpl implements IPayService {
         bizContent.put("passback_params", JSONObject.toJSONString(new JSONObject(){{
             put("from", params.getScene());
         }}));
-        if (params.getTerminal().equals(ClientEnum.H5.getCode())) {
+        if (params.getTerminal().equals(ClientEnum.H5.getCode()) || params.getTerminal().equals(ClientEnum.OA.getCode())) {
             AlipayTradeWapPayRequest alipayRequest = new AlipayTradeWapPayRequest();
             //alipayRequest.setNotifyUrl("http://y4f8ud.natappfree.cc" + aliPayNotifyUrl);
             alipayRequest.setNotifyUrl(UrlUtils.getRequestUrl() + aliPayNotifyUrl);
diff --git a/uniapp/src/components/widgets/user-info/user-info.vue b/uniapp/src/components/widgets/user-info/user-info.vue
index 737f62e2..64b09e32 100644
--- a/uniapp/src/components/widgets/user-info/user-info.vue
+++ b/uniapp/src/components/widgets/user-info/user-info.vue
@@ -13,7 +13,7 @@
                 :border-bottom="false"
                 :title-bold="true"
                 :background="{ background: 'rgba(256,256, 256, 0)' }"
-                :title-color="$theme.navColor"
+                :title-color="navColor"
             >
                 <template #title>
                     <image
@@ -72,7 +72,11 @@ const props = defineProps({
     },
     isLogin: {
         type: Boolean
-    }
+    },
+	navColor: {
+		type: String,
+		default: "#000000"
+	}
 })
 const { copy } = useCopy()
 
diff --git a/uniapp/src/pages/user/user.vue b/uniapp/src/pages/user/user.vue
index 7bf604c1..1bd36bed 100644
--- a/uniapp/src/pages/user/user.vue
+++ b/uniapp/src/pages/user/user.vue
@@ -1,61 +1,82 @@
 <template>
-    <page-meta :page-style="$theme.pageStyle">
-        <!-- #ifndef H5 -->
-        <navigation-bar
-            :front-color="$theme.navColor"
-            :background-color="$theme.navBgColor"
-        />
-        <!-- #endif -->
-    </page-meta>
-    <view class="user">
-        <view v-for="(item, index) in state.pages" :key="index">
-            <template v-if="item.name == 'user-info'">
-                <w-user-info
-                    :pageMeta="state.meta"
-                    :content="item.content"
-                    :styles="item.styles"
-                    :user="userInfo"
-                    :is-login="isLogin"
-                />
-            </template>
-            <template v-if="item.name == 'my-service'">
-                <w-my-service :content="item.content" :styles="item.styles" />
-            </template>
-            <template v-if="item.name == 'user-banner'">
-                <w-user-banner :content="item.content" :styles="item.styles" />
-            </template>
-        </view>
-        <tabbar />
-    </view>
+	<view class="user" :style="pageStyle">
+		<view v-for="(item, index) in state.pages" :key="index">
+			<template v-if="item.name == 'user-info'">
+				<w-user-info :pageMeta="state.meta" :content="item.content" :styles="item.styles" :user="userInfo"
+					:is-login="isLogin" :navColor="navColor" />
+			</template>
+			<template v-if="item.name == 'my-service'">
+				<w-my-service :content="item.content" :styles="item.styles" />
+			</template>
+			<template v-if="item.name == 'user-banner'">
+				<w-user-banner :content="item.content" :styles="item.styles" />
+			</template>
+		</view>
+		<tabbar />
+	</view>
 </template>
 
 <script setup lang="ts">
-import { getDecorate } from '@/api/shop'
-import { useUserStore } from '@/stores/user'
-import { onShow } from '@dcloudio/uni-app'
-import { storeToRefs } from 'pinia'
-import { reactive } from 'vue'
-const state = reactive<{
-    meta: any[]
-    pages: any[]
-}>({
-    meta: [],
-    pages: []
-})
-const getData = async () => {
-    const data = await getDecorate({ id: 2 })
-    state.meta = JSON.parse(data.meta)
-    state.pages = JSON.parse(data.data)
-    uni.setNavigationBarTitle({
-        title: state.meta[0].content.title
-    })
-}
-const userStore = useUserStore()
-const { userInfo, isLogin } = storeToRefs(userStore)
-onShow(() => {
-    userStore.getUser()
-})
-getData()
+	import { getDecorate } from '@/api/shop'
+	import { useUserStore } from '@/stores/user'
+	import { onShow, onLoad } from '@dcloudio/uni-app'
+	import { storeToRefs } from 'pinia'
+	import { computed, reactive } from 'vue'
+	const state = reactive<{
+		meta : any[]
+		pages : any[]
+	}>({
+		meta: [],
+		pages: []
+	})
+	const getData = async () => {
+		
+		console.log('asdasd')
+		const data = await getDecorate({ id: 2 })
+		state.meta = JSON.parse(data.meta)
+		state.pages = JSON.parse(data.data)
+		uni.setNavigationBarTitle({
+			title: state.meta[0].content.title,
+		})
+		uni.setNavigationBarColor({
+			 frontColor: '#000000',
+		})
+		console.log(123123)
+	}
+	const userStore = useUserStore()
+	const { userInfo, isLogin } = storeToRefs(userStore)
+	// 根页面样式
+	const pageStyle = computed(() => {
+		const { bg_type, bg_color, bg_image } = state.meta[0]?.content ?? {}
+		if (bg_type != undefined) {
+			return bg_type == 1 ? { 'background-color': bg_color } : { 'background-image': `url(${bg_image})` };
+		} else {
+			return ""
+		}
+	})
+	const navColor = computed(() => {
+		const { text_color } = state.meta[0]?.content ?? {}
+		if (text_color == 2) {
+			return '#000000';
+		} else {
+			return '#ffffff'
+		}
+	})
+	onShow(() => {
+		userStore.getUser()
+	})
+	getData()
+	
 </script>
 
-<style></style>
+<style lang="scss" scoped>
+	.user {
+		position: relative;
+		background-repeat: no-repeat;
+		background-size: 100% auto;
+		overflow: hidden;
+		width: 100%;
+		transition: all 1s;
+		min-height: calc(100vh - env(safe-area-inset-bottom));
+	}
+</style>
\ No newline at end of file