0508

project.config.json

@@ -131,6 +131,18 @@
                     "name": "首页",
                     "pathName": "/pages/Home",
                     "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "拼箱详情",
+                    "pathName": "/pages/details",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "收货地址",
+                    "pathName": "/pages/add",
+                    "scene": null
                 }
             ]
         }

src/pages/add.vue

@@ -8,40 +8,21 @@
 </config>
 <template>
     <div class="container">
-        <div class="box">
+        <div class="box" v-for="(item, index) in addressList" :key="index">
             <div class="box-con">
                 <div @click="add">
                     <div class="box-con-top">
                         <p>收货人</p>
-                        <span class="box-con-span">小明</span>
-                        <span class="box-con-code">17635849638</span>
+                        <span class="box-con-span">{{ item.name }}</span>
+                        <span class="box-con-code">{{ item.phone }}</span>
                     </div>
                     <div class="box-con-top">
                         <p>收货地址</p>
-                        <span class="box-con-sp">江苏 南京 玄武区 中山路18号德基广场二楼216</span>
+                        <span class="box-con-sp">{{ item.city + item.province + item.district + item.detail }}</span>
                     </div>
                 </div>
                 <div class="box-con-buttom">
-                    <div class="box-con-default">默认</div>
-                    <div class="box-con-edit">编辑</div>
-                </div>
-            </div>
-        </div>
-        <div class="box">
-            <div class="box-con">
-                <div @click="add">
-                    <div class="box-con-top">
-                        <p>收货人</p>
-                        <span class="box-con-span">小明</span>
-                        <span class="box-con-code">17635849638</span>
-                    </div>
-                    <div class="box-con-top">
-                        <p>收货地址</p>
-                        <span class="box-con-sp">江苏 南京 玄武区 中山路18号德基广场二楼216</span>
-                    </div>
-                </div>
-                <div class="box-con-buttom">
-                    <div class="box-con-default">默认</div>
+                    <div class="box-con-default" v-if="item.enabled == true">默认</div>
                     <div class="box-con-edit">编辑</div>
                 </div>
             </div>
