Merge branch 'master' of http://119.23.72.7/liangjianmin/h5

# Conflicts:
#	view/21.js
#	view/22.js
#	view/23.js
#	view/24.js
#	view/25.js
#	view/26.js
#	view/27.js
#	view/28.js
#	view/29.js
#	view/30.js
#	view/31.js
#	view/32.js
#	view/33.js
#	view/34.js
#	view/35.js
#	view/36.js
#	view/37.js
#	view/38.js
#	view/39.js
#	view/4.js
#	view/40.js
#	view/41.js
#	view/42.js
#	view/43.js
#	view/44.js
#	view/45.js
#	view/46.js
#	view/47.js
#	view/48.js
#	view/49.js
#	view/50.js
#	view/51.js
#	view/52.js
#	view/53.js
#	view/54.js
#	view/55.js
#	view/56.js
#	view/57.js
#	view/58.js
#	view/59.js
#	view/60.js
#	view/61.js
#	view/62.js
#	view/app.js
#	view/index.html
css

src/assets/css/history/history.less

+.history{
+    
+}
\ No newline at end of file

src/store/modules/history/history.js

@@ -18,7 +18,7 @@ const mutations = {
 const actions = {
     getHistory({commit}, payload) {
     state.loading = true;
-    let params= Util.getParams({page_size:100,page:4})
+    let params= Util.getParams({page_size:100,page:1})
     Services.getHistory(params).then((res) => {
       state.loading = false;
     

src/views/history/history.vue

 <template>
-    <section class="coupon">
+    <section class="history">
         
 
         <van-loading type="spinner" color="#000" class="loading-background" v-if="loading"/>
@@ -52,5 +52,5 @@
 
 
 <style scoped>
-    @import "../../assets/css/history/history.min.css";
+    /* @import "../../assets/css/history/history.min.css"; */
 </style>
\ No newline at end of file

view/index.html

@@ -29,7 +29,7 @@
     <script src="https://qzonestyle.gtimg.cn/qzone/qzact/common/share/share.js" type="text/javascript" charset="utf-8"></script>
     <script src="//static.leixin.com/static/js/flexible.min.js" type="text/javascript" charset="utf-8"></script>
     <script src="//static.leixin.com/static/js/shence.min.js" type="text/javascript" charset="utf-8"></script>
-<link href="//static.leixin.com/0.js" rel="prefetch"><link href="//static.leixin.com/1.js" rel="prefetch"><link href="//static.leixin.com/10.js" rel="prefetch"><link href="//static.leixin.com/11.js" rel="prefetch"><link href="//static.leixin.com/12.js" rel="prefetch"><link href="//static.leixin.com/13.js" rel="prefetch"><link href="//static.leixin.com/14.js" rel="prefetch"><link href="//static.leixin.com/15.js" rel="prefetch"><link href="//static.leixin.com/16.js" rel="prefetch"><link href="//static.leixin.com/17.js" rel="prefetch"><link href="//static.leixin.com/18.js" rel="prefetch"><link href="//static.leixin.com/19.js" rel="prefetch"><link href="//static.leixin.com/2.js" rel="prefetch"><link href="//static.leixin.com/20.js" rel="prefetch"><link href="//static.leixin.com/21.js" rel="prefetch"><link href="//static.leixin.com/22.js" rel="prefetch"><link href="//static.leixin.com/23.js" rel="prefetch"><link href="//static.leixin.com/24.js" rel="prefetch"><link href="//static.leixin.com/25.js" rel="prefetch"><link href="//static.leixin.com/26.js" rel="prefetch"><link href="//static.leixin.com/27.js" rel="prefetch"><link href="//static.leixin.com/28.js" rel="prefetch"><link href="//static.leixin.com/29.js" rel="prefetch"><link href="//static.leixin.com/3.js" rel="prefetch"><link href="//static.leixin.com/30.js" rel="prefetch"><link href="//static.leixin.com/31.js" rel="prefetch"><link href="//static.leixin.com/32.js" rel="prefetch"><link href="//static.leixin.com/33.js" rel="prefetch"><link href="//static.leixin.com/34.js" rel="prefetch"><link href="//static.leixin.com/35.js" rel="prefetch"><link href="//static.leixin.com/36.js" rel="prefetch"><link href="//static.leixin.com/37.js" rel="prefetch"><link href="//static.leixin.com/38.js" rel="prefetch"><link href="//static.leixin.com/39.js" rel="prefetch"><link href="//static.leixin.com/4.js" rel="prefetch"><link href="//static.leixin.com/40.js" rel="prefetch"><link href="//static.leixin.com/41.js" rel="prefetch"><link href="//static.leixin.com/42.js" rel="prefetch"><link href="//static.leixin.com/43.js" rel="prefetch"><link href="//static.leixin.com/44.js" rel="prefetch"><link href="//static.leixin.com/45.js" rel="prefetch"><link href="//static.leixin.com/46.js" rel="prefetch"><link href="//static.leixin.com/47.js" rel="prefetch"><link href="//static.leixin.com/48.js" rel="prefetch"><link href="//static.leixin.com/49.js" rel="prefetch"><link href="//static.leixin.com/5.js" rel="prefetch"><link href="//static.leixin.com/50.js" rel="prefetch"><link href="//static.leixin.com/51.js" rel="prefetch"><link href="//static.leixin.com/52.js" rel="prefetch"><link href="//static.leixin.com/53.js" rel="prefetch"><link href="//static.leixin.com/54.js" rel="prefetch"><link href="//static.leixin.com/55.js" rel="prefetch"><link href="//static.leixin.com/56.js" rel="prefetch"><link href="//static.leixin.com/57.js" rel="prefetch"><link href="//static.leixin.com/58.js" rel="prefetch"><link href="//static.leixin.com/59.js" rel="prefetch"><link href="//static.leixin.com/6.js" rel="prefetch"><link href="//static.leixin.com/60.js" rel="prefetch"><link href="//static.leixin.com/61.js" rel="prefetch"><link href="//static.leixin.com/62.js" rel="prefetch"><link href="//static.leixin.com/63.js" rel="prefetch"><link href="//static.leixin.com/7.js" rel="prefetch"><link href="//static.leixin.com/8.js" rel="prefetch"><link href="//static.leixin.com/9.js" rel="prefetch"><link href="//static.leixin.com/app.js" rel="preload" as="script"></head>
+<link href="//static.leixin.com/0.js" rel="prefetch"><link href="//static.leixin.com/1.js" rel="prefetch"><link href="//static.leixin.com/10.js" rel="prefetch"><link href="//static.leixin.com/11.js" rel="prefetch"><link href="//static.leixin.com/12.js" rel="prefetch"><link href="//static.leixin.com/13.js" rel="prefetch"><link href="//static.leixin.com/14.js" rel="prefetch"><link href="//static.leixin.com/15.js" rel="prefetch"><link href="//static.leixin.com/16.js" rel="prefetch"><link href="//static.leixin.com/17.js" rel="prefetch"><link href="//static.leixin.com/18.js" rel="prefetch"><link href="//static.leixin.com/19.js" rel="prefetch"><link href="//static.leixin.com/2.js" rel="prefetch"><link href="//static.leixin.com/20.js" rel="prefetch"><link href="//static.leixin.com/21.js" rel="prefetch"><link href="//static.leixin.com/22.js" rel="prefetch"><link href="//static.leixin.com/23.js" rel="prefetch"><link href="//static.leixin.com/24.js" rel="prefetch"><link href="//static.leixin.com/25.js" rel="prefetch"><link href="//static.leixin.com/26.js" rel="prefetch"><link href="//static.leixin.com/27.js" rel="prefetch"><link href="//static.leixin.com/28.js" rel="prefetch"><link href="//static.leixin.com/29.js" rel="prefetch"><link href="//static.leixin.com/3.js" rel="prefetch"><link href="//static.leixin.com/30.js" rel="prefetch"><link href="//static.leixin.com/31.js" rel="prefetch"><link href="//static.leixin.com/32.js" rel="prefetch"><link href="//static.leixin.com/33.js" rel="prefetch"><link href="//static.leixin.com/34.js" rel="prefetch"><link href="//static.leixin.com/35.js" rel="prefetch"><link href="//static.leixin.com/36.js" rel="prefetch"><link href="//static.leixin.com/37.js" rel="prefetch"><link href="//static.leixin.com/38.js" rel="prefetch"><link href="//static.leixin.com/39.js" rel="prefetch"><link href="//static.leixin.com/4.js" rel="prefetch"><link href="//static.leixin.com/40.js" rel="prefetch"><link href="//static.leixin.com/41.js" rel="prefetch"><link href="//static.leixin.com/42.js" rel="prefetch"><link href="//static.leixin.com/43.js" rel="prefetch"><link href="//static.leixin.com/44.js" rel="prefetch"><link href="//static.leixin.com/45.js" rel="prefetch"><link href="//static.leixin.com/46.js" rel="prefetch"><link href="//static.leixin.com/47.js" rel="prefetch"><link href="//static.leixin.com/48.js" rel="prefetch"><link href="//static.leixin.com/49.js" rel="prefetch"><link href="//static.leixin.com/5.js" rel="prefetch"><link href="//static.leixin.com/50.js" rel="prefetch"><link href="//static.leixin.com/51.js" rel="prefetch"><link href="//static.leixin.com/52.js" rel="prefetch"><link href="//static.leixin.com/53.js" rel="prefetch"><link href="//static.leixin.com/54.js" rel="prefetch"><link href="//static.leixin.com/55.js" rel="prefetch"><link href="//static.leixin.com/56.js" rel="prefetch"><link href="//static.leixin.com/57.js" rel="prefetch"><link href="//static.leixin.com/58.js" rel="prefetch"><link href="//static.leixin.com/59.js" rel="prefetch"><link href="//static.leixin.com/6.js" rel="prefetch"><link href="//static.leixin.com/60.js" rel="prefetch"><link href="//static.leixin.com/61.js" rel="prefetch"><link href="//static.leixin.com/62.js" rel="prefetch"><link href="//static.leixin.com/7.js" rel="prefetch"><link href="//static.leixin.com/8.js" rel="prefetch"><link href="//static.leixin.com/9.js" rel="prefetch"><link href="//static.leixin.com/app.js" rel="preload" as="script"></head>
 <body class="boxsiz">
 <noscript>
     <strong>网站出现了一点小问题，正在紧急修复中.......</strong>