瀏覽代碼

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

张延森 4 年之前
父節點
當前提交
69259c5eca

+ 6
- 1
config/index.js 查看文件

@@ -17,7 +17,12 @@ module.exports = {
17 17
         target: 'https://app.xnsport.cn',
18 18
         changeOrigin: true, // 如果接口跨域,需要进行这个参数配置
19 19
         pathRewrite: { '^/api': '/api' }
20
-      }
20
+      },
21
+      // '/api': {
22
+      //   target: 'https://app.xnsport.cn',
23
+      //   changeOrigin: true, // 如果接口跨域,需要进行这个参数配置
24
+      //   pathRewrite: { '^/api': '/api' }
25
+      // }
21 26
       // '/app-api': {
22 27
       //   target: 'http://ycapi.jcjyhn.com',
23 28
       //   changeOrigin: true, // 如果接口跨域,需要进行这个参数配置

+ 7
- 22
src/pages/KaiJiangZhanShi/DaLeTou/index.vue 查看文件

@@ -29,7 +29,7 @@
29 29
             </div>
30 30
 
31 31
             <!-- 销售信息 -->
32
-            <div class="SaleInfo flex-h">
32
+            <!-- <div class="SaleInfo flex-h">
33 33
               <div class="flex-item">
34 34
                 <span>本期销售:</span>
35 35
                 <span>346015916元</span>
@@ -38,10 +38,10 @@
38 38
                 <span>奖池滚存:</span>
39 39
                 <span>34623015916元</span>
40 40
               </div>
41
-            </div>
41
+            </div> -->
42 42
 
43 43
             <!-- 中奖详情 -->
44
-            <div class="ResList">
44
+            <div class="ResList" v-if="LotteryRes.length">
45 45
               <span>本期中奖详情</span>
46 46
               <ul>
47 47
                 <li class="flex-h">
@@ -49,25 +49,10 @@
49 49
                   <span class="flex-item">中奖注数(注)</span>
50 50
                   <span class="flex-item">单注奖金(元)</span>
51 51
                 </li>
52
-                <li class="flex-h">
53
-                  <span class="flex-item">一等奖</span>
54
-                  <span class="flex-item">8</span>
55
-                  <span class="flex-item">6895903</span>
56
-                </li>
57
-                <li class="flex-h">
58
-                  <span class="flex-item">二等奖</span>
59
-                  <span class="flex-item">8</span>
60
-                  <span class="flex-item">6895</span>
61
-                </li>
62
-                <li class="flex-h">
63
-                  <span class="flex-item">三等奖</span>
64
-                  <span class="flex-item">8</span>
65
-                  <span class="flex-item">689</span>
66
-                </li>
67
-                <li class="flex-h">
68
-                  <span class="flex-item">四等奖</span>
69
-                  <span class="flex-item">8</span>
70
-                  <span class="flex-item">68</span>
52
+                <li class="flex-h" v-for="(item, index) in LotteryRes[0].detailList" :key="index">
53
+                  <span class="flex-item">{{item.level}}</span>
54
+                  <span class="flex-item">{{item.piece}}</span>
55
+                  <span class="flex-item">{{item.money}}</span>
71 56
                 </li>
72 57
               </ul>
73 58
               <div class="Btn">

+ 6
- 21
src/pages/KaiJiangZhanShi/DaLeTouXiangQing/index.vue 查看文件

@@ -23,7 +23,7 @@
23 23
         </div>
24 24
 
25 25
         <!-- 销售信息 -->
26
-        <div class="SaleInfo flex-h">
26
+        <!-- <div class="SaleInfo flex-h">
27 27
           <div class="flex-item">
28 28
             <span>本期销售:</span>
29 29
             <span>346015916元</span>
@@ -32,7 +32,7 @@
32 32
             <span>奖池滚存:</span>
33 33
             <span>34623015916元</span>
34 34
           </div>
35
-        </div>
35
+        </div> -->
36 36
 
37 37
         <!-- 中奖详情 -->
38 38
         <div class="ResList">
@@ -43,25 +43,10 @@
43 43
               <span class="flex-item">中奖注数(注)</span>
44 44
               <span class="flex-item">单注奖金(元)</span>
45 45
             </li>
