Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop

部分调整页面链接

app/src/api/user.ts

@@ -3,3 +3,7 @@ import request from '@/utils/request'
 export function getUserCenter() {
     return request.get({ url: '/user/center' })
 }
+
+export function getUserInfo() {
+    return request.get({ url: '/user/info' })
+}

app/src/enums/agreementEnums.ts

@@ -1,6 +1,6 @@
 //菜单主题类型
 export enum AgreementEnum {
-    PRIVACY = 'service',
+    PRIVACY = 'privacy',
-    SERVICE = 'privacy'
+    SERVICE = 'service'
 }
 

app/src/pages/as_us/as_us.vue

@@ -1,11 +1,13 @@
 <template>
 	<view class="as-us flex flex-1 flex-col items-center">
-		<image src="https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fimg.jj20.com%2Fup%2Fallimg%2F4k%2Fs%2F02%2F2109242332225H9-0-lp.jpg&refer=http%3A%2F%2Fimg.jj20.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1665225789&t=d830459ba12f6416e919dd8082fc9d12" mode="" class="img"></image>
+		<image :src="appStore.config.website.logo" mode="" class="img"></image>
-		<view class="text-content mt-[20rpx]">当前版本v1.5.0</view>
+		<view class="text-content mt-[20rpx]">当前版本{{ appStore.config.version }}</view>
 	</view>
 </template>
 
 <script setup lang="ts">
+	import { useAppStore } from '@/stores/app'
+	const appStore = useAppStore()
 </script>
 
 <style lang="scss" scoped>

app/src/pages/user_set/user_set.vue

@@ -1,15 +1,17 @@
 <template>
 	<view class="user-set">
-		<view class="item flex bg-white mt-[20rpx]">
+		<navigator :url="`/pages/user_data/user_data`">
-			<u-avatar :src="src" shape="square"></u-avatar>
+			<view class="item flex bg-white mt-[20rpx]">
-			<view class="ml-[20rpx] flex flex-1 justify-between">
+				<u-avatar :src="userInfo.avatar" shape="square"></u-avatar>
-				<view>
+				<view class="ml-[20rpx] flex flex-1 justify-between">
-					<view class="mb-[15rpx] text-xl font-medium">闻喜的小贾</view>
+					<view>
-					<view class="text-content text-xs">账号：tt54541512</view>
+						<view class="mb-[15rpx] text-xl font-medium">{{ userInfo.nickname }}</view>
+						<view class="text-content text-xs">账号：{{ userInfo.username }}</view>
+					</view>
+					<u-icon name="arrow-right" color="#666"></u-icon>
 				</view>
-				<u-icon name="arrow-right" color="#666"></u-icon>
 			</view>
-		</view>
+		</navigator>
 		<view class="item bg-white mt-[20rpx] btn-border flex flex-1 justify-between">
 			<view class="text-xl">登录密码</view>
 			<u-icon name="arrow-right" color="#666"></u-icon>
@@ -18,25 +20,29 @@
 			<view class="text-xl">绑定微信</view>
 			<view class=" flex justify-between">
 				<view class="text-muted mr-[20rpx]">
-					未绑定
+					{{ userInfo.isBindMnp ? '已绑定' : '未绑定' }}
 				</view>
 				<u-icon name="arrow-right" color="#666"></u-icon>
 			</view>
 		</view>
 
-		<view class="item bg-white mt-[20rpx] btn-border flex flex-1 justify-between">
+		<navigator :url="`/pages/agreement/agreement?type=${ AgreementEnum.PRIVACY }`">
-			<view class="text-xl">隐私政策</view>
+			<view class="item bg-white mt-[20rpx] btn-border flex flex-1 justify-between">
-			<u-icon name="arrow-right" color="#666"></u-icon>
+				<view class="text-xl">隐私政策</view>
-		</view>
+				<u-icon name="arrow-right" color="#666"></u-icon>
-		<view class="item bg-white btn-border flex flex-1 justify-between">
+			</view>
-			<view class="text-xl">服务协议</view>
+		</navigator>
-			<u-icon name="arrow-right" color="#666"></u-icon>
+		<navigator :url="`/pages/agreement/agreement?type=${ AgreementEnum.SERVICE }`">
-		</view>
+			<view class="item bg-white btn-border flex flex-1 justify-between">
+				<view class="text-xl">服务协议</view>
+				<u-icon name="arrow-right" color="#666"></u-icon>
+			</view>
+		</navigator>
 		<view class="item bg-white btn-border flex flex-1 justify-between">
 			<view class="text-xl">关于我们</view>
 			<view class="flex justify-between">
 				<view class="text-muted mr-[20rpx]">
-					v10.2.0
+					{{ appStore.config.version }}
 				</view>
 				<u-icon name="arrow-right" color="#666"></u-icon>
 			</view>
@@ -46,40 +52,36 @@
 
 <script setup lang="ts">
 	import {
-		getDecorate
+		getUserInfo
-	} from '@/api/shop'
+	} from '@/api/user'
-	import {
-		useUserStore
-	} from '@/stores/user'
 	import {
 		onShow
 	} from '@dcloudio/uni-app'
 	import {
-		storeToRefs
+		reactive,
-	} from 'pinia'
+		ref,
-	import {
-		reactive
 	} from 'vue'
-	const state = reactive < {
+	import {
-		pages: any[]
+		useAppStore
-	} > ({
+	} from '@/stores/app'
-		pages: []
+	import {
-	})
+		AgreementEnum
-	const getData = async () => {
+	} from '@/enums/agreementEnums'
-		const data = await getDecorate({
+
-			id: 2
+	const appStore = useAppStore()
-		})
+	let userInfo = ref({})
-		state.pages = JSON.parse(data.pages)
+
+	const getUser = async () => {
+		let res = await getUserInfo()
+		console.log(res, 'res')
+
+		userInfo.value = res
+
 	}
-	const userStore = useUserStore()
+
-	const {
-		userInfo,
-		isLogin
-	} = storeToRefs(userStore)
 	onShow(() => {
-		userStore.getUser()
+		getUser()
 	})
-	getData()
 </script>
 
 <style lang="scss" scoped>

server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaController.java

@@ -1,7 +1,6 @@
 package com.mdd.admin.controller.channel;
 
 import com.mdd.admin.config.aop.Log;
-import com.mdd.admin.service.channel.IChannelH5Service;
 import com.mdd.admin.service.channel.IChannelOaService;
 import com.mdd.common.core.AjaxResult;
 import org.springframework.web.bind.annotation.*;