Merge branch 'master' into jenkins

.env.development

@@ -0,0 +1,12 @@
+# just a flag
+ENV = 'development'
+
+
+# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
+# to control whether the babel-plugin-dynamic-import-node plugin is enabled.
+# It only does one thing by converting all import() to require().
+# This configuration can significantly increase the speed of hot updates,
+# when you have a large number of pages.
+# Detail:  https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/babel-preset-app/index.js
+
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/school/companion-teacher/unbind.tsx

@@ -147,7 +147,7 @@ export default defineComponent({
       <>
         <OHeader />
 
-        <div class={styles.unbindTips}>该伴学指导存在以下班级及课程未开始，请选择交接伴学指导</div>
+        <div class={styles.unbindTips}>该伴学指导存在班级或未开始课程，请选择交接人</div>
 
         {/* <CellGroup inset class={styles.detailCellGroup}> */}
         {state.classList.map((item: any) => (

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

@@ -254,7 +254,9 @@ export default defineComponent({
     const onPreview = (type: string) => {
       if (type === 'REGISTER') {
         window.open(
-          window.location.origin + window.location.pathname + '#/preview-protocol',
+          window.location.origin +
+            window.location.pathname +
+            '#/preview-protocol?type=REGISTER_TEACHER',
           '_blank'
         )
       } else if (type === 'PRIVACY') {
@@ -450,10 +452,10 @@ export default defineComponent({
               <span class={styles.c} onClick={() => onPreview('PRIVACY')}>
                 《隐私协议》
               </span>
-              、
+              {/* 、
               <span class={styles.c} onClick={() => onPreview('WITHDRAW')}>
                 《共享经济平台注册经营者协议》
-              </span>
+              </span> */}
             </div>
           </div>
 

src/school/train-planning/modal/calendar/index.module.less

@@ -21,7 +21,7 @@
 
     .right {
       transform: rotateZ(180deg);
-      // margin-right: 16px;
+      margin-right: 16px;
     }
     .today {
       margin: 0 16px;

src/school/train-planning/modal/calendar/index.tsx

@@ -226,12 +226,12 @@ export default defineComponent({
                     class={[styles.right]}
                     onClick={this.onPrevMonth}
                   />
-                  <Icon
+                  {/* <Icon
                     name={this.todayStatus ? IconToday : IconTodayDefault}
                     size={22}
                     class={styles.today}
                     onClick={this.onToday}
-                  />
+                  /> */}
                   <Icon name={IconArrow} size={22} onClick={this.onNextMonth} />
                 </div>
               </div>

src/views/bind-wechat/index.tsx

@@ -28,20 +28,19 @@ export default defineComponent({
     // window.atob() 解密
     // console.log(qs.parse(location.hash))
 
-    const getAppIdAndCode = async (url?: string) => {
+    const getAppIdAndCode = async (url: string) => {
       try {
         const { data } = await request.get(state.platformApi + '/open/paramConfig/wechatAppId')
         // 判断是否有微信appId
         if (data) {
           closeToast()
           const replaceUrl =
-            'https://online.lexiaoya.cn/api-backend/open/agent/wx/oauth2?appId=' +
-            data +
-            '&redirectUrl=' +
-            url
+            `https://online.lexiaoya.cn/getWxCode?appid=${data}&state=STATE&redirect_uri=` +
+            encodeURIComponent(url)
+
           console.log(data, 'aaaa')
           console.log(replaceUrl)
-          // window.location.replace(replaceUrl)
+          window.location.replace(replaceUrl)
           // goAuth(data, url)
         }
       } catch {
@@ -79,6 +78,8 @@ export default defineComponent({
     onMounted(async () => {
       // console.log(dayjs(Number(data.time)).subtract(3, 'hour').valueOf())
       // 判断是否是微信，只能微信中打开
+
+      console.log(import.meta.env)
       if (!browser().weixin) {
         forms.showPopup = true
         return

src/views/preview-protocol/index.tsx

@@ -12,6 +12,7 @@ export default defineComponent({
     }
   },
   async mounted() {
+    const type = this.$route.query.type
     try {
       // 判断是否有协议内容
       if (!this.protocolHTML) {
@@ -19,7 +20,7 @@ export default defineComponent({
           state.platformApi + '/open/userContractRecord/queryLatestContractTemplate',
           {
             params: {
-              contractType: 'REGISTER'
+              contractType: type || 'REGISTER'
             }
           }
         )