Skip to content

7
7-Eleven
Commit 1c0b3aa3 by 谢中龙
Options

提交代码，拆单

parent 8db28035
Showing with 474 additions and 110 deletions
src/pages/order/order.wxml
...@@ -13,7 +13,66 @@ ...@@ -13,7 +13,66 @@
<view class='red-num' wx:if="{{item.hasTips}}"></view> <view class='red-num' wx:if="{{item.hasTips}}"></view>
</view> </view>
</view> </view>
<view class="order-content" wx:if="{{orderList.length}}"> <!-- 订单布局 -->
<view class="order-content order-list-new clear-box" wx:if="{{currentIndex != 5}}">
<!-- 这里订单布局 -->
<view class="order-item-new">
<view class="order-new-no">
<view class="order-new-no-lf">
订单编号：102024525214152524
<view class="copy" data-no="{{87878978}}" bindtap="onTapCopy">复制</view>
</view>
<image src="/assets/imgs/arrow-right.png" mode="aspectFit"></image>
</view>
<!-- 包裹 -->
<view class="order-package clear-box">
<view class="package-titile">
<view class="package-name">包裹1</view>
<view class="package-status-color-P">待发货</view>
</view>
<!-- 商品数据 -->
<view class="package-products clear-box">
<view class="product-item">
<image src="https://img3.bigaka.com/test/1002/202003/20200302/1002c503d764-c600-4efb-a02b-339ed03b7e9b.jpg" class="lf-product-img" mode="aspectFit"></image>
<view class="rg-product-info">
<view class="pro-name">这个是商品的名称</view>
<view class="pro-spec">这个是商品规格</view>
<view class="pro-count">
<text>数量</text>
<label>x2</label>
</view>
<view class="refund-count">
<text>退单</text>
<label>x1</label>
</view>
</view>
</view>
<view class="product-item">
<image src="https://img3.bigaka.com/test/1002/202003/20200302/1002c503d764-c600-4efb-a02b-339ed03b7e9b.jpg" class="lf-product-img" mode="aspectFit"></image>
<view class="rg-product-info">
<view class="pro-name">这个是商品的名称</view>
<view class="pro-spec">这个是商品规格</view>
<view class="pro-count">
<text>数量</text>
<label>x2</label>
</view>
</view>
</view>
</view>
<!-- 按钮 -->
<view class="package-btns">
<view class="btns normal-btn">取消订单</view>
<view class="btns pay-now">立即支付</view>
<view class="btns sure-get-goods">确认收货</view>
<view class="btns normal-btn">申请退款</view>
</view>
</view>
</view>
</view>
<!-- 退款售后布局 -->
<view class="order-content" wx:if="{{currentIndex == 5}}">
<block <block
wx:for="{{orderList}}" wx:for="{{orderList}}"
wx:for-item="item" wx:for-item="item"
...@@ -22,21 +81,15 @@ ...@@ -22,21 +81,15 @@
> >
<view class="order-list"> <view class="order-list">
<view class="order-header"> <view class="order-header">
<view class="order-number" wx:if="{{currentIndex == 5}}"> <view class="order-number">
<text>退单号</text> <text>退单号</text>
<text class="number"> {{item.id}}</text> <text class="number"> {{item.id}}</text>
<view class="copy" data-no="{{item.id}}" bindtap="onTapCopy">复制</view> <view class="copy" data-no="{{item.id}}" bindtap="onTapCopy">复制</view>
</view> </view>
<view class="order-number" wx:else>
<text>订单号</text>
<text class="number">{{item.id}}</text>
<view class="copy" data-no="{{item.id}}" bindtap="onTapCopy">复制</view>
</view>
<!--订单状态(C:取消;N:新建,P:已支付;D:已发货;R:已收货) 关闭 取消 新建 待付款 已支付 待发货 已发货 待收货 已完成 已收货 交易关闭 取消--> <!--订单状态(C:取消;N:新建,P:已支付;D:已发货;R:已收货) 关闭 取消 新建 待付款 已支付 待发货 已发货 待收货 已完成 已收货 交易关闭 取消-->
<!--退单状态(C:取消;N:新建;A:已审核;R:已拒绝;R:退货已发;D:退货已收货)--> <!--退单状态(C:取消;N:新建;A:已审核;R:已拒绝;R:退货已发;D:退货已收货)-->
<!-- RJ-退款驳回 R-退货中 N-待审核 A-待寄回 C-退款取消 D-退款成功 退款中 --> <!-- RJ-退款驳回 R-退货中 N-待审核 A-待寄回 C-退款取消 D-退款成功 退款中 -->
<view wx:if="{{currentIndex == 5}}"> <view>
<text class="order-status" wx-if="{{item.status == 'C'}}">退款取消</text> <text class="order-status" wx-if="{{item.status == 'C'}}">退款取消</text>
<text class="order-status" wx-if="{{item.status == 'N'}}">待审核</text> <text class="order-status" wx-if="{{item.status == 'N'}}">待审核</text>
<text class="order-status" wx-if="{{item.status == 'A'}}">待寄回</text> <text class="order-status" wx-if="{{item.status == 'A'}}">待寄回</text>
...@@ -44,18 +97,10 @@ ...@@ -44,18 +97,10 @@
<text class="order-status" wx-if="{{item.status == 'RJ'}}">退款驳回</text> <text class="order-status" wx-if="{{item.status == 'RJ'}}">退款驳回</text>
<text class="order-status" wx-if="{{item.status == 'D'}}">退款成功</text> <text class="order-status" wx-if="{{item.status == 'D'}}">退款成功</text>
</view> </view>
<view wx:else>
<text class="order-status" wx-if="{{item.status == 'C'}}">交易关闭</text>
<text class="order-status" wx-if="{{item.status == 'N'}}">待付款</text>
<text class="order-status" wx-if="{{item.status == 'P'}}">待发货</text>
<text class="order-status" wx-if="{{item.status == 'D'}}">待收货</text>
<text class="order-status" wx-if="{{item.status == 'R'}}">已完成</text>
<text class="order-status" wx-if="{{item.status == 'PR'}}">退货中</text>
<text class="order-status" wx-if="{{item.status == 'RE'}}">退货完成</text>
</view>
</view> </view>
<!-- 类型 --> <!-- 类型 -->
<view wx:if="{{currentIndex == 5}}"> <view >
<view <view
class="pro-list" class="pro-list"
data-detail="{{item}}" data-detail="{{item}}"
...@@ -87,40 +132,8 @@ ...@@ -87,40 +132,8 @@
</view> </view>
</view> </view>
</view> </view>
<view wx:else>
<view
class="pro-list"
data-detail="{{item}}"
data-id="{{item.id}}"
bindtap="handelDetail"
>
<scroll-view scroll-x="true">
<view class="uploadWrap" scroll-x="true">
<block wx:for='{{item.skuVOList}}' wx:for-item="sub" wx:key="s">
<view class="upload_Item">
<image
class="upload_Item_img"
src="{{sub.skuImgUrl ? sub.skuImgUrl : sub.mainImgUrl}}"
bindtap='goProDetail'
mode='aspectFit'
lazy-load
data-id='{{sub.goodsId}}'
/>
</view>
</block>
</view>
</scroll-view>
</view>
<view class="pro-number">
<text class="total-pro">共{{item.skuCount}}件商品</text>
<view class="total-price">
实付
<text class="price">￥{{item.payAmount}}</text>
</view>
</view>
</view>
<view wx:if="{{currentIndex == 5}}"> <view>
<view class="btn-group"> <view class="btn-group">
<view class="order-status-rf" wx-if="{{item.status == 'C'}}"> <view class="order-status-rf" wx-if="{{item.status == 'C'}}">
<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelDetailRf">查看详情</button> <button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelDetailRf">查看详情</button>
...@@ -145,44 +158,13 @@ ...@@ -145,44 +158,13 @@
</view> </view>
</view> </view>
</view> </view>
<view wx:else>
<view class="btn-group" wx:if="{{item.status != 'PR'}}">
<view class="order-status" wx-if="{{item.status == 'C' || item.status == 'RE'}}">
<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelDelOrder">删除订单</button>
</view>
<view class="order-status" wx-if="{{item.status == 'N'}}">
<button class="btn btn-sm btn-primary btn-outline"
data-merged="{{item.mergedAmount}}" data-id="{{item.id}}" bindtap="handelToPay">立即支付</button>
</view>
<view class="order-status" wx-if="{{item.status == 'P'}}">
<button
class="btn btn-sm btn-default"
data-id="{{item.id}}"
data-detail="{{item}}"
bindtap="checkLogistics"
>查看物流
</button>
</view>
<view class="order-status" wx-if="{{item.status == 'D'}}">
<button
class="btn btn-sm btn-default"
data-id="{{item.id}}"
data-detail="{{item}}"
bindtap="checkLogistics"
>查看物流
</button>
<button class="btn btn-sm btn-primary btn-outline" data-id="{{item.id}}" bindtap="handelConfirmReceipt">确认收货</button>
</view>
<!-- <view class="order-status" wx-if="{{item.status == 'R'}}" /> -->
<!--<button class="btn btn-sm btn-primary btn-outline ">再来一单</button>-->
</view>
</view>
</view> </view>
</block> </block>
<view class="no-bottom"> <view class="no-bottom">
<no-more wx:if="{{noMoreFlag}}" /> <no-more wx:if="{{noMoreFlag}}" />
</view> </view>
</view> </view>
<view hidden="{{no_data}}" class="no-list df border_box"> <view hidden="{{no_data}}" class="no-list df border_box">
<!-- 当前无数据 --> <!-- 当前无数据 -->
<empty show="{{no_data}}" text="未查找您的订单信息哦~" /> <empty show="{{no_data}}" text="未查找您的订单信息哦~" />
......
src/pages/order/order.wxss
...@@ -163,3 +163,209 @@ scroll-view{ ...@@ -163,3 +163,209 @@ scroll-view{
box-sizing: border-box; box-sizing: border-box;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
} }
/* 拆单订单布局 */
.clear-box{
box-sizing: border-box;
-webkit-box-sizing: border-box;
}
.order-list-new{
width: 100%;
padding: 0;
font-size: 24rpx;
}
.order-list-new .order-item-new{
background: #ffffff;
padding: 30rpx;
margin-bottom: 10rpx;
padding-bottom: 0;
}
.order-list-new .order-item-new .order-new-no{
padding-bottom: 20rpx;
border-bottom: solid 1rpx #eeeeee;
font-size: 28rpx;
display: flex;
align-items: center;
justify-content: space-between;
/* margin-bottom: 20rpx; */
}
.order-list-new .order-item-new .order-new-no:active{
opacity: 0.7;
}
.order-list-new .order-item-new .order-new-no image{
width: 18rpx;
height: 20rpx;
}
.order-list-new .order-item-new .order-new-no .order-new-no-lf{
display: flex;
align-items: center;
}
.order-list-new .order-item-new .order-new-no .copy{
width: 50rpx;
height: 30rpx;
border: solid 1px #cb3c3c;
color: #cb3c3c;
font-size: 22rpx;
border-radius: 5rpx;
display: flex;
align-items: center;
justify-content: center;
margin-left: 20rpx;
}
.order-package{
width: 100%;
height: auto;
border-bottom: dashed 1px #dddddd;
padding: 30rpx 0;
padding-bottom: 20rpx;
}
.order-package:last-child{
border-bottom: none;
}
.order-package .package-titile{
display: flex;
align-items: center;
justify-content: space-between;
font-size: 24rpx;
color: #666666;
padding-bottom: 20rpx;
}
.package-status-color-P{
color: #409EFF;
}
.package-status-color-D{
color: #F56C6C;
}
.package-status-color-C{
color: #999999;
}
.package-status-color-R{
color: #67C23A;
}
.order-package .package-titile .package-name{
font-weight: bold;
color: #333333;
}
.order-package .package-products{
width: 100%;
height: auto;
}
.order-package .package-products .product-item{
width: 100%;
display: flex;
padding: 10rpx 0;
}
.order-package .package-products .product-item .lf-product-img{
flex: 0;
min-width: 140rpx;
max-width: 140rpx;
height: 140rpx;
}
.order-package .package-products .product-item .rg-product-info{
flex: 1;
padding-left: 20rpx;
display: flex;
flex-direction: column;
justify-content: space-around;
}
.order-package .package-products .product-item .rg-product-info .pro-name{
font-size: 28rpx;
color: #333333;
font-weight: 550;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
overflow: hidden;
}
.order-package .package-products .product-item .rg-product-info .pro-spec{
font-size: 22rpx;
color: #999999;
}
.order-package .package-products .product-item .rg-product-info .pro-count{
font-size: 22rpx;
color: #999999;
display: flex;
justify-content: space-between;
align-items: center;
}
.order-package .package-products .product-item .rg-product-info .refund-count{
font-size: 22rpx;
color: #cb3c3c;
display: flex;
justify-content: space-between;
align-items: center;
}
.order-package .package-products .product-item .rg-product-info .pro-count label{
color: #cb3c3c;
font-size: 32rpx;
}
.package-btns{
display: flex;
padding-top: 20rpx;
margin-top: 20rpx;
border-top: solid 1px #eeeeee;
display: flex;
align-items: center;
justify-content: flex-end;
}
.package-btns .btns{
width: auto;
height: 50rpx;
padding: 0 15rpx;
border: solid 1px #dddddd;
display: flex;
align-items: center;
font-size: 24rpx;
justify-content: center;
margin-left: 15rpx;
border-radius: 8rpx;
}
.package-btns .btns.pay-now{
border: solid 1px #cb3c3c;
background: #cb3c3c;
color: #ffffff;
}
.package-btns .btns.sure-get-goods{
border: solid 1px #cb3c3c;
color: #cb3c3c;
}
.package-btns .btns.normal-btn{
color: #666666;
}
.package-btns .btns:active{
opacity: 0.7;
}
\ No newline at end of file
src/pages/orderDetail/orderDetail.js
...@@ -3,7 +3,7 @@ const app = getApp() ...@@ -3,7 +3,7 @@ const app = getApp()
const wxService = require('../../utils/wxService') const wxService = require('../../utils/wxService')
const utils = require('../../utils/util') const utils = require('../../utils/util')
const envInfo = require('../../config/index').envInfo const envInfo = require('../../config/index').envInfo
const orderTopBg = 'https://img3.bigaka.com/prd/3001/202003/20200309/3001a46ba5bf-235d-428b-b7bb-befcf37ff89b.jpg';
wxService.page({ wxService.page({
/** /**
...@@ -19,7 +19,8 @@ wxService.page({ ...@@ -19,7 +19,8 @@ wxService.page({
ms: '0', ms: '0',
mergedAmount: 0, mergedAmount: 0,
totalGoodsPrice : 0, totalGoodsPrice : 0,
canApplyRefund : true canApplyRefund : true,
orderTopBg : orderTopBg,
}, },
/** /**
......
src/pages/orderDetail/orderDetail.wxss
...@@ -3,34 +3,14 @@ ...@@ -3,34 +3,14 @@
page{ page{
background: #f9f9f9; background: #f9f9f9;
padding-bottom: 95rpx; padding-bottom: 10rpx;
overflow-x: hidden; overflow-x: hidden;
} }
.order-number-item { .order-number-item {
display: flex; display: flex;
align-items: center; align-items: center;
} }
.header-wrap{
position: relative;
height: 180rpx;
overflow-x: hidden;
padding: 49rpx 0 0 74rpx;
box-sizing: border-box;
background-repeat: no-repeat;
background-size: 100%;
}
.refund-status{
/* padding: 49rpx 0 0 74rpx; */
color: #cb3c3c;
}
.refund-status .status{
font-size: 30rpx;
font-weight: bold;
}
.refund-status .desc{
font-size: 26rpx;
margin-top: 8rpx;
}
.address-info{ .address-info{
padding: 39rpx 30rpx 0; padding: 39rpx 30rpx 0;
background-color: #ffffff; background-color: #ffffff;
...@@ -252,3 +232,196 @@ page{ ...@@ -252,3 +232,196 @@ page{
.re-address-info .re-u-name{ .re-address-info .re-u-name{
margin-right: 30rpx; margin-right: 30rpx;
} }
/* 拆单订单布局 */
.clear-box{
box-sizing: border-box;
-webkit-box-sizing: border-box;
}
.package-container{
background: #ffffff;
}
.package-products-container{
padding: 0 30rpx;
padding-top: 15rpx;
}
.order-package{
width: 100%;
height: auto;
border-bottom: dashed 1px #dddddd;
padding: 30rpx 0;
padding-bottom: 20rpx;
padding-top: 0;
}
.order-package:last-child{
border-bottom: none;
}
.order-package .package-titile{
display: flex;
align-items: center;
justify-content: space-between;
font-size: 24rpx;
color: #666666;
padding-bottom: 20rpx;
}
.package-status-color-P{
color: #409EFF;
}
.package-status-color-D{
color: #F56C6C;
}
.package-status-color-C{
color: #999999;
}
.package-status-color-R{
color: #67C23A;
}
.order-package .package-titile .package-name{
font-weight: bold;
color: #333333;
}
.order-package .package-products{
width: 100%;
height: auto;
}
.order-package .package-products .product-item{
width: 100%;
display: flex;
padding: 10rpx 0;
}
.order-package .package-products .product-item .lf-product-img{
flex: 0;
min-width: 140rpx;
max-width: 140rpx;
height: 140rpx;
}
.order-package .package-products .product-item .rg-product-info{
flex: 1;
padding-left: 20rpx;
display: flex;
flex-direction: column;
justify-content: space-around;
}
.order-package .package-products .product-item .rg-product-info .pro-name{
font-size: 28rpx;
color: #333333;
font-weight: 550;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
overflow: hidden;
}
.order-package .package-products .product-item .rg-product-info .pro-spec{
font-size: 22rpx;
color: #999999;
}
.order-package .package-products .product-item .rg-product-info .pro-count{
font-size: 22rpx;
color: #999999;
display: flex;
justify-content: space-between;
align-items: center;
}
.order-package .package-products .product-item .rg-product-info .refund-count{
font-size: 22rpx;
color: #cb3c3c;
display: flex;
justify-content: space-between;
align-items: center;
}
.order-package .package-products .product-item .rg-product-info .pro-count label{
color: #cb3c3c;
font-size: 32rpx;
}
.package-btns{
display: flex;
padding-top: 20rpx;
margin-top: 20rpx;
border-top: solid 1px #eeeeee;
display: flex;
align-items: center;
justify-content: flex-end;
}
.package-btns .btns{
width: auto;
height: 50rpx;
padding: 0 15rpx;
border: solid 1px #dddddd;
display: flex;
align-items: center;
font-size: 24rpx;
justify-content: center;
margin-left: 15rpx;
border-radius: 8rpx;
}
.package-btns .btns.pay-now{
border: solid 1px #cb3c3c;
background: #cb3c3c;
color: #ffffff;
}
.package-btns .btns.sure-get-goods{
border: solid 1px #cb3c3c;
color: #cb3c3c;
}
.package-btns .btns.normal-btn{
color: #666666;
}
.package-btns .btns:active{
opacity: 0.7;
}
.header-wrap{
position: relative;
height: 160rpx;
overflow-x: hidden;
padding: 30rpx;
box-sizing: border-box;
background-repeat: no-repeat;
background-size: 100%;
display: flex;
align-items: center;
}
.refund-status{
color: #cb3c3c;
flex: 1;
}
.refund-status .status{
font-size: 30rpx;
font-weight: bold;
display: flex;
align-items: center;
justify-content: space-between;
}
.refund-status .desc{
font-size: 26rpx;
margin-top: 8rpx;
}
\ No newline at end of file
src/project.config.json
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
"id": 16, "id": 16,
"name": "商品详情页", "name": "商品详情页",
"pathName": "pages/productDetail/productDetail", "pathName": "pages/productDetail/productDetail",
"query": "id=693123742469066752", "query": "id=694920880513486848",
"scene": null "scene": null
}, },
{ {
...@@ -205,7 +205,7 @@ ...@@ -205,7 +205,7 @@
"id": 24, "id": 24,
"name": "订单详情", "name": "订单详情",
"pathName": "pages/orderDetail/orderDetail", "pathName": "pages/orderDetail/orderDetail",
"query": "id=659705656785375232", "query": "id=695665398192017408",
"scene": null "scene": null
}, },
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment