xuan/TestRestructureWechatLymarketDist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🌈 style:更改部分模块的样式

Browse Source
This commit is contained in:
Haiyi 2022-10-08 15:20:55 +08:00
parent b878c5ea9d
commit 81268618fd
8 changed files with 108 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
config/index.js
View File

@ -67,6 +67,19 @@ const config = {
router: { router: {
mode: 'hash', mode: 'hash',
}, },
// 设置代理服务器转发
// devServer: {
// proxy: {
// '/mp/': {
// target: Domain,
// pathRewrite: {
// '^/mp/': '' // 所以带有/api/请求的链接一律替换为空并追加域名请求
// },
// changeOrigin: true
// }
// }
// }
// },
output: { output: {
filename: 'js/[name].[hash].js', filename: 'js/[name].[hash].js',
chunkFilename: 'js/[name].[chunkhash].js', chunkFilename: 'js/[name].[chunkhash].js',
@ -79,6 +92,9 @@ const config = {
filename: 'css/[name].[hash].css', filename: 'css/[name].[hash].css',
chunkFilename: 'css/[name].[chunkhash].css', chunkFilename: 'css/[name].[chunkhash].css',
}, },
devServer: {
https: true
},
publicPath: '/', publicPath: '/',
staticDirectory: 'static', staticDirectory: 'static',
postcss: { postcss: {
@ -87,7 +103,7 @@ const config = {
config: {}, config: {},
}, },
cssModules: { cssModules: {
enable: false, // 默认为 false，如需使用 css modules 功能，则设为 true enable: true, // 默认为 false，如需使用 css modules 功能，则设为 true
config: { config: {
namingPattern: 'module', // 转换模式，取值为 global/module namingPattern: 'module', // 转换模式，取值为 global/module
generateScopedName: '[name]__[local]___[hash:base64:5]', generateScopedName: '[name]__[local]___[hash:base64:5]',

4
src/common/constant.js
View File

@ -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.75:50001/lymarket`
// export const BASE_URL = `http://192.168.0.89:50001/lymarket` // export const BASE_URL = `http://192.168.0.89:50001/lymarket`
// export const BASE_URL = `http://10.0.0.5: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://dev.zzfzyc.com/lymarket` // 开发环境
// export const BASE_URL = `https://www.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.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.42:50001/lymarket` // 杰
// export const BASE_URL = `http://192.168.1.95:40001/lymarket` // 华 // export const BASE_URL = `http://192.168.1.95:40001/lymarket` // 华

2
src/components/BottomBtns/index.module.scss
View File

@ -19,7 +19,7 @@
} }
.nextBuy { .nextBuy {
margin-right: 24px; // margin-right: 24px;
width: 160px; width: 160px;
height: 72px; height: 72px;
border-radius: 40px; border-radius: 40px;

2
src/components/goodsItem/index.tsx
View File

@ -80,7 +80,7 @@ export default memo((props: props) => {
</View> </View>
</View> </View>
<View className={styles.numsBox}> <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> */} {/* <Input type={type as any} value={value.count} onInput={($event) => onInputEven($event, props.value)}></Input> */}
</View> </View>

6
src/pages/order/components/PayPopup/index.module.scss
View File

@ -150,7 +150,7 @@
} }
.sure { .sure {
margin-top: 35px; // margin-top: 35px;
margin-left: 40px; margin-left: 40px;
width: 670px; width: 670px;
height: 80px; height: 80px;
@ -169,4 +169,8 @@
height: 1500px; height: 1500px;
border-radius: 16px; border-radius: 16px;
border: 1px solid #f7f7f7; border: 1px solid #f7f7f7;
}
.safeBox {
height: 200px;
} }

138
src/pages/order/components/PayPopup/index.tsx
View File

@ -9,7 +9,7 @@ import Taro from '@tarojs/taro'
import Popup from '@/components/popup' import Popup from '@/components/popup'
import useCheckAuthorize from '@/use/useCheckAuthorize' import useCheckAuthorize from '@/use/useCheckAuthorize'
import { alert } from '@/common/common' import { alert } from '@/common/common'
import IconFont from '@/components/iconfont/iconfont'
interface Props { interface Props {
showPopup: true | false, showPopup: true | false,
popupClose?: () => void, popupClose?: () => void,
@ -106,79 +106,87 @@ export default memo((props: Props) => {
return ( return (
<View className={styles.popupBox}> <View className={styles.popupBox}>
<Popup show={showPopup} title={title} onClose={() => popupClose?.()}> <Popup show={showPopup} title={title} onClose={() => popupClose?.()}>
{ <ScrollView enhanced scrollY style={{ height: '900rpx' }}>
showSide && {
<View className={styles.contBox}> showSide &&
<View className={styles.topMoney}> <View className={styles.contBox}>
￥{formatPriceDiv(obj.wait_pay_amount)} <View className={styles.topMoney}>
</View>
<View className={styles.itemMoney}>
<View className={styles.leftFont}>
订单金额
</View>
<View className={styles.rightFont}>
￥{formatPriceDiv(obj.wait_pay_amount)} ￥{formatPriceDiv(obj.wait_pay_amount)}
</View> </View>
</View> <View className={styles.itemMoney}>
<View className={styles.itemMoney}> <View className={styles.leftFont}>
<View className={styles.leftFont}> 订单金额
已付金额 </View>
<View className={styles.rightFont}>
￥{formatPriceDiv(obj.wait_pay_amount)}
</View>
</View> </View>
<View className={styles.rightFont}> <View className={styles.itemMoney}>
￥{formatPriceDiv(obj.actual_amount)} <View className={styles.leftFont}>
已付金额
</View>
<View className={styles.rightFont}>
￥{formatPriceDiv(obj.actual_amount)}
</View>
</View> </View>
</View> <View className={styles.line}></View>
<View className={styles.line}></View> {
{ list.map((item, index) => {
list.map((item, index) => { return (
return ( <View className={styles.itemBox} key={index} onClick={() => clickItem?.(item)}>
<View className={styles.itemBox} key={index} onClick={() => clickItem?.(item)}> <View className={styles.leftItem}>
<View className={styles.leftItem}> <View className={styles.leftCrile}
<View className={styles.leftCrile}> style={{ backgroundColor: `${item.name == '线下汇款' ? '#fca846' : '#4a7fff'}` }}
<View className={classnames('iconfont', item.iconfont, styles.lujing)}></View> >
</View> <IconFont name={item.iconfont} size={35} color={item.color}></IconFont>
<View className={styles.rightLeft}> {/* <View className={classnames('iconfont', item.iconfont, styles.lujing)}></View> */}
<View className={styles.title}>{item.name}</View> </View>
{ <View className={styles.rightLeft}>
item.fonts && <View className={styles.nums}>{item.fonts}{ <View className={styles.title}>{item.name}</View>
item.money !== "" ? "￥" : "" {
}{item.money}</View> item.fonts && <View className={styles.nums}>{item.fonts}{
} item.money !== "" ? "￥" : ""
}{item.money}</View>
}
</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> </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> </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 > </Popup >
</View > </View >
) )

4
src/pages/order/components/itemList/index.module.scss
View File

@ -1,7 +1,9 @@
.itemBox { .itemBox {
margin-top: 38px; margin-top: 38px;
overflow: hidden; overflow: hidden;
width: 702px; // width: 702px;
// margin-left: 24px;
margin-right: 24px;
height: 560px; height: 560px;
background: #FFFFFF; background: #FFFFFF;
border-radius: 16px; border-radius: 16px;

6
src/pages/order/index.tsx
View File

@ -339,6 +339,7 @@ export default () => {
fonts: "发货后3天内付款", fonts: "发货后3天内付款",
isCheck: false, isCheck: false,
money: "", money: "",
color: '#ffffff'
}, },
{ {
id: 3, id: 3,
@ -347,6 +348,7 @@ export default () => {
fonts: "可用额度 ", fonts: "可用额度 ",
money: "", money: "",
isCheck: false, isCheck: false,
color: '#ffffff'
}, },
{ {
iconfont: "icon-yue", iconfont: "icon-yue",
@ -355,6 +357,7 @@ export default () => {
{ {
iconfont: "icon-saomiao", iconfont: "icon-saomiao",
name: "扫码支付", name: "扫码支付",
color: '#ffffff'
}, },
]) ])
const toPay = async (e, item) => { const toPay = async (e, item) => {
@ -387,6 +390,7 @@ export default () => {
payList.unshift({ payList.unshift({
id: 6, id: 6,
iconfont: "icon-xianxiahuizong", iconfont: "icon-xianxiahuizong",
color: '#ffffff',
name: "货主自提", name: "货主自提",
fonts: "", fonts: "",
money: "", money: "",
@ -416,6 +420,7 @@ export default () => {
{ {
iconfont: "icon-saomiao", iconfont: "icon-saomiao",
name: "扫码支付", name: "扫码支付",
color: '#ffffff'
}, },
); );
@ -428,6 +433,7 @@ export default () => {
id: 6, id: 6,
iconfont: "icon-xianxiahuizong", iconfont: "icon-xianxiahuizong",
name: "货主自提", name: "货主自提",
color: '#ffffff',
fonts: "", fonts: "",
money: "", money: "",
isCheck: false, isCheck: false,