mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

部分调整页面链接
This commit is contained in:
洪树泽 2022-09-09 09:50:31 +08:00
parent 4eb5ec6118 cb239727e7
commit 2193193df9
5 changed files with 75 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/api/user.ts
View File

@ -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' })
}

4
app/src/enums/agreementEnums.ts
View File

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

8
app/src/pages/as_us/as_us.vue
View File

@ -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>
<view class="text-content mt-[20rpx]">当前版本v1.5.0</view>
<image :src="appStore.config.website.logo" mode="" class="img"></image>
<view class="text-content mt-[20rpx]">当前版本{{ appStore.config.version }}</view>
</view>
</template>
<script setup lang="ts">
<script setup lang="ts">
import { useAppStore } from '@/stores/app'
const appStore = useAppStore()
</script>
<style lang="scss" scoped>

126
app/src/pages/user_set/user_set.vue
View File

@ -1,85 +1,87 @@
<template>
<view class="user-set">
<view class="item flex bg-white mt-[20rpx]">
<u-avatar :src="src" shape="square"></u-avatar>
<view class="ml-[20rpx] flex flex-1 justify-between">
<view>
<view class="mb-[15rpx] text-xl font-medium">闻喜的小贾</view>
<view class="text-content text-xs">账号：tt54541512</view>
<navigator :url="`/pages/user_data/user_data`">
<view class="item flex bg-white mt-[20rpx]">
<u-avatar :src="userInfo.avatar" shape="square"></u-avatar>
<view class="ml-[20rpx] flex flex-1 justify-between">
<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>
</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>
</view>
<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]">
{{ 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">
<view class="text-xl">登录密码</view>
<u-icon name="arrow-right" color="#666"></u-icon>
</view>
<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]">
未绑定
</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">
<view class="text-xl">隐私政策</view>
<u-icon name="arrow-right" color="#666"></u-icon>
</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>
<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
</view>
<u-icon name="arrow-right" color="#666"></u-icon>
</view>
<navigator :url="`/pages/agreement/agreement?type=${ AgreementEnum.PRIVACY }`">
<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>
</view>
</navigator>
<navigator :url="`/pages/agreement/agreement?type=${ AgreementEnum.SERVICE }`">
<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]">
{{ appStore.config.version }}
</view>
<u-icon name="arrow-right" color="#666"></u-icon>
</view>
</view>
</view>
</template>
<script setup lang="ts">
import {
getDecorate
} from '@/api/shop'
import {
useUserStore
} from '@/stores/user'
getUserInfo
} from '@/api/user'
import {
onShow
} from '@dcloudio/uni-app'
import {
storeToRefs
} from 'pinia'
import {
reactive
reactive,
ref,
} from 'vue'
const state = reactive < {
pages: any[]
} > ({
pages: []
})
const getData = async () => {
const data = await getDecorate({
id: 2
})
state.pages = JSON.parse(data.pages)
import {
useAppStore
} from '@/stores/app'
import {
AgreementEnum
} from '@/enums/agreementEnums'
const appStore = useAppStore()
let userInfo = ref({})
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>

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

@ -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.*;