@@ -54,9 +35,17 @@
 <script>
 export default {
     data() {
-        return {};
+        return {
+            addressList: []
+        };
     },
     methods: {
+        addRess() {
+            this.$http.get('/address/showMy').then(res => {
+                console.log(res);
+                this.addressList = res;
+            });
+        },
         address() {
             console.log(111);
             wx.redirectTo({
@@ -69,6 +58,9 @@ export default {
                 url: './address'
             });
         }
+    },
+    created() {
+        this.addRess();
     }
 };
 </script>
@@ -76,6 +68,7 @@ export default {
 .container {
     background: #f5f7fa;
     padding-top: 8px;
+    padding-bottom: 100px;
     .box {
         padding: 8px 20px;
         .box-con {
@@ -99,7 +92,6 @@ export default {
                     font-weight: bold;
                     color: #000000;
                     line-height: 24px;
-                    margin-left: 2px;
                 }
                 .box-con-code {
                     height: 24px;
@@ -115,7 +107,6 @@ export default {
                     font-weight: bold;
                     color: #000000;
                     line-height: 24px;
-                    margin-left: 12px;
                 }
             }
             .box-con-buttom {

src/pages/address.vue

@@ -60,7 +60,7 @@
         <div class="box-buttom">
             <div class="box-buttom-con">
                 <p>订单留言</p>
-                <form class="box-buttom-p2" action="">选填，备注对本次交易的说明</form>
+                <div class="box-buttom-p2">选填，备注对本次交易的说明</div>
             </div>
         </div>
         <div class="box-total">

src/pages/details.vue

@@ -17,23 +17,24 @@
                 <img src="../static/imgs/3.jpeg" alt="" />
             </swiper-item>
         </swiper>
-        <div class="box-tit">{{ detailsList.cardCaseInfo.caseName }}</div>
+        <div class="box-tit">{{ cardCaseInfo.caseName }}</div>
+
         <div class="box-live">
             <img src="../native/imgs/icon_kapai_zhibo@3x.png" alt="" />
             <p>直播未开始</p>
         </div>
         <div class="box-money">
             <img src="../static/imgs/icon_jiage@3x.png" alt="" />
-            <p>{{ detailsList.cardCaseInfo.price }}</p>
+            <p>{{ cardCaseInfo.price }}</p>
         </div>
         <div class="box-con">
             <div class="box-con-left">
                 <p>距拼箱结束</p>
-                <span>{{ detailsList.cardCaseInfo.endTime }}</span>
+                <span>{{ cardCaseInfo.endTime }}</span>
             </div>
             <div class="box-con-right">
                 <p>拼箱进度</p>
-                <span>{{ detailsList.cardCaseInfo.preorder }}</span>
+                <span>{{ cardCaseInfo.preorder }}</span>
             </div>
         </div>
         <div class="box-con2">
@@ -69,15 +70,14 @@
             <van-action-sheet :show="show" title="选择卡包">
                 <!-- <view>选择卡包</view> -->
                 <div class="van-box" @click="alls(item)" v-for="(item, index) in list" :key="index">
-                    <p class="van-box-p">卡包 {{ index + 1 }}</p>
+                    <p class="van-box-p">卡包 {{ item[0].boxCode }}</p>
                     <div class="van-con">
-                        <div class="van-con-div">{{ item }}</div>
-                        <div class="van-con-div">{{ item }}</div>
-                        <div class="van-con-div">{{ item }}</div>
-                        <div class="van-con-div">{{ item }}</div>
-                        <div class="van-con-div">{{ item }}</div>
-                        <div class="van-con-div">{{ item }}</div>
-                        <div class="van-con-div">{{ item }}</div>
+                        <!-- <div class="van-con-div">{{ item.cardCaseId }}</div>
+                        <div class="van-con-div">{{ item.groupCode }}</div>
+                        <div class="van-con-div">{{ item.cardCaseId }}</div>
+                        <div class="van-con-div">{{ item.cardCaseId }}</div>
+                        <div class="van-con-div">{{ item.cardCaseId }}</div>
+                        <div class="van-con-div">{{ item.cardCaseId }}</div> -->
                     </div>
                 </div>
                 <div class="van-btn">
@@ -109,8 +109,8 @@ export default {
         return {
             show: false,
             selman: '',
-            list: ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H'],
-            detailsList: []
+            list: [],
+            cardCaseInfo: {}
         };
     },
     methods: {
@@ -138,6 +138,8 @@ export default {
             this.$http.get('/cardCase/showInfoMA?caseId=' + this.$mp.query.id).then(res => {
                 console.log(res);
                 this.detailsList = res;
+                this.cardCaseInfo = res.cardCaseInfo || {};
+                this.list = res.cardCaseInfo;
             });
         }
     },

src/pages/order.vue

@@ -92,7 +92,7 @@
             <div class="box-footer-con">
                 <p>订单编号</p>
                 <div class="box-footer-cr">
-                    <span>复制</span>
+                    <span @click="copy">复制</span>
                     <p class="box-footer-p">2019052035464</p>
                 </div>
             </div>
@@ -170,6 +170,20 @@ export default {
         logistics() {
             this.show = true;
             console.log(this.steps);
+        },
+        copy() {
+            // wx.setClipboardData({
+            //     data: this.orderInfo.id + '',
+            //     success(res) {
+            //         wx.getClipboardData({
+            //             success(res) {
+            //                 wx.showToast({
+            //                     title: '复制成功'
+            //                 });
+            //             }
+            //         });
+            //     }
+            // });
         }
     }
 };

src/pages/receiving.vue

@@ -33,26 +33,27 @@
                 label="地区"
             />
             <van-field
-                :value="form.address"
-                @input="form.address = $event.detail"
+                :value="form.detail"
+                @input="form.detail = $event.detail"
                 placeholder="请填写您的详细地址"
                 :border="false"
                 label="详细地址"
                 type="textarea"
-                :autosize="{ maxHeight: 100, minHeight: 56 }"
             />
         </van-cell-group>
         <div class="box-but">
             <div class="box-img">
-                <img src="/native/tabbar/icon_weixuanzhong@2x.png" alt="" />
-                <p>设为默认地址</p>
-            </div>
-            <!-- <div class="default">
+                <img
+                    :checked="form.isDefault"
+                    @change="form.isDefault = $event.detail"
+                    src="/native/tabbar/icon_weixuanzhong@2x.png"
+                    alt=""
+                />
                 <div class="label">设为默认地址</div>
-                <van-switch active-color="#FF7F1F" :checked="form.isDefault" @change="form.isDefault = $event.detail" />
-            </div> -->
+                <!-- <van-switch active-color="#FF7F1F" :checked="form.isDefault" @change="form.isDefault = $event.detail" /> -->
+            </div>
             <div class="box-but-con">
-                <div class="container-but" @click="address">确认</div>
+                <div class="container-but" @click="addRess">确认</div>
                 <div class="container-cancel">获取微信地址</div>
             </div>
         </div>
@@ -72,10 +73,11 @@ export default {
     data() {
         return {
             form: {
+                isDefault: false,
                 name: '',
                 phone: '',
                 city: '',
-                address: '',
+                detail: '',
                 province: '',
                 district: ''
             }
@@ -87,7 +89,7 @@ export default {
         }
     },
     methods: {
-        address() {
+        addRess() {
             if (!this.form.name) {
                 wx.showToast({
                     icon: 'none',
@@ -109,7 +111,7 @@ export default {
                 });
                 return;
             }
-            if (!this.form.address) {
+            if (!this.form.detail) {
                 wx.showToast({
                     icon: 'none',
                     title: '详细地址不能为空'
@@ -125,7 +127,7 @@ export default {
                 .post('/address/save', form, { body: 'json' })
                 .then(res => {
                     console.log(res);
-                    // wx.hideLoading();
+                    wx.hideLoading();
                     wx.showToast({
                         title: '保存成功'
                     });
@@ -136,7 +138,7 @@ export default {
                     }, 1500);
                 })
                 .catch(e => {
-                    // wx.hideLoading();
+                    wx.hideLoading();
                     wx.showToast({
                         icon: 'none',
                         title: e.error
@@ -151,7 +153,7 @@ export default {
     .box-but {
         background: #f5f7fa;
         width: 100%;
-        height: 600px;
+        height: 500px;
         .box-img {
             display: flex;
             align-items: center;
@@ -159,6 +161,7 @@ export default {
             img {
                 width: 16px;
                 height: 16px;
+                margin-right: 10px;
             }
             p {
                 height: 18px;
@@ -177,7 +180,6 @@ export default {
                 height: 48px;
                 background: #ff6c00;
                 border-radius: 12px;
-                opacity: 0.3;
                 font-size: 16px;
                 font-weight: 400;
                 color: #ffffff;