frontend-uniapp / Civil-Affairs-Bureau-WeChar

Commit fe62b8394079a67b5a7761cadb50773f7c014417

Authored by 起风了
1 parent 755ce1c7

1

Inline Side-by-side
Showing 11 changed files with 361 additions and 169 deletions
.DS_Store
View file @fe62b83
No preview for this file type
pages/declaration/list.vue
  View file @fe62b83
@@ -34,6 +34,31 @@ @@ -34,6 +34,31 @@
34 <view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;"> 34 <view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
35 地名命名申报 35 地名命名申报
36 </view> 36 </view>
  37 + </view>
  38 +
  39 + <view @click="gopath('/pages/mapstakeline/mapstakeline')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;margin-top:20rpx;">
  40 + <view style="width: 50%;margin: 0 auto;">
  41 + <image style="height: 120rpx;width: 100%;" src="/static/new/3.png" mode="aspectFit"></image>
  42 + </view>
  43 + <view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
  44 + 界桩界线管护
  45 + </view>
  46 + </view>
  47 + <view @click="gopath('/pages/map1/map')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;margin-top:20rpx;">
  48 + <view style="width: 50%;margin: 0 auto;">
  49 + <image style="height: 120rpx;width: 100%;" src="/static/new/image 2.png" mode="aspectFit"></image>
  50 + </view>
  51 + <view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
  52 + 地名查询服务
  53 + </view>
  54 + </view>
  55 + <view @click="gopath('/pages/maptask/maptask')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;margin-top:20rpx;">
  56 + <view style="width: 50%;margin: 0 auto;">
  57 + <image style="height: 120rpx;width: 100%;" src="/static/new/image 1.png" mode="aspectFit"></image>
  58 + </view>
  59 + <view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
  60 + 我的任务
  61 + </view>
37 </view> 62 </view>
38 63
39 </view> 64 </view>
@@ -50,7 +75,7 @@ @@ -50,7 +75,7 @@
50 </view> 75 </view>
51 76
52 </view> --> 77 </view> -->
53 - <view class="bottom"> 78 + <!-- <view class="bottom">
54 <view class="bottom-two"> 79 <view class="bottom-two">
55 <view class="bottom-two-list" @click="gopath('/pages/mapstakeline/mapstakeline')"> 80 <view class="bottom-two-list" @click="gopath('/pages/mapstakeline/mapstakeline')">
56 <view class="bottom-two-list-img"><image src="../../static/map1.png"></image></view> 81 <view class="bottom-two-list-img"><image src="../../static/map1.png"></image></view>
@@ -65,7 +90,7 @@ @@ -65,7 +90,7 @@
65 <view class="bottom-my-img"><image src="../../static/map3.png"></image></view> 90 <view class="bottom-my-img"><image src="../../static/map3.png"></image></view>
66 <view class="bottom-my-text">我的任务</view> 91 <view class="bottom-my-text">我的任务</view>
67 </view> 92 </view>
68 - </view> 93 + </view> -->
69 </view> 94 </view>
70 </template> 95 </template>
71 96
pages/funeralreport/funeralreport.vue
  View file @fe62b83
@@ -42,47 +42,89 @@ @@ -42,47 +42,89 @@
42 </view> 42 </view>
43 43
44 <view class="message-list"> 44 <view class="message-list">
45 - <view class="titleall-box">  
46 - <view class="titleall-left"><view class="titleall-left-line"></view>预约人信息<text style="color: red;">（必填）</text></view> 45 + <view class="titleall-box">
  46 + <view class="titleall-left"><view class="titleall-left-line"></view>联系人信息<text style="color: red;">（必填）</text></view>
  47 + </view>
  48 + <view class="info-box">
  49 + <view class="info-box-list">
  50 + <view class="info-box-width">
  51 + <view><input class="input-text" v-model="from.contactName" type="text" placeholder="请输入" placeholder-class="inputtext" /></view>
  52 + <view class="info-box-small">联系人姓名</view>
  53 + </view>
  54 + <view class="info-box-width">
  55 + <view><input v-model="from.contactPhone" class="input-text" type="text" placeholder="请输入" placeholder-class="inputtext" /></view>
  56 + <view class="info-box-small">联系人电话</view>
  57 + </view>
  58 + </view>
  59 + </view>
