xcx 4 年 前
コミット
a364d277f6
共有3 個のファイルを変更した73 個の追加69 個の削除を含む
  1. 1
    1
      src/assets/css/reset.scss
  2. 26
    23
      src/pages/index/DingDanXiangQing/index.vue
  3. 46
    45
      src/pages/index/DingDanXiangQing/page.scss

+ 1
- 1
src/assets/css/reset.scss ファイルの表示

@@ -17,7 +17,7 @@ body {
17 17
     -webkit-tap-highlight-color: rgba(255, 0, 0, 0);
18 18
     -webkit-font-smoothing: antialiased;
19 19
     -moz-osx-font-smoothing: grayscale;
20
-    color: #333;
20
+    // color: #333;
21 21
     font-size: .13rem;
22 22
   }
23 23
 

+ 26
- 23
src/pages/index/DingDanXiangQing/index.vue ファイルの表示

@@ -39,14 +39,15 @@
39 39
         <div class="PhotoInfo">
40 40
           <span>彩票照片</span>
41 41
           <div v-if="!DetailInfo.bettingDetail.betting.isDrawn && DetailInfo.bettingDetail.betting.status - 0 !== 2">
42
-            <a class="Add" @click="$refs.VantFile.click()">
42
+            <van-uploader v-model="VantFileList" :after-read="AfterRead" @delete="ImgDelete" />
43
+            <!-- <a class="Add" @click="$refs.VantFile.click()">
43 44
               <i class="iconfont iconjia centerLabel"></i>
44 45
             </a>
45 46
             <van-uploader style="overflow: hidden;position: absolute;top: 0;left: 0;opacity: 0;" ref="VantFile" :after-read="CpFileChange" v-model="CpImgArr" :preview-image="false"></van-uploader>
46 47
             <div v-for="(item, index) in CpImgArr" :key="index">
47 48
               <img :src="item.content" class="centerLabel contain" alt="" @click="CheckBigImg(item)">
48 49
               <a class="iconfont iconguanbi" @click="DeleteCpImg(index)"></a>
49
-            </div>
50
+            </div> -->
50 51
             <!-- <input type="file" ref="CpFile" @change="CpFileChange" style="display: none" accept="image/*"> -->
51 52
           </div>
52 53
           <img v-else v-for="(item, index) in (DetailInfo.bettingDetail.betting.lotteryPicture || '').split(',')" :src="item" :key="index" width="100%" style="margin-top: 0.15rem" alt="">
@@ -83,6 +84,7 @@ export default {
83 84
   name: 'index',
84 85
   data () {
85 86
     return {
87
+      ResImgArr: [],
86 88
       VantFileList: [],
87 89
       BigImgUrl: null,
88 90
       ShowBigImg: false,
@@ -126,6 +128,18 @@ export default {
126 128
         this.DetailInfo = res.data.data
127 129
       })
128 130
     },
131
+    ImgDelete (file, target) {
132
+      this.ResImgArr.splice(target.index, 1)
133
+    },
134
+    AfterRead (file) {
135
+      file.status = 'uploading'
136
+      file.message = '上传中...'
137
+
138
+      this.UploadBase64Img({ data: { image: file.content } }).then((res) => {
139
+        this.ResImgArr.push(res.data.data)
140
+        file.status = 'done'
141
+      })
142
+    },
129 143
     CheckBigImg (item) {
130 144
       this.BigImgUrl = item.content
131 145
       this.ShowBigImg = true
@@ -141,7 +155,7 @@ export default {
141 155
       })
142 156
     },
