Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/pages/course/paymentDetail.vue

@@ -261,11 +261,11 @@
             <div class="pay_Inner">¥{{dataList.SaleCommission}}</div>
           </div>
           <div class="pay_ListMent">
-            <div class="pay_ListOne">老师提成</div>
+            <div class="pay_ListOne">课时费</div>
             <div class="pay_Inner">¥{{dataList.TeacherProfitNow}}</div>
           </div>
           <div class="pay_ListMent">
-            <div class="pay_ListOne">绩效提成</div>
+            <div class="pay_ListOne">绩效奖励</div>
             <div class="pay_Inner orangeStyle ">¥{{dataList.MeritsProfit}}</div>
           </div>
         </div>
@@ -477,7 +477,7 @@
       },
       //减法 得实收
       getShiShou(num1, num2) {
-        if (num1 && num2) {
+        if (num1!=='' && num2!=='') {
           return parseInt(num1) - parseInt(num2);
         } else {
           return 0;