xcx пре 4 година
родитељ
комит
e9ed037c35

+ 1
- 1
src/components/index/DingDanXiangQingDaLeTou/index.vue Прегледај датотеку

@@ -12,7 +12,7 @@
12 12
     <div class="Num">
13 13
       <div class="Title flex-h">
14 14
         <span class="flex-item">投注号码</span>
15
-        <span><em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.bettingTimes}}</em>倍<em>{{Data.bettingDetail.betting.totalPrice / 100}}</em>元</span>
15
+        <span><em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.bettingTimes}}</em>倍<em>{{Data.bettingDetail.betting.totalPrice}}</em>牛币</span>
16 16
       </div>
17 17
       <ul>
18 18
         <li v-for="(item, index) in Data.bettingDetail.plan.itemList" :key="index">

+ 3
- 3
src/components/index/DingDanXiangQingLanQiu/index.vue Прегледај датотеку

@@ -12,11 +12,11 @@
12 12
       <ul class="flex-h">
13 13
         <li class="flex-item">
14 14
           <span>{{Data.bettingDetail.betting.expectedEarning.substring(0, Data.bettingDetail.betting.expectedEarning.length - 1)}}</span>
15
-          <span>预计奖金()</span>
15
+          <span>预计奖金(牛币)</span>
16 16
         </li>
17 17
         <li class="flex-item">
18 18
           <span>{{Data.bettingDetail.betting.totalPrice}}</span>
19
-          <span>投资金额()</span>
19
+          <span>投资金额(牛币)</span>
20 20
         </li>
21 21
         <li class="flex-item">
22 22
           <span>{{Data.status === 1 ? '已出票' : '未出票'}}</span>
@@ -28,7 +28,7 @@
28 28
     <div class="Num">
29 29
       <div class="Title flex-h">
30 30
         <span class="flex-item">投注详情</span>
31
-        <span>{{Data.bettingDetail.betting.planName}} <em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.totalPrice / 100}}</em>元</span>
31
+        <span>{{Data.bettingDetail.betting.planName}} <em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.totalPrice}}</em>牛币</span>
32 32
       </div>
33 33
       <ul>
34 34
         <li v-for="(item, index) in Data.bettingDetail.plan.itemList" :key="index">

+ 1
- 1
src/components/index/DingDanXiangQingP3/index.vue Прегледај датотеку

@@ -12,7 +12,7 @@
12 12
     <div class="Num">
13 13
       <div class="Title flex-h">
14 14
         <span class="flex-item">投注号码</span>
15
-        <span><em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.bettingTimes}}</em>倍<em>{{Data.bettingDetail.betting.totalPrice / 100}}</em>元</span>
15
+        <span><em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.bettingTimes}}</em>倍<em>{{Data.bettingDetail.betting.totalPrice}}</em>牛币</span>
16 16
       </div>
17 17
       <ul>
18 18
         <li v-for="(item, index) in Data.bettingDetail.plan.itemList" :key="index">

+ 1
- 1
src/components/index/DingDanXiangQingP5/index.vue Прегледај датотеку

@@ -12,7 +12,7 @@
12 12
     <div class="Num">
13 13
       <div class="Title flex-h">
14 14
         <span class="flex-item">投注号码</span>
15
-        <span><em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.bettingTimes}}</em>倍<em>{{Data.bettingDetail.betting.totalPrice / 100}}</em>元</span>
15
+        <span><em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.bettingTimes}}</em>倍<em>{{Data.bettingDetail.betting.totalPrice}}</em>牛币</span>
16 16
       </div>
17 17
       <ul>
18 18
         <li v-for="(item, index) in Data.bettingDetail.plan.itemList" :key="index">

+ 1
- 1
src/components/index/DingDanXiangQingShuangSeQiu/index.vue Прегледај датотеку

@@ -12,7 +12,7 @@
12 12
     <div class="Num">
13 13
       <div class="Title flex-h">
14 14
         <span class="flex-item">投注号码</span>
15
-        <span><em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.bettingTimes}}</em>倍<em>{{Data.bettingDetail.betting.totalPrice / 100}}</em>元</span>
15
+        <span><em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.bettingTimes}}</em>倍<em>{{Data.bettingDetail.betting.totalPrice}}</em>牛币</span>
16 16
       </div>
17 17
       <ul>
18 18
         <li v-for="(item, index) in Data.bettingDetail.plan.itemList" :key="index">

+ 3
- 3
src/components/index/DingDanXiangQingZuQiu/index.vue Прегледај датотеку

@@ -12,11 +12,11 @@
12 12
       <ul class="flex-h">
