Merge branch 'online' into jenkins-test

src/views/payment-result/index.tsx

@@ -203,7 +203,11 @@ export default defineComponent({
               {{
                 icon: () => (
                   <div style={{ position: 'relative' }}>
-                    <Image class={styles.buyImg} src={goods.goodsUrl} fit="contain" />
+                    <Image
+                      class={styles.buyImg}
+                      src={goods.goodsUrl}
+                      fit="contain"
+                    />
                     {goods.giftFlag && (
                       <Image class={styles.giftFlag} src={giftFree} />
                     )}
@@ -212,12 +216,18 @@ export default defineComponent({
                 title: () => (
                   <div class={styles.buyContent}>
                     <p class={styles.goodsTitle}>{goods.goodsName}</p>
-                    {
-                      goods.brandName && <Tag class={styles.brandName}>{goods.brandName}</Tag>
-                    }
+                    {state.orders.orderType === 'SCHOOL_REGISTER' ? (
+                      <Tag class={styles.brandName}>5年</Tag>
+                    ) : (
+                      <>
+                        {goods.brandName && (
+                          <Tag class={styles.brandName}>{goods.brandName}</Tag>
+                        )}
+                      </>
+                    )}
                   </div>
                 ),
-                value: () => <span>x{goods.goodsNum}</span>
+                value: () => <span>x{state.orders.orderType === 'SCHOOL_REGISTER' ? 1 :goods.goodsNum}</span>
               }}
             </Cell>
           ))}