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

src/components/AllorderInfo.vue

@@ -6,7 +6,7 @@
                     <img src="/native/tabbar/icon_kapai_shangjia_da@3x.png" alt="" />
                     <p>光之城卡牌</p>
                 </div>
-                <div class="box-tit-seller">{{ this.name }}</div>
+                <span>{{ this.name }}</span>
             </div>
             <div class="box-con-Cards" v-for="(item, index) in orderList" :key="index.id" @click="allorder">
                 <img :src="item.images" alt="" />
@@ -35,7 +35,7 @@
                 <div v-if="this.status == 'PAYED'" @click="remind" class="box-but3">提醒发货</div>
                 <div v-if="this.status == 'SEND'" @click="logistics" class="box-but">查看物流</div>
                 <div v-if="this.status == 'SEND'" @click="comfrim" class="box-but2">确认收货</div>
-                <div v-if="this.status == 'COMPETED'" class="box-but">申请售后</div>
+                <div v-if="this.status == 'COMPETED'" @click="sales" class="box-but">申请售后</div>
                 <div v-if="this.status == 'COMPETED'" @click="logistics" class="box-but3">查看物流</div>
                 <div v-if="this.status == 'CANCELED'" @click="deletes" class="box-but">删除订单</div>
                 <div v-if="this.status == 'CANCELED'" @click="again" class="box-but3">重新购买</div>
