备注

wxVideo/project/src/assets/config/interface_api.js

@@ -81,6 +81,7 @@ var api = {
    labelEditDetail:'/wx_sph/api/sphUserLabel/labelEditDetail',//标签审核详情
    labelEditAudit:'/wx_sph/api/sphUserLabel/labelEditAudit',//标签审核
 
+   usage_report:'/wx_sph/api/sphLive/usage_report',
    // 订阅消息
    nFollowList:'/wx_sph/api/notice/followList',//消息列表
    nMsgList:'/wx_sph/api/notice/msgList',//消息列表

wxVideo/project/src/components/Detail/WhDetail/liveData.vue

@@ -19,6 +19,11 @@
             </div>
         </div>
         <div class="moreBox clear">
+            <el-tooltip class="item" effect="dark" content="销售来源仅支持小商店，魔筷，有赞，拼多多，京喜" placement="bottom">
+                <el-button style="padding:0;border:none;background:transparent;vertical-align: text-bottom;">
+                    <img style="width:20px;height:20px" src="@/assets/img/topDesc.png" alt="">
+                </el-button>
+            </el-tooltip>
             <div class="moreTitle">已记录直播<span>{{liveObj.total.live_times?$NumberHandle(liveObj.total.live_times):'-'}}</span></div>
             <div class="moreTitle">场均观看人数<span>{{liveObj.total.avg_watching_count?$NumberHandle(liveObj.total.avg_watching_count):'-'}}</span></div>
             <div class="moreTitle">场均获赞<span>{{liveObj.total.avg_like?$NumberHandle(liveObj.total.avg_like):'-'}}</span></div>

wxVideo/project/src/components/Detail/liveDetail/detail.vue

@@ -55,14 +55,26 @@
                         <li>
                             <img src="@/assets/new_img/sale.png" class="icon" alt="">
                             <div class="dataInfo">
-                                <p class="title">本场销量</p>
+                                <p class="title">本场销量
+                                    <el-tooltip class="item" effect="dark" content="直播销量根据直播过程中库存变化校准得来无法避免人工修改库存情况。仅供参考" placement="bottom">
+                                        <el-button style="padding:0;border:none;background:transparent;vertical-align: initial;">
+                                            <i class="el-icon-warning"></i>
+                                        </el-button>
+                                    </el-tooltip>
+                                </p>
                                 <p class="data">{{detailInfo.total_sales||detailInfo.total_sales==0?$NumberHandle(detailInfo.total_sales):"-"}}</p>
                             </div>
                         </li>
                         <li>
                             <img src="@/assets/new_img/money.png" class="icon" alt="">
                             <div class="dataInfo">
-                                <p class="title">本场销售额</p>
+                                <p class="title">本场销售额
+                                    <el-tooltip class="item" effect="dark" content="由于销量误差故销售额会略有误差。仅供参考" placement="bottom">
+                                        <el-button style="padding:0;border:none;background:transparent;vertical-align: initial;">
+                                            <i class="el-icon-warning"></i>
+                                        </el-button>
+                                    </el-tooltip>
+                                </p>
                                 <p class="data">{{detailInfo.total_sale_money||detailInfo.total_sale_money==0?$NumberHandle(detailInfo.total_sale_money):"-"}}</p>
                             </div>
                         </li>
@@ -210,7 +222,13 @@
             <div v-loading="loading">
                 <div class="uvBox clear">
                     <div class="left" style="margin-top:40px">
-                        <span style="color:#323232;font-size:16px;font-weight:bold">累计销售额</span>
+                        <div style="color:#323232;font-size:16px;font-weight:bold">累计销售额
+                            <el-tooltip class="item" effect="dark" content="由于销量误差所以销售额会略有误差，仅供参考" placement="bottom">
+                                <el-button style="padding:0;border:none;background:transparent;vertical-align: initial;">
+                                    <i class="el-icon-warning"></i>
+                                </el-button>
+                            </el-tooltip>
+                        </div>
                         <p class="uvData">{{detailInfo&&(detailInfo.total_sale_money||detailInfo.total_sale_money==0)?$NumberHandle(detailInfo.total_sale_money):'-'}}</p>
                         <p class="lookHint">用户平均价值{{detailInfo.per_vistor_transaction||detailInfo.per_vistor_transaction==0?$NumberHandle(detailInfo.per_vistor_transaction,2):'-'}}/人</p>
                     </div>
@@ -236,7 +254,13 @@
                 <ul class="data_info_ul">
                     <li>
                         <span class="data">{{detailInfo&&(detailInfo.total_sales||detailInfo.total_sales==0)?$NumberHandle(detailInfo.total_sales):'-'}}</span>
-                        <p class="dataTitle">累计销量</p>
+                        <p class="dataTitle">累计销量
+                            <el-tooltip class="item" effect="dark" content="直播销量根据直播过程中库存变化校准得来无法避免人工修改库存情况。仅供参考" placement="bottom">
+                                <el-button style="padding:0;border:none;background:transparent;vertical-align: initial;">
+                                    <i class="el-icon-warning"></i>
+                                </el-button>
+                            </el-tooltip>
+                        </p>
                     </li>
                     <li>
                         <span class="data">{{detailInfo&&(detailInfo.per_customer_transaction||detailInfo.per_customer_transaction==0)?$NumberHandle(detailInfo.per_customer_transaction):'-'}}</span>
@@ -333,12 +357,22 @@
                     </div>
                     <div class="goods_th_2">
                         <div :class="sort_type == 'sales' ? 'common_selected_down' : ''" @click="sortEvent('sales')">
+                            <el-tooltip class="item" effect="dark" content="直播销量根据直播过程中库存变化校准得来会有误差。仅供参考" placement="bottom">
+                                <el-button style="padding:0;border:none;background:transparent;vertical-align: initial;">
+                                    <i class="el-icon-warning"></i>
+                                </el-button>
+                            </el-tooltip>
                             预估销量
                             <i class="el-icon-caret-bottom"></i>
                         </div> 
                     </div>
                     <div class="goods_th_2">
                         <div :class="sort_type == 'sale_money' ? 'common_selected_down' : ''" @click="sortEvent('sale_money')">
+                            <el-tooltip class="item" effect="dark" content="由于销量误差故销售额会略有误差。仅供参考" placement="bottom">
+                                <el-button style="padding:0;border:none;background:transparent;vertical-align: initial;">
+                                    <i class="el-icon-warning"></i>
+                                </el-button>
+                            </el-tooltip>
                             预估销售额
                             <i class="el-icon-caret-bottom"></i>
                         </div> 
@@ -369,8 +403,12 @@
                             {{(item.min_price!=item.max_price)?'~':''}}
                             {{item.min_price!=item.max_price?$NumberHandle(item.max_price)+'元':''}}
                         </div>
-                        <div :class="['goods_th_2',sort_type == 'sales' ? 'common_selected' : '']">{{item.sales||item.sales==0?$NumberHandle(item.sales):'-'}}</div>
-                        <div :class="['goods_th_2',sort_type == 'sale_money' ? 'common_selected' : '']">{{item.sale_money||item.sale_money==0?$NumberHandle(item.sale_money):'-'}}</div>
+                        <div :class="['goods_th_2',sort_type == 'sales' ? 'common_selected' : '']">
+                            <span>{{item.sales?$NumberHandle(item.sales):(item.platform_name!='小商店'&&item.platform_name!='魔筷'&&item.platform_name!='有赞'&&item.platform_name!='拼多多'&&item.platform_name!='京喜'?('商品来源暂不支持'+item.platform_name):'0')}}</span>
+                        </div>
+                        <div :class="['goods_th_2',sort_type == 'sale_money' ? 'common_selected' : '']">
+                            <span>{{item.sale_money?$NumberHandle(item.sale_money):(item.platform_name!='小商店'&&item.platform_name!='魔筷'&&item.platform_name!='有赞'&&item.platform_name!='拼多多'&&item.platform_name!='京喜'?('商品来源暂不支持'+item.platform_name):'0')}}</span>
+                        </div>
                     </div>
                     <div v-if="!goodsLoading&&goodsList.length == 0" style="height:400px;padding-top:100px;">
                         <img src="@/assets/img/noData.png" style="width:200px;height:200px;margin:20px auto;" alt="">
@@ -1580,6 +1618,7 @@ export default {
             display: flex;
             align-items: center;
             margin: 21px 0;
+            line-height: 20px;
             .goods_th_1{
                 display: flex;
                 align-items: center;

wxVideo/project/src/components/workbench/monitor/liveMonitor/index.vue

@@ -122,6 +122,28 @@
                 </div>
             </div>
         </div>
+        <!-- 次数弹框 -->
+        <el-dialog class="diaMain" @click.stop :visible.sync="showMax" style="padding:0">
+            <div>
+                <div class="flex diaTop">
+                    <div>
+                        提示
+                    </div>
+                    <div style="overflow: hidden;">
+                        <i class="el-icon-close" style="cursor:pointer" @click="showMax=false;"></i>
+                    </div>
+                </div>
+                <div class="diaCon">
+                    <img src="@/assets/img/liveMax.png" alt="">
+                    <div>
+                        为保证监控效果，您当日直播监控次数已达上限(每日3次)，请明日再添加
+                    </div>
+                </div>
+                <div class="diaBtn">
+                    <div class="button normal" @click.stop="showMax=false">确定</div>
+                </div>
+            </div>
+        </el-dialog>
         <monitor-history v-if="tab == 2"></monitor-history>
     </div>
 </template>
@@ -133,6 +155,8 @@ export default {
     },
     data(){
         return{
+            timeObj: {},
+            showMax: false,
             loadingList: false,
             tab:1,
             pickerTimes: {
@@ -171,6 +195,7 @@ export default {
             var myDate = new Date();
             this.date = myDate.getFullYear() + '-' + (myDate.getMonth() + 1) + '-' + myDate.getDate() +' '+ myDate.getHours() + ':' + myDate.getMinutes();
         }
+        this.getTime();
     },
     methods:{
         scrollBottom(e) {
@@ -204,6 +229,23 @@ export default {
         handleCurrentChange(val){
             this.init(val)
         },
+        getTime(){
+            this.$axios.get(this.URL.BASEURL + this.URL.usage_report).then((res) => {
+                var res=res.data
+                this.loadingList = false;
+                if(res&& res.errno == 0){
+                    var data=res.rst
+                    this.timeObj = data;
+                }else {
+                    this.$message({
+                        message: res.err,
+                        type:'warning'
+                    });
+                }
+            }).catch((err)=>{
+                this.loadingList = false;
+            })
+        },
         init(page){
             if(this.search_key_word == ''){
                 this.$message({
@@ -212,7 +254,11 @@ export default {
                 });
                 return;
             }
-            this.loadingList = true;
+            if(this.searchList.length==0) {
+                this.loading = true;
+            }else {
+                this.loadingList = true;
+            }
             this.isHaveUser = false;
             this.page = page;
             this.$axios.get(this.URL.BASEURL + this.URL.userIndex,{
@@ -223,7 +269,11 @@ export default {
                 }
             }).then((res) => {
                 var res=res.data
-                this.loadingList = false;
+                if(this.searchList.length==0) {
+                    this.loading = false;
+                }else {
+                    this.loadingList = false;
+                }
                 if(res&& res.errno == 0){
                     var data=res.rst
                     this.selectUser = {};
@@ -247,10 +297,18 @@ export default {
                     });
                 }
             }).catch((err)=>{
-                this.loadingList = false;
+                if(this.searchList.length==0) {
+                    this.loading = false;
+                }else {
+                    this.loadingList = false;
+                }
             })
         },
         addUser(){
+            if(this.timeObj.useful_times==0) {
+                this.showMax = true;
+                return;
+            }
             //添加视频监测
             if(!this.selectUser.id){
                 this.$message({
@@ -282,6 +340,7 @@ export default {
                 this.loading = false;
                 var res = res.data;
                 if(res && res.errno == 0){
+                    this.getTime();
                     this.$message({
                         message: "添加成功",
                         type: 'success'
@@ -314,6 +373,54 @@ export default {
 </script>
 <style lang="scss" scoped>
 @import '../index.scss';
+.monitorBox .diaMain {
+    .diaCon {
+        padding: 30px 0 50px;
+        text-align: center;
+        img {
+            display: block;
+            margin: 0 auto 30px;
+            width: 50px;
+            height: 50px;
+        }
+    }
+    .diaTop {
+        padding: 0 30px;
+        height: 70px;
+        line-height: 70px;
+        border-bottom: 1px solid #F8F9FB;
+        font-size: 18px;
+        color: #323232;
+        font-weight: bold;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    }
+    .diaBtn {
+        display: flex;
+        justify-content: center;
+        padding: 0 0 40px;
+    }
+    .diaBtn .button {
+        width: 120px;
+        height: 40px;
+        line-height: 40px;
+        border: 1px solid #979797;
+        background: #fff;
+        border-radius: 4px;
+        text-align: center;
+        color: #000;
+        cursor: pointer;
+        margin-right: 10px;
+    }
+    .diaBtn .normal {
+        background: #2661FF;
+        color: #fff;
+        border: none;
+        margin-right: 0;
+        margin-left: 10px;
+    }
+}
 .topTab {
     background: #F5F6F8;
     padding: 13px 0 20px;
@@ -371,7 +478,7 @@ export default {
         // width: 505px;
         width: 700px;
         position: relative;
-        z-index: 9;
+        z-index: 1;
         .banner {
             height: auto;
             background: transparent!important;
@@ -407,4 +514,22 @@ export default {
         }
     }
 }
+</style>
+<style lang="scss">
+.diaMain {
+    display: flex;
+    flex-flow: column;
+    justify-content: center;
+    .el-dialog {
+        width: 515px; 
+        margin: auto!important;
+        border-radius: 8px;
+    }
+    .el-dialog__header {
+        display: none;
+    }
+    .el-dialog__body {
+        padding: 0;
+    }
+}
 </style>