diff --git a/api/article.js b/api/article.js
index a0f0637..eb3aef9 100644
--- a/api/article.js
+++ b/api/article.js
@@ -9,32 +9,46 @@ import http from "@/utils/http.js";
/**
* 文创文章
*/
-export const getCulturalArticleAPI = (data) => http.get('/cultural/article', data, { noAuth: true })
+export const getCulturalArticleAPI = (data) => http.get('/cultural/article', data, {
+ noAuth: true
+})
/**
* 全民打卡
*/
-export const getTravelPunchcardAPI = (data) => request.get('/cultural/punchcard', data, { noAuth: true })
+export const getTravelPunchcardAPI = (data) => request.get('/cultural/punchcard', data, {
+ noAuth: true
+})
/**
* 官网攻略
*/
-export const getTravelWebStrategyAPI = (data) => request.get('/cultural/WebStrategy', data, { noAuth: true })
+export const getTravelWebStrategyAPI = (data) => request.get('/cultural/WebStrategy', data, {
+ noAuth: true
+})
/**
* 热门活动
*/
-export const getTravelHotPartyAPI = (data) => request.get('/cultural/hotparty', data, { noAuth: true })
+export const getTravelHotPartyAPI = (data) => request.get('/cultural/hotparty', data, {
+ noAuth: true
+})
/**
* 获取banner
*/
-export const getSlideAPI = (data) => request.get('/Slide/get_slide', data, { noAuth: true })
+export const getSlideAPI = (data) => request.get('/Slide/get_slide', data, {
+ noAuth: true
+})
/**
* 获取文章
*/
-export const getIndexArticleList = (data) => http.get('/article/indexs', data, { noAuth: true })
-export const getIndexArticleDetails = (data) => request.get('/article/details', data, { noAuth: true })
+export const getIndexArticleList = (data) => http.get('/article/indexs', data, {
+ noAuth: true
+})
+export const getIndexArticleDetails = (data) => request.get('/article/details', data, {
+ noAuth: true
+})
export const postIndexArticleDetails = (data) => request.post('/article/post', data)
export const getIndexArticleEdit = (data) => request.get('/article/edit', data)
export const postIndexArticleEdit = (data, params) => request.post('/article/put', data, {
- params: params
+ params: params
})
// 投诉
@@ -43,7 +57,9 @@ export const postComplaintAPI = (data) => request.post('/index/complaint', data)
//评论
export const getArticleComment = (data) => request.get('/article_comment/index', data)
export const getArticleCommentOneAPI = (data) => request.get('/article_comment/one_list', data)
-export const postArticleComment = (data) => request.post('/article_comment/post', data, { noVerify: true })
+export const postArticleComment = (data) => request.post('/article_comment/post', data, {
+ noVerify: true
+})
// 评论审核
export const getCommentListAPI = (data) => request.get('/Personal/getCommentList', data)
export const oneCAlickAuditAPI = (data) => request.get('/Personal/oneCAlickAudit', data)
@@ -52,7 +68,9 @@ export const delCommentAPI = (data) => request.get('/Personal/delComment', data)
/**
* 获取分类
*/
-export const getCategory = (data) => request.get('/common/category', data, { noAuth: true })
+export const getCategory = (data) => request.get('/common/category', data, {
+ noAuth: true
+})
//我的文章
export const getMyIndexArticleList = (data) => request.get('/my_article/index', data)
@@ -71,7 +89,7 @@ export const getArticleListAPI = (data) => http.get('/getArticleList', data)
export const getHomeListAPI = (data) => http.get('/article/hot_list', data)
//获取朋友圈分类信息
export const getFriendcirclelist = (data) => request.get('/Personal/getlist', data, {
- noVerify: true
+ noVerify: true
})
/** 发布图文*/
export const createPlantApi = (data) => request.post('/Personal/addOrEditNews', data)
@@ -79,7 +97,9 @@ export const createPlantApi = (data) => request.post('/Personal/addOrEditNews',
//图文详情
export const PlantApi = (data) => request.get('/Personal/getdetails', data)
//获取说说评论
-export const replyLstApi = (data) => request.get('/Personal/getpinglun', data, { noAuth: true })
+export const replyLstApi = (data) => request.get('/Personal/getpinglun', data, {
+ noAuth: true
+})
/**发布评论*/
export const replyCreateApi = (data) => request.post('/Personal/newsComment', data)
@@ -88,14 +108,31 @@ export const replyCreateApi = (data) => request.post('/Personal/newsComment', da
// export const deletePlantApi = (data) => request.post('/Personal/newsComment', data)
//朋友圈s
export const getfriendsList = (data) => request.get('/Personal/getalllist')
-export const getCategoryListAPI = (data) => request.get('/common/category', data, { noAuth: true })
+export const getCategoryListAPI = (data) => request.get('/common/category', data, {
+ noAuth: true
+})
export const getNoticeListAPI = (data) => request.get('/Notice/list')
export const getNoticeInfoAPI = (data) => request.get('/Notice/info', data)
-export const getArea = (data) => request.get('city/get_area', data, { noAuth: true })
-export const getStreet = (data) => request.get('city/get_street', data, { noAuth: true })
-export const getVillage = (data) => request.get('city/get_village', data, { noAuth: true })
-export const getbrigadeAPI = (data) => request.get('common/get_brigade', data, { noAuth: true })
-export const postBindingAPI = (data) => request.post('Userinfo/Binding', data, { noAuth: true, noVerify: true })
\ No newline at end of file
+export const getArea = (data) => request.get('city/get_area', data, {
+ noAuth: true
+})
+export const getArea_new = (data) => request.get('city/get_city', data, {
+ noAuth: true
+})
+
+export const getStreet = (data) => request.get('city/get_street', data, {
+ noAuth: true
+})
+export const getVillage = (data) => request.get('city/get_village', data, {
+ noAuth: true
+})
+export const getbrigadeAPI = (data) => request.get('common/get_brigade', data, {
+ noAuth: true
+})
+export const postBindingAPI = (data) => request.post('Userinfo/Binding', data, {
+ noAuth: true,
+ noVerify: true
+})
\ No newline at end of file
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index d689f0b..23bcdf4 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -95,8 +95,8 @@
公司性质
-
+
diff --git a/pages/users/user_about/index.vue b/pages/users/user_about/index.vue
index d9389a8..2d9eb8b 100644
--- a/pages/users/user_about/index.vue
+++ b/pages/users/user_about/index.vue
@@ -1,10 +1,11 @@
-
+
+
@@ -14,7 +15,6 @@
申请注销
-
@@ -34,7 +34,9 @@
userOut,
getLogout
} from '@/api/user.js'
- import { mapGetters } from "vuex";
+ import {
+ mapGetters
+ } from "vuex";
export default {
name: 'user_about',
data() {
@@ -55,7 +57,7 @@
this.setTitle(this.type)
},
methods: {
- toCancel(){
+ toCancel() {
uni.redirectTo({
url: '/pages/users/user_about/index?from=the_cancellation_prompt'
})
@@ -69,37 +71,41 @@
mask: true
});
this.moal = false;
- (new Promise(call=>{
+ (new Promise(call => {
userOut().then(res => {
- if(res.data.status === 200){
+ if (res.data.status === 200) {
uni.hideLoading()
call()
- }else{
+ } else {
uni.showModal({
title: '提示',
content: res.message,
- success: ({confirm}) => {
+ success: ({
+ confirm
+ }) => {
if (confirm) {
- userOut({key: res.data.result.key}).then(res => {
+ userOut({
+ key: res.data.result.key
+ }).then(res => {
uni.hideLoading()
- if(res.data.status === 200){
+ if (res.data.status === 200) {
call()
- }else{
+ } else {
this.$util.Tips({
title: res.message
});
}
})
- }else{
+ } else {
uni.hideLoading()
}
}
});
}
})
- })).then(v=>{
+ })).then(v => {
this.$store.commit("LOGOUT");
- setTimeout(()=>{
+ setTimeout(() => {
uni.reLaunch({
url: '/pages/index/index'
});
@@ -125,7 +131,7 @@
this.loaded = false;
cacheInfo(this.type).then(res => {
this.data = res.data[this.type]
- if(res.data.title) {
+ if (res.data.title) {
uni.setNavigationBarTitle({
title: res.data.title
})
@@ -173,36 +179,44 @@
padding: 30rpx;
color: #282828;
}
+
.cancelTxt {
overflow: hidden;
overflow-y: auto;
- image{
+
+ image {
max-width: 100%;
}
}
+
.cancel {
position: fixed;
bottom: 60rpx;
left: 0;
z-index: 1;
width: 100%;
+
.checkbox {
width: 50%;
text-align: center;
margin: 0 auto;
font-size: 24rpx;
font-weight: 400;
+
span {
margin-left: 5rpx;
}
+
.font {
color: var(--view-theme);
font-style: normal;
}
+
.iconfont {
font-size: 24rpx;
}
}
+
.btn {
width: 690rpx;
height: 90rpx;
@@ -218,6 +232,7 @@
}
}
}
+
.outMoal {
width: 100%;
height: 100%;
@@ -229,6 +244,7 @@
display: flex;
align-items: center;
justify-content: center;
+
.box {
position: fixed;
width: 590rpx;
@@ -238,15 +254,18 @@
border-radius: 20rpx;
text-align: center;
padding: 50rpx;
+
.title {
font-size: 30rpx;
font-weight: 600;
color: #282828;
}
+
.moalBtn {
margin-top: 43rpx;
display: flex;
justify-content: space-between;
+
.ok {
width: 234rpx;
height: 66rpx;
@@ -256,6 +275,7 @@
line-height: 66rpx;
color: var(--view-theme);
}
+
.no {
width: 234rpx;
height: 66rpx;
@@ -268,4 +288,4 @@
}
}
}
-
+
\ No newline at end of file
diff --git a/pages/users/user_address/index.vue b/pages/users/user_address/index.vue
index 244e250..f9e21f5 100644
--- a/pages/users/user_address/index.vue
+++ b/pages/users/user_address/index.vue
@@ -24,7 +24,7 @@
-
+
详细地址
{
- res = wgsToGcj(res);
+ res = wgsToGcj(res);
let latitude, longitude;
latitude = res.latitude.toString();
longitude = res.longitude.toString();
@@ -352,9 +353,9 @@
if (!that.addressInfo.length) return that.$util.Tips({
title: '请选择所在地区'
});
- if (!that.villageInfo.length) return that.$util.Tips({
- title: '请选择所在村队'
- });
+ // if (!that.villageInfo.length) return that.$util.Tips({
+ // title: '请选择所在村队'
+ // });
if (!value.detail) return that.$util.Tips({
title: '请填写详细地址'
});