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

Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop

This commit is contained in:
TinyAnts 2022-09-16 12:06:08 +08:00
parent aaa5faf279 30bc224c1c
commit a9600cfc83
5 changed files with 100 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
admin/src/views/channel/weapp.vue
View File

@ -58,7 +58,7 @@
<div class="mr-4 w-80"> <div class="mr-4 w-80">
<el-input v-model="formData.requestDomain" disabled /> <el-input v-model="formData.requestDomain" disabled />
</div> </div>
<el-button @click="copy(formData.requestDomain)">复制</el-button> <el-button v-copy="formData.requestDomain">复制</el-button>
</div> </div>
<div class="form-tips"> <div class="form-tips">
小程序账号登录微信公众平台，点击开发>开发设置->服务器域名，填写https协议域名 小程序账号登录微信公众平台，点击开发>开发设置->服务器域名，填写https协议域名
@ -71,7 +71,7 @@
<div class="mr-4 w-80"> <div class="mr-4 w-80">
<el-input v-model="formData.socketDomain" disabled /> <el-input v-model="formData.socketDomain" disabled />
</div> </div>
<el-button @click="copy(formData.socketDomain)">复制</el-button> <el-button v-copy="formData.socketDomain">复制</el-button>
</div> </div>
<div class="form-tips"> <div class="form-tips">
小程序账号登录微信公众平台，点击开发>开发设置->服务器域名，填写wss协议域名 小程序账号登录微信公众平台，点击开发>开发设置->服务器域名，填写wss协议域名
@ -84,7 +84,7 @@
<div class="mr-4 w-80"> <div class="mr-4 w-80">
<el-input v-model="formData.uploadFileDomain" disabled /> <el-input v-model="formData.uploadFileDomain" disabled />
</div> </div>
<el-button @click="copy(formData.uploadFileDomain)">复制</el-button> <el-button v-copy="formData.uploadFileDomain">复制</el-button>
</div> </div>
<div class="form-tips"> <div class="form-tips">
小程序账号登录微信公众平台，点击开发>开发设置->服务器域名，填写https协议域名 小程序账号登录微信公众平台，点击开发>开发设置->服务器域名，填写https协议域名
@ -97,7 +97,7 @@
<div class="mr-4 w-80"> <div class="mr-4 w-80">
<el-input v-model="formData.downloadFileDomain" disabled /> <el-input v-model="formData.downloadFileDomain" disabled />
</div> </div>
<el-button @click="copy(formData.downloadFileDomain)">复制</el-button> <el-button v-copy="formData.downloadFileDomain">复制</el-button>
</div> </div>
<div class="form-tips"> <div class="form-tips">
小程序账号登录微信公众平台，点击开发>开发设置->服务器域名，填写https协议域名 小程序账号登录微信公众平台，点击开发>开发设置->服务器域名，填写https协议域名
@ -110,7 +110,7 @@
<div class="mr-4 w-80"> <div class="mr-4 w-80">
<el-input v-model="formData.udpDomain" disabled /> <el-input v-model="formData.udpDomain" disabled />
</div> </div>
<el-button @click="copy(formData.udpDomain)">复制</el-button> <el-button v-copy="formData.udpDomain">复制</el-button>
</div> </div>
<div class="form-tips"> <div class="form-tips">
小程序账号登录微信公众平台，点击开发>开发设置->服务器域名，填写udp协议域名 小程序账号登录微信公众平台，点击开发>开发设置->服务器域名，填写udp协议域名
@ -126,7 +126,7 @@
<div class="mr-4 w-80"> <div class="mr-4 w-80">
<el-input v-model="formData.businessDomain" disabled /> <el-input v-model="formData.businessDomain" disabled />
</div> </div>
<el-button @click="copy(formData.businessDomain)">复制</el-button> <el-button v-copy="formData.businessDomain">复制</el-button>
</div> </div>
<div class="form-tips"> <div class="form-tips">
小程序账号登录微信公众平台，点击开发>开发设置->业务域名，填写业务域名 小程序账号登录微信公众平台，点击开发>开发设置->业务域名，填写业务域名
@ -143,7 +143,6 @@
<script lang="ts" setup> <script lang="ts" setup>
import { getWeappConfig, setWeappConfig } from '@/api/channel/weapp' import { getWeappConfig, setWeappConfig } from '@/api/channel/weapp'
import feedback from '@/utils/feedback' import feedback from '@/utils/feedback'
import { useClipboard } from '@vueuse/core'
const formData = reactive({ const formData = reactive({
name: '', name: '',
@ -160,7 +159,6 @@ const formData = reactive({
uploadFileDomain: '' uploadFileDomain: ''
}) })
const { copy } = useClipboard()
const getDetail = async () => { const getDetail = async () => {
const data = await getWeappConfig() const data = await getWeappConfig()
for (const key in formData) { for (const key in formData) {

47
admin/src/views/channel/wx_oa/config.vue
View File

@ -1,7 +1,12 @@
<template> <template>
<div> <div>
<el-card class="!border-none" shadow="never"> <el-card class="!border-none" shadow="never">
<el-alert type="warning" title="温馨提示：填写微信公众号开发配置，请前往微信公众平台申请服务号并完成认证" :closable="false" show-icon /> <el-alert
type="warning"
title="温馨提示：填写微信公众号开发配置，请前往微信公众平台申请服务号并完成认证"
:closable="false"
show-icon
/>
</el-card> </el-card>
<el-form ref="formRef" :model="formData" label-width="160px"> <el-form ref="formRef" :model="formData" label-width="160px">
<el-card class="!border-none mt-4" shadow="never"> <el-card class="!border-none mt-4" shadow="never">
@ -53,7 +58,7 @@
<div class="mr-4 w-80"> <div class="mr-4 w-80">
<el-input v-model="formData.url" disabled /> <el-input v-model="formData.url" disabled />
</div> </div>
<el-button @click="copy(formData.url)">复制</el-button> <el-button v-copy="formData.url">复制</el-button>
</div> </div>
<div class="form-tips"> <div class="form-tips">
登录微信公众平台，点击开发>基本配置>服务器配置，填写服务器地址（URL） 登录微信公众平台，点击开发>基本配置>服务器配置，填写服务器地址（URL）
@ -73,7 +78,10 @@
<el-form-item label="EncodingAESKey" prop="EncodingAESKey"> <el-form-item label="EncodingAESKey" prop="EncodingAESKey">
<div> <div>
<div class="w-80"> <div class="w-80">
<el-input v-model="formData.encodingAesKey" placeholder="请输入EncodingAESKey" /> <el-input
v-model="formData.encodingAesKey"
placeholder="请输入EncodingAESKey"
/>
</div> </div>
<div class="form-tips"> <div class="form-tips">
消息加密密钥由43位字符组成，字符范围为A-Z,a-z,0-9 消息加密密钥由43位字符组成，字符范围为A-Z,a-z,0-9
@ -82,7 +90,10 @@
</el-form-item> </el-form-item>
<el-form-item label="消息加密方式" required prop="status"> <el-form-item label="消息加密方式" required prop="status">
<div> <div>
<el-radio-group class="flex-col !items-start" v-model="formData.encryptionType"> <el-radio-group
class="flex-col !items-start"
v-model="formData.encryptionType"
>
<el-radio :label="1"> <el-radio :label="1">
明文模式 (不使用消息体加解密功能，安全系数较低) 明文模式 (不使用消息体加解密功能，安全系数较低)
</el-radio> </el-radio>
@ -105,7 +116,7 @@
<div class="mr-4 w-80"> <div class="mr-4 w-80">
<el-input v-model="formData.businessDomain" disabled /> <el-input v-model="formData.businessDomain" disabled />
</div> </div>
<el-button @click="copy(formData.businessDomain)">复制</el-button> <el-button v-copy="formData.businessDomain">复制</el-button>
</div> </div>
<div class="form-tips"> <div class="form-tips">
登录微信公众平台，点击设置>公众号设置>功能设置，填写业务域名 登录微信公众平台，点击设置>公众号设置>功能设置，填写业务域名
@ -118,7 +129,7 @@
<div class="mr-4 w-80"> <div class="mr-4 w-80">
<el-input v-model="formData.jsDomain" disabled /> <el-input v-model="formData.jsDomain" disabled />
</div> </div>
<el-button @click="copy(formData.jsDomain)">复制</el-button> <el-button v-copy="formData.jsDomain">复制</el-button>
</div> </div>
<div class="form-tips"> <div class="form-tips">
登录微信公众平台，点击设置>公众号设置>功能设置，填写JS接口安全域名 登录微信公众平台，点击设置>公众号设置>功能设置，填写JS接口安全域名
@ -131,7 +142,7 @@
<div class="mr-4 w-80"> <div class="mr-4 w-80">
<el-input v-model="formData.webDomain" disabled /> <el-input v-model="formData.webDomain" disabled />
</div> </div>
<el-button @click="copy(formData.webDomain)">复制</el-button> <el-button v-copy="formData.webDomain">复制</el-button>
</div> </div>
<div class="form-tips"> <div class="form-tips">
登录微信公众平台，点击设置>公众号设置>功能设置，填写网页授权域名 登录微信公众平台，点击设置>公众号设置>功能设置，填写网页授权域名
@ -151,18 +162,18 @@ import feedback from '@/utils/feedback'
import { useClipboard } from '@vueuse/core' import { useClipboard } from '@vueuse/core'
const formData = reactive({ const formData = reactive({
name: "", name: '',
primaryId: " ", primaryId: ' ',
qrCode: "", qrCode: '',
appId: "", appId: '',
appSecret: "", appSecret: '',
url: "", url: '',
token: "", token: '',
encodingAesKey: "", encodingAesKey: '',
encryptionType: 1, encryptionType: 1,
businessDomain: "", businessDomain: '',
jsDomain: "", jsDomain: '',
webDomain: "" webDomain: ''
}) })
const { copy } = useClipboard() const { copy } = useClipboard()

28
admin/src/views/channel/wx_oa/menu.vue
View File

@ -1,10 +1,10 @@
<script setup lang="ts"> <script setup lang="ts">
import OaPhone from "./menu_com/oa-phone.vue"; import OaPhone from './menu_com/oa-phone.vue'
import OaAttr from "./menu_com/oa-attr.vue"; import OaAttr from './menu_com/oa-attr.vue'
import { useMenuOa } from "./menu_com/useMenuOa"; import { useMenuOa } from './menu_com/useMenuOa'
const { getOaMenuFunc, handleSave, handlePublish } = useMenuOa(undefined); const { getOaMenuFunc, handleSave, handlePublish } = useMenuOa(undefined)
getOaMenuFunc(); getOaMenuFunc()
</script> </script>
<template> <template>
@ -29,18 +29,12 @@ getOaMenuFunc();
</el-card> </el-card>
<footer-btns> <footer-btns>
<el-button <el-button type="primary" @click="handleSave" v-perms="['channel:oaMenu:save']">
type="primary" 保存
@click="handleSave" </el-button>
v-perms="['channel:oaMenu:save']" <el-button type="primary" @click="handlePublish" v-perms="['channel:oaMenu:publish']">
>保存</el-button 发布
> </el-button>
<el-button
type="primary"
@click="handlePublish"
v-perms="['channel:oaMenu:publish']"
>发布</el-button
>
</footer-btns> </footer-btns>
</div> </div>
</template> </template>

2
admin/src/views/decoration/tabbar.vue
View File

@ -118,7 +118,7 @@
<color-picker <color-picker
class="max-w-[400px]" class="max-w-[400px]"
v-model="tabbar.style.selectedColor" v-model="tabbar.style.selectedColor"
default-color="#999999" default-color="#4173ff"
/> />
</el-form-item> </el-form-item>
</el-tab-pane> </el-tab-pane>

53
admin/tailwind.config.js
View File

@ -57,6 +57,59 @@ module.exports = {
'7xl': '36px', '7xl': '36px',
'8xl': '48px', '8xl': '48px',
'9xl': '60px' '9xl': '60px'
},
spacing: {
px: '1px',
0: '0px',
0.5: '2px',
1: '4px',
1.5: '6px',
2: '8px',
2.5: '10px',
3: '12px',
3.5: '14px',
4: '16px',
5: '20px',
6: '24px',
7: '28px',
8: '32px',
9: '36px',
10: '40px',
11: '44px',
12: '48px',
14: '56px',
16: '64px',
20: '80px',
24: '96px',
28: '112px',
32: '128px',
36: '144px',
40: '160px',
44: '176px',
48: '192px',
52: '208px',
56: '224px',
60: '240px',
64: '256px',
72: '288px',
80: '320px',
96: '384px'
},
lineHeight: {
none: '1',
tight: '1.25',
snug: '1.375',
normal: '1.5',
relaxed: '1.625',
loose: '2',
3: '12px',
4: '16px',
5: '20px',
6: '24px',
7: '28px',
8: '32px',
9: '36px',
10: '40px'
} }
}, },