bug fix

src/components/class/index.vue

@@ -12,7 +12,7 @@
           </el-cascader>
         </el-form-item>
         <el-form-item label="老师">
-          <el-select v-model="teacher_id" placeholder="请选择">
+          <el-select v-model="teacher_id" placeholder="请选择" clearable>
             <el-option
               v-for="(data,index) in teacherList"
               :key="index"

src/components/lesson/index.vue

@@ -16,11 +16,13 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="3">
-          <el-button style="margin-left: 16px;" type="primary" plain @click="getUser">搜索</el-button>
+        <el-col :span="4">
+          <el-form-item>
+            <el-button type="primary" plain @click="getUser">搜索</el-button>
+          </el-form-item>
         </el-col>
-        <el-col :span="5" :offset="8">
-          <el-button style="float: right" type="success" plain @click="add">新增课程</el-button>
+        <el-col :span="4" :offset="8">
+          <el-button type="success" plain @click="add">新增课程</el-button>
         </el-col>
       </el-row>
     </el-form>

src/components/periods/index.vue

@@ -5,16 +5,33 @@
         <el-form-item label="期数标题">
           <el-input v-model="title" placeholder="请输入内容" clearable></el-input>
         </el-form-item>
-        <el-form-item label="商品ID">
-          <el-input v-model="goodsId" placeholder="请输入内容" clearable></el-input>
+        <el-form-item label="商品名称">
+          <el-select v-model="goodsId" placeholder="请选择" clearable>
+            <el-option
+              v-for="(data,index) in goodList"
+              :key="index"
+              :label="data | filterGoods"
+              :value="data.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item>
-          <el-button @click="onChoose" type="success">选择商品</el-button>
+        <el-form-item label="课程名称">
+          <el-select v-model="lessonId" placeholder="请选择" clearable>
+            <el-option
+              v-for="(data,index) in lessonList"
+              :key="index"
+              :label="data.title"
+              :value="data.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item>
+        <!--<el-form-item>-->
+          <!--<el-button @click="onChoose" type="success">选择商品</el-button>-->
+        <!--</el-form-item>-->
+        <!--<el-form-item>-->
           <el-button @click="onSearch" type="primary">查询</el-button>
         </el-form-item>
-        <el-form-item style="float: right">
+        <el-form-item style="float: left;margin-left: 20px;">
           <el-button @click="onAdd" type="primary">添加期数</el-button>
         </el-form-item>
       </el-form>
@@ -22,46 +39,6 @@
     <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">
@@ -71,12 +48,26 @@
         label="期数标题">
       </el-table-column>
       <el-table-column
-        prop="course_id"
-        label="课程ID">
+        prop="goods_name"
+        label="商品名称">
       </el-table-column>
       <el-table-column
-        prop="start_at"
-        label="期数开始时间">
+        label="商品价格">
+        <template slot-scope="scope">
+          {{scope.row.goods_price / 100 }}元
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="course_title"
+        label="课程名称">
+      </el-table-column>
+      <el-table-column
+        prop="start_name"
+        label="开始主题/歌">
+      </el-table-column>
+      <el-table-column
+        prop="current_category_name"
+        label="当前歌曲">
       </el-table-column>
       <el-table-column
         prop="watch_num"
@@ -86,6 +77,24 @@
         prop="duration_num"
         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
+        label="周几不上课">
+        <template slot-scope="scope">
+          {{scope.row.rest_week_day | dayFilter}}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="start_at"
+        label="期数开始时间">
+      </el-table-column>
       <el-table-column
         label="操作"
       width="148">
@@ -100,7 +109,6 @@
       </el-table-column>
     </el-table>
     <page :nowPage="nowPage" :total="total"/>
-    <good-dialog v-if="dialogObj.show" :dialogObj="dialogObj" @reflash="getChooseGood"></good-dialog>
     <new-dialog v-if="newDialog.show" :dialogObj="newDialog" @reflash="onSave"></new-dialog>
   </div>
 </template>
