Merge branch 'master' of http://dzgogs.hw.hongweisoft.com/tourism_project/tourism_admin_ui

.env.production

@@ -1,6 +1,8 @@
 # 页面标题
 VUE_APP_TITLE = 景区一码游管理系统
 
+NODE_ENV = 'production'
+
 # 生产环境配置
 ENV = 'production'
 

.env.staging

@@ -1,7 +1,7 @@
 # 页面标题
 VUE_APP_TITLE = 景区一码游管理系统(测试)
 
-NODE_ENV = production
+NODE_ENV = 'staging'
 
 # 测试环境配置
 ENV = 'staging'

.gitignore

@@ -1,6 +1,8 @@
 .DS_Store
 node_modules/
 dist/
+prod-dist/
+test-dist/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*

src/views/merchant/merchantMr.vue

@@ -3,7 +3,7 @@
  * @Author: gcz
  * @Date: 2024-03-20 09:10:27
  * @LastEditors: gcz
- * @LastEditTime: 2024-03-26 11:13:15
+ * @LastEditTime: 2024-03-27 09:44:37
  * @FilePath: \tourism_admin_ui\src\views\merchant\merchantMr.vue
  * @Copyright: Copyright (c) 2016~2024 by gcz, All Rights Reserved. 
 -->
@@ -118,7 +118,7 @@
           <el-input v-model="form.contactsName" placeholder="请输入商家联系人名称" />
         </el-form-item>
         <el-form-item label="手机号" prop="contactsMobile">
-          <el-input v-model="form.contactsMobile" placeholder="请输入编商家联系人手机号" />
+          <el-input v-model="form.contactsMobile" placeholder="请输入商家联系人手机号" />
         </el-form-item>
         <el-form-item label="商家地址" prop="address">
           <el-input v-model="form.address" />

src/views/system/post/index.vue

@@ -66,7 +66,7 @@
           v-hasPermi="['system:post:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -75,7 +75,7 @@
           @click="handleExport"
           v-hasPermi="['system:post:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

src/views/system/role/index.vue

@@ -84,7 +84,7 @@
           v-hasPermi="['system:role:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -93,7 +93,7 @@
           @click="handleExport"
           v-hasPermi="['system:role:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -134,7 +134,7 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:role:remove']"
           >删除</el-button>
-          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
+          <!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
             <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"
@@ -142,7 +142,7 @@
               <el-dropdown-item command="handleAuthUser" icon="el-icon-user"
                 v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item>
             </el-dropdown-menu>
-          </el-dropdown>
+          </el-dropdown> -->
         </template>
       </el-table-column>
     </el-table>

src/views/system/user/index.vue

@@ -113,7 +113,7 @@
               v-hasPermi="['system:user:remove']"
             >删除</el-button>
           </el-col>
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button
               type="info"
               plain
@@ -122,8 +122,8 @@
               @click="handleImport"
               v-hasPermi="['system:user:import']"
             >导入</el-button>
-          </el-col>
-          <el-col :span="1.5">
+          </el-col> -->
+          <!-- <el-col :span="1.5">
             <el-button
               type="warning"
               plain
@@ -132,7 +132,7 @@
               @click="handleExport"
               v-hasPermi="['system:user:export']"
             >导出</el-button>
-          </el-col>
+          </el-col> -->
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
 
@@ -179,7 +179,14 @@
                 @click="handleDelete(scope.row)"
                 v-hasPermi="['system:user:remove']"
               >删除</el-button>
-              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-key"
+                @click="handleResetPwd(scope.row)"
+                v-hasPermi="['system:user:resetPwd']"
+              >重置密码</el-button>
+              <!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
                 <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
@@ -187,7 +194,7 @@
                   <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
                     v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
                 </el-dropdown-menu>
-              </el-dropdown>
+              </el-dropdown> -->
             </template>
           </el-table-column>
         </el-table>

vue.config.js

@@ -20,7 +20,7 @@ module.exports = {
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
   publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
-  outputDir: 'dist',
+  outputDir: process.env.NODE_ENV === "production" ? "prod-dist" : "test-dist",
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
   assetsDir: 'static',
   // 是否开启eslint保存检测，有效值：ture | false | 'error'