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

src/App.vue

@@ -173,7 +173,7 @@ export default {
 }
 </script>
 <style>
-  @import "//at.alicdn.com/t/font_635492_rcf1gwtw66.css";
+  @import "//at.alicdn.com/t/font_635492_rwoxda6u56n.css";
   @import "./assets/css/Semibold.css";
   @import "./assets/css/global/config.css";
   @import "./assets/css/fileIcon.css";

src/components/newTravelmanager/travelLineTrip/ScenicTraffic.vue

@@ -13,32 +13,32 @@
     position: relative;
   }
 
-  .St_radioDiv {
+  .St_mainDiv .St_radioDiv {
     position: absolute;
-    width: 12px;
-    height: 12px;
-    background-color: rgb(11, 189, 135);
-    left: -27px;
-    top: 3px;
+    width: 25px;
+    height: 25px;
+    text-align: center;
+    line-height: 25px;
+    background-color: #fff;
+    border:1px solid rgb(11, 189, 135);
+    left: -33px;
+    top: -2px;
     border-radius: 50%;
   }
 
-  .St_current {
+  .St_mainDiv .St_current {
     position: relative;
   }
 
-  .St_current:last-child {
+  .St_mainDiv .St_current:last-child {
     margin-bottom: 0 !important;
   }
-
-  .St_current:last-child .St_radioDiv {
-    top: 7px;
+  .St_mainDiv .St_uploadContent {
+    display:inline-block;
   }
-
-  .Str1 {
-    top: 0;
+  .St_mainDiv .St_uploadContent span{
+    color:#409eff;
   }
-
 </style>
 <template>
   <div class="TC-ScenicTraffic">
@@ -46,7 +46,7 @@
       <div v-if="!ishasScenic">
         <div v-if="CurrentDayNum!=1" class="St_current" style="margin-bottom:20px;">
           <div class="St_radioDiv Str1"></div>
-          酒店出发
+          酒店出发1
         </div>
         <div class="St_current" style="margin-bottom:10px">
           <template
@@ -67,24 +67,39 @@
       </div>
       <div v-else>
         <div v-if="CurrentDayNum!=1" class="St_current" style="margin-bottom:20px;">
-          <div class="St_radioDiv Str1"></div>
+          <div class="St_radioDiv Str1">
+            <i class="iconfont icon-hotel"></i>
+          </div>
           酒店出发
         </div>
         <div v-for="(item,index) in ScenicArray" :key="index">
           <div style="margin:10px 0" class="St_current">
-            <div class="St_radioDiv"></div>
+            <div class="St_radioDiv">
+              <i class="iconfont icon-jingdian"></i>
+            </div>
             {{item.CouponsName}}
           </div>
           <div>
-            <el-select :placeholder="$t('pub.pleaseSel')" v-model="item.TrafficType">
+            <el-select :placeholder="$t('pub.pleaseSel')" class="w150" v-model="item.TrafficType">
               <el-option v-for="subItem in ArrivalTypeArray" :value="subItem.ID" :key="subItem.ID"
                 :label="subItem.Name">
               </el-option>
             </el-select>
+            <el-upload v-if="item.TrafficType==3" class="St_uploadContent"
+                :http-request="uploadFileBtn"
+                :multiple="false"
+                :show-file-list="false"
+                action
+              >
+              <span>上传</span>
+            </el-upload>
+            <el-input class="w180" v-if="item.TrafficType==4" placeholder="距离预计用时"></el-input>
           </div>
         </div>
         <div v-if="CurrentDayNum!=totalDayNum" class="St_current" style="margin:20px 0">
-          <div class="St_radioDiv"></div>
+          <div class="St_radioDiv">
+            <i class="iconfont icon-hotel"></i>
+          </div>
           回酒店
         </div>
       </div>
@@ -140,6 +155,39 @@
       "my-edit": MyEdit
     },
     methods: {
+          //上传图片
+    uploadFileBtn(file) {
+      //上传
+      if (file.file.size > 1024 * 1024 * 10) {
+        this.$message.warning(this.$t("tips.wjdxbncgsz"));
+        return;
+      }
+      //  1 文档  2 数据 3 图片
+      let typeArr = [{ stringArr: "GIF|JPG|JPEG|PNG|BMP", type: 3 }];
+      let ft = file.file.name
+        .substring(file.file.name.lastIndexOf(".") + 1, file.file.name.length)
+        .toUpperCase();
+      let fileTypeNumber = 2;
+      let typeOk = false;
+      typeArr.forEach(x => {
+        if (x.stringArr.indexOf(ft) != "-1") {
+          fileTypeNumber = x.type;
+          typeOk = true;
+        }
+      });
+      if (!typeOk) return this.Error(this.$t("tips.qsctpian"));
+      let newArr = [];
+      newArr.push(file.file);
+      let path = "/Upload/activity/";
+      this.UploadSelfFileT(path, newArr, x => {
+        let fileSize =
+          file.file.size < 1024
+            ? file.file.size
+            : (file.file.size / 1024).toFixed(0);
+
+        this.Success(this.$t("tips.scchenggong"));
+      });
+    },
 
     },
     mounted() {},

src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue

@@ -161,13 +161,13 @@
                 <span style="float: right; color: #8492a6; font-size: 13px">{{ item.Inventory }}</span>
               </el-option>
             </el-select>
-             <el-popover placement="right" width="500" trigger="click" >
+             <el-popover placement="right" width="430" trigger="click" >
                 <scenicTraffic :ref="'scenicTraffic'+dayObj.DayNum+''" :ScenicArray="dayObj.ScenicArray"  
                 :trafficObj="dayObj.TrafficObj" :ishasScenic="ishasScenic"
                 :CurrentDayNum="dayObj.DayNum" :totalDayNum="subConfig.DayNum"
                 >
                 </scenicTraffic>
-                         <span slot="reference" class="TC-tripTitle" style="padding-left:5px;cursor:pointer;">选择交通信息</span>
+                <span slot="reference" class="TC-tripTitle" style="padding-left:5px;cursor:pointer;display:none">选择交通信息</span>
             </el-popover>
 
             <ul class="scenicCheck_check" v-if="ishasScenic&& NoticeParameters.IsDirect==0">