Browse Source

细节修改

master
lucky 5 years ago
parent
commit
9a652f6d0e
  1. 2
      src/components/CoreOrgan/CoreOrgan.vue
  2. 2
      src/components/Introduce/AddShopping.vue
  3. 4
      src/components/Introduce/IntentionModel.vue
  4. 12
      src/components/Introduce/SettledModel.vue
  5. 2
      src/components/PlatformList/Fruit.vue
  6. 10
      src/components/PlatformList/PlatformList.vue
  7. 95
      src/components/User/MechanismSignUp.vue
  8. 87
      src/components/User/PersonalSignUp.vue
  9. 35
      src/views/Activity/ActDetails.vue
  10. 30
      src/views/Activity/Activity.vue
  11. 104
      src/views/Activity/components/Enroll.vue
  12. 19
      src/views/Cart/Cart.vue
  13. 23
      src/views/Community/ComDetails.vue
  14. 6
      src/views/Community/Community.vue
  15. 15
      src/views/FirstPage/FirstPage.vue
  16. 13
      src/views/IncubationPlatform/Children/Products.vue
  17. 106
      src/views/IncubationPlatform/Children/Services.vue
  18. 4
      src/views/IncubationPlatform/components/AddModel.vue
  19. 4
      src/views/Industry/Children/Serve.vue
  20. 10
      src/views/ItInformation/ItDetails.vue
  21. 2
      src/views/ItInformation/ItInformation.vue
  22. 4
      src/views/NewPlatform/Children/AchDet.vue
  23. 6
      src/views/NewPlatform/Children/Service.vue
  24. 6
      src/views/NewPlatform/Children/ServiceDet.vue
  25. 24
      src/views/NewPlatform/Children/Share.vue
  26. 6
      src/views/NewPlatform/Children/ShareChild/InsDet.vue
  27. 60
      src/views/NewPlatform/Children/ShareChild/Institute.vue
  28. 15
      src/views/NewPlatform/Children/Transfer.vue
  29. 12
      src/views/NewPlatform/Children/components/DeEnt.vue
  30. 141
      src/views/NewPlatform/components/NewModel.vue
  31. 2
      src/views/Policy/PolicyDetails.vue
  32. 2
      src/views/Policy/components/PolicyList.vue
  33. 73
      src/views/User/ForgetPassword.vue
  34. 99
      src/views/User/Login.vue
  35. 16
      src/views/User/Register.vue
  36. 4
      vue.config.js

2
src/components/CoreOrgan/CoreOrgan.vue

@ -55,7 +55,7 @@ export default {
}
} catch (error) {
// throw new Error(`SignIn.vue method getCode: ${error}`);
console.log(error);
// console.log(error);
}
},
},

2
src/components/Introduce/AddShopping.vue

