Merge branch '01/19NavMenu' into online

src/views/resetTeaming/components/resetPayList.vue

@@ -91,7 +91,7 @@
                          label="现价">
           <template slot-scope="scope">
             <div>
-              {{ scope.row.courseCurrentPrice | moneyFormat }}
+              {{ (scope.row.paymentType === 'SPAN_GROUP_CLASS_ADJUST' ? scope.row.courseOriginalPrice : scope.row.courseCurrentPrice) | moneyFormat }}
             </div>
           </template>
         </el-table-column>

src/views/resetTeaming/components/resetPayListSchool.vue

@@ -91,7 +91,7 @@
                          label="现价">
           <template slot-scope="scope">
             <div>
-              {{ scope.row.courseCurrentPrice | moneyFormat }}
+              {{ (scope.row.paymentType === 'SPAN_GROUP_CLASS_ADJUST' ? scope.row.courseOriginalPrice : scope.row.courseCurrentPrice) | moneyFormat }}
             </div>
           </template>
         </el-table-column>

src/views/resetTeaming/modals/review-detail.vue

@@ -114,9 +114,20 @@
             </el-tooltip>
           </p>
         </template>
+        <template slot-scope="scope">
+          <div>
+            {{ (scope.row.courseCurrentPrice) | moneyFormat }}
+          </div>
+        </template>
       </el-table-column>
       <el-table-column prop="courseOriginalPrice"
                        label="原价(元)">
+
+        <template slot-scope="scope">
+          <div>
+            {{ (musicGroupPaymentCalenders[0].paymentType === 'SPAN_GROUP_CLASS_ADJUST' ? musicGroupPaymentCalenders[0].paymentAmount : scope.row.courseOriginalPrice) | moneyFormat }}
+          </div>
+        </template>
       </el-table-column>
     </el-table>
     <el-alert title="缴费周期"