Merge branch '04/16vipactiveRange' into test

src/views/resetTeaming/modals/subject-preview.vue

@@ -594,9 +594,9 @@ export default {
                     tempCourse.forEach(item => {
                         m += parseFloat(item.courseCurrentPrice)
                         // 不可选的课程才会减免课程费用
-                        if (!item.isStudentOptional) {
-                            tempGroupRemissionCourseFee += parseFloat(item.courseCurrentPrice)
-                        }
+                        // if (!item.isStudentOptional) {
+                        //     tempGroupRemissionCourseFee += parseFloat(item.courseCurrentPrice)
+                        // }
                     });
                     marketPrice += parseFloat(m)
                     buyList.unshift({

vue.config.js

@@ -55,7 +55,7 @@ module.exports = {
     //   warnings: false,
     //   errors: true
     // },
-    https: false,
+    https: true,
     proxy: {
       // change xxx-api/login => mock/login
       // detail: https://cli.vuejs.org/config/#devserver-proxy
@@ -66,9 +66,8 @@ module.exports = {
       // let target = 'http://dev.dayaedu.com'
       // 'http://dev.dayaedu.com'
       '/api-auth': {
-        target: target,
-        // target: 'http://47.114.176.40:8000',
-        // target : 'https://test.dayaedu.com',
+        // target: 'https://test.dayaedu.com',
+        target : target,
         changeOrigin: true,
         pathRewrite: {
           '^api-auth': ''