提交一下

1

src/components/Descriptions/Descriptions.vue

@@ -143,9 +143,9 @@ export default {
     top: -0.5px;
   }
   .description-view .description-content {
-    white-space: nowrap;
+    /* white-space: nowrap;
     overflow: hidden;
-    text-overflow: ellipsis;
+    text-overflow: ellipsis; */
     border-right: 1px solid #e8e8e8;
     font-size: 14px;
     line-height: 1.5;

src/layout/components/TagsView.vue

@@ -19,6 +19,7 @@
         <!-- v-if="index == Array.from(visitedViews).length -1" -->
         <span
           class="el-icon-close icon"
+          style="touch-action:none"
           @click.prevent.stop="closeSelectedTag(tag)"
         ></span>
       </router-link>
@@ -62,8 +63,9 @@ export default {
     },
   },
   watch: {
-    $route() {
+    $route() {console.log('添加',this.$route)
       this.addViewTags();
+
       this.moveToCurrentTag();
       // 就是为了处理，tab 切换，saveKey 问题
       if (!activeKey && !this.$store.state.tagsView.isBack) {
@@ -87,12 +89,13 @@ export default {
     },
     visible(value) {
       if (value) {
-        document.body.addEventListener("click", this.closeMenu);
+        document.body.addEventListener("click", this.closeMenu,{passive: true });
       } else {
-        document.body.removeEventListener("click", this.closeMenu);
+        document.body.removeEventListener("click", this.closeMenu,{passive: true });
       }
     },
    async '$route.meta.title'(val){
+      console.log(this.$route.meta.title,'添加')
        await this.$store.dispatch("addVisitedViews", this.$route);
     }
   },
@@ -188,7 +191,7 @@ export default {
       } else {
 
         const searchs = new Searchs();
-        searchs.remove(this.$route.path);
+
         this.$store
           .dispatch("delVisitedViews", { ...view, dontNeedSave: true })
           .then((views) => {

src/main.js

@@ -19,7 +19,6 @@ dayjs.extend(isBetween);
 import * as constant from "@/constant";
 
 import "normalize.css/normalize.css"; // A modern alternative to CSS resets
-// import "default-passive-events";
 import "babel-polyfill";
 // import './theme/index.css'
 

src/store/modules/selects.js

@@ -126,7 +126,6 @@ export default {
       }
     },
     async setTeachers({ commit, state }, force) {
-      console.log('force',force)
       if (
         (!state.teachers.length || force === true) &&
         !loadings.commit_teachers

src/store/modules/tagsView.js

@@ -6,6 +6,8 @@ const tagsView = {
   },
   mutations: {
     ADD_VISITED_VIEWS: (state, view) => {
+      // debugger
+      console.log(view)
       if (state.visitedViews.some(v => v.path === view.path)) {
         state.visitedViews.forEach(v => {
           if (v.path === view.path) {
@@ -38,7 +40,6 @@ const tagsView = {
           if (state.visitedViews.length == 1 && state.visitedViews[0].path == compareUrl) {
             break
           } else {
-
             state.visitedViews.splice(i, 1)
             break
           }

src/store/modules/user.js

@@ -218,7 +218,6 @@ const actions = {
           resetRouter();
           removeTenant(); // 移除机构信息
           commit("SET_NAME", "");
-          console.log(getToken);
           resolve();
         })
         .catch(error => {

src/views/studentManager/modals/createMember.vue

@@ -65,7 +65,8 @@
         <el-input
           type="textarea"
           show-word-limit
-          :max="200"
+          maxlength="100"
+          :rows="3"
           v-model.trim="memberForm.remark"
           placeholder="请输入备注"
         ></el-input>

src/views/studentManager/modals/recordDetail.vue

@@ -8,7 +8,7 @@
       <descriptions-item label="已缴费人数/总人数">{{ detail.paymentUserNum }}/{{ detail.userNum }}</descriptions-item>
       <descriptions-item label="创建人">{{ detail.operatorName }}</descriptions-item>
       <descriptions-item label="创建时间">{{ detail.createTime }}</descriptions-item>
-      <descriptions-item label="备注">{{ detail.remark }}</descriptions-item>
+      <descriptions-item :span="3" label="备注">{{ detail.remark }}</descriptions-item>
     </descriptions>
 
     <!-- <el-alert title="订单详情" :closable="false" class="alert" style="margin-top: 20px;" type="info" /> -->

src/views/studentManager/studentGroupRecord.vue

@@ -37,19 +37,19 @@
           </el-select>
         </el-form-item>
         <el-form-item prop="visitTime">
-            <el-date-picker
-              v-model.trim="searchForm.visitTime"
-              style="width: 410px"
-              type="daterange"
-              :picker-options="{
-                firstDayOfWeek: 1,
-              }"
-              :default-time="['00:00:00', '23:59:59']"
-              range-separator="至"
-              start-placeholder="创建开始日期"
-              end-placeholder="创建结束日期"
-            ></el-date-picker>
-          </el-form-item>
+          <el-date-picker
+            v-model.trim="searchForm.visitTime"
+            style="width: 410px"
+            type="daterange"
+            :picker-options="{
+              firstDayOfWeek: 1,
+            }"
+            :default-time="['00:00:00', '23:59:59']"
+            range-separator="至"
+            start-placeholder="创建开始日期"
+            end-placeholder="创建结束日期"
+          ></el-date-picker>
+        </el-form-item>
         <el-form-item>
           <el-button @click="search" type="danger">搜索</el-button>
           <el-button @click="onReSet" type="primary">重置</el-button>
@@ -85,11 +85,7 @@
               {{ scope.row.actualAmount | moneyFormat(true) }}
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            prop="type"
-            label="已缴费人数/总人数"
-          >
+          <el-table-column align="center" prop="type" label="已缴费人数/总人数">
             <template slot-scope="scope">
               {{ scope.row.paymentUserNum }}/{{ scope.row.userNum }}
             </template>
@@ -106,27 +102,40 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            label="创建人"
-            prop="operatorName"
-          >
+          <el-table-column align="center" label="创建人" prop="operatorName">
           </el-table-column>
           <el-table-column
             align="center"
             prop="createTime"
             label="创建时间"
           ></el-table-column>
-          <el-table-column
-            align="center"
-            prop="remark"
-            label="备注"
-          ></el-table-column>
-          <el-table-column align="center"
-                          label="操作">
+          <el-table-column align="center" prop="remark" label="备注" width="220px">
+            <template slot-scope="scope">
+                  <overflow-text width="200px" :text="scope.row.remark" />
+                </template>
+          </el-table-column>
+          <el-table-column align="center" label="操作">
             <template slot-scope="scope">
-              <el-button type="text" v-if="scope.row.status == 'REJECT' && $helpers.permission('cloudCoachPaymentProgram/update')" @click="onUpdate(scope.row)">修改</el-button>
-              <el-button type="text" v-if="scope.row.status != 'REJECT' && $helpers.permission('studentCloudCoachPaymentDetails/queryPage')" @click="onDetail(scope.row)">详情</el-button>
+              <el-button
+                type="text"
+                v-if="
+                  scope.row.status == 'REJECT' &&
+                  $helpers.permission('cloudCoachPaymentProgram/update')
+                "
+                @click="onUpdate(scope.row)"
+                >修改</el-button
+              >
+              <el-button
+                type="text"
+                v-if="
+                  scope.row.status != 'REJECT' &&
+                  $helpers.permission(
+                    'studentCloudCoachPaymentDetails/queryPage'
+                  )
+                "
+                @click="onDetail(scope.row)"
+                >详情</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
@@ -148,7 +157,7 @@
       v-if="recordVisible"
       append-to-body
     >
-      <recordDetail :detail="selectDetail"  @close="recordVisible = false" />
+      <recordDetail :detail="selectDetail" @close="recordVisible = false" />
     </el-dialog>
 
     <el-dialog
@@ -159,7 +168,7 @@
       <createMember
         ref="addMember"
         v-if="memberVisible"
-        type='update'
+        type="update"
         :multipleSelection="selectDetail"
         @close="memberVisible = false"
         @submited="getList"
@@ -173,8 +182,8 @@
 </template>
 <script>
 import pagination from "@/components/Pagination/index";
-import recordDetail from '@/views/studentManager/modals/recordDetail'
-import { cloudCoachPaymentProgramQueryPage } from './api'
+import recordDetail from "@/views/studentManager/modals/recordDetail";
+import { cloudCoachPaymentProgramQueryPage } from "./api";
 import createMember from "./modals/createMember";
 import { getTimes } from "@/utils";
 export default {
@@ -201,12 +210,12 @@ export default {
   },
   async mounted() {
     await this.$store.dispatch("setBranchs");
-    this.getList()
+    this.getList();
   },
   methods: {
     async getList() {
       try {
-        const { visitTime, ...search } = this.searchForm
+        const { visitTime, ...search } = this.searchForm;
         const res = await cloudCoachPaymentProgramQueryPage({
           ...search,
           ...getTimes(visitTime, ["startTime", "endTime"]),
@@ -215,7 +224,7 @@ export default {
         });
         this.rules.total = res.data.total;
         this.tableList = res.data.rows;
-      } catch (e) { }
+      } catch (e) {}
     },
     search() {
       this.rules.page = 1;
@@ -225,16 +234,16 @@ export default {
       this.searchForm = {
         visitTime: [],
         period: null,
-      }
-      this.search()
+      };
+      this.search();
     },
     onDetail(row) {
-      this.selectDetail = row
-      this.recordVisible = true
+      this.selectDetail = row;
+      this.recordVisible = true;
     },
     onUpdate(row) {
-      this.memberVisible = true
-      this.selectDetail = row
+      this.memberVisible = true;
+      this.selectDetail = row;
     },
     submitAddMember() {
       this.$refs.addMember.submit();

src/views/teamDetail/teamCourseList.vue

@@ -941,6 +941,7 @@ export default {
     SchoolLocation,
   },
   created() {
+
     // this.searchForm.timer = [nowTime, nowTime];
   },
   computed: {
@@ -968,6 +969,7 @@ export default {
     },
   },
   mounted() {
+    return
     const { query, params } = this.$route;
     if (params.courseIdSearch) {
       this.searchForm.courseIdSearch = params.courseIdSearch;
@@ -1459,7 +1461,6 @@ export default {
         this.activeName = null;
       }
     },
-    "searchForm.courseIdSearch"(val) {},
   },
 };
 </script>

vue.config.js

@@ -19,6 +19,7 @@ const name = defaultSettings.title || "管乐迷后台管理系统"; // page tit
 // let target = 'http://192.168.3.251:8000' // 何国威
 // let target = 'http://192.168.3.20:8000' //邹璇
 // let target = 'http://192.168.3.119:8000' //勇哥
+// let target = 'http://192.168.3.146:8000' //王昭
 // let target = 'http://dev.dayaedu.com' // 开发环境
 let target = "https://test.dayaedu.com"; //测试环境
 // All configuration item explanations can be find in https://cli.vuejs.org/config/