update

src/components/CommodityMan/materialMan.vue

@@ -103,6 +103,7 @@
                                         <div class="material-item material-upload">
                                             <div class="app-upload" flex="main:center cross:center" style="width: 140px; height: 140px;">
                                                     <el-upload class="avatar-uploader" action="" 
+                                                    :before-upload="beforeAvatarUpload"
                                                     accept="video/mp4,video/ogg,video/webm"
                                                     :show-file-list="false" :http-request="UploadImage">
                                                     <i class="el-icon-upload"></i>
@@ -112,7 +113,7 @@
                                         <el-tooltip v-for="(item,index) in PageList" :key="index" class="item" effect="dark" :content="item.Name" placement="top-start">
                                             <div @click="PageSelect(item,index)" :class="item.Selected ? 'selected' :''" class="el-tooltip item material-item ">
                                                 <img :src="'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com'+item.Path+'?x-oss-process=video/snapshot,t_9,f_jpg,w_299,h_0,m_fast'" class="material-img" style="width: 140px; height: 140px;">
-                                                <div class="material-video-info"><i class="el-icon-video-play"></i> <span>{{item.VideoTime}}</span></div>
+                                                <div class="material-video-info"><i class="el-icon-video-play"></i> <span>{{Time(item.VideoTime)}}</span></div>
                                                 <div flex="dir:left" style="margin-top: 5px;">
                                                     <div class="material-name">{{item.Name}}</div> 
                                                     <div style="margin: 0px 5px;">|</div> 
@@ -144,7 +145,10 @@
                     
                 </div>
             </div>
-            <input type="text" ref="dur" name='0'/>
+            <video style="display:none;" controls="controls" id="aa" oncanplaythrough="myFunction(this)">
+	   	
+	   </video>
+
     </div>
     <!-- 新增分组 -->
     <el-dialog title="分组管理" :visible.sync="addGroupMsgDig" width="400px">
@@ -266,6 +270,34 @@ export default {
     
   },
   methods:{
+    Time(value){
+        var theTime = parseInt(value);// 秒
+        var middle= 0;// 分
+        var hour= 0;// 小时
+
+        if(theTime > 60) {
+            middle= parseInt(theTime/60);
+            theTime = parseInt(theTime%60);
+            if(middle> 60) {
+                hour= parseInt(middle/60);
+                middle= parseInt(middle%60);
+            }
+        }
+        var result = ""+parseInt(theTime);
+        if(theTime<10){
+            result="0"+parseInt(theTime);
+        }
+        if(middle > 0) {
+            result = ""+parseInt(middle)+":"+result;
+        }
+        else{
+            result = "00:"+result;
+        }
+        if(hour> 0) {
+            result = ""+parseInt(hour)+"小时"+result;
+        }
+        return result;
+    },
     SelectPageId(item){
         this.PageList.forEach(item=>{
             if(item.Selected){
@@ -418,13 +450,25 @@ export default {
             }
         });
     },
+    beforeAvatarUpload(file) {
+		this.getTimes(file); //
+	},
+    getTimes(file) {  //获取时长
+        var content = file;
+        var url = URL.createObjectURL(content);
+        //经测试，发现audio也可获取视频的时长
+        var audioElement = new Audio(url);
+        audioElement.addEventListener("loadedmetadata", (_event) => {
+            this.audioDuration = parseInt(audioElement.duration);
+            this.addpageMsg.VideoTime=this.audioDuration;
+        });
+    },
     UploadImage(file) {
         this.UploadFileToTencent(this.FileType().GoodsImg, file.file, res => {
           if (res.resultCode == 1) {
               if(this.addpageMsg.Type==2){
                     this.addpageMsg.Image = res.FileUrl;
               }
-              console.log(" this.addpageMsg.Image", this.addpageMsg.Image)
                 this.addpageMsg.Path = res.FileUrl;
                 this.addpageMsg.Name = res.FileName;
                 this.addPageList();

src/components/UserMan/MembersBuy.vue

@@ -9,7 +9,7 @@
         <div>
             <el-date-picker
             size="small"
-            v-model="value"
+            v-model="dateList"
             type="datetimerange"
             range-separator="至"
             start-placeholder="开始日期"
@@ -18,11 +18,12 @@
             <div style="margin-left:20px" class="searchInput">
                 <el-input style="display:inline-block;width:225px;height:30px"
                 placeholder="请输入内容"
-                v-model="value"
+                v-model="msg.UserName"
                 size="small"
+                @clear="getList"
                 clearable>
                 </el-input>
-                <span class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
+                <span @click="getList" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
             </div>
         </div>
         <el-table v-loading="loading"
@@ -30,45 +31,34 @@
             border
             style="width: 100%;margin:20px 0">
             <el-table-column
-            prop="ID"
+            prop="OrderId"
+            width="80"
             label="ID">
             </el-table-column>
             <el-table-column
-            prop="address"
+            prop="OrderNo"
             width="280"
             label="订单号">
-                <template slot-scope="scope">
-                    <div class="app-image" style="background-image: url('https://wx.qlogo.cn/mmopen/vi_32/HO8Q9ibH7UtSFzHs67f0MH6VWjftiboELYLBya5OxpZkHDlicLMq39gxRHS4NhOG1AUepQ13JdUyrT7eM52u6hAsg/132');
-                    background-size: cover; background-position: center center; width: 50px; height: 50px; border-radius: 0%; float: left; margin-right: 8px;"></div> 
-                    <div flex="dir:left cross:center">易飞易&港中旅小李15351281772</div> 
-                    <img style="width:24px;height:24px" src="../../assets/img/userman/wx.png" alt="" class="platform-img">
-                    <button type="button" class="el-button el-button--success" style="float: right; padding: 5px !important;">
-                        <span>显示OpenId</span>
-                    </button>
-                    <div>ow_7I5dE_g9Fe1BuBPKdk8RNtEj0</div> 
-                </template>  
             </el-table-column>
             <el-table-column
-            prop="name"
+            prop="UserName"
             label="昵称">
             </el-table-column>
             <el-table-column
-            prop="name"
+            prop="Income"
             label="支付金额">
             </el-table-column>
             <el-table-column
             prop="name"
             label="购买情况">
                 <template slot-scope="scope">
-                    <span class="blue">0</span>
+                    <p>支付方式：{{scope.row.PaymentWayName}}</p>
+                    <p>订单状态：{{scope.row.OrderStatusName}}</p>
                 </template>
             </el-table-column>
             <el-table-column
-            prop="name"
+            prop="PaymentTime"
             label="支付时间">
-                <template slot-scope="scope">
-                    <span class="blue">0</span>
-                </template>
             </el-table-column>
             
         </el-table>
@@ -92,13 +82,13 @@
             <div style="margin: 15px 0;"></div>
             <div style="padding: 10px 25px 20px;">
                 <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
-                    <el-checkbox style="margin-bottom:10px" v-for="city in cities" :label="city" :key="city">{{city}}</el-checkbox>
+                    <el-checkbox style="margin-bottom:10px" v-for="city in cities" :label="city.Id" :key="city.Id">{{city.Name}}</el-checkbox>
                 </el-checkbox-group>
             </div>
             
         </el-form> 
         <div style="text-align:right;margin-top:20px">
-            <el-button size="small" type="primary" @click="dialogVisible = false">导出</el-button>
+            <el-button size="small" type="primary" @click="Export">导出</el-button>
         </div>
     </el-dialog>
   </div>
@@ -109,30 +99,55 @@
       return {
         loading:false,
         checkAll: false,
-        checkedCities: ['上海', '北京'],
-        cities: ['上海', '北京', '广州', '深圳'],
-        cityOptions: ['上海', '北京', '广州', '深圳'],
+        checkedCities: [],
+        cities: [],
+        cityOptions: [],
         isIndeterminate: true,
         addMsg:{},
         dialogVisible:false,
         value:'',
         options:[],
-        tableData:[
-            {ID:'111'}
-        ],
+        tableData:[],
         msg:{
             pageIndex:1,
             pageSize:15,
+            OrderId:0,
+            OrderNo:'',
+            UserName:'',
+            StartTime:'',
+            EndTime:'',
         },
         total:0,
+        dateList:[],
 
         
       };
     },
     created() {
-
+        this.getDown();
+        this.getList();
     },
     methods: {
+        Export(){
+            this.msg.ExcelEnumIds=this.checkedCities;
+            let msg = JSON.parse(JSON.stringify(this.msg));
+            this.JavaGetLocalFile(
+            "/api/order/GetMembersToBuyToExcel",
+            msg,
+            "会员购买列表.xls"
+            );
+        },
+        getDown(){
+            this.cityOptions=[];
+            this.apipost("/api/order/GetMembersToBuyExportEnumList",{}, res => {
+                this.cities=res.data.data;
+                let data=res.data.data;
+                data.forEach(item=>{
+                    this.cityOptions.push(item.Id)
+                })
+                
+            })
+        },
         handleCheckAllChange(val) {
             this.checkedCities = val ? this.cityOptions : [];
             this.isIndeterminate = false;
@@ -148,6 +163,24 @@
         },
         getList(){
             this.loading=true;
+            
+            if(this.dateList && this.dateList.length>0){
+                this.msg.StartTime=this.dateList[0];
+                this.msg.EndTime=this.dateList[1];
+            }else{
+                this.msg.StartTime='';
+                this.msg.EndTime='';
+            }
+            this.loading=true;
+            this.apipost("/api/order/GetMembersToBuyPageList", this.msg, res => {
+                this.loading=false;
+                if(res.data.resultCode==1){
+                    this.total=res.data.data.count;
+                    let pageData=res.data.data.pageData;
+                    this.tableData=pageData;
+                }
+                
+            })
         },
 
     },

src/router/index.js

@@ -168,6 +168,12 @@ export default new Router({
           name: 'disWithdrawal',
           component: resolve => require(['@/components/UserMan/disWithdrawal'], resolve),
         },
+        // 用户管理 分销订单
+        {
+          path: '/distributionOrder',
+          name: 'distributionOrder',
+          component: resolve => require(['@/components/UserMan/distributionOrder'], resolve),
+        },
         // 商品管理 素材管理
         {
           path: '/materialMan',
@@ -228,18 +234,26 @@ export default new Router({
           name: 'goodsListEdit',
           component: resolve => require(['@/components/CommodityMan/goodsListEdit'], resolve),
         },
-        // 商品管理 商品列表新增
+        // 订单管理 商品列表新增
         {
           path: '/orderList',
           name: 'orderList',
           component: resolve => require(['@/components/orderMan/orderList'], resolve),
         },
-        // 商品管理 商品详情
+        // 订单管理 商品详情
         {
           path: '/orderDetails',
           name: 'orderDetails',
           component: resolve => require(['@/components/orderMan/orderDetails'], resolve),
         },
+        // 订单管理 售后订单
+        {
+          path: '/afterSalesOrder',
+          name: 'afterSalesOrder',
+          component: resolve => require(['@/components/orderMan/afterSalesOrder'], resolve),
+        },
+        
+        
         //设置 基础设置
         {
           path: '/basicSetUp',