13 13
         <li class="flex-item">
14 14
           <span>{{Data.bettingDetail.betting.expectedEarning.substring(0, Data.bettingDetail.betting.expectedEarning.length - 1)}}</span>
15
-          <span>预计奖金()</span>
15
+          <span>预计奖金(牛币)</span>
16 16
         </li>
17 17
         <li class="flex-item">
18 18
           <span>{{Data.bettingDetail.betting.totalPrice}}</span>
19
-          <span>投资金额()</span>
19
+          <span>投资金额(牛币)</span>
20 20
         </li>
21 21
         <li class="flex-item">
22 22
           <span>{{Data.status === 1 ? '已出票' : '未出票'}}</span>
@@ -28,7 +28,7 @@
28 28
     <div class="Num">
29 29
       <div class="Title flex-h">
30 30
         <span class="flex-item">投注详情</span>
31
-        <span>{{Data.bettingDetail.betting.planName}} <em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.totalPrice / 100}}</em>元</span>
31
+        <span>{{Data.bettingDetail.betting.planName}} <em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.totalPrice}}</em>牛币</span>
32 32
       </div>
33 33
       <ul>
34 34
         <li v-for="(item, index) in Data.bettingDetail.plan.itemList" :key="index">

+ 3
- 3
src/pages/PaiJiang/PaiJiangGuanLi/index.vue Прегледај датотеку

@@ -37,13 +37,13 @@
37 37
                         <span class="flex-item">{{item.customerBetting.lotteryName}}</span>
38 38
                         <span>{{item.customerBetting.notesNum}}注</span>
39 39
                         <span>{{item.customerBetting.bettingTimes}}倍</span>
40
-                        <span><em>{{item.customerBetting.totalPrice / 100}}</em>元</span>
40
+                        <span><em>{{item.customerBetting.totalPrice}}</em>牛币</span>
41 41
                       </div>
42 42
                       <span>订单编号:{{item.orderId}}</span>
43 43
                       <span>出票时间:{{ToolClass.DateFormat(item.createDate)}}</span>
44 44
                       <div class="Res">
45 45
                         <span v-if="item.customerBetting.lotteryId === 'basketball' || item.customerBetting.lotteryId === 'football'">过关方式:{{item.customerBetting.bettingPlan.passName}}</span>
46
-                        <span>奖金:<em>{{item.customerBetting.winAmount / 100}}元</em></span>
46
+                        <span>奖金:<em>{{item.customerBetting.winAmount}}牛币</em></span>
47 47
                       </div>
48 48
                     </router-link>
49 49
                   </li>
@@ -59,7 +59,7 @@
59 59
           <span>全选</span> -->
60 60
           <div class="flex-item">
61 61
             <div>
62
-              <span>合计:<em>{{TotalPrice / 100}}元</em></span>
62
+              <span>合计:<em>{{TotalPrice}}牛币</em></span>
63 63
             </div>
64 64
           </div>
65 65
           <a @click="SendMoney" :class="{'active': !DataLock}">{{DataLock ? '正在提交' : '派奖'}}</a>

+ 2
- 2
src/pages/PaiJiang/PaiJiangJiLu/index.vue Прегледај датотеку

@@ -37,13 +37,13 @@
37 37
                         <span class="flex-item">{{item.customerBetting.lotteryName}}</span>
38 38
                         <span>{{item.customerBetting.notesNum}}注</span>
39 39
                         <span>{{item.customerBetting.bettingTimes}}倍</span>
40
-                        <span><em>{{item.customerBetting.totalPrice / 100}}</em>元</span>
40
+                        <span><em>{{item.customerBetting.totalPrice}}</em>牛币</span>
41 41
                       </div>
42 42
                       <span>订单编号:{{item.orderId}}</span>
43 43
                       <span>出票时间:{{ToolClass.DateFormat(item.createDate)}}</span>
44 44
                       <div class="Res">
45 45
                         <span v-if="item.customerBetting.lotteryId === 'basketball' || item.customerBetting.lotteryId === 'football'">过关方式:{{item.customerBetting.bettingPlan.passName}}</span>
46
-                        <span>奖金:<em>{{item.customerBetting.winAmount / 100}}元</em></span>
46
+                        <span>奖金:<em>{{item.customerBetting.winAmount}}牛币</em></span>
47 47
                       </div>
48 48
                     </router-link>
49 49
                   </li>

+ 3
- 3
src/pages/WoDe/PaiJiangGuanLi/index.vue Прегледај датотеку

