lex-xin 5 роки тому
батько
коміт
e3295829a4

+ 1 - 1
src/api/studentManager.js

@@ -77,7 +77,7 @@ export function queryStudentPayment (data) {
 // 获取学员订单列表
 export function studentPaymentOrderList (data) {
   return request({
-    url: `/web-server/studentPaymentOrder/queryOrderPage`,
+    url: `/web-server/order/queryPage`,
     method: 'get',
     params: data
   })

+ 4 - 2
src/views/buildVip/index.vue

@@ -173,12 +173,14 @@
           <el-form-item label="线上课课酬"
                         v-if="hasOnline">
             <el-input v-model="rightForm.onlineCourse"
-                      :disabled="salaryReadonlyFlag==0 || onlineSalary!='TEACHER_DEFAULT'"></el-input>
+                      :disabled="salaryReadonlyFlag==0"></el-input>
+                      <!--  || onlineSalary!='TEACHER_DEFAULT' -->
           </el-form-item>
           <el-form-item label="线下课课酬"
                         v-if="hasOffline">
             <el-input v-model="rightForm.offlineCourse"
-                      :disabled="salaryReadonlyFlag==0 || offlineSalary!='TEACHER_DEFAULT'"></el-input>
+                      :disabled="salaryReadonlyFlag==0"></el-input>
+                      <!--  || offlineSalary!='TEACHER_DEFAULT' -->
           </el-form-item>
           <el-form-item label="线上课单价"
                         v-if="hasOnline">

+ 4 - 1
src/views/vipClass/vipList.vue

@@ -75,7 +75,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column align='center'
+          <el-table-column align='center' prop="vipGroupActivityName"
                            label="活动方案">
           </el-table-column>
           <el-table-column align='center'
@@ -88,6 +88,9 @@
           </el-table-column>
           <el-table-column align='center'
                            label="月均消耗">
+            <template slot-scope="scope">
+              {{ scope.row.monthConsumeRate }}%
+            </template>
           </el-table-column>
           <el-table-column align='center'
                            prop="coursesExpireDate"

+ 2 - 2
vue.config.js

@@ -17,10 +17,10 @@ const name = defaultSettings.title || 'vue Admin Template' // page title
 // http://47.99.212.176:8000
 // 
 // let target = 'http://192.168.3.27:8000' // 箭河
-let target = 'http://192.168.3.28:8000' //邹璇
+// let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:8000' //勇哥
 // let target = 'http://47.99.212.176:8000' // 测试服
-// let target = 'http://192.168.3.48:8000' // 乔
+let target = 'http://192.168.3.48:8000' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**