Merge remote-tracking branch 'origin/base-modify' into base-modify

package.json

@@ -84,6 +84,7 @@
     "script-loader": "0.7.0",
     "semver": "5.3.0",
     "style-loader": "0.17.0",
+    "swiper": "^4.5.0",
     "url-loader": "0.5.8",
     "vue-loader": "12.2.1",
     "vue-style-loader": "3.0.1",

src/App.vue

@@ -22,7 +22,6 @@
     padding: 10px 0;
     display: flex;
     align-items: center;
-    border-bottom: 1px solid #ccc;
   }
   .main-container{
     // padding: 0 10px;
@@ -32,12 +31,10 @@
     margin: 0 88px;
   }
   .ellipsis {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+    overflow: hidden;white-space: nowrap;text-overflow:ellipsis;word-wrap:break-word;word-break:break-all;
   }
   .ellipsis2{
-    width: 200px;
+    // width: 200px;  
     overflow: hidden;
     text-overflow: ellipsis;
     display: -webkit-box;
@@ -75,4 +72,15 @@
   /*}*/
   // .el-time-spinner__item{line-height: 16px !important;}
   // .el-scrollbar__wrap{margin-bottom: 0px !important;}
+  //去除type=number时输入框内的上下箭头
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+}
+input[type="number"]{
+  -moz-appearance: textfield;
+}
+.swiper-pagination-bullet-active{background-color: #C1A170 !important;}
+.swiper-pagination-bullet{background: #fff;}
+.swiper-pagination-fraction, .swiper-pagination-custom, .swiper-container-horizontal > .swiper-pagination-bullets{bottom: 20px;}
 </style>

src/api/base_info/branch_company/index.js

@@ -2,7 +2,7 @@ import store from "../../../store";
 import XEUtils from 'xe-utils';//加入常用工具类
 import fetch from 'utils/fetch';
 
-export function page(query) {
+export function pageOld(query) {
   return fetch({
     url: '/vehicle/branchCompany/page',
     method: 'get',
@@ -10,14 +10,110 @@ export function page(query) {
   });
 }
 
-export function allPage(query) {
+/**
+ * 分公司列表
+ * @param query
+ */
+export function page(query) {
+  return fetch({
+    url: '/vehicle/company/base/list',
+    method: 'get',
+    params: query
+  });
+}
+
+/**
+ * 设置基础信息
+ * @param query
+ */
+export function updCompany(query) {
+  return fetch({
+    url: '/vehicle/company/base/updCompany',
+    method: 'post',
+    data: query
+  });
+}
+
+/**
+ * 设置股权信息
+ * @param query
+ */
+export function updStockInfo(query) {
+  return fetch({
+    url: '/vehicle/company/base/updStockInfo',
+    method: 'post',
+    data: query
+  });
+}
+
+/**
+ * 设置详情
+ * @param query
+ */
+export function updCompanyDetail(query) {
+  return fetch({
+    url: '/vehicle/company/base/updCompanyDetail',
+    method: 'post',
+    data: query
+  });
+}
+
+/**
+ * 删除
+ * @param query
+ */
+export function deleteOne(params) {
+  return fetch({
+    url: '/vehicle/company/base/del',
+    method: 'post',
+    data: params
+  });
+}
+
+/**
+ * 获取详情
+ * @param query
+ */
+export function getCompanyDetail(query) {
   return fetch({
-    url: '/vehicle/branchCompany/allPage',
+    url: '/vehicle/company/base/getCompanyDetail',
     method: 'get',
     params: query
   });
 }
 
+/**
+ * 添加分公司
+ * @param query
+ */
+export function addCompany(query) {
+  return fetch({
+    url: '/vehicle/company/base/addCompany',
+    method: 'post',
+    data: query
+  });
+}
+
+/**
+ * 获取片区名称
+ * @param query
+ */
+export function zoneName(id) {
+  return fetch({
+    url: '/vehicle/area/' + id,
+    method: 'get'
+  });
+}
+
+
+export function allPage(query) {
+  return fetch({
+    url: '/vehicle/branchCompany/app/unauth/companys',
+    method: 'post',
+    data: query
+  });
+}
+
 export function getObj(id) {
   return fetch({
     url: '/vehicle/branchCompany/' + id,
@@ -37,7 +133,7 @@ export function addObj(obj) {
 // 股权价格
 export function getAllStockPrice() {
   return fetch({
-    url: '/vehicle/branchCompany/stock/allPrice',
+    url: '/vehicle/branchCompany/stock/right/app/unauth/stock_right_price',
     method: 'get'
   });
 }
@@ -45,7 +141,7 @@ export function getAllStockPrice() {
 // 我要参与-众筹
 export function stockApply(obj) {
   return fetch({
-    url: 'vehicle/branchCompany/stock/apply',
+    url: '/vehicle/branchCompany/stock/right/app/unauth/apply',
     method: 'post',
     data: obj
   });
@@ -53,9 +149,9 @@ export function stockApply(obj) {
 // 股权列表
 export function stockSearchPage(query) {
   return fetch({
-    url: '/vehicle/branchCompany/stock/search',
-    method: 'get',
-    params: query
+    url: '/vehicle/branchCompany/stock/right/app/unauth/webchat_office/stockrights',
+    method: 'post',
+    data: query
   });
 }
 
@@ -82,6 +178,12 @@ export function getAll() {
   })
 }
 
+export function getDetail(id) {
+  return fetch({
+    url: '/vehicle/company_base/app/unauth/detail/'+id,
+    method: 'get'
+  })
+}
 /**
  * 获取所有公司信息
  * @returns {null|*}
@@ -99,3 +201,4 @@ export function getAllCompany(resolve) {
       resolve(codeAndBranchCompany);
     });
 }
+

src/api/base_info/campsite/index.js

@@ -12,17 +12,17 @@ export function page(query) {
 
 export function allPage(query) {
   return fetch({
-    url: '/vehicle/campsite/allPage',
-    method: 'get',
-    params: query
+    url: '/api/campsite/campsiteShop/app/unauth/webchat_official/campsites',
+    method: 'POST',
+    data: query
   });
 }
 
 export function campsiteAllPage(query) {
   return fetch({
-    url: '/vehicle/campsite/allPage',
-    method: 'get',
-    params: query
+    url: '/api/campsite/campsiteShop/app/unauth/webchat_official/campsites',
+    method: 'POST',
+    data: query
   });
 }
 

src/api/base_info/region/index.js

@@ -120,5 +120,4 @@ export function getRegionByCodes(codes) {
     store.dispatch("cacheRegion", regions);
   }
   return regions;
-}
-
+}
\ No newline at end of file

src/api/branchCompany/stock/index.js

@@ -17,7 +17,7 @@ export function page(param) {
 
 export function search(param) {
   return fetch({
-    url: '/vehicle/branchCompany/stock/search',
+    url: '/vehicle/branchCompany/stock/right/search',
     method: 'get',
     params: param
   });
@@ -25,15 +25,15 @@ export function search(param) {
 
 export function addObj(param) {
   return fetch({
-    url: '/vehicle/branchCompany/stock',
-    method: 'put',
+    url: '/vehicle/branchCompany/stock/right/addStockInfo',
+    method: 'post',
     data: param
   });
 }
 
 export function updateObj(param) {
   return fetch({
-    url: '/vehicle/branchCompany/stock',
+    url: '/vehicle/branchCompany/stock/right/updStockInfo',
     method: 'post',
     data: param
   });
@@ -41,7 +41,7 @@ export function updateObj(param) {
 
 export function delObj(id) {
   return fetch({
-    url: '/vehicle/branchCompany/stock/' + id,
+    url: '/vehicle/branchCompany/stock/right/' + id,
     method: 'delete'
   });
 }

src/api/branchCompany/stockApply/index.js

@@ -2,14 +2,14 @@ import fetch from 'utils/fetch';
 
 export function getObj(id) {
   return fetch({
-    url: '/vehicle/branchCompany/stock/apply/' + id,
+    url: '/vehicle/branchCompany/stock/right/apply/' + id,
     method: 'get'
   });
 }
 
 export function page(param) {
   return fetch({
-    url: '/vehicle/branchCompany/stock/apply/page',
+    url: '/vehicle/branchCompany/stock/right/apply/page',
     method: 'get',
     params: param
   });
@@ -17,14 +17,14 @@ export function page(param) {
 
 export function delObj(id) {
   return fetch({
-    url: '/vehicle/branchCompany/stock/apply/' + id,
+    url: '/vehicle/branchCompany/stock/right/apply/' + id,
     method: 'delete'
   });
 }
 
 export function buyStock(id) {
   return fetch({
-    url: '/vehicle/branchCompany/stock/apply/buy',
+    url: '/vehicle/branchCompany/stock/right/apply/buy',
     method: 'post',
     params: {
       applyId: id
@@ -34,7 +34,7 @@ export function buyStock(id) {
 
 export function cancelApply(id) {
   return fetch({
-    url: '/vehicle/branchCompany/stock/apply/cancel',
+    url: '/vehicle/branchCompany/stock/right/apply/cancel',
     method: 'post',
     params: {
       applyId: id

src/api/vehicle/vehicleSchedulManage.js

@@ -98,4 +98,27 @@ export function getUpkeepAll() {
     url: '/vehicle/upkeep/item/all',
     method: 'get',
   });
-}
+}
\ No newline at end of file
+
+//获取旅游路线
+export function getTourList(param) {
+  if(param){
+    return fetch({
+      url: '/api/tour/verfication/getList?'+param,
+      method: 'get',
+    });
+  }else{
+    return fetch({
+      url: '/api/tour/verfication/getList',
+      method: 'get',
+    });
+  }
+}
+
+//获取核销路线id信息
+export function getTourInfor(id) {
+  return fetch({
+    url: '/api/tour/verfication/info/'+id,
+    method: 'get',
+  });
+}

src/main.js

@@ -14,6 +14,7 @@ import 'assets/iconfont/iconfont'; // iconfont 具体图标见https://github.com
 import * as filters from './filters'; // 全局vue filter
 import Multiselect from 'vue-multiselect';// 使用的一个多选框组件，element-ui的select不能满足所有需求
 import 'vue-multiselect/dist/vue-multiselect.min.css';// 多选框组件css
+import 'swiper/dist/css/swiper.css';//引入swiper样式
 import Sticky from 'components/Sticky'; // 粘性header组件
 import IconSvg from 'components/Icon-svg';// svg 组件
 import vueWaves from './directive/waves';// 水波纹指令
@@ -118,7 +119,7 @@ Object.keys(filters).forEach(key => {
 });
 
 // register global progress.
-const whiteList = ['/login', '/authredirect', '/map', '/stockCrowd', '/stockCrowdDetail', '/companyInfo', '/provinceMap', '/campsite'];// 不重定向白名单
+const whiteList = ['/login', '/authredirect', '/map', '/stockCrowd', '/stockCrowdDetail', '/companyInfo', '/provinceMap', '/campsite','/companyDetail'];// 不重定向白名单
 router.beforeEach((to, from, next) => {
   NProgress.start(); // 开启Progress
   if (getToken()) { // 判断是否有token

src/router/index.js

@@ -60,6 +60,13 @@ export const constantRouterMap = [{
   hidden: true
   // authority: 'companyInfo'
 },
+{
+  path: '/companyDetail',
+  component: _import('baseInfo/companyInfo/companyDetail'),
+  name: '公司详情',
+  hidden: true
+  // authority: 'companyInfo'
+},
 {
   path: '/provinceMap',
   component: _import('baseInfo/companyInfo/provinceMap'),

src/views/baseInfo/branchCompany/stockRightModal.vue

+<template>
+  <el-dialog title="股权信息设置" :visible.sync="dialogVisible" class="stock-right">
+    <el-form :model="form" :rules="rules" ref="form" label-width="80px">
+      <el-form-item label="状态">
+        <!--(-1:下架，0:筹备中，1:筹备完成，2:上架)-->
+        <el-radio-group v-model="form.stockState">
+          <el-radio-button style="margin-bottom: 10px;" label="-1">暂不募股</el-radio-button>
+          <el-radio-button style="margin-bottom: 10px;" label="2">募股中</el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="总份额" prop="total">
+        <el-input v-model="form.total" placeholder="请输入总份额"></el-input>
+      </el-form-item>
+      <el-form-item label="剩余份额" prop="balance">
+        <el-input v-model="form.balance" placeholder="请输入剩余份额"></el-input>
+      </el-form-item>
+      <el-form-item label="股权单价" prop="price">
+        <el-select class="filter-item" v-model="form.type" style="width: 100px;">
+          <el-option :key="1" label="￥" :value="1"></el-option>
+          <el-option :key="2" label="HK$" :value="2"></el-option>
+        </el-select>
+        <el-input style="width: 200px;margin: 0 20px;" v-model="form.price"  placeholder="请输入股权单价"></el-input>万
+      </el-form-item>
+      <el-form-item label="排序" prop="title">
+        <el-input v-model="form.rank" placeholder="请输入1,2,3……"></el-input>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer" >
+      <el-button @click="cancel('form')">取 消</el-button>
+      <el-button type="primary" @click="updateStock('form')">确 定</el-button>
+      <!--<el-button type="primary" @click="update('dialogFrom')">上 架</el-button>-->
+    </div>
+  </el-dialog>
+</template>
+
+<style>
+  .stock-right .el-form-item__content{
+    display: flex;
+    margin-left: 0;
+  }
+</style>
+
+<script>
+  import {mapGetters} from 'vuex';
+  import ElRow from "element-ui/packages/row/src/row";
+  import ElCol from "element-ui/packages/col/src/col";
+  import ElFormItem from "../../../../node_modules/element-ui/packages/form/src/form-item.vue";
+  import {
+    updStockInfo,
+    getCompanyDetail
+  } from 'api/base_info/branch_company';
+  export default {
+    components: {
+      ElFormItem,
+      ElCol,
+      ElRow},
+    props: ["row"],
+    name: 'stockRightModal',
+    data() {
+      return {
+        form:{
+          stockState: -1,
+          type: 1//("股价类型:1-万/股；2-港万/股")
+        },
+        dialogVisible:false,
+        rules: {
+          total: [
+            {
+              validator: (rule, value, callback) => {
+                if (!value) {
+                  return callback(new Error('请输入总份额'));
+                } else {
+                  const reg = /^[1-9]\d*$/;
+                  console.log(reg.test(value));
+                  if (reg.test(value)) {
+                    callback();
+                  } else {
+                    return callback(new Error('请输入大于零整数'));
+                  }
+                }
+              },
+              trigger: 'blur'
+            }
+          ],
+          price: [
+            {
+              validator: (rule, value, callback) => {
+                if (!value) {
+                  return callback(new Error('请输入股权单价'));
+                } else {
+                  const reg = /^[1-9]\d*$/;
+                  console.log(reg.test(value));
+                  if (reg.test(value)) {
+                    callback();
+                  } else {
+                    return callback(new Error('请输入大于零整数'));
+                  }
+                }
+              },
+              trigger: 'blur'
+            }
+          ],
+          balance:[
+            {
+              validator: (rule, value, callback) => {
+                if (!value) {
+                  return callback(new Error('请输入剩余份额'));
+                } else {
+                  const reg = /^[1-9]\d*$/;
+                  console.log(reg.test(value));
+                  if (reg.test(value)) {
+                    callback();
+                  } else {
+                    return callback(new Error('请输入大于零整数'));
+                  }
+                }
+              },
+              trigger: 'blur'
+            }
+          ],
+        }
+      }
+    },
+    created() {
+      if(this.row.stockId){
+        this.form.stockId = this.row.stockId;
+        this.getInfo();
+      } else {
+        this.form.id = this.row.id;
+      }
+      this.bookRecord_btn_unbook = this.elements['bookRecord:btn_unbook'];
+    },
+    computed: {
+      ...mapGetters([
+        'elements',
+      ]),
+    },
+    watch: {
+      dialogVisible(newValue, oldValue){
+        if(!newValue){
+          this.$emit("stockRightDialogEvent", false);
+        }
+      },
+    },
+    mounted() {
+      this.dialogVisible = true;
+    },
+    methods: {
+      /**
+       * 根据id获取分公司对应信息
+       * */
+      getInfo() {
+        let t = this;
+        this.listLoading = true;
+        getCompanyDetail(this.row)
+          .then(response => {
+            if(response.status==200){
+              let info = response.data;
+              info.price = info.price?info.price/10000:undefined;
+              t.form = info;
+              t.form.total = info.total;
+            } else {
+              this.$notify({
+                title: '失败',
+                message: res.message,
+                type: 'error',
+                duration: 2000
+              });
+            }
+          })
+      },
+      /**
+       * 设置股权-保存
+       * */
+      updateStock(formName){
+        const set = this.$refs;
+        set[formName].validate(valid => {
+          if (valid) {
+            this.form.price = this.form.price*10000;
+            updStockInfo(this.form)
+              .then(res => {
+                if(res.status==200){
+                  this.$notify({
+                    title: '成功',
+                    message: '设置成功',
+                    type: 'success',
+                    duration: 2000
+                  });
+                  this.$emit("stockRightDialogEvent", true);
+                }else{
+                  this.$notify({
+                    title: '失败',
+                    message: res.message,
+                    type: 'error',
+                    duration: 2000
+                  });
+                }
+              })
+          } else {
+            return;
+          }
+        });
+      },
+      /*
+       * 弹框-取消
+       * */
+      cancel() {
+        this.$emit("stockRightDialogEvent", false);
+      }
+    }
+  }
+</script>

src/views/baseInfo/companyInfo/companyDetail.vue

+<template>
+  <div style="background:#F8F8F8;height:100%">
+    <div class="swiper-container" ref="swiperContainer">
+        <div class="swiper-wrapper">
+            <div class="swiper-slide" v-for="(item,index) in imgList" :key="index">
+                <img :src="item" alt="" style="width:100%;height:180px">
+            </div>
+        </div>
+        <div class="swiper-pagination" ref="swiperPagination"></div>
+    </div>
+    <div class="describesBox">
+        <div class="companyName">{{name}}</div>
+        <div class="address">地址：{{address}}</div>
+        <div class="describes" v-html="describes"></div>
+    </div>
+    <div class="contentBox">
+        <div class="title">
+            <div class="yuan" style="margin-right:5px"></div>
+            <div>公司特色</div>
+            <div class="yuan" style="margin-left:5px"></div>
+        </div>
+        <div v-html="content"></div>
+    </div>
+    <div style="height:40px;background:#fff" v-if="showFixedBox"></div>
+    <div class="fixedBox" v-if="showFixedBox" @click="apply">申请入股</div>
+  </div>
+</template>
+
+<style scoped>
+ .swiper-container {width: 100%;height: 180px;}
+ .describesBox{width: 100%;border-radius: 5px 5px 0 0;margin-top: -5px;background: #fff;padding: 20px 15px;position: relative;top: -10px;z-index: 2;}
+ .companyName{font-size:17px;color: #171413;font-weight:500;line-height:32px;}
+ .address{font-size:11px;color: #999;margin-bottom: 20px}
+ .describes{font-size: 12px;color: #666}
+ .contentBox{width: 100%;background: #fff;padding: 20px 15px;}
+ .contentBox .title{font-size: 17px;color: #171413;display: flex;justify-content: center;align-items: center;margin-bottom: 20px}
+ .yuan{width: 6px;height: 6px;border-radius: 50%;border: 1px solid #DCBE8F}
+ .fixedBox{width: 100%;height: 40px;line-height: 40px;font-size: 14px;color: #fff;position: fixed;bottom: 0;background: #C1A170;text-align: center}
+</style>
+
+<script>
+  import Swiper from 'swiper';
+  import {getDetail} from 'api/base_info/branch_company';
+
+  import {mapGetters} from 'vuex';
+
+  export default {
+      components:[Swiper],
+    name: 'companyDetail',
+    data() {
+      return {
+          showFixedBox:1,
+          id:'',
+          imgList:[],
+          name:'',
+          address:'',
+          describes:'',
+          content:'',
+      }
+    },
+    created() {
+        this.id = this.$route.query.id;
+        this.stockRightId = this.$route.query.stockRightId;
+        this.detail();
+        if(this.$route.query.showFixedBox==1){
+            this.showFixedBox = true
+        }else{
+            this.showFixedBox = false
+        }
+
+    },
+    methods: {
+        apply(){
+            this.$router.push({path: '/stockCrowdDetail?id=' + this.id+"&stockRightId="+this.stockRightId})
+        },
+        detail(){
+          getDetail(this.id).then(res=>{
+              console.log(res)
+              if(res.status == 200){
+                  if(res.data.images!=''){
+                      var arr = res.data.images.split(',')
+                      this.imgList = arr
+                      this.$nextTick(function () {
+                          this.swiperInit()
+                      })
+                  }else{
+                      this.imgList = []
+                  }
+                  this.name = res.data.name
+                  this.address = res.data.address
+                  this.describes = res.data.describes
+                  this.content = res.data.content
+              }
+          })
+      },
+      swiperInit(){
+          new Swiper(this.$refs.swiperContainer, {
+            pagination: {
+                el: this.$refs.swiperPagination,
+                clickable: true
+            },
+            spaceBetween: 0,
+            centeredSlides: true,
+            autoplay:{
+                delay:2000
+            },
+            autoplayDisableOnInteraction:true,
+            observer:true
+　　　　});
+      }
+    },
+    mounted() {
+
+    },
+  }
+</script>

src/views/baseInfo/companyInfo/companyMap.vue

 <template>
-  <baidu-map id="map" class="map" style="height: 350px;" :center="center" :zoom="zoom" @ready="handler" @click="mapClick(this, $event)">
+  <baidu-map id="map" class="map" style="height: 350px;margin-top: 42px;" :center="center" :zoom="zoom" @ready="handler" @click="mapClick(this, $event)">
     <!--  缩放  -->
     <bm-navigation anchor="BMAP_ANCHOR_TOP_RIGHT"></bm-navigation>
   </baidu-map>
@@ -11,6 +11,7 @@
   import {
     getSonRegionByCodes,
     getRegionByCodes,
+    getAddressInfor
   } from 'api/base_info/region/';
   import {
     campsiteAllPage,
@@ -157,7 +158,7 @@
       },
       addMarker(map) {
         let  zoom = map.getZoom();
-        var myIcon = new BMap.Icon('https://cwmp.upyuns.com/attachment/images/4/2019/05/HnFr78H280dv972KuNZku70297rz7z.png',new BMap.Size(16,16));//这里先不用第三个参数IconOptions;
+        var myIcon = new BMap.Icon('../../../../static/images/small_local.png',new BMap.Size(13,16),{});//这里先不用第三个参数IconOptions;
 //        if(zoom <6){
 //          myIcon = new BMap.Icon('https://cwmp.upyuns.com/attachment/images/4/2019/05/HnFr78H280dv972KuNZku70297rz7z.png',new BMap.Size(16,16));//这里先不用第三个参数IconOptions
 //        }
@@ -183,6 +184,7 @@
         }
       },
       geolocation(map) {
+        var self = this;
         const geolocation = new BMap.Geolocation();
         geolocation.enableSDKLocation();
         geolocation.getCurrentPosition(function (r) {
@@ -194,6 +196,23 @@
             map.centerAndZoom("兰州",4);
             map.enableScrollWheelZoom(true); //开启鼠标滚轮缩放
             console.log('您的位置：' + r.point.lng + ',' + r.point.lat);
+            //获取当前城市的id
+            if(r){
+               $.ajax({
+                type: 'get',
+                url: 'https://api.map.baidu.com/geocoder/v2/?ak=wWYw0yCb8ntXmSgTxTx40vKR&callback=renderReverse&location=' + r.point.lat + ',' + r.point.lng + '&output=json&pois=1',
+                async: false,
+                jsonp: "callback", 
+                dataType: 'jsonp',
+                success: function (data) {
+                  var addrCity = data.result.addressComponent.adcode
+                  self.$emit('getAddrCity', addrCity);
+                },
+                error: function () {
+                  console.log('请求地区信息出错。');
+                }
+              });
+            }
           } else {
             alert('failed' + this.getStatus());
           }

src/views/baseInfo/stockCrowdDetail/index.vue

 <template>
-  <div>
+  <div style="background:#F8F8F8;height: calc(100vh)">
     <div class="header-css">
       <!--@click="$router.push({name:'mypoints'})"-->
       <img @click="goBack()" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAfCAYAAADqUJ2JAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTM4IDc5LjE1OTgyNCwgMjAxNi8wOS8xNC0wMTowOTowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjU0OTNGQTA2QTEwNTExRTg4M0E3OUI4RkYwRDg3RUU4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjU0OTNGQTA3QTEwNTExRTg4M0E3OUI4RkYwRDg3RUU4Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTQ5M0ZBMDRBMTA1MTFFODgzQTc5QjhGRjBEODdFRTgiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NTQ5M0ZBMDVBMTA1MTFFODgzQTc5QjhGRjBEODdFRTgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4bKBAsAAAAzklEQVR42qzWWQrCMBDG8VzCtVb01ZuIFJUq4nU8l+AlXEsFXz2CC+iXB2EYgjBL4P/6o4Qk0xD0q4G2aBSMyB590F2LNQkSe6OFFGmhA0PWUqSNjgxZWZEXWkqRDjpZkS46E+Sp2diIXAjyQKUUyRLIXIr0UMWQmQapGTKVInkCKaTIAF0ZMtEgN4aMNZdwR5DYRvskuH1RXEOPPfqtfgIrtFjucY5cTza9a5X1rv27uKUWc3mPXF9I+ma7YuYp4jrXXCet6+xP/o18BRgA2Nl6bmmSdvgAAAAASUVORK5CYII=" size="25" style="width: 15px; height: 20px; margin: 10px">
-      <span class="header-title">入股申请</span>
+      <span class="header-title" style="margin: 0 auto;padding-right: 40px;">申请入股</span>
     </div>
     <!--入股详情页-->
+    <div style="background:#F8F8F8;height:57px"></div>
     <!--我要参与-->
-    <div class="shoppings main-container"  v-if="optionName=='detail'">
+    <div class="shoppings main-container" v-if="optionName=='detail'">
       <div class="first" >
-        <h3>{{companyName}}</h3>
-       <div class="pad10 tips">
-         <p>参与须知：</p>
-         <p>本次提交为意向参与，后续会有专门的工作人员联系您，最终的入股申请参与成功，需要线下确认。</p>
-       </div>
-        <el-form :model="form" :rules="rules" ref="form" label-width="100px">
-          <el-input v-model="form.companyId" hidden></el-input>
-          <el-form-item label="姓名" prop="name">
-            <el-input v-model="form.name" placeholder="请输入姓名"></el-input>
-          </el-form-item>
-          <el-form-item label="联系电话" prop="tel">
-            <el-input v-model="form.tel" placeholder="请输入联系电话"></el-input>
-          </el-form-item>
-          <el-form-item label="数量" prop="count">
-            <el-input v-model="form.count" placeholder="请输入份额"></el-input>
-          </el-form-item>
-        </el-form>
+        <el-input v-model="form.companyId" hidden></el-input>
+        <div class="inputBox">
+          <div class="inputBoxLeft"><span style="color:red">*</span>姓名</div>
+          <div class="inputBoxRight">
+            <input type="text" placeholder="请输入您的姓名" v-model="form.name">
+          </div>
+        </div>
+        <div class="inputBox">
+          <div class="inputBoxLeft"><span style="color:red">*</span>联系电话</div>
+          <div class="inputBoxRight">
+            <input type="text" placeholder="请输入联系电话" v-model="form.tel">
+          </div>
+        </div>
+
+        <div class="inputBox" style="margin-top:10px">
+          <div class="inputBoxLeft"><span style="color:red">*</span>份额/股数</div>
+          <div class="inputBoxRight">
+            <input type="text" placeholder="请输入您的份额/股数" v-model.number="form.count">
+          </div>
+        </div>
         <ruby class="ruby" v-if="msg">{{msg}}</ruby>
-        <div class="flex-jcc-aic bottom-button">
-          <el-button @click="submit('form')">提 交</el-button>
+        <div class="pad10 tips tipBox">
+          <img src="../../../../static/images/tip.png" alt="" width="15">
+          <div class="tipBoxRight">本次提交为意向参与，后续会有专门的工作人员联系您，最终的入股申请是否成功，需要线下确认。</div>
         </div>
+        <div class="submitBox" @click="submit">立即申请</div>
       </div>
     </div>
     <!--参与结果页-->
@@ -43,7 +49,11 @@
   </div>
 </template>
 
-<style>
+<style scoped>
+  .inputBox{background: #fff;display: flex;display: flexbox;display: -webkit-box;padding: 13px 15px;}
+  .inputBoxLeft{width: 80px;color: #333333;font-size: 14px}
+  .inputBoxRight{flex: 1}
+  .inputBoxRight input{border: none;color: #333333;font-size: 14px;width: 100%;vertical-align: -2px;-webkit-tap-highlight-color:rgba(255,255,255,0);outline:none;}
   .pad10{
     padding: 10px;
   }
@@ -51,7 +61,10 @@
     color: #999;
     font-size: 14px;
   }
-
+  .tipBox{display: flex;display: flexbox;display: -webkit-box;align-items: center}
+  .tipBoxRight{flex:1;color: #666;font-size: 11px;margin-left: 10px}
+  .submitBox{margin: 30px 15px 15px 15px;background-color: #C1A170;border-radius: 25px;height: 44px;line-height: 44px;color: #fff;font-size: 14px;text-align: center;}
+  .o5{opacity: 0.5;}
   .success-tip{
     width: 100px;
     height:100px;
@@ -68,7 +81,7 @@
     display: block;
     color: red;
     font-size: 13px;
-    padding-bottom: 10px;
+    padding: 10px 15px;
   }
   .el-form-item__label{
     text-align: left;
@@ -104,12 +117,14 @@
     name: 'stockCrowdDetail',
     data() {
       return {
+        noward:true,
         optionName:"detail",
         form: {
           name: undefined,
           tel: undefined,
           companyId: undefined,
-          count: undefined
+          count: undefined,
+          stockRightId: undefined
         },
         img : !0,
         companyName: "",//公司名称
@@ -150,8 +165,18 @@
       submit(formName){
         let that = this;
         that.msg = "";
-        if(!that.form.companyId){
+        if(!that.form.stockRightId){
           that.msg = "请选择待申请的入股项目！"
+          return false;
+        }else if(!that.form.name){
+          that.msg = "请输入姓名"
+          return false;
+        }else if(!that.form.tel){
+          that.msg = "请输入手机号"
+          return false;
+        }else if(!that.form.count){
+          that.msg = "请输入份额"
+          return false;
         }
         var isPhone = false;
         var isNum = false;
@@ -184,32 +209,28 @@
           }
         };
         //提交
-        const set = this.$refs;
-        set[formName].validate(valid => {
-          checkPhone(that.form.tel);
-          checkCount(that.form.count);
-          if (valid && isPhone) {
-            stockApply(this.form)
-              .then(res => {
-                that.optionName = "crowdResult";
-              if(res.code==1){
-                that.img = !0;
-              } else {
-                that.img = !1;
-              }
+        checkPhone(that.form.tel);
+        checkCount(that.form.count);
+        if (isNum && isPhone) {
+          this.form.stockRightId = Number(this.form.stockRightId)
+          stockApply(this.form)
+            .then(res => {
+              that.optionName = "crowdResult";
+            if(res.status==200){
+              that.img = !0;
+            } else {
+              that.img = !1;
+            }
 
-              })
-          } else {
-            return false;
-          }
-        });
+          })
+        } else {
+          return false;
+        }
       }
     },
     mounted() {
-      let id = this.$route.query.id;
-      this.form.companyId = this.$route.query.id;
+      this.form.stockRightId = this.$route.query.stockRightId;
       this.companyName = this.$route.query.name;
-    }
-
+    },
   }
 </script>

src/views/cunponManagements/cunponManagement.vue

@@ -127,7 +127,7 @@
                         </div>
                         <div style="display:inline-block" v-show="formdata.valid_type_name=='相对时效'">
                           <span>领取后</span>
-                          <el-input v-model="formdata.valid_days" placeholder="请输入金额" style="width:100px" :disabled="isUpdate"></el-input>
+                          <el-input v-model="formdata.validDays" placeholder="请输入金额" style="width:100px" :disabled="isUpdate" type="number"></el-input>
                           <span>天有效</span>
                         </div>
                     </el-form-item>
@@ -525,7 +525,17 @@
               that.formdata.validStartTime = 0;
               that.formdata.validEndTime = 0;
             }
-
+            if(that.formdata.valid_type_name=='相对时效'){
+              if(that.formdata.validDays<=0){
+                this.$notify({
+                  title: '警告',
+                  message: '相对时效时间需大于0',
+                  type: 'warning',
+                  duration: 2000
+                });
+                return false
+              }
+            }
             if(that.formdata.startTimeName=='自定义'){
               that.formdata.startTime = new Date(this.formdata.startTimeStr).getTime();
             }else{

src/views/purseManage/commissionSettings.vue

@@ -10,31 +10,31 @@
         </el-col>
         <el-col :span="24" v-if="item.level==2">
           <el-form-item label="分公司股东分销提成">
-            <el-input v-model="item.extract" placeholder="请输入分公司股东分销提成" v-enterNumber></el-input>
+            <el-input v-model="item.extract" placeholder="请输入分公司股东分销提成" type="number" v-enterNumber></el-input>
             <span  style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span>
           </el-form-item>
         </el-col>
         <el-col :span="24" v-if="item.level==3">
           <el-form-item label="合伙人分销提成">
-            <el-input v-model="item.extract" placeholder="请输入合伙人分销提成" v-enterNumber></el-input>
+            <el-input v-model="item.extract" placeholder="请输入合伙人分销提成" type="number" v-enterNumber></el-input>
             <span  style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span>
           </el-form-item>
         </el-col>
         <el-col :span="24" v-if="item.level==4">
           <el-form-item label="员工分销提成">
-            <el-input v-model="item.extract" placeholder="请输入员工分销提成" v-enterNumber></el-input>
+            <el-input v-model="item.extract" placeholder="请输入员工分销提成" type="number" v-enterNumber></el-input>
             <span  style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span>
           </el-form-item>
         </el-col>
         <el-col :span="24" v-if="item.level==5">
           <el-form-item label="代理人分销提成">
-            <el-input v-model="item.extract" placeholder="请输入代理人分销提成" v-enterNumber></el-input>
+            <el-input v-model="item.extract" placeholder="请输入代理人分销提成" type="number" v-enterNumber></el-input>
             <span  style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span>
           </el-form-item>
         </el-col>
         <el-col :span="24" v-if="item.level==0">
           <el-form-item label="普通用户分销提成">
-            <el-input v-model="item.extract" placeholder="请输入普通用户分销提成" v-enterNumber></el-input>
+            <el-input v-model="item.extract" placeholder="请输入普通用户分销提成" type="number" v-enterNumber></el-input>
             <span  style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span>
           </el-form-item>
         </el-col>

src/views/tourManage/modal/oneTourModal.vue

@@ -196,7 +196,6 @@
             <!--<Editor v-if="activeName2=='third'" @input="handelExplainIncrease" :value="form.explain" :myQuillEditor="'myQuillEditorExplain'" :activeName2="activeName2"></Editor>-->
         </el-tab-pane>
       </el-tabs>
-      <el-form-item></el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button @click="cancelTour">取 消</el-button>

src/views/vehicle/vehicleInfo/index.vue

@@ -406,14 +406,14 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="发动机号" prop="engineNum">
-              <el-input v-model.number="form.engineNum" placeholder="请输入发动机号"></el-input>
+              <el-input v-model="form.engineNum" placeholder="请输入发动机号"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="生产商" prop="manufacturer">
-              <el-input v-model.number="form.manufacturer" placeholder="请输入生产商"></el-input>
+              <el-input v-model="form.manufacturer" placeholder="请输入生产商"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">

src/views/vehicle/vehicleSchedulManage/index.vue

@@ -383,7 +383,8 @@
   } from 'utils/auth';
   import {
     getVehiclePlanList,
-    getVehicleOrderDetail
+    getVehicleOrderDetail,
+    getTourInfor
   } from 'api/vehicle/vehicleSchedulManage';
   import Element1 from "../../admin/menu/components/element";
   import ElRow from "element-ui/packages/row/src/row";
@@ -586,8 +587,17 @@
               this.currentItem = {item: item, iitem: iitem, ii: ii,title: "客户用车",upkeepName:'客户用车'};
             } else if(ii.bookType == 5) {
               //房车游订单详情
-              this.zhanlan = true;
-              this.currentItem = {item: item, iitem: iitem, ii: ii, title: "房车游",upkeepName:'房车游'};
+              var str = ''
+              getTourInfor(ii.vehicleBookRecord.orderNo).then(response => {
+                if(response.status==200){
+                  str = '旅游路线：' + response.data.goodName +'  出发时间：' +response.data.time+' 出发地：' +response.data.siteName
+                  this.currentItem = {item: item, iitem: iitem, ii: ii, title: "房车游",upkeepName:'房车游',str:str};
+                  this.zhanlan = true;
+                }else{
+                  this.currentItem = {item: item, iitem: iitem, ii: ii, title: "房车游",upkeepName:'房车游'};
+                  this.zhanlan = true;
+                }
+              })
               // if(!ii.vehicleBookRecord.orderNo){
               //   this.$notify({
               //     title: '警告',

src/views/vehicle/vehicleSchedulManage/vehicleExhibitionModal.vue

@@ -24,6 +24,9 @@
         <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他-->
         <span>{{currentItem.ii.bookType==1?"租房车":currentItem.ii.bookType==3?"维修":currentItem.ii.bookType==8?"禁用":currentItem.ii.bookType==9?"客户用车":currentItem.ii.bookType==10?"其他":currentItem.ii.bookType==4?"展览":currentItem.ii.bookType==5?"旅游":currentItem.ii.bookType==6?"保养":currentItem.ii.bookType==8?"禁用":currentItem.ii.bookType==2?"分公司使用":'未知用途'}}</span>
       </el-form-item>
+      <el-form-item label="旅游详情:" v-if="currentItem.str">
+        {{currentItem.str}}
+      </el-form-item>
       <el-form-item label="申请说明:">
         <span>{{currentItem.ii.vehicleBookRecord.remark}}</span>
       </el-form-item>

src/views/vehicle/vehicleSchedulManage/vehiclePlanModal.vue

@@ -69,6 +69,19 @@
           <el-checkbox v-for="item in upkeepList" :label="item.id" :key="item.id">{{item.name}}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
+      <el-form-item label="路线" v-if="form.bookType==5" required>
+        <el-select class="filter-item" placeholder="请选择路线" v-model="goodId" @change="goodChange">
+          <el-option :key="undefined" label="无" :value="undefined"></el-option>
+          <el-option v-for="item in goodList" :key="item.goodId" :label="item.goodName" :value="item.goodId"></el-option>
+        </el-select>
+        <el-select class="filter-item" placeholder="请选择出车公司" v-model="siteId" @change="siteChange">
+          <el-option :key="undefined" label="无" :value="undefined"></el-option>
+           <el-option v-for="item in siteList" :key="item.siteId" :label="item.siteName" :value="item.siteId"></el-option>
+        </el-select>
+        <el-select class="filter-item" placeholder="请选择出发时间" v-model="verificationId">
+          <el-option v-for="item in timeList" :key="item.verificationId" :label="item.time" :value="item.verificationId"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="使用人" prop="vehicleUsername">
         <el-input v-model="form.vehicleUsername" placeholder="请输入使用人"></el-input>
       </el-form-item>
@@ -112,7 +125,8 @@
   } from 'api/base_info/branch_company/';
   import {
     bookPlan,
-    getUpkeepAll
+    getUpkeepAll,
+    getTourList
   } from 'api/vehicle/vehicleSchedulManage';
   import ElRow from "element-ui/packages/row/src/row";
   import ElCol from "element-ui/packages/col/src/col";
@@ -142,6 +156,12 @@
         }
       };
       return {
+        goodId:undefined,
+        siteId:undefined,
+        verificationId:undefined,
+        goodList:[],
+        siteList:[],
+        timeList:[],
         pickerOptions0: {
           disabledDate(time) {
             return time.getTime() < Date.now() - 8.64e7;
@@ -209,6 +229,9 @@
       getUpkeepAll().then(response => {
         this.upkeepList = response.data
       })
+      getTourList().then(response=> {
+        this.goodList = response.data
+      })
     },
     computed: {
       ...mapGetters([
@@ -226,6 +249,19 @@
       this.anpai = true;
     },
     methods: {
+      goodChange(){
+        this.siteId = undefined
+        getTourList('goodId='+this.goodId).then(response=> {
+          this.siteList = response.data
+        })
+      },
+      siteChange(){
+        this.verificationId = undefined
+        getTourList('siteId='+this.siteId+'&goodId='+this.goodId).then(response=> {
+          this.timeList = response.data
+          this.verificationId = response.data[0].verificationId
+        })
+      },
       /**
        * 还车分公司
        */
@@ -275,6 +311,19 @@
                 return false;
               }
             }
+            console.log(this.verificationId)
+            if(this.form.bookType==5){
+              if(this.verificationId==undefined){
+                this.$notify({
+                  title: '警告',
+                  message: '请选择旅游路线',
+                  type: 'warning',
+                  duration: 2000
+                });
+                return false;
+              }
+              this.form.verificationId = this.verificationId
+            }
             let params = {
               vehicleId:this.currentItem.item.id,
               bookStartDate: formatDate(this.form.times[0], "yyyy-MM-dd hh") + ":00:00",//预定开始时间
@@ -285,6 +334,7 @@
               vehicleUserPhone: this.form.vehicleUserPhone,//使用人电话
               remark: this.form.remark,//说明
               upkeepIds:this.form.bookType==6?this.form.upkeepIds.join(","):'',//保养类型
+              orderNo:this.form.bookType==5?this.verificationId:''
             };
             bookPlan(params).then(response => {
               if (response.status === 200) {

src/views/vehicle/vehicleSchedulManage/vehicleRecords.vue

@@ -53,7 +53,7 @@
       </el-table-column>
       <el-table-column align="center" label="操作" width="150" fixed="right">
         <template scope="scope">
-          <el-button size="small" class="el-button el-button--text el-button--small" @click="toShowDialog(scope.row)" v-if="scope.row.bookType !=2 && scope.row.bookType !=3">详情</el-button>
+          <el-button size="small" class="el-button el-button--text el-button--small" @click="toShowDialog(scope.row)" v-if="scope.row.bookType !=2">详情</el-button>
           <el-button size="small"  class="el-button el-button--text el-button--small" @click="getLogInfo(scope.row)" v-if="vehicleRecords_bookPlan&&scope.row.status==2&&scope.row.vehicleDepartureLogVo==undefined">重新安排</el-button>
         </template>
       </el-table-column>
@@ -110,7 +110,8 @@
     getVehicleOrderDetail
   } from 'api/vehicle/vehicleSchedulManage';
   import {
-    getBookRecord
+    getBookRecord,
+    getTourInfor
   } from 'api/vehicle/vehicleSchedulManage';
   import rsCode from '../../../utils/rsCode';
   import {
@@ -238,7 +239,7 @@
               } else {
                 this.$notify({
                   title: '失败',
-                  message: '操作失败！',
+                  message: res.message,
                   type: 'error',
                   duration: 2000
                 });
@@ -257,8 +258,8 @@
           bookType:cc.bookType
         };
 //      <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他-->
-        item.numberPlate = this.listQuery.numberPlate;//车牌号
-        item.parkCompanyName = cc.parkCompanyName;//当前停靠公司
+        item.numberPlate = cc.numberPlate;//车牌号
+        item.parkCompanyName = cc.liftCompanyName;//当前停靠公司
         item.subordinateBranchName = cc.subordinateBranchName;//所属公司
         if(ii.vehicleBookRecord.status == 1){
           //审核中显示预定中
@@ -298,8 +299,17 @@
             this.currentItem = {item: item, ii: ii,title: "客户用车",upkeepName:'客户用车'};
           } else if(cc.bookType == 5) {
             //房车游订单详情
-            this.zhanlan = true;
-            this.currentItem = {item: item, ii: ii, title: "房车游",upkeepName:'房车游'};
+            var str = ''
+            getTourInfor(ii.vehicleBookRecord.orderNo).then(response => {
+              if(response.status==200){
+                str = '旅游路线：' + response.data.goodName +'  出发时间：' +response.data.time+' 出发地：' +response.data.siteName
+                this.currentItem = {item: item, ii: ii, title: "房车游",upkeepName:'房车游',str:str};
+                this.zhanlan = true;
+              }else{
+                this.currentItem = {item: item, ii: ii, title: "房车游",upkeepName:'房车游'};
+                this.zhanlan = true;
+              }
+            })
             // if(!ii.vehicleBookRecord.orderNo){
             //   this.$notify({
             //     title: '警告',