518

project.config.json

@@ -160,6 +160,7 @@
                     "id": -1,
                     "name": "确认订单",
                     "pathName": "/pages/confirmorder",
+                    "query": "caseId=2248&boxIds=2251%2C2257%2C2275%2C2281",
                     "scene": null
                 },
                 {

src/components/CardCase.vue

@@ -26,17 +26,17 @@
 
                 <div class="content">
                     <div class="card" v-for="(card, index) in cardList" :key="index">
-                        <div class="card-title">第{{ getNumStr(index + 1) }}组</div>
+                        <div class="card-title">第{{ index + 1 }}组</div>
                         <div class="card-list">
                             <div
                                 v-for="(item, itemIndex) in card"
                                 :key="item.id"
                                 class="card-item"
                                 :class="{
-                                    used: item.caseStatus !== 'WAIT' || item.userId,
+                                    used: item.caseStatus !== ('WAIT' || 'PROGRESS') || item.userId,
                                     active: nowChoose.includes(item.id)
                                 }"
-                                @click="choose(item.id, item.caseStatus !== 'WAIT' || item.userId)"
+                                @click="choose(item.id, item.caseStatus !== ('WAIT' || 'PROGRESS') || item.userId)"
                             >
                                 {{ itemIndex + 1 }}
                             </div>
@@ -116,14 +116,11 @@ export default {
             if (used) {
                 return;
             }
-            console.log(id);
             let list = [...this.nowChoose];
             if (list.includes(id)) {
                 list.splice(list.indexOf(id), 1);
-            } else if (list.length < 6) {
-                list.push(id);
             } else {
-                this.toast('最多选择六张');
+                list.push(id);
             }
             this.nowChoose = list;
         },
@@ -132,16 +129,40 @@ export default {
                 this.toast('请选择卡牌');
                 return;
             }
-            this.$emit('update:chooseIds', this.nowChoose);
-            this.show = false;
-            if (this.buy) {
-                this.$emit('buy');
-            }
+            let caseId = this.cardCaseInfo.cardCaseId;
+            let boxIds = this.nowChoose.join(',');
+            this.$http
+                .get('/orderInfo/checkBox', {
+                    caseId,
+                    boxIds
+                })
+                .then(res => {
+                    let checkResult = false;
+                    checkResult = res;
+                    if (!checkResult) {
+                        this.toast('该卡箱需要两个卡包组选择数量一样.');
+                        return Promise.reject();
+                    } else {
+                        return Promise.resolve();
+                    }
+                })
+                .then(res => {
+                    this.$emit('update:chooseIds', this.nowChoose);
+                    this.show = false;
+                    if (this.buy) {
+                        this.$emit('buy');
+                    }
+                })
+                .catch(e => {
+                    wx.hideLoading();
+                    if (e.error) {
+                        wx.showToast({
+                            icon: 'none',
+                            title: e.error
+                        });
+                    }
+                });
         }
-        // getChart(index) {
-        //     const list = ['1', '2', '3', '4', '5', '6'];
-        //     return list[index];
-        // }
     }
 };
 </script>
@@ -227,17 +248,13 @@ export default {
     color: #939599;
     line-height: 24px;
 }
-.card-list {
-    margin: 5px;
-}
 .card {
     background-color: @bg;
     padding: 12px 16px;
     border-radius: 8px;
-    min-height: 80px;
     .card-list {
         .flex();
-
+        flex-wrap: wrap;
         .card-item {
             width: 42px;
             height: 42px;
@@ -248,7 +265,7 @@ export default {
             text-align: center;
             color: #000000;
             line-height: 42px;
-
+            margin-top: 10px;
             &.used {
                 background-color: #939599;
                 color: #ffffff;
@@ -262,6 +279,10 @@ export default {
             &:active {
                 opacity: 0.8;
             }
+
+            &:nth-child(6n + 1) {
+                margin-left: 0 !important;
+            }
         }
 
         .card-item + .card-item {

src/components/ProductInfo.vue

@@ -112,6 +112,7 @@ export default {
     align-self: stretch;
     .flex-col();
     position: relative;
+    overflow: hidden;
     .text1 {
         font-size: 16px;
         font-weight: bold;

src/pages/Applydetails.vue

@@ -9,7 +9,10 @@
         <div class="top">
             <img src="../native/imgs/icon_tuikuan_chenggong@3x.png" alt="" />
             <p>退款成功</p>
-            <span>申请成功，退款将在72小时内按照原支付渠道返回，请注意查收</span>
+            <span
+                >申请成功，退款将在72小时内按照原支付
+                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;渠道返回，请注意查收</span
+            >
         </div>
     </div>
 </template>
@@ -37,7 +40,6 @@ export default {
         }
         span {
             width: 255px;
-            height: 48px;
             font-size: 14px;
             font-weight: 400;
             color: #939599;

src/pages/confirmorder.vue

@@ -150,9 +150,11 @@ export default {
                 });
         },
         getFn() {
+            console.log(this.$mp.query.boxIds);
             this.showLoading();
             let caseId = this.$mp.query.caseId;
-            let boxIds = this.$mp.query.boxIds;
+            let boxIds = this.$mp.query.boxIds.replace(/%2C/g, ',');
+            console.log(boxIds);
             this.$http
                 .get('/orderInfo/showPreview', {
                     caseId,
@@ -231,8 +233,7 @@ export default {
     }
     .box-address {
         .box-lr {
-            display: flex;
-            align-items: center;
+            .flex();
             justify-content: space-between;
             margin: 0 23px;
             height: 120px;
@@ -291,8 +292,7 @@ export default {
         background: #ffffff;
     }
     .box-tit {
-        display: flex;
-        align-items: center;
+        .flex();
         margin: 20px 0 0 20px;
         img {
             width: 17px;
@@ -332,12 +332,11 @@ export default {
                 }
             }
             .box-con-today {
-                display: flex;
+                .flex();
                 height: 30px;
                 background: #f5f7fa;
                 border-radius: 6px;
                 width: 142px;
-                align-items: center;
                 p {
                     height: 24px;
                     font-size: 14px;
@@ -347,8 +346,7 @@ export default {
                 }
             }
             .box-con-money {
-                display: flex;
-                align-items: center;
+                .flex();
                 justify-content: space-between;
                 margin-top: 28px;
                 .box-con-num {
@@ -379,8 +377,7 @@ export default {
     .box-buttom {
         margin: 35px 20px;
         .box-buttom-con {
-            display: flex;
-            align-items: center;
+            .flex();
             justify-content: space-between;
             p {
                 height: 20px;