From 1c7196b76115fbd314764ce6036e5890315915f6 Mon Sep 17 00:00:00 2001 From: initwithout Date: Wed, 26 Apr 2023 16:22:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=94=AE=E5=90=8E=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 6 +- images/huanhuo.png | Bin 0 -> 2606 bytes images/tuihuo.png | Bin 0 -> 1773 bytes images/tuikuan.png | Bin 0 -> 3162 bytes .../aftersales.js} | 79 ++--- .../aftersales.json} | 1 + pages/aftersales/aftersales.wxml | 74 ++++ pages/aftersales/aftersales.wxss | 147 ++++++++ pages/{return_goods => aftersales}/index.js | 2 +- pages/{return_goods => aftersales}/index.json | 1 + pages/{return_goods => aftersales}/index.wxml | 4 +- pages/aftersales/index.wxss | 333 ++++++++++++++++++ pages/comment/comment.js | 122 ++----- pages/order/detail.js | 24 +- pages/order/detail.wxml | 2 + pages/order/order.js | 2 +- pages/order/order.wxss | 4 +- pages/return_goods/index.wxss | 332 ----------------- pages/return_goods/return_goods.wxml | 20 -- pages/return_goods/return_goods.wxss | 65 ---- pages/user/user.wxml | 4 +- utils/server.js | 8 +- 22 files changed, 656 insertions(+), 574 deletions(-) create mode 100644 images/huanhuo.png create mode 100644 images/tuihuo.png create mode 100644 images/tuikuan.png rename pages/{return_goods/return_goods.js => aftersales/aftersales.js} (63%) rename pages/{return_goods/return_goods.json => aftersales/aftersales.json} (63%) create mode 100644 pages/aftersales/aftersales.wxml create mode 100644 pages/aftersales/aftersales.wxss rename pages/{return_goods => aftersales}/index.js (99%) rename pages/{return_goods => aftersales}/index.json (63%) rename pages/{return_goods => aftersales}/index.wxml (99%) create mode 100644 pages/aftersales/index.wxss delete mode 100644 pages/return_goods/index.wxss delete mode 100644 pages/return_goods/return_goods.wxml delete mode 100644 pages/return_goods/return_goods.wxss diff --git a/app.json b/app.json index 485ee6b..979bee0 100644 --- a/app.json +++ b/app.json @@ -23,8 +23,6 @@ "pages/order/pay", "pages/order/detail", "pages/order/order", - "pages/return_goods/index", - "pages/return_goods/return_goods", "pages/collection/collection", "pages/comment/comment", "pages/coupon/index", @@ -51,7 +49,9 @@ "pages/store/myStore", "pages/userinfo/userinfo", "pages/set/password", - "pages/member/member" + "pages/member/member", + "pages/aftersales/aftersales", + "pages/aftersales/index" ], "window": { "backgroundTextStyle": "light", diff --git a/images/huanhuo.png b/images/huanhuo.png new file mode 100644 index 0000000000000000000000000000000000000000..42c6243df73afc332e0f6d1f725f3d666dfe4c99 GIT binary patch literal 2606 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 { + if (res.code == 200) { + var data = res.data + that.setData({ + order: data.list, + status: data.status, + refund_only_status: data.refund_only_status, + return_refund_status: data.return_refund_status, + exchange_goods_status: data.exchange_goods_status, + orderType: data.orderType + }); + } + }) }, remarkInput: function (e) { this.setData({ @@ -134,7 +121,7 @@ Page({ success: 2000 }); wx.redirectTo({ - url: '/pages/return_goods/index?currentTab=0&otype=whole', + url: '/pages/aftersales/index?currentTab=0&otype=whole', }); } else { wx.showToast({ diff --git a/pages/return_goods/return_goods.json b/pages/aftersales/aftersales.json similarity index 63% rename from pages/return_goods/return_goods.json rename to pages/aftersales/aftersales.json index 26b6cf4..76036fa 100644 --- a/pages/return_goods/return_goods.json +++ b/pages/aftersales/aftersales.json @@ -1,3 +1,4 @@ { + "usingComponents": {}, "navigationBarTitleText": "申请售后" } \ No newline at end of file diff --git a/pages/aftersales/aftersales.wxml b/pages/aftersales/aftersales.wxml new file mode 100644 index 0000000..f25bd68 --- /dev/null +++ b/pages/aftersales/aftersales.wxml @@ -0,0 +1,74 @@ + + + + + + + + {{ item.p_name }} + + + + ¥{{item.p_price}} + + x{{ item.num }} + + {{ item.size }} + + + + + + + + + + 仅退款 + + 未收到货,或与客服协商同意仅退款 + + + + + + + + 退货退款 + + 已收到货,需要退还已收到的货物 + + + + + + + + + 换货 + + 确认收货,需要更换已收到的货物 + + + + + + \ No newline at end of file diff --git a/pages/aftersales/aftersales.wxss b/pages/aftersales/aftersales.wxss new file mode 100644 index 0000000..46e792c --- /dev/null +++ b/pages/aftersales/aftersales.wxss @@ -0,0 +1,147 @@ +/* pages/aftersales/aftersales.wxss */ +.page{ + width: 100% +} +.container{ + background-color: #F4F5F6; +} +.order_goods{ + /* border-radius: 0px 0px 24rpx 24rpx; */ + margin-bottom: 20rpx; +} + +.order_two { + padding: 30rpx; + display: flex; + background-color: #fff; + margin-right: 0; +} +.shopImg{ + width: 216rpx; + height: 216rpx; + border-radius: 16rpx; + margin-right: 24rpx; +} +.order_two_a { + flex: 1; + display: flex; + flex-direction: column; + justify-content: space-around; + height: 216rpx; +} +.price_num { + display: flex; + justify-content: space-between; + align-items: center; + font-size: 32rpx; + color: #FA5151; +} +.price_num .price{ + font-weight: 600; +} +.price .price_symbol{ + font-size: 24rpx; +} +.order_p_name { + text-align: start; + height: auto; + margin: 0 0 20rpx 0; + font-size: 32rpx; + color: #333333; + overflow:hidden; + text-overflow:ellipsis; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; +} +.color_one{ + text-align: start; + max-width: 440rpx; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + font-size: 24rpx; + color: #999999; +} +.color_two { + color: #999999; +} +.return_pay { + display: flex; + padding: 30rpx; + background-color: white; + align-items: center; + /* border-bottom: 1rpx solid #eee; */ +} +.return_right{ + display: flex; + flex-direction: column; + /* justify-content: space-between; */ + /* align-items: center; */ +} +.status{ + display: flex; + align-items: center; +} +.status view{ + margin-left: 20rpx; + font-size: 32rpx; + color: black; +} +.return_right text{ + margin-top: 10rpx; + font-size: 28rpx; + color: #999999; +} +.arrow{ + position: absolute; + right: 26rpx; + width: 26rpx; + height: 26rpx; +} +/* +.return_right>view { + font-size: 28rpx; + color: #999999; +} + +.return_right>view { + justify-content: flex-start; + font-size: 32rpx; + color:#333333; + margin-bottom: 8rpx; +} + +.return_right>div img { + margin-right: 20rpx; +} */ + +.p_name { + width: 100%; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; +} + +/* 优化 */ +.yh-order-two-div { + margin-right: 40rpx; + width: 61%; +} + +.yh-line { + height: 30rpx; + width: 100%; + background-color: #eee; +} + +.return_right_img { + width: 48rpx; + height: 48rpx; +} +.color_one{ + overflow: hidden; + text-overflow:ellipsis; + white-space: nowrap; +} diff --git a/pages/return_goods/index.js b/pages/aftersales/index.js similarity index 99% rename from pages/return_goods/index.js rename to pages/aftersales/index.js index c086db5..7bf5efb 100644 --- a/pages/return_goods/index.js +++ b/pages/aftersales/index.js @@ -1,4 +1,4 @@ -// pages/return_goods/index.js +// pages/aftersales/index.js var app = getApp(); var WXAPI = require('../../utils/server.js'); function initSubMenuDisplay() { diff --git a/pages/return_goods/index.json b/pages/aftersales/index.json similarity index 63% rename from pages/return_goods/index.json rename to pages/aftersales/index.json index a1637cd..362a8e2 100644 --- a/pages/return_goods/index.json +++ b/pages/aftersales/index.json @@ -1,3 +1,4 @@ { + "usingComponents": {}, "navigationBarTitleText": "退货管理" } \ No newline at end of file diff --git a/pages/return_goods/index.wxml b/pages/aftersales/index.wxml similarity index 99% rename from pages/return_goods/index.wxml rename to pages/aftersales/index.wxml index 85b4235..ac8ff4a 100644 --- a/pages/return_goods/index.wxml +++ b/pages/aftersales/index.wxml @@ -1,4 +1,4 @@ - + @@ -160,4 +160,4 @@ - \ No newline at end of file + diff --git a/pages/aftersales/index.wxss b/pages/aftersales/index.wxss new file mode 100644 index 0000000..a9008cc --- /dev/null +++ b/pages/aftersales/index.wxss @@ -0,0 +1,333 @@ +/* pages/aftersales/index.wxss */ +.swiper-tab{ + width: 100%; + border-bottom: 1px solid #eee; + text-align: center; + line-height: 80rpx; + background: #fff; + position: fixed; + top: 0; + z-index: 999; + } +.swiper-tab-list{ +font-size: 12px; +display: inline-block; +width: 50%; +color: #666; +} +.on{ +color: #dd2727; +border-bottom: 5rpx solid #dd2727; +} +.tab_statu{ +float: right; +font-size: 13px; +color: #FF6347; +} +.swiper-box{ +display: block; +height: 100%; +width: 100%; +overflow: hidden; +} + +.clearbutton{ + background: #fff; + display: inline-block; + margin:3% 3% 2% 3%; + color: #dd2727; + font-size: 14px; + width: 94%; +} +.shop{ + background: #fafafa; + padding: 4%; + border-bottom:1px solid #eee; +} +.shop checkbox{ + margin-top: 27px; + } +.sh_slt{ + width: 65px; + height: 65px; + overflow: hidden; + margin-right: 4%; + float: left; +} +.sp_text{ + display:flex; + line-height: 20px; + width: 100%; + text-align: left; + padding-left:8px; +} +.sp_tit{ + width: 100%; + overflow: hidden; + font-size: 12px; + -webkit-line-clamp:2; +} +.sp_neb{ + width: 100%; + overflow: hidden; + font-size: 12px; + color: #999; +} +.sp_jg{ + width: 30%; + overflow: hidden; + font-size: 13px; + color: #fc0628; +} +.guige{ + font-size:12px; + color:#808080; + text-align:right; +} +.dle{ + color: #999; + font-size: 12px; + float: right; +} +.dle image{ + width: 18px; + height: 18px; + vertical-align: sub; +} +.jk_bottom{ + position: fixed; + bottom: 0; + background: #fff; + width: 100%; + display: inline-flex; + border-bottom: 1px solid #eee; + font-size: 14px; + color: #999; +} +.jk_bottom checkbox{ + margin: 4% 0 4% 4%; +} +.jk_bottom .heji{ + margin-top: 5.5%; + width: 30%; + text-align: right; +} +.jk_bottom .all{ + margin-top: 5.5%; + padding-left: 2%; +} +.jk_bottom .js_button{ + background: #dd2727; + float: right; + color: #fff; + font-size: 16px; + text-align: center; + width: 40%; + position: absolute; + right: 0; + line-height: 50px; +} +.c_t60{ + clear: both; + height: 1px; + padding-top: 48px; +} +.blue{ +color: #42b1ff; +} +.mr_5{ + margin-right: 5px; +} +.list{ +border-bottom: 4px solid #eee; +} +.top{ +padding: 2% 4%; +font-size:12px; +} +.sbut{ +background:#EE7600; +border-radius: 10px; +text-align:center; +color:#fff; +height:20px; +margin-top:8px; +} + +.sbutt{ +background:#EE7600; +border-radius:10px; +text-align:center; +color:#fff; +height:17px; +margin:0; +width:25%; +font-size:12px; +} + +/*优惠券 */ +.orderDetails { +border-bottom: 10px solid #f3f3f3; +background: #fff; +} +.orderListTitle { +height: 100rpx; +line-height: 100rpx; +border-bottom: 1rpx solid #f3f3f3; +} +.orderListTitle .userImg { +float: left; +width: 70rpx; +height: 70rpx; +border-radius: 35rpx; +margin: 15rpx; +} +.orderListTitle .userImg image { +border-radius: 35rpx; +width: 100%; +height: 100%; +} +.orderListTitle .userName { +padding-right: 50rpx; +background: url(../../../images/member_list_arrow.png) no-repeat 90% center; +background-size: 35rpx 35rpx; +} +.orderListTitle .orderStatus { +float: right; +margin-right: 20rpx; +color: #2f7b27; +font-size: 34rpx; +} +.orderListDetails { +margin: 10px; +display: flex; +height: 200rpx; +border-bottom: 1rpx solid #f3f3f3; +border:2px solid #ff4081; +border-radius: 20rpx; +} +.orderListDetails .productImg { +flex: 1.3; +height: 217rpx; +margin-top: 20rpx; +margin-left: 20rpx; +} +.orderListDetails .productImg image { +width: 100%; +height: 100%; +} +.orderListDetails .productInfo { +flex: 1.5; +padding: 20rpx 10rpx; +text-align: center; +} +.productInfo image{ +width: 82px; +height: 82px; +} +.pr { +flex: 2.6; +padding: 0 10rpx; +line-height: 44rpx; +} +.classname { +font-size: 25rpx; +color: #ccc; +} +.coupon_box{ +display:flex; +flex-direction:row; +justify-content:space-between; +align-items:center; +margin-top:5px; +width:90%; +margin:10px auto; +} +.coupon_left{ +width: 78%; +position:relative; +background: #fff; +border-radius:5px; +height:120px; +line-height:120px; +} +.coupon_right{ +width:22%; +background:#ff6347; +position:relative; +height:120px; +text-align:center; +color:#fff; +border-radius:5px; +font-size:20px; + +} +.right_y{ +position:absolute; +width:25px; +height:25px; +border-radius:50%; +background:#eee; +top:48px; +right:-13px; + +} +.right_z{ +position:absolute; +width:25px; +height:25px; +border-radius:50%; +background:#eee; +top:48px; +left:-13px; +} +.gs{ +display:inline-block; +font-size:14px; +color:#666; +margin-left:10px; +} + +.p_all { +border-bottom:1px solid #eee; +} +.drawer_screen { +width: 100%; +height: 100%; +position: fixed; +top: 0; +left: 0; +background: #000; +opacity: 0.2; +overflow: hidden; +z-index: 1000; +color: #fff; +} + +.drawer_attr_box { +width: 100%; +height: 80%; +position: fixed; +bottom: 0; +left: 0; +z-index: 2000; +background: #fff; +} +.thxq{ +padding: 10px; +font-size: 13px; +} +.Withdraw{ +padding: 10px 0; +font-size: 13px; +display:flex; +height:25px; +} +.cash{ +border-bottom:1px solid #eee; +width:80%; +margin:auto; +} +.Withdraw view{ +line-height:25px; +} \ No newline at end of file diff --git a/pages/comment/comment.js b/pages/comment/comment.js index 0e7e937..601909f 100644 --- a/pages/comment/comment.js +++ b/pages/comment/comment.js @@ -16,18 +16,6 @@ Page({ }, onLoad: function (options) { that = this; - // 设备信息 - wx.getSystemInfo({ - success: function (res) { - that.setData({ - screenWidth: res.windowWidth, - screenHeight: res.windowHeight, - pixelRatio: res.pixelRatio, - imageWidth: res.windowWidth / 4 - 10 - }); - } - }); - var orderId = options.ordersn; // 订单号 var user_id = app.globalData.userInfo.openid; // 微信id var pid = options.pid; // 商品id @@ -42,56 +30,35 @@ Page({ } else { attribute_id = ''; } - wx.request({ - url: app.d.ceshiUrl + '&action=product&m=comment', - method: 'post', - data: { - order_id: orderId, // 订单号 - user_id: user_id, //微信id - pid: pid, // 商品id - attribute_id: attribute_id, // 属性id - }, - header: { - 'Content-Type': 'application/x-www-form-urlencoded' - }, - success: function (res) { - var status = res.data.status; - if (status == 1) { - var commentList = res.data.commentList; - if (commentList.length > 1) { - // 初始化评论选项为好评 - for (var i = 0, len = commentList.length; i < len; i++) { - commentList[i].commentType = 'GOOD'; - commentList[i].images = []; - commentList[i].id = i; - commentList[i].addHide = commentList[i].images.length; - } - } else { - commentList[0].commentType = 'GOOD'; - commentList[0].images = ''; - commentList[0].id = 0; - commentList[0].addHide = commentList[0].images.length; + WXAPI.commentList({ + accessId: app.globalData.accessId, + storeId: 239, + storeType: 1, + order_id: orderId, // 订单号 + pid: pid, // 商品id + attribute_id: attribute_id, // 属性id + }).then(res => { + if (res.code == 200) { + var data = res.data + var commentList = data.commentList; + if (commentList.length > 1) { + // 初始化评论选项为好评 + for (var i = 0, len = commentList.length; i < len; i++) { + commentList[i].commentType = 'GOOD'; + commentList[i].images = []; + commentList[i].id = i; + commentList[i].addHide = commentList[i].images.length; } - that.setData({ - commentList: commentList, - bgcolor: '#09bb07', - orderId: orderId, - remind: '' - }); } else { - wx.showToast({ - title: '已经评论过了哦,亲!', - duration: 2000 - }); - wx.navigateBack({ - delta: 2 - }); + commentList[0].commentType = 'GOOD'; + commentList[0].images = ''; + commentList[0].id = 0; + commentList[0].addHide = commentList[0].images.length; } - }, - fail: function () { - wx.showToast({ - title: '网络异常!', - duration: 2000 + that.setData({ + commentList: commentList, + orderId: orderId, + remind: '' }); } }) @@ -103,42 +70,7 @@ Page({ var id = e.target.id; var that = this; // 选择图片 - wx.chooseImage({ - count: 3, // 默认9 - sizeType: ['compressed'], - sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机,默认二者都有 - success: function (res) { - // 返回选定照片的本地文件路径列表,tempFilePath可以作为img标签的src属性显示图片 - var tempFilePaths = res.tempFilePaths; - var commentList = that.data.commentList; - var images = commentList[id].images; - if (images.length > 2) { - wx.showToast({ - title: '亲!最多上传3张哦!', - icon: 'none', - duration: 2000 - }); - } else { - if (images) { - images = images.concat(tempFilePaths); - } else { - images = tempFilePaths; - } - // 循环设置数据 - for (var i = 0, len = commentList.length; i < len; i++) { - if (i == id) { - commentList[id].images = images; - commentList[id].addHide = commentList[id].images.length; - } - } - - that.setData({ - commentList: commentList, - addHide: commentList[id].images.length - }); - } - } - }) + }, //删除图片 delete: function (e) { diff --git a/pages/order/detail.js b/pages/order/detail.js index 89fcccb..b913644 100644 --- a/pages/order/detail.js +++ b/pages/order/detail.js @@ -97,11 +97,11 @@ Page({ yuan: 0, //临时储存先前的总价格 d_yuan: 0, //抵扣余额显示 }, - return_goods: function (e) { + aftersales: function (e) { var that = this, id = e.target.dataset.orderId; var sNo = that.data.sNo; wx.redirectTo({ - url: "../return_goods/return_goods?id=" + id + "&type=1&oid=" + sNo + url: "../aftersales/aftersales?id=" + id + "&type=1&oid=" + sNo }) }, @@ -508,6 +508,24 @@ Page({ url: "/pages/order/payment?orderId="+data.sNo+"&price="+data.z_price, }) }, + //申请售后 + afterSalesOrder: function(e) { + var that = this; + var info = e.currentTarget.dataset.info + wx.navigateTo({ + url:"/pages/aftersales/aftersales?orderId="+info.list[0].id + }) + // WXAPI.orderRemind({ + // accessId: app.globalData.accessId, + // storeId: 239, + // storeType: 1, + // order_id: info.id, + // }).then(res => { + // if (res.code == 200) { + // that.reloadData(); + // } + // }) + }, //提醒发货 orderRemind: function(e) { var that = this; @@ -577,7 +595,7 @@ Page({ var that = this; var info = e.currentTarget.dataset.info wx.navigateTo({ - url:"/pages/order/detail?id="+info.id + url:"/pages/comment/comment?id="+info.id }) }, diff --git a/pages/order/detail.wxml b/pages/order/detail.wxml index 75208e0..8c6b2e8 100644 --- a/pages/order/detail.wxml +++ b/pages/order/detail.wxml @@ -140,10 +140,12 @@ 立即付款 + 申请售后 提醒发货 提醒发货 + 申请售后 查看物流 确认收货 diff --git a/pages/order/order.js b/pages/order/order.js index 478c4eb..f1af316 100644 --- a/pages/order/order.js +++ b/pages/order/order.js @@ -209,7 +209,7 @@ Page({ var that = this; var info = e.currentTarget.dataset.info wx.navigateTo({ - url:"/pages/order/detail?id="+info.id + url:"/pages/comment/comment?id="+info.id }) }, diff --git a/pages/order/order.wxss b/pages/order/order.wxss index b95735d..eae0a14 100644 --- a/pages/order/order.wxss +++ b/pages/order/order.wxss @@ -10,7 +10,7 @@ page{ white-space: nowrap; } .tab-itemActive{ - color: #454553; + color: #333333; width: 20%; height: 100rpx; line-height: 100rpx; @@ -20,7 +20,7 @@ page{ display: inline-block; } .tab-item { - color: #9fa5b6; + color: #999999; width: 20%; height: 100rpx; line-height: 100rpx; diff --git a/pages/return_goods/index.wxss b/pages/return_goods/index.wxss deleted file mode 100644 index c2e5d5f..0000000 --- a/pages/return_goods/index.wxss +++ /dev/null @@ -1,332 +0,0 @@ -.swiper-tab{ - width: 100%; - border-bottom: 1px solid #eee; - text-align: center; - line-height: 80rpx; - background: #fff; - position: fixed; - top: 0; - z-index: 999; - } -.swiper-tab-list{ - font-size: 12px; - display: inline-block; - width: 50%; - color: #666; - } -.on{ - color: #dd2727; - border-bottom: 5rpx solid #dd2727; - } - .tab_statu{ - float: right; - font-size: 13px; - color: #FF6347; -} -.swiper-box{ - display: block; - height: 100%; - width: 100%; - overflow: hidden; - } - -.clearbutton{ - background: #fff; - display: inline-block; - margin:3% 3% 2% 3%; - color: #dd2727; - font-size: 14px; - width: 94%; -} -.shop{ - background: #fafafa; - padding: 4%; - border-bottom:1px solid #eee; -} -.shop checkbox{ - margin-top: 27px; - } -.sh_slt{ - width: 65px; - height: 65px; - overflow: hidden; - margin-right: 4%; - float: left; -} -.sp_text{ - display:flex; - line-height: 20px; - width: 100%; - text-align: left; - padding-left:8px; -} -.sp_tit{ - width: 100%; - overflow: hidden; - font-size: 12px; - -webkit-line-clamp:2; -} -.sp_neb{ - width: 100%; - overflow: hidden; - font-size: 12px; - color: #999; -} -.sp_jg{ - width: 30%; - overflow: hidden; - font-size: 13px; - color: #fc0628; -} -.guige{ - font-size:12px; - color:#808080; - text-align:right; -} -.dle{ - color: #999; - font-size: 12px; - float: right; -} -.dle image{ - width: 18px; - height: 18px; - vertical-align: sub; -} -.jk_bottom{ - position: fixed; - bottom: 0; - background: #fff; - width: 100%; - display: inline-flex; - border-bottom: 1px solid #eee; - font-size: 14px; - color: #999; -} -.jk_bottom checkbox{ - margin: 4% 0 4% 4%; -} -.jk_bottom .heji{ - margin-top: 5.5%; - width: 30%; - text-align: right; -} -.jk_bottom .all{ - margin-top: 5.5%; - padding-left: 2%; -} -.jk_bottom .js_button{ - background: #dd2727; - float: right; - color: #fff; - font-size: 16px; - text-align: center; - width: 40%; - position: absolute; - right: 0; - line-height: 50px; -} -.c_t60{ - clear: both; - height: 1px; - padding-top: 48px; -} -.blue{ - color: #42b1ff; -} -.mr_5{ - margin-right: 5px; -} -.list{ - border-bottom: 4px solid #eee; -} -.top{ - padding: 2% 4%; - font-size:12px; -} -.sbut{ - background:#EE7600; - border-radius: 10px; - text-align:center; - color:#fff; - height:20px; - margin-top:8px; -} - -.sbutt{ - background:#EE7600; - border-radius:10px; - text-align:center; - color:#fff; - height:17px; - margin:0; - width:25%; - font-size:12px; -} - -/*优惠券 */ -.orderDetails { - border-bottom: 10px solid #f3f3f3; - background: #fff; -} -.orderListTitle { - height: 100rpx; - line-height: 100rpx; - border-bottom: 1rpx solid #f3f3f3; -} -.orderListTitle .userImg { - float: left; - width: 70rpx; - height: 70rpx; - border-radius: 35rpx; - margin: 15rpx; -} -.orderListTitle .userImg image { - border-radius: 35rpx; - width: 100%; - height: 100%; -} -.orderListTitle .userName { - padding-right: 50rpx; - background: url(../../../images/member_list_arrow.png) no-repeat 90% center; - background-size: 35rpx 35rpx; -} -.orderListTitle .orderStatus { - float: right; - margin-right: 20rpx; - color: #2f7b27; - font-size: 34rpx; -} -.orderListDetails { - margin: 10px; - display: flex; - height: 200rpx; - border-bottom: 1rpx solid #f3f3f3; - border:2px solid #ff4081; - border-radius: 20rpx; -} -.orderListDetails .productImg { - flex: 1.3; - height: 217rpx; - margin-top: 20rpx; - margin-left: 20rpx; -} -.orderListDetails .productImg image { - width: 100%; - height: 100%; -} -.orderListDetails .productInfo { - flex: 1.5; - padding: 20rpx 10rpx; - text-align: center; -} -.productInfo image{ - width: 82px; - height: 82px; -} -.pr { - flex: 2.6; - padding: 0 10rpx; - line-height: 44rpx; -} -.classname { - font-size: 25rpx; - color: #ccc; -} -.coupon_box{ -display:flex; -flex-direction:row; -justify-content:space-between; -align-items:center; -margin-top:5px; -width:90%; -margin:10px auto; -} -.coupon_left{ - width: 78%; - position:relative; - background: #fff; - border-radius:5px; - height:120px; - line-height:120px; -} -.coupon_right{ - width:22%; -background:#ff6347; -position:relative; -height:120px; -text-align:center; -color:#fff; -border-radius:5px; -font-size:20px; - -} -.right_y{ -position:absolute; -width:25px; -height:25px; -border-radius:50%; -background:#eee; -top:48px; -right:-13px; - -} -.right_z{ -position:absolute; -width:25px; -height:25px; -border-radius:50%; -background:#eee; -top:48px; -left:-13px; -} -.gs{ - display:inline-block; - font-size:14px; - color:#666; - margin-left:10px; -} - -.p_all { - border-bottom:1px solid #eee; -} -.drawer_screen { - width: 100%; - height: 100%; - position: fixed; - top: 0; - left: 0; - background: #000; - opacity: 0.2; - overflow: hidden; - z-index: 1000; - color: #fff; -} - -.drawer_attr_box { - width: 100%; - height: 80%; - position: fixed; - bottom: 0; - left: 0; - z-index: 2000; - background: #fff; -} -.thxq{ - padding: 10px; - font-size: 13px; -} -.Withdraw{ - padding: 10px 0; - font-size: 13px; - display:flex; - height:25px; -} -.cash{ - border-bottom:1px solid #eee; - width:80%; - margin:auto; -} -.Withdraw view{ - line-height:25px; -} \ No newline at end of file diff --git a/pages/return_goods/return_goods.wxml b/pages/return_goods/return_goods.wxml deleted file mode 100644 index 4870627..0000000 --- a/pages/return_goods/return_goods.wxml +++ /dev/null @@ -1,20 +0,0 @@ - - 请填写售后信息 -
- - - 选择售后类型: {{itemList_text}} - - - - -