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

1.订单中心界面修改调整 2.申请售后页面修改调整

master
dy-hu 10 months ago
parent
ae0fe81eb3
commit
fe8e3ec6b3
4 changed files with 91 additions and 79 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. 4
      locale/en.json
  2. 4
      locale/zh-Hans.json
  3. 48
      pages_category_page1/orderModule/afterSaleApply.vue
  4. 114
      pages_category_page1/orderModule/index.vue

4
locale/en.json
View File

@ -628,5 +628,7 @@
"product.productgroupname_empty":"分组名称不能为空",
"user.myserver": "My Service",
"user.otherserver": "Other Service",
"user.growthvalue": "Growth Value"
"user.growthvalue": "Growth Value",
"common.refund_only":"Refund only",
"common.refunds_and_returns":"Refunds and Returns"
}

4
locale/zh-Hans.json
View File

@ -628,5 +628,7 @@
"product.productgroupname_empty":"分组名称不能为空",
"user.myserver": "我的服务",
"user.otherserver": "其他服务",
"user.growthvalue": "成长值"
"user.growthvalue": "成长值",
"common.refund_only":"仅退款",
"common.refunds_and_returns":"退款退货"
}

48
pages_category_page1/orderModule/afterSaleApply.vue
View File

@ -10,7 +10,7 @@
<view class="order-info">
<u-checkbox-group @change="checkboxGroupChange">
<u-checkbox
active-color="#C5AA7B"
active-color="#252744"
shape="circle"
size="40"
v-for="(item, index) in item.skus"
@ -45,7 +45,7 @@
<checkbox-group name="allCheck"
@change="changeAll">
<label>
<checkbox color="#C5AA7B"
<checkbox color="#252744"
:value="allCheck.value"
:checked="allCheck.checked"/>
<text>{{ allCheck.name }}</text>
@ -53,7 +53,7 @@
</checkbox-group>
</view>
<view class="selectRight flex-items">
<view class="selectNum">{{ number || 0 }}件商品</view>
<view style="margin-right: 12rpx">{{ number || 0 }}件商品</view>
<view class="totalPrice">合计：
<text>￥{{ total.toFixed(2) }}</text>
</view>
@ -61,11 +61,11 @@
</view>
<view class="afterBtnBox flex-items flex-sp-between">
<view class="afterBtn1"
@click="ReturnMoney(item)">仅退款
@click="ReturnMoney(item)">{{$t('common.refund_only')}}
</view>
<view v-if="distribution !== 1"
class="afterBtn2"
@click="ReturnGoods(item)">退款退货
@click="ReturnGoods(item)">{{$t('common.refunds_and_returns')}}
</view>
</view>
</view>
@ -83,7 +83,7 @@ export default {
checkboxChangelist: [],
xuanzlist: [],
allCheck: {
name: '全选',
name: this.$t('common.chooseall'),
value: 'all',
checked: false
},
@ -326,10 +326,10 @@ page {
}
.product-name {
font-size: 26upx;
color: #333;
height: 68upx;
line-height: 34upx;
font-size: 28rpx;
color: #252744;
//height: 68upx;
//line-height: 34upx;
display: -webkit-box;
overflow: hidden;
text-overflow: ellipsis;
@ -346,24 +346,24 @@ page {
}
.product-sku {
font-size: 24upx;
color: #999;
margin-top: 30upx;
font-size: 28rpx;
color: #90919C;
margin-top: 12rpx;
}
.product-price {
font-size: 28upx;
color: #333;
font-size: 32rpx;
color: #252744;
font-weight: 400;
}
.product-price .fuhao {
font-size: 28upx;
font-size: 32rpx;
}
.product-num {
font-size: 28upx;
color: #999;
font-size: 32rpx;
color: #90919C;
}
.afterSale-select-box {
@ -382,9 +382,10 @@ page {
.afterBtn1 {
width: 342rpx;
line-height: 100rpx;
border: 2rpx solid #333333;
border: 1rpx solid #252744;
text-align: center;
color: #333333;
color: #252744;
border-radius: 50rpx;
margin-right: 30rpx;
}
@ -393,13 +394,14 @@ page {
height: 100rpx;
line-height: 100rpx;
background: #333333;
border: 2rpx solid #333333;
border: 1rpx solid #252744;
border-radius: 50rpx;
text-align: center;
color: #FFEBC4;
color: #252744;
}
}
.selectBox /deep/ .uni-checkbox:not([disabled]) .uni-checkbox-input:hover {
border-color: #C5AA7B;
border-color: #252744;
}
</style>

114
pages_category_page1/orderModule/index.vue
View File

@ -12,7 +12,7 @@
:list="tabList"
disabled
:is-scroll="false"
active-color="#C5AA7B !important"
active-color="#252744 !important"
:current="tabCurrentType"
@change="handleTabChange"
/>
@ -34,13 +34,17 @@
class="top-l"
@click.stop="goShop(orderItem.shopId)"
>
<image
<!-- <image
:src="orderItem.shopLogo"
class="shop-img"
/>-->
<image
src="https://wechat.hnthee.com/ceres-local-file/image/cart_shop.png"
class="shop-img"
/>
<text class="shop-name">{{ orderItem.shopName }}</text>
<image
src="https://ceres.zkthink.com/static/images/arrowRight.png"
src="https://wechat.hnthee.com/ceres-local-file/image/icon_cart_shop_forward.png"
class="arrow-img"
/>
</view>
@ -71,11 +75,8 @@
<text class="product-price">
<text
class="fuhao"
>￥
</text>
{{ skuItem.price && skuItem.price }}
</text>
<text class="product-num">x {{ skuItem.number&&skuItem.number }}</text>
>￥</text>{{ skuItem.price && skuItem.price }}</text>
<text class="product-num">x{{ skuItem.number&&skuItem.number }}</text>
</view>
<view
v-if="skuItem.commentId === 0 && orderItem.state === 4"
@ -96,9 +97,9 @@
<template v-if="orderItem.orderPrice!==undefined || orderItem.discountPrice!==undefined">
总价¥{{
(orderItem.orderPrice + orderItem.logisticsPrice).toFixed(2)
}},优惠¥{{ orderItem.discountPrice }}
}}，优惠¥{{ orderItem.discountPrice }}
<span v-if="orderItem.price > 0">
<span v-if="orderItem.price > 0" style="font-weight: bold">
，{{ orderItem.state === 1 ? '应付¥' : '实付¥' }}{{ orderItem.price }}
</span>
</template>
@ -804,24 +805,25 @@ page {
.shop-img {
width: 36rpx;
height: 36rpx;
margin-right: 10rpx;
margin-right: 12rpx;
}
.shop-name {
font-size: 30rpx;
color: #333;
color: #252744;
font-weight: bold;
}
.arrow-img {
margin-left: 15rpx;
width: 25rpx;
height: 25rpx;
margin-left: 12rpx;
margin-top: 6rpx;
width: 14rpx;
height: 24rpx;
}
.order-status {
font-size: 32upx;
color: #C5AA7B;
font-size: 28rpx;
color: #F54639;
font-weight: 400;
}
@ -836,7 +838,7 @@ page {
.delIcon {
width: 40rpx;
height: 40rpx;
background: url("https://ceres.zkthink.com/static/images/delListOrder.png") no-repeat center center;
background: url("https://wechat.hnthee.com/ceres-local-file/image/order_del.png") no-repeat center center;
background-size: contain;
}
}
@ -847,7 +849,7 @@ page {
}
.order-info {
border-bottom: 1px solid #eee;
//border-bottom: 1px solid #eee;
}
.order-info-item {
@ -857,9 +859,10 @@ page {
}
.product-img {
width: 180upx;
height: 180upx;
margin-right: 30upx;
width: 180rpx;
height: 180rpx;
margin-right: 25rpx;
border-radius: 30rpx;
}
.info-box {
@ -870,10 +873,8 @@ page {
}
.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;
@ -889,30 +890,31 @@ page {
}
.product-sku {
font-size: 24upx;
color: #999;
font-size: 28rpx;
color: #90919C;
margin-top: -25rpx;
}
.product-price {
font-size: 28upx;
color: #333;
font-size: 32rpx;
color: #252744;
font-weight: 400;
}
.product-price .fuhao {
font-size: 28upx;
font-size: 32rpx;
}
.product-num {
display: inline-view;
font-size: 28upx;
font-size: 32rpx;
margin-left: 20upx;
color: #999;
}
.total-price-box {
font-size: 26upx;
color: #333;
font-size: 28rpx;
color: #252744;
text-align: right;
padding: 30upx 0;
}
@ -929,40 +931,44 @@ page {
width: 150upx;
height: 56upx;
text-align: center;
line-height: 56upx;
line-height: 50upx;
font-size: 26upx;
color: #333;
color: #252744;
margin-left: 20upx;
}
.evaluate {
height: 56upx;
height: 52rpx;
text-align: center;
line-height: 56upx;
font-size: 26upx;
padding: 0 30upx;
color: #C5AA7B;
background: #333333;
line-height: 52rpx;
font-size: 26rpx;
padding: 0 25rpx;
color: #FFFFFF;
background: #252744;
border-radius: 50rpx;
}
.evaluate2 {
height: 56upx;
height: 52rpx;
text-align: center;
line-height: 56upx;
font-size: 26upx;
padding: 0 30upx;
background: #333333;
color: #C5AA7B;
line-height: 52rpx;
font-size: 26rpx;
padding: 0 25rpx;
background: #252744;
border-radius: 50rpx;
color: #FFFFFF;
}
.order-btn-box .btn.l {
border: 2rpx solid #333333;
color: #333;
border: 1rpx solid #252744;
color: #252744;
border-radius: 50rpx;
}
.order-btn-box .btn.r {
border: 2rpx solid #C5AA7B;
color: #C5AA7B;
border: 1rpx solid #252744;
color: #252744;
border-radius: 50rpx;
}
.emptyOrder-box {
@ -1004,9 +1010,9 @@ page {
width: 80%;
height: 88rpx;
margin-top: 15rpx;
border-radius: 15rpx;
border-radius: 50rpx;
color: #fff;
background-color: #c5aa7b;
background-color: #252744;
display: flex;
align-items: center;
justify-content: center;

Write Preview
Loading…
Cancel
Save