部署

.env.development

@@ -9,3 +9,4 @@ VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
+VITE_BASE_PATH = ''

.env.production

@@ -5,4 +5,5 @@ VUE_APP_TITLE = 若依管理系统
 ENV = 'production'
 
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = '/weverse-prod-api'
+VITE_BASE_PATH = '/weverse/'

.env.staging

@@ -9,4 +9,5 @@ NODE_ENV = production
 ENV = 'staging'
 
 # 若依管理系统/测试环境
-VUE_APP_BASE_API = '/stage-api'
+VUE_APP_BASE_API = '/weverse-stage-api'
+VITE_BASE_PATH = '/weverse/'

src/api/system/apply.js

@@ -35,10 +35,11 @@ export function updateApply(data) {
   })
 }
 
-// 删除申请
-export function delApply(id) {
+export function toConfirm(id) {
   return request({
-    url: '/system/apply/' + id,
-    method: 'delete'
+    url: '/system/apply/confirm/' + id,
+    method: 'post'
   })
 }
+
+

src/layout/components/Navbar.vue

@@ -102,7 +102,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          location.href = '/index';
+          location.href = process.env.VITE_BASE_PATH;
         })
       }).catch(() => {});
     }

src/main.js

@@ -12,13 +12,13 @@ import store from './store'
 import router from './router'
 import directive from './directive' // directive
 import plugins from './plugins' // plugins
-import { download } from '@/utils/request'
+import {download} from '@/utils/request'
 
 import './assets/icons' // icon
 import './permission' // permission control
-import { getDicts } from "@/api/system/dict/data";
-import { getConfigKey } from "@/api/system/config";
-import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
+import {getDicts} from "@/api/system/dict/data";
+import {getConfigKey} from "@/api/system/config";
+import {parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree} from "@/utils/ruoyi";
 // 分页组件
 import Pagination from "@/components/Pagination";
 // 自定义表格工具组件
@@ -79,6 +79,7 @@ Vue.use(Element, {
 Vue.config.productionTip = false
 
 new Vue({
+  base: process.env.VUE_APP_SUB_PATH,
   el: '#app',
   router,
   store,

src/utils/request.js

@@ -87,7 +87,7 @@ service.interceptors.response.use(res => {
         MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
           isRelogin.show = false;
           store.dispatch('LogOut').then(() => {
-            location.href = '/index';
+            location.href = process.env.VITE_BASE_PATH;
           })
       }).catch(() => {
         isRelogin.show = false;

src/views/system/apply/index.vue

@@ -1,6 +1,17 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+
+      <el-form-item label="演出" prop="performId">
+        <el-select v-model="queryParams.performId" placeholder="请选择演出" style="width: 300px" clearable>
+          <el-option
+            v-for="dict in allPerform"
+            :key="dict.id"
+            :label="dict.name+'  '+dict.startTime"
+            :value="dict.id"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="weverse账号" prop="weverseEmail">
         <el-input
           v-model="queryParams.weverseEmail"
@@ -79,6 +90,14 @@
             v-hasPermi="['system:apply:edit']"
           >修改
           </el-button>
+          <el-button v-if="scope.row.status==='0'"
+                     size="mini"
+                     type="text"
+                     icon="el-icon-check"
+                     @click="confirm(scope.row)"
+                     v-hasPermi="['system:apply:confirm']"
+          >确认收款
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -138,13 +157,16 @@
 </template>
 
 <script>
-import {listApply, getApply, delApply, addApply, updateApply} from "@/api/system/apply";
+import {listApply, getApply, addApply, updateApply, toConfirm} from "@/api/system/apply";
+import {getAll} from "@/api/system/perform";
 
 export default {
   name: "Apply",
   dicts: ['apply_status'],
   data() {
     return {
+      //
+      allPerform: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -200,12 +222,20 @@ export default {
         wechatNum: [
           {required: true, message: "微信号不能为空", trigger: "blur"}
         ],
+        status: [
+          { required: true, message: "状态不能为空", trigger: "change" }
+        ],
       }
     };
   },
   created() {
     this.getList();
   },
+  mounted() {
+    getAll().then(response => {
+      this.allPerform = response.data;
+    });
+  },
   methods: {
     /** 查询申请列表 */
     getList() {
@@ -267,6 +297,14 @@ export default {
         this.title = "修改申请";
       });
     },
+    /**
+     * 确认收款
+     */
+    async confirm(row) {
+      await toConfirm(row.id);
+      this.$modal.msgSuccess("确认成功");
+      this.getList();
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {

vue.config.js

@@ -18,7 +18,7 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
+  publicPath: process.env.VITE_BASE_PATH,
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: 'dist',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
@@ -48,7 +48,7 @@ module.exports = {
   css: {
     loaderOptions: {
       sass: {
-        sassOptions: { outputStyle: "expanded" }
+        sassOptions: {outputStyle: "expanded"}
       }
     }
   },
@@ -93,39 +93,39 @@ module.exports = {
       .end()
 
     config.when(process.env.NODE_ENV !== 'development', config => {
-          config
-            .plugin('ScriptExtHtmlWebpackPlugin')
-            .after('html')
-            .use('script-ext-html-webpack-plugin', [{
-            // `runtime` must same as runtimeChunk name. default is `runtime`
-              inline: /runtime\..*\.js$/
-            }])
-            .end()
+      config
+        .plugin('ScriptExtHtmlWebpackPlugin')
+        .after('html')
+        .use('script-ext-html-webpack-plugin', [{
+          // `runtime` must same as runtimeChunk name. default is `runtime`
+          inline: /runtime\..*\.js$/
+        }])
+        .end()
 
-          config.optimization.splitChunks({
-            chunks: 'all',
-            cacheGroups: {
-              libs: {
-                name: 'chunk-libs',
-                test: /[\\/]node_modules[\\/]/,
-                priority: 10,
-                chunks: 'initial' // only package third parties that are initially dependent
-              },
-              elementUI: {
-                name: 'chunk-elementUI', // split elementUI into a single package
-                test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
-                priority: 20 // the weight needs to be larger than libs and app or it will be packaged into libs or app
-              },
-              commons: {
-                name: 'chunk-commons',
-                test: resolve('src/components'), // can customize your rules
-                minChunks: 3, //  minimum common number
-                priority: 5,
-                reuseExistingChunk: true
-              }
-            }
-          })
-          config.optimization.runtimeChunk('single')
+      config.optimization.splitChunks({
+        chunks: 'all',
+        cacheGroups: {
+          libs: {
+            name: 'chunk-libs',
+            test: /[\\/]node_modules[\\/]/,
+            priority: 10,
+            chunks: 'initial' // only package third parties that are initially dependent
+          },
+          elementUI: {
+            name: 'chunk-elementUI', // split elementUI into a single package
+            test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
+            priority: 20 // the weight needs to be larger than libs and app or it will be packaged into libs or app
+          },
+          commons: {
+            name: 'chunk-commons',
+            test: resolve('src/components'), // can customize your rules
+            minChunks: 3, //  minimum common number
+            priority: 5,
+            reuseExistingChunk: true
+          }
+        }
+      })
+      config.optimization.runtimeChunk('single')
     })
   }
 }