@ -93,7 +93,7 @@ export default {
this.WinHeight = window.innerHeight;
var d = document.getElementById('ddd');
d.style.top = this.pageY - d.offsetHeight * 0.5 + 'px';
console.log(d.offsetWidth);
// console.log(d.offsetWidth);
d.style.right = this.WinWidth - this.pageX - d.offsetWidth * 0.5 + 'px';
d.style.display = 'block';
setTimeout(() => {

4
src/components/Introduce/IntentionModel.vue

@ -186,7 +186,7 @@ export default {
},
//
async getCode() {
console.log(111);
// console.log(111);
try {
const params = {
phone: this.platform.tel,
@ -197,7 +197,7 @@ export default {
this.getCodeInterval();
} catch (error) {
// throw new Error(`SignIn.vue method getCode: ${error}`);
console.log(error);
// console.log(error);
}
},

12
src/components/Introduce/SettledModel.vue

@ -271,7 +271,7 @@ export default {
},
//
async getCode() {
console.log(111);
// console.log(111);
try {
const params = {
phone: this.platform.tel,
@ -282,7 +282,7 @@ export default {
this.getCodeInterval();
} catch (error) {
// throw new Error(`SignIn.vue method getCode: ${error}`);
console.log(error);
// console.log(error);
}
},
//
@ -370,9 +370,9 @@ export default {
staffCount: this.platform.staffCount,
},
};
console.log(params);
// console.log(params);
const res = await Settled(params);
console.log(res);
// console.log(res);
const { code, msg, data } = res.data;
if (code === 200) {
this.$message.success('申请成功');
@ -386,11 +386,11 @@ export default {
this.platform.isIdCard = false;
} else {
throw msg;
console.log('失败1');
// console.log('1');
this.confirmLoading = false;
}
} catch (error) {
console.log('失败2');
// console.log('2');
this.$message.error(error);
this.confirmLoading = false;
}

2
src/components/PlatformList/Fruit.vue

@ -82,7 +82,7 @@ export default {
this.total = parseInt(data.total);
}
} catch (error) {
console.log(error);
// console.log(error);
}
},
//

10
src/components/PlatformList/PlatformList.vue

@ -45,7 +45,7 @@ export default {
computed: mapState('home', ['listState', 'labList', 'LabIpt', 'insList', 'InsIpt', 'shareCurrent', 'productList', 'productIpt']),
watch: {
shareCurrent(val) {
console.log(val);
// console.log(val);
this.monitor(this.listState);
},
labList(val) {
@ -99,7 +99,7 @@ export default {
},
created() {
this.current = this.shareCurrent;
console.log('this.listState: ', this.listState);
// console.log('this.listState: ', this.listState);
if (this.listState === 0) {
this.getSear();
} else if (this.listState === 1) {
@ -128,7 +128,7 @@ export default {
this.total = parseInt(data.total);
}
} catch (error) {
console.log(error);
// console.log(error);
}
},
//
@ -149,7 +149,7 @@ export default {
this.total = parseInt(data.total);
}
} catch (error) {
console.log(error);
// console.log(error);
}
},
//
@ -170,7 +170,7 @@ export default {
this.total = parseInt(data.total);
}
} catch (error) {
console.log(error);
// console.log(error);
}
},
//

95
src/components/User/MechanismSignUp.vue

@ -13,12 +13,7 @@
>
<a-input v-decorator="['account']" />
</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>
<a-select placeholder="请选择单位性质" v-decorator="['nature']">
<a-select-option value="1">高校</a-select-option>
<a-select-option value="2">初中</a-select-option>
@ -42,32 +37,13 @@
>
<a-input v-decorator="['code1']" />
</a-form-item>
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="登录密码"
required
>
<a-input-password
placeholder="密码由字母和数字混合组成,6-16位字符"
v-decorator="['password', { rules: passwordRules }]"
/>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="登录密码" required>
<a-input-password placeholder="密码由字母和数字混合组成,6-16位字符" v-decorator="['password', { rules: passwordRules }]" />
</a-form-item>
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="确认密码"
>
<a-input-password
placeholder="请再次输入您设置的密码"
v-decorator="['againCredential', { rules: againPassword }]"
/>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="确认密码">
<a-input-password placeholder="请再次输入您设置的密码" v-decorator="['againCredential', { rules: againPassword }]" />
</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-input
@change="changePhone"
placeholder="该手机号用于账号激活、登录及找回密码"
@ -75,52 +51,21 @@
v-decorator="['phone', { 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"
/>
<a-button
@click="changePicCode"
class="code_img ml-2"
size="small"
type="primary"
v-else
>重新获取</a-button>
<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
>
<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-decorator="['smsCode', { rules: codeRules }]"
/>
<a-input placeholder="请输入验证码" type="number" v-decorator="['smsCode', { rules: codeRules }]" />
<a-button class="ml-2" disabled type="primary" v-if="showInterval">重新发送 {{ interval }}</a-button>
<a-button
:disabled="phone && phone.length !== 11"
@click="getCode"
class="ml-2"
type="primary"
v-else
>获取验证码</a-button>
<a-button :disabled="phone && phone.length !== 11" @click="getCode" class="ml-2" type="primary" v-else>获取验证码</a-button>
</div>
</a-form-item>
<a-form-item
<!-- <a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="来源"
@ -128,7 +73,7 @@
<a-select placeholder="请选择来源" v-decorator="['source', {initialValue: source }]">
<a-select-option value="1">绿谷</a-select-option>
</a-select>
</a-form-item>
</a-form-item> -->
<div class="d-flex flex-row-reverse">
<a-button block class="my-5" html-type="submit" style="width: 75%" type="primary">立即注册</a-button>
</div>
@ -219,15 +164,15 @@ export default {
e.preventDefault();
this.form.validateFields(async (err, values) => {
if (!err) {
console.log('Received values of form: ', values);
// console.log('Received values of form: ', values);
try {
const { account, nature, fullName, code1, password, phone, smsCode, source } = values;
this.info = values;
const params = { account, password, phone, smsCode, source };
const params = { account, password, phone, smsCode, source: 1 };
await this.signUp(params);
this.saveUserMes();
} catch (error) {
console.log(`mechanismSignUp.vue methods handleSignUp: ${error}`);
// console.log(`mechanismSignUp.vue methods handleSignUp: ${error}`);
}
}
});
@ -238,9 +183,9 @@ export default {
async saveUserMes() {
try {
const { account, nature, fullName, code1, password, phone, smsCode, source } = this.info;
console.log('this.info: ', this.info);
// console.log('this.info: ', this.info);
const params = { param: { code: code1, companyName: fullName, mold: nature, name: account, nickname: '', phone, type: 2 } };
console.log('params: ', params);
// console.log('params: ', params);
const res = await saveUserMes(params);
const { code, msg, data } = res.data;
if (code === 200) {
@ -252,7 +197,7 @@ export default {
throw msg;
}
} catch (error) {
console.log(`mechanismSignUp.vue methods saveUserMes: ${error}`);
// console.log(`mechanismSignUp.vue methods saveUserMes: ${error}`);
}
},
},

87
src/components/User/PersonalSignUp.vue

@ -22,31 +22,13 @@
>
<a-input maxlength="20" v-decorator="['nickname']" />
</a-form-item>
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="登录密码"
>
<a-input-password
placeholder="密码由字母和数字混合组成,6-16位字符"
v-decorator="['password', { rules: passwordRules }]"
/>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="登录密码">
<a-input-password placeholder="密码由字母和数字混合组成,6-16位字符" v-decorator="['password', { rules: passwordRules }]" />
</a-form-item>
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="确认密码"
>
<a-input-password
placeholder="请再次输入您设置的密码"
v-decorator="['againCredential', { rules: againPassword }]"
/>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="确认密码">
<a-input-password placeholder="请再次输入您设置的密码" v-decorator="['againCredential', { rules: againPassword }]" />
</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-input
@change="changePhone"
placeholder="该手机号用于账号激活、登录及找回密码"
@ -54,53 +36,22 @@
v-decorator="['phone', { 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"
/>
<a-button
@click="changePicCode"
class="code_img ml-2"
size="small"
type="primary"
v-else
>重新获取</a-button>
<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
>
<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-decorator="['smsCode', { rules: codeRules }]"
/>
<a-input placeholder="请输入验证码" type="number" v-decorator="['smsCode', { rules: codeRules }]" />
<a-button class="ml-2" disabled type="primary" v-if="showInterval">重新发送 {{ interval }}</a-button>
<a-button
:disabled="phone && phone.length !== 11"
@click="getCode"
class="ml-2"
type="primary"
v-else
>获取验证码</a-button>
<a-button :disabled="phone && phone.length !== 11" @click="getCode" class="ml-2" type="primary" v-else>获取验证码</a-button>
</div>
</a-form-item>
<a-form-item
<!-- <a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="来源"
@ -108,7 +59,7 @@
<a-select placeholder="请选择来源" v-decorator="['source', {initialValue: source }]">
<a-select-option value="1">绿谷</a-select-option>
</a-select>
</a-form-item>
</a-form-item> -->
<div class="d-flex flex-row-reverse">
<a-button block class="my-5" html-type="submit" style="width: 75%" type="primary">立即注册</a-button>
</div>
@ -199,15 +150,15 @@ export default {
e.preventDefault();
this.form.validateFields(async (err, values) => {
if (!err) {
console.log('Received values of form: ', values);
// console.log('Received values of form: ', values);
try {
const { account, nickname, password, phone, smsCode, source } = values;
this.info = values;
const params = { account, password, phone, smsCode, source };
const params = { account, password, phone, smsCode, source: 1 };
await this.signUp(params);
this.saveUserMes();
} catch (error) {
console.log(`personalSignUp.vue methods handleSignUp: ${error}`);
// console.log(`personalSignUp.vue methods handleSignUp: ${error}`);
}
}
});
@ -218,9 +169,9 @@ export default {
async saveUserMes() {
try {
const { account, nickname, password, phone, smsCode, source } = this.info;
console.log('this.info: ', this.info);
// console.log('this.info: ', this.info);
const params = { param: { name: account, nickname, phone, type: 1 } };
console.log('params: ', params);
// console.log('params: ', params);
const res = await saveUserMes(params);
const { code, msg, data } = res.data;
if (code === 200) {
@ -232,7 +183,7 @@ export default {
throw msg;
}
} catch (error) {
console.log(`personalSignUp.vue methods saveUserMes: ${error}`);
// console.log(`personalSignUp.vue methods saveUserMes: ${error}`);
}
},
},

35
src/views/Activity/ActDetails.vue

@ -17,24 +17,22 @@
</div>
<!-- </div> -->
<!-- <div class="policy-info"> -->
</div>
<div class="policy-content" v-dompurify-html="actDetail.content"></div>
<div class="policy-other">
<div>
<span>
<span style="font-size: 14px; margin-right: 10px"> 会议主题</span>
<!-- <a-icon class="baseColor" style="font-size: 14px; margin-right: 10px" type="clock-circle" /> -->
<span>{{ actDetail.theme }}</span>
</span>
<span style="margin-left: 60px">
<!-- <a-icon class="baseColor" style="margin-right: 10px" type="environment" /> -->
<span>{{ actDetail.organization }}</span>
</span>
<span style="font-size: 14px"> 会议主题 </span>
<span>{{ actDetail.theme }}</span>
</div>
<div>
<span style="font-size: 14px; margin-right: 10px"> 主讲嘉宾</span>
<span>{{ actDetail.organization }}</span>
</div>
<div>
<span style="font-size: 14px"> 主讲嘉宾 </span>
<span>{{ actDetail.name }}</span>
</div>
<div v-if="actDetail.other">其他事宜:{{ actDetail.other }}</div>
</div>
<div class="policy-content" v-dompurify-html="actDetail.content"></div>
<div class="policy-other" v-if="actDetail.other">其他事宜:{{ actDetail.other }}</div>
<a-button disabled style="margin: 50px 25px" v-if="actDetail.releaseTime && Date.parse(actDetail.releaseTime) < Date.parse(nowData)">
报名已结束
</a-button>
@ -56,7 +54,7 @@ export default {
created() {
//
var aData = new Date();
console.log(aData); //Wed Aug 21 2019 10:00:58 GMT+0800 ()
// console.log(aData); //Wed Aug 21 2019 10:00:58 GMT+0800 ()
this.nowData =
aData.getFullYear() +
'-' +
@ -69,7 +67,7 @@ export default {
aData.getMinutes() +
':' +
aData.getSeconds();
console.log(this.nowData); //2019-8-20
// console.log(this.nowData); //2019-8-20
},
methods: {},
};
@ -109,10 +107,9 @@ export default {
}
.policy-info {
height: 150px;
line-height: 50px;
height: 76px;
line-height: 76px;
text-align: center;
margin-bottom: 50px;
}
.policy-content {
@ -156,5 +153,9 @@ export default {
.policy-other {
margin: 50px 25px;
font-size: 16px;
color: rgba(0, 0, 0, 0.65);
font-weight: 400;
font-family: Microsoft YaHei;
}
</style>

30
src/views/Activity/Activity.vue

@ -12,14 +12,7 @@
<a-checkbox :checked="sta.jz === 1" @click="cSta('jz')">讲座</a-checkbox>
<a-checkbox :checked="sta.sl === 1" @click="cSta('sl')">沙龙</a-checkbox>
</span>
<a-input-search
@search="getData"
class="search"
enter-button="搜索"
placeholder="请输入..."
style="width: 381px"
v-model="iptCon"
/>
<a-input-search @search="getData" class="search" enter-button="搜索" placeholder="请输入..." style="width: 381px" v-model="iptCon" />
</div>
<div class="policy-box">
<div :key="index" class="policy-list" v-for="(item, index) in lists">
@ -37,10 +30,7 @@
<span class="source">地点{{ item.address }}</span>
</p>
<p class="original">
<a-button
disabled
v-if="item.releaseTime && Date.parse(item.releaseTime) < Date.parse(nowData)"
>报名已结束</a-button>
<a-button disabled v-if="item.releaseTime && Date.parse(item.releaseTime) < Date.parse(nowData)">报名已结束</a-button>
<enroll :act-name="item.title" :activity-id="item.activityId" v-else />
</p>
</div>
@ -102,7 +92,7 @@ export default {
//
var aData = new Date();
console.log(aData); //Wed Aug 21 2019 10:00:58 GMT+0800 ()
// console.log(aData); //Wed Aug 21 2019 10:00:58 GMT+0800 ()
this.nowData =
aData.getFullYear() +
'-' +
@ -115,7 +105,7 @@ export default {
aData.getMinutes() +
':' +
aData.getSeconds();
console.log(this.nowData); //2019-8-20
// console.log(this.nowData); //2019-8-20
},
methods: {
...mapMutations('home', ['setActList', 'setActIpCon', 'setActCurrent', 'setActDetail']),
@ -138,7 +128,7 @@ export default {
this.total = parseInt(data.total);
}
} catch (error) {
console.log(error);
// console.log(error);
}
},
//
@ -146,10 +136,10 @@ export default {
this.aList = [];
if (this.sta[index] === 0) {
this.sta[index] = 1;
console.log(this.sta);
// console.log(this.sta);
} else {
this.sta[index] = 0;
console.log(this.sta);
// console.log(this.sta);
}
if (this.sta.ly === 1) {
this.aList = this.aList.concat(0);
@ -183,9 +173,9 @@ export default {
var time1 = date.getTime();
var time2 = date.valueOf();
var time3 = Date.parse(date);
console.log(time1); //1586254138000
console.log(time2); //1586254138000
console.log(time3); //1586254138000
// console.log(time1); //1586254138000
// console.log(time2); //1586254138000
// console.log(time3); //1586254138000
},
},
};

104
src/views/Activity/components/Enroll.vue

@ -2,110 +2,44 @@
<div>
<a-button @click="showModal" type="primary">立即报名</a-button>
<a-modal
:confirm-loading="confirmLoading"
:title="title"
:visible="visible"
@cancel="handleCancel"
@ok="handleOk"
width="50%"
>
<a-modal :confirm-loading="confirmLoading" :title="title" :visible="visible" @cancel="handleCancel" @ok="handleOk" width="50%">
<a-form :form="form">
<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 :value="actName" disabled />
</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>
<a-input placeholder="请输入申请单位..." v-model.trim="platform.companyName" />
</a-form-item>
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
class="mb-3"
label="参加人员"
required
>
<div :key="index" class="d-flex flex-nowrap mb-3" v-for="(item,index) in people">
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" class="mb-3" label="参加人员" required>
<div :key="index" class="d-flex flex-nowrap mb-3" v-for="(item, index) in people">
<a-input class="flex-1 mr-3" placeholder="姓名" v-model.trim="item.name" />
<a-input class="flex-1 mr-3" placeholder="职称" v-model.trim="item.duties" />
<a-input class="flex-1 mr-3" placeholder="职务" v-model.trim="item.positional" />
<a-button
@click="changePerson(index)"
icon="plus"
type="link"
v-if="index === people.length -1"
/>
<a-button @click="changePerson(index)" icon="plus" type="link" v-if="index === people.length - 1" />
</div>
</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>
<a-input placeholder="请输入联系人..." v-model.trim="platform.manName" />
</a-form-item>
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="联系电话"
required
>
<a-input
@change="changePhone"
placeholder="请输入联系电话.."
type="tel"
v-decorator="['tel', { rules: phoneRules }]"
/>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="联系电话" required>
<a-input @change="changePhone" placeholder="请输入联系电话.." type="tel" v-decorator="['tel', { 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="短信验证码"
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="platform.code" />
<a-button
class="code_img ml-2"
disabled
type="primary"
v-if="showInterval"
>重新发送 {{ interval }}</a-button>
<a-button
:disabled="platform.isTel === false"
@click="getCode"
class="code_img ml-2"
type="primary"
v-else
>获取验证码</a-button>
<a-button class="code_img ml-2" disabled type="primary" v-if="showInterval">重新发送 {{ interval }}</a-button>
<a-button :disabled="platform.isTel === false" @click="getCode" class="code_img ml-2" type="primary" v-else
>获取验证码</a-button
>
</div>
</a-form-item>
</a-form>
@ -249,7 +183,7 @@ export default {
peoples: people,
},
};
console.log('params: ', params);
// console.log('params: ', params);
const res = await apply(params);
const { code, msg, data } = res.data;
if (code === 200) {
@ -271,7 +205,7 @@ export default {
},
//
async getCode() {
console.log(111);
// console.log(111);
try {
const params = {
phone: this.platform.tel,
@ -282,7 +216,7 @@ export default {
this.getCodeInterval();
} catch (error) {
// throw new Error(`SignIn.vue method getCode: ${error}`);
console.log(error);
// console.log(error);
}
},

19
src/views/Cart/Cart.vue

@ -23,14 +23,8 @@
</div>
<div class="cart-box" v-if="cart && cart.length > 0">
<div :key="list.id" class="d-flex flex-column pa-5 white div-box mb-8" v-for="list in cart">
<p
class="font-bold-20 title-color"
>{{ list.type === 0 ? '服务' : list.type === 1 ? '设备' : '成果' }}</p>
<div
:key="index"
class="d-flex flex-nowrap flex-row mb-8"
v-for="(item, index) in list.carDetailList"
>
<p class="font-bold-20 title-color">{{ list.type === 0 ? '服务' : list.type === 1 ? '设备' : '成果' }}</p>
<div :key="index" class="d-flex flex-nowrap flex-row mb-8" v-for="(item, index) in list.carDetailList">
<img :src="item.picUrl" class="cart-pic mr-8" />
<div class="flex-1 flex-column">
<p class="font-bold-20 title-color">{{ item.name }}</p>
@ -40,12 +34,7 @@
</div>
<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"
/>
<cart-model :phone="phone" :show-model="showModel" @handleCancel="handleCancel" @submitCart="submitCart" />
</div>
</div>
</div>
@ -106,7 +95,7 @@ export default {
this.cart = data;
}
} catch (error) {
console.log(error);
// console.log(error);
}
},

23
src/views/Community/ComDetails.vue

@ -6,17 +6,9 @@
</div>
<div class="policy-info">
<span>
<a-avatar
:size="20"
:src="postDetail.avatarUrl"
style="margin-top: -4px; margin-right: 10px"
/>
<a-avatar :size="20" :src="postDetail.avatarUrl" style="margin-top: -4px; margin-right: 10px" />
<span style="margin-right: 60px">{{ postDetail.userName }}</span>
<a-icon
class="baseColor"
style="font-size: 14px; margin-right: 10px"
type="clock-circle"
/>
<a-icon class="baseColor" style="font-size: 14px; margin-right: 10px" type="clock-circle" />
<span>{{ postDetail.createdTime }}</span>
</span>
<span style="margin-left: 60px">
@ -30,12 +22,7 @@
<div class="coms-top">
<div :key="index" style="margin-top: 1em" v-for="(item, index) in coms">
<p style="color: #999">
<a-avatar
:size="20"
:src="item.avatarUrl"
alt
style="margin-top: -4px; margin-right: 4px"
/>
<a-avatar :size="20" :src="item.avatarUrl" alt style="margin-top: -4px; margin-right: 4px" />
<span style="margin-right: 10px">{{ item.userName }}</span>
<span>{{ item.creatTime }}</span>
</p>
@ -101,11 +88,11 @@ export default {
this.$message.success('评论成功');
this.getData();
} else {
console.log(msg);
// console.log(msg);
this.$message.error('评论失败');
}
} catch (error) {
console.log(error);
// console.log(error);
this.$message.error('评论失败');
}
},

6
src/views/Community/Community.vue

@ -130,14 +130,14 @@ export default {
const res = await selComment(params);
const { msg, data, code } = res.data;
if (code === 200) {
console.log(data);
// console.log(data);
this.lists = data.list;
this.total = parseInt(data.total);
} else {
console.log(msg);
// console.log(msg);
}
} catch (error) {
console.log(error);
// console.log(error);
}
},
//

15
src/views/FirstPage/FirstPage.vue

@ -11,12 +11,7 @@
<a-col :span="18">
<a-row class="mr-8">
<a-col :span="8" class="fill-width d-flex flex-nowrap flex-row justify-space-between">
<div
:key="platform.id"
@click="$router.push(platform.path)"
class="platform-box"
v-for="platform in platforms"
>
<div :key="platform.id" @click="$router.push(platform.path)" class="platform-box" v-for="platform in platforms">
<div class="d-flex flex-column align-center pointer">
<img :src="platform.url" />
<div class="platform-txt mt-3">{{ platform.firstName }}</div>
@ -164,9 +159,9 @@ export default {
const res = await frontSearchFriend(params);
const { data, code, msg } = res.data;
if (code === 200) {
console.log(data);
// console.log(data);
} else {
console.log(msg);
// console.log(msg);
}
},
@ -183,9 +178,9 @@ export default {
const res = await frontSearchCompany(params);
const { data, code, msg } = res.data;
if (code === 200) {
console.log(data);
// console.log(data);
} else {
console.log(msg);
// console.log(msg);
}
},

13
src/views/IncubationPlatform/Children/Products.vue

@ -16,16 +16,11 @@
@click="choose(index)"
class="ins-name"
v-for="(item, index) in productLists"
>{{ item.name }}</span>
>{{ item.name }}</span
>
</div>
<div class="flex-1 align-center">
<a-input-search
@search="searchProduct"
class="item-search"
enter-button="搜索"
placeholder="请输入"
v-model="productIpt"
/>
<a-input-search @search="searchProduct" class="item-search" enter-button="搜索" placeholder="请输入" v-model="productIpt" />
</div>
</div>
</div>
@ -90,7 +85,7 @@ export default {
}
}
} catch (error) {
console.log(error);
// console.log(error);
}
},

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

@ -42,94 +42,36 @@
v-show="total > 8"
/>
</div>
<a-modal
:confirm-loading="confirmLoading"
:visible="visible"
@cancel="handleCancel"
@ok="handleOk"
title="产品购买"
width="50%"
>
<a-modal :confirm-loading="confirmLoading" :visible="visible" @cancel="handleCancel" @ok="handleOk" title="产品购买" width="50%">
<a-form :form="form">
<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-model.trim="platform.companyName" />
</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>
<a-input placeholder="请输入联系人..." v-model.trim="platform.manName" />
</a-form-item>
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="联系电话"
required
>
<a-input
@change="changePhone"
placeholder="请输入联系电话.."
type="tel"
v-decorator="['tel', { rules: phoneRules }]"
/>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="联系电话" required>
<a-input @change="changePhone" placeholder="请输入联系电话.." type="tel" v-decorator="['tel', { 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="短信验证码"
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="platform.code" />
<a-button
class="code_img ml-2"
disabled
type="primary"
v-if="showInterval"
>重新发送 {{ interval }}</a-button>
<a-button
:disabled="platform.isTel === false"
@click="getCode"
class="code_img ml-2"
type="primary"
v-else
>获取验证码</a-button>
<a-button class="code_img ml-2" disabled type="primary" v-if="showInterval">重新发送 {{ interval }}</a-button>
<a-button :disabled="platform.isTel === false" @click="getCode" class="code_img 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-textarea
placeholder="请输入需求描述..."
style="height: 120px"
v-model.trim="platform.describe"
/>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="需求描述">
<a-textarea placeholder="请输入需求描述..." style="height: 120px" v-model.trim="platform.describe" />
</a-form-item>
<a-form-item
:label-col="formItemLayout.labelCol"
@ -137,16 +79,8 @@
label="上传附件"
v-show="typeData.type === 0"
>
<a-upload
:action="action"
:default-file-list="fileList"
@change="fileChange"
list-type="picture"
name="files"
>
<a-button>
<a-icon type="upload" />点击上传附件
</a-button>
<a-upload :action="action" :default-file-list="fileList" @change="fileChange" list-type="picture" name="files">
<a-button> <a-icon type="upload" />点击上传附件 </a-button>
</a-upload>
</a-form-item>
</a-form>
@ -257,13 +191,13 @@ export default {
this.list = data;
}
} catch (error) {
console.log(data);
// console.log(data);
}
},
//
jump(id) {
console.log(id);
// console.log(id);
this.setServiceArr([]);
this.setServiceArr(this.arr);
this.$router.push({
@ -343,7 +277,7 @@ export default {
},
//
async getCode() {
console.log(111);
// console.log(111);
try {
const params = {
phone: this.platform.tel,
@ -354,7 +288,7 @@ export default {
this.getCodeInterval();
} catch (error) {
// throw new Error(`SignIn.vue method getCode: ${error}`);
console.log(error);
// console.log(error);
}
},

4
src/views/IncubationPlatform/components/AddModel.vue

@ -178,7 +178,7 @@ export default {
},
//
async getCode() {
console.log(111);
// console.log(111);
try {
const params = {
phone: this.platform.tel,
@ -189,7 +189,7 @@ export default {
this.getCodeInterval();
} catch (error) {
// throw new Error(`SignIn.vue method getCode: ${error}`);
console.log(error);
// console.log(error);
}
},

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

@ -238,7 +238,7 @@ export default {
},
//
async getCode() {
console.log(111);
// console.log(111);
try {
const params = {
phone: this.platform.tel,
@ -249,7 +249,7 @@ export default {
this.getCodeInterval();
} catch (error) {
// throw new Error(`SignIn.vue method getCode: ${error}`);
console.log(error);
// console.log(error);
}
},

10
src/views/ItInformation/ItDetails.vue

@ -6,11 +6,7 @@
</div>
<div class="policy-info">
<span>
<a-icon
class="baseColor"
style="font-size: 14px; margin-right: 10px"
type="clock-circle"
/>
<a-icon class="baseColor" style="font-size: 14px; margin-right: 10px" type="clock-circle" />
<span>{{ actDetail.time }}</span>
</span>
<span style="margin-left: 60px">
@ -34,7 +30,7 @@ export default {
created() {
//
var aData = new Date();
console.log(aData); //Wed Aug 21 2019 10:00:58 GMT+0800 ()
// console.log(aData); //Wed Aug 21 2019 10:00:58 GMT+0800 ()
this.nowData =
aData.getFullYear() +
'-' +
@ -47,7 +43,7 @@ export default {
aData.getMinutes() +
':' +
aData.getSeconds();
console.log(this.nowData); //2019-8-20
// console.log(this.nowData); //2019-8-20
},
methods: {},
};

2
src/views/ItInformation/ItInformation.vue

@ -71,7 +71,7 @@ export default {
this.lists[i].time = this.$moment(parseInt(this.lists[i].time) * 1000).format('YYYY-MM-DD');
}
} else {
console.log(msg);
// console.log(msg);
}
} catch (error) {
this.$message.error(error);

4
src/views/NewPlatform/Children/AchDet.vue

@ -87,11 +87,11 @@ export default {
const res = await selResMes(params);
const { code, data, msg } = res.data;
if (code === 200) {
console.log(data);
// console.log(data);
this.obj = data;
}
} catch (error) {
console.log(error);
// console.log(error);
}
},
},

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

@ -225,7 +225,7 @@ export default {
this.list = data;
}
} catch (error) {
console.log(data);
// console.log(data);
}
},
//
@ -310,7 +310,7 @@ export default {
},
//
async getCode() {
console.log(111);
// console.log(111);
try {
const params = {
phone: this.platform.tel,
@ -321,7 +321,7 @@ export default {
this.getCodeInterval();
} catch (error) {
// throw new Error(`SignIn.vue method getCode: ${error}`);
console.log(error);
// console.log(error);
}
},

6
src/views/NewPlatform/Children/ServiceDet.vue

@ -3,7 +3,7 @@
<div class="inner my-1">
<a-breadcrumb>
<a-breadcrumb-item>绿谷生物</a-breadcrumb-item>
<a-breadcrumb-item :key="index" v-for="(item,index) in serviceArr">
<a-breadcrumb-item :key="index" v-for="(item, index) in serviceArr">
<router-link :to="item.url">{{ item.name }}</router-link>
</a-breadcrumb-item>
</a-breadcrumb>
@ -63,11 +63,11 @@ export default {
const res = await selContent(params);
const { code, msg, data } = res.data;
if (code === 200) {
console.log(data);
// console.log(data);
this.obj = data;
}
} catch (error) {
console.log(error);
// console.log(error);
}
},
},

24
src/views/NewPlatform/Children/Share.vue

@ -15,16 +15,11 @@
@click="choose(index, 0)"
class="ins-name"
v-for="(item, index) in laboratory"
>{{ item.name }}</span>
>{{ item.name }}</span
>
</div>
<div class="flex-1 align-center">
<a-input-search
@search="searchLab"
class="item-search"
enter-button="搜索"
placeholder="搜索实验室"
v-model="LabIpt"
/>
<a-input-search @search="searchLab" class="item-search" enter-button="搜索" placeholder="搜索实验室" v-model="LabIpt" />
</div>
</div>
<div class="flex-3 flex-wrap" style="border-top: 1px solid rgba(0, 0, 0, 0.06)">
@ -36,16 +31,11 @@
@click="choose(index, 1)"
class="ins-name"
v-for="(item, index) in instrument"
>{{ item.name }}</span>
>{{ item.name }}</span
>
</div>
<div class="flex-1 align-center">
<a-input-search
@search="searchIns"
class="item-search"
enter-button="搜索"
placeholder="搜索仪器"
v-model="InsIpt"
/>
<a-input-search @search="searchIns" class="item-search" enter-button="搜索" placeholder="搜索仪器" v-model="InsIpt" />
</div>
</div>
</div>
@ -130,7 +120,7 @@ export default {
}
}
} catch (error) {
console.log(error);
// console.log(error);
}
},
//

6
src/views/NewPlatform/Children/ShareChild/InsDet.vue

@ -125,7 +125,7 @@ export default {
this.obj = data;
}
} catch (error) {
console.log(error);
// console.log(error);
}
},
@ -136,11 +136,11 @@ export default {
const res = await selProductMes(params);
const { code, data, msg } = res.data;
if (code === 200) {
console.log(data);
// console.log(data);
this.obj = data;
}
} catch (error) {
console.log(error);
// console.log(error);
}
},
},

