feats

config/index.js

@@ -12,16 +12,11 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
       '/api': {
+        target: 'https://app.xnsport.cn',
         // target: 'http://123.57.65.31:9004',
-        target: 'http://127.0.0.1:8080',
         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/pages/WoDe/ChongZhi/index.vue

@@ -60,7 +60,7 @@ export default {
         this.Toast('充值牛逼数量必须为正整数')
         return false
       }
-      window.location.href = `/api/app/alipay/deposit?amount=${this.Amount - 0}&returlURL=${encodeURIComponent(`${window.location.origin}/#/WoDe/ChongZhiZhuangTai`)}&token=${window.localStorage.Jwt}`
+      window.location.href = `/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

@@ -17,7 +17,7 @@
 <script>
 import MainPageContainer from '../../../components/common/MainPageContainer'
 import { createNamespacedHelpers } from 'vuex'
-const { mapActions: mapUserActions } = createNamespacedHelpers('user')
+const { mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
 export default {
   name: 'index',
   data () {
@@ -40,12 +40,21 @@ export default {
   },
   methods: {
     ...mapUserActions([
+      'GetCurrentUserInfo',
       'GetAliPayStatus'
     ]),
+    ...mapUserMutations([
+      'UpdateUserInfo'
+    ]),
     Init () { // 初始化
       if (this.$route.query.orderId !== undefined) {
         this.GetAliPayStatus({ urlData: { id: this.$route.query.orderId } }).then((res) => {
           this.OrderStatus = res.data.data === 1 ? 'Success' : 'Error'
+          if (res.data.data === 1) {
+            this.GetCurrentUserInfo().then((res) => {
+              this.UpdateUserInfo(res.data.data)
+            })
+          }
         })
       }
     }

src/pages/WoDe/UserCenter/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="Page">
-    <MainPageContainer :ShowMainTabBar="true" :MainTabBarActiveId="3">
+    <MainPageContainer @UserInfoChange="UserInfoChange" :ShowMainTabBar="true" :MainTabBarActiveId="3">
       <div class="PageContainer">
         <!-- 头像 & 背景 -->
         <div class="TopContainer">
@@ -38,7 +38,7 @@
 <script>
 import MainPageContainer from '../../../components/common/MainPageContainer'
 import { createNamespacedHelpers } from 'vuex'
-const { mapState: mapUserState } = createNamespacedHelpers('user')
+const { mapState: mapUserState, mapActions: mapUserActions } = createNamespacedHelpers('user')
 export default {
   name: '',
   data () {
@@ -69,6 +69,11 @@ export default {
     })
   },
   methods: {
+    ...mapUserActions([
+      'GetCurrentUserInfo'
+    ]),
+    UserInfoChange () {
+    }
   }
 }
 </script>

src/pages/index/LanQiuDingDan/index.vue

@@ -44,14 +44,14 @@
             <a @click="ShowStore = true">店铺：{{CurrentStoreName || '请选择'}}</a>
           </div>
           <div class="Chuan" v-if="$route.query.type === 'mix'">
-            <span @click="ShowPassWay = true">{{CurrentPassName || '请选择过关方式'}}</span>
+            <span @click="ShowPassWay = true">{{CurrentPassName || '请选择过关方式'}} <i class="iconfont iconjiantoudown"></i></span>
           </div>
           <div class="Count">
             <span>
               <em>{{TotalCount}}</em>注
             </span>
             <span>金额：<em>{{TotalPrice}}</em>牛币</span>
-            <span>预计奖金：<em>{{(PriceArr[0] * Multiple).toFixed(2)}} ~ {{(PriceArr[1] * Multiple).toFixed(2)}}</em>牛币</span>
+            <span>预计奖金：<em>{{(MinPrice * Multiple).toFixed(2)}} ~ {{(MaxPrice * Multiple).toFixed(2)}}</em>牛币</span>
           </div>
           <a :class="{'active': CurrentStoreId !== null && LanQiuCart.length}" @click="ToPostBetting">立即购买</a>
         </div>
@@ -151,7 +151,9 @@ export default {
       TotalCount: 0, // 总注数
       TotalPrice: 0, // 总金额
       PageList: [],
-      DataLock: false
+      DataLock: false,
+      MaxPrice: 0,
+      MinPrice: 0
     }
   },
   computed: {
@@ -303,7 +305,35 @@ export default {
       this.TotalCount = GetAllParts([...ListData], PassTarget).sum
       this.TotalPrice = this.TotalCount * 2 * this.Multiple
       this.PriceArr = GetPrice(this.AllParts)
-      console.log(JSON.stringify(this.AllParts))
+      // console.log(this.AllParts)
+      let ResArr = []
+      this.AllParts.map((item, index) => {
+        ResArr.push([])
+        item.map((subItem, subIndex) => {
+          ResArr[index].push([])
+          subItem.map((cItem) => {
+            ResArr[index][subIndex].push({ odds: cItem.detail.odds - 0, id: cItem.matchId, ruleCode: cItem.detail.ruleCode })
+          })
+        })
+      })
+      // console.log(JSON.stringify(ResArr))
+      let MaxPrice = 0
+      let PrevPrice = null
+      ResArr.map((item, index) => {
+        let subItemPrice = 1
+        item.map((subItem, subIndex) => {
+          subItem.map((cItem) => {
+            subItemPrice *= cItem.odds
+          })
+          subItemPrice *= 2
+          if (PrevPrice === null || PrevPrice > subItemPrice) {
+            PrevPrice = subItemPrice - 0
+          }
+        })
+        MaxPrice += subItemPrice
+      })
+      this.MaxPrice = MaxPrice.toFixed(2)
+      this.MinPrice = PrevPrice.toFixed(2)
     },
     ReturnDeatilList (list, pid) {
       let Arr = []

src/pages/index/ZuQiuDingDan/index.vue

@@ -44,14 +44,14 @@
             <a @click="ShowStore = true">店铺：{{CurrentStoreName || '请选择'}}</a>
           </div>
           <div class="Chuan" v-if="$route.query.type === 'mix'">
-            <span @click="ShowPassWay = true">{{CurrentPassName || '请选择过关方式'}}</span>
+            <span @click="ShowPassWay = true">{{CurrentPassName || '请选择过关方式'}} <i class="iconfont iconjiantoudown"></i></span>
           </div>
           <div class="Count">
             <span>
               <em>{{TotalCount}}</em>注
             </span>
             <span>金额：<em>{{TotalPrice}}</em>牛币</span>
-            <span>预计奖金：<em>{{(PriceArr[0] * Multiple).toFixed(2)}} ~ {{(PriceArr[1] * Multiple).toFixed(2)}}</em>牛币</span>
+            <span>预计奖金：<em>{{(MinPrice * Multiple).toFixed(2)}} ~ {{(MaxPrice * Multiple).toFixed(2)}}</em>牛币</span>
           </div>
           <a :class="{'active': CurrentStoreId !== null && ZuQiuCart.length}" @click="ToPostBetting">立即购买</a>
         </div>
@@ -151,7 +151,9 @@ export default {
       TotalCount: 0, // 总注数
       TotalPrice: 0, // 总金额
       PageList: [],
-      DataLock: false
+      DataLock: false,
+      MaxPrice: 0,
+      MinPrice: 0
     }
   },
   computed: {
@@ -315,20 +317,24 @@ export default {
           })
         })
       })
-      console.log(JSON.stringify(ResArr))
-      // let PartsArr = this.AllParts
-      // let OddsArr = []
-      // PartsArr.map((item, index) => {
-      //   OddsArr.push([])
-      //   item.map((subItem, subIndex) => {
-      //     let Num = 1
-      //     subItem.map((cItem) => {
-      //       Num *= cItem.detail.odds - 0
-      //     })
-      //     OddsArr[index].push((Num * 2).toFixed(2) - 0)
-      //   })
-      // })
-      // console.log(JSON.stringify(OddsArr))
+      // console.log(JSON.stringify(ResArr))
+      let MaxPrice = 0
+      let PrevPrice = null
+      ResArr.map((item, index) => {
+        let subItemPrice = 1
+        item.map((subItem, subIndex) => {
+          subItem.map((cItem) => {
+            subItemPrice *= cItem.odds
+          })
+          subItemPrice *= 2
+          if (PrevPrice === null || PrevPrice > subItemPrice) {
+            PrevPrice = subItemPrice - 0
+          }
+        })
+        MaxPrice += subItemPrice
+      })
+      this.MaxPrice = MaxPrice.toFixed(2)
+      this.MinPrice = PrevPrice.toFixed(2)
     },
     ReturnDeatilList (list, pid) {
       let Arr = []

src/store/user/index.js

@@ -121,6 +121,11 @@ export default {
     }
   },
   actions: {
+    GetCurrentUserInfo (context, payload) { // 获取当前用户信息
+      return new Promise((resolve, reject) => {
+        ToolClass.Axios(resolve, reject, Api.GetCurrentUserInfo, context, payload, 1000)
+      })
+    },
     BindAliAccount (context, payload) { // 绑定支付宝
       return new Promise((resolve, reject) => {
         ToolClass.Axios(resolve, reject, Api.BindAliAccount, context, payload, 1000)

src/util/Api.js

@@ -2,6 +2,10 @@
 const prefix = process.env.NODE_ENV === 'production' ? '/api' : '/api'
 
 const $api = {
+  GetCurrentUserInfo: { // 获取当前用户信息
+    method: 'get',
+    url: `${prefix}/app/customer/current`
+  },
   BindAliAccount: { // 绑定支付宝
     method: 'post',
     url: `${prefix}/shop/alipay/auth/user`