47 </view> 60 </view>
48 - <view class="info-box">  
49 - <view class="info-box-list">  
50 - <view class="info-box-width">  
51 - <view><input class="input-text" v-model="from.contactName" type="text" placeholder="请输入" placeholder-class="inputtext" /></view>  
52 - <view class="info-box-small">预约人姓名</view> 61 + <!-- -->
  62 + <view class="message-list">
  63 + <view class="titleall-box">
  64 + <view class="titleall-left"><view class="titleall-left-line"></view>遗体接运信息<text style="color: red;">（必填）</text></view>
  65 + </view>
  66 + <view class="info-box">
  67 + <view class="info-box-list">
  68 + <view class="info-box-width width100">
  69 + <!-- <view @click="areashow = true">{{area}}</view> -->
  70 + <view>
  71 + <input v-model="area" class="input-text" type="text" placeholder="请输入详细地址" placeholder-class="inputtext" />
  72 + </view>
  73 + <view class="info-box-small">接运地点</view>
  74 + </view>
53 </view> 75 </view>
54 - <view class="info-box-width">  
55 - <view><input v-model="from.contactPhone" class="input-text" type="text" placeholder="请输入" placeholder-class="inputtext" /></view>  
56 - <view class="info-box-small">预约人电话</view> 76 + <u-picker :show="areashow" :columns="areacolumns" @confirm="areaconfirm" @close="areaclose"></u-picker>
  77 + <view class="info-box-list">
  78 + <view class="info-box-width width100">
  79 + <view @click="timeshow = true">
  80 + <label>{{accessTime}}</label>
  81 + </view>
  82 + <view class="info-box-small">接运时间</view>
  83 + </view>
  84 + </view>
  85 + <view class="info-box-list">
  86 + <view class="info-box-width width100">
  87 + <view>
  88 + <input v-model="remarks" class="input-text" type="text" placeholder="请输入" placeholder-class="inputtext" />
  89 + </view>
  90 + <view class="info-box-small">备注</view>
  91 + </view>
57 </view> 92 </view>
58 </view> 93 </view>
59 </view> 94 </view>
60 - </view> 95 + <u-datetime-picker
  96 + :show="timeshow1"
  97 + mode="datetime"
  98 + v-model="accessTimeby"
  99 + @confirm="xztime"
  100 + @cancel="qxtime"
  101 + ></u-datetime-picker>
  102 + <!-- -->
61 <u-calendar :show="jytimeshow" @confirm="jytimeconfirm" @close="jytimeclose"></u-calendar> 103 <u-calendar :show="jytimeshow" @confirm="jytimeconfirm" @close="jytimeclose"></u-calendar>
62 <view class="message-list"> 104 <view class="message-list">
63 - <view class="titleall-box">  
64 - <view class="titleall-left"><view class="titleall-left-line"></view>死亡相关<text style="color: red;">（必填）</text></view>  
65 - </view>  
66 - <view class="info-box">  
67 - <view class="info-box-list">  
68 - <view class="info-box-width">  
69 - <view @click="swyyshow = true"><input disabled v-model="from.deathCase" class="input-text" type="text" placeholder="请选择" placeholder-class="inputtext" /></view>  
70 - <view class="info-box-small">死亡原因</view>  
71 - </view>  
72 - <view class="info-box-width" @click="timeshow = true">  
73 - <view>{{from.deathdate}}</view>  
74 - <view class="info-box-small">死亡日期</view> 105 + <view class="titleall-box">
  106 + <view class="titleall-left"><view class="titleall-left-line"></view>死亡因数<text style="color: red;">（必填）</text></view>
  107 + </view>
  108 + <view class="info-box">
  109 + <view class="info-box-list">
  110 + <view class="info-box-width">
  111 + <view @click="swyyshow = true"><input disabled v-model="from.deathCase" class="input-text" type="text" placeholder="请选择" placeholder-class="inputtext" /></view>
  112 + <view class="info-box-small">死亡原因</view>
  113 + </view>
  114 + <view class="info-box-width" @click="timeshow = true">
  115 + <view>{{from.deathdate}}</view>
  116 + <view class="info-box-small">死亡日期</view>
  117 + </view>
75 </view> 118 </view>
  119 + <u-picker :show="swyyshow" @confirm="swyyconfirm" @close="swyyclose" :columns="swyycolumns"></u-picker>
76 </view> 120 </view>
77 - <u-picker :show="swyyshow" @confirm="swyyconfirm" @close="swyyclose" :columns="swyycolumns"></u-picker>  
78 - </view>  
79 </view> 121 </view>
80 <u-calendar minDate="2023-11-01" maxDate="3050-12-01" :show="timeshow" @confirm="timeconfirm" @close="timeclose"></u-calendar> 122 <u-calendar minDate="2023-11-01" maxDate="3050-12-01" :show="timeshow" @confirm="timeconfirm" @close="timeclose"></u-calendar>
81 <view class="message-list"> 123 <view class="message-list">
82 - <view class="titleall-box">  
83 - <view class="titleall-left"><view class="titleall-left-line"></view>家属信息<text>（选填）</text></view>  
84 - </view>  
85 - <view class="info-box"> 124 + <view class="titleall-box">
  125 + <view class="titleall-left"><view class="titleall-left-line"></view>家属信息<text>（选填）</text></view>
  126 + </view>
  127 + <view class="info-box">
