bug fix

src/components/class/index.vue

@@ -181,16 +181,12 @@
         });
       },
       onAdd(){
-        if(this.periods){
         this.dialogObj = {
           show:true,
           title:'添加班级',
-            periodsId:this.periods.id,
+          periodsId:this.periods ? this.periods.id : '',
           type:0,
         }
-        }else{
-          this.$message.error('请先选择期数');
-        }
       },
       editClass(data){
         this.dialogObj = {

src/components/noLesson/dialog.vue

@@ -47,8 +47,8 @@
         title: '',
         loading:true,
         form:{
-          key:'noLesson',
-          value:'noLesson',
+          key:'no_lesson_date',
+          value:'no_lesson_date',
           desc:[]
         },
         noLessonDate: '',

src/components/noLesson/index.vue

@@ -46,12 +46,11 @@
       },
       getList(){
         let json = {
-          key:'noLesson'
+          key:'no_lesson_date'
         };
         getConfigListApi(json).then(res => {
           if(res.list.length > 0){
             let _desc = res.list[0].desc;
-            console.log('desc', _desc)
             this.id = res.list[0].id;
             this.list = _desc ? JSON.parse(_desc) : [];
           }
@@ -75,25 +74,22 @@
         });
       },
       del(data){
-          console.log('data', data);
         this.$confirm('此操作将删除该记录?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
           let json = {
-            key: 'noLesson',
-            value: 'noLesson'
+            key: 'no_lesson_date',
+            value: 'no_lesson_date'
           }
           let _desc = [];
           this.list.forEach((val)=>{
             if(val !== data) {
-              console.log('_desc val', val)
                 _desc.push(val);
             }
           })
           json.desc = JSON.stringify(_desc);
-          console.log('_desc json', json)
           updateConfigApi(this.id,json).then(res=>{
             this.$message({
               type: 'success',

src/components/periods/index.vue

@@ -22,6 +22,46 @@
     <el-table
       :data="periodList"
       style="width: 100%">
+      <el-table-column type="expand">
+        <template slot-scope="props">
+          <el-form label-position="left"  class="demo-table-expand">
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="关联的商品ID:">
+                  <span>{{ props.row.goods_id }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="已看课包数:">
+                  <span>{{ props.row.has_watch_num }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="已续看课包数:">
+                  <span>{{ props.row.has_duration_num }}</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="当前看的课包ID:">
+                  <span>{{ props.row.current_category_id }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="周几不上课:">
+                  <span>{{ props.row.rest_week_day | dayFilter }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="开始的主题/歌ID:">
+                  <span>{{ props.row.start_num }}</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="id"
         label="期数ID">
@@ -30,18 +70,10 @@
         prop="title"
         label="期数标题">
       </el-table-column>
-      <el-table-column
-        prop="goods_id"
-        label="关联的商品ID">
-      </el-table-column>
       <el-table-column
         prop="course_id"
         label="课程ID">
       </el-table-column>
-      <el-table-column
-        prop="start_num"
-        label="开始的主题/歌ID">
-      </el-table-column>
       <el-table-column
         prop="start_at"
         label="期数开始时间">
@@ -55,23 +87,8 @@
         label="续看课包数">
       </el-table-column>
       <el-table-column
-        prop="has_watch_num"
-        label="已看课包数">
-      </el-table-column>
-      <el-table-column
-        prop="has_duration_num"
-        label="已续看课包数">
-      </el-table-column>
-      <el-table-column
-        prop="current_category_id"
-        label="当前看的课包ID">
-      </el-table-column>
-      <el-table-column
-        prop="rest_week_day"
-        label="周几不上课">
-      </el-table-column>
-      <el-table-column
-        label="操作">
+        label="操作"
+      width="148">
         <template slot-scope="scope">
           <el-button size="mini" plain type="primary" @click="onEdit(scope.row)">
             编辑
@@ -93,6 +110,7 @@
   import newDialog from './newDialog'
   import page from '../framework/page'
   import {getPeriodsApi,delPeriodApi} from "../../service/api";
+  import {WEEKDAY} from '../../util/wordbook';
   export default {
     name: "index",
     data(){
@@ -120,6 +138,15 @@
         }
       }
     },
+    filters: {
+      dayFilter: function (value) {
+        let list = value ? value.split(',') : [];
+        list = list.map((day) => {
+            return WEEKDAY[day];
+        })
+        return list.join(',')
+      }
+    },
     components:{
       goodDialog,
       newDialog,

src/components/periods/newDialog.vue

@@ -42,7 +42,7 @@
               placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="老师IDs">
+          <el-form-item label="相关老师ID">
             <el-select v-model="teacherList" multiple placeholder="请选择">
               <el-option
                 v-for="item in teacherOptions"

src/components/shop/dialog.vue

@@ -6,25 +6,59 @@
     :visible.sync="dialogObj.show"
     width="800px">
     <div v-loading="loading">
-      <el-form ref="form" :model="form" label-width="200px" :disabled="dialogObj.type === 2">
+      <el-form ref="form" :model="form" label-width="100px" :disabled="dialogObj.type === 2">
+        <el-row>
+          <el-col :span="12">
             <el-form-item label="商品名称">
               <el-input v-model="form.name"></el-input>
             </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="商品描述">
               <el-input v-model="form.goods_desc.desc"></el-input>
             </el-form-item>
-        <el-form-item label="商品类型">
-          <el-select v-model="form.goods_type" placeholder="请选择">
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="课程类型">
+              <el-select v-model="form.course_type" placeholder="请选择" @change="changeLessonType()">
                 <el-option
-              :label="'普通商品'"
+                  :label="'日课'"
                   :value="1">
                 </el-option>
                 <el-option
-              :label="'团购商品'"
-              :value="2">
+                  :label="'月课'"
+                  :value="0">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="课程">
+              <el-select v-model="form.course_id" placeholder="请选择">
+                <el-option
+                  v-for="data in lessonList"
+                  :key="data.id"
+                  :label="data.title"
+                  :value="data.id">
                 </el-option>
               </el-select>
             </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="观看时长(节)">
+              <el-input-number v-model="form.watch_num" label="课时数"></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="续看时长(天)">
+              <el-input-number v-model="form.duration_num" label="看课天数"></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-form-item label="主图">
           <el-upload
             list-type="picture-card"
@@ -47,79 +81,89 @@
             <i class="el-icon-plus"></i>
           </el-upload>
         </el-form-item>
-        <el-form-item label="课程类型">
-          <el-select v-model="form.course_type" placeholder="请选择" @change="changeLessonType()">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="商品类型">
+              <el-select v-model="form.goods_type" placeholder="请选择">
                 <el-option
-              :label="'日课'"
+                  :label="'普通商品'"
                   :value="1">
                 </el-option>
                 <el-option
-              :label="'月课'"
-              :value="0">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="课程">
-          <el-select v-model="form.course_id" placeholder="请选择">
-            <el-option
-              v-for="data in lessonList"
-              :key="data.id"
-              :label="data.title"
-              :value="data.id">
+                  :label="'团购商品'"
+                  :value="2">
                 </el-option>
               </el-select>
             </el-form-item>
-        <el-form-item label="观看时长">
-          <el-input-number v-model="form.watch_num" label="课时数"></el-input-number> 节
-        </el-form-item>
-        <el-form-item label="续看时长">
-          <el-input-number v-model="form.duration_num" label="看课天数"></el-input-number> 天
+          </el-col>
+        </el-row>
+        <el-form-item label="推荐奖金(元)" v-if="form.goods_type === 1">
+          <el-input-number v-model="form.invite_earnings" label="推荐奖金"></el-input-number>
         </el-form-item>
         <el-form-item label="是否配置实物">
           <el-switch
             v-model="form.is_real"
             :active-value="1"
             :inactive-value="0">
-          </el-switch> <span>打开后提示用户填写具体住址</span>
+          </el-switch> <span style="font-size: 12px;">打开后提示用户填写具体住址</span>
         </el-form-item>
-        <template v-if="form.goods_type === 1">
-          <el-form-item label="是否可以给用户分享">
+        <el-row v-if="form.goods_type === 1">
+          <el-col :span="12">
+            <el-form-item label="是否允许用户推广" label-width="200">
               <el-switch
                 v-model="form.is_auth_user"
                 :active-value="1"
                 :inactive-value="0">
               </el-switch>
             </el-form-item>
-          <el-form-item label="是否可以给老师分享">
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否允许老师推广" label-width="200">
               <el-switch
                 v-model="form.is_auth_teacher"
                 :active-value="1"
                 :inactive-value="0">
               </el-switch>
             </el-form-item>
-          <el-form-item label="推荐奖金">
-            <el-input-number v-model="form.invite_earnings" label="推荐奖金"></el-input-number> 元
-          </el-form-item>
-        </template>
-        <el-form-item :label="form.goods_type === 1 ? '原价' : '拼团价格'">
-          <el-input-number v-model="form.original_price" label="原价"></el-input-number> 元
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="form.goods_type === 1 ? '原价(元)' : '拼团价格(元)'">
+              <el-input-number v-model="form.original_price" label="原价"></el-input-number>
             </el-form-item>
-        <el-form-item :label="form.goods_type === 1 ? '现价' : '单买价格'">
-          <el-input-number v-model="form.current_price" label="现价"></el-input-number> 元
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="form.goods_type === 1 ? '现价(元)' : '单买价格(元)'">
+              <el-input-number v-model="form.current_price" label="现价"></el-input-number>
             </el-form-item>
-        <el-form-item label="成团人数" v-if="form.goods_type === 2">
-          <el-input-number v-model="form.desc.group_number" label="成团人数"></el-input-number> 人
+          </el-col>
+        </el-row>
+        <el-row v-if="form.goods_type === 2">
+          <el-col :span="12">
+            <el-form-item label="成团人数(人)" >
+              <el-input-number v-model="form.desc.group_number" label="成团人数"></el-input-number>
             </el-form-item>
-        <el-form-item label="团购失效时间" v-if="form.goods_type === 2">
-          <el-input-number v-model="form.desc.group_continue" label="团购失效时间"></el-input-number>小时
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="团购失效时间(小时)" label-width="136">
+              <el-input-number v-model="form.desc.group_continue" label="团购失效时间"></el-input-number>
             </el-form-item>
-
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
             <el-form-item label="分享标题">
-          <el-input v-model="form.share_desc.title" style="width: 200px"></el-input>
+              <el-input v-model="form.share_desc.title"></el-input>
             </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="分享内容">
               <el-input v-model="form.share_desc.content"></el-input>
             </el-form-item>
+          </el-col>
+        </el-row>
         <el-form-item label="分享主图">
           <el-upload
             list-type="picture-card"
@@ -129,13 +173,20 @@
             <i class="el-icon-plus"></i>
           </el-upload>
         </el-form-item>
+        <el-row>
+          <el-col :span="24">
             <el-form-item label="商品详情">
               <el-input type="textarea" :rows="25" v-model="form.desc.detail"></el-input>
             </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
             <el-form-item label="Q&A详情">
               <el-input type="textarea" :rows="25" v-model="form.desc.qa"></el-input>
             </el-form-item>
-
+          </el-col>
+        </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer" v-if="dialogObj.type !== 2">
         <el-button @click="dialogObj.show = false">取 消</el-button>
@@ -360,11 +411,11 @@
 
 <style scoped lang="less">
   .el-col{
-    height: 50px;
+    min-height: 50px;
     text-align: center;
-    margin-bottom: 20px;
+    margin-bottom: 10px;
     line-height: 40px;
-    .el-select{
+    .el-select,.el-select{
       width: 100%;
     }
     img{

src/util/wordbook.js

@@ -24,3 +24,12 @@ export const GOODSSTATUS = {
   '0':'在售',
   '1':'下架'
 };
+export const WEEKDAY = {
+  0: '周日',
+  1: '周一',
+  2: '周二',
+  3: '周三',
+  4: '周四',
+  5: '周五',
+  6: '周六'
+};