From cb429a55a72f46bc8b749e0870b4a006fd066c78 Mon Sep 17 00:00:00 2001
From: pyt <626651354@qq.com>
Date: 星期四, 27 二月 2025 15:31:34 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide
---
H5/uni_modules/uview-ui/libs/util/calendar.js | 4 +-
management/src/pages/setting/user/index.jsx | 12 ++----
H5/App.vue | 6 +-
H5/utils/request.js | 2
H5/uni_modules/uview-ui/components/u-slider/nvue.js | 4 +-
management/src/pages/setting/role/components/addAndEdit.jsx | 2
management/src/global.less | 26 +++++++++++++
H5/pages/location/location.vue | 16 ++++----
management/src/app.tsx | 1
H5/uni_modules/uview-ui/components/u-skeleton/u-skeleton.vue | 2
management/config/routes.ts | 2
H5/pages/Appeal/Appeal.vue | 20 +++++-----
H5/pages/progress/progress.vue | 4 +-
H5/pages/components/certificate/certificate.vue | 2
H5/uni_modules/uview-ui/libs/config/config.js | 2
H5/pages/index/index.vue | 14 +++---
16 files changed, 71 insertions(+), 48 deletions(-)
diff --git a/H5/App.vue b/H5/App.vue
index 464a80a..2a7e874 100644
--- a/H5/App.vue
+++ b/H5/App.vue
@@ -1,13 +1,13 @@
<script>
export default {
onLaunch: function() {
- console.log('App Launch')
+
},
onShow: function() {
- console.log('App Show')
+
},
onHide: function() {
- console.log('App Hide')
+
}
}
</script>
diff --git a/H5/pages/Appeal/Appeal.vue b/H5/pages/Appeal/Appeal.vue
index 3383ae2..0544b06 100644
--- a/H5/pages/Appeal/Appeal.vue
+++ b/H5/pages/Appeal/Appeal.vue
@@ -159,10 +159,10 @@
longPressActions: {
itemList: ['发送给朋友', '保存图片', '收藏'],
success: function(data) {
- console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+
},
fail: function(err) {
- console.log(err.errMsg);
+
}
}
});
@@ -181,7 +181,7 @@
},
getproblem() {
getproblem().then((resp => {
- console.log(resp, '问题类型')
+
this.columns = [resp.data.map(item => {
return item.name
})]
@@ -260,7 +260,7 @@
videos: this.videos.join(','),
}
save(data).then(resp => {
- console.log(resp, '保存');
+
if (resp.code == 200) {
uni.showToast({
title: '保存成功',
@@ -273,12 +273,12 @@
})
},
confirmone(e) {
- console.log(e, 'eeee');
+
this.time = dayjs(e.value).format('YYYY-MM-DD')
this.showDate = false
},
confirmtwo(e) {
- console.log(e, 'eeee');
+
this.problemType = e.value[0]
this.showList = false
},
@@ -291,7 +291,7 @@
this.showList = false
},
goTopagelocation() {
- console.log('0000000000000000');
+
uni.navigateTo({
url: '/pages/location/location'
})
@@ -302,7 +302,7 @@
sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
sourceType: ['album'], //从相册选择
success: (res) => {
- console.log(res, 'res');
+
uni.showLoading()
uni.uploadFile({
url: config.imageUrl,
@@ -312,7 +312,7 @@
'Authorization': uni.getStorageSync('token')
},
success: (uploadFileRes) => {
- console.log(JSON.parse(uploadFileRes.data), 'uploadFileRes');
+
this.images = [...this.images, JSON.parse(uploadFileRes.data).data]
uni.hideLoading()
},
@@ -350,7 +350,7 @@
'Authorization': uni.getStorageSync('token')
},
success: (uploadFileRes) => {
- console.log(JSON.parse(uploadFileRes.data).data, 'uploadFileRes');
+
this.videos = [...this.videos, JSON.parse(uploadFileRes.data).data]
uni.hideLoading()
},
diff --git a/H5/pages/components/certificate/certificate.vue b/H5/pages/components/certificate/certificate.vue
index e392dd2..f8a86e6 100644
--- a/H5/pages/components/certificate/certificate.vue
+++ b/H5/pages/components/certificate/certificate.vue
@@ -53,7 +53,7 @@
methods: {
open() {
getInfo().then(resp => {
- console.log(resp, '党员信息');
+
if(resp.code==200){
this.info =resp.data
}
diff --git a/H5/pages/index/index.vue b/H5/pages/index/index.vue
index 4d48c01..16411ae 100644
--- a/H5/pages/index/index.vue
+++ b/H5/pages/index/index.vue
@@ -163,19 +163,19 @@
methods: {
Allread() {
getread().then(resp => {
- console.log(resp, '=====');
+
this.getMessagelist()
})
},
getBanner() {
getBanner().then(resp => {
- console.log(resp, '获取banner');
+
this.bannerlist = resp.data
})
},
getappletcinfo() {
getappletcinfo().then(resp => {
- console.log(resp, '-----判断角色');
+
this.userInfo = resp.data
this.member = resp.data ? 2 : 1
uni.setStorageSync('userInfo', resp.data)
@@ -188,7 +188,7 @@
pageSize: 5
}
getMessagelist(data).then(resp => {
- console.log(resp, '获取消息列表');
+
if (resp.data.records.length < 5 && this.pageNum == 1) {
this.msgListTotal = resp.data.records
this.isLoading = true
@@ -232,7 +232,7 @@
1)
this.noreadlists = this.msgLists.filter(item => item.readStatus === 0)
this.noreadlist = this.msgList.filter(item => item.readStatus === 0)
- console.log(this.msgListTotal, 'this.msgListTotal');
+
})
},
changeActive(value) {
@@ -251,12 +251,12 @@
},
change() {
- console.log('1111');
+
},
onClick() {
this.isClick = true
- console.log('this.isClick', this.isClick);
+
},
goTopage() {
uni.navigateTo({
diff --git a/H5/pages/location/location.vue b/H5/pages/location/location.vue
index 6bbc0c3..d25a23a 100644
--- a/H5/pages/location/location.vue
+++ b/H5/pages/location/location.vue
@@ -96,7 +96,7 @@
result.id = index + 1
return result
});
- console.log(this.locationList);
+
}
})
return
@@ -111,7 +111,7 @@
ak: '3mHKIXMArjgIkgADzOlTYp4XssNSNkwr' // 替换为你自己的 AK
},
success: (res) => {
- console.log(res, '-------');
+
if (res.data.status === 0) {
this.searchResults = res.data.results;
this.latitude = res.data.results[0].location.lat
@@ -135,7 +135,7 @@
},
onReady() {
this.map = new BMapGL.Map("container"); // 创建地图实例
- console.log(this.map);
+
// uni.getLocation({
// type: 'wgs84',
// success: (res) => {
@@ -146,12 +146,12 @@
const longitude = position.coords.longitude;
const accuracy = position.coords.accuracy; // 精度，单位米
- console.log(`纬度: ${latitude}, 经度: ${longitude}, 精度: ${accuracy}`);
+
// 在这里可以使用获取到的经纬度信息，例如在地图上显示位置等。
}
function error(err) {
- console.log(err);
+
switch (err.code) {
case err.PERMISSION_DENIED:
console.error("用户拒绝了位置请求。");
@@ -191,7 +191,7 @@
item.id = index + 1
return item
})
- console.log(this.locationList);
+
})
this.map.addEventListener('click', (e) => {
this.clearMarkers()
@@ -203,7 +203,7 @@
var myGeo = new BMapGL.Geocoder();
// 根据坐标得到地址描述
myGeo.getLocation(new BMapGL.Point(e.latlng.lng, e.latlng.lat), (result) => {
- console.log(result, 'result');
+
this.locationList = result.surroundingPois.map((item, index) => {
item.id = index + 1
return item
@@ -216,7 +216,7 @@
});
// },
// error:err=>{
- // console.log(err,'err');
+ //
// }
// });
diff --git a/H5/pages/progress/progress.vue b/H5/pages/progress/progress.vue
index 0fb7746..b8d3609 100644
--- a/H5/pages/progress/progress.vue
+++ b/H5/pages/progress/progress.vue
@@ -103,7 +103,7 @@
return dayjs(val).format('YYYY-MM-DD HH:mm:ss')
}
},
- onLoad(params) {
+ onShow(params) {
this.id = params.id
if (params.type) {
this.type = false
@@ -114,7 +114,7 @@
getComplaintDetail({
id: params.id
}).then(res => {
- console.log('res', res)
+
this.info = {
...res.data
}
diff --git a/H5/uni_modules/uview-ui/components/u-skeleton/u-skeleton.vue b/H5/uni_modules/uview-ui/components/u-skeleton/u-skeleton.vue
index efa649e..68eb16f 100644
--- a/H5/uni_modules/uview-ui/components/u-skeleton/u-skeleton.vue
+++ b/H5/uni_modules/uview-ui/components/u-skeleton/u-skeleton.vue
@@ -110,7 +110,7 @@
item.height = uni.$u.addUnit(rowHeight)
rows.push(item)
}
- // console.log(rows);
+ //
return rows
},
uTitleWidth() {
diff --git a/H5/uni_modules/uview-ui/components/u-slider/nvue.js b/H5/uni_modules/uview-ui/components/u-slider/nvue.js
index 344dce8..ba69b03 100644
--- a/H5/uni_modules/uview-ui/components/u-slider/nvue.js
+++ b/H5/uni_modules/uview-ui/components/u-slider/nvue.js
@@ -105,7 +105,7 @@
// width: `${this.startX + this.deltaX}px`
// }
// })
- // // console.log(this.startX + this.deltaX);
+ // //
// animation.transition(button, {
// styles: {
// transform: `translateX(${this.startX + this.deltaX}px)`
@@ -141,7 +141,7 @@
this.barStyle = {
width: `${width}px`
}
- // console.log('width', width);
+ //
if (drag) {
this.$emit('drag', {
value
diff --git a/H5/uni_modules/uview-ui/libs/config/config.js b/H5/uni_modules/uview-ui/libs/config/config.js
index 82b3c69..fed0fc3 100644
--- a/H5/uni_modules/uview-ui/libs/config/config.js
+++ b/H5/uni_modules/uview-ui/libs/config/config.js
@@ -3,7 +3,7 @@
// 开发环境才提示，生产环境不会提示
if (process.env.NODE_ENV === 'development') {
- console.log(`\n %c uView V${version} %c https://uviewui.com/ \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0; border-radius: 5px;');
+
}
export default {
diff --git a/H5/uni_modules/uview-ui/libs/util/calendar.js b/H5/uni_modules/uview-ui/libs/util/calendar.js
index e006dea..471bb53 100644
--- a/H5/uni_modules/uview-ui/libs/util/calendar.js
+++ b/H5/uni_modules/uview-ui/libs/util/calendar.js
@@ -378,7 +378,7 @@
* @param m solar month
* @param d solar day
* @return JSON object
- * @eg:console.log(calendar.solar2lunar(1987,11,01));
+ * @eg:
*/
solar2lunar: function (y, m, d) { // 参数区间1900.1.31~2100.12.31
// 年份限定、上限
@@ -497,7 +497,7 @@
* @param d lunar day
* @param isLeapMonth lunar month is leap or not.[如果是农历闰月第四个参数赋值true即可]
* @return JSON object
- * @eg:console.log(calendar.lunar2solar(1987,9,10));
+ * @eg:
*/
lunar2solar: function (y, m, d, isLeapMonth) { // 参数区间1900.1.31~2100.12.1
var isLeapMonth = !!isLeapMonth
diff --git a/H5/utils/request.js b/H5/utils/request.js
index a7b5eae..4fa6f10 100644
--- a/H5/utils/request.js
+++ b/H5/utils/request.js
@@ -22,7 +22,7 @@
let token = uni.getStorageSync('token')
let header = {
'content-type': type ? 'application/x-www-form-urlencoded;charset=UTF-8' : 'application/json',
- 'Authorization': 'Bearer ' + token,
+ 'Authorization': token,
'lang': uni.getStorageSync('locale') === 'zh-Hans' ? 'zh_CN' : 'zh-tw',
}
const requestTask = uni.request({
diff --git a/management/config/routes.ts b/management/config/routes.ts
index 3bbfd1a..260b74a 100644
--- a/management/config/routes.ts
+++ b/management/config/routes.ts
@@ -55,7 +55,7 @@
name: '人员管理',
path: '/setting/user',
component: './setting/user',
- // access: '/system_setting/user_management',
+ // access: '/system_setting/people_management',
}
],
},
diff --git a/management/src/app.tsx b/management/src/app.tsx
index bef4a29..04bc735 100644
--- a/management/src/app.tsx
+++ b/management/src/app.tsx
@@ -89,6 +89,7 @@
);
},
...initialState?.settings,
+ pageTitleRender: () => '“三个身边”群众工作机制问题化解平台'
};
};
diff --git a/management/src/global.less b/management/src/global.less
index f7cef8c..fa5ddb6 100644
--- a/management/src/global.less
+++ b/management/src/global.less
@@ -63,4 +63,30 @@
:where(.css-dev-only-do-not-override-17md30i).ant-menu-light .ant-menu-submenu-selected>.ant-menu-submenu-title,
:where(.css-dev-only-do-not-override-17md30i).ant-menu-light>.ant-menu .ant-menu-submenu-selected>.ant-menu-submenu-title{
color: rgba(0, 0, 0, 0.95);
+}
+
+.del-confirm {
+ .del-icon {
+ margin-right: 5px;
+ width: 22px;
+ height: 22px;
+ background-color: rgba(233, 157, 66, 1);
+ color: #fff;
+ border-radius: 50%;
+ align-content: center;
+ text-align: center;
+ }
+
+ .ant-modal-confirm-btns {
+ .ant-btn-default:last-child {
+ border-color: red !important;
+ color: #fff !important;
+ background-color: red !important;
+ }
+
+ .ant-btn-default {
+ color: #000 !important;
+ border-color: #d9d9d9 !important;
+ }
+ }
}
\ No newline at end of file
diff --git a/management/src/pages/setting/role/components/addAndEdit.jsx b/management/src/pages/setting/role/components/addAndEdit.jsx
index 5c86c0e..ad2a7a4 100644
--- a/management/src/pages/setting/role/components/addAndEdit.jsx
+++ b/management/src/pages/setting/role/components/addAndEdit.jsx
@@ -46,7 +46,7 @@
const okHandle = () => {
form.validateFields().then((values) => {
setSpinning(true)
- values.menuIds = treeSeletKeys
+ values.systemMenuIds = treeSeletKeys
delete values.tree
if (data.id) {
values.id = data.id
diff --git a/management/src/pages/setting/user/index.jsx b/management/src/pages/setting/user/index.jsx
index 1f617c3..ed748d3 100644
--- a/management/src/pages/setting/user/index.jsx
+++ b/management/src/pages/setting/user/index.jsx
@@ -256,9 +256,8 @@
return (
<Space>
{record.roleId != 1 && (
- <Access accessible={access['/system_setting/role_management/edit']}>
+ <Access accessible={access['/system_setting/people_management/edit']}>
<a
- type="link"
onClick={() => {
addViewRef.current.refreshData(record);
handleModalVisibles(true);
@@ -269,9 +268,8 @@
</Access>
)}
{record.roleId != 1 && (
- <Access accessible={access['/system_setting/role_management/del']}>
+ <Access accessible={access['/system_setting/people_management/del']}>
<a
- type="link"
onClick={() => {
showDelConfirm(async () => {
let status = await sendRequest(del, record.id);
@@ -285,9 +283,8 @@
</a>
</Access>
)}
- <Access accessible={access['/system_setting/role_management/edit'] || false}>
+ <Access accessible={access['/system_setting/people_management/detail'] || false}>
<a
- type="link"
onClick={() => {
addViewRef.current.refreshData(record, true);
handleModalVisibles(true);
@@ -298,7 +295,6 @@
</Access>
<Access accessible={access['/system_setting/role_management/edit'] || false}>
<a
- type="link"
onClick={() => {
showDelConfirm(async () => {
let status = await sendRequest(
@@ -385,7 +381,7 @@
return buildProTableDataSource(getList, obj);
}}
toolBarRender={(action, selectRows) => [
- <Access accessible={access['/system_setting/role_management/add']}>
+ <Access accessible={access['/system_setting/people_management/add']}>
<Space>
<Button
type="primary"
--
Gitblit v1.7.1