60
src/views/NewPlatform/Children/ShareChild/Institute.vue

@ -21,8 +21,8 @@
<p @click="jump(item.id)" class="font-16 baseColor item-more">了解更多</p>
</div>
</div>
<p class="font-bold-24 item-title" v-if="obj !== null">人才团队带头人情况</p>
<div class="d-flex" v-if="obj !== null">
<p class="font-bold-24 item-title" v-if="teamHead.name !== '' || teamHead.name !== null">人才团队带头人情况</p>
<div class="d-flex" v-if="teamHead.name !== '' || teamHead.name !== null">
<div class="header-box" style="flex: 1">
<p style="background: #11b7ce; color: #fff">姓名</p>
<p>性别</p>
@ -36,21 +36,21 @@
<p>工作单位</p>
<p>研究方向</p>
</div>
<div class="header-box" style="flex: 5; background: #fff" v-if="obj">
<p style="border-bottom: 1px solid #eee">{{ obj.name }}</p>
<div class="header-box" style="flex: 5; background: #fff" v-if="teamHead.name !== '' || teamHead.name !== null">
<p style="border-bottom: 1px solid #eee">{{ teamHead.name }}</p>
<p>
<span v-if="obj.gender - 0 === 1"></span>
<span v-else-if="obj.gender - 0 === 2"></span>
<span v-if="teamHead.gender - 0 === 1"></span>
<span v-else-if="teamHead.gender - 0 === 2"></span>
</p>
<p>{{ obj.famousFamily }}</p>
<p>{{ obj.birthday }}</p>
<p>{{ obj.education }}</p>
<p>{{ obj.position }}</p>
<p>{{ obj.major }}</p>
<p>{{ obj.professional }}</p>
<p>{{ obj.teamName }}</p>
<p>{{ obj.workUnit }}</p>
<p>{{ obj.direction }}</p>
<p>{{ teamHead.famousFamily }}</p>
<p>{{ teamHead.birthday }}</p>
<p>{{ teamHead.education }}</p>
<p>{{ teamHead.position }}</p>
<p>{{ teamHead.major }}</p>
<p>{{ teamHead.professional }}</p>
<p>{{ teamHead.teamName }}</p>
<p>{{ teamHead.workUnit }}</p>
<p>{{ teamHead.direction }}</p>
</div>
</div>
<p class="font-bold-24 item-title" v-if="obj !== null">团队成员信息</p>
@ -65,7 +65,7 @@
</div>
<div v-if="obj.teamMemberList && obj.teamMemberList.length > 0">
<div :key="index" class="d-flex" v-for="(item, index) in obj.teamMemberList">
<div class="con-box" style="flex: 1">{{ item.name }}</div>
<div class="con-box" style="flex: 1">{{ item.tmName }}</div>
<div class="con-box" style="flex: 1">
<span v-if="item.gender - 0 === 1"></span>
<span v-else-if="item.gender - 0 === 2"></span>
@ -102,6 +102,19 @@ export default {
{ name: '科技资源开放共享服务平台', url: '/NewPlatform/Share' },
{ name: '研究院详情', url: '' },
],
teamHead: {
name: '',
gender: '',
famousFamily: '',
birthday: '',
education: '',
position: '',
major: '',
professional: '',
teamName: '',
workUnit: '',
direction: '',
},
obj: null,
list: [],
description: '',
@ -147,7 +160,7 @@ export default {
}
}
} catch (error) {
console.log(error);
// console.log(error);
}
},
//
@ -157,12 +170,23 @@ export default {
const res = await teamSearch(params);
const { code, msg, data } = res.data;
if (code === 200) {
this.teamHead.name = data[0].name;
this.teamHead.gender = data[0].gender;
this.teamHead.famousFamily = data[0].famousFamily;
this.teamHead.birthday = data[0].birthday;
this.teamHead.education = data[0].education;
this.teamHead.position = data[0].position;
this.teamHead.major = data[0].major;
this.teamHead.professional = data[0].professional;
this.teamHead.teamName = data[0].teamName;
this.teamHead.workUnit = data[0].workUnit;
this.teamHead.direction = data[0].direction;
if (data && data[0].teamMemberList.length > 0) {
this.obj = data[0];
}
}
} catch (error) {
console.log(error);
// console.log(error);
}
},
// /

