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

src/pages/index/DaLeTouDingDan/index.vue

@@ -47,7 +47,7 @@
 
         <div class="Bottom">
           <div class="Store">
-            <a @click="ShowStore = true">店铺：{{CurrentStoreName || '请选择'}}</a>
+            <a @click="() => { if (GetStoreListStatus) { ShowStore = true } }">店铺：{{GetStoreListStatus ? CurrentStoreName === null ? '请选择' : CurrentStoreName : '正在请求店铺数据...'}}</a>
           </div>
           <div class="Count">
             <span><em>{{TotalCount}}</em>注</span>
@@ -119,6 +119,7 @@ export default {
     return {
       Lat: '',
       Lng: '',
+      GetStoreListStatus: false,
       MyStoreList: [], // 我的店铺
       CurrentStoreName: null, // 当前选择店铺名称
       CurrentStoreId: null, // 当前选择店铺id
@@ -174,6 +175,7 @@ export default {
       'GetCurrentUserInfo'
     ]),
     ToGetStoreList () {
+      this.GetStoreListStatus = false
       this.GetStoreList({
         queryData: {
           location: `${this.Lng},${this.Lat}`,
@@ -193,6 +195,7 @@ export default {
           this.CurrentStoreName = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].name
           this.CurrentStoreId = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].shopId
         }
+        this.GetStoreListStatus = true
       })
     },
     SelectStore (item) { // 选择店铺
@@ -224,7 +227,7 @@ export default {
         done()
       }
     },
