Merge branch 'master' of http://www.jiyou-tech.com:3000/chenming/561_jiexin

src/components/sidebar.vue

 				}]
 			}
 		},
+		created() {
+			// var path=this.$route.path;
+			// var i,j,k;
+			// for(i=0;i<this.list.length;i++){
+			// 	for(j=0;j<this.list[i].children.length;j++){
+			// 		for(k=0;k<this.list[i].children[j].children.length;k++){
+			// 			if(path==this.pagePath[i][j][this.list[i].children[j].children[k]]){
+			// 				this.list[i].children[j].show=true;
+			// 				break
+			// 			}
+			// 		}
+			// 	}
+			// }
+		},
 		methods: {
 			getImg(img) {
-				if (this.imgBaseUrl) {
-					return this.imgBaseUrl + 'sidebar/' + img;
-				} else {
-					return require('../assets/' + 'sidebar/' + img);
-				}
+				return require('../assets/' + 'sidebar/' + img);
+				// if (this.imgBaseUrl) {
+				// 	return this.imgBaseUrl + 'sidebar/' + img;
+				// } else {
+				// 	return require('../assets/' + 'sidebar/' + img);
+				// }
 			},
 			open() {
 				this.$refs.sidebar.style.left = '0%';
 			},
 			show3(index1, index2, title) {
 				this.close()
-				console.log(this.pagePath[index1][index2][title])
-				this.$router.replace(this.pagePath[index1][index2][title])
+				var path=this.pagePath[index1][index2][title];
+				if(path!=this.$route.path){
+					this.$router.replace(this.pagePath[index1][index2][title])
+				}
 			}
 		}
 	}

src/views/Home.vue

 		computed: mapState(['imgBaseUrl']),
 		methods: {
 			getImg(img) {
-				if (this.imgBaseUrl) {
-					return this.imgBaseUrl+'home/' + img;
-				} else {
-					return require('../assets/'+'home/' + img);
-				}
+				return require('../assets/'+'home/' + img);
+				// if (this.imgBaseUrl) {
+				// 	return this.imgBaseUrl+'home/' + img;
+				// } else {
+				// 	return require('../assets/'+'home/' + img);
+				// }
 			},
 			toList(){
 				this.$router.replace('/list')

src/views/List.vue

 		},
 		methods: {
 			getImg(img) {
-				if (this.imgBaseUrl) {
-					return this.imgBaseUrl + 'list/' + img;
-				} else {
-					return require('../assets/' + 'list/' + img);
-				}
+				return require('../assets/' + 'list/' + img);
+				// if (this.imgBaseUrl) {
+				// 	return this.imgBaseUrl + 'list/' + img;
+				// } else {
+				// 	return require('../assets/' + 'list/' + img);
+				// }
 			},
 			toBackHome() {
 				if (this.step == 1) {