Browse Source

Merge branch 'temp-data'

lex 1 year ago
parent
commit
b893342d34
1 changed files with 2 additions and 2 deletions
  1. 2 2
      src/views/student-register/order-detail.tsx

+ 2 - 2
src/views/student-register/order-detail.tsx

@@ -370,7 +370,7 @@ export default defineComponent({
             </div>
           )}
 
-          <CellGroup style={{ margin: 0 }}>
+          <CellGroup style={{ margin: 0 }} border={false}>
             {state.goodsInfos &&
               state.goodsInfos.map((goods: any) => (
                 <Cell class={styles.cellItem}>
@@ -417,7 +417,7 @@ export default defineComponent({
               ))}
           </CellGroup>
 
-          {orderType.value === 'SCHOOL_REGISTER' && (
+          {state.hasInstrument && (
             <Cell
               class={styles.freight}
               title="运费"