Commit 65fb88fe authored by ‘yangmengxue’'s avatar ‘yangmengxue’

111

parent 70e9ac6d
......@@ -356,5 +356,6 @@
.annex_urls_name {
color: var(--color);
cursor: pointer;
}
}
\ No newline at end of file
......@@ -184,6 +184,7 @@
@closeCFSUDialog="closeCFSUDialog"
></confirm-sign-up>
<!-- 上传付款材料 -->
<!-- 银行卡支付 -->
<el-dialog
:before-close="handleClose"
:visible.sync="bankDialogVisible"
......@@ -270,6 +271,95 @@
<el-button @click="uploadConfirm" type="primary">确 定</el-button>
</span>
</el-dialog>
<!-- 微信二维码截图支付 -->
<el-dialog
:before-close="handleClose"
:visible.sync="wxImgDialogVisible"
title="微信二维码截图支付"
width="200"
@open="openBank"
>
<div class="bank_pay">
<img
style="width: 200px; margin: 10px 0"
:src="$store.state.tp_qr_code"
/>
<div
v-if="$store.state.tp_qr_note != null"
:class="
$store.state.indexIdentity == 'b670c2faa285477ea6a2fb1efeaf03a4' ||
$store.state.indexIdentity == '303c738d07b24a5b881d03d5177409a0' ||
$store.state.indexIdentity == 'd1a331f0140e4e49b1f3751c0cbf9660'
? 'redFont'
: ''
"
>
<span>备注:</span>{{ $store.state.tp_qr_note }}
</div>
<span>上传带有订单编号的转账截图</span>
<div class="image_add">
<div class="image_in">
<el-upload
:before-upload="beforeAvatarUpload"
:class="{ hide: hideUpload }"
:file-list="fileList"
:http-request="uploadPicture"
:limit="1"
:on-progress="handleUploadProgress"
:on-success="uploadSuccess"
accept=".jpg,.jpeg,.png"
action="#"
list-type="picture-card"
name="multipartFile"
ref="imgUrl"
>
<div slot="file" slot-scope="{ file }">
<div :key="idx" v-for="(item, idx) in fileList">
<img
:src="file.url"
alt=""
class="el-upload-list__item-thumbnail"
/>
<span class="el-upload-list__item-actions">
<span
@click="handlePictureCardPreview(file)"
class="el-upload-list__item-preview"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
@click="handleDownload(file)"
class="el-upload-list__item-delete"
v-if="!disabled"
>
<i class="el-icon-download"></i>
</span>
<span
@click="handleRemove(file)"
class="el-upload-list__item-delete"
v-if="!disabled"
>
<i class="el-icon-delete"></i>
</span>
</span>
</div>
</div>
<i class="el-icon-circle-plus"> </i>
</el-upload>
</div>
<el-dialog :visible.sync="dialogVisible">
<img :src="resultPicture" alt="" width="100%" />
</el-dialog>
</div>
</div>
<span class="dialog-footer" slot="footer">
<el-button @click="wxImgDialogVisible = false">取 消</el-button>
<el-button @click="uploadConfirm" type="primary">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
......@@ -318,11 +408,13 @@ export default {
dialogVisible: false,
fileList: [],
file: "",
file_image: {},
// file_image: {},
resultPicture: "",
disabled: false, //限制输入框
hideUpload: false,
isBank_infoFile: false,
//微信二维码支付
wxImgDialogVisible: false,
};
},
created() {
......@@ -360,8 +452,7 @@ export default {
},
// 子组件触发,关闭确认报名弹框
closeCFSUDialog(val, isSuccess) {
console.log(val, "val");
console.log(isSuccess, "isSuccess");
// console.log(val, "val");
this.confirmSignUpDialogFu = val;
if (isSuccess == 1) {
this.$emit("getstatus", 6);
......@@ -416,9 +507,16 @@ export default {
});
} else {
// transfer_account 判断微信支付宝或者银行卡支付
if (this.transfer_account == 0) {
console.log(this.$store.state.tp_qr_pay, "this.$store.state.tp_qr_pay");
if (this.$store.state.tp_qr_pay == 1) {
//tp_qr_pay 微信二维码截图支付
this.wxImgDialogVisible = true;
if (this.fileList.length >= 1) {
this.hideUpload = true;
}
} else if (this.transfer_account == 0) {
this.dialogChoose = true;
} else {
} else if (this.transfer_account == 1) {
this.bankDialogVisible = true;
if (this.fileList.length >= 1) {
this.hideUpload = true;
......@@ -537,17 +635,20 @@ export default {
// console.log("已经准备好上传图片", params);
this.file = params.file;
let raw = params.file;
console.log(raw);
let image = {
name: raw.name,
size: raw.size,
type: raw.type,
};
this.file_image = image;
this.getCosConfigs(this.file_image, params.file);
// console.log(image)
// this.file_image = image;
this.getCosConfigs(image, params.file);
},
// 上传截图
uploadConfirm() {
this.bankDialogVisible = false;
this.wxImgDialogVisible = false;
this.$message.success("提交成功");
// this.getOssConfigs(this.file_image, this.file);
},
......
......@@ -1319,7 +1319,11 @@
<div class="annex" v-show="$store.state.annex_key == 1">
<div class="cont_title">下载附件</div>
<div class="annex_remarks">{{ $store.state.annex_notice }}</div>
<div class="annex_urls_name">{{ annex_urls_name }}</div>
<div v-for="(item, index) in annexList" :key="index">
<div class="annex_urls_name" @click="downloadAnnexFile(item.url)">
{{ item.name }}
</div>
</div>
</div>
<div class="btn">
<el-button @click="confirm">提交资料</el-button>
......@@ -1360,6 +1364,7 @@ import {
getProAndCity,
getSchool,
setAccount,
downloadAnnex,
} from "r/index/signUp";
import COS from "cos-js-sdk-v5";
import { achievementCallBack, cosSignature } from "r/index/cosUpload";
......@@ -1849,7 +1854,7 @@ export default {
],
isShowStepsTips: false,
// 下载附件
annex_urls_name: null,
annexList: [],
};
},
created() {
......@@ -1915,7 +1920,7 @@ export default {
// 下载附件
let annex_urls = this.$store.state.annex_urls;
if (annex_urls != null) {
this.annex_urls_name = this.getSubstringAfterFourthSlash(annex_urls);
this.getAnnexName(annex_urls);
}
},
watch: {
......@@ -2001,14 +2006,32 @@ export default {
},
mounted() {},
methods: {
//正则-截取附件名称
getSubstringAfterFourthSlash(str) {
const parts = str.split("/"); // 使用斜杠分割字符串
if (parts.length > 4) {
// 确保有四个或更多的斜杠
return parts.slice(4).join("/"); // 返回第四个斜杠后的所有部分,用斜杠重新连接
}
return ""; // 如果没有足够的斜杠,返回空字符串
//下载附件
downloadAnnexFile(url) {
downloadAnnex({ enclosure_url: url }).then((res) => {
if (res.data.code != 200) {
return this.$message.error(res.data.msg);
}
let url = res.data.url;
let reg = /(\.pdf|\.txt|\.mp3|\.mp4)/;
if (reg.test(url)) {
window.open(url, "_black");
} else {
window.open(url, "_self");
}
this.$message.success("下载成功");
});
},
//截取附件名称
getAnnexName(str) {
let arr = str.split(",");
arr.forEach((i) => {
this.annexList.push({
name: i.split("annex/")[1],
url: i,
});
});
},
toShowSteps() {
this.isShowStepsTips = !this.isShowStepsTips;
......
......@@ -4,11 +4,11 @@
// export const SERVER_WS_URL = "wss://tgwapi.campcenter.cn"; // websocket
// 正式
// export const SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; // 正式环境
// export const DEVELOPMENT_SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; //开发环境
// export const SERVER_WS_URL = "wss://gwapi.campcenter.cn"; // websocket
export const SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; // 正式环境
export const DEVELOPMENT_SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; //开发环境
export const SERVER_WS_URL = "wss://gwapi.campcenter.cn"; // websocket
// 测试
export const SERVER_URL = "http://192.168.1.145:8088/modules-campsite"; // 正式环境
export const DEVELOPMENT_SERVER_URL = "http://192.168.1.145:8088/modules-campsite"; //开发环境
export const SERVER_WS_URL = "wss://192.168.1.145:8088"; // websocket
// export const SERVER_URL = "http://192.168.1.145:8088/modules-campsite"; // 正式环境
// export const DEVELOPMENT_SERVER_URL = "http://192.168.1.145:8088/modules-campsite"; //开发环境
// export const SERVER_WS_URL = "wss://192.168.1.145:8088"; // websocket
......@@ -139,3 +139,13 @@ export function setLog(data) {
params: data
})
}
//下载附件
export function downloadAnnex(data) {
  data['identity'] = store.state.indexIdentity;
  return request({
    method: 'post',
    url: '/web/download/getDownloadAnnex',
    params: data
  })
}
......@@ -214,10 +214,16 @@ function checkCam(code, cb) {
if (res.data.annex_urls != null) {
store.state.annex_key = res.data.annex_key;
// if (annex_notice != null) {
store.state.annex_notice = res.data.annex_notice;
store.state.annex_notice = res.data.annex_notice;
// }
store.state.annex_urls = res.data.annex_urls;
}
//是否使用微信二维码截图支付(和转账信息二选一)
if (res.data.tp_qr_pay == 1) {
store.state.tp_qr_pay = res.data.tp_qr_pay;
store.state.tp_qr_note = res.data.tp_qr_note;
store.state.tp_qr_code = res.data.tp_qr_code;
}
cb && cb(true);
}).catch(() => {
......
......@@ -34,6 +34,9 @@ let state = {
annex_key: null,//是否下载附件
annex_notice: null,
annex_key: null,
tp_qr_pay:null,//微信二维码截图支付
tp_qr_note:null,
tp_qr_code:null,
};
export default new Vuex.Store({
......
......@@ -25,7 +25,7 @@
</div>
</div>
<div class="cont_title_2">作业内容</div>
<div class="cont_info" v-html="work_contexts">}</div>
<div class="cont_info" v-html="work_contexts"></div>
<div class="cont_title_2">相关附件</div>
<div class="upload_box">
<div v-if="teaFileList.length > 0">
......
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