Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/spider_cloud_warehouse into 订单页

This commit is contained in:
Haiyi
2022-09-29 15:22:46 +08:00
58 changed files with 488 additions and 243 deletions
+3
View File
@@ -73,3 +73,6 @@
padding-left: 20px !important;
}
}
.customRightSlot{
margin-right: 20px;
}
+9 -10
View File
@@ -104,22 +104,21 @@ export default memo(
disabled={disabled}
value={inputCon}
placeholder={placeholder}
onInput={(e) => onInputEven(e)}
onInput={e => onInputEven(e)}
/>
<View className={styles.search_closeBtn}>
{!!inputCon && <CloseBtn onClose={() => clearInput()} styleObj={{ width: '20rpx', height: '20rpx', backgroundColor: '#fff', border: '0' }} />}
</View>
{
showScan && <View onClick={() => {
handScan?.()
}}>
<IconFont
name={'icon-saomiao'} size={40} color={'#337FFF'}
></IconFont>
{showScan && (
<View
onClick={() => {
handScan?.()
}}>
<IconFont name={'icon-saomiao'} size={40} color={'#337FFF'}></IconFont>
</View>
}
)}
<View>{customRightSlot}</View>
<View className={styles.customRightSlot}>{customRightSlot}</View>
</View>
</View>
{showBtn && (