旅游

src/views/campsiteManage/index.vue

@@ -313,7 +313,12 @@ import {
       },
       getAddrStr(branchCompany) {
         let regions = getRegionByCodes([branchCompany.addrProvince, branchCompany.addrCity, branchCompany.addrTown]);
-        return regions[0].name + ' ' + regions[1].name + ' ' + regions[2].name + ' ';
+        let address = [];
+        for(let i = 0; i < regions.length; i++){
+          address.push(regions[i].name);
+        }
+        return address.join(" ");
+//        return regions[0].name + ' ' + regions[1].name + ' ' + regions[2].name + ' ';
       },
       handleFilter() {
         this.listQuery.page = 1;

src/views/tourManage/index.vue

@@ -797,11 +797,15 @@
           this.list = listRs;
           this.total = totalCountRs;
         })
-
       },
       getAddrStr(branchCompany) {
         let regions = getRegionByCodes([branchCompany.addrProvince, branchCompany.addrCity, branchCompany.addrTown]);
-        return regions[0].name + ' ' + regions[1].name + ' ' + regions[2].name + ' ';
+        let address = "";
+        for(let i = 0; i < regions.length; i++){
+          address += regions[i].name + " ";
+        }
+        return address;
+//        return regions[0].name + ' ' + regions[1].name + ' ' + regions[2].name + ' ';
       },
       handleFilter() {
         this.listQuery.page = 1;

src/views/tourManage/modal/departureModal.vue

@@ -178,7 +178,7 @@
        * 删除分公司出发地
        * */
       deleteItem(obj){
-        this.list.splice(this.list.indexOf(obj),1);
+        this.lists.splice(this.lists.indexOf(obj),1);
         console.log(obj);
       },
       /**
@@ -199,6 +199,14 @@
           let select = {};
           that.allCompaniesArr.map(function(ii){
             if(ii.id == item.name){
+              let provinceObj = getRegionByCodes([ii.addrProvince]);
+              let cityObj = getRegionByCodes([ii.addrCity]);
+              item.provinceName = provinceObj[0].name;
+              item.cityName = cityObj[0].name;
+              item.addrProvince =  ii.addrProvince;
+              item.address = ii.addrDetail,
+              item.addrCity =  ii.addrCity;
+              item.addrTown = ii.addrTown;
               item.name = ii.name;
               item.companyId = ii.id;
               item.longitude = ii.longitude;

src/views/tourManage/modal/oneTourModal.vue

@@ -117,7 +117,7 @@
       <el-row>
         <el-col :span="4">
           <el-form-item label="单位" prop="amount">
-            <el-input v-model="form.unit" placeholder="元/人"></el-input>
+            <el-input v-model="form.unit" placeholder="人"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -136,13 +136,12 @@
           action="https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload"
           :show-file-list="false"
           :on-success="handleAvatarSuccess"
+          :on-progress="uploadProcess"
           list-type="picture">
-          <img v-if="$utils.isString(form.cover) && !$utils.isEmpty(form.cover)" :src="form.cover" style="width:300px;max-height:300px;">
-          <i v-else class="el-icon-plus avatar-uploader-icon" style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"></i>
+          <el-progress v-show="imgFlag == true" type="circle" :percentage="percent" style="margin-top: 20px"></el-progress>
+          <img v-if="$utils.isString(form.cover) && !$utils.isEmpty(form.cover) && !imgFlag" :src="form.cover" style="width:300px;max-height:300px;">
+          <i v-else-if="!imgFlag" class="el-icon-plus avatar-uploader-icon" style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"></i>
         </el-upload>
-        <!--<el-dialog v-model="dialogVisible" size="tiny">-->
-          <!--<img width="100%" :src="form.cover" alt="">-->
-        <!--</el-dialog>-->
       </el-form-item>
       <el-form-item label="轮播图" :style="{display:'block'}">
         <el-upload
@@ -238,6 +237,8 @@
     },
     data() {
       return {
+        percent: 0,//上传进度
+        imgFlag: false,
         onePathObj:{name: ""},//待编辑的途径地
         destinationObj:{name: ""},//目的地
         departureList: [],//出发地列表
@@ -267,7 +268,7 @@
           updTime: undefined,//更新时间
           viewCount: undefined,//浏览量
           isMember: undefined,//是否是会员商品
-          tagDTOS: undefined,//旅行标签
+          tagDTOS: [],//旅行标签
           bannerDTOS:[],//banner轮播
         },
         showDestinationVisible: false,//编辑目的地
@@ -337,6 +338,11 @@
       },
     },
     methods: {
+      uploadProcess(event, file, fileList) {
+        this.imgFlag = true;
+        console.log(event.percent);
+        this.percent = Math.floor(event.percent);
+      },
       handleClick(tab, event) {
         console.log(tab, event);
       },
@@ -408,14 +414,18 @@
         let siteDTOS = [];
         //出发地
         this.departureList.map(function(item){
+          let pp  = item.province?item.province:item.addrProvince;
+          let c = item.addrCity?item.addrCity: item.city;
+          let provinceObj = getRegionByCodes([pp]);
+          let cityObj = getRegionByCodes([c]);
           let p = {
             name: item.name,
             departTime:item.departTime?item.departTime:0,
             address: item.addrDetail?item.addrDetail: item.address,
             companyId: item.companyId,
             province: item.addrProvince?item.addrProvince:item.province,
-            provinceName:item.provinceName?item.provinceName:'',
-            cityName: item.cityName?item.cityName:'',
+            provinceName:provinceObj[0].name,
+            cityName: cityObj[0].name,
             city: item.addrCity?item.addrCity: item.city,
             longitude: item.longitude,
             latitude: item.latitude,
@@ -426,13 +436,15 @@
         });
         //途径地
         this.pathway.map(function(item){
+          let provinceObj = getRegionByCodes([item.province]);
+          let cityObj = getRegionByCodes([item.city]);
           let p = {
             name: item.name,
             address: item.addrDetail?item.addrDetail: item.address,
 //            companyId: item.id,
             province: item.addrProvince?item.addrProvince:item.province,
-            provinceName:item.provinceName?item.provinceName:'',
-            cityName: item.cityName?item.cityName:'',
+            provinceName:provinceObj[0].name,
+            cityName: cityObj[0].name,
             city: item.addrCity?item.addrCity: item.city,
             longitude: item.longitude,
             latitude: item.latitude,
@@ -443,12 +455,14 @@
         });
         //destinationObj目的地
         let destinationObj = this.destinationObj;
+        let provinceObj = getRegionByCodes([destinationObj.province]);
+        let cityObj = getRegionByCodes([destinationObj.city]);
         let p = {
           name: destinationObj.name,
           address: destinationObj.addrDetail?destinationObj.addrDetail: destinationObj.address,
           province: destinationObj.addrProvince?destinationObj.addrProvince:destinationObj.province,
-          provinceName:destinationObj.provinceName?destinationObj.provinceName:'',
-          cityName: destinationObj.cityName?destinationObj.cityName:'',
+          provinceName:provinceObj[0].name,
+          cityName: cityObj[0].name,
           city: destinationObj.addrCity?destinationObj.addrCity: destinationObj.city,
           longitude: destinationObj.longitude,
           latitude: destinationObj.latitude,
@@ -480,6 +494,7 @@
         };
         console.log(params);
         goodsEdit(params).then(response => {
+          this.isCreate = false;
           if (response.status === 200) {
             this.$notify({
               title: '成功',
@@ -515,14 +530,19 @@
         let siteDTOS = [];
         //出发地
         this.departureList.map(function(item){
+          let pp  = item.province?item.province:item.addrProvince;
+          let c = item.addrCity?item.addrCity: item.city;
+          let provinceObj = getRegionByCodes([pp]);
+          let cityObj = getRegionByCodes([c]);
           let p = {
+            id: item.id,
             name: item.name,
             departTime:item.departTime?item.departTime:0,
             address: item.addrDetail?item.addrDetail: item.address,
             companyId: item.companyId,
             province: item.addrProvince?item.addrProvince:item.province,
-            provinceName:item.provinceName?item.provinceName:'',
-            cityName: item.cityName?item.cityName:'',
+            provinceName:provinceObj[0].name,
+            cityName: cityObj[0].name,
             city: item.addrCity?item.addrCity: item.city,
             longitude: item.longitude,
             latitude: item.latitude,
@@ -535,15 +555,14 @@
         this.pathway.map(function(item){
           let provinceObj = getRegionByCodes([item.province]);
           let cityObj = getRegionByCodes([item.city]);
-          item.provinceName = provinceObj[0].name;
-          item.cityName = cityObj[0].name;
           let p = {
+            id: item.id,
             name: item.name,
             address: item.addrDetail?item.addrDetail: item.address,
 //            companyId: item.id,
             province: item.addrProvince?item.addrProvince:item.province,
-            provinceName:item.provinceName?item.provinceName:'',
-            cityName: item.cityName?item.cityName:'',
+            provinceName: provinceObj[0].name,
+            cityName:  cityObj[0].name,
             city: item.addrCity?item.addrCity: item.city,
             longitude: item.longitude,
             latitude: item.latitude,
@@ -556,14 +575,13 @@
         let destinationObj = this.destinationObj;
         let provinceObj = getRegionByCodes([destinationObj.province]);
         let cityObj = getRegionByCodes([destinationObj.city]);
-        destinationObj.provinceName = provinceObj[0].name;
-        destinationObj.cityName = cityObj[0].name;
         let p = {
+          id: destinationObj.id,
           name: destinationObj.name,
           address: destinationObj.addrDetail?destinationObj.addrDetail: destinationObj.address,
           province: destinationObj.addrProvince?destinationObj.addrProvince:destinationObj.province,
-          provinceName:destinationObj.provinceName?destinationObj.provinceName:'',
-          cityName: destinationObj.cityName?destinationObj.cityName:'',
+          provinceName: provinceObj[0].name,
+          cityName: cityObj[0].name,
           city: destinationObj.addrCity?destinationObj.addrCity: destinationObj.city,
           longitude: destinationObj.longitude,
           latitude: destinationObj.latitude,
@@ -597,6 +615,7 @@
         console.log(params);
         console.log(this.form);
         goodsEdit(params).then(response => {
+          this.isCreate = false;
           if (response.status === 200) {
             this.$notify({
               title: '成功',
@@ -858,6 +877,8 @@
        * 封面图上传
        * **/
       handleAvatarSuccess(res, file){
+        this.percent = 0;
+        this.imgFlag = false;
         this.form.cover = res.data;
       },
       /**
@@ -899,7 +920,7 @@
             updTime: undefined,//更新时间
             viewCount: undefined,//浏览量
             isMember: "0",//是否是会员商品0不启用，1启用
-            tagDTOS: undefined,//旅行标签
+            tagDTOS: [],//旅行标签
             bannerDTOS:[],//banner轮播
             tourDepartTimeVo:[],//活动时间
         },