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

src/pages/shopping/components/bottomEditBar/index.tsx

@@ -43,7 +43,7 @@ export default memo<PropsType>((props) => {
         </MCheckbox>
       </View>
       <View className={styles.bottomRight}>
-        <NormalButton plain round type='danger' size='normal' onClick={handleSettle} customStyles={{ backgroundColor: '#F44761' }}>
+        <NormalButton round type='danger' size='normal' onClick={handleSettle} customStyles={{ backgroundColor: '#F44761' }}>
           <Text style={{ fontSize: '32rpx' }}>删除</Text>
         </NormalButton>
       </View>

src/pages/shopping/components/bottomSettleBar/index.tsx

@@ -26,7 +26,7 @@ export default memo<PropsType>((props) => {
         </Text>
       </View>
       <View className={styles.bottomRight}>
-        <NormalButton plain type='primary' round size='normal' onClick={handleSettle}>
+        <NormalButton type='primary' round size='normal' onClick={handleSettle}>
           <Text style={{fontSize: '32rpx'}}>结算</Text>
         </NormalButton>
       </View>

src/pages/shopping/components/shoppingCartItem/index.tsx

@@ -185,7 +185,7 @@ export default memo<PropsType>(props => {
           <View className={styles.topItem}>
             <View className='flex-row items-center'>
               <View className={styles.topTitle}>{itemData?.purchaser_name}</View>
-              <Tag type='info' size='normal' circle plain>
+              <Tag type='info' size='normal' circle customStyle={{ backgroundColor: '#f0f0f0',borderColor: 'transparent' }} plain>
                 {itemData?.sale_user_name}
               </Tag>
             </View>
@@ -194,10 +194,6 @@ export default memo<PropsType>(props => {
                 已选 {materialChecked} 种面料，{colorChecked} 个颜色，共{' '}
                 {selected === EnumSaleMode.Bulk ? `${lengthOrRollChecked} 条` : `${lengthOrRollChecked} 米`}
               </Text>
-              {/* <Text>
-                已选 {0} 种面料，{0} 个颜色，共{' '}
-                {selected === EnumSaleMode.Bulk ? `${0} 条` : `${0} 米`}
-              </Text> */}
             </View>
           </View>
           <DrawerButton isOpen={openDetail} />
@@ -234,7 +230,7 @@ export default memo<PropsType>(props => {
             <Divider customClassName={styles.line}></Divider>
             <View className={classnames(styles.orderTitle, 'justify-between')}>
               <Text>布料颜色</Text>
-              <Tag type='danger' size='normal' circle plain={false}>
+              <Tag type='danger' size='normal' circle plain>
                 {selectList[selected].title}单位：{selectList[selected].unit}
               </Tag>
             </View>