Browse Source

修改冲突

master
aBin 5 years ago
parent
commit
cec24592be
  1. 15
      rest/project.http
  2. BIN
      src/assets/jiagou.png
  3. BIN
      src/assets/zckj01.png
  4. BIN
      src/assets/zckj02.png
  5. BIN
      src/assets/zckj03.png
  6. 1
      src/components/Introduce/DeriveEnterprise.vue
  7. 11
      src/components/PlatformList/Fruit.vue
  8. 1
      src/components/PlatformList/PlatformList.vue
  9. 4
      src/config/api.js
  10. 3
      src/store/modules/home/actions.js
  11. 12
      src/views/About/Children/Organ.vue
  12. 1
      src/views/Activity/Activity.vue
  13. 138
      src/views/Cart/Cart.vue
  14. 171
      src/views/Cart/CartModel.vue
  15. 18
      src/views/Challenge/Children/Notice.vue
  16. 18
      src/views/Challenge/Children/Release.vue
  17. 1
      src/views/Community/Community.vue
  18. 22
      src/views/IncubationPlatform/Children/Services.vue
  19. 27
      src/views/IncubationPlatform/Children/place/EntitySpace.vue
  20. 22
      src/views/Industry/Children/Serve.vue
  21. 15
      src/views/Industry/Children/Union.vue
  22. 11
      src/views/ItInformation/ItInformation.vue
  23. 22
      src/views/NewPlatform/Children/Service.vue
  24. 14
      src/views/NewPlatform/Children/components/DeEnt.vue
  25. 1
      src/views/Policy/components/PolicyList.vue
  26. 100
      src/views/User/Login.vue

15
rest/project.http

@ -1,5 +1,5 @@
# @tall = {{url}}/tall/v1.0
@tall = http://www.sxwikionline.com/gateway/tall/v1.0
@tall = https://www.tall.wiki/gateway/tall/v1.0
@greenvalley = http://www.sxwikionline.com/gateway/greenvalley
@type = content-type: application/json;charset=utf-8
@ -13,8 +13,8 @@ POST {{tall}}/users/signin
"client": 1,
"type": 3,
"data": {
"identifier": "song",
"credential": "999999"
"identifier": "whj",
"credential": "123456"
}
}
@ -40,17 +40,12 @@ POST {{tall}}/users/signin
### 根据团队id查看研发团队相关信息
POST {{greenvalley}}/researchTeam/selectTeam
POST {{greenvalley}}/user/userSer
{{type}}
Authorization: Bearer {{login.response.body.$.data.token}}
{
"param": {
"company": "",
"researchDirection": "",
"teamId": 0,
"teamIntroduce": "",
"teamLeaderName": "",
"teamName": ""
}
}

BIN
src/assets/jiagou.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

BIN
src/assets/zckj01.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 217 KiB

BIN
src/assets/zckj02.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 208 KiB

BIN
src/assets/zckj03.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

1
src/components/Introduce/DeriveEnterprise.vue

@ -36,6 +36,7 @@
@change="onChange"
show-less-items
v-model="current"
v-show="newPartners.length > 6"
/>
</div>
</div>

11
src/components/PlatformList/Fruit.vue

@ -1,24 +1,25 @@
<template>
<div>
<div class="inner d-flex flex-wrap">
<div v-for="(item, index) in list" :key="index" class="item-box" :class="(index + 1) % 4 === 0 ? 'margin-0' : ''">
<p class="font-24 my-3" style="cursor: pointer" @click="detail(item.id)">{{ item.name }}</p>
<p class="font-16" style="color: rgba(0, 0, 0, 0.45); cursor: pointer" @click="detail(item.id)">编号{{ item.identifier }}</p>
<div :class="(index + 1) % 4 === 0 ? 'margin-0' : ''" :key="index" class="item-box" v-for="(item, index) in list">
<p @click="detail(item.id)" class="font-24 my-3" style="cursor: pointer">{{ item.name }}</p>
<p @click="detail(item.id)" class="font-16" style="color: rgba(0, 0, 0, 0.45); cursor: pointer">编号{{ item.identifier }}</p>
<p class="font-16 baseColor item-more">
<!-- <a-button type="primary" style="cursor: pointer">转化意向填报</a-button> -->
<intention-model :type-data="getId(item.id)" />
<intention-model style="cursor: pointer" :type-data="getId(item.id)" />
</p>
</div>
</div>
<div class="inner">
<a-pagination
:current="achCurrent"
:total="total"
:page-size="pageSize"
:total="total"
@change="onShowSizeChange"
class="pagination"
show-less-items
show-quick-jumper
v-show="total > 12"
/>
</div>
</div>

