tijiao

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://rm-bp1cbq48ara8ex3309o.mysql.rds.aliyuncs.com:3306/yuedong?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://rm-bp1cbq48ara8ex3309o.mysql.rds.aliyuncs.com:3306/sport-game?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: yuedong
                 password: Yuedong2020
             # 从库数据源

ruoyi-ui/src/components/ParentView/index 2.vue

@@ -0,0 +1,3 @@
+<template >
+  <router-view />
+</template>

ruoyi-ui/src/components/ParentView/index.vue

@@ -1,3 +1,3 @@
-<template >
-  <router-view />
-</template>
+<template >
+  <router-view />
+</template>

ruoyi-ui/src/views/system/LzydBanner/index.vue

@@ -106,7 +106,7 @@
           v-hasPermi="['system:LzydBanner:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -115,17 +115,22 @@
           @click="handleExport"
           v-hasPermi="['system:LzydBanner:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="LzydBannerList" @selection-change="handleSelectionChange">
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <!-- <el-table-column label="租户id" align="center" prop="appId" /> -->
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="id" align="center" prop="id" />
       <el-table-column label="banner_id" align="center" prop="bannerId" />
       <el-table-column label="标题" align="center" prop="title" />
-      <el-table-column label="图片" align="center" prop="imageUrl"/>
-      <el-table-column label="外链" align="center" prop="linkUrl" />
+      <!-- <el-table-column label="图片" align="center" prop="imageUrl"/> -->
+      <el-table-column label="图片" align="center" width="200">
+        <template slot-scope="scope" >
+           <img style="width:100%;height:100%" :src="scope.row.imageUrl" alt="" />
+        </template>
+      </el-table-column>
+      <el-table-column label="外链" align="center" prop="linkUrl" width="200px"/>
       <el-table-column label="跳转类型" align="center" prop="linkType" />
       <!-- (0默认无跳转，1外链) -->
       <el-table-column label="是否展示" align="center" prop="isShow" />
@@ -172,12 +177,12 @@
     <!-- 添加或修改轮播图对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="租户id" prop="appId">
+        <!-- <el-form-item label="租户id" prop="appId">
           <el-input v-model="form.appId" placeholder="请输入租户id" />
-        </el-form-item>
-        <el-form-item label="banner_id" prop="bannerId">
+        </el-form-item> -->
+        <!-- <el-form-item label="banner_id" prop="bannerId">
           <el-input v-model="form.bannerId" placeholder="请输入banner_id" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="标题" prop="title">
           <el-input v-model="form.title" placeholder="请输入标题" />
         </el-form-item>
@@ -266,7 +271,9 @@ export default {
         updatedAt: null
       },
       // 表单参数
-      form: {},
+      form: {
+        appId:'lzyd',
+      },
       // 表单校验
       rules: {
       }

ruoyi-ui/src/views/system/LzydMarathon/index.vue

@@ -190,7 +190,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -234,11 +234,11 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="LzydMarathonList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="id" align="center" prop="scope.row.index" />
       <!-- <el-table-column label="租户id" align="center" prop="appId" /> -->
       <el-table-column label="活动id" align="center" prop="marathonId" />
       <el-table-column label="活动名称" align="center" prop="name" />

ruoyi-ui/src/views/system/LzydMarathonMileage/index.vue

@@ -67,7 +67,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -111,7 +111,7 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="LzydMarathonMileageList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />

ruoyi-ui/src/views/system/LzydMarathonOrderDetail/index.vue

@@ -158,7 +158,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -202,14 +202,15 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="LzydMarathonOrderDetailList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="订单id" align="center" prop="dealSn" />
+      <!-- scope.row.index -->
+      <el-table-column label="订单id" align="center" prop="dealSn" width="200"/>
       <el-table-column label="马拉松id" align="center" prop="marathonId" />
-      <el-table-column label="用户id" align="center" prop="userId" />
+      <el-table-column label="用户id" align="center" prop="userId" width="200" />
       <el-table-column label="赛事包id" align="center" prop="pkgId" />
       <el-table-column label="赛事包" align="center" prop="pkgName" />
       <el-table-column label="规格id" align="center" prop="specId" />