86 <view class="info-box-list"> 128 <view class="info-box-list">
87 <view class="info-box-width"> 129 <view class="info-box-width">
88 <view><input v-model="from.relativeName" class="input-text" type="text" placeholder="请输入" placeholder-class="inputtext" /></view> 130 <view><input v-model="from.relativeName" class="input-text" type="text" placeholder="请输入" placeholder-class="inputtext" /></view>
@@ -122,15 +164,15 @@ @@ -122,15 +164,15 @@
122 <view><image src="../../static/btn2.png"></image></view> 164 <view><image src="../../static/btn2.png"></image></view>
123 <view class="cart-add-text"><image src="../../static/phone.png"></image><text>联系电话</text></view> 165 <view class="cart-add-text"><image src="../../static/phone.png"></image><text>联系电话</text></view>
124 </view> 166 </view>
125 - <view class="buy-at" @click="funeralreportmove"> 167 + <view class="buy-at" @click="funeralresult">
126 <image src="../../static/btn1.png"></image> 168 <image src="../../static/btn1.png"></image>
127 - <text>下一步</text> 169 + <text>提交</text>
128 </view> 170 </view>
129 </view> 171 </view>
130 </view> 172 </view>
131 -  
132 </view> 173 </view>
133 </view> 174 </view>
  175 + <u-toast ref="uToast"></u-toast>
