Merge branch '0609getMusicFee' into test

src/views/businessManager/shopManager/shopList.vue

@@ -1137,41 +1137,6 @@ export default {
             trigger: "change",
           },
         ],
-        studentShowOrganId: [
-          {
-            required: true,
-            message: "请选择学生端可见分部",
-            trigger: "change",
-          },
-        ],
-        educationShowOrganId: [
-          {
-            required: true,
-            message: "请选择管理端可见分部",
-            trigger: "change",
-          },
-        ],
-        courseFeeShowOrganId: [
-          {
-            required: true,
-            message: "请选择课程收费团可见分部",
-            trigger: "change",
-          },
-        ],
-        memberFeeShowOrganId: [
-          {
-            required: true,
-            message: "请选择会员收费团可见分部",
-            trigger: "change",
-          },
-        ],
-        replacementShowOrganId: [
-          {
-            required: true,
-            message: "请选择乐器置换展示可见分部",
-            trigger: "change",
-          },
-        ],
         goodsCategoryId: [
           {
             required: true,

src/views/businessManager/shopManager/shopOperation.vue

@@ -504,41 +504,6 @@ export default {
             trigger: "change",
           },
         ],
-        studentShowOrganId: [
-          {
-            required: true,
-            message: "请选择学生端可见分部",
-            trigger: "change",
-          },
-        ],
-        educationShowOrganId: [
-          {
-            required: true,
-            message: "请选择管理端可见分部",
-            trigger: "change",
-          },
-        ],
-        courseFeeShowOrganId: [
-          {
-            required: true,
-            message: "请选择课程&AMR可见分部",
-            trigger: "change",
-          },
-        ],
-        memberFeeShowOrganId: [
-          {
-            required: true,
-            message: "请选择会员收费团可见分部",
-            trigger: "change",
-          },
-        ],
-        replacementShowOrganId: [
-          {
-            required: true,
-            message: "请选择乐器置换展示可见分部",
-            trigger: "change",
-          },
-        ],
         specification: [
           {
             required: true,

src/views/categroyManager/productSystem/index.vue

@@ -2,7 +2,7 @@
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      产品收费设置
+      会员收费设置
     </h2>
     <div class="m-core">
       <!-- navMenu -->

src/views/resetTeaming/components/resetPayList.vue

@@ -156,7 +156,7 @@
                   v-if="
                     scope.row.auditStatus != 'REJECT' &&
                     scope.row.auditStatus != 'AUDITING' &&
-                     scope.row.auditStatus != 'DRAFT' &&
+                    scope.row.auditStatus != 'DRAFT' &&
                     teamStatus &&
                     scope.row.paymentType != 'MUSIC_APPLY' &&
                     scope.row.paymentType != 'ADD_STUDENT' &&
@@ -620,11 +620,13 @@ export default {
     },
     teamStatus() {
       // let type = this.$route.query.type;
-      return this.team_status == "PRE_BUILD_FEE" || this.team_status == "PROGRESS";
+      return (
+        this.team_status == "PRE_BUILD_FEE" || this.team_status == "PROGRESS"
+      );
+    },
+    team_status() {
+      return this.$route.query.team_status;
     },
-    team_status(){
-      return this.$route.query.team_status
-    }
   },
   // activated () {
   //   this.init();
@@ -637,16 +639,18 @@ export default {
           musicGroupId: this.$route.query.id,
         });
       } catch (error) {}
-      this.getTeamInfo()
+      this.getTeamInfo();
       this.getList();
     },
     getTeamInfo() {
-      getTeamBaseInfo({ musicGroupId: this.$route.query.id }).then((res) => {
-        if (res.code == 200) {
-          this.baseInfo = res.data;
-          this.$emit("getBaseInfo",this.baseInfo);
-        }
-      });
+      if (this.$route.query.id) {
+        getTeamBaseInfo({ musicGroupId: this.$route.query.id }).then((res) => {
+          if (res.code == 200) {
+            this.baseInfo = res.data;
+            this.$emit("getBaseInfo", this.baseInfo);
+          }
+        });
+      }
     },
     newUserPay() {
       // 判断一下乐团是课程缴费 还是会员缴费 且乐团状态为创建缴费中
@@ -742,7 +746,7 @@ export default {
         });
         this.$message.success("取消审批成功");
         this.getList();
-        this.getTeamInfo()
+        this.getTeamInfo();
       } catch {}
     },
     changeActive(val) {
@@ -866,7 +870,7 @@ export default {
         if (res.code == 200) {
           this.$message.success("修改成功");
           this.payVisible = false;
-          this.getTeamInfo()
+          this.getTeamInfo();
           this.getList();
         }
       });
@@ -917,7 +921,7 @@ export default {
     async payedSubmited(data) {
       try {
         await this.getList();
-        this.getTeamInfo()
+        this.getTeamInfo();
         // if (!this.isNewGropu) {
         //   this.chioseStudentVisible = true;
         //   if (data) {

src/views/teamDetail/teamList.vue

@@ -108,8 +108,8 @@
             type="daterange"
             value-format="yyyy-MM-dd"
             range-separator="至"
-            start-placeholder="创建开始日期"
-            end-placeholder="创建结束日期"
+            start-placeholder="申请开始日期"
+            end-placeholder="申请结束日期"
             :picker-options="{
               firstDayOfWeek: 1,
             }"