diff --git a/src/api/member.js b/src/api/member.js
index 60ac26d..fb168bf 100755
--- a/src/api/member.js
+++ b/src/api/member.js
@@ -68,7 +68,7 @@ export function homeCouponGet (params = {}) {
export function getCardDetail (params = {}) {
// return req.get('/user/getCardDetail', params)
- return req.get('/user/receiveCardByPoint', params) //积分换优惠券操作
+ return req.post('/user/receiveCardByPoint', params) //积分换优惠券操作
}
export function userUsedCard (params = {}) {
diff --git a/src/components/sp-coupon/index.js b/src/components/sp-coupon/index.js
index 04c2e33..a2a5048 100755
--- a/src/components/sp-coupon/index.js
+++ b/src/components/sp-coupon/index.js
@@ -41,6 +41,7 @@ function SpCoupon (props) {
status,
valid,
} = info
+ console.log("🚀 ~ info:", info)
const { tag, invalidBg, bg } = COUPON_TYPE[cardType]
const couponTagBg = info.tagClass === 'used' || info.tagClass === 'overdue' || !info.valid ? invalidBg : bg
@@ -60,7 +61,8 @@ function SpCoupon (props) {
{isNew ? 有效日期：领取{fixedTerm}天内有效 :
有效日期：{beginDate}至{endDate}}
- {!valid || info.tagClass === 'used' || info.tagClass === 'overdue' ? 已{info.tagClass === 'used' ? '使用' : '过期'}
+ {/* !valid || */}
+ {info.tagClass === 'used' || info.tagClass === 'overdue' ? 已{info.tagClass === 'used' ? '使用' : '过期'}
: 立即{isNew ? '兑换' : '使用'}}
)
diff --git a/src/components/sp-filter-bar-new/index.js b/src/components/sp-filter-bar-new/index.js
index 34edfc0..da31d1c 100755
--- a/src/components/sp-filter-bar-new/index.js
+++ b/src/components/sp-filter-bar-new/index.js
@@ -31,7 +31,7 @@ export default class SpFilterBar extends Component {
curIdx: current,
sortOrder: 1,
value: '0',
- sortVal: '0',
+ sortVal: 0,
showFilter: false
}
}
diff --git a/src/components/sp-picker/picker-select.js b/src/components/sp-picker/picker-select.js
index 06a2740..b28a41b 100755
--- a/src/components/sp-picker/picker-select.js
+++ b/src/components/sp-picker/picker-select.js
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react'
+import React, { useEffect, useState } from 'react'
import { useImmer } from 'use-immer'
import { useSelector } from 'react-redux'
import { useAsyncCallback } from '@/hooks'
@@ -8,7 +8,7 @@ import './picker-select.scss'
const initialState = {
source: [],
- value: '0',
+ value: 0,
markMultiDateTime: false
}
function PickerDateTime (props) {
@@ -19,33 +19,18 @@ function PickerDateTime (props) {
{ mode: 'day', unit: '日' },
]
// const [state, setState] = useAsyncCallback({ source: props.list || [], value: props.value || '' })
- const [state, setState] = useImmer({ source: list, value: props.value })
- const { source, value } = state
- // useEffect(() => {
- // // const { dateTime, start } = this.props
- // // 推荐 上架时间 价格低-高 价格高一低
- // setState((draft) => {
- // draft.source = [
- // { text: '推荐', val: '0' },
- // { text: '上架时间', val: '3' },
- // { text: '价格低-高', val: '1' },
- // { text: '价格高-低', val: '2' },
- // ]
- // })
- // }, [])
+ // const [state, setState] = useImmer({ value: [props.value || 0] })
+ // const { source, value } = state
+ const [value, setState] = useState(props.value || [0])
- const onChange = (e, index) => {
+ const onChange = (e) => {
// const _value = [...value]
// _value[index] = e.detail.value
- // console.log(value, e.detail.value)
-
// const { source, value } = state
// source.item[]
setState(
- (draft) => {
- draft.value = e.detail.value
- },
+ e.detail.value
// ({ source, value }) => {
// const res = []
// for (let i = 0; i < source.length; i++) {
@@ -69,27 +54,26 @@ function PickerDateTime (props) {
// }
)
}
- console.log(value)
+ const handleClick = () => {
+ onPickerCancel()
+ handleConfirm(list[value[0]], value[0])
+ }
return (
onChange(e)}
+ immediateChange
// 使用acc.concat将多维数组打平成一维数组再求数组长度
>
- {source.map((item, elementIndex) => (
- {item.text}
+ {list.map((item, elementIndex) => (
+ {item.text}
))}
- {
- onPickerCancel()
- setTimeout(() => {
- handleConfirm(source[value[0]], value[0])
- }, 100)
- }}>确定
+ 确定
)
}
diff --git a/src/components/sp-sku-select-new/index.js b/src/components/sp-sku-select-new/index.js
index 2c124a5..609c440 100755
--- a/src/components/sp-sku-select-new/index.js
+++ b/src/components/sp-sku-select-new/index.js
@@ -48,7 +48,7 @@ function SpSkuSelect (props, ref) {
hideInputNumber = false,
onChangeImg
} = props
- // console.log('SpSkuSelect:info', info)
+ console.log('SpSkuSelect:info', info)
// const [state, setState] = useImmer(initialState)
const [state, setState] = useAsyncCallback(initialState)
const { selection, curImage, disabledSet, curItem, skuText, num, loading } = state
@@ -63,6 +63,7 @@ function SpSkuSelect (props, ref) {
const init = () => {
const { skuList, specItems } = info
+ console.log("🚀 ~ skuList:", skuList)
specItems.forEach((item) => {
const key = item.specItem.map((spec) => spec.specId).join('_')
skuDictRef.current[key] = item
@@ -78,11 +79,12 @@ function SpSkuSelect (props, ref) {
}
const calcDisabled = (selection, i = 0) => {
+ const { skuList } = info
const disabledSet = new Set()
const makeReg = (sel, row, val) => {
const tSel = sel.slice()
const regStr = tSel.map((s, idx) => (row === idx ? val : !s ? '(\\d+)' : s)).join('_')
- // console.log('regStr:', regStr)
+ console.log('regStr:', regStr)
return new RegExp(regStr)
}
@@ -178,7 +180,7 @@ function SpSkuSelect (props, ref) {
return null
}
- const { skuList } = info
+ // const { skuList } = info
const addToCart = async () => {
const { nospec } = info
@@ -370,7 +372,7 @@ function SpSkuSelect (props, ref) {
}
- {skuList.map((item, index) => (
+ {info.skuList.map((item, index) => (
{/* {item.skuName} */}
diff --git a/src/doc/coupon.js b/src/doc/coupon.js
index 53a93b8..ee7df02 100755
--- a/src/doc/coupon.js
+++ b/src/doc/coupon.js
@@ -31,13 +31,18 @@ export const COUPON_ITEM = {
}
},
couponStatus: ({ quantity, get_limit, user_get_num, get_num }) => {
- if (quantity - get_num <= 0) {
- return 0 // 已领完
- } else if (get_limit - user_get_num > 0) {
- return 1 // 立即领取
- } else if (get_limit - user_get_num <= 0) {
- return 2 // 已领取
+ if (typeof valid === 'undefined') {
+ return 1
+ } else {
+ return valid
}
+ // if (quantity - get_num <= 0) {
+ // return 0 // 已领完
+ // } else if (get_limit - user_get_num > 0) {
+ // return 1 // 立即领取
+ // } else if (get_limit - user_get_num <= 0) {
+ // return 2 // 已领取
+ // }
},
// fixedTerm: 'fixed_term',
fixedTerm: ({ begin_date, end_date }) => diffInDays(begin_date, end_date),
diff --git a/src/doc/trade.js b/src/doc/trade.js
index 62b0086..b7ebf27 100755
--- a/src/doc/trade.js
+++ b/src/doc/trade.js
@@ -36,7 +36,25 @@ export const TRADE_ITEM = {
refundNum: 1,
itemSpecDesc: 'item_spec_desc',
point: 'point',
- checked: () => false
+ checked: () => false,
+ descInfo: ({ item_spec_desc }) => {
+ const desc = item_spec_desc
+ let desc_info = ''
+ if (desc) {
+ try {
+ const descArr = desc.split(',')
+ descArr.forEach((item, index) => {
+ let [_, value] = item.split(':')
+ if (index === 1) {
+ value = value.substring(0, 2)
+ }
+ desc_info += value + ' '
+ })
+ } catch (error) {
+ }
+ return desc_info
+ }
+ }
})
},
point: 'point',
@@ -44,7 +62,7 @@ export const TRADE_ITEM = {
totalFee: ({ total_fee }) => total_fee / 100,
marketFee: ({ market_fee }) => market_fee / 100,
itemFee: ({ item_fee_new }) => item_fee_new / 100,
- freightFee: ({ freight_fee }) => freight_fee / 100
+ freightFee: ({ freight_fee }) => freight_fee / 100,
}
export const SHOP_INFO = {
@@ -69,11 +87,11 @@ export const TRADE_AFTER_SALES_ITEM = {
})
},
hasAftersalesAddress: ({ aftersales_address }) => isObject(aftersales_address),
- afterSalesName: ({ aftersales_address }) => aftersales_address.aftersales_name,
- afterSalesMobile: ({ aftersales_address }) => aftersales_address.aftersales_mobile,
- afterSalesAddress: ({ aftersales_address }) => aftersales_address.aftersales_address,
- afterSalesContact: ({ aftersales_address }) => aftersales_address.aftersales_contact,
- aftersalesHours: ({ aftersales_address }) => aftersales_address.aftersales_hours,
+ afterSalesName: ({ aftersales_address }) => aftersales_address.aftersales_name,
+ afterSalesMobile: ({ aftersales_address }) => aftersales_address.aftersales_mobile,
+ afterSalesAddress: ({ aftersales_address }) => aftersales_address.aftersales_address,
+ afterSalesContact: ({ aftersales_address }) => aftersales_address.aftersales_contact,
+ aftersalesHours: ({ aftersales_address }) => aftersales_address.aftersales_hours,
refundFee: ({ refund_fee }) => refund_fee / 100,
refundPoint: 'refund_point',
reason: 'reason',
diff --git a/src/pages/cart/espier-checkout.js b/src/pages/cart/espier-checkout.js
index 24b6e49..b394c42 100755
--- a/src/pages/cart/espier-checkout.js
+++ b/src/pages/cart/espier-checkout.js
@@ -910,8 +910,8 @@ function CartCheckout (props) {
运费
{totalInfo.freight_type !== 'point'
- ? `¥ ${totalInfo.freight_fee}`
- : `${totalInfo.freight_fee * 100}${this.props.pointName}`}
+ ? `¥ ${+totalInfo.freight_fee / 100}`
+ : `${totalInfo.freight_fee}${this.props.pointName}`}
diff --git a/src/pages/item/espier-detail.js b/src/pages/item/espier-detail.js
index ef8f759..5f94c9f 100755
--- a/src/pages/item/espier-detail.js
+++ b/src/pages/item/espier-detail.js
@@ -66,7 +66,7 @@ import { WgtFilm, WgtSlider, WgtWriting, WgtGoods, WgtHeading, WgtHeadline } fro
import './espier-detail.scss'
-const MSpSkuSelect = React.memo(SpSkuSelectNew)
+const MSpSkuSelect = SpSkuSelectNew
const initialState = {
id: null,
@@ -256,15 +256,15 @@ function EspierDetail (props) {
draft.defaultMsg = '商品已下架'
})
}
- if (selColorIdx != 0) {
- const spec_values = data.itemSpecDesc?.[0]?.spec_values || []
- if (spec_values.length) {
- const item = spec_values[selColorIdx]
- setTimeout(() => {
- skuSelectRef.current?.handleSelectSku({ specId: item.spec_value_id, specValueId: item.spec_value_id }, selColorIdx)
- }, 100)
- }
- }
+ // if (selColorIdx != 0) {
+ // const spec_values = data.itemSpecDesc?.[0]?.spec_values || []
+ // if (spec_values.length) {
+ // const item = spec_values[selColorIdx]
+ // setTimeout(() => {
+ // skuSelectRef.current?.handleSelectSku({ specId: item.spec_value_id, specValueId: item.spec_value_id }, selColorIdx)
+ // }, 100)
+ // }
+ // }
} catch (e) {
setState((draft) => {
draft.isDefault = true
@@ -289,7 +289,7 @@ function EspierDetail (props) {
}
})
}
- console.log("🚀 ~ data.introList:", data.introList)
+ console.log("🚀 ~ data.introList:", data)
setState((draft) => {
draft.info = {
...data,
diff --git a/src/pages/member/item-fav.js b/src/pages/member/item-fav.js
index 624e502..2da92d5 100755
--- a/src/pages/member/item-fav.js
+++ b/src/pages/member/item-fav.js
@@ -309,9 +309,9 @@ export default class ItemFav extends Component {
人收藏
- this.handleClickItem(item)}>
+ {/* this.handleClickItem(item)}>
相似推荐
-
+ */}
this.handleClickItem(item)}>
立即购买
diff --git a/src/subpage/pages/trade/cancel.scss b/src/subpage/pages/trade/cancel.scss
index 1853d88..a30452d 100755
--- a/src/subpage/pages/trade/cancel.scss
+++ b/src/subpage/pages/trade/cancel.scss
@@ -1,4 +1,4 @@
-@import "@/style/imports";
+@import '@/style/imports';
.page-trade-cancel {
.sp-cell {
@@ -9,18 +9,25 @@
}
&__bd {
width: 100%;
+ .at-tag--active {
+ color: #000;
+ border-color: #000;
+ background-color: #fff;
+ }
}
.cancel-reason {
margin: 0 6px 0 0;
}
}
.trade-cancel-footer {
- width: 100%;
position: fixed;
- left: 0;
- bottom: 0;
+ left: 30px;
+ right: 30px;
+ bottom: 50px;
+ width: 690px;
}
.toolbar_btn {
+ border-radius: 10px;
width: 100%;
box-sizing: border-box;
display: inline-block;
diff --git a/src/subpage/pages/trade/comps/new-item.js b/src/subpage/pages/trade/comps/new-item.js
index c2affc6..095d09d 100755
--- a/src/subpage/pages/trade/comps/new-item.js
+++ b/src/subpage/pages/trade/comps/new-item.js
@@ -221,7 +221,7 @@ export default class TradeItem extends Component {
{info.status_desc}
- {info.receipt_type !== 'dada' && (
+ {/* {info.receipt_type !== 'dada' && (
- )}
+ )} */}
{info.receipt_type !== 'dada' && (
diff --git a/src/subpage/pages/trade/detail.scss b/src/subpage/pages/trade/detail.scss
index 41be52b..172f7c2 100755
--- a/src/subpage/pages/trade/detail.scss
+++ b/src/subpage/pages/trade/detail.scss
@@ -456,7 +456,8 @@ $paddingBottom: 100px;
left: 0;
width: 100%;
height: 100px;
- bottom: $edge-margin;
+ // bottom: $edge-margin;
+ bottom: 30px;
background: #fff;
display: flex;
justify-content: space-evenly;
@@ -740,6 +741,22 @@ $paddingBottom: 100px;
height: 650px;
color: #000;
font-size: 26px;
+ .receiver_item {
+ display: flex;
+ box-sizing: border-box;
+ font-style: 20px;
+ &:not(:last-child) {
+ margin-bottom: 30px;
+ }
+ &_left {
+ width: 190px;
+ font-style: 20px;
+ }
+ &_right {
+ flex: 1;
+ font-style: 20px;
+ }
+ }
}
}
.no-text {
diff --git a/src/subpage/pages/trade/split-bagpack.js b/src/subpage/pages/trade/split-bagpack.js
index 6a30825..fd2b641 100755
--- a/src/subpage/pages/trade/split-bagpack.js
+++ b/src/subpage/pages/trade/split-bagpack.js
@@ -3,7 +3,7 @@ import Taro, { getCurrentInstance } from '@tarojs/taro'
import { View, Text, Button, Image, ScrollView } from '@tarojs/components'
import { connect } from 'react-redux'
import { AtCountdown } from 'taro-ui'
-import { Loading, SpToast, SpNavBar, FloatMenuMeiQia, SpImg } from '@/components'
+import { Loading, SpToast, SpNavBar, FloatMenuMeiQia, SpImg, SpPage } from '@/components'
import { pickBy, formatTime, resolveOrderStatus } from '@/utils'
import api from '@/api'
@@ -27,7 +27,7 @@ import './split-bagpack.scss'
// }
export default class TradeDetail extends Component {
$instance = getCurrentInstance()
- constructor (props) {
+ constructor(props) {
super(props)
this.state = {
@@ -68,8 +68,8 @@ export default class TradeDetail extends Component {
}
return (
-
-
+
+ {/* */}
您有{delivery_num}个包裹已发出
@@ -97,7 +97,7 @@ export default class TradeDetail extends Component {
)}
{/* */}
@@ -112,7 +112,7 @@ export default class TradeDetail extends Component {
{/* */}
-
+
)
}
}
diff --git a/src/subpages/marketing/coupon-center.js b/src/subpages/marketing/coupon-center.js
index 395e77a..4861879 100755
--- a/src/subpages/marketing/coupon-center.js
+++ b/src/subpages/marketing/coupon-center.js
@@ -6,7 +6,7 @@ import api from '@/api'
import doc from '@/doc'
import qs from 'qs'
import { View, Text } from '@tarojs/components'
-import { pickBy, showToast, isWeixin, entryLaunch, styleNames } from '@/utils'
+import { pickBy, showToast, isWeixin, entryLaunch, styleNames, thousandthFormat } from '@/utils'
import { SpPage, SpScrollView, SpCoupon, SpImage } from '@/components'
import './coupon-center.scss'
@@ -23,10 +23,10 @@ function CouponCenter (props) {
useEffect(() => { getMypoint() }, [])
const getMypoint = async () => {
- // const { point } = await api.pointitem.getMypoint()
- const { point } = await api.member.memberInfo()
+ const { point } = await api.pointitem.getMypoint()
+ // const { point } = await api.member.memberInfo()
setState((draft) => {
- draft.point = point
+ draft.point = thousandthFormat(point)
})
}
@@ -103,7 +103,7 @@ function CouponCenter (props) {
}
const getCoupon = async ({ cardId }, index) => {
- const { status } = await api.member.homeCouponGet({
+ const { status } = await api.member.getCardDetail({
card_id: cardId
})
if (status) {
@@ -151,7 +151,7 @@ function CouponCenter (props) {
}
const getPoint = async () => {
- await api.member.depositToPoint({ money: 50000 })
+ await api.member.depositToPoint({ money: 10000 })
showToast('积分+500')
setState((draft) => {
draft.couponList = []
diff --git a/src/subpages/marketing/coupon-picker.js b/src/subpages/marketing/coupon-picker.js
index 02db207..a5fbf4f 100755
--- a/src/subpages/marketing/coupon-picker.js
+++ b/src/subpages/marketing/coupon-picker.js
@@ -97,6 +97,7 @@ function CouponPicker (props) {
暂不使用优惠券
+ {/* 暂不使用优惠券 */}
}
>
diff --git a/src/subpages/trade/after-sale.js b/src/subpages/trade/after-sale.js
index 3b5167e..55d8ceb 100755
--- a/src/subpages/trade/after-sale.js
+++ b/src/subpages/trade/after-sale.js
@@ -1,15 +1,15 @@
-import React, { useEffect, useRef } from "react";
+import React, { useEffect, useRef } from "react"
import { useSelector } from "react-redux"
import { useImmer } from "use-immer"
-import Taro, { getCurrentInstance } from "@tarojs/taro";
+import Taro, { getCurrentInstance } from "@tarojs/taro"
import api from "@/api"
import doc from "@/doc"
import { AtButton, AtInput, AtTextarea } from 'taro-ui'
-import { SpPage, SpTabs, SpCell, SpCheckbox, SpImage, SpInputNumber, SpFloatLayout, SpUpload, SpPrice, SpHtml } from '@/components'
+import { SpPage, SpTabs, SpCell, SpCheckbox, SpImage, SpInputNumber, SpFloatLayout, SpUpload, SpPrice, SpHtml, SpOrderItem } from '@/components'
import { View, Text, Picker } from "@tarojs/components"
import { AFTER_SALE_TYPE, REFUND_FEE_TYPE } from '@/consts'
-import { pickBy, showToast, classNames, VERSION_STANDARD, VERSION_PLATFORM } from '@/utils'
-import "./after-sale.scss";
+import { pickBy, showToast, classNames, VERSION_STANDARD, VERSION_PLATFORM, JumpGoodDetail } from '@/utils'
+import "./after-sale.scss"
const initialState = {
info: null,
@@ -37,7 +37,7 @@ const initialState = {
}
}
-function TradeAfterSale(props) {
+function TradeAfterSale (props) {
const $instance = getCurrentInstance()
const [state, setState] = useImmer(initialState)
const pageRef = useRef()
@@ -75,7 +75,7 @@ function TradeAfterSale(props) {
const { orderInfo, offline_aftersales_is_open, distributor } = await api.trade.detail(id)
const reasons = await api.aftersales.reasonList()
const { intro, is_open } = await api.aftersales.remindDetail()
- const { offline_aftersales } = distributor
+ const { offline_aftersales } = distributor
const _info = pickBy(orderInfo, doc.trade.TRADE_ITEM)
setState(draft => {
draft.info = _info
@@ -205,49 +205,113 @@ function TradeAfterSale(props) {
}
>
- {
+
+ 请选择售后类型:
+ item.title)}
+ onChange={(e) => {
+ setState(draft => {
+ draft.curTabIdx = +e.detail.value
+ })
+ }}
+ >
+
+ {tabList[curTabIdx] ? tabList[curTabIdx].title : '请选择售后类型'}
+ -1 ? '#000' : '#a5a5a5' }}>
+
+
+
+ {/* {
setState(draft => {
draft.curTabIdx = e
})
- }} />
-
+ }} /> */}
+ 请选择您要退货的商品
+
+ { }} />
+
{
info?.items.map((item, index) => (
-
-
-
-
-
-
-
-
- {item.itemName}
-
-
- {item.itemSpecDesc && {`${item.itemSpecDesc}`}}
- x {item.num}
-
-
- 退款数量
- onChangeItemNum(e, index)}
- />
+
+
+
+
+
+
+ {/* {
+ if (info.order_class == 'pointsmall') {
+ Taro.navigateTo({
+ url: `/subpages/pointshop/espier-detail?id=${item.good_id}`
+ })
+ } else {
+ JumpGoodDetail(item.good_id, item.distributor_id)
+ }
+ }}
+ /> */}
+
+
+
+ {item.itemName}
+
+
+ {item.itemSpecDesc && {`${item.descInfo}`}}
+ {/* x {item.num} */}
+
+
+ 数量：{item.num}
+
+ onChangeItemNum(e, index)}
+ />
+
+
))
}
-
+
+ 退货原因:
+ {
+ setState(draft => {
+ draft.reasonIndex = e.detail.value
+ })
+ }}
+ >
+
+ {`${reasons?.[reasonIndex] || '请选择退货原因'}`}
+
+
+
+
+
+
+ 退货数量:
+
+ {`${reasons?.[reasonIndex] || '请选择退货数量'}`}
+
+
+
+ {/*
{`${reasons?.[reasonIndex] || '请选择取消原因'}`}}>
-
+ */}
+
-
+
+ {false &&
@@ -270,7 +336,7 @@ function TradeAfterSale(props) {
{/* */}
-
+ }
{curTabIdx == 1 &&
{
diff --git a/src/subpages/trade/after-sale.scss b/src/subpages/trade/after-sale.scss
index fcb8eec..e9dbdb5 100755
--- a/src/subpages/trade/after-sale.scss
+++ b/src/subpages/trade/after-sale.scss
@@ -1,4 +1,36 @@
.page-trade-after-sale {
+ .after-item {
+ padding: 0 22px;
+ &.mt-40 {
+ margin-top: 40px;
+ }
+ &-label {
+ color: #000;
+ font-size: 26px;
+ line-height: 1;
+ margin-bottom: 20px;
+ }
+ .color-hui {
+ background: #f5f5f5;
+ }
+ &-input {
+ box-sizing: border-box;
+ background: #f5f5f5;
+ border-radius: 6px;
+ padding: 20px 50px;
+ color: #000;
+ position: relative;
+ .icon-arrowRight {
+ font-size: 34px;
+ position: absolute;
+ right: 60px;
+ top: 30%;
+ // transform: translateY(-50%);
+ color: #000;
+ rotate: 90deg;
+ }
+ }
+ }
.btn-wrap {
padding: 20px;
}
@@ -30,6 +62,18 @@
border-radius: 16px;
overflow: hidden;
}
+ .choose-item {
+ margin: 26px 22px 24px;
+ font-size: 26px;
+ }
+ .choose-all {
+ display: flex;
+ padding-left: 54px;
+ box-sizing: border-box;
+ .sp-checkbox-new__label {
+ font-style: 26px;
+ }
+ }
.reason-container {
background-color: #e2e4ea;
margin-top: 32px;
@@ -39,7 +83,7 @@
}
.refund-items {
background-color: #fff;
- margin: 24px 16px 0;
+ margin: 0px 22px 0;
border-radius: 16px;
.title {
font-size: 30px;
@@ -50,14 +94,26 @@
}
.items-container {
// padding: 0 32px 20px;
- padding: 24px 20px;
+ padding: 24px 0;
+ }
+ .item-box {
+ padding: 30px;
+ background: #f7f7f7;
+ border-radius: 6px;
+ &:not(:last-child) {
+ margin-bottom: 10px;
+ }
+ .sp-price {
+ display: block;
+ text-align: end;
+ }
}
.item-wrap {
display: flex;
align-items: center;
- &:not(:last-child) {
- margin-bottom: 20px;
- }
+ }
+ .item-hd {
+ margin-right: 40px;
}
.item-bd {
flex: 1;
@@ -65,31 +121,46 @@
align-items: center;
}
.goods-info {
- margin-left: 24px;
+ margin-left: 60px;
flex: 1;
- margin-top: 8px;
+ height: 150px;
+ display: flex;
+ justify-content: space-between;
+ flex-direction: column;
+ padding: 10px 0;
+ box-sizing: border-box;
&-hd {
display: flex;
+ font-size: 20px;
justify-content: space-between;
}
&-bd {
display: flex;
justify-content: space-between;
align-items: center;
+ font-size: 20px;
.num {
font-size: 24px;
}
}
&-ft {
display: flex;
- justify-content: space-between;
+ // justify-content: space-between;
align-items: center;
- margin-top: 10px;
+ // margin-top: 10px;
+ font-size: 20px;
+ .sp-price {
+ margin-left: 30px;
+ .sp-price__symbol {
+ margin-right: 2px !important;
+ }
+ }
}
.goods-title {
font-weight: 500;
- color: #111a34;
- font-size: 26px;
+ // color: #111a34;
+ color: #000;
+ font-size: 20px;
}
.goods-num {
font-size: 22px;
@@ -97,13 +168,11 @@
color: #111a34;
}
.sku-info {
- font-size: 24px;
- font-weight: 400;
- color: #858b9c;
- background: #f5f5f5;
- padding: 0 10px;
+ padding: 20px 0;
height: 34px;
line-height: 34px;
+ font-size: 20px;
+ opacity: 0.85;
}
}
.refund-detail {