lex před 1 rokem
rodič
revize
082438d69a

binární
src/views/payment-result/images/giftFree.png


+ 9 - 1
src/views/payment-result/index.module.less

@@ -144,6 +144,14 @@
     border-radius: 5px;
     margin-right: 9px;
   }
+
+  .giftFlag {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 31px;
+    height: 14px;
+  }
 }
 
 .container {
@@ -202,4 +210,4 @@
 .phoneName {
   background: #f2f2f2;
   border-radius: 6px;
-}
+}

+ 8 - 7
src/views/payment-result/index.tsx

@@ -7,6 +7,7 @@ import icon_success from './images/icon_success.png';
 import iconClose from './images/icon_close.png';
 import iconTradeing from './images/icon_tradeing.png';
 import iconTips from './images/icon-tips.png';
+import giftFree from './images/giftFree.png';
 import request from '@/helpers/request';
 import { useRoute, useRouter } from 'vue-router';
 import { browser, moneyFormat } from '@/helpers/utils';
@@ -202,17 +203,17 @@ export default defineComponent({
             <Cell>
               {{
                 icon: () => (
-                  <Image class={styles.buyImg} src={goods.goodsUrl} />
+                  <div style={{ position: 'relative' }}>
+                    <Image class={styles.buyImg} src={goods.goodsUrl} />
+                    {goods.giftFlag && (
+                      <Image class={styles.giftFlag} src={giftFree} />
+                    )}
+                  </div>
                 ),
                 title: () => (
                   <div class={styles.buyContent}>
                     <p class={styles.goodsTitle}>{goods.goodsName}</p>
-                    <Tag class={styles.brandName}>
-                      {state.orders.orderType === 'VIP' ||
-                      goods.goodsType === 'VIP'
-                        ? '12个月'
-                        : goods.brandName}
-                    </Tag>
+                    <Tag class={styles.brandName}>{goods.brandName}</Tag>
                   </div>
                 ),
                 value: () => <span>x{goods.goodsNum}</span>

+ 2 - 2
src/views/student-register/component/user-auth.module.less

@@ -56,8 +56,8 @@
     padding: 0 40px;
     font-size: 16px;
     font-weight: 600;
-    background: linear-gradient(121deg, #FFD892 0%, #FFCB75 100%);
-    color: #5B2C03;
+    background: linear-gradient(135deg, #31C7FF 0%, #007AFE 100%);
+    color: #FFFFFF;
 
   }
 }

binární
src/views/student-register/images/giftFree.png


+ 14 - 6
src/views/student-register/order-detail.module.less

@@ -107,6 +107,14 @@
     margin-right: 15px;
   }
 
+  .giftFlag {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 31px;
+    height: 14px;
+  }
+
   .cellPrice {
     font-size: 20px;
     font-weight: bold;
@@ -170,10 +178,10 @@
       line-height: 18px;
       font-size: 12px;
       padding: 0 6px;
-      color: #BE7332;
-      background-color: #FFF5E6;
+      color: #19A1FE;
+      background: #F4FAFF;
       border-radius: 4px;
-      border: 1px solid #FFE9D9;
+      border: 1px solid rgba(52, 173, 255, 0.55);
     }
 
     .model {
@@ -361,7 +369,7 @@
   // }
 
   // &.otherBtn {
-  background: linear-gradient(121deg, #FFD892 0%, #FFCB75 100%);
-  color: #5B2C03;
+  background: linear-gradient(135deg, #31C7FF 0%, #007AFE 100%);
+  color: #FFFFFF;
   // }
-}
+}

+ 8 - 6
src/views/student-register/order-detail.tsx

@@ -29,6 +29,7 @@ import { orderStatus } from '@/helpers/constant';
 import QrcodePayment from './qrcode-payment';
 import { beforeSubmit } from './order-state';
 import { listenerMessage, postMessage } from '@/helpers/native-message';
+import giftFree from './images/giftFree.png';
 
 /**
  * 接入jsdk
@@ -465,7 +466,12 @@ export default defineComponent({
                 <Cell class={styles.cellItem}>
                   {{
                     icon: () => (
-                      <Image class={styles.img} src={goods.goodsUrl} />
+                      <div style={{ position: 'relative' }}>
+                        <Image class={styles.img} src={goods.goodsUrl} />
+                        {goods.giftFlag && (
+                          <Image class={styles.giftFlag} src={giftFree} />
+                        )}
+                      </div>
                     ),
                     title: () => (
                       <div class={styles.goodsContent}>
@@ -476,11 +482,7 @@ export default defineComponent({
                           </span>
                         </h2>
                         <div class={styles.goodsPrice}>
-                          <Tag class={styles.brandName}>
-                            {goods.goodsType === 'VIP'
-                              ? '12个月'
-                              : goods.brandName}
-                          </Tag>
+                          <Tag class={styles.brandName}>{goods.brandName}</Tag>
                           <span
                             class={[
                               styles.goodsNums,

+ 1 - 1
vite.config.ts

@@ -16,7 +16,7 @@ function resolve(dir: string) {
 // const proxyUrl = 'https://test.lexiaoya.cn/';
 // const proxyUrl = 'https://kt.colexiu.com/';
 // const proxyUrl = 'http://192.168.3.143:7093/';
-const proxyUrl = 'https://test.kt.colexiu.com/';
+const proxyUrl = 'https://dev.kt.colexiu.com/';
 export default defineConfig({
   base: './',
   plugins: [