From ff066fb8d926d9a75efdcfdfc1b37f890cd98d82 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 14 Aug 2021 16:02:39 +0800
Subject: [PATCH] 解决冲突
---
public/papers.html | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/public/papers.html b/public/papers.html
index b39f705..dfe0ad7 100644
--- a/public/papers.html
+++ b/public/papers.html
@@ -121,8 +121,8 @@
var examType = JSON.parse(getData("data")).examType;
// console.log(JSON.parse(getData("data")), 111);
- // axios.get('http://223.82.109.183:2080/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
- axios.get('http://localhost:81/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
+ axios.get('http://223.82.109.183:2080/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
+ // axios.get('http://localhost:81/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
var data = res.data.data;
var str = `<span class="title">${data.examName}</span>
<span class="title">准考证信息</span>
--
Gitblit v1.9.3