diff --git a/api/qiniu/info.js b/api/qiniu/info.js new file mode 100644 index 0000000..358365a --- /dev/null +++ b/api/qiniu/info.js @@ -0,0 +1,37 @@ +import request from '@/utils/request' + +// 查询字典数据列表 +export function listData(query) { + return request({ + url: '/system/dict/data/list', + method: 'get', + params: query + }) +} + +// 新增文件列表 +export function addFileList(data) { + return request({ + url: '/system/fileList', + method: 'post', + data: data + }) +} + +// 修改字典数据 +export function updateData(data) { + return request({ + url: '/system/dict/data', + method: 'put', + data: data + }) +} + +//获取七牛文件上传token +export function getQNtoken(data) { + return request({ + url: '/qiniufile/getQNtoken', + method: 'post', + data: data + }) + } diff --git a/api/system/fileList.js b/api/system/fileList.js new file mode 100644 index 0000000..d60e500 --- /dev/null +++ b/api/system/fileList.js @@ -0,0 +1,52 @@ +import request from '@/utils/request' + +// 查询文件列表列表 +export function listFileList(query) { + return request({ + url: '/system/fileList/list', + method: 'get', + params: query + }) +} + +// 查询七牛云文件域名 +export function getQNdomain() { + return request({ + url: '/qiniufile/getQNdomain', + method: 'get' + }) +} + +// 查询文件列表详细 +export function getFileList(id) { + return request({ + url: '/system/fileList/' + id, + method: 'get' + }) +} + +// 新增文件列表 +export function addFileList(data) { + return request({ + url: '/system/fileList', + method: 'post', + data: data + }) +} + +// 修改文件列表 +export function updateFileList(data) { + return request({ + url: '/system/fileList', + method: 'put', + data: data + }) +} + +// 删除文件列表 +export function delFileList(id) { + return request({ + url: '/system/fileList/' + id, + method: 'delete' + }) +} diff --git a/config.js b/config.js index 247c2da..2b21c81 100644 --- a/config.js +++ b/config.js @@ -1,9 +1,11 @@ // 应用全局配置 export default { + qnDomain: 'http://sdcwwvrwz.hn-bkt.clouddn.com/', + uploadQiNiuDomain: 'https://upload-z2.qiniup.com', // baseUrl: 'https://vue.ruoyi.vip/prod-api', // baseUrl: 'http://47.93.242.168:8080', - // baseUrl: 'http://localhost:8080', - baseUrl: 'http://192.168.123.81:8080', + baseUrl: 'http://localhost:8080', + // baseUrl: 'http://192.168.123.81:8080', // baseUrl: 'http://47.93.242.168:8080', // 应用信息 appInfo: { diff --git a/main.js b/main.js index af1b897..ca8ee4a 100644 --- a/main.js +++ b/main.js @@ -2,7 +2,7 @@ import { createSSRApp } from 'vue' import App from './App' import store from './store' // store import { install } from './plugins' // plugins -import './permission' // permission +import './permission.js' // permission // main.js import uviewPlus from 'uview-plus' diff --git a/package.json b/package.json index dbc6916..54cc38e 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "dependencies": { "clipboard": "^2.0.11", "dayjs": "^1.11.11", + "qiniu-js": "^3.4.2", "uview-plus": "^3.2.15" } } diff --git a/pages/common/file/fileUpload/index.vue b/pages/common/file/fileUpload/index.vue new file mode 100644 index 0000000..c817c31 --- /dev/null +++ b/pages/common/file/fileUpload/index.vue @@ -0,0 +1,169 @@ + + + \ No newline at end of file diff --git a/pages/index.vue b/pages/index.vue index b52067d..7d11e1f 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -216,7 +216,7 @@ } }, onLoad() { - + console.log(this.$store.state.user.QNDomain); }, methods: { toEarch() { diff --git a/pages/loginInfo/login.vue b/pages/loginInfo/login.vue index c7498cc..a68802d 100644 --- a/pages/loginInfo/login.vue +++ b/pages/loginInfo/login.vue @@ -83,9 +83,9 @@ const wxLoginInto = async (code) => { const loginSuccess = async () => { try { await store.dispatch('GetInfo') - + await store.dispatch('getQNDomainInfo') proxy.$tab.reLaunch('/pages/index'); - await store.dispatch('GetUserInfo'); + // await store.dispatch('GetUserInfo'); } catch (error) { console.log("获取用户信息失败", error) } @@ -94,7 +94,7 @@ const loginSuccess = async () => { const getPhoneNumber = async (e) => { console.log(e) if (e.detail.errMsg != "getPhoneNumber:ok") { - proxy.$modal.msgError(`cuowu错误!`); + proxy.$modal.msgError(`phoneNumber错误!`); return ''; } try { @@ -171,8 +171,12 @@ function validatePhoneNumber(phoneNumber) { function getPlat() { type.value = uni.getSystemInfoSync().uniPlatform + store.dispatch('getPhoneType').then(e=> { + type.value = store.state.user.phoneType + }) console.log("当前环境是:", type.value); + } getPlat(); diff --git a/pages/work/index.vue b/pages/work/index.vue index 3798ee6..c5938fb 100644 --- a/pages/work/index.vue +++ b/pages/work/index.vue @@ -71,16 +71,28 @@ + + + + + + + + -