@@ -145,6 +145,12 @@ export default {
         again() {
             this.navigateTo('/pages/details?id=' + this.caseId);
         },
+        sales() {
+            wx.showToast({
+                title: '敬请开放',
+                icon: 'none'
+            });
+        },
         logisticCopy() {
             wx.setClipboardData({
                 data: this.logisTics.number + '',
@@ -258,22 +264,26 @@ export default {
             });
         },
         Apply() {
-            wx.showModal({
-                title: '提示',
-                content: '敬请开放',
-                success: res => {
-                    if (res.confirm) {
-                        // this.$http.post('orderInfo/refund', { orderInfoId: this.id, remark: '' }).then(res => {
-                        //     wx.hideLoading();
-                        //     wx.showToast({
-                        //         icon: 'none',
-                        //         title: '退款成功'
-                        //     });
-                        //     this.refreash();
-                        // });
-                    }
-                }
+            wx.showToast({
+                title: '敬请开放',
+                icon: 'none'
             });
+            // wx.showModal({
+            //     title: '提示',
+            //     content: '敬请开放',
+            //     success: res => {
+            //         if (res.confirm) {
+            // this.$http.post('orderInfo/refund', { orderInfoId: this.id, remark: '' }).then(res => {
+            //     wx.hideLoading();
+            //     wx.showToast({
+            //         icon: 'none',
+            //         title: '退款成功'
+            //     });
+            //     this.refreash();
+            // });
+            //         }
+            //     }
+            // });
         },
         remind() {
             this.$http.post('orderInfo/remindMy', { orderInfoId: this.id, remark: '' }).then(res => {
@@ -358,12 +368,12 @@ export default {
                     margin-left: 2px;
                 }
             }
-            .box-tit-seller {
+            span {
                 height: 22px;
                 font-size: 14px;
                 font-weight: bold;
-                color: #ff6c00;
                 line-height: 22px;
+                color: #ff6c00;
             }
         }
         .box-con-Cards {

src/pages/allorder.vue

@@ -63,7 +63,6 @@ export default {
             let userId = this.$store.state.userInfo.id;
             this.$http
                 .get('/orderInfo/showMyOrderInfos', {
-                    // orderInfoId: id,
                     orderStatus: this.allStatus(this.active),
                     userId
                 })
@@ -94,8 +93,7 @@ export default {
     background: #f5f7fa;
     padding-top: 30px;
     padding: 60px 0 40px 0;
-    min-height: 610px;
-    // height: 100%;
+    min-height: 624px;
     .box-tab {
         background: #ffffff;
         .flex();

src/pages/confirmorder.vue

@@ -21,7 +21,8 @@
                     <div class="box-con-top">
                         <p>收货地址</p>
                         <span class="box-con-sp">
-                            {{ addressList.province + addressList.city + addressList.district + addressList.detail }}
+                            {{ addressList.province }} {{ addressList.city }} {{ addressList.district }}
+                            {{ addressList.detail }}
                         </span>
                     </div>
                 </div>
@@ -85,7 +86,7 @@
         <div class="box-total">
             <div class="box-con-num">
                 <span>总计</span>
-                <img src="../static/imgs/icon_jiage.png" alt="" />
+                <img src="../static/imgs/icon_jiage@3x.png" alt="" />
                 <p>{{ total }}</p>
             </div>
             <van-button type="warning" @click="order">确认订单</van-button>
@@ -158,6 +159,7 @@ export default {
                     boxIds
                 })
                 .then(res => {
+                    console.log(res);
                     wx.hideLoading();
                     this.total = res.total;
                     this.Boxes = res.selectedBoxes;

src/pages/follow.vue

@@ -22,7 +22,7 @@
                 </div>
                 <div class="box-con-money">
                     <div class="box-con-num">
-                        <img src="../static/imgs/icon_jiage.png" alt="" />
+                        <img src="../static/imgs/icon_jiage@3x.png" alt="" />
                         <p>320</p>
                     </div>
                     <van-button>取消关注</van-button>

src/pages/orderdetails.vue

@@ -34,7 +34,10 @@
                 <div class="box-con-top">
                     <span>{{ this.addressList.name }}</span>
                     <span class="box-con-span">{{ this.addressList.phone }}</span>
-                    <p>{{ addressList.province + addressList.city + addressList.district + addressList.detail }}</p>
+                    <p>
+                        {{ addressList.province }} {{ addressList.city }} {{ addressList.district }}
+                        {{ addressList.detail }}
+                    </p>
                 </div>
             </div>
         </div>
@@ -44,12 +47,12 @@
                 <img src="/native/tabbar/icon_kapai_shangjia_da@3x.png" alt="" />
                 <p>光之城卡牌</p>
             </div>
-            <div class="box-tit-seller">联系卖家</div>
+            <div class="box-tit-seller" @click="seller">联系卖家</div>
         </div>
         <div v-for="(item, index) in Boxes" :key="index.id">
             <div class="box-con">
                 <div class="box-con-Cards">
-                    <img :src="cardCaseInfo.images" alt="" />
+                    <img :src="cardCaseInfo.images[0]" alt="" />
                     <div class="box-con-right">
                         <p class="box-con-tit">{{ cardCaseInfo.name }}</p>
                         <div class="box-con-today">
@@ -136,88 +139,49 @@
             />
             <div class="box-btn">
                 <!-- 已完成 -->
-                <div
-                    v-if="this.status.orderStatus === 'COMPETED'"
-                    class="box-btn-left"
-                    @click="deletes"
-                    :style="{ backgroundImage: `url(/native/imgs/btn_02@3x.png)` }"
-                >
-                    删除订单
+                <div v-if="this.status.orderStatus === 'COMPETED'" class="box-btn-left" @click="deletes">
+                    <img src="/native/imgs/btn_03@3x.png" alt="" />
+                    <span>删除订单</span>
                 </div>
-                <div
-                    v-if="this.status.orderStatus === 'COMPETED'"
-                    class="box-btn-right"
-                    :style="{ backgroundImage: `url(/native/imgs/btn_01@3x.png)` }"
-                >
-                    申请售后
+                <div v-if="this.status.orderStatus === 'COMPETED'" class="box-btn-right" @click="sales">
+                    <img src="/native/imgs/btn_01@4x.png" alt="" />
+                    <span class="box-btn-sp">申请售后</span>
                 </div>
                 <!-- 已发货 -->
-                <div
-                    v-if="this.status.orderStatus === 'SEND'"
-                    class="box-btn-left"
-                    @click="logistics"
-                    :style="{ backgroundImage: `url(/native/imgs/btn_02@3x.png)` }"
-                >
-                    查看物流
+                <div v-if="this.status.orderStatus === 'SEND'" class="box-btn-left" @click="logistics">
+                    <img src="/native/imgs/btn_03@3x.png" alt="" />
+                    <span>查看物流</span>
                 </div>
-                <div
-                    v-if="this.status.orderStatus === 'SEND'"
-                    class="box-btn-right"
-                    @click="comfrim"
-                    :style="{ backgroundImage: `url(/native/imgs/btn_01@3x.png)` }"
-                >
-                    确认收货
+                <div v-if="this.status.orderStatus === 'SEND'" class="box-btn-right" @click="comfrim">
+                    <img src="/native/imgs/btn_01@3x.png" alt="" />
+                    <span>确认收货</span>
                 </div>
                 <!-- 待发货 -->
-                <div
-                    v-if="this.status.orderStatus === 'PAYED'"
-                    class="box-btn-left2"
-                    @click="Apply"
-                    :style="{ backgroundImage: `url(/native/imgs/btn_03@3x.png)` }"
-                >
-                    申请退款
+                <div v-if="this.status.orderStatus === 'PAYED'" class="box-btn-left2" @click="Apply">
+                    <img src="/native/imgs/btn_03@3x.png" alt="" />
+                    <span>申请退款</span>
                 </div>
-                <div
-                    v-if="this.status.orderStatus === 'PAYED'"
-                    class="box-btn-right"
-                    @click="comfrim"
-                    :style="{ backgroundImage: `url(/native/imgs/btn_01@3x.png)` }"
-                >
-                    确认收货
+                <div v-if="this.status.orderStatus === 'PAYED'" class="box-btn-right" @click="comfrim">
+                    <img src="/native/imgs/btn_01@3x.png" alt="" />
+                    <span>确认收货</span>
                 </div>
                 <!-- 待支付 -->
-                <div
-                    v-if="this.status.orderStatus === 'CREATED'"
-                    class="box-btn-left2"
-                    @click="cancel"
-                    :style="{ backgroundImage: `url(/native/imgs/btn_03@3x.png)` }"
-                >
-                    取消订单
+                <div v-if="this.status.orderStatus === 'CREATED'" class="box-btn-left2" @click="cancel">
+                    <img src="/native/imgs/btn_03@3x.png" alt="" />
+                    <span>取消订单</span>
                 </div>
-                <div
-                    v-if="this.status.orderStatus === 'CREATED'"
-                    @click="pay"
-                    class="box-btn-right"
-                    :style="{ backgroundImage: `url(/native/imgs/btn_01@3x.png)` }"
-                >
-                    立即支付
+                <div v-if="this.status.orderStatus === 'CREATED'" class="box-btn-right" @click="pay">
+                    <img src="/native/imgs/btn_01@3x.png" alt="" />
+                    <span>立即支付</span>
                 </div>
                 <!-- 已取消 -->
-                <div
-                    v-if="this.status.orderStatus === 'CANCELED'"
-                    class="box-btn-left2"
-                    @click="deletes"
-                    :style="{ backgroundImage: `url(/native/imgs/btn_03@3x.png)` }"
-                >
-                    删除订单
+                <div v-if="this.status.orderStatus === 'CANCELED'" class="box-btn-left2" @click="deletes">
+                    <img src="/native/imgs/btn_03@3x.png" alt="" />
+                    <span>删除订单</span>
                 </div>
-                <div
-                    v-if="this.status.orderStatus === 'CANCELED'"
-                    class="box-btn-right"
-                    @click="again"
-                    :style="{ backgroundImage: `url(/native/imgs/btn_01@3x.png)` }"
-                >
-                    重新购买
+                <div v-if="this.status.orderStatus === 'CANCELED'" class="box-btn-right" @click="again">
+                    <img src="/native/imgs/btn_01@3x.png" alt="" />
+                    <span>重新购买</span>
                 </div>
             </div>
         </div>
@@ -377,25 +341,41 @@ export default {
                 }
             });
         },
+        sales() {
+            wx.showToast({
+                title: '敬请开放',
+                icon: 'none'
+            });
+        },
+        seller() {
+            wx.showToast({
+                title: '敬请开放',
+                icon: 'none'
+            });
+        },
         Apply() {
-            wx.showModal({
-                title: '提示',
-                content: '敬请开放',
-                success: res => {
-                    if (res.confirm) {
-                        // this.$http.post('orderInfo/refund', { orderInfoId: this.id, remark: '' }).then(res => {
-                        //     wx.hideLoading();
-                        //     wx.showToast({
-                        //         icon: 'none',
-                        //         title: '退款成功'
-                        //     });
-                        //     setTimeout(() => {
-                        //     this.getFn();
-                        // }, 1000);
-                        // });
-                    }
-                }
+            wx.showToast({
+                title: '敬请开放',
+                icon: 'none'
             });
+            // wx.showModal({
+            //     title: '提示',
+            //     content: '敬请开放',
+            //     success: res => {
+            //         if (res.confirm) {
+            // this.$http.post('orderInfo/refund', { orderInfoId: this.id, remark: '' }).then(res => {
+            //     wx.hideLoading();
+            //     wx.showToast({
+            //         icon: 'none',
+            //         title: '退款成功'
+            //     });
+            //     setTimeout(() => {
+            //     this.getFn();
+            // }, 1000);
+            // });
+            //         }
+            //     }
+            // });
         },
         pay() {
             wx.showLoading({
@@ -407,7 +387,6 @@ export default {
                 })
                 .then(res => {
                     res.package = res.packageValue;
-                    // console.log(res);
                     wx.requestPayment({
                         ...res,
                         success: () => {
@@ -771,7 +750,8 @@ export default {
         }
     }
     .box-footer-nav {
-        .bottom();
+        // .bottom();
+        padding-bottom: 50px;
         position: fixed;
         bottom: 0;
         width: 100%;
@@ -794,36 +774,60 @@ export default {
             margin: 6px 20px 0 20px;
             .box-btn-left {
                 width: 163px;
-                height: 48px;
-                background-position: center;
-                background-size: 100% 100%;
                 font-size: 16px;
                 font-weight: 400;
-                color: #ffffff;
-                text-align: center;
+                color: #c8c9cc;
                 line-height: 48px;
+                z-index: 1;
+                img {
+                    padding-bottom: 40px;
+                    position: absolute;
+                    width: 163px;
+                    height: 48px;
+                    z-index: -1;
+                }
+                span {
+                    padding-left: 49px;
+                }
             }
             .box-btn-left2 {
                 width: 163px;
-                height: 48px;
-                background-position: center;
-                background-size: 100% 100%;
                 font-size: 16px;
                 font-weight: 400;
                 color: #c8c9cc;
-                text-align: center;
                 line-height: 48px;
+                img {
+                    padding-bottom: 40px;
+                    position: absolute;
+                    width: 163px;
+                    height: 48px;
+                    z-index: -1;
+                }
+                span {
+                    padding-left: 49px;
+                }
             }
             .box-btn-right {
                 width: 163px;
-                height: 48px;
-                background-position: center;
-                background-size: 100% 100%;
                 font-size: 16px;
                 font-weight: 400;
                 color: #ffffff;
                 text-align: center;
                 line-height: 48px;
+                padding-right: 25px;
+                img {
+                    padding-bottom: 40px;
+                    position: absolute;
+                    width: 163px;
+                    height: 48px;
+                    z-index: -1;
+                }
+                span {
+                    padding-left: 49px;
+                }
+                .box-btn-sp {
+                    color: #ff6c00;
+                }
             }
         }
     }

src/pages/receiving.vue

@@ -14,6 +14,7 @@
                 @input="form.name = $event.detail"
                 placeholder="请填写您的姓名"
                 :border="false"
+                custom-style="padding-top:23px;height:83px;"
                 label="联系人"
             />
             <van-field
@@ -22,14 +23,17 @@
                 @input="form.phone = $event.detail"
                 placeholder="请填写您的手机号码"
                 :border="false"
+                custom-style="height:70px;"
                 label="手机号"
             />
             <van-field
                 @click="$refs.area.init()"
                 :value="showCity"
                 readonly
+                is-link
                 placeholder="请选择省市区"
                 :border="false"
+                custom-style="height:70px;"
                 label="地区"
             />
             <van-field
@@ -38,6 +42,7 @@
                 placeholder="请填写您的详细地址"
                 :border="false"
                 label="详细地址"
+                custom-style="height:70px;"
                 type="textarea"
             />
         </van-cell-group>
@@ -50,7 +55,7 @@
 
             <div class="box-but-con">
                 <div class="container-but" @click="addRess">确认</div>
-                <div class="container-cancel">获取微信地址</div>
+                <div class="container-cancel" @click="refWx">获取微信地址</div>
             </div>
         </div>
         <area-select
@@ -137,6 +142,16 @@ export default {
                         title: e.error
                     });
                 });
+        },
+        refWx() {
+            wx.chooseAddress({
+                success(res) {
+                    console.log(JSON.stringify(res));
+                },
+                fail: function(err) {
+                    console.log(JSON.stringify(err));
+                }
+            });
         }
     },
     onLoad(options) {