Merge branch 'master' of http://git.izouma.com/panhui/card-wechat

src/components/CardCase.vue

@@ -102,13 +102,15 @@ export default {
     data() {
         return {
             show: false,
-            nowChoose: []
+            nowChoose: [],
+            buy: false
         };
     },
     methods: {
-        init() {
+        init(type) {
             this.nowChoose = [...this.chooseIds];
             this.show = true;
+            this.buy = type === 'buy';
         },
         choose(id, used = false) {
             if (used) {
@@ -128,6 +130,9 @@ export default {
         submit() {
             this.$emit('update:chooseIds', this.nowChoose);
             this.show = false;
+            if (this.buy) {
+                this.$emit('buy');
+            }
         },
         getChart(index) {
             const list = ['A', 'B', 'C', 'D', 'E', 'F'];

src/pages/details.vue

@@ -68,6 +68,7 @@
                 :chooseIds.sync="chooseIds"
                 :detailsList="detailsList"
                 :cardCaseInfo="cardCaseInfo"
+                @buy="purchase"
             ></card-case>
             <div class="box-footer-con">
                 <div class="box-footer-left">
@@ -132,11 +133,12 @@ export default {
         },
         // 确认订单
         purchase() {
-            if (this.chooseIds == '') {
-                wx.showToast({
-                    icon: 'none',
-                    title: '请选择卡包'
-                });
+            if (this.chooseIds.length === 0) {
+                // wx.showToast({
+                //     icon: 'none',
+                //     title: '请选择卡包'
+                // });
+                this.$refs.cardCase.init('buy');
                 return;
             }
             this.navigateTo(