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

src/components/Hotel/HotelProductManage.vue

@@ -320,7 +320,7 @@
           {{item.HasWindowStr}}
         </td>
         <td style="text-align:left;padding-left:20px;">
-          房间大小 {{item.RoomSize}} ㎡
+          房间大小 {{item.RoomSize}} <span v-if="item.RoomSize">㎡</span>
           <br />
           楼层 {{item.Floor}}
           <br />
@@ -366,6 +366,9 @@
           <el-tooltip class="item" effect="dark" :content="$t('restaurant.res_bidManage')" placement="top-start">
             <el-button type="info" @click="goUrl('HotelPrice',item.ID)" icon="el-icon-document" circle></el-button>
           </el-tooltip>
+          <el-tooltip class="item" effect="dark" content="删除" placement="top-start">
+            <el-button type="danger" @click="delRoomList(item.ID)" icon="el-icon-delete" circle></el-button>
+          </el-tooltip>
         </td>
       </tr>
     </table>
@@ -574,6 +577,28 @@
           }
         }, err => {})
       },
+      //删除房型
+      delRoomList(ID){
+        var that = this;
+        that.Confirm(this.$t("tips.shifoushanchu"), function () {
+          var msg = {
+            ProductId: ID
+          };
+          that.apipost(
+            "dict_post_HotelProduct_Remove",
+            msg,
+            res => {
+              if (res.data.resultCode == 1) {
+                that.Success(res.data.message);
+                that.initData();
+              }else{
+                that.Error(res.data.message);
+              }
+            },
+            null
+          );
+        });
+      },
       saveInfo() {
         this.HotelProductTypeList.forEach(item => {
           if (this.addMsg.HotelProductType == item.Id) {

src/components/scenicSpot/domesticScenicSpotList.vue

@@ -324,7 +324,7 @@
             </el-button>
           </el-tooltip>
           <el-tooltip class="item" effect="dark" content="门票" placement="top">
-            <el-button @click="goUrlT('domesticTicketManagement',item.ID)" type="success"
+            <el-button @click="goUrlT('domesticTicketManagement',scope.row.ID)" type="success"
               icon="iconfont icon-menpiao1" circle></el-button>
           </el-tooltip>
           <el-tooltip class="item" effect="dark" content="删除" placement="top">

src/components/scenicSpot/domesticScenicSpotPackagePrice.vue

@@ -363,7 +363,7 @@ input[type="number"] {
             </el-col>
             <el-col :span="2">
               <div class="_LowDisMoney">
-                <div>内部价格</div>
+                <div>原价</div>
                 <div>{{item.SalesPrice}}</div>
               </div>
             </el-col>
@@ -447,7 +447,7 @@ input[type="number"] {
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item :label="$t('hotel.hotel_SalesPrice')" prop="SalesPrice">
+            <el-form-item label="原价" prop="SalesPrice">
               <el-input type="text" v-model="addMsg.SalesPrice" @keyup.native="checkPrice(addMsg,'SalesPrice')"></el-input>
             </el-form-item>
           </el-col>
@@ -589,7 +589,7 @@ export default {
         SalesPrice: [
           {
             required: true,
-            message: "请输入成本价格",
+            message: "请输入原价",
             trigger: "change"
           },
           {

src/components/scenicSpot/domesticTicketManagement.vue

@@ -93,10 +93,6 @@
   padding-left: 20px;
 }
 
-.ticketManagement .w300 .el-textarea__inner {
-  height: 140px;
-}
-
 .ticketManagement .el-dialog--center .el-dialog__body {
   padding: 25px 25px 0;
 }
@@ -149,16 +145,16 @@
       "
     >
       <tr>
-        <th width="200">{{ $t("scen.sc_name") }}</th>
+        <th >{{ $t("scen.sc_name") }}</th>
         <th >门票副标题</th>
         <th >是否闪入园</th>
-        <th>闪入园最晚购买时间</th>
+        <!-- <th>闪入园最晚购买时间</th> -->
         <th >是否无忧退款</th>
-        <th >可定时间</th>
+        <!-- <th >可定时间</th> -->
         <th width="200">{{ $t("scen.sc_bjts") }}</th>
         <th>{{ $t("scen.sc_dj") }}</th>
         <th>{{ $t("scen.sc_gj") }}</th>
-        <th width="300">{{ $t("hotel.hotel_remark") }}</th>
+        <!-- <th width="300">{{ $t("hotel.hotel_remark") }}</th> -->
         <th>{{ $t("system.table_operation") }}</th>
       </tr>
       <tr v-for="item in DataList" :key="item.subCode">
@@ -168,7 +164,7 @@
             effect="dark"
             :content="item.TicketName"
             placement="top-start"
-            popper-class="max-w250"
+           
           >
             <span class="roomName">{{ item.TicketName }}</span>
           </el-tooltip>
@@ -178,12 +174,12 @@
           <div v-if="item.IsSameDayBuy===0">否</div>
           <div v-if="item.IsSameDayBuy===1">是</div>
         </td>
-        <td>{{item.DayBuyTime}}</td>
+        <!-- <td>{{item.DayBuyTime}}</td> -->
         <td>
           <div v-if="item.IsWorryFreeRefund===0">是</div>
           <div v-if="item.IsWorryFreeRefund===1">有条件退</div>
         </td>
-        <td>{{item.SubscribeTime}}</td>
+        <!-- <td>{{item.AllTime}}</td> -->
         <td class="DaysInfo">
           <span
             ><i class="iconfont icon-kaoqintongji"></i>{{ item.Days
@@ -208,7 +204,7 @@
           </p>
           <p class="Ldata">{{ item.HDate }}</p>
         </td>
-        <td>
+        <!-- <td>
           <el-tooltip
             class="item"
             effect="dark"
@@ -219,7 +215,7 @@
           >
             <span class="descripTion">{{ item.TicketDesc }}</span>
           </el-tooltip>
-        </td>
+        </td> -->
         <td>
           <el-button-group>
             <el-tooltip
@@ -280,6 +276,7 @@
             class="w300"
             filterable
             v-model="addMsg.CouponsId"
+            disabled
           >
             <el-option
               v-for="item in TicketCouponsList"
@@ -320,7 +317,7 @@
           <el-radio v-model="addMsg.IsSameDayBuy" :label="1">是</el-radio>
           <el-radio v-model="addMsg.IsSameDayBuy" :label="0">否</el-radio>
         </el-form-item>
-        <el-form-item label="闪入园最晚购买时间" prop="DayBuyTime">
+        <el-form-item label="购买时间" prop="DayBuyTime">
           <el-time-select
                 v-model="addMsg.DayBuyTime"
                 :picker-options="{
@@ -328,11 +325,11 @@
                   step: '00:15',
                   end: '23:45',
                 }"
-                placeholder="闪入园最晚购买时间"
+                placeholder="购买时间"
               >
             </el-time-select>
         </el-form-item>
-        <el-form-item label="是否无忧退款" prop="IsWorryFreeRefund">
+        <el-form-item label="无忧退款" prop="IsWorryFreeRefund">
           <el-radio v-model="addMsg.IsWorryFreeRefund" :label="1"
             >有条件退</el-radio
           >
@@ -650,14 +647,14 @@
             </el-form-item>
           </div>
         </template>
-        <el-form-item :label="$t('hotel.hotel_produceDes')" prop="TicketDesc">
+        <!-- <el-form-item :label="$t('hotel.hotel_produceDes')" prop="TicketDesc">
           <el-input
             class="w300"
             type="textarea"
             v-model="addMsg.TicketDesc"
             maxlength="200"
           ></el-input>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <button
@@ -909,7 +906,7 @@ export default {
     clearMsg() {
       let newMsg = {
         Id: "0",
-        CouponsId: "",
+        CouponsId: parseInt(this.$route.query.id),
         TicketName: "",
         TicketDesc: "",
         TicketCouponsType: "",

src/plug/index.js

@@ -118,7 +118,7 @@ export default {
         let locationName = window.location.hostname;
         // domainUrl = "http://127.0.0.1";
         domainUrl="http://192.168.20.17:8015";
-        domainUrl = "http://192.168.20.24";
+        // domainUrl = "http://192.168.20.24";
         let javaUrldo = "";
         javaUrldo = locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000";
         //商城API