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

src/components/busManagement/BookAcar/components/tripBusOrderList.vue

@@ -628,7 +628,8 @@
               <div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}">
                 <span class="fz12 c9e">订单总金额</span>
                 <div class="ml">
-                  <span class="fz15 fbold">{{ item.totalMoney.toFixed(2) }}</span>
+                  <!-- totalMoney -->
+                  <span class="fz15 fbold">{{ item.TotalPrice.toFixed(2) }}</span>
                   <span class="fz12 ml">
                     {{item.CurrencyName}}
                   </span>
@@ -814,7 +815,7 @@
               <el-table-column prop="UnitPrice" label="价格" min-width="150">
                 <template slot-scope="scope">
                   <el-input-number v-if="priceType == 1" v-model="scope.row.UnitPrice" @change="calcPrice()"
-                  :min="1" style="width:auto;"></el-input-number>
+                  :min="0" style="width:auto;"></el-input-number>
                   <span v-if="priceType != 1">
                     {{ scope.row.UnitPrice }}
                   </span>
@@ -1340,9 +1341,9 @@
         var tempRoomPrice = 0;
         var tempTotalPrice = 0;
         this.postMsg.details&&this.postMsg.details.forEach(item=>{
-          if(!item.UnitPrice){
-            item.UnitPrice = 1
-          }
+          // if(!item.UnitPrice){
+          //   item.UnitPrice = 1
+          // }
           item.Money = item.UnitPrice+item.StopBusPrice+item.RoomPrice
           if (item.UnitPrice) {
             tempUnitPrice += Number(item.UnitPrice);

src/components/platformModule/menuManagement.vue

@@ -360,6 +360,7 @@
           this.addMsg.Sort = updateList.Sort
           this.addMsg.GroupingCode = updateList.GroupingCode
           this.addMsg.MenuUrl = updateList.MenuUrl
+          this.addMsg.menutype = updateList.MenuType
           this.addMsg.MenuStatus = updateList.MenuStatus.toString()
           let style = JSON.parse(updateList.MenuStyle)
           // this.addMsg.MenuStyleIcon = style.icon