ruoyi-ui/src/views/system/LzydMarathonOrderMaster/index.vue

@@ -203,7 +203,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -247,22 +247,22 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="LzydMarathonOrderMasterList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="id" align="center" prop="id" />
       <!-- <el-table-column label="租户id" align="center" prop="appId" /> -->
-      <el-table-column label="订单号" align="center" prop="dealSn" />
+      <el-table-column label="订单号" align="center" prop="dealSn" width="200" />
       <el-table-column label="马拉松id" align="center" prop="marathonId" />
-      <el-table-column label="用户id" align="center" prop="userId" />
+      <el-table-column label="用户id" align="center" prop="userId" width="200" />
       <el-table-column label="赛事包id" align="center" prop="pkgId" />
       <el-table-column label="收件人" align="center" prop="recvMan" />
-      <el-table-column label="手机号" align="center" prop="recvPhone" />
+      <el-table-column label="手机号" align="center" prop="recvPhone"  width="200"/>
       <el-table-column label="省" align="center" prop="province" />
       <el-table-column label="市" align="center" prop="city" />
       <el-table-column label="区县" align="center" prop="area" />
-      <el-table-column label="完整地址" align="center" prop="address" />
+      <el-table-column label="完整地址" align="center" prop="address" width="200" />
       <el-table-column label="订单金额" align="center" prop="orderMoney" />
       <el-table-column label="支付金额" align="center" prop="payMoney" />
       <el-table-column label="支付方式" align="center" prop="payType" />

ruoyi-ui/src/views/system/LzydMarathonUser/index.vue

@@ -149,7 +149,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -193,20 +193,20 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="LzydMarathonUserList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="自增id" align="center" prop="id" /> -->
       <el-table-column label="id" align="center" prop="appId" />
       <!-- <el-table-column label="马拉松id" align="center" prop="marathonId" /> -->
-      <el-table-column label="号码布" align="center" prop="bibNumber" />
-      <el-table-column label="用户id" align="center" prop="userId" />
+      <el-table-column label="号码布" align="center" prop="bibNumber" width="200" />
+      <el-table-column label="用户id" align="center" prop="userId" width="200" />
       <el-table-column label="姓名" align="center" prop="name" />
       <el-table-column label="性别" align="center" prop="gender" />
-      <el-table-column label="手机号" align="center" prop="mobile" />
-      <el-table-column label="身份证号" align="center" prop="idCard" />
-      <el-table-column label="紧急联系人" align="center" prop="emergency" />
+      <el-table-column label="手机号" align="center" prop="mobile" width="200" />
+      <el-table-column label="身份证号" align="center" prop="idCard" width="200" />
+      <el-table-column label="紧急联系人" align="center" prop="emergency" width="200" />
       <el-table-column label="配速" align="center" prop="speed" />
       <el-table-column label="跑步距离/米" align="center" prop="distance" />
       <el-table-column label="比赛用时" align="center" prop="costTime" />

ruoyi-ui/src/views/system/LzydNotice/index.vue

@@ -19,7 +19,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <el-form-item label="title" prop="title">
+      <el-form-item label="标题" prop="title">
         <el-input
           v-model="queryParams.title"
           placeholder="请输入公告标题"
@@ -134,7 +134,7 @@
       <el-table-column label="公告id" align="center" prop="noticeId" />
       <el-table-column label="appid" align="center" prop="appId" />
       <el-table-column label="标题" align="center" prop="title" />
-      <el-table-column label="内容" align="center" prop="content" />
+      <el-table-column label="内容" align="center" prop="content" width="400" />
       <el-table-column label="公告跳转类型" align="center" prop="noticeSkipType" />
       <el-table-column label="公告类型" align="center" prop="noticeTypeId" />
       <el-table-column label="创建时间" align="center" prop="createAt" width="180">
@@ -180,19 +180,20 @@
     <!-- 添加或修改荔枝app-公告记录对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="公告跳转类型" prop="noticeId">
-          <el-input v-model="form.noticeId" placeholder="请输入公告跳转类型" />
+        <el-form-item label="公告id" prop="noticeId">
+          <el-input v-model="form.noticeId" placeholder="请输入公告id" />
         </el-form-item>
-        <el-form-item label="appid" prop="appId">
-          <el-input v-model="form.appId" placeholder="请输入appid" />
+        <el-form-item label="商户id" prop="appId">
+          <el-input v-model="form.appId" placeholder="请输入商户id" />
         </el-form-item>
-        <el-form-item label="appid" prop="title">
-          <el-input v-model="form.title" placeholder="请输入appid" />
+        <el-form-item label="标题" prop="title">
+          <el-input v-model="form.title" placeholder="请输入标题" />
         </el-form-item>
-        <el-form-item label="appid">
-          <editor v-model="form.content" :min-height="192"/>
+        <el-form-item label="内容">
+          <!-- <editor v-model="form.content" :min-height="192"/> -->
+          <textarea v-model="form.content" placeholder="请输入内容"/>
         </el-form-item>
-        <el-form-item label="数据创建时间" prop="createAt">
+        <!-- <el-form-item label="数据创建时间" prop="createAt">
           <el-date-picker clearable size="small"
             v-model="form.createAt"
             type="date"
@@ -207,19 +208,19 @@
             value-format="yyyy-MM-dd"
             placeholder="选择数据更新时间">
           </el-date-picker>
-        </el-form-item>
-        <el-form-item label="是否删除" prop="isDelete">
+        </el-form-item> -->
+        <!-- <el-form-item label="是否删除" prop="isDelete">
           <el-input v-model="form.isDelete" placeholder="请输入是否删除" />
-        </el-form-item>
-        <el-form-item label="跳转连接" prop="linkUrl">
-          <el-input v-model="form.linkUrl" placeholder="请输入跳转连接" />
+        </el-form-item> -->
+        <el-form-item label="跳转链接" prop="linkUrl">
+          <el-input v-model="form.linkUrl" placeholder="请输入跳转链接" />
         </el-form-item>
         <el-form-item label="公告跳转类型" prop="noticeSkipType">
           <el-select v-model="form.noticeSkipType" placeholder="请选择公告跳转类型">
             <el-option label="请选择字典生成" value="" />
           </el-select>
         </el-form-item>
-        <el-form-item label="公告跳转类型" prop="noticeTypeId">
+        <el-form-item label="公告类型" prop="noticeTypeId">
           <el-input v-model="form.noticeTypeId" placeholder="请输入公告跳转类型" />
         </el-form-item>
       </el-form>
@@ -283,25 +284,22 @@ export default {
           { required: true, message: "公告跳转类型不能为空", trigger: "blur" }
         ],
         appId: [
-          { required: true, message: "appid不能为空", trigger: "blur" }
+          { required: true, message: "商户id不能为空", trigger: "blur" }
         ],
         title: [
-          { required: true, message: "appid不能为空", trigger: "blur" }
+          { required: true, message: "标题不能为空", trigger: "blur" }
         ],
         content: [
-          { required: true, message: "appid不能为空", trigger: "blur" }
-        ],
-        isDelete: [
-          { required: true, message: "是否删除不能为空", trigger: "blur" }
+          { required: true, message: "内容不能为空", trigger: "blur" }
         ],
         linkUrl: [
-          { required: true, message: "跳转连接不能为空", trigger: "blur" }
+          { required: false, message: "跳转连接不能为空", trigger: "blur" }
         ],
         noticeSkipType: [
-          { required: true, message: "公告跳转类型不能为空", trigger: "change" }
+          { required: false, message: "公告跳转类型不能为空", trigger: "change" }
         ],
         noticeTypeId: [
-          { required: true, message: "公告跳转类型不能为空", trigger: "blur" }
+          { required: false, message: "公告跳转类型不能为空", trigger: "blur" }
         ]
       }
     };