@@ -109,7 +117,7 @@
   import goodDialog from './dialog'
   import newDialog from './newDialog'
   import page from '../framework/page'
-  import {getPeriodsApi,delPeriodApi} from "../../service/api";
+  import {getPeriodsApi,delPeriodApi,getGoodsListApi,getLessonApi} from "../../service/api";
   import {WEEKDAY} from '../../util/wordbook';
   export default {
     name: "index",
@@ -119,11 +127,8 @@
         total: 0,
         title: '',
         goodsId: null,
+        lessonId: null,
         periodList: [],
-        dialogObj:{
-          show:false,
-          title:'选择商品',
-        },
         newDialog: {
           form: {
             id: 0,
@@ -135,7 +140,9 @@
           },
           show: false,
           title: ''
-        }
+        },
+        goodList: [],
+        lessonList: []
       }
     },
     filters: {
@@ -145,6 +152,9 @@
             return WEEKDAY[day];
         })
         return list.join(',')
+      },
+      filterGoods(val){
+        return val.name + '[' +val.current_price / 100 + '元]'
       }
     },
     components:{
@@ -153,13 +163,6 @@
       page
     },
     methods: {
-      onChoose(){
-        this.dialogObj.show = true;
-      },
-      getChooseGood(val){
-        this.goodsId = val.id;
-        this.dialogObj.show = false;
-      },
       onSearch(){
         let json={
         }
@@ -169,6 +172,9 @@
         if(this.goodsId){
           json.goods_id = this.goodsId;
         }
+        if(this.lessonId){
+          json.course_id = this.lessonId;
+        }
         getPeriodsApi(json).then(res=>{
           this.periodList = res.list;
           this.total = res.total
@@ -225,10 +231,30 @@
             this.onSearch()
           });
         });
+      },
+      getGoodsOption(){
+        let json = {
+          page: 1,
+          limit: 100
+        };
+        getGoodsListApi(json).then(res=>{
+          this.goodList = res.list;
+        })
+      },
+      getLessonOption(){
+        let json = {
+          page: 1,
+          limit: 100
+        };
+        getLessonApi(json).then(res=>{
+          this.lessonList = res.list;
+        })
       }
     },
     mounted(){
       this.onSearch();
+      this.getGoodsOption();
+      this.getLessonOption();
     }
   }
 </script>

src/components/periods/newDialog.vue

@@ -10,13 +10,15 @@
         <el-form ref="form" :model="form" label-width="120px" :rules="rules">
           <el-row>
             <el-col :span="10">
-              <el-form-item label="商品ID" prop="goods_id">
-                <el-input v-model="form.goods_id" placeholder="请输入内容" clearable></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="10">
-              <el-form-item>
-                <el-button @click="onChoose" type="success">选择商品</el-button>
+              <el-form-item label="商品名称" prop="goods_id">
+                <el-select v-model="form.goods_id" placeholder="请选择" clearable @change="getLessonDetail">
+                  <el-option
+                    v-for="(data,index) in goodList"
+                    :key="index"
+                    :label="data | filterGoods"
+                    :value="data.id">
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -39,10 +41,11 @@
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
               type="date"
+              :picker-options="pickerOptions1"
               placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="相关老师ID">
+          <el-form-item label="相关老师">
             <el-select v-model="teacherList" multiple placeholder="请选择">
               <el-option
                 v-for="item in teacherOptions"
@@ -69,7 +72,6 @@
       </span>
       </div>
     </el-dialog>
-    <good-dialog v-if="goodDialogObj.show" :dialogObj="goodDialogObj" @reflash="getChooseGood"></good-dialog>
   </div>
 </template>
 
@@ -86,9 +88,10 @@
         loading: false,
         form: {},
         teacherList: [],
