订单&用户详情&期数修改

src/components/order/detail.vue

@@ -22,7 +22,7 @@
     </el-row>
     <el-row align="middle" type="flex">
       <el-col :span="4"><label>推广人类型</label></el-col>
-      <el-col :span="8">{{detail.invite_type}}</el-col>
+      <el-col :span="8">{{detail.invite_type | inviteType}}</el-col>
       <el-col :span="4"><label>推广人ID</label></el-col>
       <el-col :span="8">{{detail.invite_id}}</el-col>
     </el-row>

src/components/order/index.vue

@@ -3,30 +3,37 @@
     <el-form ref="searchFrom" :model="searchFrom" label-width="100px">
       <el-row>
         <el-col :span="6">
-          <el-form-item label="用户昵称">
-            <el-input v-model="searchFrom.nickname"></el-input>
+          <el-form-item label="用户ID">
+            <el-input v-model="searchFrom.user_id"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="用户ID">
-            <el-input v-model="searchFrom.user_id"></el-input>
+          <el-form-item label="用户昵称">
+            <el-input v-model="searchFrom.nickname"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="商品ID">
-            <el-input v-model="searchFrom.goods_id"></el-input>
+          <el-form-item label="收件人手机号">
+            <el-input v-model="searchFrom.receive_mobile"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="推广人ID">
-            <el-input v-model="searchFrom.invite_id"></el-input>
+          <el-form-item label="商品名称">
+            <el-select v-model="searchFrom.goods_id" 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-col>
       </el-row>
       <el-row>
-        <el-col :span="6">
-          <el-form-item label="推广人类型">
-            <el-select v-model="searchFrom.invite_type" placeholder="请选择" clearable>
+        <el-col :span="12">
+          <el-form-item label="来源" class="test">
+            <el-select v-model="searchFrom.invite_type" placeholder="来源类型" @change="onInviteTypeChange" clearable>
               <el-option
                 v-for="item in inviteTypeOption"
                 :key="item.id"
@@ -34,6 +41,7 @@
                 :value="item.id">
               </el-option>
             </el-select>
+            <el-input v-if="parseInt(searchFrom.invite_type) >= 0" v-model="searchFrom.invite_id" :placeholder="inviteSearchPlaceholder"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -60,16 +68,11 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="交易订单号">
-            <el-input v-model="searchFrom.out_trade_no"></el-input>
-          </el-form-item>
-        </el-col>
       </el-row>
       <el-row>
         <el-col :span="6">
-          <el-form-item label="收件人手机号">
-            <el-input v-model="searchFrom.receive_mobile"></el-input>
+          <el-form-item label="交易订单号">
+            <el-input v-model="searchFrom.out_trade_no"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -105,7 +108,7 @@
         className="f-c"
       >
         <template slot-scope="scope">
-          <img class="avatar" :src="scope.row.user_avatar"/> {{scope.row.user_nickname}}
+          <img class="avatar" :src="scope.row.user_avatar"/> {{scope.row.user_nickname}}(ID:{{scope.row.user_id}})
         </template>
       </el-table-column>
       <el-table-column
@@ -187,7 +190,7 @@
 </template>
 
 <script>
-  import {getOrderListApi,editOrderDescApi} from "../../service/api";
+  import {getOrderListApi,editOrderDescApi,getGoodsListApi} from "../../service/api";
   import page from '../framework/page'
   import addressDialog from './dialog'
   import refundDialog from './refundDialog'
@@ -227,12 +230,32 @@
               show: false,
               detail: {}
           },
+          goodList: [],
           inviteTypeOption: INVITETYPEOPTION,
           orderStatusOption: ORDERSTATUSOPTION,
-          buyTypeOption: BUYTYPEOPTION
+          buyTypeOption: BUYTYPEOPTION,
+          inviteSearchPlaceholder: '',
         }
     },
     methods: {
+      getGoodsOption(){
+        let json = {
+          page: 1,
+          limit: 100
+        };
+        getGoodsListApi(json).then(res=>{
+          this.goodList = res.list;
+        })
+      },
+      onInviteTypeChange(val){
+        if (val === 0) {
+          this.inviteSearchPlaceholder = '用户ID'
+        } else if (val === 1) {
+          this.inviteSearchPlaceholder = '老师ID'
+        } else if (val === 2) {
+          this.inviteSearchPlaceholder = '推广人ID'
+        }
+      },
       detail(row){
         let _detail = row;
         this.dialogDetailObj = {
@@ -372,6 +395,7 @@
     },
     mounted(){
       this.getOrderList();
+      this.getGoodsOption();
     },
     filters:{
       payMentFilter(val){
@@ -391,6 +415,9 @@
       },
       moneytFilter(val){
         return val = val / 100 + '元'
+      },
+      filterGoods(val){
+        return val.name + '[' +val.current_price / 100 + '元]'
       }
     }
   }
@@ -413,4 +440,7 @@
     justify-content: flex-start;
     align-items: center;
   }
