diff --git a/.DS_Store b/.DS_Store
index 9c13582..6c7d7cd 100644
--- a/.DS_Store
+++ b/.DS_Store
diff --git a/pages/declaration/list.vue b/pages/declaration/list.vue
index ef94042..0bfe0e2 100644
--- a/pages/declaration/list.vue
+++ b/pages/declaration/list.vue
@@ -34,6 +34,31 @@
地名命名申报
+
+
+
+
+
+
+
+ 界桩界线管护
+
+
+
+
+
+
+
+ 地名查询服务
+
+
+
+
+
+
+
+ 我的任务
+
@@ -50,7 +75,7 @@
-->
-
+
diff --git a/pages/funeralreport/funeralreport.vue b/pages/funeralreport/funeralreport.vue
index f452f87..a807d93 100644
--- a/pages/funeralreport/funeralreport.vue
+++ b/pages/funeralreport/funeralreport.vue
@@ -42,47 +42,89 @@
-
- 预约人信息（必填）
+
+ 联系人信息（必填）
+
+
+
+
+
+ 联系人姓名
+
+
+
+ 联系人电话
+
+
+
-
-
-
-
- 预约人姓名
+
+
+
+ 遗体接运信息（必填）
+
+
+
+
+
+
+
+
+ 接运地点
+
-
-
- 预约人电话
+
+
+
+
+
+
+ 接运时间
+
+
+
+
+
+
+
+ 备注
+
-
+
+
-
- 死亡相关（必填）
-
-
-
-
-
- 死亡原因
-
-
- {{from.deathdate}}
- 死亡日期
+
+ 死亡因数（必填）
+
+
+
+
+
+ 死亡原因
+
+
+ {{from.deathdate}}
+ 死亡日期
+
+
-
-
-
- 家属信息（选填）
-
-
+
+ 家属信息（选填）
+
+
@@ -122,15 +164,15 @@
联系电话
-
+
- 下一步
+ 提交
-
+
@@ -142,7 +184,7 @@
BASE_URL,
fileList: [],
nvConfig:{
- title:"填写基本信息",
+ title:"报丧登记",
bgColor:"#ffffff",
color:"#000000",
fixedAssist:{
@@ -170,7 +212,13 @@
relativeIdCardNumber:"",
relativeAddress:"",
- provelmage:""
+ provelmage:"",
+
+ accessLocation:"",
+ accessTime:"",
+ obituaryType:"",
+ remarks:"",
+ userId:"",
},
xbshow:false,
xbcolumns: [
@@ -186,6 +234,24 @@
['自然死亡','疾病死亡','意外死亡']
],
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)},
@@ -193,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);
diff --git a/pages/funeralreportmove/funeralreportmove.vue b/pages/funeralreportmove/funeralreportmove.vue
index 6af8545..41ebb30 100644
--- a/pages/funeralreportmove/funeralreportmove.vue
+++ b/pages/funeralreportmove/funeralreportmove.vue
@@ -4,38 +4,37 @@
-
- 遗体接运信息（必填）
-
-
-
-
-
-
-
+
+ 遗体接运信息（必填）
+
+
+
+
+
+
+
+
+ 接运地点
- 接运地点
-
-
-
-
-
-
+
+
+
+
+
+
+ 接运时间
- 接运时间
-
-
-
-
-
+
+
+
+
+
+ 备注
- 备注
-
-
-
-
-
+
+
- 新闻资讯
-
-
- 查看更多 >
+ 殡葬服务
-
-
-
- 眉山仁寿城北小学激发学生爱国主义热情
- 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
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 59d1763..2b4f6b8 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -26,10 +26,16 @@
+
+ 服务
+
+
+ 服务
+
@@ -80,57 +86,11 @@
-
-
-
-
-
+
diff --git a/pages/slgxx/slgxx.scss b/pages/slgxx/slgxx.scss
index c1da8f0..1fe492a 100644
--- a/pages/slgxx/slgxx.scss
+++ b/pages/slgxx/slgxx.scss
@@ -15,7 +15,8 @@
background-color: #FFFFFF;
border-radius: 20rpx;
margin: 25rpx;
- border: 1px solid #d4d5d8;
+ // border: 1px solid #d4d5d8;
+ box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px;
.title-status{
display: flex;
align-items: center;
diff --git a/pages/slgxx/slgxx.vue b/pages/slgxx/slgxx.vue
index cc6e387..8497fc6 100644
--- a/pages/slgxx/slgxx.vue
+++ b/pages/slgxx/slgxx.vue
@@ -24,8 +24,8 @@
-
- 已确认
+
+ 已确认