sunny

ruoyi-ui/package.json

@@ -1,8 +1,8 @@
 {
   "name": "ruoyi",
   "version": "3.4.0",
-  "description": "荔枝悦动管理系统",
-  "author": "荔枝悦动",
+  "description": "荔枝庄园管理系统",
+  "author": "荔枝庄园",
   "license": "MIT",
   "scripts": {
     "dev": "vue-cli-service serve",

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

@@ -142,7 +142,7 @@
           v-hasPermi="['system:GameMallGoods:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -151,15 +151,15 @@
           @click="handleExport"
           v-hasPermi="['system:GameMallGoods:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="GameMallGoodsList" @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="goodsId" />
+      <!-- <el-table-column label="租户Id" align="center" prop="appId" /> -->
+      <!-- <el-table-column label="商品id" align="center" prop="goodsId" /> -->
       <el-table-column label="商品封面" align="center" prop="cover" />
       <el-table-column label="商品名称" align="center" prop="name" />
       <el-table-column label="所需积分数" align="center" prop="needPoint" />
@@ -167,7 +167,7 @@
       <el-table-column label="虚拟库存数" align="center" prop="virtualStockNum" />
       <el-table-column label="已兑换数" align="center" prop="exchangeNum" />
       <el-table-column label="状态" align="center" prop="status" />
-      <el-table-column label="是否删除" align="center" prop="isDelete" />
+      <!-- <el-table-column label="是否删除" align="center" prop="isDelete" /> -->
       <el-table-column label="创建时间" align="center" prop="createdAt" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createdAt, '{y}-{m}-{d}') }}</span>
@@ -209,9 +209,9 @@
     <!-- 添加或修改商品列表对话框 -->
     <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> -->
         <el-form-item label="商品id" prop="goodsId">
           <el-input v-model="form.goodsId" placeholder="请输入商品id" />
         </el-form-item>
@@ -230,15 +230,15 @@
         <el-form-item label="虚拟库存数" prop="virtualStockNum">
           <el-input v-model="form.virtualStockNum" placeholder="请输入虚拟库存数" />
         </el-form-item>
-        <el-form-item label="已兑换数" prop="exchangeNum">
+        <!-- <el-form-item label="已兑换数" prop="exchangeNum">
           <el-input v-model="form.exchangeNum" placeholder="请输入已兑换数" />
-        </el-form-item>
-        <el-form-item label="状态">
+        </el-form-item> -->
+        <!-- <el-form-item label="状态">
           <el-radio-group v-model="form.status">
             <el-radio label="1">请选择字典生成</el-radio>
           </el-radio-group>
-        </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="createdAt">
@@ -256,7 +256,7 @@
             value-format="yyyy-MM-dd"
             placeholder="选择更新时间">
           </el-date-picker>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

ruoyi-ui/src/views/system/GameUserList/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="appId">
+      <!-- <el-form-item label="租户id" prop="appId">
         <el-input
           v-model="queryParams.appId"
           placeholder="请输入租户id"
@@ -9,7 +9,7 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="用户id" prop="userId">
         <el-input
           v-model="queryParams.userId"
@@ -19,7 +19,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="头像" prop="avatar">
+      <!-- <el-form-item label="头像" prop="avatar">
         <el-input
           v-model="queryParams.avatar"
           placeholder="请输入头像"
@@ -27,7 +27,7 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="用户名" prop="username">
         <el-input
           v-model="queryParams.username"
@@ -37,7 +37,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="密码" prop="password">
+      <!-- <el-form-item label="密码" prop="password">
         <el-input
           v-model="queryParams.password"
           placeholder="请输入密码"
@@ -61,7 +61,7 @@
           value-format="yyyy-MM-dd"
           placeholder="选择更新时间">
         </el-date-picker>
-      </el-form-item>
+      </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>
@@ -117,10 +117,15 @@
     <el-table v-loading="loading" :data="GameUserListList" @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="appId" /> -->
       <el-table-column label="用户id" align="center" prop="userId" />
-      <el-table-column label="头像" align="center" prop="avatar" />
+      <!-- <el-table-column label="" align="center" prop="avatar" /> -->
       <el-table-column label="用户名" align="center" prop="username" />
+      <el-table-column label="头像" align="center" width="100">
+        <template slot-scope="scope" >
+           <img style="width:100%;height:100%" :src="scope.row.avatar" alt="" />
+        </template>
+      </el-table-column>
       <el-table-column label="密码" align="center" prop="password" />
       <el-table-column label="创建时间" align="center" prop="createdAt" width="180">
         <template slot-scope="scope">

ruoyi-ui/vue.config.js

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