ruoyi-ui/src/views/system/LzydNoticeGenre/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="公告类型id" prop="noticeTypeId">
+      <el-form-item label="公告类型" prop="noticeTypeId">
         <el-input
           v-model="queryParams.noticeTypeId"
           placeholder="请输入公告类型id"
@@ -119,7 +119,11 @@
       <el-table-column label="公告类型id" align="center" prop="noticeTypeId" />
       <el-table-column label="appid" align="center" prop="appId" />
       <el-table-column label="发布者昵称" align="center" prop="noticeName" />
-      <el-table-column label="发布者头像" align="center" prop="noticeAvatar" />
+      <el-table-column label="发布者头像" align="center" width="100">
+        <template slot-scope="scope" >
+           <img style="width:100%;height:100%" :src="scope.row.noticeAvatar" alt="" />
+        </template>
+      </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createAt" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createAt, '{y}-{m}-{d}') }}</span>

ruoyi-ui/src/views/system/LzydNoticeUser/index.vue

@@ -50,7 +50,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -94,7 +94,7 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="LzydNoticeUserList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />

ruoyi-ui/src/views/system/LzydQualifying/index.vue

@@ -158,7 +158,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -202,15 +202,15 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="LzydQualifyingList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="appid" align="center" prop="appId" />
-      <el-table-column label="活动id" align="center" prop="qualifyingId" />
-      <el-table-column label="发起人用户id" align="center" prop="sponsorId" />
-      <el-table-column label="活动名称" align="center" prop="name" />
+      <!-- <el-table-column label="appid" align="center" prop="appId" /> -->
+      <el-table-column label="活动id" align="center" prop="qualifyingId" width="200" />
+      <el-table-column label="发起人用户id" align="center" prop="sponsorId" width="200" />
+      <el-table-column label="活动名称" align="center" prop="name" width="200" />
       <el-table-column label="活动里程" align="center" prop="mileage" />
       <el-table-column label="里程id" align="center" prop="mileageId" />
       <el-table-column label="里程名称" align="center" prop="mileageName" />
@@ -232,7 +232,7 @@
       <el-table-column label="完赛时间
 
 " align="center" prop="eventDuration" />
-      <el-table-column label="比赛公告" align="center" prop="announce" />
+      <el-table-column label="比赛公告" align="center" prop="announce" width="200" />
       <el-table-column label="完赛获取积分" align="center" prop="cangetScore" />
       <el-table-column label="参赛所需积分" align="center" prop="spendScore" />
       <el-table-column label="是否删除/0=否；1=已删除" align="center" prop="isDelete" />

ruoyi-ui/src/views/system/LzydQualifyingUser/index.vue

@@ -104,7 +104,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -148,14 +148,14 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="LzydQualifyingUserList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="id" align="center" prop="id" />
       <!-- <el-table-column label="appid" align="center" prop="appId" /> -->
-      <el-table-column label="排位赛id" align="center" prop="qualifyingId" />
-      <el-table-column label="用户id" align="center" prop="userId" />
+      <el-table-column label="排位赛id" align="center" prop="qualifyingId" width="200" />
+      <el-table-column label="用户id" align="center" prop="userId" width="200"/>
       <el-table-column label="积分数" align="center" prop="getPoints" />
       <el-table-column label="配速" align="center" prop="speed" />
       <el-table-column label="跑步距离/米" align="center" prop="distance" />

ruoyi-ui/src/views/system/LzydSportLog/index.vue

@@ -101,7 +101,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -145,13 +145,13 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="LzydSportLogList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="用户id" align="center" prop="userId" />
-      <el-table-column label="任务id" align="center" prop="taskId" />
+      <el-table-column label="用户id" align="center" prop="userId" width="200" />
+      <el-table-column label="任务id" align="center" prop="taskId" width="200" />
       <el-table-column label="运动类型" align="center" prop="sportsType" />
       <!-- |0=室外1=室内 -->
       <el-table-column label="卡路里" align="center" prop="calorie" />

ruoyi-ui/src/views/system/LzydUser/index.vue

