Merge branch 'master' of http://rungit.jxdsy.cn:10000/xys/lumastoreapp

assets/style/border.css

-@charset "utf-8";html{background-color:#fff;color:#000;font-size:14px} 
-body,ul,ol,dl,dd,h1,h2,h3,h4,h5,h6,figure,form,fieldset,legend,input,textarea,button,p,blockquote,th,td,pre,xmp{margin:0;padding:0}
-body,input,textarea,button,select,pre,xmp,tt,code,kbd,samp{line-height:1.5;}
-h1,h2,h3,h4,h5,h6,small,big,input,textarea,button,select{font-size:100%}
-
-h1,h2,h3,h4,h5,h6,b,strong{font-weight:normal}
-address,cite,dfn,em,i,optgroup,var{font-style:normal}
-table{border-collapse:collapse;border-spacing:0;text-align:left}
-caption,th{text-align:inherit}
-ul,ol,menu{list-style:none}
-fieldset,img{border:0}
-img,object,input,textarea,button,select{vertical-align:middle}
-article,aside,footer,header,section,nav,figure,figcaption,hgroup,details,menu{display:block} 
-blockquote:before,blockquote:after,q:before,q:after{content:"\0020"}
-textarea{overflow:auto;resize:vertical}
-input,textarea,button,select,a{outline:0 none;border: none;}
-button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}
-mark{background-color:transparent}
-a,ins,s,u,del{text-decoration:none}
-sup,sub{vertical-align:baseline}
-html {overflow-x: hidden;height: 100%;font-size: 50px;-webkit-tap-highlight-color: transparent;}
-body {color: #333;font-size: .28em;line-height: 1;-webkit-text-size-adjust: none;}
-hr {height: .02rem;margin: .1rem 0;border: medium none;border-top: .02rem solid #cacaca;}
-a {color: #000;text-decoration: none;}
-

assets/style/main.css

-html,body {
-	width: 700px;
-	margin: auto; 
-	font-size:14px;
-}
-	.main700{
-		position: absolute;		
-	width: 700px;
-	}
-    .H10{height: 10px;}
-    .H15{height: 15px;}
-    .H50{height: 50px;}
-    .white{background: #fff;}
-    .van-nav-bar__text{
-		color:#555;
-	}	
-	.van-nav-bar .van-icon{
-		color:#555;
-	}
-	
-	
-@media (max-width: 700px) {
-	html,body {
-		width: 100%; 
-	}
-	.main700{
-		position: absolute;		
-	width: 100%;
-	}
-}
-

main.js

 import Vue from 'vue'
 import App from './App'
-// import './assets/style/border.css'
-// import './assets/style/main.css'
+
 import http from './common/axios.js'  
 
 import store from './store'//状态管理

manifest.json

@@ -148,7 +148,7 @@
                 }
             }
         },
-        "compilerVersion" : 2
+        "compilerVersion" : 3
     },
     /* 快应用特有相关 */
     "quickapp" : {},