静态页面

config/index.js

@@ -11,16 +11,16 @@ module.exports = {
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
     proxyTable: {
-      '/api': {
-        target: 'http://123.57.65.31:9004',
-        changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
-        pathRewrite: { '^/api': '/api' }
-      },
       // '/api': {
-      //   target: 'https://app.xnsport.cn',
+      //   target: 'http://123.57.65.31:9004',
       //   changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
       //   pathRewrite: { '^/api': '/api' }
-      // }
+      // },
+      '/api': {
+        target: 'https://app.xnsport.cn',
+        changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
+        pathRewrite: { '^/api': '/api' }
+      }
       // '/app-api': {
       //   target: 'http://ycapi.jcjyhn.com',
       //   changeOrigin: true, // 如果接口跨域，需要进行这个参数配置

src/components/common/MainPageContainer/index.vue

@@ -10,7 +10,7 @@
         <a class="iconfont iconjiantoudown" @click="MainTitleClick()" v-if="ShowMainTitleIcon"></a>
       </span>
       <a class="MainHeaderRight" v-if="ShowMainHeaderRight" @click="MainHeaderRightClick()">
-        <i class="iconfont" :class="MainHeaderRightIcon"></i>
+        <i class="iconfont" :class="MainHeaderRightIcon" v-if="MainHeaderRightIcon !== null"></i>
         <span>{{MainHeaderRightText}}</span>
       </a>
     </div>

src/pages/WoDe/WoDeCaiPiao/index.vue

@@ -2,7 +2,7 @@
   <div class="Page">
     <MainPageContainer :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="我的彩票">
       <div class="PageContainer">
-        <scroller :on-refresh="Refresh" ref="MyScroller">
+        <scroller :on-refresh="Refresh" :on-infinite="Infinite" ref="MyScroller">
           <div class="Container">
             <ul>
               <router-link tag="li" :to="{ name: 'CaiPiaoXiangQing', query: { id: item.bettingId } }" v-for="(item, index) in UserBettingList" :key="index">
@@ -47,12 +47,13 @@ export default {
   name: '',
   data () {
     return {
-      DataLock: false, // 数据锁
       PageData: {
-        pageNum: 1,
-        pageSize: 15
+        pageNum: 0,
+        pageSize: 10
       },
-      HasNextPage: true
+      Timer: null,
+      HasNextPage: true,
+      DataLock: false
     }
   },
   computed: {
@@ -78,32 +79,38 @@ export default {
       'EmptyUserBettingList'
     ]),
     Init (done = () => { }) { // 初始化
-      this.EmptyUserBettingList() // 清空列表
-      this.PageData = {
-        pageNum: 1,
-        pageSize: 15
-      }
+      this.EmptyUserBettingList()
+      this.PageData.pageNum = 1
       this.HasNextPage = true
-      this.GetPageList(done) // 获取列表
+      this.DataLock = false
+      this.ToGetPageList(done)
     },
-    GetPageList (done = () => { }) { // 获取列表
-      if (this.DataLock && !this.HasNextPage) {
-        done()
-      } else {
-        this.DataLock = true
+    ToGetPageList (done = () => { }) { // 获取列表
+      if (this.HasNextPage) {
         this.GetUserBettingList({ queryData: { ...this.PageData } }).then((res) => {
-          // console.log(res.data.data)
           this.HasNextPage = res.data.data.total > this.UserBettingList.length
-          this.DataLock = false
           done()
         }).catch((res) => {
           done()
-          this.DataLock = false
         })
       }
     },
+    Infinite (done) { // 上拉加载
+      this.Timer = window.setTimeout(() => {
+        if (this.HasNextPage) {
+          this.PageData.pageNum += 1
+          this.ToGetPageList(done)
+        } else {
+          this.$refs.MyScroller.finishInfinite(true)
+        }
+      }, 1000)
+    },
     Refresh (done) { // 页面下拉刷新
-      this.Init(done)
+      if (!this.DataLock) {
+        this.Init(done)
+      } else {
+        done()
+      }
     }
   }
 }

src/pages/index/DaLeTouDingDan/index.vue

@@ -222,7 +222,7 @@ export default {
         this.TotalPrize = 0
         this.Multiple = 1
         this.DataLock = false
-        window.location.href = `/api/app/order/alipay/betting?orderId=${res.data.data.orderId}&returlURL=${encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${res.data.data.orderId}`)}&token=${window.localStorage.Jwt}`
+        window.location.href = `/api/app/order/alipay/betting?orderId=${res.data.data.orderId}&returlURL=${encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${res.data.data.orderId}`)}&token=${window.localStorage.Jwt}&routerName=DaLeTou`
       }).catch((res) => {
         this.Toast(res.data.message)
         this.DataLock = false

src/pages/index/DingDanZhiFuZhuangTai/index.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="Page">
-    <MainPageContainer :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="订单状态">
+    <MainPageContainer @UserInfoChange="Init" :ShowMainHeader="true" MainHeaderTitle="订单状态" :ShowMainHeaderRight="true" :MainHeaderRightText="`完成`" :MainHeaderRightClick="() => { $router.push({ name: 'index' }) }">
       <div class="PageContainer">
         <div class="centerLabel">
           <i class="iconfont iconshibai" v-if="OrderStatus === 'Error'"></i>
           <span v-if="OrderStatus === 'Error'">支付失败</span>
           <i class="iconfont iconchenggong active" v-if="OrderStatus === 'Success'"></i>
           <span v-if="OrderStatus === 'Success'">支付成功</span>
-          <a v-if="OrderStatus === 'Error'" :href="`/api/app/order/alipay/betting?orderId=${$route.query.id}&returlURL=${LocationOrigin}&token=${Jwt}`">重新支付</a>
+          <a v-if="OrderStatus === 'Error'" :href="`/api/app/order/alipay/betting?orderId=${$route.query.id}&returlURL=${LocationOrigin}&token=${Jwt}&routerName=${$route.query.routerName}`">重新支付</a>
           <router-link :to="{ name: 'index' }">返回首页</router-link>
-          <a @click="$router.go(-1)">继续投注</a>
+          <router-link :to="{ name: $route.query.routerName }">继续投注</router-link>
         </div>
       </div>
     </MainPageContainer>
@@ -35,7 +35,6 @@ export default {
     MainPageContainer
   },
   created () {
-    this.Init()
   },
   mounted () {
     this.$nextTick(() => {

src/pages/index/LanQiuDingDan/index.vue

@@ -231,7 +231,7 @@ export default {
         this.TotalPrice = 0
         this.Multiple = 1
         this.DataLock = false
-        window.location.href = `/api/app/order/alipay/betting?orderId=${res.data.data.orderId}&returlURL=${encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${res.data.data.orderId}`)}&token=${window.localStorage.Jwt}`
+        window.location.href = `/api/app/order/alipay/betting?orderId=${res.data.data.orderId}&returlURL=${encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${res.data.data.orderId}`)}&token=${window.localStorage.Jwt}&routerName=LanQiu`
       }).catch((res) => {
         this.Toast(res.data.message)
         this.DataLock = false

src/pages/index/PaiLie3DingDan/index.vue

@@ -289,7 +289,7 @@ export default {
         this.TotalPrize = 0
         this.Multiple = 1
         this.DataLock = false
-        window.location.href = `/api/app/order/alipay/betting?orderId=${res.data.data.orderId}&returlURL=${encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${res.data.data.orderId}`)}&token=${window.localStorage.Jwt}`
+        window.location.href = `/api/app/order/alipay/betting?orderId=${res.data.data.orderId}&returlURL=${encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${res.data.data.orderId}`)}&token=${window.localStorage.Jwt}&routerName=PaiLie3`
       }).catch((res) => {
         this.Toast(res.data.message)
         this.DataLock = false

src/pages/index/PaiLie5DingDan/index.vue

@@ -261,7 +261,7 @@ export default {
         this.TotalPrize = 0
         this.Multiple = 1
         this.DataLock = false
-        window.location.href = `/api/app/order/alipay/betting?orderId=${res.data.data.orderId}&returlURL=${encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${res.data.data.orderId}`)}&token=${window.localStorage.Jwt}`
+        window.location.href = `/api/app/order/alipay/betting?orderId=${res.data.data.orderId}&returlURL=${encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${res.data.data.orderId}`)}&token=${window.localStorage.Jwt}&routerName=PaiLie5`
       }).catch((res) => {
         this.Toast(res.data.message)
         this.DataLock = false

src/pages/index/ShuangSeQiuDingDan/index.vue

@@ -212,7 +212,7 @@ export default {
         this.TotalPrize = 0
         this.Multiple = 1
         this.DataLock = false
-        window.location.href = `/api/app/order/alipay/betting?orderId=${res.data.data.orderId}&returlURL=${encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${res.data.data.orderId}`)}&token=${window.localStorage.Jwt}`
+        window.location.href = `/api/app/order/alipay/betting?orderId=${res.data.data.orderId}&returlURL=${encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${res.data.data.orderId}`)}&token=${window.localStorage.Jwt}&routerName=ShuangSeQiu`
       }).catch((res) => {
         this.Toast(res.data.message)
         this.DataLock = false

src/pages/index/ZuQiuDingDan/index.vue

@@ -232,7 +232,7 @@ export default {
         this.TotalPrice = 0
         this.Multiple = 1
         this.DataLock = false
-        window.location.href = `/api/app/order/alipay/betting?orderId=${res.data.data.orderId}&returlURL=${encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${res.data.data.orderId}`)}&token=${window.localStorage.Jwt}`
+        window.location.href = `/api/app/order/alipay/betting?orderId=${res.data.data.orderId}&returlURL=${encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${res.data.data.orderId}`)}&token=${window.localStorage.Jwt}&routerName=ZuQiu`
       }).catch((res) => {
         this.Toast(res.data.message)
         this.DataLock = false