diff --git a/manifest.json b/manifest.json index b7fa41d..86ef02a 100644 --- a/manifest.json +++ b/manifest.json @@ -101,10 +101,10 @@ // }, "icons" : { "android" : { - "hdpi" : "unpackage/res/icons/72x72.png", - "xhdpi" : "unpackage/res/icons/96x96.png", - "xxhdpi" : "unpackage/res/icons/144x144.png", - "xxxhdpi" : "unpackage/res/icons/192x192.png" + "hdpi" : "static/appLogo.png", + "xhdpi" : "static/appLogo.png", + "xxhdpi" : "", + "xxxhdpi" : "" } }, // "ios" : { diff --git a/pages.json b/pages.json index 3bda65a..6e13f13 100644 --- a/pages.json +++ b/pages.json @@ -70,7 +70,7 @@ { "path": "pages/conDetail/conDetail", "style": { - "navigationBarTitleText": "", + "navigationBarTitleText": "党的建设详情", "navigationBarBackgroundColor": "#FFFFFF" } }, { @@ -118,7 +118,7 @@ }, { "path": "pages/equip/equip", "style": { - "navigationBarTitleText": "机构", + "navigationBarTitleText": "供应和需求", "navigationBarBackgroundColor": "#FFFFFF" } }, @@ -332,7 +332,7 @@ { "path": "pages/postNotice/postNotice", "style": { - "navigationBarTitleText": "公式公告发布", + "navigationBarTitleText": "公示公告发布", "enablePullDownRefresh": false } }, @@ -458,6 +458,14 @@ "navigationBarTitleText" : "诉求信息", "enablePullDownRefresh" : false } + }, + { + "path" : "pages/official/newGroup/newGroup", + "style" : + { + "navigationBarTitleText" : "分组列表和新建分组", + "enablePullDownRefresh" : false + } } // { diff --git a/pages/Feedback/Feedback.vue b/pages/Feedback/Feedback.vue index d5c7c24..81a570a 100644 --- a/pages/Feedback/Feedback.vue +++ b/pages/Feedback/Feedback.vue @@ -1,6 +1,6 @@ diff --git a/pages/construct/construct.vue b/pages/construct/construct.vue index 08bdc75..4c80466 100644 --- a/pages/construct/construct.vue +++ b/pages/construct/construct.vue @@ -61,20 +61,16 @@ import utils from '../../service/utils'; this.getConstructList() }, methods:{ - // 获取用户信息 + // 获取用户信息判断是否有党建建设发布的ID,权限判断authority = 519148751890154757 getUser(){ if (uni.getStorageSync('user')) { let userCode = uni.getStorageSync('user') // console.log("用户的code", this.userCode) this.userId = userCode.userInfo.userId - this.userName = userCode.userInfo.userAccount - this.userIcon = userCode.userInfo.headIcon - this.organizeName = userCode.userInfo.organizeName - // this.isAdmin = userCode.userInfo.isCompany console.log(userCode) - if(userCode.userInfo.userId === 'admin'){ - this.isAdmin = true - } + let authorityID = userCode.permissionList + this.isAdmin = authorityID.some(it => it.modelId === '519148751890154757') + console.log('是否有党建发布权限',this.isAdmin) } else { uni.showToast({ title: '请登录', diff --git a/pages/datain/datain.vue b/pages/datain/datain.vue index 1bb23fb..ebf36f0 100644 --- a/pages/datain/datain.vue +++ b/pages/datain/datain.vue @@ -4,7 +4,7 @@ - + @@ -24,6 +24,14 @@ + 园区企业量、园区服务、产品量专家人才、惠企政策等 + + + + + + + 进口总额和出口总额 @@ -32,6 +40,30 @@ + 平台访问统计 + + + + + + + + 占地面积Top5 + + + + + + + + 产品数量统计 + + + + + + + 填报企业规模大览 @@ -51,15 +83,15 @@ 填报企业从业人数大览 - + - - + + - + 表单设计 @@ -71,6 +103,18 @@ + @@ -84,15 +128,16 @@ - + {{it.fullName}} - - + + - + @@ -104,7 +149,7 @@ - + @@ -121,14 +166,14 @@ startDate: '2024-02-20', // 结束日期 endDate: '2024-2-26', - isSystem:false, + isSystem: false, chartsDataColumn1: { categories: [], series: [{ name: "固投", data: [] }, - + { name: "利润", data: [] @@ -137,33 +182,72 @@ name: "销售收入", data: [] }, - - + + { name: "总产值", data: [] }, ] }, - + chartsDataColumn2: { categories: [], - series: [ + series: [{ + name: "数量", + data: [] + }, + { + name: "税收", + data: [] + }, + ] + }, + chartsDataColumn6: { + categories: [], + series: [{ name: "数量", data: [] }, - + { name: "税收", data: [] }, ] }, + chartsDataColumn4: { + categories: ['总和'], + series: [{ + name: "园区企业量", + data: [] + }, + { + name: "规上企业量(工业)", + data: [] + }, + { + name: "规上企业（限上商贸/服务业）", + data: [] + }, + { + name: "园区服务/产品量", + data: [] + }, + { + name: "惠企政策", + data: [] + }, + { + name: "专家人才", + data: [] + }, + ] + }, chartsDataColumn3: { categories: [], - series: [ - { + series: [{ name: "进口总额", data: [] }, @@ -173,6 +257,13 @@ }, ] }, + chartsDataColumn5: { + categories: ['一汽解放汽车有限公司四川分公司', '四川华侨凤凰纸业有限公司', '德阳南控科技产业发展有限公司', '四川依科制药有限公司', '四川广汉宝湾国际物流有限公司'], + series: [{ + name: "占地面积（亩）", + data: ['828', '700', '471', '380', '372'] + }, ] + }, opts1: { color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4", "#ea7ccc" @@ -188,6 +279,14 @@ min: 0 }] }, + extra: { + column: { + type: "group", + width: 30, + activeBgColor: "#000000", + activeBgOpacity: 0.08 + } + } }, chartData2: { @@ -225,6 +324,11 @@ data: [] }] }, + chartData5: { + series: [{ + data: [] + }] + }, opts2: { color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4", "#ea7ccc" @@ -244,8 +348,40 @@ } } }, - companysId:[], - tellInfo:[] + opts3: { + color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4", + "#ea7ccc" + ], + padding: [15, 30, 0, 5], + enableScroll: false, + // enableScroll: true, + legend: {}, + xAxis: { + boundaryGap: "justify", + disableGrid: false, + // disableGrid: true, + min: 0, + // axisLine: false, + axisLine: true, + max: 70 + }, + yAxis: { + // min:30 + }, + extra: { + bar: { + type: "stack", + width: 30, + meterBorde: 1, + meterFillColor: "#FFFFFF", + activeBgColor: "#000000", + activeBgOpacity: 0.08, + categoryGap: 2 + } + } + }, + companysId: [], + tellInfo: [] } }, onUnload() { @@ -255,15 +391,19 @@ onLoad() { this.getUser() this.getPostQing() + this.getFormList() + this.getHomeTopNumber() + this.getProNumber() + this.getCountNumber() uni.$on('idInfo', res => { console.log("选择公司页面返回的公司ID", res) - if(res.length > 0) - this.companysId = res + if (res.length > 0) + this.companysId = res }) uni.$on('tellInfo', res => { console.log("tell信息", res) - if(res.length > 0) - this.tellInfo = res + if (res.length > 0) + this.tellInfo = res }) }, created() { @@ -274,7 +414,7 @@ console.log('change事件:', e); this.startDate = e[0]; this.endDate = e[1] - console.log(this.startDate,this.endDate) + console.log(this.startDate, this.endDate) this.getPostQing() }, // 跳转到选择通知企业页面 @@ -284,63 +424,121 @@ }) }, // 进行通知 - tellNotice(id){ + tellNotice(id) { // 进行通知 request({ - url:'/api/extend/demo/SendMessageByApp', - method:'post', - data:{ - title:this.tellInfo[0], - companys:this.companysId, - desc:this.tellInfo[1], - reid:id, - type:'表单填报通知', - link:'/pages/apply/dynamicModel/index', - fangshi:'通知' + url: '/api/extend/demo/SendMessageByApp', + method: 'post', + data: { + title: this.tellInfo[0], + companys: this.companysId, + desc: this.tellInfo[1], + reid: id, + type: '表单填报通知', + link: '/pages/apply/dynamicModel/index', + fangshi: '通知' } - }).then(res=>{ - console.log('通知结果',res) - if(res.code == 200){ + }).then(res => { + console.log('通知结果', res) + if (res.code == 200) { uni.showToast({ - icon:"success", - title:"通知成功" + icon: "success", + title: "通知成功" }) } }) }, - // 获取用户信息 - getUser() { - // // 获取日期 - // // 获取当前日期 - // var currentDate = new Date(); - - // // 获取前七天的日期 - // var previousDates = []; - // for (var i = 6; i >= 0; i--) { - // var previousDate = new Date(currentDate); - // previousDate.setDate(currentDate.getDate() - i); - // previousDates.push(previousDate); - // } + // 获取pc端首页等数量 + getHomeTopNumber() { + this.chartsDataColumn4.series[0].data = [] + this.chartsDataColumn4.series[1].data = [] + this.chartsDataColumn4.series[2].data = [] + this.chartsDataColumn4.series[3].data = [] + this.chartsDataColumn4.series[4].data = [] + this.chartsDataColumn4.series[5].data = [] + request({ + url: '/api/SubDev/zyoaarticle/homeTopNumbers', + method: 'get', + data: {} + }).then(res => { + console.log('HomeTopNumber', res) + if (res.code == 200) { - // // 格式化日期 - // var formattedDates = previousDates.map(function(date) { - // var year = date.getFullYear(); - // var month = (date.getMonth() + 1).toString().padStart(2, '0'); - // var day = date.getDate().toString().padStart(2, '0'); - // return year + '-' + month + '-' + day; - // }); + this.chartsDataColumn4.series[0].data.push(res.data.count_yqqyl) + this.chartsDataColumn4.series[1].data.push(res.data.count_gsqyl_gy) + this.chartsDataColumn4.series[2].data.push(res.data.count_gsqyl_fwy) + this.chartsDataColumn4.series[3].data.push(res.data.count_yqfwcpl) + this.chartsDataColumn4.series[4].data.push(res.data.count_hqzc) + this.chartsDataColumn4.series[5].data.push(res.data.count_gdrc) + console.log(this.chartsDataColumn4) + } + }) + }, + // 获取产品数量统计 + getProNumber() { + this.chartData5.series[0].data = [] + request({ + url: 'https://www.dygxq-es.cn/api/system/DataInterface/398719263910659333/Actions/Response?n=1709609644', + method: 'get', + data: {} + }).then(res => { + console.log('产品数量', res) + if (res.code == 200) { + this.chartData5.series[0].data = res.data.series[0].data.map(it => { + return { + name: it.name, + value: it.value + } + }) + // for(let i=0;i { + console.log('平台访问统计', res) + if (res.code == 200) { + this.chartsDataColumn6.categories = ['每月访问统计'] + for(let i=0;i { + // return { + // name: '', + // data: [it] + // } + // }) + } + }) + }, + // 获取用户信息判断是否有表单设计和企业通知的ID,权限判断authority = 361476463456683269 + getUser() { if (uni.getStorageSync('user')) { let userCode = uni.getStorageSync('user') // console.log("用户的code", this.userCode) this.userId = userCode.userInfo.userId - this.userName = userCode.userInfo.userAccount - this.userIcon = userCode.userInfo.headIcon - this.organizeName = userCode.userInfo.organizeName - this.isAdmin = userCode.userInfo.isCompany + // this.userName = userCode.userInfo.userAccount + // this.userIcon = userCode.userInfo.headIcon + // this.organizeName = userCode.userInfo.organizeName + let authorityID = userCode.permissionList + this.isAdmin = authorityID.some(it => it.modelId === '361476463456683269') + console.log('是否有表单设计和企业通知权限', this.isAdmin) console.log(userCode) } else { uni.showToast({ @@ -370,6 +568,7 @@ that.chartsDataColumn1.series[3].data = [] that.chartData3.series[0].data = [] that.chartData2.series[0].data = [] + that.chartData4.series[0].data = [] request({ url: '/api/SubDev/baseenterprisemanager/GetDataNumber', method: 'get', @@ -378,19 +577,19 @@ endDate: this.endDate } }).then(res => { - if (res.code == 200) { - console.log(res) + if (res.code === 200) { + console.log('res', res) for (let i = 0; i < res.data.GetCreateDateNumber.length; i++) { that.chartsDataColumn1.categories.push(res.data.GetCreateDateNumber[i].Day) that.chartsDataColumn2.categories.push(res.data.GetCreateDateNumber[i].Day) that.chartsDataColumn3.categories.push(res.data.GetCreateDateNumber[i].Day) - that.chartsDataColumn3.series[0].data.push(res.data.GetCreateDateNumber[i].Imports) + that.chartsDataColumn3.series[0].data.push(res.data.GetCreateDateNumber[i].Imports) that.chartsDataColumn3.series[1].data.push(res.data.GetCreateDateNumber[i] .TotalExportValue) that.chartsDataColumn2.series[0].data.push(res.data.GetCreateDateNumber[i].Number) that.chartsDataColumn2.series[1].data.push(res.data.GetCreateDateNumber[i].Taxation) that.chartsDataColumn1.series[0].data.push(res.data.GetCreateDateNumber[i] - .FixedInvestment) + .FixedInvestment) that.chartsDataColumn1.series[1].data.push(res.data.GetCreateDateNumber[i].Profit) that.chartsDataColumn1.series[2].data.push(res.data.GetCreateDateNumber[i] .SalesRevenue) @@ -454,7 +653,8 @@ if (res.code === 600) { uni.showToast({ icon: "exception", - title: '登录过期，请重新登录' + title: '登录过期，请重新登录', + duration: 1500 }) } this.formList = res.data.list diff --git a/pages/equip/equip.scss b/pages/equip/equip.scss index 0b67cef..1907dcc 100644 --- a/pages/equip/equip.scss +++ b/pages/equip/equip.scss @@ -12,7 +12,7 @@ justify-content: space-evenly; align-items: center; position: fixed; - top: 70rpx; + top: 0; background-color: white; z-index: 2; } diff --git a/pages/equip/equip.vue b/pages/equip/equip.vue index 628a1fc..8182e63 100644 --- a/pages/equip/equip.vue +++ b/pages/equip/equip.vue @@ -45,7 +45,7 @@ 需求中心 - + diff --git a/pages/home/home.vue b/pages/home/home.vue index e613afc..650d2e7 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -215,26 +215,31 @@ // 首页模糊查询 getMoHuList(){ this.selectShow = true - request({ - url:'/api/SubDev/zyoaarticle', - method:'get', - data:{ - keyword:this.selectName - } - }).then(res=>{ - console.log('模糊查询',res.data) - if(res.code === 200){ - let arr = res.data.list - this.comList = arr.map(it=>{ - return { - ...it, - name:it.title - } - }) - this.comList = JSON.parse(JSON.stringify(this.comList)) - console.log('mohu',this.comList) - } - }) + if(this.selectName === ''){ + this.selectShow = false + }else{ + request({ + url:'/api/SubDev/zyoaarticle', + method:'get', + data:{ + keyword:this.selectName + } + }).then(res=>{ + console.log('模糊查询',res.data) + if(res.code === 200){ + let arr = res.data.list + this.comList = arr.map(it=>{ + return { + ...it, + name:it.title + } + }) + this.comList = JSON.parse(JSON.stringify(this.comList)) + console.log('mohu',this.comList) + } + }) + } + }, select(item) { diff --git a/pages/my/adminMessageList/adminMessageList.vue b/pages/my/adminMessageList/adminMessageList.vue index 653ddd8..2b43f10 100644 --- a/pages/my/adminMessageList/adminMessageList.vue +++ b/pages/my/adminMessageList/adminMessageList.vue @@ -28,7 +28,8 @@ data() { return { messageList: [], - isAdmin: false + isAdmin: false, + baseUrl: 'http://deyanggaoxin.fengshiyun.com' } }, onShow() { @@ -92,23 +93,94 @@ // }) // } // }) - uni.navigateTo({ - url: link.link + `?data=${JSON.stringify(link.reid)}` - }) - // request({ - // url:`/api/extend/demo/UpdateIsReadEnd?MessageId=${id}`, - // method:'put', - // data:{} - // }).then(res=>{ - // console.log("修改已读",res) - // if(res.code == 200){ - // console.log('成功修改') - // uni.navigateTo({ - // url:link.link + `?data=${JSON.stringify(link.reid)}` - // }) - // } - // }) - } + if (link.type === '公文办理通知') { + this.download(link.link) + } else { + uni.navigateTo({ + url: link.link + `?data=${JSON.stringify(link.reid)}` + }) + } + + if (link.type === '公文办理通知') { + this.download(link.link) + } else if (link.type === '表单填报通知') { + uni.navigateTo({ + url: link.link + `?id=${link.reid}` + }) + } else { + uni.navigateTo({ + url: link.link + `?data=${JSON.stringify(link.reid)}` + }) + } + // request({ + // url: `/api/extend/demo/UpdateIsReadEnd?MessageId=${id}`, + // method: 'put', + // data: {} + // }).then(res => { + // console.log("修改已读", res) + // if (res.code == 200) { + // console.log('成功修改') + // if (link.type === '公文办理通知') { + // this.download(link.link) + // } else { + // uni.navigateTo({ + // url: link.link + `?data=${JSON.stringify(link.reid)}` + // }) + // } + + // if (link.type === '公文办理通知') { + // this.download(link.link) + // } else if (link.type === '表单填报通知') { + // uni.navigateTo({ + // url: link.link + `?id=${link.reid}` + // }) + // } else { + // uni.navigateTo({ + // url: link.link + `?data=${JSON.stringify(link.reid)}` + // }) + // } + // } + // }) + }, + download(it) { + uni.downloadFile({ + url: this.baseUrl + it, //下载地址接口返回 + success: (data) => { + if (data.statusCode === 200) { + //文件保存到本地 + uni.saveFile({ + tempFilePath: data.tempFilePath, //临时路径 + success: function(res) { + uni.showToast({ + icon: 'none', + mask: true, + title: '文件已保存：' + res.savedFilePath, //保存路径 + duration: 3000, + }); + setTimeout(() => { + //打开文档查看 + uni.openDocument({ + filePath: res.savedFilePath, + success: function(res) { + // console.log('打开文档成功'); + } + }); + }, 3000) + } + }); + } + }, + fail: (err) => { + that.loadelshow = false + console.log(err); + uni.showToast({ + icon: 'none', + mask: true, + title: '失败请重新下载', + }); + }, + }); + }, } } diff --git a/pages/my/messageList/messageList.vue b/pages/my/messageList/messageList.vue index 04c0624..7e5b57b 100644 --- a/pages/my/messageList/messageList.vue +++ b/pages/my/messageList/messageList.vue @@ -11,7 +11,7 @@ {{it.MessageContent.BodyText}} - + 未读 diff --git a/pages/my/my.vue b/pages/my/my.vue index 22344d4..a9bb78f 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -14,7 +14,7 @@ - + @@ -252,7 +252,19 @@ isAdmin:false }; }, - onLoad() { + // onLoad() { + // this.getUser() + // this.getSelfProCount() + // this.getSelfDemandCount() + // this.getSelfZhaoCount() + // this.getSelfCom() + // if(this.isAdmin){ + // this.getAdminNoticeTell() + // }else{ + // this.getNoticeTell() + // } + // }, + onShow() { this.getUser() this.getSelfProCount() this.getSelfDemandCount() @@ -299,7 +311,9 @@ request({ url:'/api/extend/demo/GetMyMessage', method:'get', - data:{} + data:{ + pageSize:10000 + } }).then(res=>{ console.log('通知列表',res) if(res.code == 200){ @@ -312,7 +326,9 @@ request({ url:'/api/extend/demo/GetMessageList', method:'get', - data:{} + data:{ + pageSize:10000 + } }).then(res=>{ console.log('通知列表',res) if(res.code == 200){ @@ -375,11 +391,13 @@ request({ url: this.baseUrl + '/api/Extend/baseproduct', method: 'get', - data: {} + data: { + pageSize:10000 + } }).then(res => { if (res.code === 200) { - console.log(res) this.proCount = res.data.list.length + console.log('产品数量',this.proCount,res.data.list) } else { uni.showToast({ icon: "error", @@ -394,7 +412,9 @@ request({ url: this.baseUrl + '/api/Extend/demandrelease', method: 'get', - data: {} + data: { + pageSize:10000 + } }).then(res => { if (res.code === 200) { // console.log(res.data.list.length ,"需求数量") @@ -412,7 +432,9 @@ request({ url: this.baseUrl + '/api/Extend/basetalentrecruitment', method: 'get', - data: {} + data: { + pageSize:10000 + } }).then(res => { if (res.code === 200) { console.log(res) @@ -430,7 +452,9 @@ request({ url: this.baseUrl + '/api/SubDev/baseenterprisemanager', method: 'get', - data: {} + data: { + pageSize:10000 + } }).then(res => { if (res.code === 200) { console.log(res) diff --git a/pages/my/myCom/myCom.vue b/pages/my/myCom/myCom.vue index 729b0e1..4782e5b 100644 --- a/pages/my/myCom/myCom.vue +++ b/pages/my/myCom/myCom.vue @@ -44,7 +44,9 @@ import utils from '../../../service/utils' request({ url: this.baseUrl + '/api/SubDev/baseenterprisemanager', method: 'get', - data: {} + data: { + pageSize:10000 + } }).then(res => { if (res.code === 200) { console.log(res) diff --git a/pages/my/myDemand/myDemand.vue b/pages/my/myDemand/myDemand.vue index ee6d392..9cc19d3 100644 --- a/pages/my/myDemand/myDemand.vue +++ b/pages/my/myDemand/myDemand.vue @@ -44,7 +44,9 @@ import utils from '../../../service/utils' request({ url: this.baseUrl + '/api/Extend/demandrelease', method: 'get', - data: {} + data: { + pageSize:10000 + } }).then(res => { if (res.code === 200) { console.log(res) diff --git a/pages/my/myPro/myPro.vue b/pages/my/myPro/myPro.vue index 673bbfb..2d4ce8b 100644 --- a/pages/my/myPro/myPro.vue +++ b/pages/my/myPro/myPro.vue @@ -44,7 +44,9 @@ import utils from '../../../service/utils' request({ url: this.baseUrl + '/api/Extend/baseproduct', method: 'get', - data: {} + data: { + pageSize:10000 + } }).then(res => { if (res.code === 200) { console.log(res) diff --git a/pages/my/myZhao/myZhao.vue b/pages/my/myZhao/myZhao.vue index df3134a..a04325b 100644 --- a/pages/my/myZhao/myZhao.vue +++ b/pages/my/myZhao/myZhao.vue @@ -44,7 +44,9 @@ request({ url: this.baseUrl + '/api/Extend/basetalentrecruitment', method: 'get', - data: {} + data: { + pageSize:10000 + } }).then(res => { if (res.code === 200) { console.log(res) diff --git a/pages/my/personalData/index.vue b/pages/my/personalData/index.vue index 154c7de..9be2e23 100644 --- a/pages/my/personalData/index.vue +++ b/pages/my/personalData/index.vue @@ -6,11 +6,11 @@ - + - + @@ -21,7 +21,8 @@ gender: '', birthday: '', userInfo: {}, - baseUrl:'http://deyanggaoxin.fengshiyun.com' + baseUrl:'http://deyanggaoxin.fengshiyun.com', + } }, computed: { @@ -31,6 +32,7 @@ }, onLoad() { this.userInfo = uni.getStorageSync('user') || {}; + console.log(this.userInfo) this.gender = this.userInfo.gender == 1 ? '男' : this.userInfo.gender == 2 ? '女' : '保密' this.birthday = this.userInfo.birthday ? this.$u.timeFormat(this.userInfo.birthday, 'yyyy-mm-dd') : '' diff --git a/pages/news/news.vue b/pages/news/news.vue index f652668..e8bbc68 100644 --- a/pages/news/news.vue +++ b/pages/news/news.vue @@ -50,9 +50,9 @@ - + @@ -125,7 +125,7 @@ this.getNewsList('360233879019193605') }, methods: { - // 获取用户信息 + // 获取用户信息判断是否有公示公告和新闻信息发布的ID,权限判断authority = 194684404600145157 getUser() { if (uni.getStorageSync('user')) { let userCode = uni.getStorageSync('user') @@ -135,10 +135,9 @@ this.userIcon = userCode.userInfo.headIcon this.organizeName = userCode.userInfo.organizeName // this.isAdmin = userCode.userInfo.isCompany - console.log(userCode) - if (userCode.userInfo.userId === 'admin') { - this.isAdmin = true - } + let authorityID = userCode.permissionList + this.isAdmin = authorityID.some(it => it.modelId === '194684404600145157') + console.log('是否有公示公告和新闻信息权限',this.isAdmin) } else { uni.showToast({ title: '请登录', diff --git a/pages/newsDetail/newsDetail.vue b/pages/newsDetail/newsDetail.vue index c06fc21..51b136a 100644 --- a/pages/newsDetail/newsDetail.vue +++ b/pages/newsDetail/newsDetail.vue @@ -114,7 +114,7 @@ import BASE_URL from '../../common/config.js' let currentId = that.data console.log(currentId) that.API.getNewsDetail(currentId).then(res =>{ - console.log(res) + console.log('返回res',res) let createTime = utils.formatTime(res.data.createTime) res.data.createTime = createTime that.detailData = res.data diff --git a/pages/notice/notice.vue b/pages/notice/notice.vue index 1bc623f..dd71e0c 100644 --- a/pages/notice/notice.vue +++ b/pages/notice/notice.vue @@ -46,9 +46,9 @@ - + @@ -117,20 +117,20 @@ import utils from '../../service/utils'; this.getNoticeList(this.categorrId) }, methods: { - // 获取用户信息 + // 获取用户信息判断是否有公示公告和新闻信息发布的ID,权限判断authority = 194684404600145157 getUser(){ if (uni.getStorageSync('user')) { let userCode = uni.getStorageSync('user') // console.log("用户的code", this.userCode) - this.userId = userCode.userInfo.userId - this.userName = userCode.userInfo.userAccount - this.userIcon = userCode.userInfo.headIcon - this.organizeName = userCode.userInfo.organizeName - // this.isAdmin = userCode.userInfo.isCompany + // this.userId = userCode.userInfo.userId + // this.userName = userCode.userInfo.userAccount + // this.userIcon = userCode.userInfo.headIcon + // this.organizeName = userCode.userInfo.organizeName + let authorityID = userCode.permissionList + this.isAdmin = authorityID.some(it => it.modelId === '194684404600145157') + console.log('是否有公示公告和新闻信息权限',this.isAdmin) console.log(userCode) - if(userCode.userInfo.userId === 'admin'){ - this.isAdmin = true - } + } else { uni.showToast({ title: '请登录', diff --git a/pages/official/grouping/grouping.vue b/pages/official/grouping/grouping.vue index 10d7865..473755d 100644 --- a/pages/official/grouping/grouping.vue +++ b/pages/official/grouping/grouping.vue @@ -1,43 +1,237 @@ - \ No newline at end of file diff --git a/pages/official/grouping/official.scss b/pages/official/grouping/official.scss new file mode 100644 index 0000000..1b86700 --- /dev/null +++ b/pages/official/grouping/official.scss @@ -0,0 +1,67 @@ +.official { + display: flex; + align-items: center; + justify-content: space-between; + background-color: #fff; + box-shadow: 0 -10rpx 20rpx 0 #efefef; + height: 120rpx; + width: 100%; + padding: 20rpx; + border-radius: 20rpx 20rpx 0 0; + position: fixed; + bottom: 0; + .official-btn { + background-color: #E60012; + color: #fff; + font-size: 20rpx; + border-radius: 100rpx; + padding: 0 50rpx; + height: 70rpx; + line-height: 70rpx; + } + .official-num { + color: #E60012; + font-weight: bold; + } +} +.page1{ + width: 100%; + height: 100vh; + background-color: #f4f4f4; + .fileName{ + width: 400rpx; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + } + .item { + display: flex; + justify-content: space-between; + align-items: center; + background-color: #ffffff; + border-radius: 20rpx; + height: 80rpx; + margin-top: 30rpx; + + button { + height: 60rpx; + text-align: center; + line-height: 60rpx; + margin: 0; + font-size: 20rpx; + margin-right: 30rpx; + } + } + } + .top{ + width: 90%; + margin: 0 auto; + display: flex; + justify-content: space-between; + margin-top: 20rpx; + font-size: 30rpx; + .nameTitle{ + font-weight: bold; + } + } + \ No newline at end of file diff --git a/pages/official/newGroup/Feedback.scss b/pages/official/newGroup/Feedback.scss new file mode 100644 index 0000000..5c8732f --- /dev/null +++ b/pages/official/newGroup/Feedback.scss @@ -0,0 +1,203 @@ +.page{ + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + background-color: #f6f6f6; +} +.titleall-box { + display: flex; + justify-content: space-between; + padding: 40rpx 20rpx 20rpx 0; + .titleall-left { + font-size: 32rpx; + font-weight: bold; + display: flex; + align-items: center; + .titleall-left-line { + width: 14rpx; + height: 36rpx; + border-radius: 0 10rpx 10rpx 0; + background-color: #E60012; + box-shadow: 0 0 10rpx 5rpx #fbdadc; + margin-right: 20rpx; + } + text { + font-size: 28rpx; + color: #999999; + } + } +} +/* 反馈类型 */ +.feedback-type{ + position: relative; + display: flex; + align-items: center; + justify-content: space-between; + width: 94%; + height: 100rpx; + margin: 20rpx auto; + background-color: #FFFFFF; + border-radius: 20rpx; + padding: 0 4%; + .feedback-type-left { + color: #909090; + } + .title{ + display: flex; + align-items: center; + text{ + font-size: 26rpx; + } + } + .picker{ + position: absolute; + width: 100%; + height: 100%; + opacity: 0; + } + .more{ + display: flex; + align-items: center; + text{ + color: #000; + font-size: 34rpx; + } + image { + width: 20rpx; + height: 20rpx; + margin-left: 10rpx; + } + } + .feedback-type-right { + display: flex; + align-items: center; + } +} +.example-body { + padding: 10px; + padding-top: 0; + } + + .custom-image-box { + /* #ifndef APP-NVUE */ + display: flex; + /* #endif */ + flex-direction: row; + justify-content: space-between; + align-items: center; + } + + .text { + font-size: 14px; + color: #333; + } +.segmented-control { + margin-bottom: 15px; + } + + .button-group { + margin-top: 15px; + display: flex; + justify-content: space-around; + } + + .form-item { + display: flex; + align-items: center; + } + + .button { + display: flex; + align-items: center; + height: 35px; + margin-left: 10px; + } +/* 反馈内容 */ +.feedback-data{ + width: 94%; + // height: 600rpx; + margin: 20rpx auto; + background-color: #FFFFFF; + border-radius: 20rpx; + .content{ + padding: 20rpx; + textarea{ + width: 94%; + height: 320rpx; + background-color: #f6f6f6; + border-radius: 20rpx; + padding: 20rpx; + font-size: 26rpx; + color: #222222; + } + } + .voucher-img{ + display: flex; + align-items: center; + padding: 0 20rpx; + height: 240rpx; + margin-top: 20rpx; + .list{ + width: 33%; + height: 100%; + image{ + width: 160rpx; + height: 160rpx; + border-radius: 10rpx; + } + } + } +} + +/* 联系方式 */ +.contact-way{ + display: flex; + align-items: center; + justify-content: center; + width: 94%; + height: 100rpx; + margin: 20rpx auto; + background-color: #FFFFFF; + border-radius: 20rpx; + input{ + width: 100%; + height: 100%; + padding: 0 4%; + font-size: 26rpx; + color: #222222; + } +} + +/* 提交 */ +.submit-btn{ + display: flex; + align-items: center; + justify-content: center; + width: 94%; + height: 80rpx; + margin: 30rpx auto; + background: #E60012; + border-radius: 80rpx; + text{ + color: #FFFFFF; + font-size: 28rpx; + } +} +.lieBiao{ + display: flex; + align-items: center; + justify-content: space-between; + margin-top: 20rpx; + .lef{ + display: flex; + margin-right: 20rpx; + } + .groupName{ + margin-left: 20rpx; + } + .groupCode{ + text-align: right; + } +} diff --git a/pages/official/newGroup/newGroup.vue b/pages/official/newGroup/newGroup.vue new file mode 100644 index 0000000..5c43d88 --- /dev/null +++ b/pages/official/newGroup/newGroup.vue @@ -0,0 +1,276 @@ + + + + + \ No newline at end of file diff --git a/pages/official/official.vue b/pages/official/official.vue index 3033457..c34698c 100644 --- a/pages/official/official.vue +++ b/pages/official/official.vue @@ -1,7 +1,7 @@