no message

src/assets/utils/tripUtils.js

@@ -786,9 +786,8 @@ var tripUtils = {
     if (B2BDomain) {
       var url = "http://" + B2BDomain;
       window.open(
-        url + '/#/OneDayDetailTwo/' +
-        encodeURIComponent(ConfigId) + '/' + tcid +
-        '/preview',
+        url + '/#/detail/XXcsyIZsyIY%3D/' +
+        encodeURIComponent(ConfigId) + '/' + tcid,
         '_blank'
       )
     }
@@ -798,11 +797,10 @@ var tripUtils = {
     if (B2BDomain) {
       var url = "http://" + B2BDomain;
       window.open(
-        url + "/#/detailTwo/" +
+        url + "/#/detail/XXcsyIZsyIY%3D/" +
         encodeURIComponent(ConfigId) +
         "/" +
-        tcid +
-        "/preview",
+        tcid,
         "_blank"
       );
     }
@@ -812,8 +810,7 @@ var tripUtils = {
         if (B2BDomain) {
           var url = "http://" + B2BDomain;
           window.open(
-            url + "/#/details/" +
-            encodeURIComponent(ConfigId) +
+            url + "/#/details/" +-encodeURIComponent(ConfigId) +
             "/" +
             tcid ,
             "_blank"

src/components/SalesModule/productQueryOne.vue

@@ -1331,11 +1331,13 @@
     },
     methods: {
       goB2Bdetail(ConfigId, tcid) {
-        var url = "http://" + 'www.oytour.com';
-        window.open(
-          url + "/#/detail/XXcsyIZsyIY%3D/" +tcid +"/" +encodeURIComponent(ConfigId),
-          "_blank"
-        );
+        var B2BDomain = this.CurrentUserInfo.B2BDomain//'www.oytour.com';
+        this.$tripUtils.GotoB2BPage(B2BDomain,encodeURIComponent(ConfigId),tcid);
+        // var url = "http://" + 'www.oytour.com';
+        // window.open(
+        //   url + "/#/detail/XXcsyIZsyIY%3D/" +tcid +"/" +encodeURIComponent(ConfigId),
+        //   "_blank"
+        // );
       },
       getCountry() {
         //获取国家

src/components/scenicSpot/scenicSpotInfoManage.vue

@@ -858,6 +858,17 @@
               </div>
             </div>
           </div>
+          <el-form-item
+            label="自取地址"
+            prop="SelffetchAddress"
+          >
+            <el-input
+              type="text"
+              v-model="addMsg.SelffetchAddress"
+              maxlength="100"
+              class="w300"
+            ></el-input>
+          </el-form-item>
           <el-form-item
             :label="$t('restaurant.res_BusinessHours')"
             prop="OpeningHours"
@@ -888,14 +899,14 @@
           <span class="resource-lititle sheshi">景点门票类型</span>
           <div class="res-span margin-bottom">
             <el-tree
-  :data="categoryTree" default-expand-all
-  :props="{label: 'CategoryName', children: 'SubList'}"
-  show-checkbox
-  node-key="Id"
-  ref="treeForm"
-  @check-change="handleNodeClick"
-  >
-</el-tree>
+            :data="categoryTree" default-expand-all
+            :props="{label: 'CategoryName', children: 'SubList'}"
+            show-checkbox
+            node-key="Id"
+            ref="treeForm"
+            @check-change="handleNodeClick"
+            >
+          </el-tree>
           </div>
           <span class="resource-lititle sheshi">{{
             $t("restaurant.res_detailInformation")
@@ -1362,6 +1373,7 @@ export default {
         PlayTimeHour: "", //游玩小时
         PlayTimeMinutes: "", //游玩分钟
         IsIncludeLeader: 0, //是否包含领队:0-包含,1-不包含
+        SelffetchAddress:'',//邮寄地址
       },
       rules: {
         //表单必填验证
@@ -1411,6 +1423,13 @@ export default {
             trigger: "change",
           },
         ],
+        SelffetchAddress: [
+          {
+            required: true,
+            message: "请输入邮寄地址",
+            trigger: "blur"
+          }
+        ],
       },
     };
   },

src/components/scenicSpot/scenicSpotPackagePrice.vue

@@ -474,6 +474,11 @@ input[type="number"] {
               <el-input v-model='addMsg.CurrentRate' @keyup.native="checkRate(addMsg,'CurrentRate')"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item label="邮寄费" prop="MailingMoney">
+              <el-input v-model='addMsg.MailingMoney' @keyup.native="checkRate(addMsg,'MailingMoney')"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item :label="$t('hotel.hotel_remark')" prop="Remark">
               <el-input type="textarea" v-model="addMsg.Remark"></el-input>
@@ -525,7 +530,8 @@ export default {
         StartDate: "",
         EndDate: "",
         CurrencyId: 0,
-        CurrentRate: 0.0
+        CurrentRate: 0.0,
+        MailingMoney: null,//邮寄费
       },
       rules: {
         //表单必填验证
@@ -617,7 +623,18 @@ export default {
             message: "请输输入汇率",
             trigger: "change"
           }
-        ]
+        ],
+        MailingMoney: [
+          {
+            required: true,
+            message: "请输入邮寄费",
+            trigger: "blur"
+          },
+          {
+            pattern: this.$commonUtils.Regex.el_Isdecimal,
+            message: "请输入两位小数"
+          }
+        ],
       },
       msg: {
         pageIndex: 1,