个人中心提交

src/api/users/user.js

@@ -124,3 +124,49 @@ export function getEmployeeAddrBook(data)
       })
     }
   
+
+      /**
+ * 获取我的提成折线图
+ */
+    export function getUserSellCommission(data)
+    {
+      return request({
+        url: '/UserInfo/GetUserSellCommission',
+        method: 'post',
+        data
+      })
+    }
+      /**
+ * 获取我的奖金折线图
+ */
+  export function getTeacherSellCommission(data)
+  {
+    return request({
+      url: '/UserInfo/GetTeacherSellCommission',
+      method: 'post',
+      data
+    })
+  }
+      /**
+ * 个人中心 我的奖金确认  
+ */
+  export function updateSureTeachingBonusDetail(data)
+  {
+    return request({
+      url: '/UserInfo/UpdateSureTeachingBonusDetail',
+      method: 'post',
+      data
+    })
+  }
+
+      /**
+ * 个人中心 我的提成确认  
+ */
+  export function updatSureSellCommission(data)
+  {
+    return request({
+      url: '/UserInfo/UpdatSureSellCommission',
+      method: 'post',
+      data
+    })
+  }
\ No newline at end of file

src/components/school/teacher/teacher-form.vue

@@ -286,6 +286,9 @@
           this.objOption.BaseStuNum = this.saveObj.BaseStuNum;
           this.objOption.BaseHourFee = this.saveObj.BaseHourFee;
           this.objOption.Specialty = this.saveObj.Specialty;
+
+          this.objOption.EnableTime = this.saveObj.EnableTime;
+          this.objOption.BaseHoursEnabled = this.saveObj.BaseHoursEnabled;
           if (this.saveObj.ChooseSpecialty && this.saveObj.ChooseSpecialty.length > 0) {
             this.chooseSpecialty = this.saveObj.ChooseSpecialty;
           }

src/pages/administration/document.vue

@@ -479,7 +479,7 @@
       //分页改变
       changePage(val) {
         this.msg.PageIndex = val;
-        this.getSchool()
+        this.getList()
       },
       getChild(deptArray) {
         var tempStr = "";

src/pages/user/personalData.vue

@@ -115,7 +115,7 @@
                     <div class="text-muted" style="font-size:14px;margin-top: 12px;">
                         {{showObj.SchoolName}}·{{showObj.PostName}}</div>
                     <div class="q-mt-xs">
-                        <q-btn style="background: var(--q-color-negative);color: white;" @click="logout">退出登录</q-btn>
+                        <q-btn style="background: var(--q-color-negative);color: white;margin-top: 10px;" size="sm" @click="logout">退出登录</q-btn>
                     </div>
                 </div>
             </div>
@@ -131,9 +131,8 @@
                 <span class="box_l_t_l">部门：</span>
                 <span>{{showObj.DeptName}}</span>
             </div>
-            <!-- <div class="box_l_title" style="margin-top: 55px;">概要信息</div> -->
-            <!-- <div :class="rightType==0?'box_l_title':'box_l_cen'" @click='rightType=0'>概要信息</div>
-            <div :class="rightType==3?'box_l_title':'box_l_cen'" @click='rightType=3'>预警信息</div> -->
+            <div :class="rightType==0?'box_l_title':'box_l_cen'" @click='rightType=0'>概要信息</div>
+            <!-- <div :class="rightType==3?'box_l_title':'box_l_cen'" @click='rightType=3'>预警信息</div> -->
             <div :class="rightType==1?'box_l_title':'box_l_cen'" @click='rightType=1'>账户资料</div>
             <div :class="rightType==2?'box_l_title':'box_l_cen'" @click='rightType=2'>密码修改</div>
         </div>
@@ -238,7 +237,7 @@
                 loading1: false,
                 loading2:false,
                 showObj: {},
-                rightType: 1,//右边显示类型
+                rightType: 0,//右边显示类型
                 datamodify: {},
                 CompanyList: [],
                 passwordMsg:Object.assign({},defaultpassword),