diff --git a/src/components/goods-evaluation/index.js b/src/components/goods-evaluation/index.js index 88d6e9e..25ad91a 100755 --- a/src/components/goods-evaluation/index.js +++ b/src/components/goods-evaluation/index.js @@ -2,7 +2,10 @@ import React, { Component } from 'react' import Taro, { getCurrentInstance } from '@tarojs/taro' import { View, Text, Image } from '@tarojs/components' import { AtRate } from 'taro-ui' -import userIcon from '@/assets/imgs/user-icon.png' +import { + SpImage +} from '@/components' +// import userIcon from '@/assets/imgs/user-icon.png' import './index.scss' export default class GoodsEvaluation extends Component { @@ -96,12 +99,13 @@ export default class GoodsEvaluation extends Component { return ( - + /> */} + diff --git a/src/components/sp-button/index.js b/src/components/sp-button/index.js index d67c2cc..6181ce9 100755 --- a/src/components/sp-button/index.js +++ b/src/components/sp-button/index.js @@ -3,11 +3,12 @@ import React, { useCallback, useState, useMemo } from 'react' import { View, Text, Image } from '@tarojs/components' import './index.scss' -const voidFunc = () => {} +const voidFunc = () => { } const SpButton = (props) => { const { resetText = '取消', + showReset = true, confirmText = '确定', onConfirm = voidFunc, onReset = voidFunc @@ -15,9 +16,9 @@ const SpButton = (props) => { return ( - + {showReset && {resetText} - + } {confirmText} diff --git a/src/marketing/pages/item/rate.js b/src/marketing/pages/item/rate.js index 75586c0..6a1e21a 100755 --- a/src/marketing/pages/item/rate.js +++ b/src/marketing/pages/item/rate.js @@ -257,12 +257,15 @@ export default class TradeRate extends Component { - + 立即评价 + + {/* + > */} diff --git a/src/marketing/pages/item/rate.scss b/src/marketing/pages/item/rate.scss index 8c12485..8c05b72 100755 --- a/src/marketing/pages/item/rate.scss +++ b/src/marketing/pages/item/rate.scss @@ -105,9 +105,25 @@ page { position: fixed; left: 0; right: 0; - bottom: 40px; + bottom: 0; + padding-bottom: 50px; z-index: 88; background: #fff; + &__confirm { + // width: 58%; + width: 90%; + margin: 0 auto; + /* prettier-ignore */ + border: 1PX solid var(--color-primary); + background: var(--color-primary); + height: 80px; + border-radius: 6px; + color: #fff; + text-align: center; + line-height: 80px; + box-sizing: border-box; + font-size: 30px; + } } } diff --git a/src/pages/item/comps/comp-evaluation.js b/src/pages/item/comps/comp-evaluation.js index 907f2da..f9b5e4e 100755 --- a/src/pages/item/comps/comp-evaluation.js +++ b/src/pages/item/comps/comp-evaluation.js @@ -53,9 +53,9 @@ function CompEvaluation (props) { */} {list.map((item) => ( - + - + {'匿名用户' || item.username} {fortmatStr(item.item_spec_desc)} @@ -64,6 +64,7 @@ function CompEvaluation (props) { ))} + 查看全部 {list.length == 0 && 暂无商品评价} diff --git a/src/pages/item/comps/comp-evaluation.scss b/src/pages/item/comps/comp-evaluation.scss index 945f1f0..0e31c99 100755 --- a/src/pages/item/comps/comp-evaluation.scss +++ b/src/pages/item/comps/comp-evaluation.scss @@ -28,6 +28,17 @@ // margin-bottom: 20px; // } } + .click-all { + text-align: center; + color: var(--color-primary); + font-size: 24px; + line-height: 24px; + padding: 6px 20px 0 20px; + .icon-qianwang-01 { + font-size: 24px; + line-height: 24px; + } + } } .evaluation-icon { margin-right: 16px; @@ -44,12 +55,12 @@ .item-hd { display: flex; align-items: flex-start; - margin-bottom: -8px; + margin-bottom: -2px; } .evaluation-content { // padding-left: 50px; // padding-right: 16px; - margin: 0 16px 0 50px; + margin: 0 16px 0 60px; white-space: pre-wrap; font-size: 28px; // padding-bottom: 28px;