@@ -37,13 +37,13 @@
37 37
                         <span class="flex-item">竞足胜平负</span>
38 38
                         <span>1注</span>
39 39
                         <span>1倍</span>
40
-                        <span><em>2.00</em></span>
40
+                        <span><em>2.00</em>牛币</span>
41 41
                       </div>
42 42
                       <span>订单编号:TE20200810000146179970</span>
43 43
                       <span>出票时间:2020-08-10 15:10:10</span>
44 44
                       <div class="Res">
45 45
                         <span>过关方式:2串1</span>
46
-                        <span>奖金:<em>5.20</em></span>
46
+                        <span>奖金:<em>5.20牛币</em></span>
47 47
                       </div>
48 48
                     </div>
49 49
                   </li>
@@ -59,7 +59,7 @@
59 59
           <span>全选</span>
60 60
           <div class="flex-item">
61 61
             <div>
62
-              <span>合计:<em>5.20</em></span>
62
+              <span>合计:<em>5.20牛币</em></span>
63 63
             </div>
64 64
           </div>
65 65
           <a>派奖</a>

+ 2
- 2
src/pages/WoDe/PaiJiangJiLu/index.vue Прегледај датотеку

@@ -26,13 +26,13 @@
26 26
                         <span class="flex-item">竞足胜平负</span>
27 27
                         <span>1注</span>
28 28
                         <span>1倍</span>
29
-                        <span><em>2.00</em></span>
29
+                        <span><em>2.00</em>牛币</span>
30 30
                       </div>
31 31
                       <span>订单编号:TE20200810000146179970</span>
32 32
                       <span>出票时间:2020-08-10 15:10:10</span>
33 33
                       <div class="Res">
34 34
                         <span>过关方式:2串1</span>
35
-                        <span>奖金:<em>5.20</em></span>
35
+                        <span>奖金:<em>5.20牛币</em></span>
36 36
                       </div>
37 37
                     </div>
38 38
                   </li>

+ 2
- 2
src/pages/index/DingDanChaXun/index.vue Прегледај датотеку

@@ -13,11 +13,11 @@
13 13
                       <span>竞足让球胜平负 <em>| 跟单</em></span>
14 14
                     </div>
15 15
                   </div>
16
-                  <span class="Grey">奖金:<em>5.20</em></span>
16
+                  <span class="Grey">奖金:<em>5.20</em>牛币</span>
17 17
                   <span>已出票</span>
18 18
                 </div>
19 19
                 <span>订单编号:TE20200810000146179970</span>
20
-                <span><em>2.00</em>下单时间:2020-08-20 15:30:22</span>
20
+                <span><em>2.00牛币</em>下单时间:2020-08-20 15:30:22</span>
21 21
               </li>
22 22
             </ul>
23 23
           </div>

+ 14
- 9
src/pages/index/DingDanXiangQing/index.vue Прегледај датотеку

@@ -52,7 +52,7 @@
52 52
         </div>
53 53
 
54 54
         <div class="Bottom">
55
-          <a @click="ToProcessOrder" v-if="!DetailInfo.bettingDetail.betting.isDrawn" class="active">出票</a>
55
+          <a @click="ToProcessOrder" v-if="!DetailInfo.bettingDetail.betting.isDrawn" class="active">确定</a>
56 56
           <a :href="`/api/shop/sent-award/order/${$route.query.id}?returlURL=${encodeURIComponent(`${Origin}/#/PaiJiang/PaiJiangGuanLi`)}&token=${Jwt}`" v-if="DetailInfo.bettingDetail.betting.isDrawn && DetailInfo.bettingDetail.betting.isWinning && !DetailInfo.bettingDetail.betting.isCashed" class="active">派奖</a>
57 57
           <!-- <a v-else>撤单</a> -->
58 58
         </div>
@@ -115,14 +115,19 @@ export default {
115 115
       })
116 116
     },