15
src/views/NewPlatform/Children/Transfer.vue

@ -15,16 +15,11 @@
@click="choose(index)"
class="ins-name"
v-for="(item, index) in list"
>{{ item.name }}</span>
>{{ item.name }}</span
>
</div>
<div class="flex-1 align-center">
<a-input-search
@search="searchFruit"
class="item-search"
enter-button="搜索"
placeholder="搜索成果"
v-model="fruitIpt"
/>
<a-input-search @search="searchFruit" class="item-search" enter-button="搜索" placeholder="搜索成果" v-model="fruitIpt" />
</div>
</div>
</div>
@ -83,10 +78,10 @@ export default {
for (var i = 0; i < this.list.length; i++) {
this.list[i].isActive = false;
}
console.log(this.list);
// console.log(this.list);
}
} catch (error) {
console.log(error);
// console.log(error);
}
},
//

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

@ -41,14 +41,12 @@
</div>
</div>-->
<div v-if="newPartners && newPartners.length > 0">
<div :key="index" class="mb-4" v-for="(item,index) in newPartners">
<p
class="font-bold-24 title-color"
>{{ item.typeOfTech===0 ? '高校' : item.typeOfTech===1 ? '院所' : '企业' }}</p>
<div :key="index" class="mb-4" v-for="(item, index) in newPartners">
<p class="font-bold-24 title-color">{{ item.typeOfTech === 0 ? '高校' : item.typeOfTech === 1 ? '院所' : '企业' }}</p>
<div class="d-flex flex-wrap pointer">
<div
:class="(index+1)%4===0? 'logo-box1' : ''"
@click="openProfile(item.name,item.description)"
:class="(index + 1) % 4 === 0 ? 'logo-box1' : ''"
@click="openProfile(item.name, item.description)"
class="logo-box d-flex flex-column align-center justify-center white mb-8"
>
<img :src="item.logoUrl" class="logo-pic my-2" v-if="list.logoUrl" />
@ -100,7 +98,7 @@ export default {
arr.push(item);
}
}
console.log('arr: ', arr);
// console.log('arr: ', arr);
return arr;
}
return arr;

