Merge branch 'fine-music-score' into dev

src/router/routes-common.ts

@@ -219,6 +219,14 @@ export const router = [
     meta: {
       title: '酷乐秀平台服务协议'
     }
+  },
+  {
+    path: '/awardActivity',
+    name: 'awardActivity',
+    component: () => import('@/views/award-activity/index'),
+    meta: {
+      title: '活动奖品'
+    }
   }
 ]
 

src/student/invite-teacher/teacher-change/index.module.less

@@ -19,6 +19,7 @@
     height: 38px;
     border-radius: 50%;
     overflow: hidden;
+    flex-shrink: inherit;
   }
 
   .txt,
@@ -31,6 +32,10 @@
   }
   span {
     padding-left: 12px;
+    max-width: 140px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
   }
 }
 

src/views/award-activity/index.tsx

@@ -0,0 +1,14 @@
+import { CellGroup, Cell } from 'vant'
+import { defineComponent } from 'vue'
+import styles from './index.module.less'
+
+export default defineComponent({
+  name: 'award-activity',
+  render() {
+    return <div>
+      <CellGroup inset>
+        <Cell />
+      </CellGroup>
+    </div>
+  }
+})