@@ -10,6 +10,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+       <el-form-item label="手机号" prop="mobilePhone">
+        <el-input
+          v-model="queryParams.mobilePhone"
+          placeholder="请输入用户手机号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <!-- <el-form-item label="账户类型" prop="role">
         <el-input
           v-model="queryParams.role"
@@ -276,7 +285,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -320,20 +329,24 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="LzydUserList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="悦动id" align="center" prop="yuedongId" />
-      <el-table-column label="用户id" align="center" prop="userId" />
+      <el-table-column label="悦动id" align="center" prop="yuedongId" width="200" />
+      <el-table-column label="用户id" align="center" prop="userId" width="200" />
       <el-table-column label="账户类型" align="center" prop="role" />
       <el-table-column label="用户姓名" align="center" prop="username" />
       <el-table-column label="用户地址" align="center" prop="address" />
-      <el-table-column label="地区" align="center" prop="area" />
+      <el-table-column label="地区" align="center" prop="area" width="200px" />
       <el-table-column label="密码" align="center" prop="password" />
-      <el-table-column label="用户手机号" align="center" prop="mobilePhone" />
-      <el-table-column label="用户头像" align="center" prop="userAvatar" />
+      <el-table-column label="用户手机号" align="center" prop="mobilePhone" width="200" />
+      <el-table-column label="发布者头像" align="center" width="100">
+        <template slot-scope="scope" >
+          <img style="width:100%;height:100%" :src="scope.row.userAvatar" alt="" />
+        </template>
+      </el-table-column>
       <el-table-column label="用户二维码" align="center" prop="qrCode" />
       <el-table-column label="用户排位赛级别" align="center" prop="userGrade" />
       <el-table-column label="昵称" align="center" prop="realName" />

ruoyi-ui/src/views/system/LzydVideoAttention/index.vue

@@ -64,7 +64,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -108,13 +108,13 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="LzydVideoAttentionList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="id" align="center" prop="id" />
       <!-- <el-table-column label="租户id" align="center" prop="appId" /> -->
-      <el-table-column label="用户id" align="center" prop="userId" />
+      <el-table-column label="用户id" align="center" prop="userId" width="200px"/>
       <el-table-column label="关注的用户id" align="center" prop="attentionUserId" />
       <el-table-column label="状态" align="center" prop="status" />
       <!-- (默认0关注中，1取消关注,2已拉黑) -->

ruoyi-ui/src/views/system/LzydVideoComment/index.vue

@@ -95,7 +95,7 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-
+<!-- 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -140,16 +140,16 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="LzydVideoCommentList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="id" align="center" prop="id" />
       <!-- <el-table-column label="租户id" align="center" prop="appId" /> -->
-      <el-table-column label="来源id" align="center" prop="resourceId" />
-      <el-table-column label="评论id" align="center" prop="commentId" />
-      <el-table-column label="用户id" align="center" prop="commentUserId" />
-      <el-table-column label="内容" align="center" prop="content" />
+      <el-table-column label="来源id" align="center" prop="resourceId" width="200" />
+      <el-table-column label="评论id" align="center" prop="commentId" width="200" />
+      <el-table-column label="用户id" align="center" prop="commentUserId" width="200" />
+      <el-table-column label="内容" align="center" prop="content" width="200" />
       <el-table-column label="喜欢数" align="center" prop="likeNum" />
       <el-table-column label="不喜欢数" align="center" prop="dislikeNum" />
       <el-table-column label="审核状态" align="center" prop="status" />

ruoyi-ui/src/views/system/LzydVideoMaster/index.vue

@@ -164,7 +164,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -208,27 +208,27 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="LzydVideoMasterList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="id" align="center" prop="id" />
       <!-- <el-table-column label="租户id" align="center" prop="appId" /> -->
-      <el-table-column label="视频id" align="center" prop="videoId" />
+      <el-table-column label="视频id" align="center" prop="videoId" width="200px" />
       <!-- <el-table-column label="视频上传upload_id" align="center" prop="uploadId" /> -->