141
src/views/NewPlatform/components/NewModel.vue

@ -1,51 +1,20 @@
<template>
<div>
<a-button @click="showModal" type="primary">{{ str }}</a-button>
<a-modal
:confirm-loading="confirmLoading"
:title="title"
:visible="visible"
@cancel="handleCancel"
@ok="handleOk"
width="50%"
>
<a-modal :confirm-loading="confirmLoading" :title="title" :visible="visible" @cancel="handleCancel" @ok="handleOk" width="50%">
<a-form :form="form">
<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-model.trim="platform.companyName" />
</a-form-item>
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="单位性质"
>
<a-input placeholder="请输入单位性质..." v-model.trim="platform.companyType " />
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="单位性质">
<a-input placeholder="请输入单位性质..." v-model.trim="platform.companyType" />
</a-form-item>
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
class="fill-width"
>
<span class="title-color" style="margin-left:5%;">社会信用代码或组织机构代码</span>
<a-input
placeholder="请输入社会信用代码或组织机构代码..."
style="margin-left:27.5%;"
v-model.trim="platform.code "
/>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" class="fill-width">
<span class="title-color" style="margin-left: 5%">社会信用代码或组织机构代码</span>
<a-input placeholder="请输入社会信用代码或组织机构代码..." style="margin-left: 27.5%" v-model.trim="platform.code" />
</a-form-item>
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="所属领域"
>
<a-select
@change="handlePosition"
placeholder="请选择所属领域"
v-model.trim="platform.position "
>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="所属领域">
<a-select @change="handlePosition" placeholder="请选择所属领域" v-model.trim="platform.position">
<a-select-option value="1">功能食品协同创新中心</a-select-option>
<a-select-option value="2">现代医药</a-select-option>
<a-select-option value="3">生物医学工程</a-select-option>
@ -53,101 +22,41 @@
<a-select-option value="5">其他</a-select-option>
</a-select>
</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-input placeholder="请输入单位负责人..." v-model.trim="platform.ower" />
</a-form-item>
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="单位邮箱"
>
<a-input
:initial-value="platform.email"
placeholder="请输入单位邮箱..."
v-decorator="['email', { rules: emailRules }]"
/>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="单位邮箱">
<a-input :initial-value="platform.email" placeholder="请输入单位邮箱..." v-decorator="['email', { rules: emailRules }]" />
</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>
<a-input placeholder="请输入单位联系人..." v-model.trim="platform.contact" />
</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>
<a-input
@change="changePhone"
placeholder="请输入联系电话.."
type="phone"
v-decorator="['phone', {initialValue: platform.phone, rules: phoneRules }]"
v-decorator="['phone', { initialValue: platform.phone, 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="短信验证码"
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="platform.message" />
<a-button
class="code_img ml-2"
disabled
type="primary"
v-if="showInterval"
>重新发送 {{ interval }}</a-button>
<a-button
:disabled="isTel === false"
@click="getCode"
class="code_img ml-2"
type="primary"
v-else
>获取验证码</a-button>
<a-button class="code_img ml-2" disabled type="primary" v-if="showInterval">重新发送 {{ interval }}</a-button>
<a-button :disabled="isTel === false" @click="getCode" class="code_img 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-upload
:action="action"
:default-file-list="fileList"
@change="fileChange"
list-type="picture"
name="files"
>
<a-button>
<a-icon type="upload" />点击上传附件
</a-button>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="上传附件">
<a-upload :action="action" :default-file-list="fileList" @change="fileChange" list-type="picture" name="files">
<a-button> <a-icon type="upload" />点击上传附件 </a-button>
</a-upload>
</a-form-item>
</a-form>
@ -295,7 +204,7 @@ export default {
fileList: this.fileList,
},
};
console.log('params: ', params);
// console.log('params: ', params);
const res = await CreatingPlatformAdd(params);
const { code, msg, data } = res.data;
if (code === 200) {
@ -327,7 +236,7 @@ export default {
this.getCodeInterval();
} catch (error) {
// throw new Error(`SignIn.vue method getCode: ${error}`);
console.log(error);
// console.log(error);
}
},

