合并

package.json

@@ -14,54 +14,53 @@
     "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml"
   },
   "dependencies": {
-    "@babel/plugin-proposal-optional-chaining": "^7.11.0",
     "JSONPath": "^0.11.2",
     "axios": "0.18.1",
-    "browserslist": "^4.16.4",
-    "caniuse-lite": "^1.0.30001214",
+    "browserslist": "^4.16.6",
+    "caniuse-lite": "^1.0.30001244",
     "clean-deep": "^3.3.0",
     "copy-to-clipboard": "^3.3.1",
-    "dayjs": "^1.8.35",
+    "dayjs": "^1.10.6",
     "default-passive-events": "^1.0.10",
     "echarts": "^4.8.0",
-    "element-ui": "^2.13.2",
+    "element-ui": "^2.15.3",
     "http-server": "^0.12.3",
     "i": "^0.3.6",
-    "js-base64": "^3.6.0",
+    "js-base64": "^3.6.1",
     "js-cookie": "2.2.0",
     "linq": "^3.2.2",
-    "lodash": "^4.17.20",
+    "lodash": "^4.17.21",
     "moment": "^2.29.1",
     "node-sass": "^4.13.1",
     "normalize.css": "7.0.0",
-    "npm": "^6.13.0",
+    "npm": "^6.14.13",
     "nprogress": "0.2.0",
     "numeral": "^2.0.6",
     "object-diff": "0.0.4",
     "path-to-regexp": "2.4.0",
     "portal-vue": "^2.1.7",
     "qrcodejs2": "0.0.2",
-    "qs": "^6.8.0",
+    "qs": "^6.10.1",
     "screenfull": "^5.1.0",
-    "swiper": "^6.3.5",
+    "swiper": "^6.7.5",
     "v-charts": "^1.19.0",
     "vue": "2.6.10",
     "vue-amap": "^0.5.10",
     "vue-awesome-swiper": "^4.1.1",
     "vue-count-to": "^1.0.13",
     "vue-drag-resize": "^1.5.4",
-    "vue-lunar-calendar-pro": "^1.0.14",
-    "vue-qr": "^2.2.1",
+    "vue-lunar-calendar-pro": "^1.0.16",
+    "vue-qr": "^2.5.0",
     "vue-quill-editor": "^3.0.6",
     "vue-resize": "^1.0.1",
     "vue-router": "3.0.6",
     "vuex": "3.1.0",
-    "wangeditor": "^4.0.0",
-    "webpack-merge": "^5.3.0"
+    "wangeditor": "^4.7.5",
+    "webpack-merge": "^5.8.0"
   },
   "devDependencies": {
     "@babel/core": "7.0.0",
-    "@babel/plugin-proposal-optional-chaining": "^7.11.0",
+    "@babel/plugin-proposal-optional-chaining": "^7.14.5",
     "@babel/register": "7.0.0",
     "@vue/cli-plugin-babel": "3.6.0",
     "@vue/cli-plugin-eslint": "^3.9.1",
@@ -78,7 +77,7 @@
     "eslint": "5.15.3",
     "eslint-plugin-vue": "5.2.2",
     "html-webpack-plugin": "3.2.0",
-    "less": "^3.10.3",
+    "less": "^3.13.1",
     "less-loader": "^5.0.0",
     "mockjs": "1.0.1-beta3",
     "runjs": "^4.3.2",
@@ -89,7 +88,7 @@
     "svg-sprite-loader": "4.1.3",
     "svgo": "1.2.2",
     "vue-template-compiler": "2.6.10",
-    "worker-loader": "^3.0.7"
+    "worker-loader": "^3.0.8"
   },
   "engines": {
     "node": ">=8.9",

src/views/teamBuild/api.js

@@ -70,7 +70,13 @@ export const setNoneCloudTeacher = data => request2({
   method: 'get',
   requestType: 'json'
 })
-
+// 拒绝审核
+export const setCloudTeacherToFailed = data => request2({
+  url: '/api-web/studentRegistration/setCloudTeacherToFailed',
+  params: data,
+  method: 'post',
+  requestType: 'json'
+})
 
 // 意向列表
 export const queryPreApplySubjectList = data => request2({
@@ -87,3 +93,5 @@ export const sendParentMeetingNotice = data => request2({
   method: 'post',
   requestType: 'form'
 })
+
+// 审核拒绝

src/views/teamBuild/signupList.vue

@@ -617,6 +617,14 @@
                   >解除预约限制</el-button
                 >
               </auth>
+              <auth
+                v-show="scope.row.payingStatus == 2"
+                :auths="'studentRegistration/setCloudTeacherToFailed'"
+              >
+                <el-button type="text" @click="failedRelieve(scope.row)"
+                  >拒绝审核</el-button
+                >
+              </auth>
             </div>
           </template>
         </el-table-column>
@@ -876,7 +884,7 @@ import {
   checkCanReg,
 } from "@/api/buildTeam";
 
-import { setNoneCloudTeacher } from "./api";
+import { setNoneCloudTeacher, setCloudTeacherToFailed } from "./api";
 import mergeMusic from "./components/merge-music";
 import forecastList from "./components/forecast-list";
 import newForecastList from "./components/newForecast-list";
@@ -1761,6 +1769,21 @@ export default {
         }
       });
     },
+    failedRelieve(row) {
+      this.$confirm("拒绝后学员需购买会员方可入团", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(async () => {
+        try {
+          const res = await setCloudTeacherToFailed({ id: row.id });
+          this.$message.success("操作成功");
+          this.getList();
+        } catch (e) {
+          console.log(e);
+        }
+      });
+    },
     getCheckNum(row) {
       this.rules.page = 1;
       this.rules.limit = 10;

vue.config.js

@@ -19,8 +19,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.148:8000' //邹璇
 // let target = 'http://192.168.3.112:8000' //勇哥
-// let target = 'http://dev.dayaedu.com' // 开发环境
-let target = 'https://test.dayaedu.com' //测试环境
+let target = 'http://dev.dayaedu.com' // 开发环境
+// let target = 'https://test.dayaedu.com' //测试环境
 // let target = 'http://192.168.3.134' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
@@ -54,7 +54,7 @@ module.exports = {
     //   warnings: false,
     //   errors: true
     // },
-    https: true,
+    https: false,
     proxy: {
       // change xxx-api/login => mock/login
       // detail: https://cli.vuejs.org/config/#devserver-proxy