46
-            <li class="flex-h">
47
-              <span class="flex-item">一等奖</span>
48
-              <span class="flex-item">8</span>
49
-              <span class="flex-item">6895903</span>
50
-            </li>
51
-            <li class="flex-h">
52
-              <span class="flex-item">二等奖</span>
53
-              <span class="flex-item">8</span>
54
-              <span class="flex-item">6895</span>
55
-            </li>
56
-            <li class="flex-h">
57
-              <span class="flex-item">三等奖</span>
58
-              <span class="flex-item">8</span>
59
-              <span class="flex-item">689</span>
60
-            </li>
61
-            <li class="flex-h">
62
-              <span class="flex-item">四等奖</span>
63
-              <span class="flex-item">8</span>
64
-              <span class="flex-item">68</span>
46
+            <li class="flex-h" v-for="(item, index) in PageData.detailList" :key="index">
47
+              <span class="flex-item">{{item.level}}</span>
48
+              <span class="flex-item">{{item.piece}}</span>
49
+              <span class="flex-item">{{item.money}}</span>
65 50
             </li>
66 51
           </ul>
67 52
           <div class="Btn">

+ 7
- 22
src/pages/KaiJiangZhanShi/PaiLie3/index.vue 查看文件

@@ -28,7 +28,7 @@
28 28
             </div>
29 29
 
30 30
             <!-- 销售信息 -->
31
-            <div class="SaleInfo flex-h">
31
+            <!-- <div class="SaleInfo flex-h">
32 32
               <div class="flex-item">
33 33
                 <span>本期销售:</span>
34 34
                 <span>346015916元</span>
@@ -37,10 +37,10 @@
37 37
                 <span>奖池滚存:</span>
38 38
                 <span>34623015916元</span>
39 39
               </div>
40
-            </div>
40
+            </div> -->
41 41
 
42 42
             <!-- 中奖详情 -->
43
-            <div class="ResList">
43
+            <div class="ResList" v-if="LotteryRes.length">
44 44
               <span>本期中奖详情</span>
45 45
               <ul>
46 46
                 <li class="flex-h">
@@ -48,25 +48,10 @@
48 48
                   <span class="flex-item">中奖注数(注)</span>
49 49
                   <span class="flex-item">单注奖金(元)</span>
50 50
                 </li>
51
-                <li class="flex-h">
52
-                  <span class="flex-item">一等奖</span>
53
-                  <span class="flex-item">8</span>
54
-                  <span class="flex-item">6895903</span>
55
-                </li>
56
-                <li class="flex-h">
57
-                  <span class="flex-item">二等奖</span>
58
-                  <span class="flex-item">8</span>
59
-                  <span class="flex-item">6895</span>
60
-                </li>
61
-                <li class="flex-h">
62
-                  <span class="flex-item">三等奖</span>
63
-                  <span class="flex-item">8</span>
64
-                  <span class="flex-item">689</span>
65
-                </li>
66
-                <li class="flex-h">
67
-                  <span class="flex-item">四等奖</span>
68
-                  <span class="flex-item">8</span>
69
-                  <span class="flex-item">68</span>
51
+                <li class="flex-h" v-for="(item, index) in LotteryRes[0].detailList" :key="index">
52
+                  <span class="flex-item">{{item.level}}</span>
53
+                  <span class="flex-item">{{item.piece}}</span>
54
+                  <span class="flex-item">{{item.money}}</span>
70 55
                 </li>
71 56
               </ul>
72 57
               <div class="Btn">

+ 6
- 21
src/pages/KaiJiangZhanShi/PaiLie3XiangQing/index.vue 查看文件

@@ -22,7 +22,7 @@
22 22
         </div>
23 23
 
24 24
         <!-- 销售信息 -->
25
-        <div class="SaleInfo flex-h">
25
+        <!-- <div class="SaleInfo flex-h">
26 26
           <div class="flex-item">
27 27
             <span>本期销售:</span>
28 28
             <span>346015916元</span>
@@ -31,7 +31,7 @@
31 31
             <span>奖池滚存:</span>
32 32
             <span>34623015916元</span>
33 33
           </div>
34
-        </div>
34
+        </div> -->
35 35
 
36 36
         <!-- 中奖详情 -->
37 37
         <div class="ResList">
@@ -42,25 +42,10 @@
42 42
               <span class="flex-item">中奖注数(注)</span>
43 43
               <span class="flex-item">单注奖金(元)</span>
44 44
             </li>
