Commit 43904a41 authored by ‘yangmengxue’'s avatar ‘yangmengxue’

111

parent 2d5d6537
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
::v-deep .el-form-item { ::v-deep .el-form-item {
margin-bottom: 20px; margin-bottom: 20px;
height: 70px; // height: 70px;
.el-form-item__label { .el-form-item__label {
height: 32px; height: 32px;
...@@ -241,9 +241,10 @@ ...@@ -241,9 +241,10 @@
// 下载附件 // 下载附件
.annex { .annex {
>div{ >div {
margin-bottom: 10px; margin-bottom: 10px;
} }
.annex_remarks { .annex_remarks {
color: red; color: red;
font-size: 18px; font-size: 18px;
...@@ -253,4 +254,87 @@ ...@@ -253,4 +254,87 @@
color: var(--color); color: var(--color);
cursor: pointer; cursor: pointer;
} }
}
.annex_url {
.el-form-item__label {
width: 100%;
}
.upload_box {
// margin-top: 10px;
.img_list {
position: relative;
float: left;
width: 160px;
height: 120px;
text-align: center;
background: transparent;
border-radius: 4px;
border: 2px dashed #E1E3E6;
margin: 0 8px 8px 0;
padding: 5px;
display: flex;
flex-flow: column;
justify-content: center;
align-items: center;
>div {
width: 100%;
.el-image {
width: 30px;
height: 30px;
min-height: 30px;
display: block;
margin: 0 auto;
border: 0;
img {
width: auto;
height: auto;
max-width: 100% !important;
max-height: 100% !important;
}
}
.item_name {
font-size: 12px;
color: #999999;
line-height: 16px;
word-wrap: break-word;
margin: 5px 0 10px;
}
.item_remove {
width: 40px;
font-size: 12px;
color: #999999;
font-weight: bold;
line-height: 16px;
margin: 0 auto;
&:hover {
cursor: pointer;
color: red;
}
}
}
}
::v-deep .el-upload {
width: 170px !important;
height: 134px !important;
background: transparent;
border-radius: 4px;
border: 2px dashed #E1E3E6;
display: flex;
justify-content: center;
align-items: center;
}
}
} }
\ No newline at end of file
...@@ -25,10 +25,7 @@ ...@@ -25,10 +25,7 @@
</div> </div>
<!-- 报名流程提示 --> <!-- 报名流程提示 -->
<div <div class="vertical-steps" v-if="isShowStepsTips">
class="vertical-steps"
v-if="isShowStepsTips && (status == 0 || status == 2)"
>
<div class="vertical-steps-title">报名流程</div> <div class="vertical-steps-title">报名流程</div>
<div class="vertical_close" @click="toShowSteps"> <div class="vertical_close" @click="toShowSteps">
<i class="el-icon-close"></i> <i class="el-icon-close"></i>
...@@ -44,7 +41,11 @@ ...@@ -44,7 +41,11 @@
</div> </div>
</div> </div>
</div> </div>
<div class="referInfoTips" @click="toShowSteps"> <div
class="referInfoTips"
v-show="status == 0 || status == 1 || status == 2||status == 3 "
@click="toShowSteps"
>
<i class="el-icon-question"></i> <i class="el-icon-question"></i>
</div> </div>
</div> </div>
......
This diff is collapsed.
...@@ -9,6 +9,6 @@ export const DEVELOPMENT_SERVER_URL = "https://gwapi.campcenter.cn/modules-camps ...@@ -9,6 +9,6 @@ export const DEVELOPMENT_SERVER_URL = "https://gwapi.campcenter.cn/modules-camps
export const SERVER_WS_URL = "wss://gwapi.campcenter.cn"; // websocket export const SERVER_WS_URL = "wss://gwapi.campcenter.cn"; // websocket
// 测试 // 测试
// export const SERVER_URL = "http://192.168.1.145:8088/modules-campsite"; // 正式环境 // export const SERVER_URL = "http://192.168.8.204:8088/modules-campsite"; // 正式环境
// export const DEVELOPMENT_SERVER_URL = "http://192.168.1.145:8088/modules-campsite"; //开发环境 // export const DEVELOPMENT_SERVER_URL = "http://192.168.8.204:8088/modules-campsite"; //开发环境
// export const SERVER_WS_URL = "wss://192.168.1.145:8088"; // websocket // export const SERVER_WS_URL = "wss://192.168.8.204:8088"; // websocket
/* eslint-disable */ /* eslint-disable */
import {request} from '../network'; import { request } from '../network';
import store from '@/store'; import store from '@/store';
// 报名初始化 // 报名初始化
...@@ -73,7 +73,7 @@ export function delPic(data) { ...@@ -73,7 +73,7 @@ export function delPic(data) {
return request({ return request({
method: 'post', method: 'post',
url: '/web/auth/delPic', url: '/web/auth/delPic',
params:data params: data
}) })
} }
...@@ -142,10 +142,21 @@ export function setLog(data) { ...@@ -142,10 +142,21 @@ export function setLog(data) {
//下载附件 //下载附件
export function downloadAnnex(data) { export function downloadAnnex(data) {
  data['identity'] = store.state.indexIdentity; data['identity'] = store.state.indexIdentity;
  return request({ return request({
    method: 'post', method: 'post',
    url: '/web/download/getDownloadAnnex', url: '/web/download/getDownloadAnnex',
    params: data params: data
  }) })
}
//用户上传附件的接口地址
export function setAnnexUrl(data) {
data['identity'] = store.state.indexIdentity;
return request({
method: 'post',
url: '/web/signUp/setAnnexUrl',
data
})
} }
...@@ -224,6 +224,11 @@ function checkCam(code, cb) { ...@@ -224,6 +224,11 @@ function checkCam(code, cb) {
store.state.tp_qr_note = res.data.tp_qr_note; store.state.tp_qr_note = res.data.tp_qr_note;
store.state.tp_qr_code = res.data.tp_qr_code; store.state.tp_qr_code = res.data.tp_qr_code;
} }
//是否上传附件
if (res.data.user_annex_key == 1) {
store.state.user_annex_key = res.data.user_annex_key;
}
cb && cb(true); cb && cb(true);
}).catch(() => { }).catch(() => {
......
...@@ -37,6 +37,7 @@ let state = { ...@@ -37,6 +37,7 @@ let state = {
tp_qr_pay:null,//微信二维码截图支付 tp_qr_pay:null,//微信二维码截图支付
tp_qr_note:null, tp_qr_note:null,
tp_qr_code:null, tp_qr_code:null,
user_annex_key:null,//上传附件
}; };
export default new Vuex.Store({ export default new Vuex.Store({
......
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