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

src/components/Hotel/roomReservationsDetails.vue

@@ -280,7 +280,7 @@
               <td v-if="childIndex==0" :rowspan="6" style="white-space:nowrap;">
                 {{subItem.TotalPrice}}
                 <template v-if="subItem.NewTotalPrice">
-                  <br />{{subItem.NewTotalPrice}}
+                  <br /><span style="color:red;">{{subItem.NewTotalPrice}}</span>
                 </template>
               </td>
               <!-- 付款方式 -->
@@ -772,7 +772,6 @@
         let jpaObj = this.allCurrencyList.find(item => {
           return item.ID === 3; //筛选出匹配数据
         });
-        //this.allCurrencyList 
         obj.OrderDetailsList.forEach((item, index) => {
           var tempPrice = 0;
           var coefficient = 1;
@@ -799,7 +798,14 @@
           else if (currentObj.ID == 3) {
             obj.NewTotalPrice = "";
           } else {
-            obj.NewTotalPrice = currentObj.Name + ":" + (totalPrice / currentObj.PayRate).toFixed(2);
+            if(currentObj.CurrentRate>1)
+            {
+              obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice*jpaObj.PayRate)/currentObj.CurrentRate).toFixed(2);
+            }
+            else
+            {
+              obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice*jpaObj.PayRate)*currentObj.CurrentRate).toFixed(2);
+            }
           }
         } else {
           obj.NewTotalPrice = "";