🌈 style:更改部分模块的样式
This commit is contained in:
Haiyi
parent
b878c5ea9d
commit
81268618fd
@ -67,6 +67,19 @@ const config = {
|
||||
router: {
|
||||
mode: 'hash',
|
||||
},
|
||||
// 设置代理服务器转发
|
||||
// devServer: {
|
||||
// proxy: {
|
||||
// '/mp/': {
|
||||
// target: Domain,
|
||||
// pathRewrite: {
|
||||
// '^/mp/': '' // 所以带有/api/请求的链接一律替换为空并追加域名请求
|
||||
// },
|
||||
// changeOrigin: true
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// },
|
||||
output: {
|
||||
filename: 'js/[name].[hash].js',
|
||||
chunkFilename: 'js/[name].[chunkhash].js',
|
||||
@ -79,6 +92,9 @@ const config = {
|
||||
filename: 'css/[name].[hash].css',
|
||||
chunkFilename: 'css/[name].[chunkhash].css',
|
||||
},
|
||||
devServer: {
|
||||
https: true
|
||||
},
|
||||
publicPath: '/',
|
||||
staticDirectory: 'static',
|
||||
postcss: {
|
||||
@ -87,7 +103,7 @@ const config = {
|
||||
config: {},
|
||||
},
|
||||
cssModules: {
|
||||
enable: false, // 默认为 false，如需使用 css modules 功能，则设为 true
|
||||
enable: true, // 默认为 false，如需使用 css modules 功能，则设为 true
|
||||
config: {
|
||||
namingPattern: 'module', // 转换模式，取值为 global/module
|
||||
generateScopedName: '[name]__[local]___[hash:base64:5]',
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// export const BASE_URL = CURRENT_BASE_URL
|
||||
export const BASE_URL = CURRENT_BASE_URL
|
||||
// export const BASE_URL = `http://192.168.0.75:50001/lymarket`
|
||||
// export const BASE_URL = `http://192.168.0.89:50001/lymarket`
|
||||
// export const BASE_URL = `http://10.0.0.5:50001/lymarket`
|
||||
@ -12,7 +12,7 @@
|
||||
// export const BASE_URL = `https://dev.zzfzyc.com/lymarket` // 开发环境
|
||||
// export const BASE_URL = `https://www.zzfzyc.com/lymarket` // 正式环境
|
||||
// export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞
|
||||
export const BASE_URL = `http://192.168.1.7:50002/lymarket` // 添
|
||||
// export const BASE_URL = `http://192.168.1.7:50002/lymarket` // 添
|
||||
// export const BASE_URL = `http://192.168.1.42:50001/lymarket` // 杰
|
||||
// export const BASE_URL = `http://192.168.1.95:40001/lymarket` // 华
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
}
|
||||
|
||||
.nextBuy {
|
||||
margin-right: 24px;
|
||||
// margin-right: 24px;
|
||||
width: 160px;
|
||||
height: 72px;
|
||||
border-radius: 40px;
|
||||
|
||||
@ -80,7 +80,7 @@ export default memo((props: props) => {
|
||||
</View>
|
||||
</View>
|
||||
<View className={styles.numsBox}>
|
||||
<Input cursorSpacing={100} adjustPosition type={type as any} value={value.count} onInput={onInputEven} onBlur={(e) => props.onBlur?.(e, props.value.id)}></Input>
|
||||
<Input alwaysEmbed cursorSpacing={100} adjustPosition type={type as any} value={value.count} onInput={onInputEven} onBlur={(e) => props.onBlur?.(e, props.value.id)}></Input>
|
||||
|
||||
{/* <Input type={type as any} value={value.count} onInput={($event) => onInputEven($event, props.value)}></Input> */}
|
||||
</View>
|
||||
|
||||
@ -150,7 +150,7 @@
|
||||
}
|
||||
|
||||
.sure {
|
||||
margin-top: 35px;
|
||||
// margin-top: 35px;
|
||||
margin-left: 40px;
|
||||
width: 670px;
|
||||
height: 80px;
|
||||
@ -169,4 +169,8 @@
|
||||
height: 1500px;
|
||||
border-radius: 16px;
|
||||
border: 1px solid #f7f7f7;
|
||||
}
|
||||
|
||||
.safeBox {
|
||||
height: 200px;
|
||||
}
|
||||
@ -9,7 +9,7 @@ import Taro from '@tarojs/taro'
|
||||
import Popup from '@/components/popup'
|
||||
import useCheckAuthorize from '@/use/useCheckAuthorize'
|
||||
import { alert } from '@/common/common'
|
||||
|
||||
import IconFont from '@/components/iconfont/iconfont'
|
||||
interface Props {
|
||||
showPopup: true | false,
|
||||
popupClose?: () => void,
|
||||
@ -106,79 +106,87 @@ export default memo((props: Props) => {
|
||||
return (
|
||||
<View className={styles.popupBox}>
|
||||
<Popup show={showPopup} title={title} onClose={() => popupClose?.()}>
|
||||
{
|
||||
showSide &&
|
||||
<View className={styles.contBox}>
|
||||
<View className={styles.topMoney}>
|
||||
￥{formatPriceDiv(obj.wait_pay_amount)}
|
||||
</View>
|
||||
<View className={styles.itemMoney}>
|
||||
<View className={styles.leftFont}>
|
||||
订单金额
|
||||
</View>
|
||||
<View className={styles.rightFont}>
|
||||
<ScrollView enhanced scrollY style={{ height: '900rpx' }}>
|
||||
{
|
||||
showSide &&
|
||||
<View className={styles.contBox}>
|
||||
<View className={styles.topMoney}>
|
||||
￥{formatPriceDiv(obj.wait_pay_amount)}
|
||||
</View>
|
||||
</View>
|
||||
<View className={styles.itemMoney}>
|
||||
<View className={styles.leftFont}>
|
||||
已付金额
|
||||
<View className={styles.itemMoney}>
|
||||
<View className={styles.leftFont}>
|
||||
订单金额
|
||||
</View>
|
||||
<View className={styles.rightFont}>
|
||||
￥{formatPriceDiv(obj.wait_pay_amount)}
|
||||
</View>
|
||||
</View>
|
||||
<View className={styles.rightFont}>
|
||||
￥{formatPriceDiv(obj.actual_amount)}
|
||||
<View className={styles.itemMoney}>
|
||||
<View className={styles.leftFont}>
|
||||
已付金额
|
||||
</View>
|
||||
<View className={styles.rightFont}>
|
||||
￥{formatPriceDiv(obj.actual_amount)}
|
||||
</View>
|
||||
</View>
|
||||
</View>
|
||||
<View className={styles.line}></View>
|
||||
{
|
||||
list.map((item, index) => {
|
||||
return (
|
||||
<View className={styles.itemBox} key={index} onClick={() => clickItem?.(item)}>
|
||||
<View className={styles.leftItem}>
|
||||
<View className={styles.leftCrile}>
|
||||
<View className={classnames('iconfont', item.iconfont, styles.lujing)}></View>
|
||||
</View>
|
||||
<View className={styles.rightLeft}>
|
||||
<View className={styles.title}>{item.name}</View>
|
||||
{
|
||||
item.fonts && <View className={styles.nums}>{item.fonts}{
|
||||
item.money !== "" ? "￥" : ""
|
||||
}{item.money}</View>
|
||||
}
|
||||
<View className={styles.line}></View>
|
||||
{
|
||||
list.map((item, index) => {
|
||||
return (
|
||||
<View className={styles.itemBox} key={index} onClick={() => clickItem?.(item)}>
|
||||
<View className={styles.leftItem}>
|
||||
<View className={styles.leftCrile}
|
||||
style={{ backgroundColor: `${item.name == '线下汇款' ? '#fca846' : '#4a7fff'}` }}
|
||||
>
|
||||
<IconFont name={item.iconfont} size={35} color={item.color}></IconFont>
|
||||
{/* <View className={classnames('iconfont', item.iconfont, styles.lujing)}></View> */}
|
||||
</View>
|
||||
<View className={styles.rightLeft}>
|
||||
<View className={styles.title}>{item.name}</View>
|
||||
{
|
||||
item.fonts && <View className={styles.nums}>{item.fonts}{
|
||||
item.money !== "" ? "￥" : ""
|
||||
}{item.money}</View>
|
||||
}
|
||||
</View>
|
||||
</View>
|
||||
{
|
||||
item.name !== '扫码支付' && item.name !== '线下汇款' &&
|
||||
<View className={item.checked ? styles.activeChecked : styles.checkYuan}>
|
||||
{/* <View className={classnames('iconfont', 'icon-lujing', styles.gou)}></View> */}
|
||||
<IconFont name={'icon-lujing'} size={20} color={'#ffffff'}></IconFont>
|
||||
</View>
|
||||
}
|
||||
{
|
||||
(item.name === '扫码支付' || item.name === '线下汇款') &&
|
||||
<IconFont name={'icon-chakanquanbukehu'} size={50} color={'#000000'} customClassName={styles['chakanquanbukehu']}></IconFont>
|
||||
// <View className={classnames('iconfont', 'icon-chakanquanbukehu', styles.chakanquanbukehu)}></View>
|
||||
}
|
||||
</View>
|
||||
{
|
||||
item.name !== '扫码支付' && item.name !== '线下汇款' &&
|
||||
<View className={item.checked ? styles.activeChecked : styles.checkYuan}>
|
||||
<View className={classnames('iconfont', 'icon-lujing', styles.gou)}></View>
|
||||
</View>
|
||||
}
|
||||
{
|
||||
(item.name === '扫码支付' || item.name === '线下汇款') &&
|
||||
<View className={classnames('iconfont', 'icon-chakanquanbukehu', styles.chakanquanbukehu)}></View>
|
||||
}
|
||||
</View>
|
||||
)
|
||||
})
|
||||
}
|
||||
)
|
||||
})
|
||||
}
|
||||
|
||||
</View>
|
||||
|
||||
}
|
||||
{
|
||||
showSide && <View className={styles.sure} onClick={() => handsurePay?.(props?.obj)}>确认交易</View>
|
||||
}
|
||||
{
|
||||
!showSide &&
|
||||
<ScrollView enhanced scrollY style={{ height: '700rpx', marginLeft: '24rpx' }}>
|
||||
<View className={styles.pic}>
|
||||
<Image lazyLoad mode='widthFix' style={{ width: '100%', height: '100%' }} src={picUrl} onClick={() => showImage()}></Image>
|
||||
</View>
|
||||
</ScrollView>
|
||||
|
||||
}
|
||||
{
|
||||
!showSide && <View className={styles.sure} onClick={() => saveImageCheck()}>保存图片</View>
|
||||
}
|
||||
}
|
||||
{
|
||||
showSide && <View className={styles.sure} onClick={() => handsurePay?.(props?.obj)}>确认交易</View>
|
||||
}
|
||||
{
|
||||
!showSide &&
|
||||
<ScrollView enhanced scrollY style={{ height: '700rpx', marginLeft: '24rpx' }}>
|
||||
<View className={styles.pic}>
|
||||
<Image lazyLoad mode='widthFix' style={{ width: '100%', height: '100%' }} src={picUrl} onClick={() => showImage()}></Image>
|
||||
</View>
|
||||
</ScrollView>
|
||||
|
||||
}
|
||||
{
|
||||
!showSide && <View className={styles.sure} onClick={() => saveImageCheck()}>保存图片</View>
|
||||
}
|
||||
<View className={styles.safeBox}></View>
|
||||
</ScrollView>
|
||||
</Popup >
|
||||
</View >
|
||||
)
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
.itemBox {
|
||||
margin-top: 38px;
|
||||
overflow: hidden;
|
||||
width: 702px;
|
||||
// width: 702px;
|
||||
// margin-left: 24px;
|
||||
margin-right: 24px;
|
||||
height: 560px;
|
||||
background: #FFFFFF;
|
||||
border-radius: 16px;
|
||||
|
||||
@ -339,6 +339,7 @@ export default () => {
|
||||
fonts: "发货后3天内付款",
|
||||
isCheck: false,
|
||||
money: "",
|
||||
color: '#ffffff'
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
@ -347,6 +348,7 @@ export default () => {
|
||||
fonts: "可用额度 ",
|
||||
money: "",
|
||||
isCheck: false,
|
||||
color: '#ffffff'
|
||||
},
|
||||
{
|
||||
iconfont: "icon-yue",
|
||||
@ -355,6 +357,7 @@ export default () => {
|
||||
{
|
||||
iconfont: "icon-saomiao",
|
||||
name: "扫码支付",
|
||||
color: '#ffffff'
|
||||
},
|
||||
])
|
||||
const toPay = async (e, item) => {
|
||||
@ -387,6 +390,7 @@ export default () => {
|
||||
payList.unshift({
|
||||
id: 6,
|
||||
iconfont: "icon-xianxiahuizong",
|
||||
color: '#ffffff',
|
||||
name: "货主自提",
|
||||
fonts: "",
|
||||
money: "",
|
||||
@ -416,6 +420,7 @@ export default () => {
|
||||
{
|
||||
iconfont: "icon-saomiao",
|
||||
name: "扫码支付",
|
||||
color: '#ffffff'
|
||||
},
|
||||
|
||||
);
|
||||
@ -428,6 +433,7 @@ export default () => {
|
||||
id: 6,
|
||||
iconfont: "icon-xianxiahuizong",
|
||||
name: "货主自提",
|
||||
color: '#ffffff',
|
||||
fonts: "",
|
||||
money: "",
|
||||
isCheck: false,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user