frontend-uniapp / Civil-Affairs-Bureau-WeChar

Commit 8296aa5cdbdaeaeb0509586cd45a9a09353b59d3

Authored by 李宇
2 parents b81ba111 9c04a298

Merge branch 'master' of http://39.98.150.180/frontend-uniapp/Civil-Affairs-Bureau-WeChar

Inline Side-by-side
Showing 7 changed files with 73 additions and 42 deletions
pages/declaration/list.vue
  View file @8296aa5
... ... @@ -32,7 +32,7 @@
32 32 <image style="height: 120rpx;width: 100%;" src="../../static/ly/image6.png" mode="aspectFit"></image>
33 33 </view>
34 34 <view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
35   - 地名命名申报
  35 + 地名备案
36 36 </view>
37 37 </view>
38 38  
... ... @@ -57,7 +57,7 @@
57 57 <image style="height: 120rpx;width: 100%;" src="/static/new/image 1.png" mode="aspectFit"></image>
58 58 </view>
59 59 <view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
60   - 我的任务
  60 + 巡检任务
61 61 </view>
62 62 </view>
63 63  
... ...
pages/funeralreport/funeralreport.vue
  View file @8296aa5
... ... @@ -160,7 +160,7 @@
160 160  
161 161 <view class="page-footer">
162 162 <view class="footer-buy">
163   - <view class="cart-add">
  163 + <view class="cart-add" @click="lxdh">
164 164 <view><image src="../../static/btn2.png"></image></view>
165 165 <view class="cart-add-text"><image src="../../static/phone.png"></image><text>联系电话</text></view>
166 166 </view>
... ... @@ -264,6 +264,19 @@
264 264  
265 265 },
266 266 methods:{
  267 + lxdh(){
  268 + uni.showModal({
  269 + title: '联系电话',
  270 + content: '028-36241643',
  271 + success: function(res) {
  272 + if (res.confirm) {
  273 + console.log('点击了确认')
  274 + } else {
  275 + console.log('点击了取消')
  276 + }
  277 + }
  278 + })
  279 + },
267 280 //
268 281 xztime(value){
269 282 this.timeshow1 = false
... ...
pages/funeralreservation/funeralreservation.vue
  View file @8296aa5
... ... @@ -106,7 +106,7 @@
106 106 this.$refs.uToast.show({
107 107 type: 'error',
108 108 title: '成功主题(带图标)',
109   - message: "请先去线上报丧",
  109 + message: "请先进行线上报丧",
110 110 iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/error.png'
111 111 })
112 112 }
... ...
pages/home/home.vue
  View file @8296aa5
... ... @@ -61,15 +61,15 @@
61 61 <view class="content">
62 62 <view class="box_item" @click="funeralculture">
63 63 <view>
64   - <image src="/static/nav/nav_ico7.png" style="width: 90%;" mode="widthFix"></image>
  64 + <image src="/static/nav/nav_ico5.png" style="width: 90%;" mode="widthFix"></image>
65 65 </view>
66   - <view class="text">文化宣传</view>
  66 + <view class="text">线上报丧</view>
67 67 </view>
68 68 <view class="box_item" @click="funerallaw">
69 69 <view>
70   - <image src="/static/nav/nav_ico8.png" style="width: 90%;" mode="widthFix"></image>
  70 + <image src="/static/nav/nav_ico6.png" style="width: 90%;" mode="widthFix"></image>
71 71 </view>
72   - <view class="text">普法宣传</view>
  72 + <view class="text">线上预约</view>
73 73 </view>
74 74 <view class="box_item" @click="funeralguide">
75 75 <view>
... ... @@ -116,7 +116,7 @@
116 116 <view style="margin-bottom: 20rpx;">
117 117 <image src="/static/ly/image6.png" style="width: 60%;height: 90rpx;" mode=""></image>
118 118 </view>
119   - <view class="text">地名命名申报</view>
  119 + <view class="text">地名备案</view>
120 120 </view>
121 121 </view>
122 122 <view class="content" style="margin-top: -70rpx;z-index: 10000;padding: 0 20rpx;">
... ... @@ -126,6 +126,12 @@
126 126 </view>
127 127 <view class="text">地名查询服务</view>
128 128 </view>
  129 + <view class="box_item" @click="gopath('/pages/maptask/maptask')">
  130 + <view style="margin-bottom: 20rpx;">
  131 + <image src="/static/new/image 1.png" style="width: 60%;height: 90rpx;" mode=""></image>
  132 + </view>
  133 + <view class="text">巡检任务</view>
  134 + </view>
129 135 </view>
130 136 </view>
131 137  
... ... @@ -193,13 +199,14 @@
193 199 methods: {
194 200 //
195 201 funeralculture() {
  202 + uni.setStorageSync('dh',1)
196 203 uni.navigateTo({
197   - url: '/pages/funeralculture/funeralculture'
  204 + url: '/pages/funeralreport/funeralreport'
198 205 })
199 206 },
200 207 funerallaw() {
201 208 uni.navigateTo({
202   - url: '/pages/funerallaw/funerallaw'
  209 + url: '/pages/funeralreservation/funeralreservation'
203 210 })
204 211 },
205 212 funeralguide() {
... ...
pages/maptask/maptask.vue
  View file @8296aa5
... ... @@ -41,7 +41,7 @@
41 41 return {
42 42 TabShow: 0,
43 43 nvConfig: {
44   - title: "我的任务",
  44 + title: "巡检任务",
45 45 bgColor: "#ffffff",
46 46 color: "#000000",
47 47 fixedAssist: {
... ...
pages/mydeath/mydeath.vue
  View file @8296aa5
... ... @@ -11,9 +11,9 @@
11 11 <text>逝者编号：{{item.orderNumber}}</text>
12 12 <image src="../../static/right1.png"></image>
13 13 </view>
14   - <view class="status">
  14 + <!-- <view class="status">
15 15 <text>待评价</text>
16   - </view>
  16 + </view> -->
17 17 </view>
18 18 <view class="goods-list">
19 19 <view class="goods">
... ... @@ -56,8 +56,10 @@
56 56 pageNum:1,
57 57 pageSize:10,
58 58 userId:"",
  59 + filingStatus:"0"
59 60 },
60 61 list:[],
  62 + total:0,
61 63 };
62 64 },
63 65 onPageScroll(e) {
... ... @@ -80,16 +82,37 @@
80 82 })
81 83 },
82 84 getinfo(){
83   - this.info.userId = uni.getStorageSync("USERS_KEY").userId
  85 + if(uni.getStorageSync('userjs') == '调度员'){
  86 + this.info.userId = ''
  87 + }else{
  88 + this.info.userId = uni.getStorageSync("USERS_KEY").userId
  89 + }
84 90 console.log("user",uni.getStorageSync("USERS_KEY"));
85 91 this.API.getwsyy(this.info).then(res=>{
86 92 console.log("获取网上报丧信息",res);
  93 + this.total = res.total
87 94 for(let i = 0;i < res.rows.length;i++){
88 95 this.list.push(res.rows[i])
89 96 }
90 97 })
91 98 },
92   - }
  99 + },
  100 + onReachBottom() {
  101 + var page = parseInt(this.total / 10 );
  102 + var s = parseInt(this.total % 10 );
  103 + console.log(page,s);
  104 + if(s > 0){
  105 + page = page + 1
  106 + }
  107 + if(page > 0){
  108 + if(this.info.pageNum < page){
  109 + this.info.pageNum = this.info.pageNum + 1
  110 + this.getinfo();
  111 + }else{
  112 + console.log("没有了");
  113 + }
  114 + }
  115 + },
93 116 }
94 117 </script>
95 118  
... ...
pages/mydeathdetail/mydeathdetail.vue
  View file @8296aa5
... ... @@ -54,16 +54,6 @@
54 54 <view class="info-box-small">预约人电话</view>
55 55 </view>
56 56 </view>
57   - <!-- <view class="info-box-list">
58   - <view class="info-box-width">
59   - <view>内地居民身份证</view>
60   - <view class="info-box-small">预约人证件类型</view>
61   - </view>
62   - <view class="info-box-width">
63   - <view>38172648172618819</view>
64   - <view class="info-box-small">预约人证件号码</view>
65   - </view>
66   - </view> -->
67 57 </view>
68 58 </view>
69 59  
... ... @@ -85,25 +75,24 @@
85 75 </view>
86 76 </view>
87 77  
88   - <view class="message-list">
89   - <!-- <view class="titleall-box">
90   - <view class="titleall-left"><view class="titleall-left-line"></view>火化时间</view>
91   - </view>
92   - <view class="info-box">
93   - <view class="info-box-list">
94   - <view class="info-box-width width100">
95   - <view>2023-01-01</view>
96   - <view class="info-box-small">火化日期</view>
97   - </view>
  78 + <!-- <view class="message-list">
  79 + <view class="titleall-box">
  80 + <view class="titleall-left"><view class="titleall-left-line"></view>派遣司机</view>
98 81 </view>
99   - <view class="info-box-list">
100   - <view class="info-box-width width100">
101   - <view>16:20-17:00</view>
102   - <view class="info-box-small">火化时间（此为预约时间，非实际火化时间）</view>
  82 + <view class="info-box">
  83 + <view class="info-box-list">
  84 + <view class="info-box-width width100">
  85 +
  86 + </view>
  87 + </view>
  88 + <view class="info-box-list">
  89 + <view class="info-box-width width100">
  90 + <view>16:20-17:00</view>
  91 + <view class="info-box-small">火化时间（此为预约时间，非实际火化时间）</view>
  92 + </view>
103 93 </view>
104 94 </view>
105 95 </view> -->
106   - </view>
107 96 </view>
108 97 </view>
109 98 </view>
... ... @@ -171,7 +160,6 @@
171 160 }
172 161 }
173 162 })
174   -
175 163 },
176 164 /**
177 165 * 返回点击
... ...