no message

src/components/SalesModule/enrollTotal.vue

@@ -809,7 +809,7 @@
           <td v-if="isEditOrderCreate == 1">
             <button
               class="normalBtn"
-              style="margin-left: 0; width: 95px; padding: 0"
+              style="margin-left: 0; padding: 0"
               @click="getSalerInfo(item)"
             >
               {{ $t("salesModule.UpdateYWY") }}

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1784,7 +1784,7 @@
           <th width="200">操作</th>
         </tr>
         <tr>
-          <td v-show="list.length == 0" colspan="17" align="center">
+          <td v-show="list.length == 0" colspan="18" align="center">
             暂无数据
           </td>
         </tr>

src/components/SalesModule/productQuery2.vue

@@ -446,7 +446,7 @@
       layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
     </el-pagination>
     <!-- 产品列表 -->
-    <productOrderList :loading="loading" :list="list" @success="reSearchPage"></productOrderList>
+    <productOrderList :loading="loading" :list="list" @success="reSearchPage" :pagesTitle="pagesTitle"></productOrderList>
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
       layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
     </el-pagination>
@@ -460,6 +460,7 @@
   export default {
     data() {
       return {
+        pagesTitle: '跟团游产品',
         //当前登录用户信息
         CurrentUserInfo: {},
         userId: "",

src/components/orderCommon/order-form.vue

@@ -42,7 +42,8 @@
           <!-- 客户类型 -->
           <el-form-item :label="$t('fnc.khleixing')" prop="CustomerType">
             <el-select v-model="addMsg.CustomerType" filterable :placeholder="$t('pub.pleaseSel')" @change="
-                  resetMsg(addMsg.CustomerType); getTypePrice();
+                  resetMsg(addMsg.CustomerType);
+                  getTypePrice();
                   resetSelect();
                   getClientSource();
                   getCustomer();
@@ -52,6 +53,8 @@
               </el-option>
             </el-select>
           </el-form-item>
+        </el-col>
+        <el-col :span="4" v-if="pagesTitle=='跟团游产品'">
           <!-- 参团类型 -->
           <el-form-item :label="$t('fnc.ctleixing')" prop="GroupType">
             <el-select v-model="addMsg.GroupType" @change="changeGroupType(addMsg.GroupType)" filterable
@@ -61,8 +64,10 @@
               </el-option>
             </el-select>
           </el-form-item>
+        </el-col>
+        <el-col :span="4" v-if="addMsg.GroupType == '3'">
           <!--自由行占床不占床0-占床，1-不占床-->
-          <el-form-item v-if="addMsg.GroupType == '3'" :label="$t('salesModule.IsUseRoom')" prop="GroupTypeNeedHouse">
+          <el-form-item :label="$t('salesModule.IsUseRoom')" prop="GroupTypeNeedHouse">
             <el-switch v-model="addMsg.GroupTypeNeedHouse" active-value="0" inactive-value="1"></el-switch>
           </el-form-item>
         </el-col>
@@ -95,7 +100,7 @@
             <el-input v-model="addMsg.IndustryCategory"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="4" v-if="showCity">
+        <el-col :span="4" v-if="showCity&&pagesTitle=='跟团游产品'">
           <!--出发城市-->
           <el-form-item :label="$t('system.table_goCity')" prop="DepartureCityId">
             <el-select v-model="addMsg.DepartureCityId" :disabled="
@@ -123,7 +128,7 @@
               type="date" @change="getUnionTravelPrice(priceObj, 1)"></el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="4" v-if="showCity">
+        <el-col :span="4" v-if="showCity&&pagesTitle=='跟团游产品'">
           <!--返回城市-->
           <el-form-item :label="$t('salesModule.BackCity')" prop="ReturnArriveCityId">
             <el-select v-model="addMsg.ReturnArriveCityId" :disabled="
@@ -151,7 +156,9 @@
         </el-col>
         <el-col :span="4">
           <el-form-item :label="$t('salesModule.TeamPrice')" prop="TC_Price">
-            <el-input v-if="addMsg.GroupType != 4" v-model="addMsg.TC_Price" @input="getTotalPrice()">
+            <el-input v-if="addMsg.GroupType != 4" v-model="addMsg.TC_Price" 
+            :disabled="pagesTitle=='跟团游产品'?false:true" 
+            @input="getTotalPrice()">
             </el-input>
             <el-input v-else v-model="SingleDMCPricex" :disabled="true" @input="getTotalPrice()"></el-input>
           </el-form-item>
@@ -169,7 +176,6 @@
           </el-form-item>
         </el-col>
         <el-col :span="4">
-          <template>
             <el-form-item :label="$t('fnc.cjdanjia')" prop="Unit_Price" v-if="HightUnitPrice === '2'">
               <el-select v-model="addMsg.Unit_Price" filterable :placeholder="$t('pub.pleaseSel')"
                 @change="getTotalPrice(2)">
@@ -182,7 +188,6 @@
               </el-input>
               <el-input v-else v-model="SingleDMCPrice" @change="getTotalPrice(3)"></el-input>
             </el-form-item>
-          </template>
           <!--高于本团单价-->
           <el-form-item :label="$t('salesModule.UpTeamPrice')" v-show="addMsg.GroupType != '4'">
             <el-switch v-model="HightUnitPrice" active-value="1" inactive-value="2"></el-switch>
@@ -222,6 +227,7 @@
                 "></el-input>
           </el-form-item>
         </el-col>
+        <template v-if="pagesTitle=='跟团游产品'">
         <el-col :span="4">
           <p v-if="priceObj.IsSupportChildren == 2"
             style="color:#e95252;font-size:12px;line-height:40px;text-align:center; ">
@@ -249,6 +255,16 @@
                 "></el-input>
           </el-form-item>
         </el-col>
+        </template>
+        <template v-if="pagesTitle=='当地游产品'">
+          <el-col :span="4">
+            <p v-if='priceObj.IsSupportChildren==2' style="color: #E95252; font-size: 12px; line-height: 40px; text-align: center;">{{$t('salesModule.NoSupplier')}}!</p>
+            <el-form-item v-if='priceObj.IsSupportChildren==1' v-show="addMsg.GroupType !== '4'" :label="$t('salesModule.ChildNum')" prop="ChirdNoNeedBedNum">
+              <el-input v-model='addMsg.ChirdNum' :disabled="addMsg.GroupType==='4'" @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
+                @input='getNumber();getHouseNo();getTotalPrice();autoRemarks("ChirdNoNeedBedNum","儿童人数");' @change="getNumGuest"></el-input>
+            </el-form-item>
+          </el-col>
+        </template>
         <el-col :span="4" v-if="priceObj.IsSupportChildren == 1" v-show="addMsg.GroupType !== '4'">
           <el-form-item :label="$t('salesModule.BabyNum')" prop="BabyNum">
             <el-input v-model="addMsg.BabyNum" :disabled="addMsg.GroupType === '4'"
@@ -259,6 +275,7 @@
                 "></el-input>
           </el-form-item>
         </el-col>
+        <template v-if="pagesTitle=='跟团游产品'">
         <el-col :span="4" v-show="addMsg.GroupType !== '4'">
           <el-form-item :label="$t('salesModule.OldPeopleNum')" prop="OldPeopleNum">
             <el-input v-model="addMsg.OldPeopleNum" :disabled="addMsg.GroupType === '4'"
@@ -270,8 +287,10 @@
                 "></el-input>
           </el-form-item>
         </el-col>
+        </template>
       </el-row>
       <el-row :gutter="20">
+        <template v-if="pagesTitle=='跟团游产品'">
         <el-col :span="4" v-if="addMsg.GroupTypeNeedHouse == '0'">
           <el-form-item :label="$t('salesModule.SingleRoomNum')" prop="SingleRoomNum">
             <el-input v-model="addMsg.SingleRoomNum" @keyup.native="checkInteger(addMsg, 'SingleRoomNum')" @input="
@@ -299,7 +318,8 @@
                 "></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="4">
+      </template>
+        <el-col :span="4" v-if="pagesTitle=='跟团游产品'">
           <el-form-item :label="$t('salesModule.VisaNum')" prop="VisaNum">
             <el-input v-model="addMsg.VisaNum" @keyup.native="checkInteger(addMsg, 'VisaNum')" @input="
                   yzVisaNum();
@@ -308,7 +328,7 @@
                 "></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="4" v-if="showCity">
+        <el-col :span="4" v-if="showCity||pagesTitle=='当地游产品'">
           <el-form-item :label="$t('salesModule.SaleNum')" prop="SaleNum">
             <el-input v-model="addMsg.SafeNum" @keyup.native="checkInteger(addMsg, 'SafeNum')" @input="
                   yzSafeNum();
@@ -316,7 +336,7 @@
                 "></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="4">
+        <el-col :span="4" v-if="pagesTitle=='跟团游产品'">
           <el-form-item :label="$t('salesModule.SingleFM')">
             <el-radio v-model="addMsg.OneSex" label="1">{{ $t("pub.man") }}
             </el-radio>
@@ -326,6 +346,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="20">
+        <template v-if="pagesTitle=='跟团游产品'">
         <el-col :span="4" v-if="addMsg.GroupTypeNeedHouse == '0'">
           <el-form-item :label="$t('salesModule.PredictRoomNum')" prop="PredictRoomNum">
             <el-input v-model="addMsg.PredictRoomNum" :disabled="true"></el-input>
@@ -336,6 +357,7 @@
             <el-input v-model="addMsg.PreferPrice" :disabled="true"></el-input>
           </el-form-item>
         </el-col>
+        </template>
         <el-col :span="4" v-show="addMsg.CustomerType == 1 || addMsg.CustomerType == 2">
           <el-form-item :label="$t('salesModule.SharePeople')" prop="CommissionSharePeople">
             <el-select :disabled="isUpdateSharePeople" filterable clearable @change="getTotalPrice"
@@ -355,6 +377,7 @@
         <el-col :span="4"> &nbsp; </el-col>
       </el-row>
       <el-row :gutter="20">
+        <template v-if="pagesTitle=='跟团游产品'">
         <el-col :span="4">
           <el-form-item :label="$t('Airticket.Air_EconomyClass')" prop="YSeatNum">
             <el-input v-model="addMsg.YSeatNum" @keyup.native="checkInteger(addMsg, 'YSeatNum')"></el-input>
@@ -370,12 +393,13 @@
             <el-input v-model="addMsg.FSeatNum" @input="getNumber()"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="4">
-          <!--<el-form-item label="单地接数量" prop="AirticketNum">
+        </template>
+        <!--<el-col :span="4">
+          <el-form-item label="单地接数量" prop="AirticketNum">
 						   <el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')"    @input='getTotalPrice();getHouseNo()'></el-input>
-						</el-form-item>-->
-        </el-col>
-        <el-col :span="4" v-if="showCity">
+						</el-form-item>
+        </el-col>-->
+        <el-col :span="4" v-if="showCity&&pagesTitle=='跟团游产品'">
           <el-form-item :label="$t('salesModule.ScenicRefund')">
             <el-select filterable multiple class="multiple_input" v-model="addMsg.ScenicRefundArr"
               :placeholder="$t('pub.pleaseSel')" @change="ScenicRefundMethods">
@@ -384,7 +408,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="4" v-if="showCity">
+        <el-col :span="4" v-if="showCity||pagesTitle=='当地游产品'">
           <el-form-item :label="$t('salesModule.MsgMoney')">
             <el-select filterable v-model="addMsg.IsShowMessagesMoney" :placeholder="$t('pub.pleaseSel')">
               <el-option :label="$t('system.table_isShows')" value="1"></el-option>
@@ -466,32 +490,15 @@
 <script>
   export default {
     //团期编号，订单编号(新增传0),下单人选择的公司
-    props: {
-      showCity: {
-        type: Boolean,
-        default: true,
-        },
-      PTCID: {
-        type: Number,
-        default: 0, //团期编号(必须传)
-      },
-      POrderId: {
-        type: Number,
-        default: 0, //订单编号(新增传0)
-      },
-      PBranchId: {
-        type: Number,
-        default: 0, //销售公司/联运公司
-      },
-      PProductType: {
-        type: Number,
-        default: 0, //产品类型(1-常规团，2-包机团)
-      },
-      productObj:{
-        type: Object,
-        default: {},
-      }
-    },
+    props: [
+      'showCity',
+      'PTCID',//团期编号(必须传),
+      'POrderId',//订单编号(新增传0)
+      'PBranchId', //销售公司/联运公司
+      'PProductType', //产品类型(1-常规团，2-包机团)
+      'productObj',
+      'pagesTitle'
+    ],
     data() {
       return {
         pickerOptions0: {
@@ -660,24 +667,6 @@
         crmOrderObj: null
       };
     },
-    filters: {
-      //价格格式化
-      priceFormat(value) {
-        if (value == null) {
-          return 0.00;
-        }
-        let nStr = value.toFixed(2)
-        nStr += '';
-        let x = nStr.split('.');
-        let x1 = x[0];
-        let x2 = x.length > 1 ? '.' + x[1] : '';
-        var rgx = /(\d+)(\d{3})/;
-        while (rgx.test(x1)) {
-          x1 = x1.replace(rgx, '$1' + ',' + '$2');
-        }
-        return x1 + x2;
-      },
-    },
     methods: {
       //参团类型切换
       changeGroupType(type) {
@@ -717,7 +706,7 @@
         this.addMsg.GroupTypeNeedHouse = "0";
       },
       //验证签证人数
-      yzVisaNum: function () {
+      yzVisaNum() {
         let ChirdNum = Number(this.addMsg.ChirdNum);
         //地接
         if (this.addMsg.GroupType == 4) {
@@ -731,7 +720,7 @@
         }
       },
       //验证保险人数
-      yzSafeNum: function () {
+      yzSafeNum() {
         let ChirdNum = Number(this.addMsg.ChirdNum);
         //单地接
         if (this.addMsg.GroupType == 4) {
@@ -779,7 +768,7 @@
         this.autoRemarks("TripleRoomNum", "三人房");
       },
       // 自动添加备注
-      autoRemarks: function (key, text) {
+      autoRemarks(key, text) {
         let count = Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) +
           Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum);
         this.remarkMsg.qz = "";
@@ -1075,6 +1064,11 @@
       },
       //计算少价金额
       getTypePrice() {
+        if(this.pagesTitle=='当地游产品'){
+          this.addMsg.ContactName = ''
+          this.addMsg.ContactMobile = ''
+        }
+        
         if (this.addMsg.CustomerType == 1) {
           this.addMsg.TC_Price = this.priceObj.B2BMemberPrice;
           this.addMsg.Unit_Price = this.priceObj.B2BMemberPrice;
@@ -1407,6 +1401,9 @@
           qz: "",
           qzf: "",
         }
+        if(this.pagesTitle=='当地游产品'){
+          this.addMsg.GroupType = "1"
+        }
         this.clientSourceList = [];
         this.addMsg.ScenicRefundArr = [];
       },
@@ -1804,14 +1801,6 @@
       this.getCityList();
       //获取交易方式
       this.getTradeWay();
-
-      // crm自动登陆传过来的参数
-      if (this.$route.query.crmOrderObj) {
-        this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
-        this.addMsg.LureEmpId = this.crmOrderObj.LureEmpId //引流id
-        this.addMsg.CRMGuestId = this.crmOrderObj.CRMGuestId //客人ID
-      }
-      
     },
     watch: {
       productObj:{
@@ -1822,6 +1811,17 @@
           this.addMsg.ReturnArriveCityId = oldValue.ReturnArriveCityId
           this.addMsg.GoCityTime = this.starTime = oldValue.StartCityTime;
           this.addMsg.BackCityTime = this.endTime = oldValue.BackCityTime;
+          this.priceObj = JSON.parse(JSON.stringify(oldValue))
+          if(this.pagesTitle=='当地游产品'){
+            let str = ''
+            if (oldValue.OtherPrice > 0) {
+              str += '杂费' + oldValue.OtherPrice + '/人;'
+            }
+            this.addMsg.Remarks = str
+            this.otherRemark = str;
+            this.SingleDMCPrice = oldValue.SingleDMCPrice;
+            this.SingleDMCPricex = oldValue.SingleDMCPrice;
+          }
           // crm自动登陆传过来的参数
           if (this.$route.query.crmOrderObj) {
             this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)

src/components/orderCommon/productOrderList.vue

@@ -246,7 +246,7 @@
     }
   
     .productQueryList li .d7 {
-      width: auto;
+      width: 10%;
       min-width: 160px;
       text-align: center;
       padding: 40px 20px;
@@ -470,13 +470,13 @@
               <div v-if="item.IsB2B === 0" class="product_union1"></div>
               <div v-if="item.IsUnionTravel === 1" class="product_union"></div>
               <div v-if="item.IsWarning === 1" class="product_warning"></div>
-              <div class="d12" style="float: none; margin: auto">
+              <div class="d12" style="float: none; margin: auto" :style="{'width': pagesTitle=='跟团游产品'?'200px':'auto'}">
                 <p><i class="iconfont icon-biaoti1"></i> {{ item.LineName }}</p>
                 <p class="d12TC">{{ item.TCNUM }}（{{ item.TCID }}）</p>
                 <p>{{ item.LtName }}</p>
                 <el-tooltip class="item" effect="dark" :content="item.Title" placement="top-start"
                   popper-class="max-w250">
-                  <p class="d12p" @click="getJourney(item.ConfigID, item.TCID, item.LineName)" :title="item.Title">
+                  <p class="d12p" @click="getTitledetail(item.ConfigID)" :title="item.Title">
                     {{ item.Title }}
                   </p>
                 </el-tooltip>
@@ -489,7 +489,7 @@
                 </p>
               </div>
             </div>
-            <div class="d2">
+            <div class="d2" v-if="pagesTitle=='跟团游产品'">
               <p style="text-align: left; text-indent: 50px">
                 <i class="iconfont icon-hangban1"></i>{{ $t("salesModule.GoFlight") }}
               </p>
@@ -577,7 +577,7 @@
                 </div>
               </div>
             </div>
-            <div class="d3">
+            <div class="d3" v-if="pagesTitle=='跟团游产品'">
               <p>
                 <i class="iconfont icon-tuandui"></i>{{ $t("visa.v_teaminfo")
                 }}<em>{{ item.DayNum }}{{ $t("hotel.hotel_day") }}{{ item.NightNum
@@ -642,19 +642,19 @@
                 <el-popover width="630" trigger="click">
                   <table class="PQ_detail">
                     <tr>
-                      <td colspan="6" style="text-align: left; padding-left: 10px">
+                      <td :colspan="pagesTitle=='跟团游产品'?'6':'5'" style="text-align: left; padding-left: 10px">
                         {{ $t("salesModule.BasePrice") }}
                       </td>
                     </tr>
                     <tr>
-                      <th>{{ $t("advmanager.v_type") }}</th>
+                      <th v-if="pagesTitle=='跟团游产品'">{{ $t("advmanager.v_type") }}</th>
                       <th>{{ $t("salesModule.HYTHJ") }}</th>
                       <th>{{ $t("salesModule.PTTHJ") }}</th>
                       <th>{{ $t("salesModule.ZKHYJ") }}</th>
                       <th colspan="2">{{ $t("salesModule.PTZKJ") }}</th>
                     </tr>
                     <tr>
-                      <td>{{ $t("salesModule.Adult") }}</td>
+                      <td v-if="pagesTitle=='跟团游产品'">{{ $t("salesModule.Adult") }}</td>
                       <td>
                         {{
                           item.B2BMemberPrice | priceFormat(item.B2BMemberPrice)
@@ -668,6 +668,7 @@
                       </td>
                       <td colspan="2">{{ item.B2CPrice | priceFormat(item.B2CPrice) }}</td>
                     </tr>
+                    <template v-if="pagesTitle=='跟团游产品'">
                     <tr>
                       <td>{{ $t("salesModule.ChildBed") }}</td>
                       <td>
@@ -786,6 +787,7 @@
                       </td>
                       <td>{{ item.TipAmount?item.TipAmount:'0.00' }}</td>
                     </tr>
+                  </template>
                   </table>
                   <span slot="reference" class="price">{{
                     $t("Operation.Op_priceDetail")
@@ -816,11 +818,11 @@
                   $t("salesModule.RefuseHB")
                 }}</em>
               </p>
-              <p>
+              <p v-if="pagesTitle=='跟团游产品'">
                 <span>操作OP</span><i style="font-weight: normal">{{ item.OPName }}</i>
               </p>
             </div>
-            <div class="d8">
+            <div class="d8" v-if="pagesTitle=='跟团游产品'">
               <p>
                 <i class="iconfont icon-hangban1"></i>{{ $t("Operation.Op_Warmprompt") }}
               </p>
@@ -865,18 +867,18 @@
               <el-button-group style="display: block">
                 <el-tooltip class="item" effect="dark" :content="$t('salesModule.LookBM')" placement="top-start">
                   <el-button @click="
-                      goUrl('groupTourOrderByTuan', item.TCID, item.TCNUM)
-                    " type="primary" style="background: #00c6ff; border-color: #00c6ff" icon="iconfont icon-sousuo">
+                      goUrl(item.TCID, item.TCNUM)
+                    " type="primary" style="background-color: #00c6ff !important; border-color: #00c6ff !important" icon="iconfont icon-sousuo">
                   </el-button>
                 </el-tooltip>
                 <!--关内团后不能在报名 hk 2022-07-13去掉 && item.IsB2B === 1 修改为可报名 -->
                 <el-tooltip class="item" effect="dark" :content="$t('salesModule.LJXD')" placement="top-start"
                   v-if="item.IsPayOrder !== 1 ">
-                  <el-button type="primary" style="background: #f16c3c; border-color: #f16c3c" v-if="!TCIDList"
+                  <el-button type="primary" style="background-color: #f16c3c !important; border-color: #f16c3c !important" v-if="!TCIDList"
                     icon="iconfont icon-fukuan1" @click="goBuy(item)"></el-button>
                 </el-tooltip>
                 <el-tooltip class="item" effect="dark" :content="$t('Operation.Op_tripDownLoad')" placement="top-start">
-                  <el-button @click="toTrip(item)" type="primary" style="background: #47bf8c; border-color: #47bf8c"
+                  <el-button @click="toTrip(item)" type="primary" style="background-color: #47bf8c !important; border-color: #47bf8c !important"
                     icon="iconfont icon-xiazai"></el-button>
                 </el-tooltip>
                 <el-tooltip v-if="
@@ -886,7 +888,7 @@
                     item.LineID != 8
                   " class="item" effect="dark" content="直客版预览" placement="top-start">
                   <el-button @click.native="goB2B(item)" type="primary"
-                    style="background: #f16c3c; border-color: #f16c3c" icon="iconfont icon-view"></el-button>
+                    style="background-color: #f16c3c !important; border-color: #f16c3c !important" icon="iconfont icon-view"></el-button>
                 </el-tooltip>
               </el-button-group>
               <el-button-group v-show="qjGroupId == userInfo.RB_Group_id || S_Travel_Share" style="display: block">
@@ -909,8 +911,8 @@
                       </p>
                     </div>
                     <el-button slot="reference" type="primary" style="
-                        background: #b552e9;
-                        border-color: #b552e9;
+                        background-color: #b552e9 !important;
+                        border-color: #b552e9 !important;
                         border-radius: 0;
                         border-top-left-radius: 4px;
                         border-bottom-left-radius: 4px;
@@ -932,14 +934,14 @@
                       </p>
                     </div>
                     <el-button slot="reference" type="primary" style="
-                        background: #e6a014;
-                        border-color: #e6a014;
+                        background-color: #e6a014 !important;
+                        border-color: #e6a014 !important;
                         border-radius: 0;
                       " icon="iconfont icon-erweima"></el-button>
                   </el-popover>
                 </el-tooltip>
                 <el-tooltip class="item" effect="dark" :content="'广告数量' + item.AdvertCount" placement="top-start">
-                  <el-button type="primary" style="background: #e95252; border-color: #e95252" v-if="!TCIDList"
+                  <el-button type="primary" style="background-color: #e95252 !important; border-color: #e95252 !important" v-if="!TCIDList"
                     icon="iconfont icon-guanggao" @click="goUrlX(item)"></el-button>
                 </el-tooltip>
               </el-button-group>
@@ -983,7 +985,8 @@
       :PBranchId="0" 
       :PProductType="1" 
       :showCity="true"
-      :productObj="teamInfo">
+      :productObj="teamInfo"
+      :pagesTitle="pagesTitle">
       </orderForm>
     </div>
     </div>
@@ -997,7 +1000,7 @@
     import orderForm from "./order-form.vue";
   
     export default {
-        props:['loading','list'],
+        props:['loading','list','pagesTitle'],
       data() {
         return {
           //当前登录用户信息
@@ -1129,7 +1132,14 @@
         hideTripDown() {
           this.travelControlTripLayerShow = false;
         },
-        goUrl(path, id, tcmun) {
+        goUrl(id, tcmun) {
+          let path
+          if(this.pagesTitle=='跟团游产品'){
+            path = 'groupTourOrderByTuan'
+          }
+          if(this.pagesTitle=='当地游产品'){
+            path = 'groupTourOrderByTuanOne'
+          }
           this.$router.push({
             name: path,
             query: {
@@ -1159,6 +1169,18 @@
           this.teamInfo = obj;
           this.isShowTeamOrder = true;
         },
+        // 产品详情
+        getTitledetail(item){
+          if(this.pagesTitle=='跟团游产品'){
+            this.getJourney(item.ConfigID, item.TCID, item.LineName)
+          }if(this.pagesTitle=='当地游产品'){
+            this.goB2Bdetail(item.ConfigID, item.TCID)
+          }
+        },
+        goB2Bdetail(ConfigId, tcid) {
+          var B2BDomain = this.CurrentUserInfo.B2BDomain//'www.oytour.com';
+          this.$tripUtils.GotoB2BPage(B2BDomain,encodeURIComponent(ConfigId),tcid);
+       },
         getJourney(id, TCID, title) {
           var that = this;
           this.tripTitle = title;