mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
DESKTOP-GMUNQ1B\k 2024-03-12 16:38:47 +08:00
parent f949519a32
commit 76fc202512
4 changed files with 103 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
api/article.js
View File

@ -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 * 获取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 getIndexArticleList = (data) => http.get('/article/indexs', data, {
export const getIndexArticleDetails = (data) => request.get('/article/details', data, { noAuth: true }) noAuth: true
})
export const getIndexArticleDetails = (data) => request.get('/article/details', data, {
noAuth: true
})
export const postIndexArticleDetails = (data) => request.post('/article/post', data) export const postIndexArticleDetails = (data) => request.post('/article/post', data)
export const getIndexArticleEdit = (data) => request.get('/article/edit', data) export const getIndexArticleEdit = (data) => request.get('/article/edit', data)
export const postIndexArticleEdit = (data, params) => request.post('/article/put', 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 getArticleComment = (data) => request.get('/article_comment/index', data)
export const getArticleCommentOneAPI = (data) => request.get('/article_comment/one_list', 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 getCommentListAPI = (data) => request.get('/Personal/getCommentList', data)
export const oneCAlickAuditAPI = (data) => request.get('/Personal/oneCAlickAudit', 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) 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 getHomeListAPI = (data) => http.get('/article/hot_list', data)
//获取朋友圈分类信息 //获取朋友圈分类信息
export const getFriendcirclelist = (data) => request.get('/Personal/getlist', data, { export const getFriendcirclelist = (data) => request.get('/Personal/getlist', data, {
noVerify: true noVerify: true
}) })
/** 发布图文*/ /** 发布图文*/
export const createPlantApi = (data) => request.post('/Personal/addOrEditNews', data) 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 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) 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) // export const deletePlantApi = (data) => request.post('/Personal/newsComment', data)
//朋友圈s //朋友圈s
export const getfriendsList = (data) => request.get('/Personal/getalllist') 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 getNoticeListAPI = (data) => request.get('/Notice/list')
export const getNoticeInfoAPI = (data) => request.get('/Notice/info', data) export const getNoticeInfoAPI = (data) => request.get('/Notice/info', data)
export const getArea = (data) => request.get('city/get_area', data, { noAuth: true }) export const getArea = (data) => request.get('city/get_area', data, {
export const getStreet = (data) => request.get('city/get_street', data, { noAuth: true }) 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 getArea_new = (data) => request.get('city/get_city', data, {
export const postBindingAPI = (data) => request.post('Userinfo/Binding', data, { noAuth: true, noVerify: true }) 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
})

4
pages/store/settled/index.vue
View File

@ -95,8 +95,8 @@
<text class="item-name">公司性质</text> <text class="item-name">公司性质</text>
<picker @change="natureBusinessChange" mode="selector" :value="index" <picker @change="natureBusinessChange" mode="selector" :value="index"
:range="companyTypeList"> :range="companyTypeList">
<input placeholder="请选择公司性质" type="text" readonly <input placeholder="请选择公司性质" type="text" readonly disabled
:value="nature_business===''?'':nature_business==1?'对公户':'个体户'"> :value="nature_business==''?'':nature_business==1?'对公户':'个体户'">
<view class='iconfont icon-jiantou'></view> <view class='iconfont icon-jiantou'></view>
</picker> </picker>
</view> </view>

54
pages/users/user_about/index.vue
View File

@ -1,10 +1,11 @@
<template> <template>
<view class="user_about" :style="viewColor"> <view class="user_about" :style="viewColor">
<view> <view style="height:calc(100vh - 220rpx);overflow: auto;">
<view class="text cancelTxt" :class="{cancelTxt: type == 'the_cancellation_msg'}"> <view class="text cancelTxt" :class="{cancelTxt: type == 'the_cancellation_msg'}">
<jyf-parser :html="data.replace(/<br\/>/ig, '')" ref="article" :tag-style="tagStyle"></jyf-parser> <jyf-parser :html="data.replace(/<br\/>/ig, '')" ref="article" :tag-style="tagStyle"></jyf-parser>
</view> </view>
</view> </view>
<view class="cancel" v-if="type == 'the_cancellation_msg' && loaded"> <view class="cancel" v-if="type == 'the_cancellation_msg' && loaded">
<view class="checkbox" @click="setCheck"> <view class="checkbox" @click="setCheck">
<text v-if="!check" class="iconfont icon-weixuanzhong"></text> <text v-if="!check" class="iconfont icon-weixuanzhong"></text>
@ -14,7 +15,6 @@
<view class="btn" @click="cancelBtn"> <view class="btn" @click="cancelBtn">
申请注销 申请注销
</view> </view>
</view> </view>
<view class="outMoal" v-if="moal"> <view class="outMoal" v-if="moal">
<view class="box"> <view class="box">
@ -34,7 +34,9 @@
userOut, userOut,
getLogout getLogout
} from '@/api/user.js' } from '@/api/user.js'
import { mapGetters } from "vuex"; import {
mapGetters
} from "vuex";
export default { export default {
name: 'user_about', name: 'user_about',
data() { data() {
@ -55,7 +57,7 @@
this.setTitle(this.type) this.setTitle(this.type)
}, },
methods: { methods: {
toCancel(){ toCancel() {
uni.redirectTo({ uni.redirectTo({
url: '/pages/users/user_about/index?from=the_cancellation_prompt' url: '/pages/users/user_about/index?from=the_cancellation_prompt'
}) })
@ -69,37 +71,41 @@
mask: true mask: true
}); });
this.moal = false; this.moal = false;
(new Promise(call=>{ (new Promise(call => {
userOut().then(res => { userOut().then(res => {
if(res.data.status === 200){ if (res.data.status === 200) {
uni.hideLoading() uni.hideLoading()
call() call()
}else{ } else {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: res.message, content: res.message,
success: ({confirm}) => { success: ({
confirm
}) => {
if (confirm) { if (confirm) {
userOut({key: res.data.result.key}).then(res => { userOut({
key: res.data.result.key
}).then(res => {
uni.hideLoading() uni.hideLoading()
if(res.data.status === 200){ if (res.data.status === 200) {
call() call()
}else{ } else {
this.$util.Tips({ this.$util.Tips({
title: res.message title: res.message
}); });
} }
}) })
}else{ } else {
uni.hideLoading() uni.hideLoading()
} }
} }
}); });
} }
}) })
})).then(v=>{ })).then(v => {
this.$store.commit("LOGOUT"); this.$store.commit("LOGOUT");
setTimeout(()=>{ setTimeout(() => {
uni.reLaunch({ uni.reLaunch({
url: '/pages/index/index' url: '/pages/index/index'
}); });
@ -125,7 +131,7 @@
this.loaded = false; this.loaded = false;
cacheInfo(this.type).then(res => { cacheInfo(this.type).then(res => {
this.data = res.data[this.type] this.data = res.data[this.type]
if(res.data.title) { if (res.data.title) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: res.data.title title: res.data.title
}) })
@ -173,36 +179,44 @@
padding: 30rpx; padding: 30rpx;
color: #282828; color: #282828;
} }
.cancelTxt { .cancelTxt {
overflow: hidden; overflow: hidden;
overflow-y: auto; overflow-y: auto;
image{
image {
max-width: 100%; max-width: 100%;
} }
} }
.cancel { .cancel {
position: fixed; position: fixed;
bottom: 60rpx; bottom: 60rpx;
left: 0; left: 0;
z-index: 1; z-index: 1;
width: 100%; width: 100%;
.checkbox { .checkbox {
width: 50%; width: 50%;
text-align: center; text-align: center;
margin: 0 auto; margin: 0 auto;
font-size: 24rpx; font-size: 24rpx;
font-weight: 400; font-weight: 400;
span { span {
margin-left: 5rpx; margin-left: 5rpx;
} }
.font { .font {
color: var(--view-theme); color: var(--view-theme);
font-style: normal; font-style: normal;
} }
.iconfont { .iconfont {
font-size: 24rpx; font-size: 24rpx;
} }
} }
.btn { .btn {
width: 690rpx; width: 690rpx;
height: 90rpx; height: 90rpx;
@ -218,6 +232,7 @@
} }
} }
} }
.outMoal { .outMoal {
width: 100%; width: 100%;
height: 100%; height: 100%;
@ -229,6 +244,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
.box { .box {
position: fixed; position: fixed;
width: 590rpx; width: 590rpx;
@ -238,15 +254,18 @@
border-radius: 20rpx; border-radius: 20rpx;
text-align: center; text-align: center;
padding: 50rpx; padding: 50rpx;
.title { .title {
font-size: 30rpx; font-size: 30rpx;
font-weight: 600; font-weight: 600;
color: #282828; color: #282828;
} }
.moalBtn { .moalBtn {
margin-top: 43rpx; margin-top: 43rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.ok { .ok {
width: 234rpx; width: 234rpx;
height: 66rpx; height: 66rpx;
@ -256,6 +275,7 @@
line-height: 66rpx; line-height: 66rpx;
color: var(--view-theme); color: var(--view-theme);
} }
.no { .no {
width: 234rpx; width: 234rpx;
height: 66rpx; height: 66rpx;
@ -268,4 +288,4 @@
} }
} }
} }
</style> </style>

17
pages/users/user_address/index.vue
View File

@ -24,7 +24,7 @@
</view> </view>
</view> </view>
<view class='item acea-row row-between-wrapper'> <!-- <view class='item acea-row row-between-wrapper'>
<view class='name'>所在村队</view> <view class='name'>所在村队</view>
<view class="region"> <view class="region">
<view class="region_count" @click="changevillage"> <view class="region_count" @click="changevillage">
@ -33,8 +33,7 @@
<text class="iconfont icon-xiangyou"></text> <text class="iconfont icon-xiangyou"></text>
</view> </view>
</view> </view>
</view> -->
</view>
<view class='item acea-row row-between-wrapper'> <view class='item acea-row row-between-wrapper'>
<view class='name'>详细地址</view> <view class='name'>详细地址</view>
<input type='text' class="location-input" placeholder='请填写具体地址' name='detail' <input type='text' class="location-input" placeholder='请填写具体地址' name='detail'
@ -86,7 +85,9 @@
editAddress, editAddress,
getAddressDetail getAddressDetail
} from '@/api/user.js'; } from '@/api/user.js';
import { wgsToGcj } from "@/utils/wgs.js"; import {
wgsToGcj
} from "@/utils/wgs.js";
import { import {
getCityV2, getCityV2,
getCityList getCityList
@ -287,7 +288,7 @@
uni.getLocation({ uni.getLocation({
type: 'gcj02', type: 'gcj02',
success: (res) => { success: (res) => {
res = wgsToGcj(res); res = wgsToGcj(res);
let latitude, longitude; let latitude, longitude;
latitude = res.latitude.toString(); latitude = res.latitude.toString();
longitude = res.longitude.toString(); longitude = res.longitude.toString();
@ -352,9 +353,9 @@
if (!that.addressInfo.length) return that.$util.Tips({ if (!that.addressInfo.length) return that.$util.Tips({
title: '请选择所在地区' title: '请选择所在地区'
}); });
if (!that.villageInfo.length) return that.$util.Tips({ // if (!that.villageInfo.length) return that.$util.Tips({
title: '请选择所在村队' // title: '请选择所在村队'
}); // });
if (!value.detail) return that.$util.Tips({ if (!value.detail) return that.$util.Tips({
title: '请填写详细地址' title: '请填写详细地址'
}); });