1
src/components/PlatformList/PlatformList.vue

@ -17,6 +17,7 @@
class="pagination"
show-less-items
show-quick-jumper
v-show="total > 8"
/>
</div>
</div>

4
src/config/api.js

@ -87,6 +87,10 @@ export const SearchCar = params => axios.post(`${service}/SearchCar`, params);
export const serviceApply = params => axios.post(`${service}/serviceApply`, params);
// 加入购物车
export const addCar = params => axios.post(`${service}/addCar`, params);
export const searchCar = params => axios.post(`${service}/SearchCar`, params);
// 加入购物车后购买
export const carAndBuy = params => axios.post(`${service}/CarAndBuy`, params);
// 登录人信息
export const getUserSer = params => axios.post(`${user}/userSer`, params);

3
src/store/modules/home/actions.js

@ -125,11 +125,12 @@ const actions = {
*/
async getUserSer({ commit }) {
try {
const token = sessionStorage.getItem('anyringToken');
if (!token) return;
const params = { param: {} };
const res = await getUserSer(params);
const { code, msg, data } = res.data;
if (code === 200) {
console.log('setUserSer: ', data);
commit('setUserSer', data);
} else {
message.error(msg || '查询失败');

12
src/views/About/Children/Organ.vue

@ -5,7 +5,13 @@
<div class="inner">
<bread-crumb :arr="arr" />
<div class="white pa-5 my-5">
<rich-text :title="title" />
<!-- <rich-text :title="title" /> -->
<div class="d-flex flex-column align-center">
<div class="d-flex flex-row align-start fill-width mb-6">
公司下设行政事业部创新事业部孵化事业部和产业事业部联系人小武 电话0351-5223175
</div>
<img src="~assets/jiagou.png" />
</div>
</div>
</div>
</div>
@ -15,11 +21,11 @@
import Banner from 'components/Banner/Banner.vue';
import HNav from './../components/HNav.vue';
import BreadCrumb from 'components/BreadCrumb/BreadCrumb.vue';
import RichText from 'components/Introduce/RichText.vue';
// import RichText from 'components/Introduce/RichText.vue';
export default {
name: 'Introduce',
components: { Banner, HNav, BreadCrumb, RichText },
components: { Banner, HNav, BreadCrumb },
data() {
return {
title: '组织机构',

1
src/views/Activity/Activity.vue

@ -45,6 +45,7 @@
class="pagination"
show-less-items
show-quick-jumper
v-show="total > 5"
/>
</div>
</template>

138
src/views/Cart/Cart.vue

@ -10,26 +10,21 @@
<div class="white pa-5 mb-5 d-flex flex-nowrap align-center justify-space-between">
<div>
<span class="font-16 textColor">联系人</span>
<a-input :default-value="name" style="width:auto" />
<a-input style="width: auto" v-model="name" />
</div>
<div>
<span class="font-16 textColor">联系电话</span>
<a-input :default-value="phone" style="width:auto" />
<a-input @change="onChange" style="width: auto" v-model="phone" />
</div>
<div>
<span class="font-16 textColor">公司名称</span>
<a-input :default-value="company" style="width:200px" />
<a-input style="width: 200px" v-model="company" />
</div>
</div>
<div class="cart-box">
<div :key="list.id" class="d-flex flex-column pa-5 white div-box mb-8" v-for="list in lists">
<div class="cart-box" v-if="cart.lists && cart.lists.length > 0">
<div :key="list.id" class="d-flex flex-column pa-5 white div-box mb-8" v-for="list in cart.lists">
<p class="font-bold-20 title-color">{{ list.title }}</p>
<div
:key="index"
@click="jumpDetails(item)"
class="d-flex flex-nowrap flex-row pointer mb-8"
v-for="(item, index) in list.list"
>
<div :key="index" class="d-flex flex-nowrap flex-row mb-8" v-for="(item, index) in list.list">
<img :src="item.src" class="cart-pic mr-8" />
<div class="flex-1 flex-column">
<p class="font-bold-20 title-color">{{ item.title }}</p>
@ -37,9 +32,10 @@
</div>
</div>
</div>
</div>
<div class="d-flex flex-row-reverse pb-10">
<a-button type="primary">提交</a-button>
<div class="d-flex flex-row-reverse pb-10">
<a-button @click="handleSubmit" type="primary">提交</a-button>
<cart-model :phone="phone" :show-model="showModel" @handleCancel="handleCancel" @submitCart="submitCart" />
</div>
</div>
</div>
</template>
@ -47,54 +43,28 @@
<script>
import { mapState, mapMutations, mapActions } from 'vuex';
import BreadCrumb from 'components/BreadCrumb/BreadCrumb.vue';
import { SearchCar } from 'config/api';
import CartModel from './CartModel.vue';
import { searchCar, carAndBuy } from 'config/api';
export default {
name: 'Cart',
components: { BreadCrumb },
components: { BreadCrumb, CartModel },
data() {
return {
arr: [{ name: '购物车', url: '' }],
name: '张三',
phone: '15233330000',
company: '山西传控电子科技有限公司',
lists: [
{
id: 1,
title: '服务',
list: [
{
src: 'https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2059927486,2456161292&fm=26&gp=0.jpg',
title: '检验检测服务',
content: '用户填写的需求描述',
},
{
src: 'https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2059927486,2456161292&fm=26&gp=0.jpg',
title: '检验检测服务',
content: '用户填写的需求描述',
},
],
},
{
id: 2,
title: '设备',
list: [
{
src: 'https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2059927486,2456161292&fm=26&gp=0.jpg',
title: '检验检测服务',
content: '用户填写的需求描述',
},
{
src: 'https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2059927486,2456161292&fm=26&gp=0.jpg',
title: '检验检测服务',
content: '用户填写的需求描述',
},
],
},
name: '',
phone: '',
company: '',
cart: {},
showModel: false,
phoneRules: [
{ required: true, pattern: new RegExp(/^[1][3,4,5,6,7,8,9][0-9]{9}$/), whitespace: true, message: '请输入正确的手机号' },
],
};
},
computed: mapState('home', ['userSer']),
async created() {
await this.getData();
await this.getUserSer();
@ -103,13 +73,14 @@ export default {
this.name = this.userSer.name;
}
if (this.userSer.phone) {
this.company = this.userSer.phone;
this.phone = this.userSer.phone;
}
if (this.userSer.companyName) {
this.company = this.userSer.companyName;
}
}
},
methods: {
...mapMutations('home', []),
...mapActions('home', ['getUserSer']),
@ -118,20 +89,69 @@ export default {
async getData() {
try {
const params = { param: { pageNum: 1, pageSize: 10 } };
const res = await SearchCar(params);
const res = await searchCar(params);
const { data, msg, code } = res.data;
if (code === 200) {
console.log('data: ', data);
// this.lists = data.list;
this.cart = data;
}
} catch (error) {
console.log(error);
}
},
//
jumpDetails(item) {
console.log('item: ', item);
//
onChange(e) {
this.phone = e.target.value;
},
handleSubmit() {
if (this.userSer.phone !== this.phone) {
this.openModel();
} else {
this.submitCart();
}
},
//
async submitCart(tel) {
try {
if (tel) {
this.phone = tel;
}
const { name, phone, company, cart } = this;
const ids = [];
ids.push(cart.id);
const params = {
param: {
contactName: company,
contactPhone: phone,
companyName: name,
ids,
},
};
const res = await carAndBuy(params);
const { data, msg, code } = res.data;
if (code === 200) {
this.$message.success('提交成功');
this.confirmLoading = false;
} else {
throw msg;
this.confirmLoading = false;
}
} catch (error) {
this.$message.error(error);
this.confirmLoading = false;
}
},
//
openModel() {
this.showModel = true;
},
//
handleCancel() {
this.showModel = false;
},
},
};

171
src/views/Cart/CartModel.vue

@ -0,0 +1,171 @@
<!--
Copyright (c) 2020.
author: song
email: 15235360226@163.com
-->
<template>
<div>
<a-modal :confirm-loading="confirmLoading" :visible="showModel" @cancel="handleCancel" @ok="handleOk()" title="电话验证" width="50%">
<a-form :form="form">
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="联系电话" required>
<a-input placeholder="请输入手机号" type="tel" v-model="tel" />
</a-form-item>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="图片验证码" required>
<div class="d-flex flex-nowrap">
<a-input placeholder="请输入图片验证码" required type="number" v-model="codeNum" />
<img :src="picCode.imageBase64" @click="changePicCode" class="code_img ml-2" v-if="picCode && picCode.imageBase64" />
<a-button @click="changePicCode" class="code_img ml-2" size="small" type="primary" v-else>重新获取</a-button>
</div>
</a-form-item>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="短信验证码" required>
<div class="d-flex flex-nowrap">
<a-input placeholder="请输入验证码" type="number" v-model="code" />
<a-button class="ml-2" disabled type="primary" v-if="showInterval">重新发送 {{ interval }}</a-button>
<a-button :disabled="!showCode" @click="getCode" class="ml-2" type="primary" v-else>获取验证码</a-button>
</div>
</a-form-item>
</a-form>
</a-modal>
</div>
</template>
<script>
import { mapState, mapActions } from 'vuex';
import { carAndBuy } from 'config/api';
const formItemLayout = {
labelCol: { span: 6 },
wrapperCol: { span: 18 },
};
const formTailLayout = {
labelCol: { span: 6 },
wrapperCol: { span: 18, offset: 6 },
};
export default {
name: 'CartModel',
components: {},
props: {
showModel: {
type: Boolean,
default: false,
},
phone: {
type: String,
default: '',
},
},
data() {
return {
confirmLoading: false,
formItemLayout,
formTailLayout,
form: this.$form.createForm(this, { name: 'submitPhone' }),
tel: '',
code: '',
codeNum: '',
phoneRules: [
{ required: true, pattern: new RegExp(/^[1][3,4,5,6,7,8,9][0-9]{9}$/), whitespace: true, message: '请输入正确的手机号' },
],
codeRules: [
{ required: true, message: '请输入验证码' },
{ min: 4, max: 4, message: '请输入4位短信验证码' },
],
showInterval: false,
codeTimer: null,
interval: 120, //
};
},
computed: {
...mapState('user', ['picCode']),
showCode() {
return /^[1][3,4,5,6,7,8,9][0-9]{9}$/.test(this.tel);
},
},
watch: {
phone(val) {
this.tel = this.phone;
},
},
created() {
// if (this.phone) this.tel = this.phone;
this.sendPicCode();
},
methods: {
...mapActions('user', ['sendCode', 'sendPicCode']),
handleOk() {
if (!this.tel) {
this.$message.error('电话为必填项');
} else {
if (this.tel) {
const phoneRule = /^[1][3,4,5,6,7,8,9][0-9]{9}$/.test(this.tel);
if (phoneRule) {
this.$emit('submitCart', this.tel);
this.$emit('handleCancel');
} else {
this.$message.error('请输入正确的联系电话');
}
}
}
},
handleCancel() {
this.$emit('handleCancel');
},
//
async getCode() {
try {
const params = {
phone: this.tel,
verificationCodeId: this.picCode.verificationCodeId,
verificationCodeValue: this.codeNum,
};
await this.sendCode(params);
this.getCodeInterval();
} catch (error) {
throw new Error(`SignIn.vue method getCode: ${error}`);
}
},
//
getCodeInterval() {
this.showInterval = true;
this.codeTimer = setInterval(() => {
if (this.interval === 0) {
clearInterval(this.codeTimer);
this.codeTimer = null;
this.showInterval = false;
this.interval = 120;
return;
}
this.interval = this.interval - 1;
}, 1000);
},
//
changePicCode() {
this.sendPicCode();
},
},
};
</script>
<style lang="stylus" scoped>
.must-color {
color: red;
}
.code_img {
height: 32px;
width: 120px;
}
</style>

18
src/views/Challenge/Children/Notice.vue

@ -10,18 +10,21 @@
<span class="ins-title">技术领域</span>
<span
:class="item.isActive ? 'act-color' : ''"
v-for="(item, index) in list"
:key="index"
class="ins-name"
@click="choose(index)"
>
{{ item.name }}
</span>
class="ins-name"
v-for="(item, index) in list"
>{{ item.name }}</span>
</div>
</div>
</div>
<div class="inner d-flex flex-wrap">
<div class="pro-box" v-for="(item, index) in lists" :key="index" :class="(index + 1) % 4 === 0 ? 'margin-0' : ''">
<div
:class="(index + 1) % 4 === 0 ? 'margin-0' : ''"
:key="index"
class="pro-box"
v-for="(item, index) in lists"
>
<p class="pro-title">{{ item.title }}</p>
<p class="pro-content">{{ item.content }}</p>
<p class="pro-time">时间{{ item.time }}</p>
@ -30,12 +33,13 @@
<div class="inner">
<a-pagination
:current="current"
:total="total"
:page-size="pageSize"
:total="total"
@change="onShowSizeChange"
class="pagination"
show-less-items
show-quick-jumper
v-show="total > 8"
/>
</div>
</div>

18
src/views/Challenge/Children/Release.vue

@ -10,18 +10,21 @@
<span class="ins-title">技术领域</span>
<span
:class="item.isActive ? 'act-color' : ''"
v-for="(item, index) in list"
:key="index"
class="ins-name"
@click="choose(index)"
>
{{ item.name }}
</span>
class="ins-name"
v-for="(item, index) in list"
>{{ item.name }}</span>
</div>
</div>
</div>
<div class="inner d-flex flex-wrap">
<div class="pro-box" v-for="(item, index) in lists" :key="index" :class="(index + 1) % 4 === 0 ? 'margin-0' : ''">
<div
:class="(index + 1) % 4 === 0 ? 'margin-0' : ''"
:key="index"
class="pro-box"
v-for="(item, index) in lists"
>
<p class="pro-title">{{ item.title }}</p>
<p class="pro-content">{{ item.content }}</p>
<p class="pro-time">时间{{ item.time }}</p>
@ -31,12 +34,13 @@
<div class="inner">
<a-pagination
:current="current"
:total="total"
:page-size="pageSize"
:total="total"
@change="onShowSizeChange"
class="pagination"
show-less-items
show-quick-jumper
v-show="total > 8"
/>
</div>
</div>

1
src/views/Community/Community.vue

@ -66,6 +66,7 @@
class="pagination"
show-less-items
show-quick-jumper
v-show="total > 5"
/>
</div>
</template>

22
src/views/IncubationPlatform/Children/Services.vue

@ -9,15 +9,28 @@
<div class="flow-title">服务流程</div>
<div class="flow-content">
<span class="login-color">注册登录</span> 后通过直接申请或加入购物车进行申请服务 直接申请后在个人中心查看 加入
<span class="login-color">购物车</span> 后可通过顶部菜单栏的购物车查看
<span @click="$router.push('/register')" class="login-color">注册</span>
<span @click="$router.push('/login')" class="login-color">登录</span> 后通过直接申请或加入购物车进行申请服务 直接申请后在个人中心查看 加入
<span
@click="$router.push('/Cart')"
class="login-color"
>购物车</span> 后可通过顶部菜单栏的购物车查看
</div>
</div>
<div class="inner d-flex flex-wrap">
<div :class="(index + 1) % 4 === 0 ? 'margin-0' : ''" :key="index" class="item-box" v-for="(item, index) in list">
<div
:class="(index + 1) % 4 === 0 ? 'margin-0' : ''"
:key="index"
class="item-box"
v-for="(item, index) in list"
>
<img :src="item.imgUrl" style="height: 220px; width: 100%; border: 1px solid #ccc" />
<p class="font-24 my-4">{{ item.name }}</p>
<p @click="jump(item.id)" class="font-16 baseColor" style="text-align: right; cursor: pointer">了解更多</p>
<p
@click="jump(item.id)"
class="font-16 baseColor"
style="text-align: right; cursor: pointer"
>了解更多</p>
</div>
</div>
<div class="inner">
@ -29,6 +42,7 @@
class="pagination"
show-less-items
show-quick-jumper
v-show="total > 8"
/>
</div>
</div>

27
src/views/IncubationPlatform/Children/place/EntitySpace.vue

@ -93,11 +93,12 @@
<a-pagination
:current="current"
:page-size="pageSize"
:total="total"
:total="lists.length"
@change="onShowSizeChange"
class="pagination"
show-less-items
show-quick-jumper
v-show="lists.length > 18"
/>
</div>
</div>
@ -125,10 +126,28 @@ export default {
],
type: '1',
list: [],
pageSize: 20,
total: 20,
pageSize: 18,
current: 1,
lists: ['XX企业', 'XX企业', 'XX企业', 'XX企业', 'XX企业', 'XX企业', 'XX企业', 'XX企业', 'XX企业'],
lists: [
'XX企业',
'XX企业',
'XX企业',
'XX企业',
'XX企业',
'XX企业',
'XX企业',
'XX企业',
'XX企业',
'XX企业',
'XX企业',
'XX企业',
'XX企业',
'XX企业',
'XX企业',
'XX企业',
'XX企业',
'XX企业',
],
lists1: ['XX企业', 'XX企业', 'XX企业', 'XX企业', 'XX企业', 'XX企业', 'XX企业', 'XX企业', 'XX企业'],
};
},

22
src/views/Industry/Children/Serve.vue

@ -8,16 +8,30 @@
<div class="flow-path">
<div class="flow-title">服务流程</div>
<div class="flow-content">
<span class="login-color">注册登录</span> 后通过直接申请或加入购物车进行申请服务 直接申请后在个人中心查看 加入
<span class="login-color">购物车</span> 后可通过顶部菜单栏的购物车查看
<span @click="$router.push('/register')" class="login-color">注册</span>
<span @click="$router.push('/login')" class="login-color">登录</span> 后通过直接申请或加入购物车进行申请服务 直接申请后在个人中心查看 加入
<span
@click="$router.push('/Cart')"
class="login-color"
>购物车</span> 后可通过顶部菜单栏的购物车查看
</div>
</div>
<div class="inner d-flex flex-wrap" style="margin: 60px auto">
<div v-for="(item, index) in list" :key="index" class="item-box" :class="(index + 1) % 3 === 0 ? 'margin-0' : ''">
<div
:class="(index + 1) % 3 === 0 ? 'margin-0' : ''"
:key="index"
class="item-box"
v-for="(item, index) in list"
>
<img :src="item.picUrl" style="height: 220px; width: 100%; border: 1px solid #ccc" />
<p class="font-24 item-title">{{ item.name }}</p>
<p class="font-24 my-4 item-content">{{ item.intro }}</p>
<p class="font-16 baseColor" style="text-align: right; cursor: pointer" @click="jump(item.id)">了解更多</p>
<p
@click="jump(item.id)"
class="font-16 baseColor"
style="text-align: right; cursor: pointer"
>了解更多</p>
</div>
</div>
</div>

15
src/views/Industry/Children/Union.vue

@ -38,22 +38,28 @@
</div>
<div class="center-content">
<div class="d-flex flex-wrap">
<div v-for="(item, index) in lists" :key="index" class="ent-box" :class="(index + 1) % 3 === 0 ? 'margin-0' : ''">
<div
:class="(index + 1) % 3 === 0 ? 'margin-0' : ''"
:key="index"
class="ent-box"
v-for="(item, index) in lists"
>
<p class="ent-index">{{ index + 1 }}</p>
<span class="ent-name" style="margin-left: 50px">{{ item }}</span>
</div>
</div>
</div>
<div class="reg-box">
<a-button class="" type="primary" style="float: left">入驻企业注册</a-button>
<a-button class style="float: left" type="primary">入驻企业注册</a-button>
<a-pagination
:current="current"
:total="total"
:page-size="pageSize"
:total="lists.length"
@change="onShowSizeChange"
class="pagination"
show-less-items
show-quick-jumper
v-show="lists.length > 18"
/>
</div>
</div>
@ -76,8 +82,7 @@ export default {
{ name: '产业创新联盟', url: '' },
],
list: [],
pageSize: 20,
total: 20,
pageSize: 18,
current: 1,
lists: ['XX企业', 'XX企业', 'XX企业', 'XX企业', 'XX企业', 'XX企业', 'XX企业', 'XX企业', 'XX企业'],
};

11
src/views/ItInformation/ItInformation.vue

@ -6,7 +6,7 @@
<template>
<div class="box">
<div class="info-box" v-for="item in lists" :key="item.title">
<div :key="item.title" class="info-box" v-for="item in lists">
<div class="date-box">
<p class="date-mon">{{ monthEnglish[item.time.split('-')[1] - 1] }}.</p>
<p class="date-day">{{ item.time.split('-')[2] }}</p>
@ -25,13 +25,14 @@
{{ item.time }}
</div>
<a-pagination
show-quick-jumper
:current="current"
:page-size="pageSize"
class="pagination"
:total="total"
:current="current"
show-less-items
@change="onShowSizeChange"
class="pagination"
show-less-items
show-quick-jumper
v-show="total > 5"
/>
</div>
</template>

22
src/views/NewPlatform/Children/Service.vue

@ -8,16 +8,30 @@
<div class="flow-path">
<div class="flow-title">服务流程</div>
<div class="flow-content">
<span class="login-color">注册登录</span> 后通过直接申请或加入购物车进行申请服务 直接申请后在个人中心查看 加入
<span class="login-color">购物车</span> 后可通过顶部菜单栏的购物车查看
<span @click="$router.push('/register')" class="login-color">注册</span>
<span @click="$router.push('/login')" class="login-color">登录</span> 后通过直接申请或加入购物车进行申请服务 直接申请后在个人中心查看 加入
<span
@click="$router.push('/Cart')"
class="login-color"
>购物车</span> 后可通过顶部菜单栏的购物车查看
</div>
</div>
<div class="inner d-flex flex-wrap" style="margin: 60px auto">
<div v-for="(item, index) in list" :key="index" class="item-box" :class="(index + 1) % 4 === 0 ? 'margin-0' : ''">
<div
:class="(index + 1) % 4 === 0 ? 'margin-0' : ''"
:key="index"
class="item-box"
v-for="(item, index) in list"
>
<img :src="item.picUrl" style="height: 220px; width: 100%; border: 1px solid #ccc" />
<p class="font-24 item-title">{{ item.name }}</p>
<p class="font-24 my-4 item-content">{{ item.intro }}</p>
<p class="font-16 baseColor" style="text-align: right; cursor: pointer" @click="jump(item.id)">了解更多</p>
<p
@click="jump(item.id)"
class="font-16 baseColor"
style="text-align: right; cursor: pointer"
>了解更多</p>
</div>
</div>
</div>

14
src/views/NewPlatform/Children/components/DeEnt.vue

@ -16,7 +16,9 @@
>
<img :src="item.logoUrl" class="enterprise-pic my-2" />
<div class="font-bold-24 title-color my-2">{{ item.name }}</div>
<div class="font-16 textColor d-flex flex-wrap align-left fill-width enterprise-txt">{{ item.description }}</div>
<div
class="font-16 textColor d-flex flex-wrap align-left fill-width enterprise-txt"
>{{ item.description }}</div>
<div class="d-flex flex-nowrap fill-width py-5 enterprise-more">
<div class="flex-1"></div>
<span class="font-16 baseColor">
@ -28,7 +30,14 @@
<company-profile :show-profile="showProfile" @closeProfile="closeProfile" v-if="showProfile" />
</div>
<div class="inner d-flex flex-row-reverse pb-10 enterprise-page">
<a-pagination :default-page-size="6" :total="newPartners.length" @change="onChange" show-less-items v-model="current" />
<a-pagination
:page-size="pageSize"
:total="newPartners.length"
@change="onChange"
show-less-items
v-model="current"
v-show="newPartners.length > 6"
/>
</div>
</div>
</template>
@ -54,6 +63,7 @@ export default {
data() {
return {
current: 1,
pageSize: 6,
showProfile: false, //
};
},

1
src/views/Policy/components/PolicyList.vue

@ -64,6 +64,7 @@
class="pagination"
show-less-items
show-quick-jumper
v-show="total > 5"
/>
</div>
</template>

100
src/views/User/Login.vue

@ -3,11 +3,21 @@
<div class="d-flex flex-column box">
<!-- 切换登录方式 -->
<div class="d-flex justify-center my-4">
<a-button :class="type === 1 ? 'baseColor ' : 'textColor'" @click="type = 1" class="d-flex flex-column" type="link">
<a-button
:class="type === 1 ? 'baseColor ' : 'textColor'"
@click="type = 1"
class="d-flex flex-column"
type="link"
>
<span>免密登录</span>
<div class="head-top mt-1" v-if="type === 1"></div>
</a-button>
<a-button :class="type === 3 ? 'baseColor ' : 'textColor'" @click="type = 3" class="d-flex flex-column" type="link">
<a-button
:class="type === 3 ? 'baseColor ' : 'textColor'"
@click="type = 3"
class="d-flex flex-column"
type="link"
>
<span>账号登录</span>
<div class="head-top mt-1" v-if="type === 3"></div>
</a-button>
@ -17,28 +27,68 @@
<a-col :span="8" class="explain" flex="auto">
<!-- <a-form :form="form" v-model="valid"> -->
<a-form :form="form" @submit="handleSignIn">
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="手机号">
<a-input @change="changePhone" placeholder="请输入手机号" type="tel" v-decorator="['identifier', { rules: phoneRules }]" />
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="手机号"
>
<a-input
@change="changePhone"
placeholder="请输入手机号"
type="tel"
v-decorator="['identifier', { rules: phoneRules }]"
/>
</a-form-item>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="图片验证码" required>
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="图片验证码"
required
>
<div class="d-flex flex-nowrap">
<a-input placeholder="图片验证码" type="number" v-model="codeNum" />
<img :src="picCode.imageBase64" @click="changePicCode" class="code_img ml-2" v-if="picCode && picCode.imageBase64" />
<img
:src="picCode.imageBase64"
@click="changePicCode"
class="code_img ml-2"
v-if="picCode && picCode.imageBase64"
/>
<a-button @click="changePicCode" class="code_img ml-2" size="small" v-else>获取验证码</a-button>
<!-- <a-input v-decorator="['account', { rules: rules.account }]" /> -->
</div>
</a-form-item>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="短信验证码">
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="短信验证码"
>
<div class="d-flex flex-nowrap">
<a-input placeholder="请输入验证码" type="number" v-decorator="['credential', { rules: codeRules }]" />
<a-button class="ml-2" disabled type="primary" v-if="showInterval">重新发送 {{ interval }}</a-button>
<a-button :disabled="identifier && identifier.length !== 11" @click="getCode" class="ml-2" type="primary" v-else>
获取验证码
</a-button>
<a-input
placeholder="请输入验证码"
type="number"
v-decorator="['credential', { rules: codeRules }]"
/>
<a-button
class="ml-2"
disabled
type="primary"
v-if="showInterval"
>重新发送 {{ interval }}</a-button>
<a-button
:disabled="identifier && identifier.length !== 11"
@click="getCode"
class="ml-2"
type="primary"
v-else
>获取验证码</a-button>
</div>
</a-form-item>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="来源">
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="来源"
>
<a-select placeholder="请选择来源" v-decorator="['source']">
<a-select-option value="1">绿谷</a-select-option>
</a-select>
@ -71,16 +121,31 @@
<a-row class="d-flex flex-nowrap mt-4" type="flex" v-if="type === 3">
<a-col :span="8" class="explain" flex="auto">
<a-form :form="form" @submit="handleSignIn">
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="账号">
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="账号"
>
<a-input
placeholder="请输入用户名/手机号"
v-decorator="['identifier', { rules: [{ required: true, message: '请输入用户名/手机号' }] }]"
/>
</a-form-item>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="密码">
<a-input-password placeholder="请输入6-16位数字和字母密码" v-decorator="['credential', { rules: passwordRules }]" />
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="密码"
>
<a-input-password
placeholder="请输入6-16位数字和字母密码"
v-decorator="['credential', { rules: passwordRules }]"
/>
</a-form-item>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="来源">
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="来源"
>
<a-select placeholder="请选择来源" v-decorator="['source']">
<a-select-option value="1">绿谷</a-select-option>
</a-select>
@ -182,6 +247,7 @@ export default {
const { identifier, credential, source } = values;
const { type } = this;
const params = { data: { identifier, credential, source }, type, client: SIGN_IN_CLIENTS.h5 };
console.log('params: ', params);
await this.signIn(params);
//
const { query } = this.$route;

Loading…
Cancel
Save