-      <el-table-column label="用户id" align="center" prop="userId" />
+      <el-table-column label="用户id" align="center" prop="userId" width="200px" />
       <el-table-column label="标题" align="center" prop="title" />
       <el-table-column label="简介" align="center" prop="summary" />
-      <el-table-column label="封面图片" align="center" width="200">
+      <el-table-column label="封面图片" align="center" width="150">
          <template slot-scope="scope" >
-           <img style="width:200px;height:200px" :src="scope.row.cover" alt="" />
+           <img style="width:150px;height:150px" :src="scope.row.cover" alt="" />
         </template>
       </el-table-column>
       <el-table-column label="所在省份" align="center" prop="province" />
       <el-table-column label="所在城市" align="center" prop="city" />
       <el-table-column label="所在区" align="center" prop="area" />
       <!-- <el-table-column label="用户定位坐标(lng,lat)" align="center" prop="location" /> -->
-      <el-table-column label="详细地址" align="center" prop="address" />
+      <el-table-column label="详细地址" align="center" prop="address" width="200px" />
       <el-table-column label="喜欢数" align="center" prop="likeNum" />
       <el-table-column label="转发数" align="center" prop="shareNum" />
       <el-table-column label="观看次数" align="center" prop="watchNum" />

ruoyi-ui/src/views/system/LzydVideoRecord/index.vue

@@ -73,7 +73,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -117,7 +117,7 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="LzydVideoRecordList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
@@ -125,9 +125,8 @@
       <!-- <el-table-column label="租户Id" align="center" prop="appId" /> -->
       <el-table-column label="用户id" align="center" prop="userId" />
       <el-table-column label="视频id" align="center" prop="videoId" />
-      <el-table-column label="用户Id" align="center" prop="videoUserId" />
       <el-table-column label="类型" align="center" prop="type" />
-      <el-table-column label="是否删除" align="center" prop="isDelete" />
+      <!-- <el-table-column label="是否删除" align="center" prop="isDelete" /> -->
         <!-- <template slot-scope="scope" >
           {{scope.row.isDelete ? '已删除':'未删除'}}
         </template> -->

ruoyi-ui/src/views/system/LzydVideoReplyComment/index.vue

@@ -150,10 +150,10 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="id" align="center" prop="id" />
       <!-- <el-table-column label="租户id" align="center" prop="appId" /> -->
-      <el-table-column label="评论id" align="center" prop="replyCommentId" />
-      <el-table-column label="用户id" align="center" prop="replyCommentUserId" />
+      <el-table-column label="评论id" align="center" prop="replyCommentId" width="200" />
+      <el-table-column label="用户id" align="center" prop="replyCommentUserId" width="200" />
       <!-- <el-table-column label="父级回复评论comment_id" align="center" prop="parentReplyCommentId" /> -->
-      <el-table-column label="一级评论id" align="center" prop="commentId" />
+      <el-table-column label="一级评论id" align="center" prop="commentId" width="200"/>
       <el-table-column label="内容" align="center" prop="content" />
       <el-table-column label="喜欢数" align="center" prop="likeNum" />
       <el-table-column label="不喜欢数" align="center" prop="dislikeNum" />

ruoyi-ui/src/views/system/LzydVideoUpload/index.vue

@@ -96,7 +96,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -140,13 +140,13 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="LzydVideoUploadList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="id" align="center" prop="id" />
       <!-- <el-table-column label="租户id" align="center" prop="appId" /> -->
-      <el-table-column label="视频上传id" align="center" prop="uploadId" />
+      <el-table-column label="视频上传id" align="center" prop="uploadId" width="200" />
       <el-table-column label="用户id" align="center" prop="userId" />
       <el-table-column label="VideoId" align="center" prop="videoOssId" />
       <el-table-column label="视频url" align="center" prop="videoUrl" />

ruoyi-ui/vue.config.js

@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://192.168.0.105:4009`,
-        target: `http://lzyd-backend-api.lizhiyuedong.com/`,
+        target: `http://192.168.0.103:8080/`,
+        // target: `http://lzyd-backend-api.lizhiyuedong.com/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''