Browse Source

修改hash模式到history模式

ming 4 years ago
parent
commit
e1ff35270e

+ 1 - 1
manifest.json

@@ -120,7 +120,7 @@
     "h5" : {
         "title" : "伍继",
         "router" : {
-            "mode" : "hash"
+            "mode" : "history"
         },
         "devServer" : {
             "https" : false

+ 1 - 1
pages/deviceAdd/deviceAdd.vue

@@ -240,7 +240,7 @@
 				}
 				setTimeout(() => {
 					uni.navigateTo({
-						url: '/pages/siteManage/siteManage',
+						url: '/pages/deviceManage/deviceManage',
 					});
 				}, 1000);
 			},

+ 2 - 14
pages/deviceManage/deviceManage.vue

@@ -27,9 +27,7 @@
 					</view>
 
 					<view class="nav-right num">
-						<view class="text-grey text-xs">
-							<image @click="mapLocation(item)" src="../../static/nav-icon.png" style="width:25rpx;height:25rpx;margin-right:26rpx"></image>
-						</view>
+						
 					</view>
 					<view class="move">
 						<view class="bg-grey" @click.stop="editItem(item)">编辑</view>
@@ -102,17 +100,7 @@
 					}.bind(this)
 				});
 			},
-			
-			// 打开导航
-			mapLocation(item) {
-				uni.openLocation({
-					latitude: parseInt(item.latitude),
-					longitude: parseInt(item.longitude),
-					success: function() {
-						// console.log('success');
-					}
-				});
-			},
+			
 
 			async setDelSite(ming = {}) {
 				const res = await this.$myRequest({

+ 1 - 1
pages/index/components/chart/chart.vue

@@ -159,7 +159,7 @@
 				// 动态引入较大类库避免影响页面展示
 				const script = document.createElement('script')
 				// view 层的页面运行在 www 根目录,其相对路径相对于 www 计算
-				script.src = 'static/echarts.js'
+				script.src = '/static/echarts.js'
 				script.onload = this.initEcharts.bind(this)
 				document.head.appendChild(script)
 			}

+ 1 - 1
pages/index/components/chart2/chart2.vue

@@ -180,7 +180,7 @@
 				// 动态引入较大类库避免影响页面展示
 				const script = document.createElement('script')
 				// view 层的页面运行在 www 根目录,其相对路径相对于 www 计算
-				script.src = 'static/echarts.js'
+				script.src = '/static/echarts.js'
 				script.onload = this.initEcharts.bind(this)
 				document.head.appendChild(script)
 			}

+ 1 - 1
pages/index/components/chart3/chart3.vue

@@ -194,7 +194,7 @@
 				// 动态引入较大类库避免影响页面展示
 				const script = document.createElement('script')
 				// view 层的页面运行在 www 根目录,其相对路径相对于 www 计算
-				script.src = 'static/echarts.js'
+				script.src = '/static/echarts.js'
 				script.onload = this.initEcharts.bind(this)
 				document.head.appendChild(script)
 			}

+ 9 - 9
pages/index/index.vue

@@ -144,16 +144,16 @@
 		},
 
 		onLoad(option) {
-			console.log('option')
-			console.log(option)
-			if(!option.code){
-				alert(1)
-				 this.getPageAuthorization()
+			// console.log('option')
+			// console.log(option)
+			// if(!option.code){
+			// 	alert(1)
+			// 	 this.getPageAuthorization()
 				
-			}else{
-				alert(option.code);
-				this.getPageAuthorization({"code":option.code})
-			}
+			// }else{
+			// 	alert(option.code);
+			// 	this.getPageAuthorization({"code":option.code})
+			// }
 
 			this.hackReset = false;
 			this.$nextTick(() => {