Commit 02ee7a25 authored by denghr's avatar denghr

公众号页面

parent 3a99d8d0
This diff is collapsed.
......@@ -31,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;
......@@ -82,4 +80,7 @@ input::-webkit-inner-spin-button {
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>
......@@ -12,9 +12,9 @@ export function page(query) {
export function allPage(query) {
return fetch({
url: '/vehicle/branchCompany/allPage',
method: 'get',
params: query
url: '/vehicle/branchCompany/app/unauth/companys',
method: 'post',
data: query
});
}
......@@ -37,7 +37,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 +45,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 +53,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 +82,12 @@ export function getAll() {
})
}
export function getDetail(id) {
return fetch({
url: '/vehicle/company_base/app/unauth/detail/'+id,
method: 'get'
})
}
/**
* 获取所有公司信息
* @returns {null|*}
......@@ -99,3 +105,4 @@ export function getAllCompany(resolve) {
resolve(codeAndBranchCompany);
});
}
......@@ -12,9 +12,9 @@ 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
});
}
......
......@@ -121,4 +121,3 @@ export function getRegionByCodes(codes) {
}
return regions;
}
\ No newline at end of file
......@@ -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'
});
}
This diff is collapsed.
This diff is collapsed.
......@@ -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';// 水波纹指令
......
......@@ -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'),
......
This diff is collapsed.
<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() {
let id = this.$route.query.id;
this.id = this.$route.query.id;
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})
},
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>
<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: 'http://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());
}
......
This diff is collapsed.
<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="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>
<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="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,6 +117,7 @@
name: 'stockCrowdDetail',
data() {
return {
noward:true,
optionName:"detail",
form: {
name: undefined,
......@@ -152,6 +166,16 @@
that.msg = "";
if(!that.form.companyId){
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,11 +208,9 @@
}
};
//提交
const set = this.$refs;
set[formName].validate(valid => {
checkPhone(that.form.tel);
checkCount(that.form.count);
if (valid && isPhone) {
if (isNum && isPhone) {
stockApply(this.form)
.then(res => {
that.optionName = "crowdResult";
......@@ -202,14 +224,12 @@
} else {
return false;
}
});
}
},
mounted() {
let id = this.$route.query.id;
this.form.companyId = this.$route.query.id;
this.companyName = this.$route.query.name;
}
},
}
</script>
This diff is collapsed.
......@@ -127,7 +127,7 @@
</div>
<div style="display:inline-block" v-show="formdata.valid_type_name=='相对时效'">
<span>领取后</span>
<el-input v-model="formdata.validDays" 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{
......
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment