业绩归属 标题

src/api/live/liveProfit.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+export function liveProfitList(data) {
+  return request({
+    url: '/live/liveProfit/list',
+    method: 'get',
+    params: data
+  })
+}
+
+

src/layout/components/Sidebar/Logo.vue

@@ -6,7 +6,7 @@
         <h1 v-else class="sidebar-title">{{ title }} </h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        
+
         <h1 class="sidebar-title">{{ title }} </h1>
       </router-link>
     </transition>
@@ -26,7 +26,7 @@ export default {
   },
   data() {
     return {
-      title: '御君方管理平台',
+      title: '芳华惠选',
       logo: logoImg
     }
   }

src/settings.js

@@ -1,19 +1,19 @@
 module.exports = {
-  title: '御君方管理平台',
+  title: '芳华惠选',
+
 
- 
 
   /**
    * 是否系统布局配置
    */
   showSettings: false,
 
-  
+
   /**
    * 是否显示顶部导航
    */
    topNav: true,
- 
+
 
   /**
    * 是否显示 tagsView

src/views/live/live/index.vue

@@ -664,8 +664,6 @@ export default {
     submitForm() {
       if(this.form.liveId != null) { this.videoUrl = this.form.videoUrl; }
       if(this.form.liveType==2 && this.videoUrl.length == 0) {return this.$message.error("请上传视频");}
-      // todo yhq 上传接口有问题，暂时写死地址
-      this.form.liveImgUrl = "https://thirdwx.qlogo.cn/mmopen/vi_32/LmSEYyqHt4cPJOibcGsJA5XnBqT7D1GsNGTuiaibQ0rvMluFbHhV2HLlPd8RtI3EfI6SmDszykB5f5QSMgb3C6TibUwsxvO0hkNkGCvn5BF6UIk/132"
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.form.videoUrl = this.videoUrl;

src/views/live/liveConfig/liveRedConf.vue

@@ -203,6 +203,7 @@ export default {
   data() {
     return {
       //字典
+      // redStatusOptions: [{label:"未发放",value:0},{label:"发放中",value:1},{label:"已结束",value:2},{label:"暂停",value:3}],
       redStatusOptions: [],
       redTypeOptions: [],
       canLiveId:false,

src/views/live/liveConfig/watchReward.vue

@@ -250,10 +250,19 @@ export default {
 
     };
   },
+  watch: {
+    // 监听路由的 query 参数变化
+    '$route.query': {
+      handler(newQuery) {
+        this.liveId = this.$route.params.liveId
+        this.watchRewardForm.liveId = this.liveId
+        this.getLiveConfig();
+      },
+      // 初始化时立即执行一次
+      immediate: true
+    }
+  },
   created() {
-    this.liveId = this.$route.params.liveId
-    this.watchRewardForm.liveId = this.liveId
-    this.getLiveConfig();
   },
   methods: {
     getLiveConfig(){

src/views/live/liveConsole/index.vue

@@ -791,6 +791,8 @@ export default {
       })
     },
     connectWebSocket() {
+      console.log('connectWebSocket')
+      console.log(this.liveWsUrl)
       this.$store.dispatch('initLiveWs', {
         liveWsUrl: this.liveWsUrl,
         liveId: this.liveId,

src/views/live/liveProfit/index.vue

@@ -0,0 +1,193 @@
+<template>
+  <div class="app-container">
+  <div class="el-container-md">
+
+    <el-form :model="queryParams" class="live-goods-css" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="商品名称" prop="keywords" >
+        <el-input
+          v-model="queryParams.keywords"
+          placeholder="请输入商品名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="上下架" prop="status" >
+        <el-input
+          v-model="queryParams.status"
+          placeholder="请输入直播间状态"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+<!--    <div class="selection-toolbar">-->
+<!--      <el-checkbox :indeterminate="isIndeterminate" v-model="allChecked" @change="toggleSelectAll">-->
+<!--        {{ multipleSelection.length > 0 ? `已选 ${multipleSelection.length} 条` : '选中本页' }}-->
+<!--      </el-checkbox>-->
+<!--      <el-button  plain size="mini" @click="handleShelf">上架</el-button>-->
+<!--      <el-button  plain size="mini" @click="handleUnshelf">下架</el-button>-->
+<!--      <el-button  plain size="mini" @click="handleDeleteSelected">删除</el-button>-->
+<!--      <el-button  plain type="mini" icon="el-icon-plus" @click="handleAddLiveGoods">添加商品</el-button>-->
+<!--    </div>-->
+    <el-table
+      ref="dataTable"
+      :data="dataList"
+      style="width: 100%"
+      v-loading="loading"
+    >
+      <!-- 题干列：显示试题的主要内容 -->
+      <el-table-column
+        prop="orderId"
+        label="订单id"
+        show-overflow-tooltip
+      ></el-table-column>
+
+      <el-table-column
+        prop="orderCode"
+        label="订单号"
+      >
+      </el-table-column>
+
+      <el-table-column
+        prop="userName"
+        label="用户名称"
+      ></el-table-column>
+
+      <el-table-column
+        prop="userPhone"
+        label="用户电话"
+      ></el-table-column>
+
+      <el-table-column
+        prop="totalPrice"
+        label="总价格"
+      ></el-table-column>
+
+      <el-table-column
+        prop="payPrice"
+        label="支付价格"
+      ></el-table-column>
+
+      <el-table-column
+        prop="isPay"
+        label="是否支付"
+      >
+        <template slot-scope="scope">
+          <el-tag type="success" v-if="scope.row.isPay == 1">已支付</el-tag>
+          <el-tag type="info" v-if="scope.row.isPay == 0">未支付</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="status"
+        label="订单状态"
+      >
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.status == -1">申请退款</el-tag>
+          <el-tag v-if="scope.row.status == -2">退货成功</el-tag>
+          <el-tag v-if="scope.row.status == 0">已取消</el-tag>
+          <el-tag v-if="scope.row.status == 1">待支付</el-tag>
+          <el-tag v-if="scope.row.status == 2">代发货</el-tag>
+          <el-tag v-if="scope.row.status == 3">待收货</el-tag>
+          <el-tag v-if="scope.row.status == 4">待评价</el-tag>
+          <el-tag v-if="scope.row.status == 5">已完成</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="companyUserId"
+        label="销售id"
+      ></el-table-column>
+      <el-table-column
+        prop="companyUserName"
+        label="销售名称"
+      ></el-table-column>
+      <el-table-column
+        prop="companyName"
+        label="公司名称"
+      ></el-table-column>
+
+
+
+    </el-table>
+
+    <!-- 分页组件：用于分页展示试题列表 -->
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+      style="margin-top: 20px;"
+    />
+
+
+  </div>
+  </div>
+</template>
+
+<script>
+import {liveProfitList} from '@/api/live/liveProfit';
+export default {
+  data() {
+    return {
+      loading: true,
+      // 查询条件
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        keywords: null,
+        status: null,
+        liveId: null,
+        desc: null,
+        createTime: null,
+        updateTime: null,
+      },
+      // 数据列表
+      dataList:[],
+      total:0,
+      // 显示搜索条件
+      showSearch: true,
+    }
+  },
+  created(){
+    this.getList();
+  },
+  mounted() {
+    this.loading = false;
+  },
+  methods: {
+    getList(){
+      liveProfitList(this.queryParams).then(res=>{
+        this.dataList = res.rows;
+        this.total = res.total;
+      })
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.loading = true
+      // listLiveGoods(this.queryParams).then(response => {
+      //   this.goodsLiveList = response.rows
+      //   this.goodsLiveTotal = response.total
+      //   this.loading = false
+      // })
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.$refs.queryForm.resetFields();
+    },
+  },
+}
+</script>
+
+
+
+<style scoped lang="scss">
+
+</style>