Merge branch 'master' into jenkins

public/project/initiation.html

@@ -348,20 +348,20 @@
         }
 
         // 判断是否是微信，只能微信中打开
-        if (!browser().weixin) {
-          this.showPopup = true
-          return
-        } else {
-          //授权
-          const code = getUrlCode()
-          console.log(code)
-          if (!code) {
-            this.getAppIdAndCode(window.location.href)
-            return
-          } else {
-            this.code = code
-          }
-        }
+        // if (!browser().weixin) {
+        //   this.showPopup = true
+        //   return
+        // } else {
+        //   //授权
+        //   const code = getUrlCode()
+        //   console.log(code)
+        //   if (!code) {
+        //     this.getAppIdAndCode(window.location.href)
+        //     return
+        //   } else {
+        //     this.code = code
+        //   }
+        // }
 
         if (!this.orchestraId) {
           vant.showToast('信息获取失败，请联系老师')

public/project/preRegister.html

@@ -380,20 +380,20 @@
         }
 
         // 判断是否是微信，只能微信中打开
-        if (!browser().weixin) {
-          this.showPopup = true
-          return
-        } else {
-          //授权
-          const code = getUrlCode()
-          console.log(code)
-          if (!code) {
-            this.getAppIdAndCode(window.location.href)
-            return
-          } else {
-            this.code = code
-          }
-        }
+        // if (!browser().weixin) {
+        //   this.showPopup = true
+        //   return
+        // } else {
+        //   //授权
+        //   const code = getUrlCode()
+        //   console.log(code)
+        //   if (!code) {
+        //     this.getAppIdAndCode(window.location.href)
+        //     return
+        //   } else {
+        //     this.code = code
+        //   }
+        // }
 
         if (!this.orchestraId) {
           vant.showToast('信息获取失败，请联系老师')

src/school/approval-manage/subsidy/grant-detail.tsx

@@ -166,9 +166,13 @@ export default defineComponent({
               }}
             </Cell>
             <div class={styles.tipContent}>
-              1、若未在本学期时间内发布2篇乐团资讯，则下一学期管理补助按标准金额的80%发放
+              1、管理补助每个学期最多发放16次，且仅在有配置课件课程的周次发放
               <br />
-              2、若本学期管理补助是按标准金额的80%发放，只要在本学期内发布2篇或以上乐团资讯，则下学期恢复正常管理补助标准
+              2、若本周有配置课件的课程，则需在乐团剪影中上传6张训练照片，若不足6张，则本周次管理补助扣除
+              <br />
+              3、若未在本学期时间内发布2篇乐团资讯，则下一学期管理补助按标准金额的80%发放
+              <br />
+              4、若本学期管理补助是按标准金额的80%发放，只要在本学期内发布2篇或以上乐团资讯，则下学期恢复正常管理补助标准
             </div>
           </div>
         </Dialog>

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

@@ -200,28 +200,28 @@ export default defineComponent({
       }
 
       // 判断是否是微信，只能微信中打开
-      if (!browser().weixin) {
-        state.showPopup = true
-        return
-      } else {
-        //授权
-        const code = getUrlCode()
-        if (!code) {
-          const newUrl =
-            window.location.origin +
-            window.location.pathname +
-            '#' +
-            route.path +
-            '?' +
-            qs.stringify({
-              ...route.query
-            })
-          getAppIdAndCode(newUrl)
-          return
-        } else {
-          state.code = code
-        }
-      }
+      // if (!browser().weixin) {
+      //   state.showPopup = true
+      //   return
+      // } else {
+      //   //授权
+      //   const code = getUrlCode()
+      //   if (!code) {
+      //     const newUrl =
+      //       window.location.origin +
+      //       window.location.pathname +
+      //       '#' +
+      //       route.path +
+      //       '?' +
+      //       qs.stringify({
+      //         ...route.query
+      //       })
+      //     getAppIdAndCode(newUrl)
+      //     return
+      //   } else {
+      //     state.code = code
+      //   }
+      // }
 
       // t: route.query.t, // 过期时间
       try {

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

@@ -130,28 +130,28 @@ export default defineComponent({
       }
 
       // 判断是否是微信，只能微信中打开
-      if (!browser().weixin) {
-        state.showPopup = true
-        return
-      } else {
-        //授权
-        const code = getUrlCode()
-        if (!code) {
-          const newUrl =
-            window.location.origin +
-            window.location.pathname +
-            '#' +
-            route.path +
-            '?' +
-            qs.stringify({
-              ...route.query
-            })
-          getAppIdAndCode(newUrl)
-          return
-        } else {
-          state.code = code
-        }
-      }
+      // if (!browser().weixin) {
+      //   state.showPopup = true
+      //   return
+      // } else {
+      //   //授权
+      //   const code = getUrlCode()
+      //   if (!code) {
+      //     const newUrl =
+      //       window.location.origin +
+      //       window.location.pathname +
+      //       '#' +
+      //       route.path +
+      //       '?' +
+      //       qs.stringify({
+      //         ...route.query
+      //       })
+      //     getAppIdAndCode(newUrl)
+      //     return
+      //   } else {
+      //     state.code = code
+      //   }
+      // }
 
       // t: route.query.t, // 过期时间
       try {

src/school/orchestra/compontent/photo-create.tsx

@@ -42,7 +42,7 @@ export default defineComponent({
       showPhoto: false,
       status: false,
       isLoading: false,
-      photoName: null, // 相册名称
+      photoName: null as any, // 相册名称
       list: [] as any,
       listState: {
         dataShow: true, // 判断是否有数据
@@ -314,6 +314,7 @@ export default defineComponent({
               block
               class={styles.addPhone}
               onClick={() => {
+                state.photoName = ''
                 state.status = true
                 state.selectType = 'add'
               }}

src/school/orchestra/compontent/photo.tsx

@@ -39,7 +39,7 @@ export default defineComponent({
       oPopover: false,
       status: false,
       isLoading: false,
-      photoName: null, // 相册名称
+      photoName: null as any, // 相册名称
       list: [] as any,
       listState: {
         dataShow: true, // 判断是否有数据
@@ -223,6 +223,7 @@ export default defineComponent({
                 <span
                   class={styles.addPhotoTop}
                   onClick={() => {
+                    state.photoName = ''
                     state.status = true
                     state.selectType = 'add'
                   }}

src/school/practice-rewards/detail.tsx

@@ -194,51 +194,51 @@ export default defineComponent({
           </div>
         </div>
         {state.listState.dataShow ? (
-          <OFullRefresh
-            v-model:modelValue={state.listState.refreshing}
-            onRefresh={onRefresh}
-            style={{
-              minHeight: 'auto' //`calc(100vh - ${state.listState.height}px)`
-            }}
+          // <OFullRefresh
+          //   v-model:modelValue={state.listState.refreshing}
+          //   onRefresh={onRefresh}
+          //   style={{
+          //     minHeight: 'auto' //`calc(100vh - ${state.listState.height}px)`
+          //   }}
+          // >
+          <List
+            // v-model:loading={state.listState.loading}
+            finished={state.listState.finished}
+            finishedText=" "
+            class={[styles.liveList]}
+            onLoad={getList}
+            immediateCheck={false}
           >
-            <List
-              // v-model:loading={state.listState.loading}
-              finished={state.listState.finished}
-              finishedText=" "
-              class={[styles.liveList]}
-              onLoad={getList}
-              immediateCheck={false}
-            >
-              <CellGroup inset class={styles.cellGroup}>
-                {state.list.map((item: any) => (
-                  <Cell center>
-                    {{
-                      icon: () => <Image src={item.avatar || iconStudent} class={styles.img} />,
-                      title: () => (
-                        <div class={styles.userInfo}>
-                          <div class={styles.userName}>{item.nickname}</div>
-                          <div class={styles.subjectNames}>
-                            {item.subjectNameList.map((item: any) => (
-                              <Tag type="primary">{item}</Tag>
-                            ))}
-                          </div>
+            <CellGroup inset class={styles.cellGroup}>
+              {state.list.map((item: any) => (
+                <Cell center>
+                  {{
+                    icon: () => <Image src={item.avatar || iconStudent} class={styles.img} />,
+                    title: () => (
+                      <div class={styles.userInfo}>
+                        <div class={styles.userName}>{item.nickname}</div>
+                        <div class={styles.subjectNames}>
+                          {item.subjectNameList.map((item: any) => (
+                            <Tag type="primary">{item}</Tag>
+                          ))}
                         </div>
-                      ),
-                      value: () => (
-                        <div class={styles.mins}>
-                          <div class={styles.nums}>
-                            <span>{item.practiceTimes}</span> 分钟
-                          </div>
-                          <div class={styles.text}>练习时长</div>
+                      </div>
+                    ),
+                    value: () => (
+                      <div class={styles.mins}>
+                        <div class={styles.nums}>
+                          <span>{item.practiceTimes}</span> 分钟
                         </div>
-                      )
-                    }}
-                  </Cell>
-                ))}
-              </CellGroup>
-            </List>
-          </OFullRefresh>
+                        <div class={styles.text}>练习时长</div>
+                      </div>
+                    )
+                  }}
+                </Cell>
+              ))}
+            </CellGroup>
+          </List>
         ) : (
+          // </OFullRefresh>
           <OEmpty btnStatus={false} tips="暂无数据" />
         )}
 

src/styles/index.less

@@ -413,7 +413,7 @@ input {
     background: url('../common/svg/arrow.svg') no-repeat center center;
     width: 9px;
     height: 5px;
-    margin-left: 4px;
+    margin-left: 3px;
   }
 }