静态页面

src/components/common/MainPageContainer/index.vue

@@ -4,7 +4,7 @@
     <!-- 头部 -->
     <div class="MainHeaderPadding" v-if="ShowMainHeader" :style="{height: `${MainPaddingTop}px`}"></div>
     <div class="MainHeader flex-h" v-if="ShowMainHeader">
-      <a class="MainBack iconfont iconjiantouleft" v-if="ShowMainHeaderBack" @click="$router.back(-1)"></a>
+      <a class="MainBack iconfont iconjiantouleft" v-if="ShowMainHeaderBack" @click="() => { GoBack === null ? $router.back(-1) : GoBack() }"></a>
       <span class="MainTitle">
         <span @click="MainTitleClick()">{{MainHeaderTitle}}</span>
         <a class="iconfont iconjiantoudown" @click="MainTitleClick()" v-if="ShowMainTitleIcon"></a>
@@ -45,6 +45,9 @@ const { mapState: mapUserState, mapActions: mapUserActions } = createNamespacedH
 export default {
   name: 'MainPageContainer',
   props: {
+    GoBack: {
+      default: null
+    },
     ShowMainHeaderRight: { // 显隐头部右边选项
       default: false,
       type: Boolean

src/pages/WoDe/ChongZhi/index.vue

@@ -82,7 +82,6 @@ export default {
       }).catch((res) => {
         this.DataLock = false
       })
-      // window.location.replace(`${APIBase}api/app/alipay/deposit?amount=${this.Amount - 0}&returnURL=${encodeURIComponent(`${window.location.origin}/#/WoDe/ChongZhiZhuangTai`)}&token=${window.localStorage.Jwt}`)
     }
   }
 }

src/pages/WoDe/ChongZhiZhuangTai/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="Page">
-    <MainPageContainer @UserInfoChange="Init" :ShowMainHeader="true" MainHeaderTitle="订单状态" :ShowMainHeaderRight="true" :MainHeaderRightText="`完成`" :MainHeaderRightClick="() => { $router.push({ name: 'index' }) }">
+    <MainPageContainer @UserInfoChange="Init" :ShowMainHeader="true" MainHeaderTitle="订单状态" :ShowMainHeaderRight="true" :MainHeaderRightText="`完成`" :MainHeaderRightClick="() => { $router.push({ name: $route.query.from || 'index' }) }">
       <div class="PageContainer">
         <div class="centerLabel">
           <i class="iconfont iconshibai" v-if="OrderStatus === 'Error'"></i>