45
-            <li class="flex-h">
46
-              <span class="flex-item">一等奖</span>
47
-              <span class="flex-item">8</span>
48
-              <span class="flex-item">6895903</span>
49
-            </li>
50
-            <li class="flex-h">
51
-              <span class="flex-item">二等奖</span>
52
-              <span class="flex-item">8</span>
53
-              <span class="flex-item">6895</span>
54
-            </li>
55
-            <li class="flex-h">
56
-              <span class="flex-item">三等奖</span>
57
-              <span class="flex-item">8</span>
58
-              <span class="flex-item">689</span>
59
-            </li>
60
-            <li class="flex-h">
61
-              <span class="flex-item">四等奖</span>
62
-              <span class="flex-item">8</span>
63
-              <span class="flex-item">68</span>
45
+            <li class="flex-h" v-for="(item, index) in PageData.detailList" :key="index">
46
+              <span class="flex-item">{{item.level}}</span>
47
+              <span class="flex-item">{{item.piece}}</span>
48
+              <span class="flex-item">{{item.money}}</span>
64 49
             </li>
65 50
           </ul>
66 51
           <div class="Btn">

+ 7
- 22
src/pages/KaiJiangZhanShi/PaiLie5/index.vue 查看文件

@@ -28,7 +28,7 @@
28 28
             </div>
29 29
 
30 30
             <!-- 销售信息 -->
31
-            <div class="SaleInfo flex-h">
31
+            <!-- <div class="SaleInfo flex-h">
32 32
               <div class="flex-item">
33 33
                 <span>本期销售:</span>
34 34
                 <span>346015916元</span>
@@ -37,10 +37,10 @@
37 37
                 <span>奖池滚存:</span>
38 38
                 <span>34623015916元</span>
39 39
               </div>
40
-            </div>
40
+            </div> -->
41 41
 
42 42
             <!-- 中奖详情 -->
43
-            <div class="ResList">
43
+            <div class="ResList" v-if="LotteryRes.length">
44 44
               <span>本期中奖详情</span>
45 45
               <ul>
46 46
                 <li class="flex-h">
@@ -48,25 +48,10 @@
48 48
                   <span class="flex-item">中奖注数(注)</span>
49 49
                   <span class="flex-item">单注奖金(元)</span>
50 50
                 </li>
51
-                <li class="flex-h">
52
-                  <span class="flex-item">一等奖</span>
53
-                  <span class="flex-item">8</span>
54
-                  <span class="flex-item">6895903</span>
55
-                </li>
56
-                <li class="flex-h">
57
-                  <span class="flex-item">二等奖</span>
58
-                  <span class="flex-item">8</span>
59
-                  <span class="flex-item">6895</span>
60
-                </li>
61
-                <li class="flex-h">
62
-                  <span class="flex-item">三等奖</span>
63
-                  <span class="flex-item">8</span>
64
-                  <span class="flex-item">689</span>
65
-                </li>
66
-                <li class="flex-h">
67
-                  <span class="flex-item">四等奖</span>
68
-                  <span class="flex-item">8</span>
69
-                  <span class="flex-item">68</span>
51
+                <li class="flex-h" v-for="(item, index) in LotteryRes[0].detailList" :key="index">
52
+                  <span class="flex-item">{{item.level}}</span>
53
+                  <span class="flex-item">{{item.piece}}</span>
54
+                  <span class="flex-item">{{item.money}}</span>
70 55
                 </li>
71 56
               </ul>
72 57
               <div class="Btn">

+ 6
- 21
src/pages/KaiJiangZhanShi/PaiLie5XiangQing/index.vue 查看文件

@@ -22,7 +22,7 @@
22 22
         </div>
23 23
 
24 24
         <!-- 销售信息 -->
25
-        <div class="SaleInfo flex-h">
25
+        <!-- <div class="SaleInfo flex-h">
26 26
           <div class="flex-item">
27 27
             <span>本期销售:</span>
28 28
             <span>346015916元</span>
@@ -31,7 +31,7 @@
31 31
             <span>奖池滚存:</span>
32 32
             <span>34623015916元</span>
33 33
           </div>
34
-        </div>
34
+        </div> -->
35 35
 
36 36
         <!-- 中奖详情 -->
37 37
         <div class="ResList">
@@ -42,25 +42,10 @@
42 42
               <span class="flex-item">中奖注数(注)</span>
43 43
               <span class="flex-item">单注奖金(元)</span>
44 44
             </li>
