首页自定义导航按钮及功能；站点管理，已处理未处理列表页定位兼容调整，点击跳转及弹框等功能

common/common.scss

@@ -7,6 +7,49 @@ radio,checkbox {
 			transform: scale(0.77)
 }
 
+.searchSelect{
+	
+	
+		position: -webkit-fixed;
+		    position: fixed;
+		    // top: 88rpx;
+			top: var(--window-top);
+		    z-index: 999;
+		    -webkit-box-flex: 1;
+		    -webkit-flex: 1;
+		    flex: 1;
+		    -webkit-box-orient: vertical;
+		    -webkit-box-direction: normal;
+		    -webkit-flex-direction: column;
+		    flex-direction: column;
+		    overflow: hidden;
+		    background-color: #fff;
+			width:254rpx;
+			.search{
+				min-height:80rpx;
+			}
+			.search-form{
+				border:1px solid #E9E9E9;
+				height:50rpx;
+				line-height:50rpx;
+				
+				
+				.cuIcon-search{
+					color:#4074E7
+				}
+				input{
+					padding-left:20rpx;
+					padding-right:0rpx
+				}
+			}
+			.select-item{
+				 padding:12rpx 32rpx;
+				text-align:center;
+				border-top:1px solid #E9E9E9;
+				font-size:28rpx
+				
+			}
+	}
 		
 /* 九宫格样式 */
 .cu-list.grid>.cu-item uni-text {
@@ -88,12 +131,10 @@ radio,checkbox {
 }
 
 /* 站点列表 */
-.site-items {
-	position: fixed;
-	/* top: 100rpx; */
+.site-items {
+	margin-top:100rpx;
 	width: 100%;
 	height: calc(100% - 100rpx);
-	;
 	overflow: scroll
 }
 
@@ -112,12 +153,15 @@ radio,checkbox {
 }
 
 .ding{
-		position: sticky;
+	position:fixed;
+	width:100%;
+	top: var(--window-top);
+		// position: sticky;
 			/* #ifdef H5 */
-			top: 44px;
+			// top: 44px;
 			/* #endif */
 			/* #ifndef H5 */
-			top: 0;
+			// top: 0;
 			/* #endif */
 			z-index: 999;
 			flex: 1;
@@ -127,7 +171,8 @@ radio,checkbox {
 	
 	}
 /* 已处理未处理列表 */
-.processList .cu-list.menu-avatar .cu-item {
+.processList .cu-list.menu-avatar .cu-item {
+	
 	height: 178rpx;
 }
 
@@ -143,9 +188,10 @@ radio,checkbox {
 
 .pro-res {}
 
-.processList {
+.processList {
+	margin-top:100rpx;
 	/* position: fixed; */
-	top: 100rpx;
+
 	width: 100%;
 	height: calc(100% - 100rpx);
 	overflow-y: scroll;
@@ -176,13 +222,14 @@ radio,checkbox {
 	margin-left: 24rpx;
 	border-bottom: 1px solid #EDEDED;
 	line-height: 92rpx;
-	color: #666;
+	color: #666;
+	.checkMore {
+		color: #4074E7!important
+	}
 
 }
 
-.checkMore {
-	color: #4074E7
-}
+
 
 .info-content view text:first-child {
 	width: 160rpx;

components/square/square.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class="section2 section  bg-white margin-top-sm margin-bottom-sm">
+		<view class="section2 section  bg-white margin-top-sm">
 			<view class="cu-list grid col-3 no-border">
 				<view class="cu-item justify-center align-center" @tap="goSiteList(item.redirectUrl)"  v-for="(item,index) in cuIconList" :key="index">
 					<image :src="`${item.imgUrl}`" style="width:100rpx;height:100rpx"></image>
@@ -38,5 +38,8 @@
 </script>
 
 <style>
+	.cu-list.grid.no-border{
+		padding:30rpx 10rpx
+	}
 
 </style>

data/json.js

@@ -47,9 +47,49 @@ let siteListData = [{
   "id"	: 3,
    "siteName":'测试站点三'
 },
-]
+];
+// 本地模拟json数据
+let cuIconList = [{
+					imgUrl: '../../static/square1.png',
+					badge: 120,
+					name: '综合报警',
+					redirectUrl: '/pages/siteList/siteList?type=1'
+				}, {
+					imgUrl: '../../static/square2.png',
+					badge: 0,
+					name: '运行监测',
+					redirectUrl: '/pages/siteList/siteList?type=2'
+				}, {
+					imgUrl: '../../static/square-wb.png',
+					badge: 0,
+					name: '维保',
+					redirectUrl: ''
+				}, {
+					imgUrl: '../../static/square-bx.png',
+					badge: 22,
+					name: '报修',
+					redirectUrl: ''
+				}, {
+					imgUrl: '../../static/square-rl.png',
+					badge: 0,
+					name: '人脸识别',
+					redirectUrl: ''
+				}, {
+					imgUrl: '../../static/square-xj.png',
+					badge: 0,
+					badge: 0,
+					name: '巡检',
+					redirectUrl: ''
+				}, {
+					imgUrl: '../../static/square-bz.png',
+					badge: 0,
+					badge: 0,
+					name: '风险保障',
+					redirectUrl: ''
+				}]
 
 // 定义数据出口
 module.exports = {
-  siteListData: siteListData
+  siteListData: siteListData,
+  cuIconList:cuIconList
 }

manifest.json

@@ -1,14 +1,14 @@
 {
-    "name" : "hello-uniapp",
-    "appid" : "",
-    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "name" : "伍继app",
+    "appid" : "__UNI__945DA73",
+    "description" : "伍继app升级",
+    "versionName" : "2.0",
+    "versionCode" : 2,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
         "usingComponents" : true,
-		"nvueStyleCompiler" : "uni-app",
+        "nvueStyleCompiler" : "uni-app",
         "compilerVersion" : 3,
         "splashscreen" : {
             "alwaysShowBeforeRender" : true,
@@ -23,27 +23,67 @@
             /* android打包配置 */
             "android" : {
                 "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ]
             },
             /* ios打包配置 */
             "ios" : {},
             /* SDK配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {
+                "ad" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            },
+            "splashscreen" : {
+                "androidStyle" : "default",
+                "android" : {
+                    "hdpi" : "static/aa.9.png"
+                }
+            }
         }
     },
     /* 快应用特有相关 */
@@ -65,7 +105,16 @@
     "mp-toutiao" : {
         "usingComponents" : true
     },
-    "uniStatistics": {  
-        "enable": false
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "h5" : {
+        "title" : "伍继",
+        "router" : {
+            "mode" : "hash"
+        },
+        "devServer" : {
+            "https" : false
+        }
     }
 }

pages.json

@@ -19,34 +19,27 @@
 				"navigationBarTitleText": "首页",
 				"app-plus": {
 
-					// "titleNView": {
-					// 	"buttons": [{
-					// 			"text": "扫一扫",
-					// 			"fontSize": "22",
-					// 			"redDot": true
-					// 		},
-					// 		{
-
-					// 			"text": "",
-					// 			"fontSize": "22",
-					// 			"select": true,
-					// 			"width": "auto"
-					// 		}
-					// 	]
-					// }
-					// "titleNView": {
-					// 	"titleText": "",
-					// 	"tags": [{
-					// 		"tag": "img",
-					// 		"src": "/static/nav.png",
-					// 		"position": {
-					// 			"left": "auto",
-					// 			"top": "auto",
-					// 			"width": "110px",
-					// 			"height": "26px"
-					// 		}
-					// 	}]
-					// }
+					"titleNView": {
+						"buttons": [{
+								"text": "\ue607",
+								"fontSize": "18px",
+								 // "redDot": true,
+								 "float":"right",
+								"fontSrc": "/static/iconfont/iconfont.ttf",
+								 "width": "auto"
+								
+							},
+							{
+
+								"text": "\ue63d",
+								"fontSize": "18px",
+								"float":"left",
+								"fontSrc": "/static/iconfont/iconfont.ttf",
+								 "width": "auto"
+							}
+						]
+					}
+				
 				}
 
 			}

pages/index/components/chart2/chart2.vue

@@ -29,17 +29,17 @@
 	export default {
 		data() {
 			return {
-
-
-				option: {
-
+				option: {
+					color: ['#F67F32', '#3BD2BD', '#1DABFE'],
+					
 					title: {
 						left: 'center'
 					},
 					tooltip: {
 						trigger: 'item',
 						formatter: "{a} <br/>{b}: {c} ({d}%)"
-					},
+					},
+					
 					title: [{ //aa标题
 						text: '{val|' + total + '}\n{name|' + title + '}',
 						top: '45%',
@@ -81,7 +81,6 @@
 							}
 						},
 					},
-					color: ['#F67F32', '#3BD2BD', '#1DABFE'],
 					series: [{
 						name: '访问来源',
 						type: 'pie',
@@ -106,7 +105,33 @@
 								shadowOffsetX: 0,
 								shadowColor: 'rgba(0, 0, 0, 0.5)'
 							}
-						}
+						},
+						labelLine: {
+							normal: {
+								length: 10, //aa折线长度
+								length2: 20, //aa折线长度
+						
+							}
+						},
+						label: {
+							normal: {
+								// formatter: '{a|{b}：{d}%}',
+								formatter: params => {
+									var percent = 0;
+									var total = 0;
+									for (var i = 0; i < echartData.length; i++) {
+										total += echartData[i].value;
+									}
+									console.log(111);
+									console.log(total);
+						
+									percent = ((params.value / total) * 100).toFixed(0);
+									return params.name + ': ' + percent + '%';
+						
+								},
+								
+							}
+						},
 					}]
 				}
 			}

pages/index/components/chart4/chart4.vue

@@ -7,7 +7,7 @@
 </template>
 
 <script>
-	let title = '报警总数';
+	
 	let echartData = [{
 			name: "报警",
 			value: 1000
@@ -18,14 +18,10 @@
 		},
 		
 
-	];
-
-	let formatNumber = function(num) {
-		let reg = /(?=(\B)(\d{3})+$)/g;
-		return num.toString().replace(reg, ',');
-	}
-	let total = echartData.reduce((a, b) => {
-		return a + b.value * 1
+	];
+	let title = '报警总数';
+	let total = echartData.reduce((a, b) => {
+		return a + b.value * 1
 	}, 0);
 
 	export default {
@@ -87,7 +83,6 @@
 
 						itemStyle: {
 							normal: {
-
 								shadowBlur: 20,
 								shadowColor: '#F9F5F7',
 								shadowOffsetX: 0,
@@ -117,24 +112,9 @@
 									}
 									console.log(111);
 									console.log(total);
-
 									percent = ((params.value / total) * 100).toFixed(0);
 									return params.name + ': ' + percent + '%';
-
 								},
-								// padding: [0, -60, 25, -60], //aa折线上的文字位置
-								rich: {
-									name: {
-										fontSize: 14,
-										padding: [0, 10, 0, -5],
-										
-									},
-									value: {
-										fontSize: 14,
-										// fontWeight: 'bold',
-										
-									}
-								}
 							}
 						},
 					}]

pages/index/index.vue

@@ -1,5 +1,19 @@
 <template>
-	<view style="background:#f1f1f1;height:1450rpx" class="padding-sm">
+	<view style="background:#f1f1f1;" class="padding-sm">
+		<view class="searchSelect shadow" v-if="flag">
+			<view class="cu-bar search bg-white">
+				<view class="search-form round">
+					<input @focus="InputFocus" @blur="InputBlur" :adjust-position="false" type="text" placeholder="" confirm-type="search"></input>
+					<text class="cuIcon-search "></text>
+				</view>
+			</view>
+			<view>
+				<view class="select-item">虹泾总部园</view>
+				<view class="select-item">上海永天科技</view>
+				<view class="select-item">AAAAA</view>
+				<view class="select-item">BBBBBBB</view>
+			</view>
+		</view>
 		<view class="section1 section bg-white padding-xs">
 			<view class=" static-tabs grid margin-bottom text-center col-3 margin-top-sm margin-bottom-sm">
 				<view :class="['padding-sm ',Inv==0?'active':'']" @click="Inv=0">报警信息统计</view>
@@ -10,110 +24,145 @@
 			</view>
 			<view>
 				<view v-if="Inv == 0">
-					<!-- <chart></chart> -->
+					<!-- <chart></chart> -->
 					<chart4></chart4>
 				</view>
-				<view v-if="Inv == 1">
-					
+				<view v-if="Inv == 1">
+
 					<chart2></chart2>
 				</view>
-				<view v-if="Inv == 2" class="chart3-box">
-					<ul class="chart3-icon">
-						<li><image src="../../static/chart3-1.png" style="width:64rpx;height:64rpx"></image></li>
-						<li><image src="../../static/chart3-2.png" style="width:64rpx;height:64rpx"></image></li>
-						<li><image src="../../static/chart3-3.png" style="width:64rpx;height:64rpx"></image></li>
-						<li><image src="../../static/chart3-4.png" style="width:64rpx;height:64rpx"></image></li>
-						<li><image src="../../static/chart3-5.png" style="width:64rpx;height:64rpx"></image></li>
+				<view v-if="Inv == 2" class="chart3-box">
+					<ul class="chart3-icon">
+						<li>
+							<image src="../../static/chart3-1.png" style="width:64rpx;height:64rpx"></image>
+						</li>
+						<li>
+							<image src="../../static/chart3-2.png" style="width:64rpx;height:64rpx"></image>
+						</li>
+						<li>
+							<image src="../../static/chart3-3.png" style="width:64rpx;height:64rpx"></image>
+						</li>
+						<li>
+							<image src="../../static/chart3-4.png" style="width:64rpx;height:64rpx"></image>
+						</li>
+						<li>
+							<image src="../../static/chart3-5.png" style="width:64rpx;height:64rpx"></image>
+						</li>
 					</ul>
-					<chart3>
-						
+					<chart3>
+
 					</chart3>
 				</view>
 			</view>
 		</view>
 
-		<!-- 宫格列表 -->
-		<square :cuIconList="cuIconList"></square>
-		<!-- <view class="section2 section  bg-white margin-top-sm margin-bottom-sm">
+		<!-- 宫格列表 -->
+		<!-- <square :cuIconList="cuIconList"></square> -->
+		<view class="section2 section  bg-white margin-top-sm margin-bottom-sm">
 			<view class="cu-list grid col-3 no-border">
-				<view class="cu-item justify-center align-center" @tap="goSiteList"  v-for="(item,index) in cuIconList" :key="index">
+				<view class="cu-item justify-center align-center" @tap=hrefKing(index) v-for="(item,index) in cuIconList" :key="index">
 					<image :src="`${item.imgUrl}`" style="width:100rpx;height:100rpx"></image>
-					<view class="cu-tag badge" v-if="item.badge!=0">
+					<view class="cu-tag badge" v-if="item.badge!=0">
 						<block v-if="item.badge!=1">{{item.badge>99?'99+':item.badge}}</block>
 					</view>
 					<text>{{item.name}}</text>
 				</view>
 			</view>
-		</view> -->
+		</view>
 	</view>
 </template>
 
 <script>
 	import chart from './components/chart/chart.vue';
 	import chart2 from './components/chart2/chart2.vue';
-	import chart3 from './components/chart3/chart3.vue';
+	import chart3 from './components/chart3/chart3.vue';
 	import chart4 from './components/chart4/chart4.vue';
-	// import square from '../../components/square/square.vue';
+	import json from '../../data/json.js';
 
 	export default {
 		components: {
 			chart,
 			chart2,
-			chart3,
-			chart4
-			// square
+			chart3,
+			chart4
+
 		},
 		data() {
-			return {
-				
-				// 宫格列表数据
-				cuIconList: [{
-					imgUrl:'../../static/square1.png',
-					badge: 120,
-					name: '综合报警',
-					redirectUrl:'/pages/siteList/siteList?type=1'
-				}, {
-					imgUrl:'../../static/square2.png',
-					badge: 0,
-					name: '运行监测',
-					redirectUrl:'/pages/siteList/siteList?type=2'
-				}, {
-					imgUrl:'../../static/square-wb.png',
-					badge: 0,
-					name: '维保',
-					redirectUrl:''
-				}, {
-					imgUrl:'../../static/square-bx.png',
-					badge: 22,
-					name: '报修',
-					redirectUrl:''
-				}, {
-					imgUrl:'../../static/square-rl.png',
-					badge: 0,
-					name: '人脸识别',
-					redirectUrl:''
-				}, {
-					imgUrl:'../../static/square-xj.png',
-					badge: 0,
-					badge: 0,
-					name: '巡检',
-					redirectUrl:''
-				},  {
-					imgUrl:'../../static/square-bz.png',
-					badge: 0,
-					badge: 0,
-					name: '风险保障',
-					redirectUrl:''
-				}],
+			return {
+				flag: false,
+				// 宫格列表数据
+				cuIconList: json.cuIconList,
 				Inv: 0,
 
-
-
 			};
 
 		},
+		onNavigationBarButtonTap(e) {
+			if (e.float == 'right') {
+				console.log("你点击了扫一扫")
+				uni.scanCode({
+					success: function(res) {
+						console.log('条码类型：' + res.scanType);
+						console.log('条码内容：' + res.result);
+					}
+				});
+			} else {
+				// alert("你点击了下拉");
+				this.showTag()
+			}
+		},
+
 		onLoad() {},
 		methods: {
+
+			hrefKing(index) {
+				// log(index)
+				let url = "";
+				switch (index) {
+					case 0:
+						url = "/pages/siteList/siteList?type=1" //进口水果
+						break;
+					case 1:
+						url = "/pages/siteList/siteList?type=2" //热门品种
+						break;
+					default:
+						break;
+				}
+				if (url) {
+					uni.navigateTo({
+						url: url
+					})
+				} else {
+					// uni.showToast({
+					// 	title: '此模块开发中~',
+					// 	icon: 'none'
+					// });
+					uni.showModal({
+					    title: 'Tips',
+					    content: '此模块开发中~',
+						showCancel:false,
+					    success: function (res) {
+					        if (res.confirm) {
+					            console.log('用户点击确定');
+					        } else if (res.cancel) {
+					            console.log('用户点击取消');
+					        }
+					    }
+					});
+				}
+			},
+
+			showTag() {
+				this.flag = !this.flag;
+			},
+
+			InputFocus(e) {
+				this.InputBottom = e.detail.height
+			},
+			InputBlur(e) {
+				this.InputBottom = 0
+			},
+
 			changeTab(Inv) {
 				that.navIdx = Inv;
 
@@ -123,7 +172,7 @@
 	}
 </script>
 
-<style>
+<style lang="scss">
 	body {
 		background: #f1f1f1 !important;
 	}
@@ -170,21 +219,32 @@
 		color: #666666;
 		font-size: 28rpx;
 
-	}
-	
-	.chart3-box{
-		position:relative
-	}
-	.chart3-icon{
-		position:absolute;
-		top:60rpx;
-		left:30rpx
-	}
-	.chart3-icon li{
-		padding-top:25rpx
-	}
-	ul,li{ padding:0;margin:0;list-style:none}
-
-
-	
+	}
+
+	.chart3-box {
+		position: relative
+	}
+
+	.chart3-icon {
+		position: absolute;
+		top: 60rpx;
+		left: 30rpx
+	}
+
+	.chart3-icon li {
+		padding-top: 25rpx
+	}
+
+	ul,
+	li {
+		padding: 0;
+		margin: 0;
+		list-style: none
+	}
+</style>
+
+<style>
+	.shadow {
+		box-shadow: 1px 1px 4px rgb(26 26 26 / 10%);
+	}
 </style>

pages/info/info.vue

@@ -2,7 +2,7 @@
 	<view class="processWrapper ">
 		
 		<block v-if="TabCur==0">
-			<view class="processList">
+			<view class="processList" style="margin-top:0">
 				<view class="cu-list menu-avatar ">
 					<view class="cu-item" v-for="(item,index) in unporcessList" :key="index"  @tap="goUnprocessDetail">
 						<view class="cu-avatar lg" style="background-image:url(../../static/process-icon.png);"></view>

pages/processedDetail/processedDetail.vue

@@ -45,11 +45,11 @@
 				</view>
 				<view>
 					<text>运行数据：</text>
-					<text class="checkMore">点击查看</text>
+					<text class="checkMore"  @tap="goOpeDataDetail">点击查看</text>
 				</view>
 				<view>
 					<text>视频：</text>
-					<text class="checkMore">点击查看</text>
+					<text class="checkMore" @tap="goVideoDetail">点击查看</text>
 				</view>
 			</view>
 		</view>
@@ -106,22 +106,32 @@
 				});
 			},
 			mapLocation(){
-				uni.getLocation({
-				    type: 'gcj02', //返回可以用于uni.openLocation的经纬度
-				    success: function (res) {
-				        const latitude =31.469465;
-				        const longitude = 121.327514;
-						console.log(latitude);
-				        uni.openLocation({
-				            latitude: latitude,
-				            longitude: longitude,
-				            success: function () {
-				                console.log('success');
-				            }
-				        });
-				    }
+				uni.openLocation({
+					latitude: 31.469465,
+					longitude: 121.327514,
+					success: function() {
+						console.log('success');
+					}
 				});
 			},
+			// 页面跳转
+			goOpeDataDetail() {
+				uni.navigateTo({
+					url: '/pages/unprocessDetail/opeDataDetail/opeDataDetail',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+			goVideoDetail() {
+				uni.navigateTo({
+					url: '/pages/unprocessDetail/videoDetail/videoDetail',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			
+			},
 			
 			RadioChange(e) {
 				this.radio = e.detail.value

pages/siteList/siteList.vue

@@ -3,7 +3,7 @@
 
 
 		<!-- 站点列表start -->
-		<view class="site-items" :style="[{top:CustomBar + 'px'}]">
+		<view class="site-items" style="margin-top:0">
 			<view class="cu-list menu-avatar">
 				<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''" v-for="(item,index) in siteListData"
 				 :key="index" :data-target="'move-box-' + index">

pages/siteManage/siteManage.vue

@@ -17,7 +17,8 @@
 		<!-- 筛选框end -->
 
 		<!-- 站点列表start -->
-		<view class="site-items">
+		<view class="site-items">
+			
 			<view class="cu-list menu-avatar">
 				<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''" v-for="(item,index) in siteListData" :key="index"
 				 @touchstart="ListTouchStart" @touchmove="ListTouchMove" @touchend="ListTouchEnd" :data-target="'move-box-' + index">
@@ -65,7 +66,16 @@
 				modalName: null,
 				listTouchStart: 0,
 				listTouchDirection: null,
-				CustomBar: this.CustomBar,
+				CustomBar: this.CustomBar,
+				
+				
+				
+				csListArrl:[],
+						//左滑默认宽度
+						delBtnWidth: 160,
+						
+						
+						
 			};
 		},
 	
@@ -125,7 +135,8 @@
 			},
 			InputBlur(e) {
 				this.InputBottom = 0
-			},
+			},
+			
 
 			// ListTouch触摸开始
 			ListTouchStart(e) {
@@ -134,7 +145,7 @@
 
 			// ListTouch计算方向
 			ListTouchMove(e) {
-				this.listTouchDirection = e.touches[0].pageX - this.listTouchStart > 0 ? 'right' : 'left'
+				this.listTouchDirection = e.touches[0].pageX - this.listTouchStart < -80 ? 'left' : 'right'
 			},
 
 			// ListTouch计算滚动

pages/unprocessDetail/unprocessDetail.vue

@@ -41,9 +41,9 @@
 				</view>
 				<view>
 					<text>联系方式：</text>
-					<text>
-						15122423833 
-						<text class="phone icon iconfont" @click="submit()">&#xe61d;</text>
+					<text>
+						15122423833
+						<text class="phone icon iconfont" @click="submit()">&#xe61d;</text>
 					</text>
 				</view>
 				<view>
@@ -113,23 +113,17 @@
 				uni.makePhoneCall({
 					phoneNumber: '15122423833' //仅为示例
 				});
-			},
-			mapLocation(){
-				uni.getLocation({
-				    type: 'gcj02', //返回可以用于uni.openLocation的经纬度
-				    success: function (res) {
-				        const latitude =31.469465;
-				        const longitude = 121.327514;
-						console.log(latitude);
-				        uni.openLocation({
-				            latitude: latitude,
-				            longitude: longitude,
-				            success: function () {
-				                console.log('success');
-				            }
-				        });
-				    }
-				});
+			},
+			mapLocation() {
+				uni.openLocation({
+					latitude: 31.469465,
+					longitude: 121.327514,
+					success: function() {
+						console.log('success');
+					}
+				});
+
+
 			},
 
 			// 页面跳转
@@ -176,15 +170,15 @@
 	}
 
 	.processStatus {
-		
+
 
 		textarea {
 			background: #F5F5F5;
 			color: #999999;
 		}
 
-	}
-	
+	}
+
 
 	// textarea
 	.JTxtArea {

static/iconfont/iconfont.css

@@ -1,17 +1,11 @@
-
-
-
-
-
-
 @font-face {
   font-family: 'iconfont';  /* project id 2394829 */
-  src: url('https://at.alicdn.com/t/font_2394829_yxeekujatog.eot');
-  src: url('https://at.alicdn.com/t/font_2394829_yxeekujatog.eot?#iefix') format('embedded-opentype'),
-  url('https://at.alicdn.com/t/font_2394829_yxeekujatog.woff2') format('woff2'),
-  url('https://at.alicdn.com/t/font_2394829_yxeekujatog.woff') format('woff'),
-  url('https://at.alicdn.com/t/font_2394829_yxeekujatog.ttf') format('truetype'),
-  url('https://at.alicdn.com/t/font_2394829_yxeekujatog.svg#iconfont') format('svg');
+  src: url('https://at.alicdn.com/t/font_2394829_cpwu6e12c4.eot');
+  src: url('https://at.alicdn.com/t/font_2394829_cpwu6e12c4.eot?#iefix') format('embedded-opentype'),
+  url('https://at.alicdn.com/t/font_2394829_cpwu6e12c4.woff2') format('woff2'),
+  url('https://at.alicdn.com/t/font_2394829_cpwu6e12c4.woff') format('woff'),
+  url('https://at.alicdn.com/t/font_2394829_cpwu6e12c4.ttf') format('truetype'),
+  url('https://at.alicdn.com/t/font_2394829_cpwu6e12c4.svg#iconfont') format('svg');
 }
 
 .iconfont {
@@ -22,6 +16,42 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-xiajiantou_huaban:before {
+  content: "\e63d";
+}
+
+.icon-saoyisao:before {
+  content: "\e607";
+}
+
+.icon-dianhua1:before {
+  content: "\e61d";
+}
+
+.icon-daohang:before {
+  content: "\e612";
+}
+
+.icon-youjiantou:before {
+  content: "\e629";
+}
+
+.icon-zhuye:before {
+  content: "\e64e";
+}
+
+.icon-shezhi:before {
+  content: "\e611";
+}
+
+.icon-xiaoxi:before {
+  content: "\e606";
+}
+
+.icon-circulation-full:before {
+  content: "\e858";
+}
+
 .icon-yanzheng:before {
   content: "\e86a";
 }