Explorar o código

Merge branch 'iteration_0310' into jenkins

lex %!s(int64=2) %!d(string=hai) anos
pai
achega
b5cc1138c1
Modificáronse 1 ficheiros con 20 adicións e 14 borrados
  1. 20 14
      public/project/initiation.html

+ 20 - 14
public/project/initiation.html

@@ -347,20 +347,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('信息获取失败,请联系老师')
@@ -494,6 +494,12 @@
           this.btnLoading = true
           try {
             var stu = this.stu
+            // 无意向
+            if (stu.joinOrchestra == 0) {
+              stu.learningSubjectName = null
+              stu.joinParentMeeting = null
+              stu.phone = null
+            }
             var res = await axios.post('/api-student/open/orchestraInitiationSurvey/save', {
               orchestraId: this.orchestraId,
               schoolId: this.schoolId,