panxiaohe
/
ceres-uniapp-v2.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

订单详情页面调整修改

master
dy-hu 10 months ago
parent
3728caa5fe
commit
52afec68f1
3 changed files with 128 additions and 104 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      pages.json
  2. 218
      pages_category_page1/orderModule/orderDetails.vue
  3. 2
      pages_category_page2/userModule/messageCenter.vue

12
pages.json
View File

@ -221,9 +221,9 @@
"path": "orderModule/orderDetails",
"style": {
"navigationBarTitleText": "%page.orderdetail%",
"navigationBarBackgroundColor": "#333333",
"backgroundColor": "#333333",
"navigationBarTextStyle": "white"
"navigationBarBackgroundColor": "#E5E6F6",
"backgroundColor": "#E5E6F6",
"navigationBarTextStyle": "black"
}
}, {
"path": "orderModule/afterSaleApplyRefund",
@ -668,19 +668,19 @@
"pagePath": "pages/tabbar/category/index",
"iconPath": "static/images/tabbar/fenlei.png",
"selectedIconPath": "static/images/tabbar/fenleiactive.png"
},
{
"pagePath": "pages/tabbar/cart/index",
"iconPath": "static/images/tabbar/gouwuche.png",
"selectedIconPath": "static/images/tabbar/gouwucheactive.png"
},
{
"pagePath": "pages/tabbar/user/index",
"iconPath": "static/images/tabbar/wode.png",
"selectedIconPath": "static/images/tabbar/wodeactive.png",
"navigationBarBackgroundColor": "#333333",
"backgroundColor": "#333333",
"navigationBarTextStyle": "white"

218
pages_category_page1/orderModule/orderDetails.vue
View File

@ -10,10 +10,10 @@
<view class="l">
<text class="status">等待买家付款</text>
<!-- <text class="label">剩{{hou}}小时{{min}}分{{sec}}秒自动关闭</text> -->
<view style="color: #FFFFFF; margin-top: 20rpx;">
<view style="color: #252744; margin-top: 20rpx;">
<text>剩</text>
<u-count-down :timestamp="remainingTime" fontSize="24rpx" :separator="zh"
separatorColor="#FFFFFF" separatorSize="24rpx"></u-count-down>
separatorColor="#252744" separatorSize="24rpx"></u-count-down>
<text>自动关闭</text>
</view>
</view>
@ -81,7 +81,7 @@
</view>
<view class="order-details-info-box">
<view class="address-box">
<image src="https://ceres.zkthink.com/static/images/orderAddress.png" class="address-img">
<image src="https://wechat.hnthee.com/ceres-local-file/image/orderdetail_location.png" class="address-img">
</image>
<view class="address-r">
<view class="address-name-box">
@ -100,15 +100,15 @@
<view class="item">
<view class="order-list-top">
<view class="top-l" @click="goShop(dataList.shopId)">
<image src="https://ceres.zkthink.com/static/images/orderStoreIcon.png"
<image src="https://wechat.hnthee.com/ceres-local-file/image/cart_shop.png"
class="shop-img"></image>
<text class="shop-name">{{ dataList.shopName }}</text>
<image src="https://ceres.zkthink.com/static/images/arrowRight.png"
<image src="https://wechat.hnthee.com/ceres-local-file/image/icon_cart_shop_forward.png"
class="arrow-img">
</image>
</view>
<view class="toService" @click="openService">
<image src="https://ceres.zkthink.com/static/images/serviceImg-order-detail.png"
<image src="https://wechat.hnthee.com/ceres-local-file/image/orderdetail_customer.png"
class="service-img"></image>
<text>联系客服</text>
</view>
@ -137,7 +137,7 @@
<!-- </view>-->
<view
v-if="(dataList.state === 3 || dataList.state === 4) && proItem.afterState == 0 && !proItem.returnType">
v-if="(dataList.state === 3 || dataList.state === 4) && proItem.afterState == 0 && !proItem.returnType">
<view class="item-applay-btn"
v-if="proItem.returnStatus == null || (!proItem.canApplyIntervention && proItem.returnStatus == 2)"
@click.stop="applayItemTap(proItem)">退款
@ -223,13 +223,13 @@
<!-- 待付款 价格是橙色-->
<view class="order-total-box" v-else-if="dataList.state==1">
<text>需付款</text>
<text class="way-color">¥{{ dataList.price }}</text>
<text class="way-orange-color">¥{{ dataList.price }}</text>
</view>
<!-- 退款成功 交易关闭 -->
<view class="order-total-box"
v-else-if="(dataList.returnType==1 && dataList.moneyReturnList.status==4) || (dataList.returnType==2 && dataList.goodsReturn.status==6) || (dataList.state==5)">
<text>需付款</text>
<text>¥{{ dataList.price }}</text>
<text class="way-color">¥{{ dataList.price }}</text>
</view>
</view>
</view>
@ -301,7 +301,7 @@
<text class="btn btn-r"
@click="goInviteSpll(dataList.collageId,dataList.orderId,dataList.skus[0].productId,dataList.skus[0].skuId,dataList.shopGroupWorkId)"
v-if="dataList.state==6">邀请拼单</text>
<text class="btn-l" @click="delOrder" v-if="dataList.state==5 && dataList.collageId == 0">删除订单</text>
<text class="btn-del" @click="delOrder" v-if="dataList.state==5 && dataList.collageId == 0">删除订单</text>
<text class="btn btn-r"
@click="againCollage(dataList.skus[0].productId,dataList.shopId,dataList.skus[0].skuId,dataList)"
v-if="dataList.state==5 && dataList.collageId == 0">再次购买</text>
@ -998,7 +998,7 @@
.order-details-status {
width: 750upx;
height: 250upx;
background: #333333;
background: linear-gradient(0deg, #FAFAFA, #E5E6F6);
}
.status-title-box {
@ -1026,14 +1026,15 @@
.status-title-box .l .status,
.status-title-box2 .status {
font-size: 30upx;
color: #fff;
font-size: 32rpx;
color: #252744;
font-weight: bold;
}
.status-title-box .l .label,
.status-title-box2 .label {
font-size: 24upx;
color: #fff;
font-size: 28rpx;
color: #252744;
margin-top: 14upx;
}
@ -1057,6 +1058,7 @@
display: flex;
flex-direction: row;
align-items: center;
border-radius: 30rpx;
}
.address-box .address-img {
@ -1080,41 +1082,43 @@
}
.address-name-box {
font-size: 30upx;
color: #333;
font-size: 28rpx;
color: #252744;
}
.phone {
font-size: 24upx;
color: #999;
font-size: 28rpx;
color: #90919C;
margin-left: 20upx;
}
.address-info {
font-size: 28upx;
color: #333;
margin-top: 15upx;
font-size: 28rpx;
color: #252744;
margin-top: 15rpx;
}
.order-list-box {
margin-top: 20upx;
.toService {
line-height: 40rpx;
padding: 0 8rpx;
border: 1rpx solid #FAF6ED;
//line-height: 40rpx;
padding: 6rpx 20rpx;
border: 1rpx solid #252744;
border-radius: 340rpx;
cursor: pointer;
display: flex;
align-items: center;
.service-img {
width: 60upx;
height: 60upx;
width: 32rpx;
height: 32rpx;
margin-right: 12rpx;
}
text {
line-height: 40rpx;
//line-height: 40rpx;
font-size: 24rpx;
}
}
}
@ -1122,6 +1126,7 @@
.order-list-box .item {
margin-bottom: 20upx;
background: #fff;
border-radius: 30rpx;
}
.order-list-top {
@ -1132,7 +1137,7 @@
flex-direction: row;
align-items: center;
justify-content: space-between;
border-bottom: 1px solid #eee;
border-bottom: 1px solid #F2F2F6;
}
.top-l {
@ -1142,21 +1147,22 @@
}
.shop-img {
width: 34upx;
height: 34upx;
margin-right: 10upx;
width: 34rpx;
height: 34rpx;
margin-right: 10rpx;
}
.shop-name {
font-size: 30upx;
color: #333;
font-size: 30rpx;
color: #252744;
font-weight: bold;
}
.arrow-img {
margin-left: 15upx;
width: 24upx;
height: 24upx;
width: 14rpx;
height: 24rpx;
margin-left: 12rpx;
margin-top: 6rpx;
}
.order-info-box {
@ -1175,10 +1181,10 @@
}
.product-img {
width: 180upx;
height: 180upx;
border-radius: 10upx;
margin-right: 30upx;
width: 180rpx;
height: 180rpx;
border-radius: 30upx;
margin-right: 25upx;
}
.info-box {
@ -1189,10 +1195,8 @@
}
.product-name {
font-size: 26upx;
color: #333;
height: 68upx;
line-height: 34upx;
font-size: 28rpx;
color: #252744;
display: -webkit-box;
overflow: hidden;
text-overflow: ellipsis;
@ -1210,8 +1214,8 @@
}
.product-sku {
font-size: 24upx;
color: #999;
font-size: 28rpx;
color: #90919C;
display: inline-block;
margin-left: -20upx;
display: flex;
@ -1224,35 +1228,34 @@
}
.product-price1 {
font-size: 24upx;
color: #333;
font-size: 32rpx;
color: #90919C;
font-weight: 400;
}
.product-price2 {
font-size: 24upx;
color: #999;
font-size: 32rpx;
color: #90919C;
text-decoration: line-through;
font-weight: 400;
}
.product-price .fuhao {
font-size: 28upx;
font-size: 32rpx;
}
.item-applay-btn {
height: 50upx;
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
padding: 0 30upx;
padding: 4rpx 25upx;
background: rgba(255, 255, 255, 1);
border: 1px solid rgba(187, 187, 187, 1);
border: 1px solid #252744;
border-radius: 25upx;
font-size: 24upx;
font-weight: 400;
color: rgba(51, 51, 51, 1);
color: #252744;
}
.product-num {
@ -1272,12 +1275,12 @@
flex-direction: row;
align-items: center;
justify-content: space-between;
font-size: 26upx;
color: #333;
font-size: 28rpx;
color: #90919C;
}
.delivery-way-box .item .way {
color: #999;
color: #90919C;
}
.order-total-box {
@ -1286,17 +1289,27 @@
flex-direction: row;
align-items: center;
justify-content: space-between;
font-size: 26upx;
color: #333;
font-size: 28rpx;
color: #252744;
}
.order-total-box .way-color {
color: #333333;
font-size: 32rpx;
color: #252744;
font-weight: bold;
font-size: 28rpx;
}
.order-total-box .way-orange-color {
color: orange;
font-weight: bold;
font-size: 28rpx;
}
.order-details-information {
background: #fff;
margin-right: 30rpx;
margin-left: 30rpx;
border-radius: 30rpx;
}
.order-details-information.padd {
@ -1305,9 +1318,9 @@
}
.order-details-information .order-title {
font-size: 30upx;
color: #333;
font-weight: 500;
font-size: 32rpx;
color: #252744;
font-weight: 400;
display: flex;
flex-direction: row;
align-items: center;
@ -1322,14 +1335,14 @@
flex-direction: row;
align-items: center;
justify-content: space-between;
font-size: 24upx;
color: #666;
font-size: 28rpx;
color: #252744;
margin-bottom: 20upx;
}
.order-details-information .info-box .item .copy-color {
font-size: 24upx;
color: #C5AA7B;
color: #F54639;
}
.order-details-btn {
@ -1351,26 +1364,41 @@
.order-details-btn .btn {
width: 100%;
height: 100upx;
background: #333333;
font-size: 28upx;
color: #FFEBC4;
height: 98rpx;
background: #252744;
font-size: 30rpx;
color: #FFFFFF;
text-align: center;
line-height: 100upx;
font-weight: 500upx;
line-height: 98rpx;
font-weight: 400rpx;
border-radius: 50rpx;
}
.order-details-btn .btn-l {
width: 50%;
height: 100upx;
border: 2rpx solid #333333;
font-size: 28upx;
color: #333;
height: 98rpx;
border: 1rpx solid #252744;
font-size: 30rpx;
color: #252744;
text-align: center;
line-height: 100upx;
line-height: 98rpx;
box-sizing: border-box;
margin-right: 10rpx;
}
border-radius: 50rpx;
}
.order-details-btn .btn-del {
width: 50%;
height: 98rpx;
border: 1rpx solid #F54639;
font-size: 30rpx;
color: #F54639;
text-align: center;
line-height: 98rpx;
box-sizing: border-box;
margin-right: 10rpx;
border-radius: 50rpx;
}
.order-details-btn .btn-r {
width: 50%;
@ -1400,25 +1428,21 @@
}
.evaluate {
height: 56upx;
border-radius: 28upx;
border-radius: 30rpx;
text-align: center;
line-height: 56upx;
font-size: 26upx;
padding: 0 30upx;
border: 1px solid #C5AA7B;
color: #C5AA7B;
font-size: 24rpx;
padding: 4rpx 25upx;
border: 1px solid #252744;
color: #252744;
}
.evaluate2 {
height: 56upx;
border-radius: 28upx;
border-radius: 30rpx;
text-align: center;
line-height: 56upx;
font-size: 26upx;
padding: 0 30upx;
border: 1px solid #BBBBBB;
color: #333;
font-size: 24rpx;
padding: 4rpx 25rpx;
border: 1px solid #252744;
color: #252744;
}
.emptyOrder-box {
@ -1518,7 +1542,7 @@
border-radius: 40upx;
font-size: 28upx;
text-align: center;
background: linear-gradient(90deg, rgba(255, 162, 0, 1), rgba(255, 121, 17, 1));
background: linear-gradient(-10deg, #252744, #484A66);
color: #fff;
display: inline-block;
margin-right: 66upx;
@ -1528,7 +1552,7 @@
.period-radio {
margin: 30upx;
padding-right: 100upx;
padding-right: 98rpx;
width: 95%;
border-bottom: 1px solid #EFEFEF;

2
pages_category_page2/userModule/messageCenter.vue
View File

@ -4,7 +4,7 @@
<view>
<view v-if="messageList.length" class="flex-items flex-sp-between fs26 topTitBox">
<view>
{{$t('common.unreadmsgcount', num)}}
{{$t('common.unreadmsgcount',{"number": num})}}
</view>
<view v-if="num!=0" class="allRead" @click="allMessage">
全部已读

Write Preview
Loading…
Cancel
Save