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

李宇
2 parents b81ba111 9c04a298
Showing 7 changed files with 73 additions and 42 deletions
pages/declaration/list.vue
pages/funeralreport/funeralreport.vue
pages/funeralreservation/funeralreservation.vue
pages/home/home.vue
pages/maptask/maptask.vue
pages/mydeath/mydeath.vue
pages/mydeathdetail/mydeathdetail.vue
@@ -32,7 +32,7 @@
 					<image style="height: 120rpx;width: 100%;" src="../../static/ly/image6.png" mode="aspectFit"></image>
 				</view>
 				<view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
-					地名命名申报
+					地名备案
 				</view>
 			</view>
@@ -57,7 +57,7 @@
 					<image style="height: 120rpx;width: 100%;" src="/static/new/image 1.png" mode="aspectFit"></image>
 				</view>
 				<view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
-					我的任务
+					巡检任务
 				</view>
 			</view>
@@ -160,7 +160,7 @@
 			<view class="page-footer">
 			  <view class="footer-buy">
-			    <view class="cart-add">
+			    <view class="cart-add" @click="lxdh">
 					<view><image src="../../static/btn2.png"></image></view>
 					<view class="cart-add-text"><image src="../../static/phone.png"></image><text>联系电话</text></view>
 			    </view>
@@ -264,6 +264,19 @@
 		},
 		methods:{
+			lxdh(){
+				uni.showModal({
+					title: '联系电话',
+					content: '028-36241643',
+					success: function(res) {
+						if (res.confirm) {
+							console.log('点击了确认')
+						} else {
+							console.log('点击了取消')
+						}
+					}
+				})
+			},
 			// 
 			xztime(value){
 				this.timeshow1 = false
@@ -106,7 +106,7 @@
 					this.$refs.uToast.show({
 						type: 'error',
 						title: '成功主题(带图标)',
-						message: "请先去线上报丧",
+						message: "请先进行线上报丧",
 						iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/error.png'
 					})
 				}
@@ -61,15 +61,15 @@
 				<view class="content">
 					<view class="box_item" @click="funeralculture">
 						<view>
-							<image src="/static/nav/nav_ico7.png" style="width: 90%;" mode="widthFix"></image>
+							<image src="/static/nav/nav_ico5.png" style="width: 90%;" mode="widthFix"></image>
 						</view>
-						<view class="text">文化宣传</view>
+						<view class="text">线上报丧</view>
 					</view>
 					<view class="box_item" @click="funerallaw">
 						<view>
-							<image src="/static/nav/nav_ico8.png" style="width: 90%;" mode="widthFix"></image>
+							<image src="/static/nav/nav_ico6.png" style="width: 90%;" mode="widthFix"></image>
 						</view>
-						<view class="text">普法宣传</view>
+						<view class="text">线上预约</view>
 					</view>
 					<view class="box_item" @click="funeralguide">
 						<view>
@@ -116,7 +116,7 @@
 						<view style="margin-bottom: 20rpx;">
 							<image src="/static/ly/image6.png" style="width: 60%;height: 90rpx;" mode=""></image>
 						</view>
-						<view class="text">地名命名申报</view>
+						<view class="text">地名备案</view>
 					</view>
 				</view>
 				<view class="content" style="margin-top: -70rpx;z-index: 10000;padding: 0 20rpx;">
@@ -126,6 +126,12 @@
 						</view>
 						<view class="text">地名查询服务</view>
 					</view>
+					<view class="box_item" @click="gopath('/pages/maptask/maptask')">
+						<view style="margin-bottom: 20rpx;">
+							<image src="/static/new/image 1.png" style="width: 60%;height: 90rpx;" mode=""></image>
+						</view>
+						<view class="text">巡检任务</view>
+					</view>
 				</view>
 			</view>
@@ -193,13 +199,14 @@
 		methods: {
 			// 
 			funeralculture() {
+				uni.setStorageSync('dh',1)
 				uni.navigateTo({
-					url: '/pages/funeralculture/funeralculture'
+					url: '/pages/funeralreport/funeralreport'
 				})
 			},
 			funerallaw() {
 				uni.navigateTo({
-					url: '/pages/funerallaw/funerallaw'
+					url: '/pages/funeralreservation/funeralreservation'
 				})
 			},
 			funeralguide() {
@@ -41,7 +41,7 @@
 			return {
 				TabShow: 0,
 				nvConfig: {
-					title: "我的任务",
+					title: "巡检任务",
 					bgColor: "#ffffff",
 					color: "#000000",
 					fixedAssist: {
@@ -11,9 +11,9 @@
 								<text>逝者编号：{{item.orderNumber}}</text>
 								<image src="../../static/right1.png"></image>
 							</view>
-							<view class="status">
+							<!-- <view class="status">
 								<text>待评价</text>
-							</view>
+							</view> -->
 						</view>
 						<view class="goods-list">
 							<view class="goods">
@@ -56,8 +56,10 @@
 					pageNum:1,
 					pageSize:10,
 					userId:"",
+					filingStatus:"0"
 				},
 				list:[],
+				total:0,
 			};
 		},
 		onPageScroll(e) {
@@ -80,16 +82,37 @@
 				})
 			},
 			getinfo(){
-				this.info.userId = uni.getStorageSync("USERS_KEY").userId
+				if(uni.getStorageSync('userjs') == '调度员'){
+					this.info.userId = ''
+				}else{
+					this.info.userId = uni.getStorageSync("USERS_KEY").userId
+				}
 				console.log("user",uni.getStorageSync("USERS_KEY"));
 				this.API.getwsyy(this.info).then(res=>{
 					console.log("获取网上报丧信息",res);
+					this.total = res.total
 					for(let i = 0;i < res.rows.length;i++){
 						this.list.push(res.rows[i])
 					}
 				})
 			},
-		}
+		},
+		onReachBottom() {
+			var page = parseInt(this.total / 10 );
+			var s = parseInt(this.total % 10 );
+			console.log(page,s);
+			if(s > 0){
+				page = page + 1
+			}
+			if(page > 0){
+				if(this.info.pageNum < page){
+					this.info.pageNum = this.info.pageNum + 1
+					this.getinfo();
+				}else{
+					console.log("没有了");
+				}
+			}
+		},
 	}
 </script>
@@ -54,16 +54,6 @@
 						<view class="info-box-small">预约人电话</view>
 					</view>
 				</view>
-				<!-- <view class="info-box-list">
-					<view class="info-box-width">
-						<view>内地居民身份证</view>
-						<view class="info-box-small">预约人证件类型</view>
-					</view>
-					<view class="info-box-width">
-						<view>38172648172618819</view>
-						<view class="info-box-small">预约人证件号码</view>
-					</view>
-				</view> -->
 			</view>
 			</view>
@@ -85,25 +75,24 @@
 			</view>
 			</view>
-			<view class="message-list">
-			<!-- <view class="titleall-box">
-				<view class="titleall-left"><view class="titleall-left-line"></view>火化时间</view>
-			</view>
-			<view class="info-box">
-				<view class="info-box-list">
-					<view class="info-box-width width100">
-						<view>2023-01-01</view>
-						<view class="info-box-small">火化日期</view>
-					</view>
+			<!-- <view class="message-list">
+				<view class="titleall-box">
+					<view class="titleall-left"><view class="titleall-left-line"></view>派遣司机</view>
 				</view>
-				<view class="info-box-list">
-					<view class="info-box-width width100">
-						<view>16:20-17:00</view>
-						<view class="info-box-small">火化时间（此为预约时间，非实际火化时间）</view>
+				<view class="info-box">
+					<view class="info-box-list">
+						<view class="info-box-width width100">
+							
+						</view>
+					</view>
+					<view class="info-box-list">
+						<view class="info-box-width width100">
+							<view>16:20-17:00</view>
+							<view class="info-box-small">火化时间（此为预约时间，非实际火化时间）</view>
+						</view>
 					</view>
 				</view>
 			</view> -->
-			</view>
 		</view>
 		</view>
 	</view>
@@ -171,7 +160,6 @@
 						}
 					}
 				})
-
 			},
 			/**
 			 * 返回点击