From 9a8f39ae36b7710f3efff4550ebe9c1bfe9d68d3 Mon Sep 17 00:00:00 2001 From: BigBoss <2280520255@qq.com> Date: Thu, 21 May 2020 23:03:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 72 ++++---- src/pages/addOpticsData/addOpticsData.vue | 19 +++ src/pages/myOrder/components/OrderCard.vue | 221 +++++++++++++++++++------ src/pages/myOrder/myOrder.vue | 80 +++++---- src/pages/myOrderPaying/myOrderPaying.vue | 254 ++++++++++++++++++++++------- src/pages/predelivery/predelivery.vue | 1 + src/pages/user/user.vue | 184 +++++++++++++++------ src/static/car.png | Bin 0 -> 1593 bytes src/static/img/user/dataWrite.png | Bin 0 -> 382 bytes src/static/img/user/introduce.png | Bin 0 -> 488 bytes src/static/img/user/joinUs.png | Bin 0 -> 2017 bytes src/static/img/user/refound.png | Bin 0 -> 3463 bytes src/static/img/user/service.png | Bin 0 -> 1194 bytes src/static/img/user/shouyi.png | Bin 0 -> 1546 bytes src/static/img/user/waitDeliver.png | Bin 0 -> 1959 bytes src/static/img/user/waitPay.png | Bin 0 -> 2238 bytes src/static/img/user/waitReceive.png | Bin 0 -> 2057 bytes src/static/joinUs (2).png | Bin 0 -> 488 bytes src/static/joinUs (3).png | Bin 0 -> 1194 bytes src/static/joinUs.png | Bin 0 -> 2017 bytes src/static/shouyi.png | Bin 0 -> 1546 bytes src/static/waitReceive.png | Bin 789 -> 2057 bytes src/store/modules/cancelOrder.js | 36 ++++ src/store/modules/myOrder.js | 148 ++++++++--------- src/store/modules/orderRead.js | 35 ++++ src/store/modules/payLog.js | 27 +++ src/store/modules/statusConfirm.js | 37 +++++ src/store/url.js | 8 +- 28 files changed, 820 insertions(+), 302 deletions(-) create mode 100644 src/pages/addOpticsData/addOpticsData.vue create mode 100644 src/static/car.png create mode 100644 src/static/img/user/dataWrite.png create mode 100644 src/static/img/user/introduce.png create mode 100644 src/static/img/user/joinUs.png create mode 100644 src/static/img/user/refound.png create mode 100644 src/static/img/user/service.png create mode 100644 src/static/img/user/shouyi.png create mode 100644 src/static/img/user/waitDeliver.png create mode 100644 src/static/img/user/waitPay.png create mode 100644 src/static/img/user/waitReceive.png create mode 100644 src/static/joinUs (2).png create mode 100644 src/static/joinUs (3).png create mode 100644 src/static/joinUs.png create mode 100644 src/static/shouyi.png create mode 100644 src/store/modules/cancelOrder.js create mode 100644 src/store/modules/orderRead.js create mode 100644 src/store/modules/payLog.js create mode 100644 src/store/modules/statusConfirm.js diff --git a/src/pages.json b/src/pages.json index 0c74409..8cf8654 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1,90 +1,99 @@ { "pages" : [ { - "path" : "pages/index/index", + "path" : "pages/user/user", "style" : { - "navigationBarTitleText" : "商城一览" + "navigationBarTitleText" : "我的" } }, { - "path" : "pages/myOrder/myOrder", + "path" : "pages/detailsChoiceArgs/detailsChoiceArgs", "style" : { - "navigationBarTitleText" : "我的订单" + "navigationBarTitleText" : "镜片名称名称" } }, { - "path" : "pages/cart/cart", + "path" : "pages/purchaseLenses/purchaseLenses", "style" : { - "navigationBarTitleText" : "购物车" + "navigationBarTitleText" : "产品选购" } }, { - "path" : "pages/frameDetail/frameDetail", + "path" : "pages/lensDetails/lensDetails", "style" : { "navigationBarTitleText" : "产品详情" } }, { - "path" : "pages/lensDetails/lensDetails", + "path" : "pages/myOrderPaying/myOrderPaying", "style" : { - "navigationBarTitleText" : "产品详情" + "navigationBarTitleText" : "我的订单" } }, { - "path" : "pages/purchaseLenses/purchaseLenses", + "path" : "pages/myOrder/myOrder", "style" : { - "navigationBarTitleText" : "产品选购" + "navigationBarTitleText" : "我的订单" } }, { - "path" : "pages/refundProgress/refundProgress", + "path" : "pages/index/index", "style" : { - "navigationBarTitleText" : "申请退款" + "navigationBarTitleText" : "商城一览" } }, { - "path" : "pages/addAddress/addAddress", + "path" : "pages/cart/cart", "style" : { - "navigationBarTitleText" : "新增地址" + "navigationBarTitleText" : "购物车" } }, { - "path" : "pages/confirmOrder/confirmOrder", + "path" : "pages/frameDetail/frameDetail", "style" : { - "navigationBarTitleText" : "确认订单" + "navigationBarTitleText" : "产品详情" } }, { - "path" : "pages/user/user", + "path" : "pages/refundProgress/refundProgress", "style" : { - "navigationBarTitleText" : "我的" + "navigationBarTitleText" : "申请退款" } }, { - "path" : "pages/refundment/refundWays" + "path" : "pages/addAddress/addAddress", + "style" : { + "navigationBarTitleText" : "新增地址" + } }, { - "path" : "pages/refundment/refundment" + "path" : "pages/confirmOrder/confirmOrder", + "style" : { + "navigationBarTitleText" : "确认订单" + } }, { - "path" : "pages/predelivery/predelivery" + "path" : "pages/refundment/refundWays", + "style" : { + "navigationBarTitleText" : "退款方式" + } }, { - "path" : "pages/customerService/customerService", + "path" : "pages/refundment/refundment", "style" : { - "navigationBarTitleText" : "在线客服" + "navigationBarTitleText" : "申请退款" } }, { - "path" : "pages/myOrderPaying/myOrderPaying", + "path" : "pages/predelivery/predelivery", "style" : { - "navigationBarTitleText" : "我的订单" + "navigationBarTitleText" : "待发货" } }, { - "path" : "pages/detailsChoiceArgs/detailsChoiceArgs", + "path" : "pages/customerService/customerService", "style" : { - "navigationBarTitleText" : "镜片名称名称" + "navigationBarTitleText" : "在线客服" } }, { @@ -98,7 +107,12 @@ "style" : { "navigationBarTitleText" : "镜框选购页" } - } + } + ,{ + "path" : "pages/addOpticsData/addOpticsData", + "style" : { + "navigationBarTitleText" : "验光数据"} + } ], "globalStyle" : { "navigationBarTextStyle" : "black", diff --git a/src/pages/addOpticsData/addOpticsData.vue b/src/pages/addOpticsData/addOpticsData.vue new file mode 100644 index 0000000..8c3b35f --- /dev/null +++ b/src/pages/addOpticsData/addOpticsData.vue @@ -0,0 +1,19 @@ + + + + + diff --git a/src/pages/myOrder/components/OrderCard.vue b/src/pages/myOrder/components/OrderCard.vue index adbb338..d8de011 100644 --- a/src/pages/myOrder/components/OrderCard.vue +++ b/src/pages/myOrder/components/OrderCard.vue @@ -1,61 +1,75 @@ @@ -67,13 +81,72 @@ * 订单数据 */ order: { - orderId: Number, - img: String, - name: String, - originCost:String, - price: String, - orderType:Number, - buyNum:Number + // orderId: Number, + // img: String, + // name: String, + // originCost:String, + // price: String, + // orderType:Number, + // buyNum:Number, + finished_time: null, + is_refound: String, + mch_id: String, + money_of_dcw: String, + money_of_partner: String, + money_of_shop: String, + orderJudge: Boolean, + order_info: { + address:{ + cityName: String, + countyName: String, + detailInfo: String, + errMsg: String, + nationalCode: String, + postalCode: String, + provinceName: String, + telNumber: String, + userName: String, + }, + cartinfo: ["127"], + keyname: "330_1588911391", + lefttime: Number, + list:[ + { + cart_id: "127", + imgUrl: String, + img_index_url: null, + memo: String, + mp_id: String, + nowPrice: String, + num: String, + oldPrice: Number, + p_discount: String, + p_name: String, + p_root_index: String, + p_sale_price: String, + peopleName: String, + pics: ["79_0_D122D2.jpg","79_1_E0A1ED.jpg","79_2_B00B3D.jpg","79_3_B2CF21.jpg","79_4_33AD1B.jpg"], + pid: String, + sk_id: String, + } + ], + orderDesc: String, + total_fee: Number, + }, + partner_uid: String, + pay_cate: String, + pay_id: String, + pay_time: String, + pay_wood_desc: String, + pay_wood_id: String, + prepay_id: String, + re_check_staus: String, + shopid: String, + split_userid: String, + status: String, + // status0待付款 1已付款 待收货 2 已收货待评价 3 已评价 + total_fee: String, + uid: String, }, /** * 当前选择 @@ -81,9 +154,18 @@ current:Number }, - onLoad() { - // console.log('dd'); - console.log('order', this.props.order); + created() { + console.log(this.order); + // console.log(this.order.status ); + // console.log(this.current); + }, + computed:{ + status(){ + return this.order.status + }, + orderInfoList(){ + return this.order.order_info[0] + } }, data() { return { @@ -97,6 +179,43 @@ fail: () => {}, complete: () => {} }); + }, + toOrderInfo(status,payId){ + console.log(status,payId) + switch(status){ + // 0待付款 1待收货 2已收货 3 已评价 + case '0': + uni.navigateTo({ + url:`../myOrderPaying/myOrderPaying?status=`+status+`&payId=`+payId, + fail(errMsg) { + console.log(errMsg) + } + }) + break; + case '1': + uni.navigateTo({ + url:`../myOrderPaying/myOrderPaying?status=`+status+`&payId=`+payId, + fail(errMsg) { + console.log(errMsg) + } + }) + + break; + case '2 || 3': + uni.navigateTo({ + url:`../myOrderPaying/myOrderPaying?status=`+status+`&payId=`+payId, + fail(errMsg) { + console.log(errMsg) + } + }) + + break; + + + default: + break; + + } } } } @@ -147,24 +266,34 @@ justify-content: space-between; align-items: flex-start; height: 188rpx; + width: 368rpx; } .orderName{ font-size: 14px; color: #333333; + display: -webkit-box; + overflow: hidden; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; } .orderDescrib{ font-size: 12px; color: #999999; + display: -webkit-box; + overflow: hidden; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; } .infoText-bottom{ display: flex; flex-direction: row; - justify-content: space-between; + justify-content: flex-start; align-items: center; width: 100%; .markPrice{ font-size: 14px; color: #FF6B4A; + margin-right: 20rpx; } .buy-num{ font-size: 12px; diff --git a/src/pages/myOrder/myOrder.vue b/src/pages/myOrder/myOrder.vue index fa44b35..5e825af 100644 --- a/src/pages/myOrder/myOrder.vue +++ b/src/pages/myOrder/myOrder.vue @@ -2,10 +2,10 @@ - + {{ item.text }} @@ -20,7 +20,7 @@ - 已显示全部 + 没有更多订单了，去商城看看吧~ @@ -88,27 +84,28 @@ .header{ background-color: #ffffff; width: 100%; - height: 232rpx; - padding: 40rpx 40rpx 36rpx 40rpx; + // height: 232rpx; + padding: 20rpx 40rpx 16rpx 40rpx; box-sizing: border-box; position: fixed; top: 0; left: 0; - .searchBar { - width: 670rpx; - display: flex; - justify-content: center; - align-items: center; - box-sizing: border-box; - padding: 0rpx 16rpx; - border: 1px solid #FF6B4A; - border-radius: 8rpx; - background-color: #ffffff; - } + // .searchBar { + // width: 670rpx; + // display: flex; + // justify-content: center; + // align-items: center; + // box-sizing: border-box; + // padding: 0rpx 16rpx; + // border: 1px solid #FF6B4A; + // border-radius: 8rpx; + // background-color: #ffffff; + // } .screenBar{ width: 670rpx; - height: 110rpx; + // height: 110rpx; + height: 70rpx; display: flex; flex-direction: row; justify-content: space-between; @@ -138,7 +135,8 @@ } } .orderList{ - margin-top: 232rpx; + // margin-top: 232rpx; + margin-top: 132rpx; } .footer{ font-size: 14px; diff --git a/src/pages/myOrderPaying/myOrderPaying.vue b/src/pages/myOrderPaying/myOrderPaying.vue index d7ade1b..8ce0e82 100644 --- a/src/pages/myOrderPaying/myOrderPaying.vue +++ b/src/pages/myOrderPaying/myOrderPaying.vue @@ -1,35 +1,45 @@ + -