Merge branch 'iteration_0307' into online

src/school/companion-teacher/companion-teacher-register.module.less

@@ -356,12 +356,15 @@ span {
 
   .item {
     display: block;
-    margin-right: 5px;
+    margin-left: 0;
+    margin-right: 6px;
     margin-bottom: 10px;
     min-width: 80px;
     height: 32px;
+  }
 
-    &:nth-child(4n + 0) {
+  .radio:nth-child(4n + 4) {
+    .item {
       margin-right: 0;
     }
   }

src/school/companion-teacher/companion-teacher-register.tsx

@@ -299,6 +299,13 @@ export default defineComponent({
       } else if (type === 'WITHDRAW') {
         //
         window.open(window.location.origin + window.location.pathname + '#/cashProtocol', '_blank')
+      } else if (type === 'LABOR') {
+        window.open(
+          window.location.origin +
+            window.location.pathname +
+            '#/preview-protocol?type=LABOR_TEACHER',
+          '_blank'
+        )
       }
     }
 
@@ -703,6 +710,10 @@ export default defineComponent({
               <span class={styles.c} onClick={() => onPreview('PRIVACY')}>
                 《隐私协议》
               </span>
+              、
+              <span class={styles.c} onClick={() => onPreview('LABOR')}>
+                《劳务协议》
+              </span>
               {/* 、
               <span class={styles.c} onClick={() => onPreview('WITHDRAW')}>
                 《共享经济平台注册经营者协议》

src/school/manage-teacher/manage-teacher-register.tsx

@@ -253,6 +253,13 @@ export default defineComponent({
       } else if (type === 'WITHDRAW') {
         //
         window.open(window.location.origin + window.location.pathname + '#/cashProtocol', '_blank')
+      } else if (type === 'LABOR') {
+        window.open(
+          window.location.origin +
+            window.location.pathname +
+            '#/preview-protocol?type=LABOR_TEACHER',
+          '_blank'
+        )
       }
     }
 
@@ -467,6 +474,10 @@ export default defineComponent({
               <span class={styles.c} onClick={() => onPreview('PRIVACY')}>
                 《隐私协议》
               </span>
+              、
+              <span class={styles.c} onClick={() => onPreview('LABOR')}>
+                《劳务协议》
+              </span>
               {/* 、
               <span class={styles.c} onClick={() => onPreview('WITHDRAW')}>
                 《共享经济平台注册经营者协议》

src/views/preview-protocol/index.module.less

@@ -18,3 +18,10 @@
     text-align: right;
   }
 }
+
+.LABOR_TEACHER {
+  p:last-child {
+    padding-top: 12px;
+    text-align: left;
+  }
+}

src/views/preview-protocol/index.tsx

@@ -19,6 +19,10 @@ export default defineComponent({
 
     if (queryType) {
       type = queryType.toString()
+
+      if (queryType === 'LABOR_TEACHER') {
+        document.title = '管乐团劳务协议'
+      }
     } else {
       if (state.platformType === 'STUDENT') {
         type = 'REGISTER'
@@ -48,7 +52,13 @@ export default defineComponent({
     return (
       <div id="mProtocol">
         {browser().isApp && <OHeader />}
-        <div class={styles.mProtocol} v-html={this.protocolHTML}></div>
+        <div
+          class={[
+            styles.mProtocol,
+            this.$route.query.type ? styles[this.$route.query.type as any] : ''
+          ]}
+          v-html={this.protocolHTML}
+        ></div>
       </div>
     )
   }