2
src/views/Policy/PolicyDetails.vue

@ -58,7 +58,7 @@ export default {
window.scroll(0, 0);
}
} catch (error) {
console.log(error);
// console.log(error);
}
},
},

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

@ -133,7 +133,7 @@ export default {
window.scroll(0, 0);
}
} catch (error) {
console.log(error);
// console.log(error);
}
},
//

73
src/views/User/ForgetPassword.vue

@ -12,72 +12,25 @@
<a-row class="d-flex flex-nowrap mt-4" type="flex">
<a-col :span="8" class="explain" flex="auto">
<a-form :form="form" @submit="handleChangePassword">
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="手机号"
>
<a-input
@change="changePhone"
placeholder="请输入手机号"
type="tel"
v-decorator="['phone', { rules: phoneRules }]"
/>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="手机号">
<a-input @change="changePhone" placeholder="请输入手机号" type="tel" v-decorator="['phone', { 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="请输入图片验证码" 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>
<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="短信验证码"
>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="短信验证码">
<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="phone && phone.length !== 11"
@click="getCode"
class="ml-2"
type="primary"
v-else
>获取验证码</a-button>
<a-button class="ml-2" disabled type="primary" v-if="showInterval">重新发送 {{ interval }}</a-button>
<a-button :disabled="phone && phone.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-input-password
placeholder="请输入您设置的新密码"
v-decorator="['credential', { rules: passwordRules }]"
/>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="新密码">
<a-input-password placeholder="请输入您设置的新密码" v-decorator="['credential', { rules: passwordRules }]" />
</a-form-item>
<div class="d-flex flex-row-reverse">
<a-button block class="my-5" html-type="submit" style="width: 75%" type="primary">确认修改</a-button>
@ -98,7 +51,7 @@
<a-col :span="4" flex="150px">
<div class="d-flex flex-column">
<div>说明</div>
<div>1.登录账号XXX</div>
<div>1.请通过手机号和验证码修改密码</div>
</div>
</a-col>
</a-row>
@ -171,12 +124,12 @@ export default {
e.preventDefault();
this.form.validateFields(async (err, values) => {
if (!err) {
console.log('Received values of form: ', values);
// console.log('Received values of form: ', values);
try {
const { phone, credential } = values;
const { code, type } = this;
const params = { code, password: credential, phone };
console.log('params: ', params);
// console.log('params: ', params);
await this.changePassword(params);
this.$router.push('/login');
} catch (error) {

99
src/views/User/Login.vue

@ -3,21 +3,11 @@
<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>
@ -27,61 +17,25 @@
<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
@ -110,10 +64,10 @@
</div>
</div>
</a-col>
<a-col :span="4" flex="150px">
<a-col :span="4" flex="200px">
<div class="d-flex flex-column">
<div>说明</div>
<div>1.登录账号XXX</div>
<div>1.请使用手机号和验证码登录</div>
</div>
</a-col>
</a-row>
@ -121,25 +75,14 @@
<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="请输入密码"
v-decorator="['credential', { rules: passwordRules }]"
/>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="密码">
<a-input-password placeholder="请输入密码" v-decorator="['credential', { rules: passwordRules }]" />
</a-form-item>
<!-- <a-form-item
:label-col="formItemLayout.labelCol"
@ -166,10 +109,10 @@
</div>
</div>
</a-col>
<a-col :span="4" flex="150px">
<a-col :span="4" flex="200px">
<div class="d-flex flex-column">
<div>说明</div>
<div>1.登录账号XXX</div>
<div>1.请使用账号和密码登录</div>
</div>
</a-col>
</a-row>
@ -242,7 +185,7 @@ export default {
e.preventDefault();
this.form.validateFields(async (err, values) => {
if (!err) {
console.log('Received values of form: ', values);
// console.log('Received values of form: ', values);
try {
const { identifier, credential } = values;
const { type } = this;
@ -252,7 +195,7 @@ export default {
const { query } = this.$route;
this.$router.replace({ path: '/', query });
} catch (error) {
console.log(`Login.vue methods handleSignIn: ${error}`);
// console.log(`Login.vue methods handleSignIn: ${error}`);
}
}
});

16
src/views/User/Register.vue

@ -3,21 +3,11 @@
<div class="d-flex flex-column box1">
<!-- 切换注册方式 -->
<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>
@ -60,7 +50,7 @@ export default {
methods: {
callback(key) {
console.log(key);
// console.log(key);
},
//

4
vue.config.js

@ -13,8 +13,8 @@ const publicPath = process.env.VUE_APP_PUBLIC_PATH;
const proxyUrl = process.env.VUE_APP_PROXY_URL;
const apiUrl = process.env.VUE_APP_API_URL;
const title = process.env.VUE_APP_TITLE;
console.log('proxyUrl: ', proxyUrl);
console.log('apiUrl: ', apiUrl);
// console.log('proxyUrl: ', proxyUrl);
// console.log('apiUrl: ', apiUrl);
// 本地环境是否需要使用cdn
const devNeedCdn = true;

Loading…
Cancel
Save