diff --git a/.DS_Store b/.DS_Store index 7bbd772..6c7d7cd 100644 --- a/.DS_Store +++ b/.DS_Store diff --git a/.gitignore b/.gitignore index ffed323..ddaf27f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +unpackage/ node_modules/ dist/ uploadfiles/ diff --git a/apis/.DS_Store b/apis/.DS_Store index d99aadb..1bbe57b 100644 --- a/apis/.DS_Store +++ b/apis/.DS_Store diff --git a/apis/modules/ly.js b/apis/modules/ly.js index 1b43592..3dca82d 100644 --- a/apis/modules/ly.js +++ b/apis/modules/ly.js @@ -1,6 +1,30 @@ import request from '../../service/request.js' import utils from '../../service/utils.js' -export default { +export default { + // 修改界桩 + removeplie(data){ + return request.put('/areBoundary/plie',data) + }, + // 添加界桩 + addplie(data){ + return request.post('/areBoundary/plie',data) + }, + // 获取地名类别 + getregional(data){ + return request.get('/arePlaceName/regional/list',data) + }, + // 获取处理地名类别 + gettreeselect(data){ + return request.get('/arePlaceName/regional/treeselect',data) + }, + // 添加国家地理 + toponym(data){ + return request.post('/arePlaceName/toponym',data) + }, + // 获取国家地理 + gettoponym(data){ + return request.get('/arePlaceName/toponym/list',data) + }, // 申报巡检 addpatrol(data){ return request.post('/areBoundary/patrol',data) @@ -13,6 +37,10 @@ export default { getpolicyDocument(data){ return request.get('/arePlaceName/policyDocument/list',data) }, + // 政策文件详情 + getpolicyDocumentone(data){ + return request.get('/arePlaceName/policyDocument/'+data) + }, // 行政区 getplie(data){ return request.get('/areBoundary/plie/list',data) diff --git a/apis/modules/oauth.js b/apis/modules/oauth.js index fda517a..83cbe82 100644 --- a/apis/modules/oauth.js +++ b/apis/modules/oauth.js @@ -27,6 +27,10 @@ export default { getfbgl(data){ return request.get("/funeral/related/list",data) }, + // 获取殡葬文化、普法、办事、详情 + getfbgldata(data){ + return request.get("/funeral/related/"+data) + }, // 获取殡葬服务机构列表 getjg(){ return request.get('/funeral/agencies/list?pageNum=1&pageSize=10'); diff --git a/common/config.js b/common/config.js index 7c2e8a7..811245d 100644 --- a/common/config.js +++ b/common/config.js @@ -1,7 +1,7 @@ let BASE_URL='http://8.130.38.56:8536'; -// let BASE_URL='http://10.0.0.2:2023'; +// let BASE_URL='http://192.168.179.221:8536'; export default BASE_URL diff --git a/components/TabBar/TabBar.vue b/components/TabBar/TabBar.vue index 4bca5eb..0bd7a8b 100644 --- a/components/TabBar/TabBar.vue +++ b/components/TabBar/TabBar.vue @@ -1,6 +1,7 @@ diff --git a/pages/declaration/newDeclaration.vue b/pages/declaration/newDeclaration.vue new file mode 100644 index 0000000..090aa29 --- /dev/null +++ b/pages/declaration/newDeclaration.vue @@ -0,0 +1,1031 @@ + + + + + \ No newline at end of file diff --git a/pages/declaration/newDeclarationdetail.vue b/pages/declaration/newDeclarationdetail.vue new file mode 100644 index 0000000..589df58 --- /dev/null +++ b/pages/declaration/newDeclarationdetail.vue @@ -0,0 +1,587 @@ + + + + + \ No newline at end of file diff --git a/pages/funeral/funeral.vue b/pages/funeral/funeral.vue index 42c2654..43f5755 100644 --- a/pages/funeral/funeral.vue +++ b/pages/funeral/funeral.vue @@ -110,29 +110,8 @@ }, onLoad() { uni.hideTabBar(); - this.getGps(); }, methods: { - // 获取gps定位 - getGps(){ - var info = { - request:{ - "Action":"GetVehicleTrackData", - "UserId":"user", - "Pwd":"6B18CFA67F76F079B0BFFBD773DC4494", - "PlateNum":"川Zyb907", - "ColorCode":"0", - "BeginTime":"20231010090000", - "EndTime":"20231010150000", - "MinSpeed":"1", - "NeedAddress":"0", - } - } - info.request = JSON.stringify(info.request) - this.API.getGps(info).then(res=>{ - console.log("gps",res); - }) - }, home() { uni.navigateTo({ url: '/pages/home/home' diff --git a/pages/funeralcremation/funeralcremation.vue b/pages/funeralcremation/funeralcremation.vue index 619734d..ef50cd4 100644 --- a/pages/funeralcremation/funeralcremation.vue +++ b/pages/funeralcremation/funeralcremation.vue @@ -172,11 +172,12 @@ onLoad(params) { this.OrderType = params.type; var now = new Date(); - this.nowdate = now - this.from.scheduledCremationDate = now + this.nowdate = this.timestampToTime(now) + this.from.scheduledCremationDate = this.timestampToTime(now) + console.log("时间",this.from.scheduledCremationDate); // this.gethhsjsl(this.parseTime(now)); this.getbsinfo(); - this.zxhhllist(now); + this.zxhhllist(this.timestampToTime(now)); }, onReady() { this.$nextTick(() => { @@ -208,8 +209,20 @@ }, 2000); }, methods:{ + timestampToTime(timestamp) { + timestamp = timestamp ? timestamp : null; + let date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000 + let Y = date.getFullYear() + '-'; + let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'; + let D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' '; + let h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':'; + let m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':'; + let s = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds(); + return Y + M + D; + }, // 火化炉列表获取 zxhhllist(date){ + console.log("初始化时间",date); this.API.zxhhllist().then(res=>{ console.log("火化炉",res); this.columns = []; @@ -280,7 +293,7 @@ gethhsjsl(times){ this.API.gethhsjsl().then(res=>{ console.log("获取预约时间和数量",res); - console.log("时间",times); + console.log("时间111",times); this.sjlist = [] for(let i = 0;i < res.data.length;i++){ if(res.data[i].DateStr == times){ @@ -327,10 +340,14 @@ console.log("火化炉id",this.hhlid); this.zxhqhhltimelist(this.nowdate); this.hhlshow = false; + this.sjlist = [] this.from.cremationFurnaceInfo = e.value[0]; }, // 最新获取时间火化炉时间 zxhqhhltimelist(time){ + // time = time + '' + var reg = /[\t\r\f\n\s]*/g; + time = time.replace(reg,''); var infos = { furnaceId:this.hhlid, useStatus:"2", @@ -339,17 +356,30 @@ this.API.gethhsjsl(infos).then(res=>{ console.log("最新时间列表",res); this.sjlist = [] + console.log("选择的时间",time); + for(let i = 0;i < res.data.length;i++){ + console.log("时间是否正确",res.data[i].dateStr == time,res.data[i].dateStr,typeof(time),typeof(res.data[i].dateStr)); + // if(res.data[i].dateStr === time){ + // for(let s = 0;s < res.data[i].timeAndTotalList.length;s++){ + // var info = { + // time:"", + // status:false + // } + // info.time = res.data[i].timeAndTotalList[s].timePeriod; + // if(s == 0){ + // info.status = true + // this.from.scheduledCremationTime = res.data[i].timeAndTotalList[s].timePeriod; + // } + // this.sjlist.push(info) + // } + // } for(let s = 0;s < res.data[i].timeAndTotalList.length;s++){ var info = { time:"", status:false } info.time = res.data[i].timeAndTotalList[s].timePeriod; - // if(s == 0){ - // info.status = true - // this.from.scheduledCremationTime = res.data[i].timeAndTotalList[s].timePeriod; - // } this.sjlist.push(info) } } @@ -380,6 +410,7 @@ return } this.from.obituaryOrderNumber = this.bspersoninfo.obituaryOrderNumber + this.from.furnaceId = this.hhlid console.log("from",this.from); // return this.API.hhlyy(this.from).then(res=>{ diff --git a/pages/funeralculture/funeralculture.vue b/pages/funeralculture/funeralculture.vue index 4407499..fb6c372 100644 --- a/pages/funeralculture/funeralculture.vue +++ b/pages/funeralculture/funeralculture.vue @@ -9,7 +9,7 @@ {{item.title}} - + @@ -48,7 +48,7 @@ computed:{ pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight} }, - onShow() { + onLoad() { this.getfbgl(); }, methods: { diff --git a/pages/funeralguide/funeralguide.vue b/pages/funeralguide/funeralguide.vue index 4a210d9..62c8511 100644 --- a/pages/funeralguide/funeralguide.vue +++ b/pages/funeralguide/funeralguide.vue @@ -9,7 +9,7 @@ {{item.title}} - + @@ -48,7 +48,7 @@ computed:{ pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight} }, - onShow() { + onLoad() { this.getfbgl(); }, methods: { diff --git a/pages/funerallaw/funerallaw.vue b/pages/funerallaw/funerallaw.vue index 30b3d88..c89d535 100644 --- a/pages/funerallaw/funerallaw.vue +++ b/pages/funerallaw/funerallaw.vue @@ -9,7 +9,7 @@ {{item.title}} - + @@ -48,7 +48,7 @@ computed:{ pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight} }, - onShow() { + onLoad() { this.getfbgl(); }, methods: { @@ -71,7 +71,7 @@ tzdetail(item){ console.log("ress",item); uni.navigateTo({ - url:'/pages/xxdetail/xxdetail?info=' + JSON.stringify(item) + url:'/pages/xxdetail/xxdetail?info=' + item }) } }, diff --git a/pages/funeralproblem/funeralproblem.vue b/pages/funeralproblem/funeralproblem.vue index c7c20e5..b7c0da1 100644 --- a/pages/funeralproblem/funeralproblem.vue +++ b/pages/funeralproblem/funeralproblem.vue @@ -9,7 +9,7 @@ {{item.title}} - + @@ -48,7 +48,7 @@ computed:{ pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight} }, - onShow() { + onLoad() { this.getfbgl(); }, methods: { diff --git a/pages/funeralreport/funeralreport.vue b/pages/funeralreport/funeralreport.vue index 4827870..a807d93 100644 --- a/pages/funeralreport/funeralreport.vue +++ b/pages/funeralreport/funeralreport.vue @@ -42,46 +42,89 @@ - - 预约人信息（必填） + + 联系人信息（必填） + + + + + + 联系人姓名 + + + + 联系人电话 + + + - - - - - 预约人姓名 + + + + 遗体接运信息（必填） + + + + + + + + + 接运地点 + - - - 预约人电话 + + + + + + + 接运时间 + + + + + + + + 备注 + - + + - - 死亡相关（必填） - - - - - - 死亡原因 - - - {{from.deathdate}} - 死亡日期 + + 死亡因数（必填） + + + + + + 死亡原因 + + + {{from.deathdate}} + 死亡日期 + + - - - 家属信息（选填） - - + + 家属信息（选填） + + @@ -121,15 +164,15 @@ 联系电话 - + - 下一步 + 提交 - + @@ -141,7 +184,7 @@ BASE_URL, fileList: [], nvConfig:{ - title:"填写基本信息", + title:"报丧登记", bgColor:"#ffffff", color:"#000000", fixedAssist:{ @@ -169,7 +212,13 @@ relativeIdCardNumber:"", relativeAddress:"", - provelmage:"" + provelmage:"", + + accessLocation:"", + accessTime:"", + obituaryType:"", + remarks:"", + userId:"", }, xbshow:false, xbcolumns: [ @@ -181,6 +230,28 @@ ], timeshow:false, jytimeshow:false, + swyycolumns:[ + ['自然死亡','疾病死亡','意外死亡'] + ], + swyyshow:false, + + + // + timeshow1:false, + accessLocation:"", + area:"", + xxarea:"", + areashow:false, + areacolumns:[ + ['地区1', '地区2'] + ], + + accessTime:"请选择", + accessTimeby:2, + timeshow:false, + remarks:"", + info:{} + // }; }, onPageScroll(e) {this.$refs.nv.pageScroll(e)}, @@ -188,8 +259,74 @@ pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight} }, onLoad(params) { + const timestamp = Date.now(); + this.accessTime = this.timestampToTime(timestamp); + }, methods:{ + // + xztime(value){ + this.timeshow1 = false + var that = this; + let selectTime =this.timestampToTime(value.value); + that.accessTime = selectTime; + }, + qxtime(){ + this.timeshow1 = false + }, + timeclose(){ + this.timeshow1 = false + }, + timestampToTime(timestamp) { + timestamp = timestamp ? timestamp : null; + let date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000 + let Y = date.getFullYear() + '-'; + let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'; + let D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' '; + let h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':'; + let m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':'; + let s = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds(); + return Y + M + D + h + m + s; + }, + funeralresult(){ + this.from.accessLocation = this.area + this.from.accessTime = this.accessTime + // this.info.obituaryType = "网上报丧" + if(uni.getStorageSync('dh') == 2){ + this.from.obituaryType = "电话报丧" + }else{ + this.from.obituaryType = "网上报丧" + } + this.from.remarks = this.remarks + this.from.userId = uni.getStorageSync("USERS_KEY").userId + // console.log(this.from); + if(this.from.deceasedName == '' || this.from.deceasedAge == '' || this.from.idCardNumber == '' || this.from.ethnicity == '' || this.from.contactName == '' || this.from.contactPhone == '' || this.from.deathCase == '' || this.from.deathdate == '请选择' || this.sex == '请选择' || this.area != '请输入详细地址' || this.accessTime != "请选择" || this.remarks != ''){ + uni.showToast({ + icon:"error", + title:"请填写完整必填信息" + }) + }else{ + // console.log(1123); + this.API.tjwsyy(this.info).then(res=>{ + console.log("网上报丧",res); + }) + uni.navigateTo({ + url: '/pages/funeralresult/funeralresult', + }) + } + }, + // 地区选择确认回调 + areaconfirm(e){ + this.areashow = false + this.area = e.value[0]; + }, + areaclose(){ + this.areashow = false + }, + timeclose(){ + this.timeshow = false + }, + // // 上传图片 async afterRead(event) { console.log(event); @@ -217,8 +354,9 @@ this.fileList.splice(event.index, 1) }, funeralreportmove(){ + // this.from.deceasedSex = this.sex var info = JSON.stringify(this.from) - console.log("提交的数据",this.from); + console.log("提交的数据",this.from,this.sex); // return // deceasedName deceasedAge idCardNumber ethnicity contactName contactPhone deathCase deathdate sex if(this.from.deceasedName == '' || this.from.deceasedAge == '' || this.from.idCardNumber == '' || this.from.ethnicity == '' || this.from.contactName == '' || this.from.contactPhone == '' || this.from.deathCase == '' || this.from.deathdate == '请选择' || this.sex == '请选择'){ @@ -240,6 +378,7 @@ xbconfirm(e){ this.xbshow = false this.sex = e.value[0] + this.from.deceasedSex = e.value[0] console.log("性别选择",e); }, // 性别取消选择 @@ -263,6 +402,17 @@ timeclose(){ this.timeshow = false }, + // 死亡原因确认 + swyyconfirm(e){ + console.log("e",e); + this.from.deathCase = e.value[0] + this.swyyshow = false + }, + // 死亡原因取消 + swyyclose(){ + this.swyyshow = false + } + } } diff --git a/pages/funeralreportmove/funeralreportmove.vue b/pages/funeralreportmove/funeralreportmove.vue index 62f1ca8..41ebb30 100644 --- a/pages/funeralreportmove/funeralreportmove.vue +++ b/pages/funeralreportmove/funeralreportmove.vue @@ -3,49 +3,46 @@ - - - 遗体接运信息（必填） - - - - - - - + + 遗体接运信息（必填） + + + + + + + + + 接运地点 - 接运地点 - - - - - - {{accessTime}} + + + + + + + 接运时间 - 接运时间 - - - - - + + + + + + 备注 - 备注 - - - @@ -86,6 +83,7 @@ ], accessTime:"请选择", + accessTimeby:2, timeshow:false, remarks:"", info:{} @@ -108,8 +106,9 @@ methods:{ xztime(value){ this.timeshow = false - console.log("value",value); - this.accessTime = this.timestampToTime(value.value) + var that = this; + let selectTime =this.timestampToTime(value.value); + that.accessTime = selectTime; }, qxtime(){ this.timeshow = false @@ -164,12 +163,7 @@ areaclose(){ this.areashow = false }, - // 时间选择 - timeconfirm(e){ - console.log(e); - this.accessTime = e[0] - this.timeshow = false; - }, + timeclose(){ this.timeshow = false }, diff --git a/pages/hcxx/hcxx.scss b/pages/hcxx/hcxx.scss index 935a4f0..ae8b81f 100644 --- a/pages/hcxx/hcxx.scss +++ b/pages/hcxx/hcxx.scss @@ -4,6 +4,7 @@ } .content { width: 100%; + position: relative; } /* 订单列表 */ .order-list{ @@ -14,7 +15,11 @@ min-height: 400rpx; background-color: #FFFFFF; border-radius: 20rpx; + // border-top-left-radius: 20rpx; + // border-top-right-radius: 20rpx; margin: 25rpx; + box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px; + // padding-bottom: 10rpx; .title-status{ display: flex; align-items: center; @@ -24,6 +29,8 @@ .title{ display: flex; align-items: center; + width: 800rpx; + // border: 1px solid red; text{ font-size: 26rpx; color: #A7A7A7; @@ -61,7 +68,7 @@ font-size: 26rpx; color: #A7A7A7; .goods-name-title { - font-size: 30rpx; + font-size: 27rpx; color: #3d3d3d; font-weight: bold; margin-bottom: 40rpx; diff --git a/pages/hcxx/hcxx.vue b/pages/hcxx/hcxx.vue index 26545c3..bef1319 100644 --- a/pages/hcxx/hcxx.vue +++ b/pages/hcxx/hcxx.vue @@ -1,56 +1,57 @@ @@ -61,7 +62,7 @@ return { OrderType: 0, nvConfig:{ - title:"调度信息", + title:"接运信息", bgColor:"#ffffff", color:"#000000", fixedAssist:{ @@ -79,6 +80,10 @@ this.OrderType = 0; this.carddxx(); }, + mounted() { + this.OrderType = 0; + this.carddxx(); + }, methods:{ // 获取调度信息 carddxx(){ @@ -155,16 +160,19 @@ /* 订单tab */ .order-tab{ position: fixed; + position: absolute; left: 0; - top: 88rpx; + top: 0; + margin-top: -7vh; /* #ifdef MP-WEIXIN */ - top: calc(100rpx + var(--status-bar-height)); + // top: calc(100rpx + var(--status-bar-height)); /* #endif */ z-index: 10; display: flex; align-items: center; width: 100%; height: 100rpx; + // border: 1px solid red; background-color: #FFFFFF; .tab{ position: relative; diff --git a/pages/home/home.scss b/pages/home/home.scss index 0f8ee6d..fd5d24e 100644 --- a/pages/home/home.scss +++ b/pages/home/home.scss @@ -47,9 +47,7 @@ float:left; height: 250rpx; image{ - // width: 80rpx; height: 80rpx; - // margin-top: 100rpx; } .text{ font-size: 28rpx; @@ -61,10 +59,10 @@ } .xw{ - background-color: rgba(255, 255, 255, 0.6); + background-color: rgba(255, 255, 255, 1); margin:20rpx; z-index: 10000000; - padding: 20rpx; + padding: 10rpx; border-radius: 20rpx; .title{ height: 50rpx; @@ -91,37 +89,17 @@ } } .content{ - padding: 20rpx; + padding: 20rpx; + display: flex; .box_item{ - background-color: #fff; - display: flex; padding: 20rpx; border-radius: 20rpx; - height: 200rpx; - .box_left{ - display: flex; - flex-direction: column; - justify-content: space-between; - width: 60%; - .f1{ - font-size: 35rpx; - font-weight: 600; - display: block; - margin-bottom: 20rpx; - } - .f2{ - color: #ababab; - } - } - .box_right{ - width: 40%; - .images{ - background-color: #ababab; - height: 160rpx; - border-radius: 20rpx; - background-image: url("http://antis14.sherkxuan.cn/assets/images/a1.png"); - background-size: 100% 100%; - } + height: 200rpx; + width: 25%; + text-align: center; + .text{ + font-size: 20rpx; + font-weight: 600; } } } diff --git a/pages/home/home.vue b/pages/home/home.vue index c8f7b7b..fc98887 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -21,7 +21,7 @@ - 未成年保护 + 个案登记 @@ -29,16 +29,15 @@ - 殡葬服务 + 殡葬 - + - 个案接报登记 + 地名申报 - + - 地名申报 + 地名查询 @@ -47,35 +46,106 @@ 新闻资讯 - + --> - - + + - 新闻资讯 - - - 查看更多 > + 殡葬服务 - - - - 眉山仁寿城北小学激发学生爱国主义热情 - 500人阅读 - - - - - - + + + + + + 文化宣传 + + + + + + 普法宣传 + + + + + + 办事指南 + + + + + + 常见问题 + + + + + + + 区域服务 + + + + + + + + 门楼牌申报 + + + + + + 地名标志牌申报 + + + + + + 建筑物备案 + + + + + + 地名命名申报 + + + + + + + + 地名查询服务 + + + + + + + + 未保服务 + + + + + + + + 个案登记 + + + + @@ -120,7 +190,35 @@ onLoad() { uni.hideTabBar(); }, - methods: { + methods: { + // + funeralculture() { + uni.navigateTo({ + url: '/pages/funeralculture/funeralculture' + }) + }, + funerallaw() { + uni.navigateTo({ + url: '/pages/funerallaw/funerallaw' + }) + }, + funeralguide() { + uni.navigateTo({ + url: '/pages/funeralguide/funeralguide' + }) + }, + funeralproblem() { + uni.navigateTo({ + url: '/pages/funeralproblem/funeralproblem' + }) + }, + // + gopath(e) { + uni.navigateTo({ + url: e + }) + }, + // gopath(e) { uni.navigateTo({ url: e @@ -128,7 +226,7 @@ }, toponym() { uni.navigateTo({ - url:"/pages/toponym/toponym" + url:"/pages/declaration/newDeclaration" }) }, tzyl(){ @@ -140,29 +238,68 @@ lmpsb(){ uni.navigateTo({ // url:'/pages/mapdoorplate/mapdoorplate' - url: '/pages/receiptRegistration/receiptRegistration' + url:'/pages/map1/map' + // url: '/pages/receiptRegistration/receiptRegistration' }) }, - minor() { - uni.navigateTo({ - url: '/pages/minor/minor' + minor() { + uni.navigateTo({ + // url:'/pages/mapdoorplate/mapdoorplate' + url: '/pages/receiptRegistration/receiptRegistration' }) + // uni.navigateTo({ + // url: '/pages/minor/minor' + // }) }, journalism() { uni.navigateTo({ url: '/pages/journalism/journalism' }) + }, + // 获取用户信息 + hquserinfo(){ + var info = { + userId:uni.getStorageSync("USERS_KEY").userId, + } + this.API.hquserinfo(info).then(res=>{ + console.log("获取用户信息",res); + this.user.nickName = res.data.nickName; + this.user.avatar = res.data.avatar + this.user.deptId = res.data.deptId + console.log("信息",this.user); + }) }, funeral() { - if(uni.getStorageSync('userjs') != '普通用户'){ - uni.switchTab({ - url: '/pages/my/my' - }) - }else{ - uni.switchTab({ - url: '/pages/funeral/funeral' - }) - } + var info = { + userId:uni.getStorageSync("USERS_KEY").userId, + } + this.API.hquserinfo(info).then(res=>{ + console.log("获取用户信息",res); + console.log("信息1",res.data.roles[0].roleName,uni.getStorageSync('userjs')); + if(res.data.roles[0].roleName != uni.getStorageSync('userjs')){ + uni.reLaunch({ + url: '/pages/login/login' + }); + return + } + if(uni.getStorageSync('userjs') == null || uni.getStorageSync('userjs') == undefined){ + uni.reLaunch({ + url: '/pages/login/login' + }); + return + } + + if(uni.getStorageSync('userjs') != '普通用户'){ + uni.switchTab({ + url: '/pages/my/my' + }) + }else{ + uni.switchTab({ + url: '/pages/funeral/funeral' + }) + } + }) + }, map() { uni.navigateTo({ diff --git a/pages/map1/home.scss b/pages/map1/home.scss new file mode 100644 index 0000000..d615498 --- /dev/null +++ b/pages/map1/home.scss @@ -0,0 +1,45 @@ +.page{ + position: relative; + width: 100%; + overflow: hidden; +} + +.cent { + position: fixed; + bottom: 0; + width: 100%; + .list { + flex-wrap: wrap; + .on { + border: 2rpx solid sandybrown; + border-radius: 18rpx; + } + .item { + width: 20%; + height: 100rpx; + text-align: center; + font-size: 22rpx; + font-weight: 500; + color: #676767; + background: #FFFFFF; + // box-sizing: border-box; + padding: 20rpx 0rpx; + margin-left: 4%; + margin-bottom: 20rpx; + border-radius: 18rpx; + } + } + .list1 { + background: #FFFFFF; + padding: 0 30rpx; + .item { + width: 100%; + align-items: center; + padding: 20rpx 0; + border-top: 2rpx solid #EEEEEE; + font-size: 24rpx; + font-weight: 500; + color: #676767; + } + } +} \ No newline at end of file diff --git a/pages/map1/map - 副本.vue b/pages/map1/map - 副本.vue new file mode 100644 index 0000000..acf68e4 --- /dev/null +++ b/pages/map1/map - 副本.vue @@ -0,0 +1,266 @@ + + + + + diff --git a/pages/map1/map.vue b/pages/map1/map.vue index f4c7233..5c6c926 100644 --- a/pages/map1/map.vue +++ b/pages/map1/map.vue @@ -1,266 +1,355 @@ -