Merge branch 'master' of http://git.ycjcjy.com/xuchengxiang/niucai-user

src/pages/WoDe/WoDeCaiPiao/index.vue

@@ -21,14 +21,14 @@
                   </div>
                   <div class="flex-item">
                     <span>{{item.lotteryName}}</span>
-                    <span>{{item.totalPrice}}元</span>
+                    <span>{{item.totalPrice / 100}}元</span>
                   </div>
                 </div>
                 <div class="flex-h">
                   <div class="flex-item">
-                    <span>订单号：{{null}}</span>
+                    <!-- <span>订单号：{{item.orderId || null}}</span> -->
                   </div>
-                  <span>{{item.status}}</span>
+                  <span>{{ReturnStatus(item)}}</span>
                 </div>
               </router-link>
             </ul>
@@ -78,6 +78,18 @@ export default {
     ...mapUserMutations([
       'EmptyUserBettingList'
     ]),
+    ReturnStatus (item) {
+      if (!item.isDrawn) {
+        return '未出票'
+      }
+      if (!item.isOpen) {
+        return '未开奖'
+      }
+      if (!item.isWinning) {
+        return '未中奖'
+      }
+      return '已中奖'
+    },
     Init (done = () => { }) { // 初始化
       this.EmptyUserBettingList()
       this.PageData.pageNum = 1

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}&routerName=DaLeTou`
+        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}&bettingId=${res.data.data.bettingId}`)}&token=${window.localStorage.Jwt}&routerName=DaLeTou`
       }).catch((res) => {
         this.Toast(res.data.message)
         this.DataLock = false

src/pages/index/DingDanZhiFuZhuangTai/index.vue

@@ -9,7 +9,7 @@
           <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}&routerName=${$route.query.routerName}`">重新支付</a>
           <router-link :to="{ name: 'index' }">返回首页</router-link>
-          <router-link :to="{ name: $route.query.routerName }">继续投注</router-link>
+          <router-link :to="{ name: 'CaiPiaoXiangQing', query: { id: $route.query.bettingId } }">查看投注</router-link>
         </div>
       </div>
     </MainPageContainer>

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}&routerName=LanQiu`
+        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}&bettingId=${res.data.data.bettingId}`)}&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}&routerName=PaiLie3`
+        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}&bettingId=${res.data.data.bettingId}`)}&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}&routerName=PaiLie5`
+        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}&bettingId=${res.data.data.bettingId}`)}&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}&routerName=ShuangSeQiu`
+        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}&bettingId=${res.data.data.bettingId}`)}&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}&routerName=ZuQiu`
+        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}&bettingId=${res.data.data.bettingId}`)}&token=${window.localStorage.Jwt}&routerName=ZuQiu`
       }).catch((res) => {
         this.Toast(res.data.message)
         this.DataLock = false

src/store/index.js

@@ -40,27 +40,27 @@ const store = new Vuex.Store({
         if (item.lotteryId === 'basketball') {
           item.router = 'LanQiu'
           item.icon = 'icon6.png'
-          item.desc = '精彩赛事实况'
+          item.desc = '玩转NBA'
         } else if (item.lotteryId === 'football') {
           item.router = 'ZuQiu'
           item.icon = 'icon3.png'
-          item.desc = '有态度看直播'
+          item.desc = '精彩足球赛事'
         } else if (item.lotteryId === 'lottery') {
           item.router = 'DaLeTou'
           item.icon = 'icon4.png'
-          item.desc = '想要中奖必看'
+          item.desc = '喜提头等奖'
         } else if (item.lotteryId === 'double-color') {
           item.router = 'ShuangSeQiu'
           item.icon = 'icon5.png'
-          item.desc = '十分钟开奖'
+          item.desc = '2元可中100w'
         } else if (item.lotteryId === 'p3') {
           item.router = 'PaiLie3'
           item.icon = 'icon7.png'
-          item.desc = '得仕球迷乐园'
+          item.desc = '最高可中1040元'
         } else if (item.lotteryId === 'p5') {
           item.router = 'PaiLie5'
           item.icon = 'icon2.png'
-          item.desc = '一起抢好运'
+          item.desc = '奖金可达10w'
         } else {
           item.router = ''
           item.icon = ''