Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
W
web-site
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张冬
web-site
Commits
a0cce051
Commit
a0cce051
authored
Oct 22, 2020
by
吴冠
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
流程
parent
58e5a72a
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
27 additions
and
55 deletions
+27
-55
list.js
common/list.js
+8
-0
index.vue
pages/index/index.vue
+0
-29
enquirydetails.vue
pages/index/notice/enquirydetails.vue
+3
-3
examine.vue
pages/login/examine.vue
+12
-11
user.vue
pages/login/user.vue
+2
-10
request.js
utils/request.js
+2
-2
No files found.
common/list.js
View file @
a0cce051
...
...
@@ -228,4 +228,11 @@ export function getnewsdetails(id){
url
:
`/news/content/
${
id
}
`
,
method
:
'get'
,
})
}
//审核失败后
export
function
getErrorInfo
(
id
){
return
request
({
url
:
`/company/detail/
${
id
}
`
,
method
:
'get'
,
})
}
\ No newline at end of file
pages/index/index.vue
View file @
a0cce051
...
...
@@ -100,27 +100,9 @@ import Cookies from "js-cookie"
let
mes
=
{
status
:
1
}
/* let mes1 = {
cateId:124
}
let mes2 = {
cateId:125
}
let mes3 = {
cateId:123
} */
/* const {data} = await getSecond() */
const
{
data
}
=
await
getLoopPic
(
mes
)
/* const res1 = await getListSite(mes1)
const res2 = await getListSite1(mes2)
const res3 = await getListSite2(mes3) */
return
{
/* dataList:data, */
picArr
:
data
,
/* dynamic1:res1,
dynamic2:res2,
dynamic3:res3, */
}
},
methods
:{
...
...
@@ -167,10 +149,6 @@ import Cookies from "js-cookie"
Merchant
(){
this
.
$router
.
push
(
'/login/examine'
)
},
/* async getCategoryList(){
const {data} = await getCategoryList()
this.dynamicList = data
}, */
async
getListSite
(){
let
me
=
{}
me
.
cateId
=
124
...
...
@@ -223,10 +201,6 @@ import Cookies from "js-cookie"
const
{
data
}
=
await
getLoopPic
(
message
)
this
.
picArr
=
data
},
//移入显示退出按钮
/* changeOver(){
this.isshow = true
}, */
//添加退出按钮 清空token
checkout
(){
Cookies
.
remove
(
"token"
)
...
...
@@ -235,7 +209,6 @@ import Cookies from "js-cookie"
pushH
(){
let
token
=
Cookies
.
get
(
"token"
)
if
(
token
){
/* window.location.href="http://192.168.200.201:8082/#/purchaser/Home" */
window
.
location
.
href
=
`http://60.205.251.80:8082/#/purchaser/Home?token=
${
token
}
`
}
}
...
...
@@ -498,8 +471,6 @@ import Cookies from "js-cookie"
width
:
12rem
;
margin
:
0
auto
;
position
:
relative
;
/* height:5.3rem; */
/* top:-310px; */
z-index
:
99999
}
</
style
>
pages/index/notice/enquirydetails.vue
View file @
a0cce051
...
...
@@ -218,10 +218,10 @@ export default {
}
},
prev
()
{
let
size
=
Cookies
.
get
(
"size"
)
||
10
/*
let size = Cookies.get("size")||10
let currentPage = Cookies.get("currentPage")||1
this
.
$router
.
push
(
`/notice/inquiry/?size=
${
size
}
¤tPage=
${
currentPage
}
¬iceType=ENQUIRY`
)
/* window.history.back() */
this.$router.push(`/notice/inquiry/?size=${size}¤tPage=${currentPage}¬iceType=ENQUIRY`)
*/
window
.
history
.
back
()
},
async
getenquirydetails
(
params
)
{
const
{
data
}
=
await
getenquirydetails
(
params
);
...
...
pages/login/examine.vue
View file @
a0cce051
...
...
@@ -666,6 +666,7 @@ import imgUpload from "~/components/Upload/imgUpload";
import
Identify
from
"~/components/identify"
;
import
citySelect
from
"~/components/citySelect"
;
import
Cookies
from
"js-cookie"
import
{
getErrorInfo
}
from
'~/common/list.js'
export
default
{
components
:
{
Identify
,
...
...
@@ -682,11 +683,8 @@ export default {
// this.getCordimg();
//如果是来自于auditStatus状态的话 说明有错误信息 重新把用户输入的信息自动填充
if
(
Cookies
.
get
(
"auditStatus"
)
==
"1"
){
this
.
active
==
2
this
.
form
=
Cookies
.
get
(
"form"
)
this
.
adminform
=
Cookies
.
get
(
"adminform"
)
this
.
perfectForm
=
Cookies
.
get
(
"perfectForm"
)
this
.
form
.
companyName
=
Cookies
.
get
(
"company"
)
this
.
active
==
1
this
.
getErrorInfo
()
}
Cookies
.
remove
(
"auditStatus"
)
},
...
...
@@ -1092,6 +1090,15 @@ export default {
};
},
methods
:
{
//code502填充注册所有信息
async
getErrorInfo
(){
let
companyErrorId
=
Cookies
.
get
(
"companyErrorId"
)
const
{
data
}
=
await
getErrorInfo
(
companyErrorId
)
this
.
form
=
data
.
form
/* this.adminform = data.adminform */
this
.
perfectForm
=
data
.
perfectForm
},
/* watchStatus(){
this.$router.push("auditStatus")
}, */
...
...
@@ -1206,12 +1213,6 @@ export default {
}
else
{
this
.
$message
.
error
(
error
)
}
//储存form和perfectForm注册有问题时回到这个页面
Cookies
.
set
(
"from"
,
this
.
form
)
Cookies
.
set
(
"adminform"
,
this
.
adminform
)
Cookies
.
set
(
"perfectForm"
,
this
.
perfectForm
)
Cookies
.
set
(
"company"
,
this
.
form
.
companyName
)
console
.
log
(
"this.companyName"
)
}
}
},
...
...
pages/login/user.vue
View file @
a0cce051
...
...
@@ -163,19 +163,11 @@
type
:
'error'
});
}
//储存公司id 审核未通过时自动填充数据
if
(
code
!==
200
){
Cookies
.
set
(
"code"
,
code
)
this
.
$router
.
push
(
"/login/auditStatus"
)
Cookies
.
set
(
"companyErrorId"
,
data
.
companyId
)
}
/* if(code ==501){
this.$router.push("auditStatus")
cookies.set("code",501)
}
if(code ==502){
this.$router.push("auditStatus")
cookies.set("code",502)
} */
}
}
catch
(
err
)
{
console
.
log
(
err
);
...
...
utils/request.js
View file @
a0cce051
...
...
@@ -8,8 +8,8 @@ import requestUrl from '../utils/Domain.js'
// 创建axios实例
const
service
=
axios
.
create
({
baseURL
:
'http://60.205.251.80:8082/apis'
,
/* baseURL: 'http://192.168.3.35:8085/apis', */
/* baseURL:'http://60.205.251.80:8082/apis', */
baseURL
:
'http://192.168.3.35:8085/apis'
,
timeout
:
35000
// 请求超时时间
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment