Merge branch 'master' of http://116.63.33.55/git/nazw

nngkxxdp/src/main/resources/static/district/js/correct.js

@@ -88,6 +88,9 @@ $(function () {
             for (let i = 0; i < res.data.tcs.length; i++) {
                 allArr.push(res.data.tcs[i]);
             }
+            for (let i = 0; i < res.data.zysd.length; i++) {
+                allArr.push(res.data.zysd[i]);
+            }
             $.each(res.data.gcs, function (i) {
                 allArr.push(res.data.gcs[i]);
             });

nngkxxdp/src/main/resources/static/district/js/sy.js

@@ -15,7 +15,7 @@ $(function() {
 	// 区级部门与街镇解析地址批量解析开始
 	var myGeo = new BMap.Geocoder();
 
-	var xxs=[],xx=[],zx=[],tsjy=[],dx=[],zyyx=[],yey=[],bmfwzx=[],ggfwzx=[],dqfwzx=[],bms=[],jzs=[],cyy=[],byfwjg=[],cwss=[],sqwsfwz=[],ejyljg=[],ekzlfwjg=[],kqbpsfczmz=[],myghyfjzmz=[],sjyljg=[],sqwsfwjg=[],zybzdjg=[],gy=[],tc=[],gc=[],hydjjg=[],zcyljg=[],ckmzfwjg=[],pcs=[];
+	var xxs=[],xx=[],zx=[],tsjy=[],dx=[],zyyx=[],yey=[],bmfwzx=[],ggfwzx=[],dqfwzx=[],bms=[],jzs=[],cyy=[],byfwjg=[],cwss=[],sqwsfwz=[],ejyljg=[],ekzlfwjg=[],kqbpsfczmz=[],myghyfjzmz=[],sjyljg=[],sqwsfwjg=[],zybzdjg=[],gy=[],tc=[],zysd=[],gc=[],hydjjg=[],zcyljg=[],ckmzfwjg=[],pcs=[];
 	var crjywbljg=[],jtxljcdd=[],jtwfcljg=[],jtsgcljg=[],cgs=[],jdcjccs=[],jsrtjz=[],ylfwjg=[],tsg=[],whg=[],wgs=[],ggty=[],jq=[];
 	var bdcdjzxbsdt=[],cjrfwzx=[],ddcjrfwjg=[],fwglzx=[],gzc=[],sfjdjg=[],jcfwfws=[],flyzzx=[],bsfwt=[],scjdglj=[];
 	var yb=[],dkbld=[],cjgshfwz=[],jykszx=[],xzfwzx=[],jzzx=[],jyhrczx=[],shbxswzx=[],sq=[],gjj=[],hscyd=[],slcsjz=[],gwzx=[],jd=[];
@@ -180,6 +180,12 @@ $(function() {
 				getAllJson.push(res.data.tcs[i]);
                 contrastArrey.push(res.data.tcs[i]);
 			}
+			for (let i = 0; i < res.data.zysd.length; i++) {
+				zysd.push(res.data.zysd[i])
+				allArr.push(res.data.zysd[i]);
+				getAllJson.push(res.data.zysd[i]);
+				contrastArrey.push(res.data.zysd[i]);
+			}
 			$.each(res.data.gcs,function(i){
 				gc.push(res.data.gcs[i])
 				allArr.push(res.data.gcs[i]);
@@ -494,6 +500,14 @@ $(function() {
 				$('.title-first1:nth-child(2)').css('padding-top',60);
 				$('.left-map').scrollTop(0);
 				break;
+			case '直饮水点':
+				xxGEO(zysd);
+				xrxx(zysd);
+				getPointPostAjax(zysd);
+				$('.flex_box').css('padding-top',$('.wrap_fwdt').outerHeight()+10);
+				$('.title-first1:nth-child(2)').css('padding-top',60);
+				$('.left-map').scrollTop(0);
+				break;
 			case '不动产登记':
 				xxGEO(bdcdjzxbsdt);
 				xrxx(bdcdjzxbsdt);

nngkxxdp/src/main/resources/static/district/js/sy_mobile.js

@@ -33,7 +33,7 @@ $(function () {
     var myGeo = new BMap.Geocoder();
 
     var xxs=[],xx=[],zx=[],tsjy=[],dx=[],zyyx=[],yey=[],bmfwzx=[],ggfwzx=[],dqfwzx=[],cyy=[],byfwjg=[],cwss=[],sqwsfwz=[],ejyljg=[];
-	var ekzlfwjg=[],kqbpsfczmz=[],myghyfjzmz=[],sjyljg=[],sqwsfwjg=[],zybzdjg=[],gy=[],tc=[],gc=[],hydjjg=[],zcyljg=[],ckmzfwjg=[],pcs=[];
+	var ekzlfwjg=[],kqbpsfczmz=[],myghyfjzmz=[],sjyljg=[],sqwsfwjg=[],zybzdjg=[],gy=[],tc=[],zysd=[],gc=[],hydjjg=[],zcyljg=[],ckmzfwjg=[],pcs=[];
 	var crjywbljg=[],jtxljcdd=[],jtwfcljg=[],jtsgcljg=[],cgs=[],jdcjccs=[],jsrtjz=[],ylfwjg=[],tsg=[],whg=[],wgs=[],ggty=[],jq=[];
 	var bdcdjzxbsdt=[],cjrfwzx=[],ddcjrfwjg=[],fwglzx=[],gzc=[],sfjdjg=[],jcfwfws=[],flyzzx=[],bsfwt=[],scjdglj=[];
     var yb=[],dkbld=[],cjgshfwz=[],jykszx=[],xzfwzx=[],jzzx=[],jyhrczx=[],shbxswzx=[],sq=[],gjj=[],hscyd=[],gwzx=[],jd=[];
@@ -193,6 +193,11 @@ $(function () {
                 getAllJson.push(res.data.tcs[i]);
                 contrastArrey.push(res.data.tcs[i]);
 			});
+            $.each(res.data.zysd,function(i){
+                zysd.push(res.data.zysd[i]);
+                getAllJson.push(res.data.zysd[i]);
+                contrastArrey.push(res.data.zysd[i]);
+            });
             $.each(res.data.gcs,function(i){
 				gc.push(res.data.gcs[i])
 				getAllJson.push(res.data.gcs[i]);
@@ -815,6 +820,11 @@ $(function () {
                 xrList(tc);
                 getPointPostAjax(tc);
                 break;
+            case '直饮水点':
+                applyClickList();
+                xrList(zysd);
+                getPointPostAjax(zysd);
+                break;
             case '不动产登记':
                 applyClickList();
                 xrList(bdcdjzxbsdt);

nngkxxdp/src/main/resources/static/district/sy.html

@@ -492,6 +492,12 @@
                         <p class="flex_text">停车泊车</p>
                     </div>
                 </li>
+                <li class="flex_li">
+                    <div class="img_tab">
+                        <img src="img/zysd.png">
+                        <p class="flex_text">直饮水点</p>
+                    </div>
+                </li>
                 <li class="flex_li"></li>
             </ul>
             <div class="text-second"></div>

nngkxxdp/src/main/resources/static/district/sy_mobile.html

@@ -514,6 +514,12 @@
 								<p class="flex_text">停车泊车</p>
 							</div>
 						</li>
+                        <li>
+                            <div class="img_tab">
+                                <img src="img/zysd.png" class="gn_img">
+                                <p class="flex_text">直饮水点</p>
+                            </div>
+                        </li>
                         <li></li>
                     </ul>
                 </div>

nnzwminiapp/pages/index/index.wxml

@@ -60,10 +60,30 @@
 			</view>
 			<!-- 内容top -->
 		</view>
+        
+            <view style="padding: 25rpx 30rpx;background: #ffffff;">
+			<!-- <view class="content-search-tab" style="height: 588rpx;"> -->
+				<view class="content-service">
+					<view bindtap="clickService1" data-item="{{index}}" wx:for="{{ serviceItems1 }}" wx:for-item="item" wx:for-index="index" wx:key="index" class="content-service-item">
+						<view data-item="{{index}}">
+							<image src="{{ item.img }}" style="height:88rpx;width:88rpx"></image>
+						</view>
+						<view data-item="{{index}}">{{ item.name }}</view>
+					</view>
+				</view>
+				<view class="content-service">
+					<view bindtap="clickService1" data-item="{{index}}" wx:for="{{ serviceItems1 }}" wx:for-item="item" wx:for-index="index" wx:key="index" class="content-service-item">
+						<view data-item="{{index}}">
+							<image src="{{ item.img }}" style="height:88rpx;width:88rpx"></image>
+						</view>
+						<view data-item="{{index}}">{{ item.name }}</view>
+					</view>
+				</view>
+			</view>
 
 		<!-- 视频推荐 -->
-		<view class="three" style="height:163rpx;width:100%;padding-left:15rpx;background-color: #F5F5F5;">
-			<image src="{{imgUrl}}index-video-recommend.png" style="height:163rpx;width:720rpx" bindtap="gotoSPTJ"></image>
+		<!-- <view class="three" style="height:163rpx;width:100%;padding-left:15rpx;background-color: #F5F5F5;">
+			<image src="{{imgUrl}}index-video-recommend.png" style="height:163rpx;width:720rpx" bindtap="gotoSPTJ"></image> -->
 			<!-- <swiper current="{{lun}}" indicator-dots="{{true}}" style="height: 100%;width: 720rpx">
 				<swiper-item bindtap="gotoNewsPaper">
 					<image src="{{imgUrl}}index-video-banner.png" style="height:163rpx;width:100%"></image>
@@ -75,7 +95,7 @@
 					<image src="{{imgUrl}}self-service.png" style="height:163rpx;width:100%"></image>
 				</swiper-item>
 			</swiper> -->
-		</view>
+		<!-- </view> -->
 		<!-- 南岸动态 -->
 		<view class="content-na" style="height:512rpx;width:100%;background-color:#F5F5F5;position:relative;overflow: hidden;margin-top: 5rpx;">
 			<!-- 浮动 -->
@@ -92,21 +112,21 @@
 						<view style="height:50rpx;padding-left:10rpx;">南岸动态</view>
 					</view>
 					<!-- 今日重庆 -->
-					<view class="tab-item {{naTab==1?'active':''}}" bindtap="clickNaTilteTab" data-item="1">
+					<!-- <view class="tab-item {{naTab==1?'active':''}}" bindtap="clickNaTilteTab" data-item="1">
 						<view style="position: absolute;width: 0;height: 0;border-left: 10rpx solid transparent;border-right: 10rpx solid transparent;border-top: 10rpx solid #508FF4;bottom: -13rpx;" />
 						<view style="height:50rpx;width:32rpx;display: flex;justify-content:center;align-items:center;">
 							<image wx:if="{{ naTab==1 }}" style="width:32rpx;height:32rpx;" src="{{imgUrl}}na-title-1.png"></image>
 						</view>
 						<view style="height:50rpx;padding-left:10rpx">今日重庆</view>
-					</view>
+					</view> -->
 					<!-- 国务院信息 -->
-					<view class="tab-item-last {{naTab==2?'active':''}}" bindtap="clickNaTilteTab" data-item="2">
+					<!-- <view class="tab-item-last {{naTab==2?'active':''}}" bindtap="clickNaTilteTab" data-item="2">
 						<view style="position: absolute;width: 0;height: 0;border-left: 10rpx solid transparent;border-right: 10rpx solid transparent;border-top: 10rpx solid #508FF4;bottom: -13rpx;" />
 						<view style="height:50rpx;width:32rpx;display: flex;justify-content:center;align-items:center;">
 							<image wx:if="{{ naTab==2 }}" style="width:32rpx;height:32rpx;" src="{{imgUrl}}na-title-1.png"></image>
 						</view>
 						<view style="height:50rpx;padding-left:10rpx">国务院信息</view>
-					</view>
+					</view> -->
 				</view>
 				<!-- 标题 -->
 				<!-- 内容 -->
@@ -123,7 +143,7 @@
 							<include wx:else src="naTitleTab.wxml" />
 						</swiper-item>
 						<!-- 今日重庆 -->
-						<swiper-item>
+						<!-- <swiper-item>
 							<view wx:if="{{isNaLoading}}" style="display: flex;justify-content: center;align-items: center;height: 100%;">
 								<t-loading theme="spinner" size="64rpx" text="加载中..." inheritColor></t-loading>
 							</view>
@@ -131,9 +151,9 @@
 								<t-empty icon="info-circle-filled" description="暂无数据" />
 							</view>
 							<include wx:else src="naTitleTab.wxml" />
-						</swiper-item>
+						</swiper-item> -->
 						<!-- 国务院信息 -->
-						<swiper-item>
+						<!-- <swiper-item>
 							<view wx:if="{{isNaLoading}}" style="display: flex;justify-content: center;align-items: center;height: 100%;">
 								<t-loading theme="spinner" size="64rpx" text="加载中..." inheritColor></t-loading>
 							</view>
@@ -141,7 +161,7 @@
 								<t-empty icon="info-circle-filled" description="暂无数据" />
 							</view>
 							<include wx:else src="naTitleTab.wxml" />
-						</swiper-item>
+						</swiper-item> -->
 					</swiper>
 				</view>
 				<!-- 内容 -->

nnzwminiapp/pages/map/map.js

@@ -36,6 +36,7 @@ const popType = [
     [
         ["商圈", "购物中心", "酒店"],
         [],
+        [],
         []
     ]
 ]
@@ -64,7 +65,7 @@ Page({
             [{ "id": 1, "name": "社会保障", "image": imgUrl + "fshbz.png" }, { "id": 2, "name": "养老服务", "image": imgUrl + "fylfw.png" }, { "id": 3, "name": "民政服务", "image": imgUrl + "fmzfw.png" }, { "id": 4, "name": "办税服务", "image": imgUrl + "fbsfwt.png" }],
             [{ "id": 1, "name": "市场监管", "image": imgUrl + "fscjd.png" }, { "id": 2, "name": "住房保障", "image": imgUrl + "fgzf.png" }, { "id": 3, "name": "不动产登记", "image": imgUrl + "fbdcdj.png" }, { "id": 4, "name": "住房公积金", "image": imgUrl + "fgjj.png" }],
             [{ "id": 1, "name": "文体旅游", "image": imgUrl + "fwtly.png" }, { "id": 2, "name": "司法服务", "image": imgUrl + "fsffw.png" }, { "id": 3, "name": "助疾服务", "image": imgUrl + "fcjr.png" }, { "id": 4, "name": "产业园区", "image": imgUrl + "fcyy.png" }],
-            [{ "id": 1, "name": "商业服务", "image": imgUrl + "fbmfw.png" }, { "id": 2, "name": "便民公厕", "image": imgUrl + "fgc.png" }, { "id": 3, "name": "停车泊车", "image": imgUrl + "ftc.png" }]
+            [{ "id": 1, "name": "商业服务", "image": imgUrl + "fbmfw.png" }, { "id": 2, "name": "便民公厕", "image": imgUrl + "fgc.png" }, { "id": 3, "name": "停车泊车", "image": imgUrl + "ftc.png" }, { "id": 4, "name": "直饮水点", "image": imgUrl + "zysd.png" }]
         ],
         popData: [{ "popName": "", "data": [] }],
         showIndex: false,
@@ -79,7 +80,7 @@ Page({
         showSet: false,
         trafficType: 0,
         xxs: [], xx: [], zx: [], tsjy: [], dx: [], zyyx: [], yey: [], bmfwzx: [], ggfwzx: [], dqfwzx: [], cyy: [], byfwjg: [], cwss: [], sqwsfwz: [], ejyljg: [],
-        ekzlfwjg: [], kqbpsfczmz: [], myghyfjzmz: [], sjyljg: [], sqwsfwjg: [], zybzdjg: [], gy: [], tc: [], gc: [], hydjjg: [], zcyljg: [], ckmzfwjg: [], pcs: [],
+        ekzlfwjg: [], kqbpsfczmz: [], myghyfjzmz: [], sjyljg: [], sqwsfwjg: [], zybzdjg: [], gy: [], tc: [], zysd: [], gc: [], hydjjg: [], zcyljg: [], ckmzfwjg: [], pcs: [],
         crjywbljg: [], jtxljcdd: [], jtwfcljg: [], jtsgcljg: [], cgs: [], jdcjccs: [], jsrtjz: [], ylfwjg: [], tsg: [], whg: [], wgs: [], ggty: [], jq: [],
         bdcdjzxbsdt: [], cjrfwzx: [], ddcjrfwjg: [], fwglzx: [], gzc: [], sfjdjg: [], jcfwfws: [], flyzzx: [], bsfwt: [], scjdglj: [],
         yb: [], dkbld: [], cjgshfwz: [], jykszx: [], xzfwzx: [], jzzx: [], jyhrczx: [], shbxswzx: [], sq: [], gjj: [], hscyd: [], gwzx: [], jd: [],
@@ -97,7 +98,7 @@ Page({
           success: (res) => {
               res = res.data;
               let xxs = [], xx = [], zx = [], tsjy = [], dx = [], zyyx = [], yey = [], bmfwzx = [], ggfwzx = [], dqfwzx = [], cyy = [], byfwjg = [], cwss = [], sqwsfwz = [], ejyljg = [];
-              let ekzlfwjg = [], kqbpsfczmz = [], myghyfjzmz = [], sjyljg = [], sqwsfwjg = [], zybzdjg = [], gy = [], tc = [], gc = [], hydjjg = [], zcyljg = [], ckmzfwjg = [], pcs = [];
+              let ekzlfwjg = [], kqbpsfczmz = [], myghyfjzmz = [], sjyljg = [], sqwsfwjg = [], zybzdjg = [], gy = [], tc = [], zysd = [], gc = [], hydjjg = [], zcyljg = [], ckmzfwjg = [], pcs = [];
               let crjywbljg = [], jtxljcdd = [], jtwfcljg = [], jtsgcljg = [], cgs = [], jdcjccs = [], jsrtjz = [], ylfwjg = [], tsg = [], whg = [], wgs = [], ggty = [], jq = [];
               let bdcdjzxbsdt = [], cjrfwzx = [], ddcjrfwjg = [], fwglzx = [], gzc = [], sfjdjg = [], jcfwfws = [], flyzzx = [], bsfwt = [], scjdglj = [];
               let yb = [], dkbld = [], cjgshfwz = [], jykszx = [], xzfwzx = [], jzzx = [], jyhrczx = [], shbxswzx = [], sq = [], gjj = [], hscyd = [], gwzx = [], jd = [];
@@ -359,6 +360,16 @@ Page({
               that.setData({
                   tc: tc
               });
+              for (let i in res.data.zysd) {
+                  if (res.data.zysd[i].tel) {
+                      res.data.zysd[i].tel = res.data.zysd[i].tel.split(';');
+                  }
+                  zysd.push(res.data.zysd[i]);
+                  getAllJson.push(res.data.zysd[i]);
+              }
+              that.setData({
+                zysd: zysd
+              });
               for (let i in res.data.gcs) {
                   if (res.data.gcs[i].tel) {
                       res.data.gcs[i].tel = res.data.gcs[i].tel.split(';');
@@ -1209,6 +1220,9 @@ Page({
             case "停车泊车":
             arr = this.data.tc;
             break
+            case "直饮水点":
+            arr = this.data.zysd;
+            break
         }
         this.setData({
           popData:arr

nnzwminiapp/pages/myCenter/myCenter.js

@@ -1,191 +1,191 @@
 // pages/nais/nais.js
 import {
-	imgUrl
+    imgUrl
 } from "../api/request"
 
 import {
-	cacheGet
+    cacheGet
 } from "../../utils/cacheUtil"
 let app = getApp();
 Page({
-	/**
-	 * 页面的初始数据
-	 */
-	data: {
-		canIUseGetUserProfile: true,
-		nickName: "",
-		avatarUrl: "",
-		hasUserInfo: false,
-		imgUrl: imgUrl,
-		show: false
-	},
-	// 自定义函数
-	toCanteen: function (e) {
-		wx.navigateTo({
-			url: '/pages/ourCanteen/ourCanteen'
-		})
-    },
-    
-    toWorkOrder:function(e) {
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        canIUseGetUserProfile: true,
+        nickName: "",
+        avatarUrl: "",
+        hasUserInfo: false,
+        imgUrl: imgUrl,
+        show: false
+    },
+    // 自定义函数
+    toCanteen: function (e) {
+        wx.navigateTo({
+            url: '/pages/ourCanteen/ourCanteen'
+        })
+    },
+
+    toWorkOrder: function (e) {
         wx.navigateTo({
-          url: '/pagesPublic/pages/work-order/work-order',
+            url: '/pagesPublic/pages/work-order/work-order',
         });
     },
 
-	handleAction() {
-		var that = this
-		wx.showActionSheet({
-			itemList: ['退出登录'],
-			success(res) {
-				console.log(res.tapIndex)
-				wx.clearStorageSync();
-				that.setData({
-					show: false,
-					canIUseGetUserProfile: true,
-					hasUserInfo: false
-				})
-			},
-			fail(res) {
-				console.log(res.errMsg)
-			}
-		})
-	},
+    handleAction() {
+        var that = this
+        wx.showActionSheet({
+            itemList: ['退出登录'],
+            success(res) {
+                console.log(res.tapIndex)
+                wx.clearStorageSync();
+                that.setData({
+                    show: false,
+                    canIUseGetUserProfile: true,
+                    hasUserInfo: false
+                })
+            },
+            fail(res) {
+                console.log(res.errMsg)
+            }
+        })
+    },
 
-	/**
-	 * 生命周期函数--监听页面初次渲染完成
-	 */
-	onReady() {
-		if (typeof this.getTabBar === 'function' &&
-			this.getTabBar()) {
-			this.getTabBar().setData({
-				selected: 4
-			})
-		}
-	},
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+        if (typeof this.getTabBar === 'function' &&
+            this.getTabBar()) {
+            this.getTabBar().setData({
+                selected: 4
+            })
+        }
+    },
 
-	/**
-	 * 生命周期函数--监听页面显示
-	 */
-	onShow() {
-		// let token = wx.getStorageSync('token');
-		let token = cacheGet('token');
-		if (token != null && token != '') {
-			this.setData({
-				canIUseGetUserProfile: false,
-				nickName: wx.getStorageSync('nickName'),
-				avatarUrl: wx.getStorageSync('imgUrl'),
-				hasUserInfo: true
-			})
-		} else {
-			this.setData({
-				hasUserInfo: false,
-				canIUseGetUserProfile: true
-			})
-		}
-		if (typeof this.getTabBar === 'function' &&
-			this.getTabBar()) {
-			this.getTabBar().setData({
-				selected: 4
-			})
-		}
-	},
-	onHide() {
-		if (typeof this.getTabBar === 'function' &&
-			this.getTabBar()) {
-			this.getTabBar().setData({
-				selected: -1
-			})
-		}
-	},
-	onLoad() {
-		// let token = wx.getStorageSync('token');
-		let token = cacheGet('token');
-		if (token != null && token != '') {
-			this.setData({
-				nickName: wx.getStorageSync('nickName'),
-				avatarUrl: wx.getStorageSync('imgUrl'),
-				hasUserInfo: true
-			})
-		}
-	},
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        // let token = wx.getStorageSync('token');
+        let token = cacheGet('token');
+        if (token != null && token != '') {
+            this.setData({
+                canIUseGetUserProfile: false,
+                nickName: wx.getStorageSync('nickName'),
+                avatarUrl: wx.getStorageSync('imgUrl'),
+                hasUserInfo: true
+            })
+        } else {
+            this.setData({
+                hasUserInfo: false,
+                canIUseGetUserProfile: true
+            })
+        }
+        if (typeof this.getTabBar === 'function' &&
+            this.getTabBar()) {
+            this.getTabBar().setData({
+                selected: 4
+            })
+        }
+    },
+    onHide() {
+        if (typeof this.getTabBar === 'function' &&
+            this.getTabBar()) {
+            this.getTabBar().setData({
+                selected: -1
+            })
+        }
+    },
+    onLoad() {
+        // let token = wx.getStorageSync('token');
+        let token = cacheGet('token');
+        if (token != null && token != '') {
+            this.setData({
+                nickName: wx.getStorageSync('nickName'),
+                avatarUrl: wx.getStorageSync('imgUrl'),
+                hasUserInfo: true
+            })
+        }
+    },
 
-	/**
-	 * 生命周期函数--监听页面卸载
-	 */
-	onUnload() {
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
 
-	},
+    },
 
-	/**
-	 * 页面相关事件处理函数--监听用户下拉动作
-	 */
-	onPullDownRefresh() {
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
 
-	},
+    },
 
-	/**
-	 * 页面上拉触底事件的处理函数
-	 */
-	onReachBottom() {
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
 
-	},
+    },
 
-	/**
-	 * 用户点击右上角分享
-	 */
-	onShareAppMessage() {
-		return {
-			title: '个人中心'
-		}
-	},
-	toLike() {
-		wx.navigateTo({
-			url: '/pagesPublic/pages/like/like',
-		})
-	},
-	navto() {
-		wx.navigateTo({
-			url: '/pagesPublic/pages/menu/menu',
-		})
-	},
-	// toPersonalData() {
-	// 	wx.navigateTo({
-	// 		url: '/pagesPublic/pages/personalData/index/personalData',
-	// 	})
-	// },
-	gotoMyCollection() {
-		wx.navigateTo({
-			url: '/pagesPublic/pages/myCollection/myCollection',
-		})
-	},
-	toMyComment() {
-		wx.navigateTo({
-			url: '/pagesPublic/pages/myComment/myComment',
-		})
-	},
-	tologin() {
-		wx.navigateTo({
-			url: '/pages/login/login',
-		})
-	},
-	getUserInfo() {
-		// this.setData({
-		// 	nickName: wx.getStorageSync('nickName'),
-		// 	avatarUrl: wx.getStorageSync('imgUrl'),
-		// 	hasUserInfo: true
-		// })
-	},
-	// logout(){
-	// 	this.setData({
-	// 		hasUserInfo: false,
-	// 		nickName:"",
-	// 		avatarUrl:""
-	// 	})
-	// 	wx.removeStorage({
-	// 	  key: 'nickName',
-	// 	})(option)
-	// 	wx.removeStorage({
-	// 		key: 'imgUrl',
-	// 	  })(option)
-	// }
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+        return {
+            title: '个人中心'
+        }
+    },
+    toLike() {
+        wx.navigateTo({
+            url: '/pagesPublic/pages/like/like',
+        })
+    },
+    navto() {
+        wx.navigateTo({
+            url: '/pagesPublic/pages/menu/menu',
+        })
+    },
+    // toPersonalData() {
+    // 	wx.navigateTo({
+    // 		url: '/pagesPublic/pages/personalData/index/personalData',
+    // 	})
+    // },
+    gotoMyCollection() {
+        wx.navigateTo({
+            url: '/pagesPublic/pages/myCollection/myCollection',
+        })
+    },
+    toMyComment() {
+        wx.navigateTo({
+            url: '/pagesPublic/pages/myComment/myComment',
+        })
+    },
+    tologin() {
+        wx.navigateTo({
+            url: '/pages/login/login',
+        })
+    },
+    getUserInfo() {
+        // this.setData({
+        // 	nickName: wx.getStorageSync('nickName'),
+        // 	avatarUrl: wx.getStorageSync('imgUrl'),
+        // 	hasUserInfo: true
+        // })
+    },
+    // logout(){
+    // 	this.setData({
+    // 		hasUserInfo: false,
+    // 		nickName:"",
+    // 		avatarUrl:""
+    // 	})
+    // 	wx.removeStorage({
+    // 	  key: 'nickName',
+    // 	})(option)
+    // 	wx.removeStorage({
+    // 		key: 'imgUrl',
+    // 	  })(option)
+    // }
 })

nnzwminiapp/pages/myCenter/myCenter.wxml

@@ -92,7 +92,7 @@
             <view class="line"></view>
 			<view class="list-item" bindtap="toWorkOrder">
 				<view class="left">
-					<image src="../images/l-grzl.png" alt=""></image>
+					<image src="../images/l-rwzx.png" alt=""></image>
 					<text>工单维修</text>
 				</view>
 				<view class="arrow">

nnzwminiapp/pagesPublic/pages/work-order-detail/work-order-detail.js

@@ -10,7 +10,10 @@ Page({
      */
     data: {
         imgUrl: imgUrl,
-
+        isWorker: false,
+        colorComplete: '#508FF4',
+        colorIncomplete: '#999999',
+        complete: true,
     },
 
     /**
@@ -61,4 +64,52 @@ Page({
     onReachBottom() {
 
     },
+
+    /**
+     * 点击返回上一层页面
+     */
+    backTap() {
+        wx.navigateBack();
+    },
+
+    radioChange(e) {
+        console.info(e)
+        // e.detail.value
+        if (e.detail.value == '已完成') {
+            this.setData({
+                colorComplete: '#508FF4',
+                colorIncomplete: '#999999',
+                complete: true
+            });
+        } else {
+            this.setData({
+                colorComplete: '#999999',
+                colorIncomplete: '#508FF4',
+                complete: false
+            });
+        }
+    },
+
+    /**
+     * 上传报修结果图片
+     */
+    uploadImage() {
+        wx.chooseMedia({
+            success(res) {
+                console.info(res);
+            }
+        });
+    },
+
+    submitReport(e) {
+        console.info(e)
+        let complete = this.data.complete;
+        if (!complete && !e.detail.value.reason) {
+            wx.showToast({
+                title: '请填写失败原因',
+                icon: 'error'
+            });
+            return;
+        }
+    },
 })

nnzwminiapp/pagesPublic/pages/work-order-detail/work-order-detail.wxml

@@ -1,10 +1,10 @@
 <!--pagesPublic/pages/work-order-detail/work-order-detail.wxml-->
 <view class="navigation">
-    <image class="nav-back" src="/pages/images/arrow.png" mode="" />
+    <image class="nav-back" src="/pages/images/arrow.png" mode="" bindtap="backTap" />
     <text class="nav-title">工单详情</text>
 </view>
 <view class="pageBox">
-    <image class="bgimage" src="/pages/images/work-order-detail-bg.png" mode="aspectFill" />
+    <image class="bgimage" src="/pages/images/work-order-detail-bg.png" mode="widthFix" />
 
     <view class="detail">
         <view class="item-row">
@@ -27,7 +27,7 @@
             <text class="item-label">问题描述：</text>
             <text class="item-value">{{description}}</text>
         </view>
-        <view class="item-row">
+        <view class="item-row" style="align-items: flex-start;">
             <text class="item-label">图片：</text>
             <view class="item-image-box">
                 <image src="" mode="" />
@@ -36,6 +36,78 @@
         </view>
     </view>
 </view>
-<view class="progressBox">
-    
+
+<view class="progressBox" wx:if="{{isWorker}}">
+    <view class="progress-head">
+        <image class="head-image" src="/pages/images/hourglass.png" mode="" />
+        <text class="head-title">维修进度</text>
+    </view>
+    <view class="progress-detail">
+        <view class="detail-row">
+            <view class="circle checked">
+                <view class="inner-circle"></view>
+            </view>
+            <view class="vertical-line checked"></view>
+            <view class="step-name checked">发起工单</view>
+            <image class="icon-complete" src="/pages/images/complete.png" mode="" />
+            <view class="status-text checked">发起成功</view>
+        </view>
+        <view class="detail-row">
+            <view class="circle">
+                <view class="inner-circle"></view>
+            </view>
+            <view class="vertical-line"></view>
+            <view class="step-name">管理员审核</view>
+            <image class="icon-complete" src="/pages/images/complete.png" mode="" />
+            <view class="status-text">待审核</view>
+        </view>
+        <view class="detail-row">
+            <view class="circle">
+                <view class="inner-circle"></view>
+            </view>
+            <view class="vertical-line"></view>
+            <view class="step-name">工人上门维修</view>
+            <image class="icon-complete" src="/pages/images/complete.png" mode="" />
+            <view class="status-text">待上门</view>
+        </view>
+        <view class="detail-row">
+            <view class="circle">
+                <view class="inner-circle"></view>
+            </view>
+            <view class="step-name">用户确认签字</view>
+            <image class="icon-complete" src="/pages/images/complete.png" mode="" />
+            <view class="status-text">待确认</view>
+        </view>
+    </view>
+</view>
+
+<view class="progressBox" wx:else="{{isWorker}}">
+    <view class="progress-head">
+        <image class="head-image2" src="/pages/images/worker.png" mode="" />
+        <text class="head-title2">维修结果填报</text>
+    </view>
+    <view class="report-form">
+        <form bindsubmit="submitReport">
+            <view class="report-row">
+                <label for="" class="report-label">是否完成维修：</label>
+                <radio-group bindchange="radioChange">
+                    <label for="" style="color: {{colorComplete}};">
+                        <radio value="已完成" checked="true" color="#508FF4" />已完成
+                    </label>
+                    <label for="" style="color: {{colorIncomplete}};">
+                        <radio value="未完成" color="#508FF4" />未完成
+                    </label>
+                </radio-group>
+            </view>
+            <view class="report-row" style="align-items: flex-start;" wx:if="{{complete}}">
+                <label for="" class="report-label">维修结果：</label>
+                <image class="report-photo" src="/pages/images/photo2.png" mode="" bindtap="uploadImage" />
+            </view>
+            <view class="report-row" wx:else="{{complete}}">
+                <label for="" class="report-label">原因：</label>
+                <input class="report-input" type="text" name="reason" maxlength="200" placeholder="请填写失败原因" placeholder-style="color:#999999" />
+            </view>
+            <button class="report-submit" form-type="submit">提 交</button>
+        </form>
+    </view>
 </view>

nnzwminiapp/pagesPublic/pages/work-order-detail/work-order-detail.wxss

@@ -1,11 +1,4 @@
 /* pagesPublic/pages/work-order-detail/work-order-detail.wxss */
-/* .pageBox {
-    width: 100%;
-    background-size: 100% 100%;
-    position: relative;
-    color: #fff;
-    background-image: url('/pages/images/work-order-detail-bg.png');
-} */
 page {
     background: #F5F5F5;
 }
@@ -18,7 +11,7 @@ page {
     text-align: center;
     line-height: 136rpx;
     font-size: 36rpx;
-    border-bottom: 2rpx solid #FFFFFF30;
+    border-bottom: 2rpx solid #FFFFFF4D;
 }
 
 .nav-back {
@@ -32,15 +25,15 @@ page {
 
 .bgimage {
     position: absolute;
-    left: -31%;
+    left: 0;
     top: 0;
     display: block;
-    width: 160%;
+    width: 100%;
     z-index: -999;
 }
 
 .detail {
-    margin-top: 39rpx;
+    margin-top: 19rpx;
     margin-left: 35rpx;
     margin-right: 35rpx;
 }
@@ -77,6 +70,184 @@ page {
     background: #FFFFFF;
     border-radius: 10rpx;
     margin-left: 35rpx;
-    margin-right: 35rpx;
-    height: 900rpx;
+    margin-right: 27rpx;
+    height: 700rpx;
+    /* margin-top: -10rpx; */
+}
+
+.progress-head {
+    display: inline-flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    padding-top: 46rpx;
+}
+
+.head-image {
+    width: 24rpx;
+    height: 28rpx;
+    margin-left: 26rpx;
+}
+
+.head-title {
+    font-size: 28rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #F59F0E;
+    margin-left: 20rpx;
+}
+
+.progress-detail {
+    margin-top: 52rpx;
+    margin-left: 30rpx;
+    margin-right: 25rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+}
+
+.detail-row {
+    display: inline-flex;
+    flex-direction: row;
+    align-items: center;
+}
+
+.circle {
+    width: 21rpx;
+    height: 21rpx;
+    background: #FFFFFF;
+    border: 1rpx solid #999999;
+    border-radius: 50%;
+}
+
+.circle.checked {
+    border: 1rpx solid #508FF4;
+}
+
+.circle.checked .inner-circle {
+    border: 1rpx solid #508FF4;
+    width: 9rpx;
+    height: 9rpx;
+    background: #508FF4;
+    border-radius: 50%;
+    position: relative;
+    top: 5rpx;
+    left: 5rpx;
+}
+
+.vertical-line {
+    width: 1rpx;
+    height: 80rpx;
+    background: #999999;
+    position: relative;
+    left: -14rpx;
+    top: 50rpx;
+}
+
+.vertical-line.checked {
+    background: #508FF4;
+}
+
+.step-name {
+    font-size: 26rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #999999;
+    line-height: 100rpx;
+    width: 160rpx;
+    margin-left: 19rpx;
+}
+
+.step-name.checked {
+    color: #333333;
+    font-weight: 500;
+}
+
+.icon-complete {
+    width: 23rpx;
+    height: 23rpx;
+    margin-left: 290rpx;
+}
+
+.status-text {
+    font-size: 26rpx;
+    color: #999999;
+    text-align: right;
+    width: 105rpx;
+    margin-left: 9rpx;
+}
+
+.status-text.checked {
+    color: #3A9C68;
+    font-weight: 500;
+}
+
+.head-image2 {
+    width: 28rpx;
+    height: 33rpx;
+    margin-left: 20rpx;
+}
+
+.head-title2 {
+    font-size: 28rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #4189FF;
+    margin-left: 16rpx;
+}
+
+.report-row {
+    margin-top: 65rpx;
+    margin-left: 15rpx;
+    display: inline-flex;
+    flex-direction: row;
+    align-items: center;
+    font-size: 28rpx;
+}
+
+.report-label {
+    width: 200rpx;
+    text-align: right;
+    color: #333333;
+}
+
+radio-group label:aria-checked {
+    color: #508FF4;
+}
+
+radio-group radio:aria-checked {
+    color: #508FF4;
+}
+
+radio-group label {
+    color: #999999;
+}
+
+radio-group label:nth-child(2) {
+    margin-left: 100rpx;
+}
+
+.report-photo {
+    width: 44rpx;
+    height: 40rpx;
+    background: #E9E9E9 113rpx 113rpx;
+    padding: 36rpx 35rpx;
+}
+
+.report-input {
+    width: 427rpx;
+    border-bottom: solid 1rpx #999999;
+}
+
+.report-submit {
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    height: 96rpx;
+    background: #508FF4;
+    color: #FFFFFF;
+    font-size: 28rpx;
+    line-height: 96rpx;
+    border-radius: 0;
 }

nnzwminiapp/pagesPublic/pages/work-order/work-order.js

@@ -7,6 +7,7 @@ Page({
      * 页面的初始数据
      */
     data: {
+        isUser: true,
         currentIndex: 0,
         date: '2023-10-01',
         time: '12:00',
@@ -14,6 +15,7 @@ Page({
         dateTime: null,
         startYear: 2000,
         endYear: 2250,
+        typeList: ['报修类型一', '报修类型二', '报修类型三'],
         list: [{ type: '维修类型一', address: '食堂二楼楼梯地砖', time: '2022-03-15 13:45' }, { type: '维修类型一', address: '食堂二楼楼梯地砖', time: '2022-03-15 13:45' }]
     },
 
@@ -104,11 +106,50 @@ Page({
     },
 
     /**
+     * 报修类型选择
+     * @param {*} e 
+     */
+    typePickerChange(e) {
+        console.log('picker发送选择改变，携带值为', e.detail.value)
+        this.setData({
+            index: e.detail.value
+        });
+    },
+
+    /**
      * 提交工单
      * @param {*} e 
      */
     submitWorkOrder(e) {
         console.info(e);
+        if (!e.detail.value.type) {
+            wx.showToast({
+                title: '请选择报修类型',
+                icon: 'error'
+            });
+            return;
+        }
+        if (!e.detail.value.address) {
+            wx.showToast({
+                title: '请输入地址',
+                icon: 'error'
+            });
+            return;
+        }
+        if (!e.detail.value.phone) {
+            wx.showToast({
+                title: '请输入联系电话',
+                icon: 'error'
+            });
+            return;
+        }
+        if (!e.detail.value.arriveTime) {
+            wx.showToast({
+                title: '请选择上门时间',
+                icon: 'error'
+            });
+            return;
+        }
     },
 
     /**
@@ -130,5 +171,11 @@ Page({
         wx.navigateTo({
             url: '../work-order-detail/work-order-detail',
         });
+    },
+
+    toRepairDetail() {
+        wx.navigateTo({
+            url: '../work-order-detail/work-order-detail',
+        });
     }
 })

nnzwminiapp/pagesPublic/pages/work-order/work-order.wxml

@@ -1,5 +1,5 @@
 <!--pagesPublic/pages/work-order/work-order.wxml-->
-<view>
+<view wx:if="{{isUser}}">
     <view class="navBox">
         <view class="titleBox" bindtap="titleClick" data-idx="0">
             <text class="{{0 == currentIndex ? 'fontColorBox' : ''}}">发起工单</text>
@@ -16,7 +16,9 @@
                 <view class="formBox">
                     <view class="form-item">
                         <label for="" class="form-item-label">报修类型：</label>
-                        <input type="text" class="form-input" name="type" placeholder="请选择报修类型" placeholder-style="color:#999999" />
+                        <picker mode="selector" class="form-item-picker" range="{{typeList}}" value="{{index}}" bindchange="typePickerChange">
+                            <input type="text" class="form-input" style="width: 100%;" name="type" value="{{typeList[index]}}" placeholder="请选择报修类型" placeholder-style="color:#999999" />
+                        </picker>
                         <image class="form-icon" src="/pages/images/arrow.png" alt=""></image>
                     </view>
                     <view class="form-item">
@@ -27,22 +29,20 @@
                         <label for="" class="form-item-label">问题描述：</label>
                         <input type="text" class="form-input" name="description" maxlength="500" placeholder="请描述您的问题" placeholder-style="color:#999999" />
                     </view>
-                    <view class="form-item">
+                    <view class="form-item" style="align-items: flex-start;">
                         <label for="" class="form-item-label">报修物品图片：</label>
                         <image class="form-photo" src="/pages/images/photo2.png" mode="" bindtap="uploadImage" />
                         <input type="text" name="" style="display: none;" />
                     </view>
                     <view class="form-item">
                         <label for="" class="form-item-label">联系电话：</label>
-                        <input type="text" class="form-input" name="phone" confirm-type="next" maxlength="11" placeholder="请输入联系电话" placeholder-style="color:#999999" />
+                        <input type="number" class="form-input" name="phone" confirm-type="next" maxlength="11" placeholder="请输入联系电话" placeholder-style="color:#999999" />
                     </view>
                     <view class="form-item">
                         <label for="" class="form-item-label">预约上门时间：</label>
                         <picker class="form-item-picker" mode="multiSelector" value="{{dateTime}}" bindchange="changeDateTime" bindcolumnchange="changeDateTimeColumn" range="{{dateTimeArray}}">
                             <input type="text" class="form-input" style="width: 100%;" name="arriveTime" disabled="true" placeholder="请选择上门时间" placeholder-style="color:#999999" value="{{dateTimeArray[0][dateTime[0]]}}-{{dateTimeArray[1][dateTime[1]]}}-{{dateTimeArray[2][dateTime[2]]}} {{dateTimeArray[3][dateTime[3]]}}:{{dateTimeArray[4][dateTime[4]]}}:{{dateTimeArray[5][dateTime[5]]}}" />
-                            <!-- <image class="form-icon" src="/pages/images/arrow.png" alt="" bindtap="pickArriveTime"></image> -->
                         </picker>
-                        <!-- <input type="text" class="form-input" name="arriveTime" disabled="true" placeholder="请选择上门时间" placeholder-style="color:#999999" /> -->
                         <image class="form-icon" src="/pages/images/arrow.png" alt="" bindtap="pickArriveTime"></image>
                     </view>
                 </view>
@@ -50,7 +50,7 @@
             </form>
         </swiper-item>
         <swiper-item class="swiperTtemBox">
-            <scroll-view class="viewBox" wx:for="{{list}}" wx:for-item="item">
+            <scroll-view class="viewBox" wx:for="{{list}}" wx:for-item="item" wx:key="index">
                 <view class="item" bindtap="toDetail">
                     <image class="item-status" src="/pages/images/status-complete.png" mode="" />
                     <view class="item-row">
@@ -69,4 +69,64 @@
             </scroll-view>
         </swiper-item>
     </swiper>
+</view>
+
+<view wx:else>
+    <view class="navBox">
+        <view class="titleBox" bindtap="titleClick" data-idx="0">
+            <text class="{{0 == currentIndex ? 'fontColorBox' : ''}}">待维修工单</text>
+            <hr class="{{0 == currentIndex ? 'lineBox' : 'notLineBox'}}" />
+        </view>
+        <view class="titleBox" bindtap="titleClick" data-idx="1">
+            <text class="{{1 == currentIndex ? 'fontColorBox' : ''}}">已完成工单</text>
+            <hr class="{{1 == currentIndex ? 'lineBox' : 'notLineBox'}}" />
+        </view>
+    </view>
+    <swiper class="swiperBox" bindchange="pagechange" current="{{currentIndex}}">
+        <swiper-item class="swiperTtemBox">
+            <scroll-view class="viewBox" wx:for="{{list}}" wx:for-item="item" wx:key="index">
+                <view class="item" bindtap="toRepairDetail">
+                    <view class="item-row">
+                        <text class="item-label">报修类型：</text>
+                        <text class="item-value">{{item.type}}</text>
+                    </view>
+                    <view class="item-row">
+                        <text class="item-label">维修地址：</text>
+                        <text class="item-value">{{item.address}}</text>
+                    </view>
+                    <view class="item-row">
+                        <text class="item-label">预约时间：</text>
+                        <text class="item-value">{{item.time}}</text>
+                    </view>
+                </view>
+            </scroll-view>
+        </swiper-item>
+        <swiper-item class="swiperTtemBox">
+            <scroll-view class="viewBox" wx:for="{{list}}" wx:for-item="item" wx:key="index">
+                <view class="item" bindtap="toDetail">
+                    <image class="item-status" src="/pages/images/status-complete.png" mode="" />
+                    <view class="item-row">
+                        <text class="item-label">报修类型：</text>
+                        <text class="item-value">{{item.type}}</text>
+                    </view>
+                    <view class="item-row">
+                        <text class="item-label">维修地址：</text>
+                        <text class="item-value">{{item.address}}</text>
+                    </view>
+                    <view class="item-row">
+                        <text class="item-label">维修结果：</text>
+                        <!-- <text class="item-value"></text> -->
+                        <view class="item-imgbox">
+                            <image class="item-image" src="" mode="" />
+                            <image class="item-image" src="" mode="" />
+                        </view>
+                    </view>
+                    <view class="item-row">
+                        <text class="item-label">原因：</text>
+                        <text class="item-value">{{item.time}}</text>
+                    </view>
+                </view>
+            </scroll-view>
+        </swiper-item>
+    </swiper>
 </view>

nnzwminiapp/pagesPublic/pages/work-order/work-order.wxss

@@ -95,7 +95,7 @@ Page {
 }
 
 .form-input {
-    border-bottom: solid 1rpx #999999;
+    border-bottom: solid 1rpx #99999980;
     width: 68%;
 }
 
@@ -143,6 +143,9 @@ Page {
 
 .item-row {
     margin-top: 30rpx;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
 }
 
 .item-label {
@@ -153,4 +156,9 @@ Page {
 .item-value {
     font-size: 28rpx;
     color: #333333;
+}
+
+.item-image {
+    width: 50rpx;
+    height: 50rpx;
 }