134 </view> 176 </view>
135 </template> 177 </template>
136 178
@@ -142,7 +184,7 @@ @@ -142,7 +184,7 @@
142 BASE_URL, 184 BASE_URL,
143 fileList: [], 185 fileList: [],
144 nvConfig:{ 186 nvConfig:{
145 - title:"填写基本信息", 187 + title:"报丧登记",
146 bgColor:"#ffffff", 188 bgColor:"#ffffff",
147 color:"#000000", 189 color:"#000000",
148 fixedAssist:{ 190 fixedAssist:{
@@ -170,7 +212,13 @@ @@ -170,7 +212,13 @@
170 relativeIdCardNumber:"", 212 relativeIdCardNumber:"",
171 relativeAddress:"", 213 relativeAddress:"",
172 214
173 - provelmage:"" 215 + provelmage:"",
  216 +
  217 + accessLocation:"",
  218 + accessTime:"",
  219 + obituaryType:"",
  220 + remarks:"",
  221 + userId:"",
174 }, 222 },
175 xbshow:false, 223 xbshow:false,
176 xbcolumns: [ 224 xbcolumns: [
@@ -186,6 +234,24 @@ @@ -186,6 +234,24 @@
186 ['自然死亡','疾病死亡','意外死亡'] 234 ['自然死亡','疾病死亡','意外死亡']
187 ], 235 ],
188 swyyshow:false, 236 swyyshow:false,
  237 +
  238 +
  239 + //
  240 + timeshow1:false,
  241 + accessLocation:"",
  242 + area:"",
  243 + xxarea:"",
  244 + areashow:false,
  245 + areacolumns:[
  246 + ['地区1', '地区2']
  247 + ],
  248 +
  249 + accessTime:"请选择",
  250 + accessTimeby:2,
  251 + timeshow:false,
  252 + remarks:"",
  253 + info:{}
  254 + //
189 }; 255 };
190 }, 256 },
191 onPageScroll(e) {this.$refs.nv.pageScroll(e)}, 257 onPageScroll(e) {this.$refs.nv.pageScroll(e)},
@@ -193,8 +259,74 @@ @@ -193,8 +259,74 @@
193 pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight} 259 pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
194 }, 260 },
195 onLoad(params) { 261 onLoad(params) {
  262 + const timestamp = Date.now();
  263 + this.accessTime = this.timestampToTime(timestamp);
  264 +
196 }, 265 },
197 methods:{ 266 methods:{
  267 + //
  268 + xztime(value){
  269 + this.timeshow1 = false
  270 + var that = this;
  271 + let selectTime =this.timestampToTime(value.value);
  272 + that.accessTime = selectTime;
  273 + },
  274 + qxtime(){
  275 + this.timeshow1 = false
  276 + },
  277 + timeclose(){
  278 + this.timeshow1 = false
  279 + },
  280 + timestampToTime(timestamp) {
  281 + timestamp = timestamp ? timestamp : null;
  282 + let date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
  283 + let Y = date.getFullYear() + '-';
  284 + let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
  285 + let D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' ';
  286 + let h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
  287 + let m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
  288 + let s = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds();
  289 + return Y + M + D + h + m + s;
  290 + },
  291 + funeralresult(){
  292 + this.from.accessLocation = this.area
  293 + this.from.accessTime = this.accessTime
  294 + // this.info.obituaryType = "网上报丧"
  295 + if(uni.getStorageSync('dh') == 2){
  296 + this.from.obituaryType = "电话报丧"
  297 + }else{
  298 + this.from.obituaryType = "网上报丧"
  299 + }
  300 + this.from.remarks = this.remarks
  301 + this.from.userId = uni.getStorageSync("USERS_KEY").userId
  302 + // console.log(this.from);
  303 + 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 != ''){
  304 + uni.showToast({
  305 + icon:"error",
  306 + title:"请填写完整必填信息"
  307 + })
  308 + }else{
  309 + // console.log(1123);
  310 + this.API.tjwsyy(this.info).then(res=>{
  311 + console.log("网上报丧",res);
  312 + })
  313 + uni.navigateTo({
  314 + url: '/pages/funeralresult/funeralresult',
  315 + })
  316 + }
  317 + },
  318 + // 地区选择确认回调
  319 + areaconfirm(e){
  320 + this.areashow = false
  321 + this.area = e.value[0];
  322 + },
  323 + areaclose(){
  324 + this.areashow = false
  325 + },
  326 + timeclose(){
  327 + this.timeshow = false
  328 + },
  329 + //
198 // 上传图片 330 // 上传图片
199 async afterRead(event) { 331 async afterRead(event) {
200 console.log(event); 332 console.log(event);
pages/funeralreportmove/funeralreportmove.vue
  View file @fe62b83
@@ -4,38 +4,37 @@ @@ -4,38 +4,37 @@
4 <view class="listBox" :style="{'padding-top':(pageTop+'px')}"> 4 <view class="listBox" :style="{'padding-top':(pageTop+'px')}">
5 <view class="content"> 5 <view class="content">
6 <view class="message-list"> 6 <view class="message-list">
7 - <view class="titleall-box">  
8 - <view class="titleall-left"><view class="titleall-left-line"></view>遗体接运信息<text style="color: red;">（必填）</text></view>  
9 - </view>  
10 - <view class="info-box">  
11 - <view class="info-box-list">  
12 - <view class="info-box-width width100">  
13 - <!-- <view @click="areashow = true">{{area}}</view> -->  
14 - <view>  
15 - <input v-model="area" class="input-text" type="text" placeholder="请输入详细地址" placeholder-class="inputtext" /> 7 + <view class="titleall-box">
  8 + <view class="titleall-left"><view class="titleall-left-line"></view>遗体接运信息<text style="color: red;">（必填）</text></view>
  9 + </view>
  10 + <view class="info-box">
  11 + <view class="info-box-list">
  12 + <view class="info-box-width width100">
  13 + <!-- <view @click="areashow = true">{{area}}</view> -->
  14 + <view>
  15 + <input v-model="area" class="input-text" type="text" placeholder="请输入详细地址" placeholder-class="inputtext" />
  16 + </view>
  17 + <view class="info-box-small">接运地点</view>
16 </view> 18 </view>
17 - <view class="info-box-small">接运地点</view>  
18 </view> 19 </view>
19 - </view>  
20 - <u-picker :show="areashow" :columns="areacolumns" @confirm="areaconfirm" @close="areaclose"></u-picker>  
21 - <view class="info-box-list">  
22 - <view class="info-box-width width100">  
23 - <view @click="timeshow = true">  
24 - <label>{{accessTime}}</label> 20 + <u-picker :show="areashow" :columns="areacolumns" @confirm="areaconfirm" @close="areaclose"></u-picker>
  21 + <view class="info-box-list">
  22 + <view class="info-box-width width100">
  23 + <view @click="timeshow = true">
  24 + <label>{{accessTime}}</label>
  25 + </view>
  26 + <view class="info-box-small">接运时间</view>
25 </view> 27 </view>
26 - <view class="info-box-small">接运时间</view>  
27 </view> 28 </view>
28 - </view>  
29 - <view class="info-box-list">  
30 - <view class="info-box-width width100">  
31 - <view>  
32 - <input v-model="remarks" class="input-text" type="text" placeholder="请输入" placeholder-class="inputtext" /> 29 + <view class="info-box-list">
  30 + <view class="info-box-width width100">
  31 + <view>
  32 + <input v-model="remarks" class="input-text" type="text" placeholder="请输入" placeholder-class="inputtext" />
  33 + </view>
  34 + <view class="info-box-small">备注</view>
33 </view> 35 </view>
34 - <view class="info-box-small">备注</view>  
35 </view> 36 </view>
36 </view> 37 </view>
37 -  
38 - </view>  
39 </view> 38 </view>
40 <u-datetime-picker 39 <u-datetime-picker
41 :show="timeshow" 40 :show="timeshow"
@@ -44,7 +43,6 @@ @@ -44,7 +43,6 @@
44 @confirm="xztime" 43 @confirm="xztime"
45 @cancel="qxtime" 44 @cancel="qxtime"
46 ></u-datetime-picker> 45 ></u-datetime-picker>
47 - <!-- <u-calendar minDate="2023-11-01" maxDate="3050-12-01" :show="timeshow" @confirm="timeconfirm" @close="timeclose"></u-calendar> -->  
48 <view class="page-footer"> 46 <view class="page-footer">
49 <view class="footer-buy"> 47 <view class="footer-buy">
50 <view class="cart-add"> 48 <view class="cart-add">
pages/hcxx/hcxx.scss
  View file @fe62b83
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 // border-top-left-radius: 20rpx; 18 // border-top-left-radius: 20rpx;
19 // border-top-right-radius: 20rpx; 19 // border-top-right-radius: 20rpx;
20 margin: 25rpx; 20 margin: 25rpx;
21 - border: 1px solid #d4d5d8; 21 + box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px;
22 // padding-bottom: 10rpx; 22 // padding-bottom: 10rpx;
23 .title-status{ 23 .title-status{
24 display: flex; 24 display: flex;
pages/hcxx/hcxx.vue
  View file @fe62b83
@@ -24,8 +24,8 @@ @@ -24,8 +24,8 @@
24 <view class="status-btn" v-if="OrderType == 1"> 24 <view class="status-btn" v-if="OrderType == 1">
25 <view><text class="red"></text><text class="red big"></text></view> 25 <view><text class="red"></text><text class="red big"></text></view>
26 <view class="btn"> 26 <view class="btn">
27 - <image src="../../static/btn.png" mode="widthFix"></image>  
28 - <text>已回车</text> 27 + <!-- <image src="../../static/btn.png" mode="widthFix"></image> -->
  28 + <text style="color: #fe7400;">已回车</text>
29 </view> 29 </view>
30 </view> 30 </view>
31 </view> 31 </view>
pages/home/home.scss
  View file @fe62b83
@@ -47,9 +47,7 @@ @@ -47,9 +47,7 @@
47 float:left; 47 float:left;
48 height: 250rpx; 48 height: 250rpx;
49 image{ 49 image{
50 - // width: 80rpx;  
51 height: 80rpx; 50 height: 80rpx;
52 - // margin-top: 100rpx;  
53 } 51 }
54 .text{ 52 .text{
55 font-size: 28rpx; 53 font-size: 28rpx;
@@ -61,10 +59,10 @@ @@ -61,10 +59,10 @@
61 } 59 }
62 60
63 .xw{ 61 .xw{
64 - background-color: rgba(255, 255, 255, 0.6); 62 + background-color: rgba(255, 255, 255, 1);
65 margin:20rpx; 63 margin:20rpx;
66 z-index: 10000000; 64 z-index: 10000000;
67 - padding: 20rpx; 65 + padding: 10rpx;
68 border-radius: 20rpx; 66 border-radius: 20rpx;
69 .title{ 67 .title{
70 height: 50rpx; 68 height: 50rpx;
@@ -91,37 +89,17 @@ @@ -91,37 +89,17 @@
91 } 89 }
92 } 90 }
93 .content{ 91 .content{
94 - padding: 20rpx; 92 + padding: 20rpx;
  93 + display: flex;
95 .box_item{ 94 .box_item{
96 - background-color: #fff;  
97 - display: flex;  
98 padding: 20rpx; 95 padding: 20rpx;
99 border-radius: 20rpx; 96 border-radius: 20rpx;
100 - height: 200rpx;  
101 - .box_left{  
102 - display: flex;  
103 - flex-direction: column;  
104 - justify-content: space-between;  
105 - width: 60%;  
106 - .f1{  
107 - font-size: 35rpx;  
108 - font-weight: 600;  
109 - display: block;  
110 - margin-bottom: 20rpx;  
111 - }  
112 - .f2{  
113 - color: #ababab;  
114 - }  
115 - }  
116 - .box_right{  
117 - width: 40%;  
118 - .images{  
119 - background-color: #ababab;  
120 - height: 160rpx;  
121 - border-radius: 20rpx;  
122 - background-image: url("http://antis14.sherkxuan.cn/assets/images/a1.png");  
123 - background-size: 100% 100%;  
124 - } 97 + height: 200rpx;
  98 + width: 25%;
  99 + text-align: center;
  100 + .text{
  101 + font-size: 20rpx;
  102 + font-weight: 600;
125 } 103 }
126 } 104 }
127 } 105 }
pages/home/home.vue
  View file @fe62b83
@@ -29,12 +29,11 @@ @@ -29,12 +29,11 @@
29 </view> 29 </view>
30 <view class="list" @click="funeral"> 30 <view class="list" @click="funeral">
31 <view><image src="/static/new/4.png" mode="heightFix"></image></view> 31 <view><image src="/static/new/4.png" mode="heightFix"></image></view>
32 - <view class="text">殡葬服务</view> 32 + <view class="text">殡葬</view>
33 </view> 33 </view>
34 - <view class="list" @click="toponym"> 34 + <!-- <view class="list" @click="toponym">
35 <view><image src="/static/new/image 1.png" mode="heightFix"></image></view> 35 <view><image src="/static/new/image 1.png" mode="heightFix"></image></view>
36 <view class="text">地名申报</view> 36 <view class="text">地名申报</view>
37 - <!-- <view class="text">个案接报登记</view> -->  
38 </view> 37 </view>
39 <view class="list" @click="lmpsb"> 38 <view class="list" @click="lmpsb">
40 <view><image src="/static/new/image 2.png" mode="heightFix"></image></view> 39 <view><image src="/static/new/image 2.png" mode="heightFix"></image></view>
@@ -47,35 +46,106 @@ @@ -47,35 +46,106 @@
47 <view class="list" @click="journalism"> 46 <view class="list" @click="journalism">
48 <view><image src="/static/new/image 4.png" mode="heightFix"></image></view> 47 <view><image src="/static/new/image 4.png" mode="heightFix"></image></view>
49 <view class="text">新闻资讯</view> 48 <view class="text">新闻资讯</view>
50 - </view> 49 + </view> -->
51 </view> 50 </view>
52 </view> 51 </view>
53 </view> 52 </view>
54 - <!-- 新闻 -->  
55 - <view class="xw"> 53 + <!-- 服务 -->
  54 + <view class="xw" style="padding-top: 20rpx;padding-left: 20rpx;">
56 <view class="title"> 55 <view class="title">
57 <view class="box1"> 56 <view class="box1">
58 <image src="../../static/new/矩形 331.png" mode=""></image> 57 <image src="../../static/new/矩形 331.png" mode=""></image>
59 - <span>新闻资讯</span>  
60 - </view>  
61 - <view class="box2">  
62 - <span>查看更多 ></span> 58 + <span>殡葬服务</span>
63 </view> 59 </view>
64 </view> 60 </view>
65 - <view class="content" @click="xwtz">  
66 - <view class="box_item">  
67 - <view class="box_left">  
68 - <span class="f1">眉山仁寿城北小学激发学生爱国主义热情</span>  
69 - <span class="f2">500人阅读</span>  
70 - </view>  
71 - <view class="box_right">  
72 - <view class="images">  
73 - <!-- <image src="../../static/xw.png" mode="widthFix"></image> -->  
74 - </view>  
75 - </view> 61 + <view class="content">
  62 + <view class="box_item" @click="funeralculture">
  63 + <view>
  64 + <image src="/static/nav/nav_ico7.png" style="width: 90%;" mode="widthFix"></image>
  65 + </view>
  66 + <view class="text">文化宣传</view>
  67 + </view>
  68 + <view class="box_item" @click="funerallaw">
  69 + <view>
  70 + <image src="/static/nav/nav_ico8.png" style="width: 90%;" mode="widthFix"></image>
  71 + </view>
  72 + <view class="text">普法宣传</view>
  73 + </view>
  74 + <view class="box_item" @click="funeralguide">
  75 + <view>
  76 + <image src="/static/nav/nav_ico9.png" style="width: 90%;" mode="widthFix"></image>
  77 + </view>
  78 + <view class="text">办事指南</view>
  79 + </view>
  80 + <view class="box_item" @click="funeralproblem">
  81 + <view>
  82 + <image src="/static/nav/nav_ico10.png" style="width: 90%;" mode="widthFix"></image>
  83 + </view>
  84 + <view class="text">常见问题</view>
76 </view> 85 </view>
77 </view> 86 </view>
  87 + </view>
  88 +
  89 + <view class="xw" style="padding-top: 20rpx;padding-left: 20rpx;">
  90 + <view class="title">
  91 + <view class="box1">
  92 + <image src="../../static/new/矩形 331.png" mode=""></image>
  93 + <span>区域服务</span>
  94 + </view>
  95 + </view>
  96 + <view class="content" style="margin-bottom:40rpx;">
  97 + <view class="box_item" @click="gopath('/pages/declaration/declaration?type=5')">
  98 + <view style="margin-bottom: 20rpx;">
  99 + <image src="/static/ly/image11.png" style="width: 60%;height: 90rpx;" mode=""></image>
  100 + </view>
  101 + <view class="text">门楼牌需求申报</view>
  102 + </view>
  103 + <view class="box_item" @click="gopath('/pages/mapdoorplate/mapdoorplate')">
  104 + <view style="margin-bottom: 20rpx;">
  105 + <image src="/static/ly/image8.png" style="width: 60%;height: 90rpx;" mode=""></image>
  106 + </view>
  107 + <view class="text">地名标志牌需求申报</view>
  108 + </view>
  109 + <view class="box_item" @click="gopath('/pages/declaration/declaration?type=3')">
  110 + <view style="margin-bottom: 20rpx;">
  111 + <image src="/static/ly/image5.png" style="width: 60%;height: 90rpx;" mode=""></image>
  112 + </view>
  113 + <view class="text">建筑物名称备案</view>
  114 + </view>
  115 + <view class="box_item" @click="gopath('/pages/declaration/newDeclaration')">
  116 + <view style="margin-bottom: 20rpx;">
  117 + <image src="/static/ly/image6.png" style="width: 60%;height: 90rpx;" mode=""></image>
  118 + </view>
  119 + <view class="text">地名命名</view>
  120 + </view>
  121 + </view>
  122 + <view class="content" style="margin-top: -70rpx;z-index: 10000;padding: 0 20rpx;">
  123 + <view class="box_item" @click="lmpsb">
  124 + <view style="margin-bottom: 20rpx;">
  125 + <image src="/static/new/image 2.png" style="width: 60%;height: 90rpx;" mode=""></image>
  126 + </view>
  127 + <view class="text">地名查询</view>
  128 + </view>
  129 + </view>
78 </view> 130 </view>
  131 +
  132 + <view class="xw" style="">
  133 + <view class="title">
  134 + <view class="box1">
  135 + <image src="../../static/new/矩形 331.png" mode=""></image>
  136 + <span>未保服务</span>
  137 + </view>
  138 + </view>
  139 + <view class="content">
  140 + <view class="box_item" @click="minor">
  141 + <view style="margin-bottom: 20rpx;">
  142 + <image src="/static/new/2.png" style="height: 100rpx;" mode="heightFix"></image>
  143 + </view>
  144 + <view class="text">个案登记</view>
  145 + </view>
  146 + </view>
  147 + </view>
  148 +
79 </view> 149 </view>
80 </view> 150 </view>
81 151
@@ -120,7 +190,35 @@ @@ -120,7 +190,35 @@
120 onLoad() { 190 onLoad() {
121 uni.hideTabBar(); 191 uni.hideTabBar();
122 }, 192 },
123 - methods: { 193 + methods: {
  194 + //
  195 + funeralculture() {
  196 + uni.navigateTo({
  197 + url: '/pages/funeralculture/funeralculture'
  198 + })
  199 + },
  200 + funerallaw() {
  201 + uni.navigateTo({
  202 + url: '/pages/funerallaw/funerallaw'
  203 + })
  204 + },
  205 + funeralguide() {
  206 + uni.navigateTo({
  207 + url: '/pages/funeralguide/funeralguide'
  208 + })
  209 + },
  210 + funeralproblem() {
  211 + uni.navigateTo({
  212 + url: '/pages/funeralproblem/funeralproblem'
  213 + })
  214 + },
  215 + //
  216 + gopath(e) {
  217 + uni.navigateTo({
  218 + url: e
  219 + })
  220 + },
  221 + //
124 gopath(e) { 222 gopath(e) {
125 uni.navigateTo({ 223 uni.navigateTo({
126 url: e 224 url: e
pages/my/my.vue
  View file @fe62b83
@@ -26,10 +26,16 @@ @@ -26,10 +26,16 @@
26 <view class="message-list"> 26 <view class="message-list">
27 <!-- 司机列表 --> 27 <!-- 司机列表 -->
28 <view class="" v-if="sjshow"> 28 <view class="" v-if="sjshow">
  29 + <view class="titleall-box" style="margin-bottom: -20rpx;">
  30 + <view class="titleall-left"><view class="titleall-left-line"></view>服务</view>
  31 + </view>
29 <hcxx v-if="sjshow"></hcxx> 32 <hcxx v-if="sjshow"></hcxx>
30 </view> 33 </view>
31 <!-- 收敛工列表 --> 34 <!-- 收敛工列表 -->
32 <view class="" v-if="slgshow"> 35 <view class="" v-if="slgshow">
  36 + <view class="titleall-box" style="margin-bottom: -40rpx;">
  37 + <view class="titleall-left"><view class="titleall-left-line"></view>服务</view>
  38 + </view>
33 <slgxx v-if="slgshow"></slgxx> 39 <slgxx v-if="slgshow"></slgxx>
34 </view> 40 </view>
35 <view class="titleall-box" v-if="!sjshow && !slgshow"> 41 <view class="titleall-box" v-if="!sjshow && !slgshow">
@@ -80,57 +86,11 @@ @@ -80,57 +86,11 @@
80 <text class="iconfont icon-more"></text> 86 <text class="iconfont icon-more"></text>
81 </view> 87 </view>
82 </view> 88 </view>
83 - <!-- <view class="list" @click="hcxx" v-if="sjshow">  
84 - <view class="icon-data">  
85 - <view class="icon">  
86 - <image src="/static/my-icon6.png" mode=""></image>  
87 - </view>  
88 - <view class="data">  
89 - <view class="title">  
90 - <text>消息</text>  
91 - </view>  
92 - </view>  
93 - </view>  
94 - <view class="more">  
95 - <text class="iconfont icon-more"></text>  
96 - </view>  
97 - </view> -->  
98 -  
99 - <!-- <view class="list" @click="slgxx" v-if="slgshow">  
100 - <view class="icon-data">  
101 - <view class="icon">  
102 - <image src="/static/my-icon6.png" mode=""></image>  
103 - </view>  
104 - <view class="data">  
105 - <view class="title">  
106 - <text>消息</text>  
107 - </view>  
108 - </view>  
109 - </view>  
110 - <view class="more">  
111 - <text class="iconfont icon-more"></text>  
112 - </view>  
113 - </view> -->  
114 - <!-- <view class="list" @click="dhbs" v-if="ddyshow">  
115 - <view class="icon-data">  
116 - <view class="icon">  
117 - <image src="/static/my-icon6.png" mode=""></image>  
118 - </view>  
119 - <view class="data">  
120 - <view class="title">  
121 - <text>电话报丧</text>  
122 - </view>  
123 - </view>  
124 - </view>  
125 - <view class="more">  
126 - <text class="iconfont icon-more"></text>  
127 - </view>  
128 - </view> -->  
129 </view> 89 </view>
130 </view> 90 </view>
131 </view> 91 </view>
132 <!-- tabbar --> 92 <!-- tabbar -->
133 - <TabBar :tabBarShow="3"></TabBar> 93 + <TabBar :tabBarShow="3" v-if="!sjshow && !slgshow"></TabBar>
134 </view> 94 </view>
135 </template> 95 </template>
136 96
pages/slgxx/slgxx.scss
  View file @fe62b83
@@ -15,7 +15,8 @@ @@ -15,7 +15,8 @@
15 background-color: #FFFFFF; 15 background-color: #FFFFFF;
16 border-radius: 20rpx; 16 border-radius: 20rpx;
17 margin: 25rpx; 17 margin: 25rpx;
18 - border: 1px solid #d4d5d8; 18 + // border: 1px solid #d4d5d8;
  19 + box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px;
19 .title-status{ 20 .title-status{
20 display: flex; 21 display: flex;
21 align-items: center; 22 align-items: center;
pages/slgxx/slgxx.vue
  View file @fe62b83
@@ -24,8 +24,8 @@ @@ -24,8 +24,8 @@
24 <view class="status-btn" v-if="OrderType == 1"> 24 <view class="status-btn" v-if="OrderType == 1">
25 <view><text class="red"></text><text class="red big"></text></view> 25 <view><text class="red"></text><text class="red big"></text></view>
26 <view class="btn"> 26 <view class="btn">
27 - <image src="../../static/btn.png" mode="widthFix"></image>  
28 - <text>已确认</text> 27 + <!-- <image src="../../static/btn.png" mode="widthFix"></image> -->
  28 + <text style="color: #fe7400;">已确认</text>
29 </view> 29 </view>
30 </view> 30 </view>
31 </view> 31 </view>