From 7425d09f36be7fb43fa2f32fb37f63758a4c8340 Mon Sep 17 00:00:00 2001
From: chenshuichuan <1154693969@qq.com>
Date: Tue, 16 Jul 2024 08:41:20 +0800
Subject: [PATCH] fix old pages
---
src/api/system/dict/data.js | 12 ++++----
src/api/system/dict/type.js | 14 ++++-----
src/api/system/user.js | 8 ++---
src/config.js | 2 +-
src/pages.json | 13 +-------
src/pages/mine.vue | 41 ++++++++++++++------------
src/pages/work.vue | 2 +-
src/pages_mine/pages/info/edit.vue | 16 +++++-----
src/pages_mine/pages/info/index.vue | 34 +++++++++++----------
src/pages_mine/pages/pwd/index.vue | 6 ++--
src/pages_mine/pages/setting/index.vue | 2 +-
11 files changed, 72 insertions(+), 78 deletions(-)
diff --git a/src/api/system/dict/data.js b/src/api/system/dict/data.js
index 79ee0a4..454b669 100644
--- a/src/api/system/dict/data.js
+++ b/src/api/system/dict/data.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询字典数据列表
export function listData(query) {
return request({
- url: '/system/dict/data/list',
+ url: '/admin-api/system/dict/data/list',
method: 'get',
params: query
})
@@ -12,7 +12,7 @@ export function listData(query) {
// 查询字典数据详细
export function getData(dictCode) {
return request({
- url: '/system/dict/data/' + dictCode,
+ url: '/admin-api/system/dict/data/' + dictCode,
method: 'get'
})
}
@@ -20,7 +20,7 @@ export function getData(dictCode) {
// 根据字典类型查询字典数据信息
export function getDicts(dictType) {
return request({
- url: '/system/dict/data/type/' + dictType,
+ url: '/admin-api/system/dict/data/type/' + dictType,
method: 'get'
})
}
@@ -28,7 +28,7 @@ export function getDicts(dictType) {
// 新增字典数据
export function addData(data) {
return request({
- url: '/system/dict/data',
+ url: '/admin-api/system/dict/data',
method: 'post',
data: data
})
@@ -37,7 +37,7 @@ export function addData(data) {
// 修改字典数据
export function updateData(data) {
return request({
- url: '/system/dict/data',
+ url: '/admin-api/system/dict/data',
method: 'put',
data: data
})
@@ -46,7 +46,7 @@ export function updateData(data) {
// 删除字典数据
export function delData(dictCode) {
return request({
- url: '/system/dict/data/' + dictCode,
+ url: '/admin-api/system/dict/data/' + dictCode,
method: 'delete'
})
}
diff --git a/src/api/system/dict/type.js b/src/api/system/dict/type.js
index a0254ba..f0fcab6 100644
--- a/src/api/system/dict/type.js
+++ b/src/api/system/dict/type.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询字典类型列表
export function listType(query) {
return request({
- url: '/system/dict/type/list',
+ url: '/admin-api/system/dict/type/list',
method: 'get',
params: query
})
@@ -12,7 +12,7 @@ export function listType(query) {
// 查询字典类型详细
export function getType(dictId) {
return request({
- url: '/system/dict/type/' + dictId,
+ url: '/admin-api/system/dict/type/' + dictId,
method: 'get'
})
}
@@ -20,7 +20,7 @@ export function getType(dictId) {
// 新增字典类型
export function addType(data) {
return request({
- url: '/system/dict/type',
+ url: '/admin-api/system/dict/type',
method: 'post',
data: data
})
@@ -29,7 +29,7 @@ export function addType(data) {
// 修改字典类型
export function updateType(data) {
return request({
- url: '/system/dict/type',
+ url: '/admin-api/system/dict/type',
method: 'put',
data: data
})
@@ -38,7 +38,7 @@ export function updateType(data) {
// 删除字典类型
export function delType(dictId) {
return request({
- url: '/system/dict/type/' + dictId,
+ url: '/admin-api/system/dict/type/' + dictId,
method: 'delete'
})
}
@@ -46,7 +46,7 @@ export function delType(dictId) {
// 刷新字典缓存
export function refreshCache() {
return request({
- url: '/system/dict/type/refreshCache',
+ url: '/admin-api/system/dict/type/refreshCache',
method: 'delete'
})
}
@@ -54,7 +54,7 @@ export function refreshCache() {
// 获取字典选择框列表
export function optionselect() {
return request({
- url: '/system/dict/type/optionselect',
+ url: '/admin-api/system/dict/type/optionselect',
method: 'get'
})
}
diff --git a/src/api/system/user.js b/src/api/system/user.js
index d961407..ec3e042 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -8,7 +8,7 @@ export function updateUserPwd(oldPassword, newPassword) {
newPassword
}
return request({
- url: '/system/user/profile/updatePwd',
+ url: '/admin-api/system/user/profile/update-password',
method: 'put',
params: data
})
@@ -17,7 +17,7 @@ export function updateUserPwd(oldPassword, newPassword) {
// 查询用户个人信息
export function getUserProfile() {
return request({
- url: '/system/user/profile',
+ url: '/admin-api/system/user/profile/get',
method: 'get'
})
}
@@ -25,7 +25,7 @@ export function getUserProfile() {
// 修改用户个人信息
export function updateUserProfile(data) {
return request({
- url: '/system/user/profile',
+ url: '/admin-api/system/user/profile/update',
method: 'put',
data: data
})
@@ -34,7 +34,7 @@ export function updateUserProfile(data) {
// 用户头像上传
export function uploadAvatar(data) {
return upload({
- url: '/system/user/profile/avatar',
+ url: '/admin-api/system/user/profile/update-avatar',
name: data.name,
filePath: data.filePath
})
diff --git a/src/config.js b/src/config.js
index 01f1100..e3d4cf7 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,7 +1,7 @@
// 应用全局配置
const config = {
// baseUrl: 'http://47.106.185.127:48080',127.0.0.1
- baseUrl: 'http://127.0.0.1:48080',
+ baseUrl: 'http://47.106.185.127:48080',
// 应用信息
appInfo: {
// 应用名称
diff --git a/src/pages.json b/src/pages.json
index a0167dc..3156899 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -30,12 +30,7 @@
"navigationBarTitleText": "工作台"
}
},
- {
- "path": "pages/template",
- "style": {
- "navigationBarTitleText": "模板"
- }
- },
+
{
"path": "pages/mine",
"style": {
@@ -294,12 +289,6 @@
"selectedIconPath": "static/images/tabbar/work_.png",
"text": "投料"
},
- {
- "pagePath": "pages/template",
- "iconPath": "static/images/tabbar/work.png",
- "selectedIconPath": "static/images/tabbar/work_.png",
- "text": "模板"
- },
{
"pagePath": "pages/mine",
"iconPath": "static/images/tabbar/mine.png",
diff --git a/src/pages/mine.vue b/src/pages/mine.vue
index c8bd682..b2c2eb0 100644
--- a/src/pages/mine.vue
+++ b/src/pages/mine.vue
@@ -27,21 +27,21 @@
-
-
- 交流群
+
+
+ 反馈中心
在线客服
-
-
- 反馈社区
+
+
+ 修改密码
-
-
- 点赞我们
+
+
+ 退出登录
@@ -71,7 +71,14 @@
+
+
+
+
+
+
@@ -125,7 +132,6 @@ function handleLogout() {
};
function dialogConfirm() {
//console.log('----------------点击确认------------')
-
userStore.logOut().then(() => {
uni.reLaunch({
url: '/pages/login'
@@ -135,6 +141,11 @@ function dialogConfirm() {
function dialogClose() {
//console.log('点击关闭')
};
+function handleToPwd() {
+ uni.navigateTo({
+ url: '/pages_mine/pages/pwd/index'
+ });
+}
function handleHelp() {
uni.navigateTo({
url: '/pages_mine/pages/help/index'
@@ -144,15 +155,7 @@ function handleAbout() {
uni.navigateTo({
url: '/pages_mine/pages/about/index'
});
-};
-function handleJiaoLiuQun() {
- uni.showToast({
- title: 'QQ群：133713780',
- mask: false,
- icon: "none",
- duration: 1000
- });
-};
+}
function handleBuilding() {
uni.showToast({
title: '模块建设中~',
diff --git a/src/pages/work.vue b/src/pages/work.vue
index 59f92b9..38e461d 100644
--- a/src/pages/work.vue
+++ b/src/pages/work.vue
@@ -32,7 +32,7 @@
备注:{{ item.remark }}
-
+
diff --git a/src/pages_mine/pages/info/edit.vue b/src/pages_mine/pages/info/edit.vue
index 5ec9b7b..27e6eed 100644
--- a/src/pages_mine/pages/info/edit.vue
+++ b/src/pages_mine/pages/info/edit.vue
@@ -3,10 +3,10 @@
-
+
-
+
@@ -28,26 +28,26 @@ export default {
data() {
return {
user: {
- nickName: "",
- phonenumber: "",
+ nickname: "",
+ mobile: "",
email: "",
sex: ""
},
sexs: [{
text: '男',
- value: "0"
+ value: 1
}, {
text: '女',
- value: "1"
+ value: 2
}],
rules: {
- nickName: {
+ nickname: {
rules: [{
required: true,
errorMessage: '用户昵称不能为空'
}]
},
- phonenumber: {
+ mobile: {
rules: [{
required: true,
errorMessage: '手机号码不能为空'
diff --git a/src/pages_mine/pages/info/index.vue b/src/pages_mine/pages/info/index.vue
index 287aa9f..2e8f6e0 100644
--- a/src/pages_mine/pages/info/index.vue
+++ b/src/pages_mine/pages/info/index.vue
@@ -1,17 +1,19 @@
-
-
+
+
+
+
-
-
+
+
+ :rightText="timestampToTime(user.createTime)" />
- 绑定微信
+
@@ -19,15 +21,15 @@
import { getUserProfile } from "@/api/system/user"
import { ref } from "vue";
import modal from "@/plugins/modal"
-
+import {timestampToTime} from "@/utils/dateUtil";
const user = ref({})
const roleGroup = ref("")
const postGroup = ref("")
function getUser() {
getUserProfile().then(response => {
user.value = response.data
- roleGroup.value = response.roleGroup
- postGroup.value = response.postGroup
+ // roleGroup.value = user.value.roles
+ // postGroup.value = user.value.posts
})
}
getUser()
@@ -35,12 +37,12 @@ getUser()
import { wxRegister } from "@/api/oauth"
import { getWxCode } from "@/utils/geek"
function register(){
- modal.loading('绑定微信中...')
- getWxCode().then(res=>{
- wxRegister('miniapp',res).then(res=>{
- modal.closeLoading()
- })
- })
+ // modal.loading('绑定微信中...')
+ // getWxCode().then(res=>{
+ // wxRegister('miniapp',res).then(res=>{
+ // modal.closeLoading()
+ // })
+ // })
}
diff --git a/src/pages_mine/pages/pwd/index.vue b/src/pages_mine/pages/pwd/index.vue
index d0a10c5..37d3b63 100644
--- a/src/pages_mine/pages/pwd/index.vue
+++ b/src/pages_mine/pages/pwd/index.vue
@@ -1,13 +1,13 @@
-
+
-
+
-
+
diff --git a/src/pages_mine/pages/setting/index.vue b/src/pages_mine/pages/setting/index.vue
index 4504f17..a909b00 100644
--- a/src/pages_mine/pages/setting/index.vue
+++ b/src/pages_mine/pages/setting/index.vue
@@ -47,7 +47,7 @@ const popup = ref(null);
function handleToPwd() {
uni.navigateTo({
- url: '/pages/mine/pwd/index'
+ url: '/pages_mine/pages/pwd/index'
});
};