+  .test>div> .el-input {
+    width: 30%;
+  }
 </style>

src/components/periods/index.vue

@@ -25,6 +25,16 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="开始时间">
+          <el-date-picker
+            v-model="startTime"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :default-time="['00:00:00','23:59:59']">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item>
           <el-button @click="onSearch" type="primary">查询</el-button>
         </el-form-item>
@@ -75,15 +85,27 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="周几不上课"
+        label="不上课日期"
         min-width="120">
         <template slot-scope="scope">
           {{scope.row.rest_week_day | dayFilter}}
         </template>
       </el-table-column>
+      <el-table-column
+        label="总的学员数">
+        <template slot-scope="scope">
+          {{scope.row.total_user_num ? scope.row.total_user_num : ''}}
+        </template>
+      </el-table-column>
       <el-table-column
         prop="start_at"
-        label="期数开始时间">
+        label="开始时间">
+      </el-table-column>
+      <el-table-column
+        label="结束时间">
+        <template slot-scope="scope">
+          {{scope.row.over_at ? scope.row.over_at : ''}}
+        </template>
       </el-table-column>
       <el-table-column
         label="操作"
@@ -109,6 +131,7 @@
   import page from '../framework/page'
   import {getPeriodsApi,delPeriodApi,getGoodsListApi,getLessonApi} from "../../service/api";
   import {WEEKDAY} from '../../util/wordbook';
+  import CommonJs from '../../util/common';
   export default {
     name: "index",
     data(){
@@ -119,7 +142,9 @@
         title: '',
         goodsId: null,
         lessonId: null,
+        startAt: '',
         periodList: [],
+        startTime: [],
         newDialog: {
           form: {
             id: 0,
@@ -172,6 +197,13 @@
         if(this.lessonId){
           json.course_id = this.lessonId;
         }
+        if(this.startTime && this.startTime.length > 0){
+          json.start_start_at = CommonJs.dateFmt(this.startTime[0],"yyyy-MM-dd")
+          json.start_end_at = CommonJs.dateFmt(this.startTime[1],"yyyy-MM-dd")
+        }
+        if(this.startAt){
+          json.start_at = this.startAt;
+        }
         getPeriodsApi(json).then(res=>{
           this.periodList = res.list;
           this.total = res.total

src/components/shop/dialog.vue

@@ -74,7 +74,9 @@
           <el-upload
             list-type="picture-card"
             class="upload-demo"
+            :class="form.desc.customer_service && form.desc.customer_service.length > 0 ? 'uploadService' : ''"
             action="/api/public/upload"
+            :limit="1"
             :http-request="uploadFileMainService"
             :file-list="form.desc.customer_service"
           >

src/components/shop/index.vue

@@ -98,7 +98,7 @@
                   编辑
                 </el-button>
                 <el-button size="mini" plain @click="copyUrl(scope.row.id)">
-                  商品链接
+                  复制链接
                 </el-button>
                 <el-button size="mini" plain type="danger" @click="onDel(scope.row)">
                   删除

src/components/userDetail/index.vue

@@ -51,10 +51,6 @@
     <el-table
     :data="periodList"
     style="width: 100%">
-      <el-table-column
-        prop="id"
-        label="ID">
-      </el-table-column>
       <el-table-column
         prop="periods_title"
         label="期数名称">

src/service/api.js

@@ -131,7 +131,7 @@ export const deleteGoodsApi = function (id) {
 // 商品上架
 const upGoodsUrl = `${_baseUrl}api/admin/goods/putaway/`;
 export const upGoodsApi = function (id) {
-  return Vue.prototype.$patch(`${upGoodsUrl}/${id}`)
+  return Vue.prototype.$patch(`${upGoodsUrl}${id}`)
 };
 // 商品下架
 const downGoodsUrl = `${_baseUrl}api/admin/goods/soldout/`;