117 117
     ToProcessOrder () { // 出票
118
-      if (this.DataLock || !this.CpImgArr.length) return
119
-      this.DataLock = true
120
-      this.ProcessOrder({ data: { lotteryPicture: this.CpImgArr[0], orderId: this.DetailInfo.orderId } }).then((res) => {
121
-        this.Toast(res.data.message)
122
-        this.DetailInfo.status = 1
123
-        this.DataLock = false
124
-      }).catch(() => {
125
-        this.DataLock = false
118
+      this.Dialog.confirm({
119
+        title: '',
120
+        message: '确认完成此单 ?'
121
+      }).then(() => {
122
+        if (this.DataLock) return
123
+        this.DataLock = true
124
+        this.ProcessOrder({ data: { lotteryPicture: this.CpImgArr.length ? this.CpImgArr[0] : null, orderId: this.DetailInfo.orderId } }).then((res) => {
125
+          this.Toast(res.data.message)
126
+          this.DetailInfo.status = 1
127
+          this.DataLock = false
128
+        }).catch(() => {
129
+          this.DataLock = false
130
+        })
126 131
       })
127 132
     },
128 133
     DeleteCpImg (index) {

+ 2
- 2
src/pages/index/ShouYe/index.vue Прегледај датотеку

@@ -41,8 +41,8 @@
41 41
                           </div>
42 42
                         </div>
43 43
                         <div class="Count flex-h">
44
-                          <span class="flex-item" v-if="item.customerBetting.lotteryId !== 'football' && item.customerBetting.lotteryId !== 'basketball'"><em>1</em>注<em>1</em>倍<em>2.00</em></span>
45
-                          <span class="flex-item" v-else>{{item.customerBetting.notesNum}}注{{item.customerBetting.totalPrice / 100}}元</span>
44
+                          <span class="flex-item" v-if="item.customerBetting.lotteryId !== 'football' && item.customerBetting.lotteryId !== 'basketball'"><em>1</em>注<em>1</em>倍<em>2.00</em>牛币</span>
45
+                          <span class="flex-item" v-else>{{item.customerBetting.notesNum}}注{{item.customerBetting.totalPrice}}牛币</span>
46 46
                           <span v-if="item.customerBetting.lotteryId !== 'football' && item.customerBetting.lotteryId !== 'basketball'">第{{item.customerBetting.issueNo}}期</span>
47 47
                           <span>{{ToolClass.DateFormat(item.customerBetting.createDate)}}</span>
48 48
                         </div>

+ 1
- 1
src/util/Area.js Прегледај датотеку

@@ -22,7 +22,7 @@ const AreaColumns = {
22 22
   "广西壮族自治区": ["南宁市", "柳州市", "桂林市", "梧州市", "北海市", "防城港市", "钦州市", "贵港市", "玉林市", "百色市", "贺州市", "河池市", "来宾市", "崇左市"],
23 23
   "海南省": ["海口市", "三亚市", "三沙市", "儋州市", "省直辖县"],
24 24
   "重庆市": ["重庆市", "县"],
25
-  "四川省": ["成都市", "自贡市", "攀枝花市", "泸州市", "德阳市", "绵阳市", "广市", "遂宁市", "内江市", "乐山市", "南充市", "眉山市", "宜宾市", "广安市", "达州市", "雅安市", "巴中市", "资阳市", "阿坝藏族羌族自治州", "甘孜藏族自治州", "凉山彝族自治州"],
25
+  "四川省": ["成都市", "自贡市", "攀枝花市", "泸州市", "德阳市", "绵阳市", "广牛币市", "遂宁市", "内江市", "乐山市", "南充市", "眉山市", "宜宾市", "广安市", "达州市", "雅安市", "巴中市", "资阳市", "阿坝藏族羌族自治州", "甘孜藏族自治州", "凉山彝族自治州"],
26 26
   "贵州省": ["贵阳市", "六盘水市", "遵义市", "安顺市", "毕节市", "铜仁市", "黔西南布依族苗族自治州", "黔东南苗族侗族自治州", "黔南布依族苗族自治州"],
27 27
   "云南省": ["昆明市", "曲靖市", "玉溪市", "保山市", "昭通市", "丽江市", "普洱市", "临沧市", "楚雄彝族自治州", "红河哈尼族彝族自治州", "文山壮族苗族自治州", "西双版纳傣族自治州", "大理白族自治州", "德宏傣族景颇族自治州", "怒江傈僳族自治州", "迪庆藏族自治州"],
28 28
   "西藏自治区": ["拉萨市", "日喀则市", "昌都市", "林芝市", "山南市", "那曲市", "阿里地区"],

+ 1
- 1
src/util/PublicMethod.js Прегледај датотеку

@@ -4,7 +4,7 @@ import qs from 'qs'
4 4
 const ToolClass = {
5 5
   ReplaceURLParams (url, params) {
6 6
     const args = { ...(params || {}), org: 'MQ' }
7
-    return Object.keys(args).reduce((acc, k) => { // 此方法对每个素进行处理
7
+    return Object.keys(args).reduce((acc, k) => { // 此方法对每个牛币素进行处理
8 8
       const re = new RegExp(`:${k}(?!w)`, 'i')
9 9
       return acc.replace(re, args[k])
10 10
     }, url)