Merge branch 'iteration-20240723' into dev

src/views/activation-code/activation-register/index.module.less

@@ -45,7 +45,8 @@
 .studentSection {
   margin: 0 14px 12px;
   padding: 0;
-  background: linear-gradient(180deg, rgba(219, 246, 253) 0%, rgba(255, 255, 255) 3%);
+  // background: linear-gradient(180deg, rgba(219, 246, 253) 0%, rgba(255, 255, 255) 3%);
+  background: linear-gradient(180deg, #DBF6FD 0%, #FFFFFF 4%, #FFFFFF 100%);
   border-radius: 16px;
   border: 2px solid #FFFFFF;
 
@@ -174,7 +175,7 @@
     }
 
     .van-cell__title {
-
+      flex: 1 auto;
       font-size: 14px;
       color: #666666;
       line-height: 20px;

src/views/activation-code/activation-register/index.tsx

@@ -854,7 +854,7 @@ export default defineComponent({
                 required
                 inputAlign="right"
                 label="所在地区"
-                placeholder="请选择所在地区"
+                placeholder="请选择地区"
                 isLink={forms.isRegister !== 'update'}
                 readonly
                 clickable={false}
@@ -870,7 +870,7 @@ export default defineComponent({
                 required
                 inputAlign="right"
                 label="互通学校"
-                placeholder="请选择互通学校"
+                placeholder="请选择学校"
                 isLink={forms.isRegister !== 'update'}
                 readonly
                 clickable={false}
@@ -951,7 +951,7 @@ export default defineComponent({
                   required
                   inputAlign="right"
                   label="互通码"
-                  placeholder="请选择互通码"
+                  placeholder="请输入互通码"
                   autocomplete="off"
                   v-model={forms.activationCode}
                 />
@@ -1335,7 +1335,7 @@ export default defineComponent({
                 border={false}
                 title="所在班级"
                 value={forms.currentClassText}></Cell>
-              {route.query.code && (
+              {!route.query.code && (
                 <Cell
                   border={false}
                   title="互通码"
@@ -1354,7 +1354,7 @@ export default defineComponent({
                 block
                 disabled={forms.submitLoading}
                 loading={forms.submitLoading}
-                color="linear-gradient( 305deg, #40C8FF 0%, #3192FF 100%)"
+                color="linear-gradient( 305deg, #3192FF 0%, #40C8FF 100%)"
                 onClick={() => {
                   forms.showConfirmPopup = false;
                   onSubmit();
@@ -1375,7 +1375,7 @@ export default defineComponent({
             type={forms.reslutPopupType}
             btnText={
               forms.reslutPopupType === 'ACTIVATING'
-                ? '立即下载激活码'
+                ? '立即下载激活'
                 : '我知道了'
             }
             onConfirm={() => {
@@ -1395,10 +1395,14 @@ export default defineComponent({
             )}
 
             {forms.reslutPopupType === 'CANCELLED' && (
-              <p style={{ textAlign: 'center' }}>{forms.resultPopupContent}</p>
+              <p style={{ textAlign: 'center', paddingTop: '5px' }}>
+                {forms.resultPopupContent}
+              </p>
             )}
             {forms.reslutPopupType === 'EXPIRED' && (
-              <p style={{ textAlign: 'center' }}>{forms.resultPopupContent}</p>
+              <p style={{ textAlign: 'center', paddingTop: '5px' }}>
+                {forms.resultPopupContent}
+              </p>
             )}
           </CodeDialog>
         </Popup>

src/views/activation-code/index.module.less

@@ -297,8 +297,8 @@
 
 .sectionItem {
   margin: 8px 0;
-  background: url('./images/item-bg.png') no-repeat center;
-  background-size: contain;
+  background: url('./images/item-bg.png') no-repeat top center;
+  background-size: cover;
   min-height: 141px;
 
   .itemTitle {
@@ -307,8 +307,29 @@
     color: #333333;
     line-height: 20px;
     padding-top: 6px;
-    padding-right: 17px;
+    padding-right: 14px;
     text-align: right;
+
+    .text {
+      position: relative;
+      z-index: 10;
+      display: inline-block;
+
+      &::after {
+        content: '';
+        position: absolute;
+        bottom: 1px;
+        left: 0;
+        right: 0;
+        z-index: -1;
+        display: inline-block;
+        width: 100%;
+        height: 6px;
+        background: linear-gradient(270deg, #CCF1FA 0%, #8CDDFC 100%);
+      }
+    }
+
+
   }
 
   .itemCode {
@@ -321,13 +342,12 @@
   }
 
   .itemTime {
-    padding-top: 34px;
+    padding-top: 30px;
     padding-left: 12px;
     font-size: 14px;
     color: #777777;
     line-height: 20px;
 
-
     span {
       color: #333333;
     }

src/views/activation-code/index.tsx

@@ -3,7 +3,7 @@ import { defineComponent, reactive } from 'vue';
 import styles from './index.module.less';
 import MSticky from '@/components/m-sticky';
 import MHeader from '@/components/m-header';
-import { postMessage } from '@/helpers/native-message'
+import { postMessage } from '@/helpers/native-message';
 import { useRouter } from 'vue-router';
 import { Button, Field, Popup, showToast } from 'vant';
 import iconKey from './images/icon-key.png';
@@ -13,7 +13,7 @@ import dayjs from 'dayjs';
 
 const vipGiftPeriodType = {
   DAY: '天',
-  MONTH: '个月',
+  MONTH: '月',
   YEAR: '年'
 } as any;
 
@@ -183,10 +183,14 @@ export default defineComponent({
             )}
 
             {state.reslutPopupType === 'CANCELLED' && (
-              <p style={{ textAlign: 'center' }}>{state.resultPopupContent}</p>
+              <p style={{ textAlign: 'center', paddingTop: '5px' }}>
+                {state.resultPopupContent}
+              </p>
             )}
             {state.reslutPopupType === 'EXPIRED' && (
-              <p style={{ textAlign: 'center' }}>{state.resultPopupContent}</p>
+              <p style={{ textAlign: 'center', paddingTop: '5px' }}>
+                {state.resultPopupContent}
+              </p>
             )}
           </CodeDialog>
         </Popup>

src/views/activation-code/instrument-registration/detail.tsx

@@ -314,11 +314,6 @@ export default defineComponent({
               <Button
                 onClick={() => {
                   onSubmit();
-                  // if (checkForm() || checkSubmit()) {
-                  //   forms.submitLoading = false;
-                  //   return;
-                  // }
-                  // forms.showConfirmPopup = true;
                 }}
                 round
                 block
@@ -380,7 +375,7 @@ export default defineComponent({
                     }
                   });
                 }}
-                color="linear-gradient( 305deg, #40C8FF 0%, #3192FF 100%)">
+                color="linear-gradient( 305deg, #007AFE 0%, #31C7FF 100%)">
                 我知道了
               </Button>
             </div>

src/views/activation-code/instrument-registration/index.module.less

@@ -26,6 +26,10 @@
       font-size: 14px;
       color: #AAAAAA;
 
+      input::placeholder {
+        color: #AAAAAA;
+      }
+
       :global {
         .van-field__control {
           font-size: 14px;

src/views/activation-code/instrument-registration/index.tsx

@@ -46,6 +46,7 @@ export default defineComponent({
           clearInterval(timer);
           if (item.code !== 200) {
             state.statusShow = true;
+            state.progressRate = 0;
           } else {
             router.push({
               path: '/activationRegistrationDetail',
@@ -81,8 +82,8 @@ export default defineComponent({
                 round
                 disabled={state.loading}
                 onClick={onSubmit}
-                color="linear-gradient( 135deg, #31C7FF 0%, #007AFE 100%)">
-                <p>{state.loading ? '正在进行核验' : '互通检测'}</p>
+                color="linear-gradient( 305deg, #007AFE 0%, #31C7FF 100%)">
+                <p>{state.loading ? '正在进行核验' : '互通核验'}</p>
                 <span>
                   {state.loading ? '请稍后······' : '多子女需多次核验'}
                 </span>
@@ -116,7 +117,7 @@ export default defineComponent({
                 round
                 block
                 onClick={() => (state.statusShow = false)}
-                color="linear-gradient( 305deg, #40C8FF 0%, #3192FF 100%)">
+                color="linear-gradient( 305deg, #3192FF 0%, #40C8FF 100%)">
                 我知道了
               </Button>
             </div>

src/views/activation-code/modal/code-dialog/index.module.less

@@ -70,11 +70,12 @@
   }
 
   .btnGroup {
-    padding: 20px 60px 0;
+    padding: 20px 55px 0;
 
     :global {
       .van-button {
-        font-weight: 500;
+        padding: 0;
+        font-weight: 400;
         font-size: 16px;
         color: #FFFFFF;
       }

src/views/activation-code/record.tsx

@@ -15,7 +15,7 @@ dayjs.extend(isBetween);
 
 const vipGiftPeriodType = {
   DAY: '天',
-  MONTH: '个月',
+  MONTH: '月',
   YEAR: '年'
 } as any;
 
@@ -114,6 +114,9 @@ export default defineComponent({
                 placeholder="请输入互通码"
                 onSearch={(val: any) => {
                   forms.code = val;
+                  forms.page = 1;
+                  state.list = [];
+                  state.finished = false;
                   getList();
                 }}
               />
@@ -147,8 +150,10 @@ export default defineComponent({
               state.list.map((item: any) => (
                 <div class={styles.sectionItem}>
                   <div class={styles.itemTitle}>
-                    乐器AI学练工具{item.times}
-                    {vipGiftPeriodType[item.type]}
+                    <div class={styles.text}>
+                      乐器AI学练工具{item.times}
+                      {vipGiftPeriodType[item.type]}
+                    </div>
                   </div>
                   <div class={styles.itemCode}>{item.code}</div>
                   <div class={styles.itemTime}>
@@ -184,6 +189,11 @@ export default defineComponent({
             forms.activateStartTime = dayjs(item[0]).format('YYYY-MM-DD');
             forms.activateEndTime = dayjs(item[1]).format('YYYY-MM-DD');
             state.showPopoverTime = false;
+
+            forms.page = 1;
+            state.list = [];
+            state.finished = false;
+            getList();
           }}
         />
       </div>

src/views/student-register/modal/select-student/index.module.less

@@ -1,7 +1,7 @@
 .popupTitle {
   padding: 16px 0 20px;
   text-align: center;
-  font-weight: 500;
+  font-weight: 400;
   font-size: 18px;
   color: #131415;
   line-height: 25px;
@@ -26,19 +26,6 @@
         flex-shrink: 0;
       }
     }
-
-    .tag {
-      position: absolute;
-      top: 0;
-      right: 0;
-      padding: 3px 4px;
-      font-weight: 500;
-      font-size: 12px;
-      color: #FFFFFF;
-      line-height: 17px;
-      background: linear-gradient(135deg, #31C7FF 0%, #007AFE 100%);
-      border-radius: 0 10px 0 6px;
-    }
   }
 
   .cellSelected {
@@ -72,6 +59,17 @@
       font-size: 16px;
       color: #131415;
       line-height: 22px;
+      display: flex;
+      align-items: center;
+    }
+
+    .tag {
+      margin-left: 5px;
+      display: inline-block;
+      width: 44px;
+      height: 18px;
+      background: url('../../images/new/icon-dengji.png') no-repeat center;
+      background-size: contain;
     }
 
     .schoolname {

src/views/student-register/modal/select-student/index.tsx

@@ -71,16 +71,17 @@ export default defineComponent({
                 <Image src={item.avatar} class={styles.userImg} fit="cover" />
 
                 <div class={styles.usernames}>
-                  <div class={styles.name}>{item.nickname}</div>
+                  <div class={styles.name}>
+                    {item.nickname}
+                    {!props.showAdd && item.registerFlag && (
+                      <span class={styles.tag}></span>
+                    )}
+                  </div>
                   {item.schoolName && (
                     <div class={styles.schoolname}>{item.schoolName}</div>
                   )}
                 </div>
               </div>
-
-              {!props.showAdd && item.registerFlag && (
-                <span class={styles.tag}>已登记</span>
-              )}
             </div>
           ))}
         </RadioGroup>