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

src/components/monthOrder/index.vue

@@ -41,6 +41,16 @@
                 :value="item.id">
               </el-option>
             </el-select>
+          </el-form-item>
+           <el-form-item label="支付类型">
+            <el-select v-model="searchFrom.order_type" placeholder="请选择" @change="getOrderList" clearable>
+              <el-option
+                v-for="item in orderTypeOption"
+                :key="item.id"
+                :label="item.value"
+                :value="item.id">
+              </el-option>
+            </el-select>
           </el-form-item>
           <el-form-item label="订单状态">
             <el-select multiple v-model="searchFrom.status" placeholder="请选择" @change="getOrderList" clearable>
@@ -148,6 +158,14 @@
           <el-button type="text" v-if="scope.row.status === 5 || scope.row.status === 3" @click="showRef(scope.row)">{{scope.row.status|status}}</el-button>
           <div v-if="scope.row.status !== 5 && scope.row.status !== 3">{{scope.row.status|status}}</div>
         </template>
+      </el-table-column>
+       <el-table-column
+        prop="order_type"
+        label="支付类型"
+      >
+       <template slot-scope="scope">
+          {{scope.row.order_type | buyTypeWay}}
+        </template>
       </el-table-column>
       <el-table-column
         label="实付金额"
@@ -280,7 +298,7 @@
   import detailDialog from './detail'
   import refundDetail from './refundDetail'
   import AddressArray from '../framework/address-picker/addr'
-  import {INVITETYPE,ORDERSTATUS,BUYTYPE,BUYTYPEOPTION,ORDERSTATUSOPTION,INVITETYPEOPTION,GOODSTYPE} from "../../util/wordbook";
+  import {INVITETYPE,ORDERSTATUS,BUYTYPE,BUYTYPEOPTION,ORDERSTATUSOPTION,INVITETYPEOPTION,GOODSTYPE,BUYWay,BUYTYPEWAY} from "../../util/wordbook";
   import CommonJs from '../../util/common';
 
   export default {
@@ -308,6 +326,7 @@
             invite_type: '',
             invite_id: '',
             buy_type: '',
+            order_type: '',
             status: [1,4,5],
             goods_id: '',
             out_trade_no: '',
@@ -334,6 +353,7 @@
           inviteTypeOption: INVITETYPEOPTION,
           orderStatusOption: ORDERSTATUSOPTION,
           buyTypeOption: BUYTYPEOPTION,
+          orderTypeOption:BUYWay,
           inviteSearchPlaceholder: '',
           rules:{
             value:[
@@ -390,6 +410,9 @@
         }
         if (this.searchFrom.buy_type) {
           json.buy_type = this.searchFrom.buy_type
+        }
+          if (this.searchFrom.order_type) {
+          json.order_type = this.searchFrom.order_type
         }
         if (this.searchFrom.status) {
           json.status = this.searchFrom.status.toString()
@@ -490,6 +513,9 @@
         }
         if (this.searchFrom.buy_type) {
           json.buy_type = this.searchFrom.buy_type
+        }
+          if (this.searchFrom.order_type) {
+          json.order_type = this.searchFrom.order_type
         }
         if (this.searchFrom.status) {
           json.status = this.searchFrom.status.toString()
@@ -677,6 +703,9 @@
       },
       filterGoods(val){
           return '[' + GOODSTYPE[val.goods_type] + ']' + '[' +val.current_price / 100 + '元]' + val.name
+      },
+       buyTypeWay(value){
+        return BUYTYPEWAY[value]
       }
     }
   }

src/components/monthOrder/newDialog.vue

@@ -66,9 +66,10 @@
                     <el-select v-model="form.order_type"  placeholder="请选择">
                       <el-option
                         v-for="item in buyWayOptioms"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
+                        :key="item.id"
+                        :label="item.value"
+                        :value="item.id" 
+                        :disabled="item.disabled">
                       </el-option>
                     </el-select>
                   </el-form-item>

src/components/oldUser/index.vue

@@ -34,7 +34,7 @@
       </el-table-column>
       <el-table-column
         prop="start_time"
-        label="开课时间" sortable>
+        label="开课时间">
       </el-table-column>
       <el-table-column
         label="操作"  v-if="!$store.state.readonly">

src/components/teacher/dialog.vue

@@ -92,7 +92,6 @@
 
 <script>
   import {getTeacherDetailApi,addTeacherApi,editTeacherApi,uploadFileApi} from "../../service/api";
-  import {TEACHERTYPE} from "../../util/wordbook";
   export default {
     name: "dialogObj",
     props:[

src/util/wordbook.js

@@ -67,17 +67,28 @@ export const BUYTYPEOPTION = [
 export const BUYWay = [
   {
     id: 1,
-    value: '微信'
+    value: '微信',
+    disabled: true
   },
   {
     id: 2,
     value: '支付宝'
   },
+  {
+    id: 4,
+    value: '京东'
+  },
   {
     id: 3,
     value: '其他'
   }
 ]
+export const BUYTYPEWAY = {
+  '1':'微信',
+  '2':'支付宝',
+  '4':'京东',
+  '3':'其他'
+};
 export const ORDERSTATUSOPTION = [
   {
     id: 0,