mo vor 3 Jahren
Ursprung
Commit
39c156a43c

+ 5 - 1
src/assets/icon/iconfont.css

@@ -1,6 +1,6 @@
 @font-face {
 @font-face {
   font-family: "iconfont"; /* Project id  */
   font-family: "iconfont"; /* Project id  */
-  src: url('iconfont.ttf?t=1652842291832') format('truetype');
+  src: url('iconfont.ttf?t=1653293897401') format('truetype');
 }
 }
 
 
 .iconfont {
 .iconfont {
@@ -447,3 +447,7 @@
   content: "\e688";
   content: "\e688";
 }
 }
 
 
+.icon-zhiboshangpinguanli:before {
+  content: "\e689";
+}
+

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
src/assets/icon/iconfont.js


+ 7 - 0
src/assets/icon/iconfont.json

@@ -767,6 +767,13 @@
       "font_class": "xiaoxiaoyishujiaxunlianying1",
       "font_class": "xiaoxiaoyishujiaxunlianying1",
       "unicode": "e688",
       "unicode": "e688",
       "unicode_decimal": 59016
       "unicode_decimal": 59016
+    },
+    {
+      "icon_id": "29915040",
+      "name": "直播商品管理",
+      "font_class": "zhiboshangpinguanli",
+      "unicode": "e689",
+      "unicode_decimal": 59017
     }
     }
   ]
   ]
 }
 }

BIN
src/assets/icon/iconfont.ttf


+ 25 - 18
src/views/littleArtistCamp/aristCampDetail.vue

@@ -25,7 +25,7 @@
             placeholder="所在群组"
             placeholder="所在群组"
           >
           >
             <el-option
             <el-option
-              v-for="(item) in imGroupIdList"
+              v-for="item in imGroupIdList"
               :key="item.id"
               :key="item.id"
               :value="item.id"
               :value="item.id"
               :label="item.name"
               :label="item.name"
@@ -75,7 +75,9 @@
           <el-table-column align="center" prop="playTime" label="操作">
           <el-table-column align="center" prop="playTime" label="操作">
             <template slot-scope="scope">
             <template slot-scope="scope">
               <div>
               <div>
-                <auth auths="tempLittleArtistTrainingCamp/queryUserTrainingTime">
+                <auth
+                  auths="tempLittleArtistTrainingCamp/queryUserTrainingTime"
+                >
                   <el-button type="text" @click="lookstudentCamp(scope.row)"
                   <el-button type="text" @click="lookstudentCamp(scope.row)"
                     >打卡记录</el-button
                     >打卡记录</el-button
                   >
                   >
@@ -100,16 +102,16 @@
 
 
 <script>
 <script>
 import pagination from "@/components/Pagination/index";
 import pagination from "@/components/Pagination/index";
-import artistClock from "./models/artistClock"
-import { getUserTrainingDetail,getCampImGroup } from "./api";
+import artistClock from "./models/artistClock";
+import { getUserTrainingDetail, getCampImGroup } from "./api";
 export default {
 export default {
-  components: { pagination,artistClock },
+  components: { pagination, artistClock },
   data() {
   data() {
     return {
     return {
       searchForm: {},
       searchForm: {},
       tableList: [],
       tableList: [],
-      imGroupIdList:[],
-      title:this.$route.query.name || '',
+      imGroupIdList: [],
+      title: this.$route.query.name || "",
       pageInfo: {
       pageInfo: {
         // 分页规则
         // 分页规则
         limit: 10, // 限制显示条数
         limit: 10, // 限制显示条数
@@ -121,18 +123,23 @@ export default {
   },
   },
   mounted() {
   mounted() {
     this.getList();
     this.getList();
-    this.getImgroupList()
+    this.getImgroupList();
   },
   },
   methods: {
   methods: {
-   async getImgroupList(){
-     try{
-       const res = await getCampImGroup({imGroupIds:this.$route.query.imGroupIds})
-       this.imGroupIdList = res.data
-     }catch(e){
-
-     }
-   },
-    goBack() {},
+    async getImgroupList() {
+      try {
+        const res = await getCampImGroup({
+          imGroupIds: this.$route.query.imGroupIds,
+        });
+        this.imGroupIdList = res.data;
+      } catch (e) {}
+    },
+    goBack() {
+      this.$store.dispatch("delVisitedViews", this.$route);
+      this.$router.push({
+        path: "/littleArtistCamp",
+      });
+    },
     search() {
     search() {
       this.pageInfo.page = 1;
       this.pageInfo.page = 1;
       this.getList();
       this.getList();
@@ -153,7 +160,7 @@ export default {
       }
       }
     },
     },
     lookstudentCamp(row) {
     lookstudentCamp(row) {
-      this.$refs.artistClock.openDioag(row)
+      this.$refs.artistClock.openDioag(row);
     },
     },
   },
   },
 };
 };

+ 1 - 1
src/views/littleArtistCamp/index.vue

@@ -183,7 +183,7 @@ import { getTrainingCampList,delTrainingCamp } from "./api";
 import eidtCamp from "./models/eidtCamp";
 import eidtCamp from "./models/eidtCamp";
 //
 //
 export default {
 export default {
-  components: { pagination, eidtCamp,campRosterList },
+  components: { pagination, eidtCamp, campRosterList },
   data() {
   data() {
     return {
     return {
       searchForm: {
       searchForm: {

+ 2 - 2
src/views/littleArtistCamp/models/eidtCamp.vue

@@ -14,7 +14,7 @@
         >
         >
           <el-input class="w100" v-model="formes.name"></el-input>
           <el-input class="w100" v-model="formes.name"></el-input>
         </el-form-item>
         </el-form-item>
-        <el-form-item prop="applyTime" label="报名时间">
+        <el-form-item prop="applyTime" label="报名时间"  :rules="[{ required: true, message: '请选择报名时间' }]">
           <el-date-picker
           <el-date-picker
             v-model.trim="formes.applyTime"
             v-model.trim="formes.applyTime"
             class="w100"
             class="w100"
@@ -30,7 +30,7 @@
           >
           >
           </el-date-picker>
           </el-date-picker>
         </el-form-item>
         </el-form-item>
-        <el-form-item prop="trainTime" label="训练时间">
+        <el-form-item prop="trainTime" label="训练时间" :rules="[{ required: true, message: '请选择训练时间' }]">
           <el-date-picker
           <el-date-picker
             v-model.trim="formes.trainTime"
             v-model.trim="formes.trainTime"
             type="daterange"
             type="daterange"

+ 1 - 1
src/views/liveShopManger/models/eidtLiveShop.vue

@@ -44,7 +44,7 @@
               prop="originalPrice"
               prop="originalPrice"
             >
             >
               <el-input class="w100" v-model="formes.originalPrice">
               <el-input class="w100" v-model="formes.originalPrice">
-                <template slot="append">原价</template>
+                <template slot="append"></template>
               </el-input>
               </el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.