Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghsApp/src/admin/home/member.vue

@@ -7,8 +7,8 @@
     </view>
     <app-tabs
       :tabs="tabs"
-        :isFixed="true"
-        :top="50"
+      :isFixed="true"
+      :top="40"
       :currentTab="tabIndex"
       :height="100"
       @change="change"
@@ -155,7 +155,7 @@ export default {
 
 <style lang="scss" scoped>
 .app-content {
-  padding-top: 200px;
+  padding-top: 195px;
   padding-bottom: 20px;
 }
 .tabs-wrap {

ghsApp/src/pagesPurchase/details.vue

@@ -337,7 +337,7 @@ export default {
 				
 				this.removeMemory()
 
-				uni.navigateTo({url:'/pagesPurchase/components/pageSuccess?orderSn='+res.data.orderSn})
+				uni.reLaunch({url:'/pagesPurchase/components/pageSuccess?orderSn='+res.data.orderSn})
 			} catch (error) {}
 		},
 		formSubmitFun(){