Merge branch 'test' of git.echepei.com:sailun/sailun-tbr-web into test

common/p-scan/scan.vue

@@ -23,7 +23,7 @@
 			// #ifdef APP-PLUS
 			var currentWebview = page.$getAppWebview();
 			this.barcode = plus.barcode.create('barcode', this.barcode, {
-				top: '85px',
+				top: '10%',
 				left: '10%',
 				width: '80%',
 				height: '31.5%', //180px

pages/home/index.vue

@@ -66,6 +66,9 @@
 				})
 			},
 			inStock(){
+				this.$u.route({
+					url: 'pages/home/my-stock/my-stock',
+				})
 			},
 			inInlineshop(){
 				this.$u.route({