45
-            <li class="flex-h">
46
-              <span class="flex-item">一等奖</span>
47
-              <span class="flex-item">8</span>
48
-              <span class="flex-item">6895903</span>
49
-            </li>
50
-            <li class="flex-h">
51
-              <span class="flex-item">二等奖</span>
52
-              <span class="flex-item">8</span>
53
-              <span class="flex-item">6895</span>
54
-            </li>
55
-            <li class="flex-h">
56
-              <span class="flex-item">三等奖</span>
57
-              <span class="flex-item">8</span>
58
-              <span class="flex-item">689</span>
59
-            </li>
60
-            <li class="flex-h">
61
-              <span class="flex-item">四等奖</span>
62
-              <span class="flex-item">8</span>
63
-              <span class="flex-item">68</span>
45
+            <li class="flex-h" v-for="(item, index) in PageData.detailList" :key="index">
46
+              <span class="flex-item">{{item.level}}</span>
47
+              <span class="flex-item">{{item.piece}}</span>
48
+              <span class="flex-item">{{item.money}}</span>
64 49
             </li>
65 50
           </ul>
66 51
           <div class="Btn">

+ 7
- 22
src/pages/KaiJiangZhanShi/ShuangSeQiu/index.vue 查看文件

@@ -29,7 +29,7 @@
29 29
             </div>
30 30
 
31 31
             <!-- 销售信息 -->
32
-            <div class="SaleInfo flex-h">
32
+            <!-- <div class="SaleInfo flex-h">
33 33
               <div class="flex-item">
34 34
                 <span>本期销售:</span>
35 35
                 <span>346015916元</span>
@@ -38,10 +38,10 @@
38 38
                 <span>奖池滚存:</span>
39 39
                 <span>34623015916元</span>
40 40
               </div>
41
-            </div>
41
+            </div> -->
42 42
 
43 43
             <!-- 中奖详情 -->
44
-            <div class="ResList">
44
+            <div class="ResList" v-if="LotteryRes.length">
45 45
               <span>本期中奖详情</span>
46 46
               <ul>
47 47
                 <li class="flex-h">
@@ -49,25 +49,10 @@
49 49
                   <span class="flex-item">中奖注数(注)</span>
50 50
                   <span class="flex-item">单注奖金(元)</span>
51 51
                 </li>
52
-                <li class="flex-h">
53
-                  <span class="flex-item">一等奖</span>
54
-                  <span class="flex-item">8</span>
55
-                  <span class="flex-item">6895903</span>
56
-                </li>
57
-                <li class="flex-h">
58
-                  <span class="flex-item">二等奖</span>
59
-                  <span class="flex-item">8</span>
60
-                  <span class="flex-item">6895</span>
61
-                </li>
62
-                <li class="flex-h">
63
-                  <span class="flex-item">三等奖</span>
64
-                  <span class="flex-item">8</span>
65
-                  <span class="flex-item">689</span>
66
-                </li>
67
-                <li class="flex-h">
68
-                  <span class="flex-item">四等奖</span>
69
-                  <span class="flex-item">8</span>
70
-                  <span class="flex-item">68</span>
52
+                <li class="flex-h" v-for="(item, index) in LotteryRes[0].detailList" :key="index">
53
+                  <span class="flex-item">{{item.level}}</span>
54
+                  <span class="flex-item">{{item.piece}}</span>
55
+                  <span class="flex-item">{{item.money}}</span>
71 56
                 </li>
72 57
               </ul>
73 58
               <div class="Btn">

+ 6
- 21
src/pages/KaiJiangZhanShi/ShuangSeQiuXiangQing/index.vue 查看文件

@@ -23,7 +23,7 @@
23 23
         </div>
24 24
 
25 25
         <!-- 销售信息 -->
26
-        <div class="SaleInfo flex-h">
26
+        <!-- <div class="SaleInfo flex-h">
27 27
           <div class="flex-item">
28 28
             <span>本期销售:</span>
29 29
             <span>346015916元</span>
@@ -32,7 +32,7 @@
32 32
             <span>奖池滚存:</span>
33 33
             <span>34623015916元</span>
34 34
           </div>
35
-        </div>
35
+        </div> -->
36 36
 
37 37
         <!-- 中奖详情 -->
38 38
         <div class="ResList">
@@ -43,25 +43,10 @@
43 43
               <span class="flex-item">中奖注数(注)</span>
44 44
               <span class="flex-item">单注奖金(元)</span>
45 45
             </li>