@@ -23,7 +23,6 @@ export default {
   data () {
     return {
       OrderStatus: null,
-      LocationOrigin: encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${this.$route.query.id}`),
       Jwt: window.localStorage.Jwt
     }
   },

src/pages/index/DaLeTou/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="Page">
-    <MainPageContainer :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="大乐透">
+    <MainPageContainer :GoBack="() => { $router.replace({ name: 'index' }) }" :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="大乐透">
       <div class="PageContainer flex-v">
         <div class="Top" v-if="NewstRes !== null">
           <div class="PrevRes flex-h">

src/pages/index/DaLeTouDingDan/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="Page">
-    <MainPageContainer :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="大乐透">
+    <MainPageContainer :GoBack="() => { $router.replace({ name: 'DaLeTou' }) }" :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="大乐透">
       <div id="BaiDuMap" style="display: none;"></div>
       <div class="PageContainer flex-v">
         <div class="flex-item">

src/pages/index/LanQiu/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="Page">
-    <MainPageContainer :ShowMainHeader="true" :ShowMainTitleIcon="true" :ShowMainHeaderBack="true" :MainHeaderTitle="MainTitle" :MainTitleClick="MainTitleClick">
+    <MainPageContainer :GoBack="() => { $router.replace({ name: 'index' }) }" :ShowMainHeader="true" :ShowMainTitleIcon="true" :ShowMainHeaderBack="true" :MainHeaderTitle="MainTitle" :MainTitleClick="MainTitleClick">
       <div class="PageContainer flex-v">
         <div class="HideNav" :class="{'active': ShowSelectTypeNav}">
           <div>

src/pages/index/LanQiuDingDan/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="Page">
-    <MainPageContainer :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="篮球">
+    <MainPageContainer :GoBack="() => { $router.replace({ name: 'LanQiu' }) }" :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="篮球">
       <div class="PageContainer flex-v">
         <div class="flex-item">
           <div>

src/pages/index/PaiLie3/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="Page">
-    <MainPageContainer :ShowMainHeader="true" :ShowMainTitleIcon="true" :ShowMainHeaderBack="true" :MainHeaderTitle="MainTitle" :MainTitleClick="MainTitleClick">
+    <MainPageContainer :GoBack="() => { $router.replace({ name: 'index' }) }" :ShowMainHeader="true" :ShowMainTitleIcon="true" :ShowMainHeaderBack="true" :MainHeaderTitle="MainTitle" :MainTitleClick="MainTitleClick">
       <div class="PageContainer flex-v">
         <div class="HideNav" :class="{'active': ShowSelectTypeNav}">
           <div class="flex-h">

src/pages/index/PaiLie3DingDan/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="Page">
-    <MainPageContainer :ShowMainHeader="true" :ShowMainHeaderRight="true" :ShowMainHeaderBack="true" MainHeaderRightIcon="iconqingkong" MainHeaderRightText="清空重选" MainHeaderTitle="确认投注" :MainHeaderRightClick="() => { this.EmptyCart() }">
+    <MainPageContainer :GoBack="() => { $router.replace({ name: 'PaiLie3' }) }" :ShowMainHeader="true" :ShowMainHeaderRight="true" :ShowMainHeaderBack="true" MainHeaderRightIcon="iconqingkong" MainHeaderRightText="清空重选" MainHeaderTitle="确认投注" :MainHeaderRightClick="() => { this.EmptyCart() }">
       <div class="PageContainer flex-v">
         <a class="Store flex-h" @click="() => { if (GetStoreListStatus) { ShowStore = true } }">
           <div class="flex-item">

src/pages/index/PaiLie5/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="Page">
-    <MainPageContainer :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="排列5">
+    <MainPageContainer :GoBack="() => { $router.replace({ name: 'index' }) }" :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="排列5">
       <div class="PageContainer flex-v">
         <nav class="flex-h">
           <a class="flex-item" :class="{'active': SelectType === 1}" @click="CutSelectType(1)">自选</a>

src/pages/index/PaiLie5DingDan/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="Page">
-    <MainPageContainer :ShowMainHeader="true" :ShowMainHeaderRight="true" MainHeaderRightIcon="iconqingkong" MainHeaderRightText="清空重选" :ShowMainHeaderBack="true" MainHeaderTitle="确认投注" :MainHeaderRightClick="() => { this.EmptyCart() }">
+    <MainPageContainer :GoBack="() => { $router.replace({ name: 'PaiLie5' }) }" :ShowMainHeader="true" :ShowMainHeaderRight="true" MainHeaderRightIcon="iconqingkong" MainHeaderRightText="清空重选" :ShowMainHeaderBack="true" MainHeaderTitle="确认投注" :MainHeaderRightClick="() => { this.EmptyCart() }">
       <div class="PageContainer flex-v">
         <a class="Store flex-h" @click="() => { if (GetStoreListStatus) { ShowStore = true } }">
           <div class="flex-item">

src/pages/index/ShuangSeQiu/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="Page">
-    <MainPageContainer :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="双色球">
+    <MainPageContainer :GoBack="() => { $router.replace({ name: 'index' }) }" :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="双色球">
       <div class="PageContainer flex-v">
         <div class="Top" v-if="NewstRes !== null">
           <div class="PrevRes flex-h">

src/pages/index/ShuangSeQiuDingDan/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="Page">
-    <MainPageContainer :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="双色球">
+    <MainPageContainer :GoBack="() => { $router.replace({ name: 'ShuangSeQiu' }) }" :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="双色球">
       <div class="PageContainer flex-v">
         <div class="flex-item">
           <div>
@@ -33,11 +33,11 @@
                     <a class="iconfont iconjiahao" @click="Multiple += 1"></a>
                   </span>
                 </div>
-                <div class="flex-h">
+                <!-- <div class="flex-h">
                   <span class="flex-item">是否追期？</span>
                   <span>追号喜中二等奖</span>
                   <van-switch v-model="IsAdd" active-color="#07c160" inactive-color="#ccc" size="0.13rem" @change="SwitchChange" />
-                </div>
+                </div> -->
               </div>
             </div>
 

src/pages/index/ZuQiu/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="Page">
-    <MainPageContainer :ShowMainHeader="true" :ShowMainTitleIcon="true" :ShowMainHeaderBack="true" :MainHeaderTitle="PageTitle" :MainTitleClick="MainTitleClick">
+    <MainPageContainer :GoBack="() => { $router.replace({ name: 'index' }) }" :ShowMainHeader="true" :ShowMainTitleIcon="true" :ShowMainHeaderBack="true" :MainHeaderTitle="PageTitle" :MainTitleClick="MainTitleClick">
       <div class="PageContainer flex-v">
 
         <div class="HideNav" :class="{'active': ShowSelectTypeNav}">

src/pages/index/ZuQiuDingDan/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="Page">
-    <MainPageContainer :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="足球">
+    <MainPageContainer :GoBack="() => { $router.replace({ name: 'ZuQiu' }) }" :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="足球">
       <div class="PageContainer flex-v">
         <div class="flex-item">
           <div>