58

project.config.json

@@ -136,13 +136,19 @@
                     "id": -1,
                     "name": "拼箱详情",
                     "pathName": "/pages/details",
-                    "query":"id=217"
+                    "query": "id=217"
                 },
                 {
                     "id": -1,
                     "name": "收货地址",
                     "pathName": "/pages/add",
                     "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "确认订单",
+                    "pathName": "/pages/address",
+                    "scene": null
                 }
             ]
         }

src/components/CardCase.vue

@@ -32,7 +32,7 @@
 
             <div class="van-btn">
                 <span class="van-cat">已选{{ chooseIds.length }}包，共{{ money }}元，邮费10元</span>
-                <div class="van-buy" type="primary">确认购买</div>
+                <div class="van-buy" type="primary" @click="confirm">确认购买</div>
             </div>
         </div>
     </van-popup>
@@ -59,6 +59,12 @@ export default {
             default: () => {
                 return [];
             }
+        },
+        name: {
+            type: Array,
+            default: () => {
+                return [];
+            }
         }
     },
     computed: {
@@ -105,6 +111,10 @@ export default {
 
             console.log(list);
             this.$emit('update:chooseIds', list);
+        },
+        confirm() {
+            this.$emit('update:name', `已选6包，共1920元，邮费10元`);
+            this.show = false;
         }
     }
 };

src/pages/address.vue

@@ -2,8 +2,6 @@
 {
     "navigationBarTitleText": "确认订单",
     "navigationBarBackgroundColor": "#ffffff",
-    "navigationBarTextStyle": "black",
-    "backgroundTextStyle":"light"
 }
 </config>
 <template>
@@ -96,6 +94,7 @@ export default {
 </script>
 <style lang="less" scoped>
 .container {
+    padding-bottom: 100px;
     // 按钮
     /deep/ .van-button {
         height: 48px;
@@ -105,6 +104,7 @@ export default {
         font-size: 16px;
         font-weight: 400;
         color: #ffffff;
+        margin-right: 16px;
     }
     .box-top {
         height: 44px;
@@ -263,18 +263,19 @@ export default {
         }
     }
     .box-total {
-        margin: 34px 20px 10px 20px;
+        .bottom();
         display: flex;
         height: 60px;
         align-items: center;
         justify-content: space-between;
-        // position: absolute;
-        // bottom: 0;
-        // right: 0;
-        // left: 0;
+        background: #ffffff;
+        width: 100%;
+        position: fixed;
+        bottom: 0;
         .box-con-num {
             display: flex;
             align-items: center;
+            margin-left: 16px;
             span {
                 height: 22px;
                 font-size: 13px;

src/pages/details.vue

@@ -64,7 +64,7 @@
         </div>
         <div class="box-footer">
             <div class="box-cat" @click="$refs.cardCase.show = true">
-                <div>{{ selman ? selman : '请选择卡包' }}</div>
+                <div>{{ name ? name : '请选择卡包' }}</div>
                 <div>></div>
             </div>
             <div class="box-footer-con">
@@ -73,7 +73,7 @@
                         <img src="../static/imgs/icon_kefu@3x.png" alt="" />
                         <p>客服</p>
                     </div>
-                    <div class="box-follow" @click="follows">
+                    <div class="box-follow">
                         <img src="../static/imgs/icon_guanzhu@3x.png" alt="" />
                         <p>关注</p>
                     </div>
@@ -87,6 +87,7 @@
         <card-case
             ref="cardCase"
             :chooseIds.sync="chooseIds"
+            :name.sync="name"
             :detailsList="detailsList"
             :cardCaseInfo="cardCaseInfo"
         ></card-case>
@@ -98,39 +99,30 @@ export default {
     data() {
         return {
             show: false,
-            selman: '',
+            name: '',
             list: [],
             cardCaseInfo: {},
+            id: '',
             chooseIds: []
         };
     },
     methods: {
         address() {
-            console.log(666);
             wx.redirectTo({
                 url: './address'
             });
         },
-        selection() {
-            this.show = true;
-        },
-        buy() {
-            this.show = false;
-        },
-        alls(item) {
-            this.selman = item;
-        },
-        follows() {
-            wx.redirectTo({
-                url: './follow'
-            });
-        },
+        // follows() {
+        //     wx.redirectTo({
+        //         url: './follow'
+        //     });
+        // },
         details() {
             this.$http.get('/cardCase/showInfoMA?caseId=' + this.$mp.query.id).then(res => {
                 console.log(res);
                 this.detailsList = res.groupBoxMap;
                 this.cardCaseInfo = res.cardCaseInfo || {};
-                // this.list = res.cardCaseInfo;
+                this.id = this.cardCaseInfo.cardCaseId;
             });
         }
     },
@@ -153,7 +145,7 @@ export default {
         font-weight: 400;
         color: #ffffff;
     }
-    padding: 15px 20px 145px 20px;
+    padding: 15px 20px 150px 20px;
     img {
         width: 335px;
         height: 335px;
@@ -214,12 +206,12 @@ export default {
             height: 80px;
             background: #ff6c00;
             border-radius: 8px;
-            opacity: 0.7;
+            opacity: 0.5;
             p {
                 height: 22px;
                 font-size: 13px;
                 font-weight: 400;
-                color: rgba(0, 0, 0, 0.3);
+                color: #000;
                 line-height: 22px;
                 text-align: center;
                 margin-top: 15px;
@@ -240,12 +232,12 @@ export default {
             height: 80px;
             background: #ff6c00;
             border-radius: 8px;
-            opacity: 0.7;
+            opacity: 0.5;
             p {
                 height: 22px;
                 font-size: 13px;
                 font-weight: 400;
-                color: rgba(0, 0, 0, 0.3);
+                color: #000;
                 line-height: 22px;
                 text-align: center;
                 margin-top: 15px;
@@ -331,8 +323,7 @@ export default {
         border-radius: 12px;
     }
     .box-footer {
-        width: 100%;
-        height: 82px;
+        .bottom();
         background: #ffffff;
         position: fixed;
         bottom: 0;
@@ -341,7 +332,6 @@ export default {
         .box-cat {
             display: flex;
             justify-content: space-between;
-            margin-right: 44px;
             div {
                 height: 28px;
                 font-size: 16px;

src/pages/order.vue

@@ -193,7 +193,7 @@ export default {
     /deep/ .van-step__circle-container {
         height: 0;
     }
-    padding-bottom: 120px;
+    padding-bottom: 150px;
     .box-top {
         height: 102px;
         background: #ff6c00;
@@ -435,10 +435,10 @@ export default {
         }
     }
     .box-footer-nav {
+        .bottom();
         height: 104px;
         position: fixed;
         bottom: 0;
-        left: 0;
         width: 100%;
         background: #ffffff;
         .box-tit2 {