46
-            <li class="flex-h">
47
-              <span class="flex-item">一等奖</span>
48
-              <span class="flex-item">8</span>
49
-              <span class="flex-item">6895903</span>
50
-            </li>
51
-            <li class="flex-h">
52
-              <span class="flex-item">二等奖</span>
53
-              <span class="flex-item">8</span>
54
-              <span class="flex-item">6895</span>
55
-            </li>
56
-            <li class="flex-h">
57
-              <span class="flex-item">三等奖</span>
58
-              <span class="flex-item">8</span>
59
-              <span class="flex-item">689</span>
60
-            </li>
61
-            <li class="flex-h">
62
-              <span class="flex-item">四等奖</span>
63
-              <span class="flex-item">8</span>
64
-              <span class="flex-item">68</span>
46
+            <li class="flex-h" v-for="(item, index) in PageData.detailList" :key="index">
47
+              <span class="flex-item">{{item.level}}</span>
48
+              <span class="flex-item">{{item.piece}}</span>
49
+              <span class="flex-item">{{item.money}}</span>
65 50
             </li>
66 51
           </ul>
67 52
           <div class="Btn">

+ 1
- 1
src/pages/Register/index.vue 查看文件

@@ -142,7 +142,7 @@ export default {
142 142
         if (this.TimeNum === 60) {
143 143
           this.TimeNum -= 1
144 144
         }
145
-        window.setInterval(() => {
145
+        this.Timer = window.setInterval(() => {
146 146
           if (this.TimeNum) {
147 147
             this.TimeNum -= 1
148 148
           } else {

+ 32
- 38
src/pages/WoDe/CaiPiaoXiangQing/index.vue 查看文件

@@ -1,8 +1,8 @@
1 1
 <template>
2 2
   <div class="Page CaiPiaoXiangQing">
3 3
     <MainPageContainer :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="彩票详情">
4
-      <div class="PageContainer">
5
-        <div class="Top" v-if="Detail !== null">
4
+      <div class="PageContainer" v-if="Detail !== null">
5
+        <div class="Top">
6 6
           <div class="Type flex-h">
7 7
             <img src="../../../assets/img/icon2.png" v-if="Detail.betting.lotteryId === 'p5'" alt="">
8 8
             <img src="../../../assets/img/icon3.png" v-if="Detail.betting.lotteryId === 'football'" alt="">
@@ -12,25 +12,29 @@
12 12
             <img src="../../../assets/img/icon7.png" v-if="Detail.betting.lotteryId === 'p3'" alt="">
13 13
             <span>{{ToolClass.GetLotteryName(Detail.betting.lotteryId)}}</span>
14 14
             <div class="flex-item"></div>
15
-            <span>第{{Detail.betting.issueNo}}期</span>
15
+            <span v-if="Detail.betting.lotteryId !== 'basketball' && Detail.betting.lotteryId !== 'football'">第{{Detail.betting.issueNo}}期</span>
16 16
           </div>
17 17
           <div class="Status flex-h">
18
-            <div class="flex-item">
19
-              <span>-</span>
18
+            <div class="flex-item" v-if="Detail.betting.lotteryId !== 'basketball' && Detail.betting.lotteryId !== 'football'">
19
+              <span>{{Detail.betting.winAmount || '-'}}</span>
20 20
               <span>中奖金额(元)</span>
21 21
             </div>
22
+            <div class="flex-item" v-else>
23
+              <span>{{Detail.betting.expectedEarning.substring(0, Detail.betting.expectedEarning.length - 1)}}</span>
24
+              <span>预计奖金(元)</span>
25
+            </div>
22 26
             <div class="flex-item">
23
-              <span>未中奖</span>
27
+              <span>{{Detail.betting.isDrawn ? Detail.betting.isOpen ? Detail.betting.isWinning ? '已中奖' : '未中奖' : '已出票' : '未出票'}}</span>
24 28
               <span>订单状态</span>
25 29
             </div>
26 30
             <div class="flex-item">
27
-              <span><em>2</em></span>
31
+              <span><em>{{Detail.betting.totalPrice}}</em></span>
28 32
               <span>投注金额(元)</span>
29 33
             </div>
30 34
           </div>
31 35
         </div>
32 36
 
33
-        <div class="Res">
37
+        <div class="Res" v-if="Detail.betting.isOpen">
34 38
           <div class="Title flex-h">
35 39
             <span class="flex-item">开奖结果</span>
36 40
           </div>
@@ -48,34 +52,24 @@
48 52
         <div class="BettingInfo">
49 53
           <div class="Title flex-h">
50 54
             <span class="flex-item">投注信息</span>
51
-            <span>1注1倍</span>
55
+            <span>{{Detail.betting.notesNum}}注{{Detail.betting.bettingTimes}}倍</span>
52 56
           </div>
53
-          <div class="List flex-h">
54
-            <span>单式追加</span>
57
+          <div class="List flex-h" v-for="(item, index) in Detail.plan.itemList" :key="index">
58
+            <span v-if="Detail.betting.lotteryId !== 'football' && Detail.betting.lotteryId !== 'basketball'">{{item.isDan ? '复式' : '单式'}}</span>
55 59
             <div class="flex-item">
56
-              <ul>
57
-                <li>1</li>
58
-                <li>2</li>
59
-                <li>3</li>
60
-                <li>4</li>
61
-                <li>5</li>
62
-                <li>6</li>
63
-                <li>7</li>
60
+              <ul v-if="Detail.betting.lotteryId === 'p5' || Detail.betting.lotteryId === 'p3'">
61
+                <li v-for="(subItem, subIndex) in item.firstNums.split(',')" :key="subIndex">{{subItem}}</li>
64 62
               </ul>
65
-            </div>
66
-          </div>
67
-          <div class="List flex-h">
68
-            <span>单式追加</span>
69
-            <div class="flex-item">
70
-              <ul>
71
-                <li>1</li>
72
-                <li>2</li>
73
-                <li>3</li>
74
-                <li>4</li>
75
-                <li>5</li>
76
-                <li>6</li>
77
-                <li>7</li>
63
+              <ul v-if="Detail.betting.lotteryId === 'lottery' || Detail.betting.lotteryId === 'double-color'">
64
+                <li v-for="(subItem, subIndex) in item.firstNums.split(',')" :key="`First-${subIndex}`">{{subItem}}</li>
65
+                <li v-for="(subItem, subIndex) in item.secondNums.split(',')" :key="`Second-${subIndex}`" class="active">{{subItem}}</li>
78 66
               </ul>
67
+              <div v-if="Detail.betting.lotteryId === 'football' || Detail.betting.lotteryId === 'basketball'">
68
+                <span>{{item.matchWeek}} {{item.leagueName}} {{item.homeTeamName}} vs {{item.awayTeamName}}</span>
69
+                <ul>
70
+                  <li v-for="(subItem, subIndex) in item.detailList" :key="subIndex">{{subItem.ruleName}}({{subItem.odds}})</li>
71
+                </ul>
72
+              </div>
79 73
             </div>
80 74
           </div>
81 75
         </div>
@@ -89,7 +83,7 @@
89 83
               <span>订单编号:</span>
90 84
               <div class="flex-item">
91 85
                 <div>
92
-                  <span>xxx</span>
86
+                  <span>{{Detail.order.orderId}}</span>
93 87
                 </div>
94 88
               </div>
95 89
             </li>
@@ -97,24 +91,24 @@
97 91
               <span>下单时间:</span>
98 92
               <div class="flex-item">
99 93
                 <div>
100
-                  <span>{{ToolClass.FormatDate(Detail.betting.createDate)}}</span>
94
+                  <span>{{ToolClass.FormatDate(Detail.order.createDate)}}</span>
101 95
                 </div>
102 96
               </div>
103 97
             </li>
104
-            <li class="flex-h">
98
+            <!-- <li class="flex-h">
105 99
               <span>出票时间:</span>
106 100
               <div class="flex-item">
107 101
                 <div>
108
-                  <span>xxx</span>
102
+                  <span>{{ToolClass.FormatDate(Detail.order.createDate)}}</span>
109 103
                 </div>
110 104
               </div>
111
-            </li>
105
+            </li> -->
112 106
           </ul>
113 107
           <img src="" width="100%" alt="">
114 108
         </div>
115 109
 
116 110
         <div class="Btn">
117
-          <a>联系店主</a>
111
+          <a :href="`tel: ${Detail.shop.keeperPhone}`">联系店主</a>
118 112
         </div>
119 113
       </div>
120 114
     </MainPageContainer>

+ 28
- 0
src/pages/WoDe/CaiPiaoXiangQing/page.scss 查看文件

@@ -155,6 +155,34 @@
155 155
               border-radius: 100%;
156 156
               margin-right: 0.05rem;
157 157
               margin-bottom: 0.05rem;
158
+              &.active {
159
+                background: #3f63e5;
160
+              }
161
+            }
162
+          }
163
+          > div {
164
+            border-top: 0.01rem solid #f8f8f8;
165
+            &:first-child {
166
+              border: none;
167
+            }
168
+            > span {
169
+              display: block;
170
+              font-size: 0.12rem;
171
+              line-height: 0.2rem;
172
+            }
173
+            > ul {
174
+              font-size: 0;
175
+              > li {
176
+                display: inline-block;
177
+                font-size: 0.12rem;
178
+                line-height: 0.2rem;
179
+                vertical-align: middle;
180
+                margin-right: 0.05rem;
181
+                color: #fff;
182
+                padding: 0 0.1rem;
183
+                background: #ff5100;
184
+                margin-top: 0.05rem;
185
+              }
158 186
             }
159 187
           }
160 188
         }

+ 3
- 3
src/pages/WoDe/WoDeCaiPiao/index.vue 查看文件

@@ -8,12 +8,12 @@
8 8
               <router-link tag="li" :to="{ name: 'CaiPiaoXiangQing', query: { id: item.bettingId } }" v-for="(item, index) in UserBettingList" :key="index">
9 9
                 <div class="Time">
10 10
                   <span>下单时间:{{ToolClass.FormatDate(item.createDate)}}</span>
11
-                  <span>{{item.issueNo}}期</span>
11
+                  <span v-if="item.lotteryId !== 'football' && item.lotteryId !== 'basketball'">{{item.issueNo}}期</span>
12 12
                 </div>
13 13
                 <div class="flex-h">
14 14
                   <div class="Icon">
15
-                    <img v-if="item.lotteryId === 'zq'" src="../../../assets/img/icon3.png" class="centerLabel cover" alt="">
16
-                    <img v-if="item.lotteryId === 'lq'" src="../../../assets/img/icon6.png" class="centerLabel cover" alt="">
15
+                    <img v-if="item.lotteryId === 'football'" src="../../../assets/img/icon3.png" class="centerLabel cover" alt="">
16
+                    <img v-if="item.lotteryId === 'basketball'" src="../../../assets/img/icon6.png" class="centerLabel cover" alt="">
17 17
                     <img v-if="item.lotteryId === 'lottery'" src="../../../assets/img/icon4.png" class="centerLabel cover" alt="">
18 18
                     <img v-if="item.lotteryId === 'double-color'" src="../../../assets/img/icon5.png" class="centerLabel cover" alt="">
19 19
                     <img v-if="item.lotteryId === 'p3'" src="../../../assets/img/icon7.png" class="centerLabel cover" alt="">

+ 5
- 1
src/pages/index/ShouYe/index.vue 查看文件

@@ -68,7 +68,7 @@
68 68
 import MainPageContainer from '../../../components/common/MainPageContainer'
69 69
 import Banner from '../../../components/index/Banner'
70 70
 import { mapState, mapActions, createNamespacedHelpers } from 'vuex'
71
-const { mapState: mapIndexState, mapActions: mapIndexActions } = createNamespacedHelpers('index')
71
+const { mapState: mapIndexState, mapActions: mapIndexActions, mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
72 72
 export default {
73 73
   name: 'index',
74 74
   data () {
@@ -103,7 +103,11 @@ export default {
103 103
       'GetLotteryRes',
104 104
       'GetNewstLotteryRes'
105 105
     ]),
106
+    ...mapIndexMutations([
107
+      'EmptyBanner'
108
+    ]),
106 109
     Init (done = () => { }) { // 初始化
110
+      this.EmptyBanner()
107 111
       this.GetBanner({ queryData: { pageNum: 1, pageSize: 10, status: 1, adType: 'app-index-banner' } }).then(() => { // 获取banner
108 112
         this.GetNewstLotteryRes().then(() => { // 获取最新数字彩开奖结果列表
109 113
           done()

+ 3
- 0
src/store/index/index.js 查看文件

@@ -14,6 +14,9 @@ export default {
14 14
     UpdateBanner (state, data) { // 更新banner
15 15
       state.Banner = data.records || []
16 16
     },
17
+    EmptyBanner (state) { // 清空banner
18
+      state.Banner = []
19
+    },
17 20
     UpdateLotteryRes (state, data) { // 更新数字彩开奖结果列表
18 21
       // state.LotteryRes = data.records || []
19 22
       let Arr = data.records || []