-    ToPostBetting (done = () => {}) { // 去下注
+    ToPostBetting (done = () => { }) { // 去下注
       if (this.DataLock || !this.DaLeTouCart.length || this.CurrentStoreId === null) return
       this.DataLock = true
       let ListData = []

src/pages/index/LanQiuDingDan/index.vue

@@ -41,7 +41,7 @@
 
         <div class="Bottom">
           <div class="Store">
-            <a @click="ShowStore = true">店铺：{{CurrentStoreName || '请选择'}}</a>
+            <a @click="() => { if (GetStoreListStatus) { ShowStore = true } }">店铺：{{GetStoreListStatus ? CurrentStoreName === null ? '请选择' : CurrentStoreName : '正在请求店铺数据...'}}</a>
           </div>
           <div class="Chuan" v-if="$route.query.type === 'mix'">
             <span @click="ShowPassWay = true">{{CurrentPassName || '请选择过关方式'}} <i class="iconfont iconjiantoudown"></i></span>
@@ -138,6 +138,7 @@ export default {
     return {
       Lat: '',
       Lng: '',
+      GetStoreListStatus: false,
       MyStoreList: [],
       PriceArr: [0, 0], // 奖金区间
       AllParts: [], // 投注生成结果
@@ -283,6 +284,7 @@ export default {
       })
     },
     ToGetStoreList () { // 获取店铺列表
+      this.GetStoreListStatus = false
       this.GetStoreList({
         queryData: {
           location: `${this.Lng},${this.Lat}`,
@@ -317,6 +319,7 @@ export default {
           this.CurrentStoreName = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].name
           this.CurrentStoreId = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].shopId
         }
+        this.GetStoreListStatus = true
       })
     },
     ToGetAllParts () { // 枚举投注

src/pages/index/PaiLie3DingDan/index.vue

@@ -2,10 +2,10 @@
   <div class="Page">
     <MainPageContainer :ShowMainHeader="true" :ShowMainHeaderRight="true" :ShowMainHeaderBack="true" MainHeaderRightIcon="iconqingkong" MainHeaderRightText="清空重选" MainHeaderTitle="确认投注" :MainHeaderRightClick="() => { this.EmptyCart() }">
       <div class="PageContainer flex-v">
-        <a class="Store flex-h" @click="ShowStore = true">
+        <a class="Store flex-h" @click="() => { if (GetStoreListStatus) { ShowStore = true } }">
           <div class="flex-item">
             <div>
-              <span>投注门店：{{CurrentStoreName || '请选择'}}</span>
+              <span>投注门店：{{GetStoreListStatus ? CurrentStoreName === null ? '请选择' : CurrentStoreName : '正在请求店铺数据...'}}</span>
             </div>
           </div>
           <span>查看更多</span>
@@ -163,6 +163,7 @@ export default {
     return {
       Lat: '',
       Lng: '',
+      GetStoreListStatus: false,
       MyStoreList: [],
       CurrentStoreName: null, // 当前选择店铺名称
       CurrentStoreId: null, // 当前选择店铺id
@@ -218,6 +219,7 @@ export default {
       }, { enableHighAccuracy: true })
     },
     ToGetStoreList () {
+      this.GetStoreListStatus = false
       this.GetStoreList({
         queryData: {
           location: `${this.Lng},${this.Lat}`,
@@ -237,6 +239,7 @@ export default {
           this.CurrentStoreName = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].name
           this.CurrentStoreId = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].shopId
         }
+        this.GetStoreListStatus = true
       })
     },
     ReturnType (type) { // 投注类型返回值

src/pages/index/PaiLie5DingDan/index.vue

@@ -2,10 +2,10 @@
   <div class="Page">
     <MainPageContainer :ShowMainHeader="true" :ShowMainHeaderRight="true" MainHeaderRightIcon="iconqingkong" MainHeaderRightText="清空重选" :ShowMainHeaderBack="true" MainHeaderTitle="确认投注" :MainHeaderRightClick="() => { this.EmptyCart() }">
       <div class="PageContainer flex-v">
-        <a class="Store flex-h" @click="ShowStore = true">
+        <a class="Store flex-h" @click="() => { if (GetStoreListStatus) { ShowStore = true } }">
           <div class="flex-item">
             <div>
-              <span>投注门店：{{CurrentStoreName || '请选择'}}</span>
+              <span>投注门店：{{GetStoreListStatus ? CurrentStoreName === null ? '请选择' : CurrentStoreName : '正在请求店铺数据...'}}</span>
             </div>
           </div>
           <span>查看更多</span>
@@ -154,6 +154,7 @@ export default {
     return {
       Lat: '',
       Lng: '',
+      GetStoreListStatus: false,
       MyStoreList: [],
       CurrentStoreName: null, // 当前选择店铺名称
       CurrentStoreId: null, // 当前选择店铺id
@@ -217,6 +218,7 @@ export default {
       this.CreateData()
     },
     ToGetStoreList () {
+      this.GetStoreListStatus = false
       this.GetStoreList({
         queryData: {
           location: `${this.Lng},${this.Lat}`,
@@ -236,6 +238,7 @@ export default {
           this.CurrentStoreName = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].name
           this.CurrentStoreId = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].shopId
         }
+        this.GetStoreListStatus = true
       })
     },
     ConfirmBetting () {

src/pages/index/ShuangSeQiuDingDan/index.vue

@@ -45,7 +45,7 @@
         </div>
         <div class="Bottom">
           <div class="Store">
-            <a @click="ShowStore = true">店铺：{{CurrentStoreName || '请选择'}}</a>
+            <a @click="() => { if (GetStoreListStatus) { ShowStore = true } }">店铺：{{GetStoreListStatus ? CurrentStoreName === null ? '请选择' : CurrentStoreName : '正在请求店铺数据...'}}</a>
           </div>
           <div class="Count">
             <span><em>{{TotalCount}}</em>注</span>
@@ -117,6 +117,7 @@ export default {
     return {
       Lat: '',
       Lng: '',
+      GetStoreListStatus: false,
       MyStoreList: [],
       CurrentStoreName: null, // 当前选择店铺名称
       CurrentStoreId: null, // 当前选择店铺id
@@ -171,6 +172,7 @@ export default {
       'GetCurrentUserInfo'
     ]),
     ToGetStoreList () {
+      this.GetStoreListStatus = false
       this.GetStoreList({
         queryData: {
           location: `${this.Lng},${this.Lat}`,
@@ -190,6 +192,7 @@ export default {
           this.CurrentStoreName = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].name
           this.CurrentStoreId = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].shopId
         }
+        this.GetStoreListStatus = true
       })
     },
     ResToString (target) {

src/pages/index/ZuQiu/index.vue

@@ -200,10 +200,27 @@ export default {
       if (wayCode !== '' && wayCode !== 'Mix') {
         queryData.wayCode = wayCode
       }
-      this.GetMixData({ queryData }).then((res) => {
-        this.MixData = res.data.data || []
-        this.NoData = !this.MixData.length
-      })
+      if (wayCode === 'ft-wdl') {
+        this.GetMixData({ queryData }).then((res) => {
+          let aArr = res.data.data || []
+          this.GetMixData({ queryData: { ...queryData, wayCode: 'ft-wdls' } }).then((ChildRes) => {
+            let bArr = ChildRes.data.data || []
+            aArr.map((aItem) => {
+              bArr.map((bItem) => {
+                if (aItem.matchId - 0 === bItem.matchId - 0) {
+                  this.MixData.push({ ...aItem, playOdds: { ...aItem.playOdds, 'ft-wdls': bItem.playOdds['ft-wdls'] } })
+                }
+              })
+            })
+            this.NoData = !this.MixData.length
+          })
+        })
+      } else {
+        this.GetMixData({ queryData }).then((res) => {
+          this.MixData = res.data.data || []
+          this.NoData = !this.MixData.length
+        })
+      }
     },
     ToBetting () { // 去投注
       if (this.SelectType > 5) {

src/pages/index/ZuQiuDingDan/index.vue

@@ -41,7 +41,7 @@
 
         <div class="Bottom">
           <div class="Store">
-            <a @click="ShowStore = true">店铺：{{CurrentStoreName || '请选择'}}</a>
+            <a @click="() => { if (GetStoreListStatus) { ShowStore = true } }">店铺：{{GetStoreListStatus ? CurrentStoreName === null ? '请选择' : CurrentStoreName : '正在请求店铺数据...'}}</a>
           </div>
           <div class="Chuan" v-if="$route.query.type === 'mix'">
             <span @click="ShowPassWay = true">{{CurrentPassName || '请选择过关方式'}} <i class="iconfont iconjiantoudown"></i></span>
@@ -138,6 +138,7 @@ export default {
     return {
       Lat: '',
       Lng: '',
+      GetStoreListStatus: false,
       MyStoreList: [],
       PriceArr: [0, 0], // 奖金区间
       AllParts: [], // 投注生成结果
@@ -283,6 +284,7 @@ export default {
       })
     },
     ToGetStoreList () { // 获取店铺列表
+      this.GetStoreListStatus = false
       this.GetStoreList({
         queryData: {
           location: `${this.Lng},${this.Lat}`,
@@ -317,6 +319,7 @@ export default {
           this.CurrentStoreName = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].name
           this.CurrentStoreId = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].shopId
         }
+        this.GetStoreListStatus = true
       })
     },
     ToGetAllParts () { // 枚举投注