Merge remote-tracking branch 'origin/development' into development

src/components/class/dialog.vue

@@ -69,7 +69,16 @@
         this.exitTeacherList = this.dialogObj.teacherList.length > 0 ? this.dialogObj.teacherList :  [];
         getTeacherListApi().then(res=>{
           if (this.exitTeacherList.length > 0) {
-            this.teacherList =  this.findDifferentArray(res.list, this.exitTeacherList)
+            this.teacherList =  this.findDifferentArray(res.list, this.exitTeacherList);
+            if (this.form.teacher_id){
+                let _index = this.teacherList.findIndex((ts)=>{
+                    return ts.id == this.form.teacher_id
+                  })
+                if (_index === -1) {
+                    let obj = res.list.find((item)=>{ return item.id == this.form.teacher_id})
+                  this.teacherList.push(obj)
+                }
+            }
           } else {
             this.teacherList = res.list
           }
@@ -90,7 +99,6 @@
       },
       initPage(){
         this.periods = this.dialogObj.periods
-        this.getTeacher();
         switch (this.dialogObj.type) {
           case 0:
             if(!this.dialogObj.periodsId){
@@ -100,13 +108,15 @@
               teacher_id:'',
               max_join_num:''
             };
+            this.getTeacher();
             break;
           case 1:
             getClassDetailApi(this.dialogObj.id).then(res=>{
               this.form = {
-                teacher_id:res.teacher_id,
+                teacher_id: parseInt(res.teacher_id),
                 max_join_num:res.max_join_num
               };
+              this.getTeacher();
             })
         }
       },

src/components/class/index.vue

@@ -259,6 +259,7 @@
         });
       },
       onAdd(){
+        console.log('onAdd', this.periods)
         this.dialogObj = {
           show:true,
           title:'添加班级',

src/components/periods/newDialog.vue

@@ -254,6 +254,8 @@
         }
       },
       onOptionChange(id){
+        console.log('onOptionChange', id)
+        this.form.goods_id = id;
         let index = this.goodList.findIndex((val)=>{ return val.id = id});
         if(index >-1){
             this.getLessonDetail(this.goodList[index].course_id);

src/components/refund/index.vue

@@ -22,14 +22,14 @@
     <el-table
       :data="list"
       style="width: 100%">
-      <el-table-column
-        prop="out_trade_no"
-        label="订单号">
-      </el-table-column>
       <el-table-column
         prop="refund_no"
         label="退款编号">
       </el-table-column>
+      <el-table-column
+        prop="out_trade_no"
+        label="订单号">
+      </el-table-column>
       <el-table-column
         label="用户信息"
         min-width="140"
@@ -56,11 +56,7 @@
       </el-table-column>
       <el-table-column
         prop="desc"
-        label="退款原因">
-      </el-table-column>
-      <el-table-column
-        prop="callback"
-        label="微信回调">
+        label="备注">
       </el-table-column>
       <el-table-column
         label="退款状态">

src/components/weChat/autoReplyDialog.vue

@@ -546,7 +546,7 @@
         let json = {
           type: type,
           page: this.nowPage,
-          limit: type === 'news' ? 2 : this.limit
+          limit: this.limit
         };
         this.loading = true;
         this.showMedia = true;

src/components/weChat/focusReplyDialog.vue

@@ -230,9 +230,6 @@
           <div class="tool_bar">
             <el-button @click="close">取 消</el-button>
             <el-button class="weui-desktop-btn weui-desktop-btn_primary" @click="save">保存</el-button>
-            <!--<div class="weui-desktop-popover__wrp">-->
-              <!--<span class="weui-desktop-popover__target"><button class="weui-desktop-btn weui-desktop-btn_default">删除回复</button></span>-->
-            <!--</div>-->
           </div>
         </div>
       </div>

src/service/api.js

@@ -509,3 +509,8 @@ const copyShopUrl = `/api/admin/goods/copy/`;
 export const copyShopApi = function (id) {
   return Vue.prototype.$post(`${copyShopUrl}${id}`)
 }
+// 获取media详情
+const getMediaUrl = `/api/admin/open/media/info`
+export const getMediaApi = function (id) {
+  return Vue.prototype.$fetch(`${getMediaUrl}?media_id=${id}`)
+}