143 157
     ToProcessOrder () { // 出票
144
-      if (!this.CpImgArr.length) {
158
+      if (!this.ResImgArr.length) {
145 159
         this.Toast('请先上传出票图片')
146 160
         return false
147 161
       }
@@ -151,26 +165,15 @@ export default {
151 165
       }).then(() => {
152 166
         if (this.DataLock) return
153 167
         this.DataLock = true
154
-        let Arr = []
155
-        this.CpImgArr.map((item) => {
156
-          this.UploadBase64Img({ data: { image: item.content } }).then((res) => {
157
-            Arr.push(res.data.data)
158
-            if (Arr.length === this.CpImgArr.length) {
159
-              console.log(`开始出票,时间是${Date.now()}`)
160
-              this.ProcessOrder({ data: { lotteryPicture: Arr.length ? Arr.join(',') : null, orderId: this.DetailInfo.orderId } }).then((res) => {
161
-                this.Toast('出票成功')
162
-                console.log(`出票成功,时间是${Date.now()}`)
163
-                this.DetailInfo.status = 1
164
-                this.DetailInfo.bettingDetail.betting.isDrawn = true
165
-                this.DataLock = false
166
-                this.$router.go(-1)
167
-              }).catch((res) => {
168
-                console.log(`出票失败,时间是${Date.now()}`)
169
-                this.Toast(res.data.message)
170
-                this.DataLock = false
171
-              })
172
-            }
173
-          })
168
+        this.ProcessOrder({ data: { lotteryPicture: this.ResImgArr.length ? this.ResImgArr.join(',') : null, orderId: this.DetailInfo.orderId } }).then((res) => {
169
+          this.Toast('出票成功')
170
+          this.DetailInfo.status = 1
171
+          this.DetailInfo.bettingDetail.betting.isDrawn = true
172
+          this.DataLock = false
173
+          this.$router.go(-1)
174
+        }).catch((res) => {
175
+          this.Toast(res.data.message)
176
+          this.DataLock = false
174 177
         })
175 178
       })
176 179
     },

+ 46
- 45
src/pages/index/DingDanXiangQing/page.scss ファイルの表示

@@ -23,52 +23,53 @@
23 23
         display: block;
24 24
       }
25 25
       > div {
26
-        font-size: 0;
27 26
         margin-top: 0.15rem;
28
-        position: relative;
29
-        > a.Add {
30
-          display: inline-block;
31
-          vertical-align: middle;
32
-          width: 0.6rem;
33
-          height: 0.6rem;
34
-          border: 0.01rem dashed #ccc;
35
-          position: relative;
36
-          overflow: hidden;
37
-          margin-right: 0.1rem;
38
-          margin-bottom: 0.1rem;
39
-          > i {
40
-            font-size: 0.22rem;
41
-            color: #ccc;
42
-          }
43
-        }
44
-        > div {
45
-          display: inline-block;
46
-          vertical-align: middle;
47
-          width: 0.62rem;
48
-          height: 0.62rem;
49
-          position: relative;
50
-          overflow: visible;
51
-          background: #ccc;
52
-          margin-right: 0.1rem;
53
-          margin-bottom: 0.1rem;
54
-          > img {
55
-            z-index: 1;
56
-          }
57
-          > a {
58
-            display: inline-block;
59
-            position: absolute;
60
-            font-size: 0.1rem;
61
-            width: 0.16rem;
62
-            line-height: 0.16rem;
63
-            text-align: center;
64
-            color: #fff;
65
-            border-radius: 100%;
66
-            background: #d91e36;
67
-            right: -0.04rem;
68
-            top: -0.04rem;
69
-            z-index: 2;
70
-          }
71
-        }
27
+        // font-size: 0;
28
+        // margin-top: 0.15rem;
29
+        // position: relative;
30
+        // > a.Add {
31
+        //   display: inline-block;
32
+        //   vertical-align: middle;
33
+        //   width: 0.6rem;
34
+        //   height: 0.6rem;
35
+        //   border: 0.01rem dashed #ccc;
36
+        //   position: relative;
37
+        //   overflow: hidden;
38
+        //   margin-right: 0.1rem;
39
+        //   margin-bottom: 0.1rem;
40
+        //   > i {
41
+        //     font-size: 0.22rem;
42
+        //     color: #ccc;
43
+        //   }
44
+        // }
45
+        // > div {
46
+        //   display: inline-block;
47
+        //   vertical-align: middle;
48
+        //   width: 0.62rem;
49
+        //   height: 0.62rem;
50
+        //   position: relative;
51
+        //   overflow: visible;
52
+        //   background: #ccc;
53
+        //   margin-right: 0.1rem;
54
+        //   margin-bottom: 0.1rem;
55
+        //   > img {
56
+        //     z-index: 1;
57
+        //   }
58
+        //   > a {
59
+        //     display: inline-block;
60
+        //     position: absolute;
61
+        //     font-size: 0.1rem;
62
+        //     width: 0.16rem;
63
+        //     line-height: 0.16rem;
64
+        //     text-align: center;
65
+        //     color: #fff;
66
+        //     border-radius: 100%;
67
+        //     background: #d91e36;
68
+        //     right: -0.04rem;
69
+        //     top: -0.04rem;
70
+        //     z-index: 2;
71
+        //   }
72
+        // }
72 73
       }
73 74
     }
74 75
     > .Tips {