-        goodDialogObj:{
-          show:false,
-          title:'选择商品',
+        pickerOptions1: {
+          disabledDate(time) {
+            return !(time.getTime() > Date.now());
+          }
         },
         options: [
           {
@@ -121,6 +124,7 @@
           }
         ],
         teacherOptions: [],
+        goodList: [],
         itemOptions: [],
         rules:{
           title:[
@@ -159,21 +163,12 @@
       },
       goodsStatus(value){
         return GOODSSTATUS[value]
+      },
+      filterGoods(val){
+        return val.name + '[' +val.current_price / 100 + '元]'
       }
     },
     methods:{
-      initPage(){
-        getGoodsListApi().then(res=>{
-          this.goodList = res.list;
-          this.total = res.total
-        });
-      },
-      handleCurrentChange(val){
-        this.currentRow = val;
-      },
-      onConfirm(){
-        this.$emit("reflash",this.currentRow);
-      },
       sub(){
         if (!this.teacherList) {
           this.$message.error('请选择老师ID');
@@ -209,14 +204,11 @@
           }
         });
       },
-      onChoose(){
-        this.goodDialogObj.show = true;
-      },
-      getChooseGood(val){
-        this.form.goods_id = val.id;
-        this.getLessonDetail(val.course_id);
-        this.goodDialogObj.show = false;
-      },
+//      getChooseGood(val){
+//        this.form.goods_id = val.id;
+//        this.getLessonDetail(val.course_id);
+//        this.goodDialogObj.show = false;
+//      },
       getTeachers(){
         getTeacherListApi().then((res)=>{
           this.teacherOptions = res.list;
@@ -226,11 +218,21 @@
         getLessonDetailApi(id,{}).then((res) => {
           this.itemOptions = res.detail[res.type]
         })
+      },
+      getGoodsOption(){
+        let json = {
+          page: 1,
+          limit: 100
+        };
+        getGoodsListApi(json).then(res=>{
+          this.goodList = res.list;
+        })
       }
     },
     mounted(){
 //      this.initPage()
       this.getTeachers();
+      this.getGoodsOption();
       this.form = this.dialogObj.form;
       this.teacherList = this.dialogObj.form.teacher_ids;
     }

src/components/resources/editorDialog.vue

@@ -45,6 +45,9 @@
         <el-form-item label="标题">
           <el-input v-model="form.title"></el-input>
         </el-form-item>
+        <el-form-item label="单词量">
+          <el-input-number v-model="form.words_num"></el-input-number>
+        </el-form-item>
         <el-form-item label="封面">
           <el-upload
             class="upload-demo"
@@ -151,6 +154,7 @@
               title:'',
               content:'',
               cover:'',
+              words_num: 0
             };
             break;
           case 1:
@@ -159,10 +163,10 @@
                 category_id:res.category_id,
                 content:res.content,
                 cover:res.cover,
-                title:res.title
+                title:res.title,
+                words_num: res.words_num
               }
               this.selectedMould = JSON.parse(res.content)
-              console.log(this.selectedMould)
             })
 
         }

src/components/shop/dialog.vue

@@ -130,12 +130,12 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="form.goods_type === 1 ? '原价(元)' : '拼团价格(元)'">
+            <el-form-item :label="form.goods_type === 1 ? '原价(元)' : '单买价格(元)'">
               <el-input-number v-model="form.original_price" label="原价"></el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="form.goods_type === 1 ? '现价(元)' : '单买价格(元)'">
+            <el-form-item :label="form.goods_type === 1 ? '现价(元)' : '拼团价格(元)'">
               <el-input-number v-model="form.current_price" label="现价"></el-input-number>
             </el-form-item>
           </el-col>

src/components/shop/index.vue

@@ -42,6 +42,10 @@
           {{scope.row.current_price/100}}元
         </template>
       </el-table-column>
+      <el-table-column
+        prop="course_title"
+        label="课程名称">
+      </el-table-column>
       <el-table-column
         label="课程类别">
         <template slot-scope="scope">