xiangshan
/
yxxh5
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

This commit is contained in:
lnn19986213 2023-09-19 13:33:56 +08:00
parent 55d4ccb7d8
commit e025d6ab0a
17 changed files with 180 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/pages/pageHome/pageHome.vue
View File

@ -10,7 +10,7 @@
<image src="../../static/icon11.png" mode="" class="appname"></image> <image src="../../static/icon11.png" mode="" class="appname"></image>
</view> </view>
<!-- 轮播图 --> <!-- 轮播图 -->
<u-swiper :list="list" indicator indicatorMode="line" circular></u-swiper> <u-swiper :list="list" keyName="imagePath" indicator indicatorMode="line" circular @click="goSwiDetail"></u-swiper>
<!-- 功能菜单 --> <!-- 功能菜单 -->
<view class="menus"> <view class="menus">
<u-grid :border="false" col="4"> <u-grid :border="false" col="4">
@ -259,9 +259,10 @@
let _this = this let _this = this
this.http.request('/indexImage/list', {}, "GET").then(res => { this.http.request('/indexImage/list', {}, "GET").then(res => {
if (res.code == 200) { if (res.code == 200) {
res.data.forEach(function(item) { // res.data.forEach(function(item) {
_this.list.push(item.imagePath) // _this.list.push(item.imagePath)
}) // })
this.list = res.data
// this.load = false // this.load = false
this.getEnjoy() this.getEnjoy()
} }
@ -439,6 +440,25 @@
url: '/pagesC/ActivitiesDetail/ActivitiesDetail?id=' + id url: '/pagesC/ActivitiesDetail/ActivitiesDetail?id=' + id
}) })
}, },
// 轮播图详情
goSwiDetail(index) {
let id = this.list[index].linkPath
let isOutLink = this.list[index].isOutLink
let linkType = this.list[index].linkType
if(isOutLink){
if(linkType == 'activity'){
uni.navigateTo({
url: '/pagesC/ActivitiesDetail/ActivitiesDetail?id=' + id
})
}else if(linkType == 'dynamic'){
uni.navigateTo({
url: '/pagesC/activity/activityDetail?id=' + id
})
}
}
},
callPhone() { callPhone() {
uni.makePhoneCall({ uni.makePhoneCall({
// 手机号 // 手机号

4
src/pagesA/msg/chat/chat.vue
View File

@ -681,6 +681,10 @@
position: fixed; position: fixed;
z-index: 20; z-index: 20;
bottom: 0; bottom: 0;
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
// 先constant再env
.voice, .voice,
.more { .more {

4
src/pagesB/ArtWorks/ArtWorks.vue
View File

@ -80,7 +80,7 @@
</view> </view>
<view class="time"> <view class="time">
{{ v.createdAt }} {{ v.releaseDate }}
</view> </view>
</view> </view>
</view> </view>
@ -129,7 +129,7 @@
// this.pages++ // this.pages++
// this.getMoreData(); // this.getMoreData();
// }, // },
onShow() { onLoad() {
this.list1 = [{ this.list1 = [{
name: '全部', name: '全部',
type: '', type: '',

2
src/pagesB/ArtWorks/artWorkDetail.vue
View File

@ -29,7 +29,7 @@
{{ detailData.user.userName }} {{ detailData.user.userName }}
</view> </view>
<view class=""> <view class="">
发布于{{detailData.createdAt}} 发布于{{detailData.releaseDate}}
</view> </view>
</view> </view>
</view> </view>

41
src/pagesB/MyPoints/MyPoints.vue
View File

@ -59,7 +59,7 @@
<view class="operation"> <view class="operation">
<u-button v-if="v.finish" type="default" plain size="small" color="#AFADB0"> 已完成 <u-button v-if="v.finish" type="default" plain size="small" color="#AFADB0"> 已完成
</u-button> </u-button>
<u-button v-else type="default" plain size="small" color="#99241B"> 未完成</u-button> <u-button v-else type="default" plain size="small" color="#99241B" @click="toFinish(v.name)"> 未完成</u-button>
</view> </view>
</view> </view>
</view> </view>
@ -106,7 +106,7 @@
<view class="operation"> <view class="operation">
<u-button v-if="v.finish" type="default" plain size="small" color="#AFADB0"> 已完成 <u-button v-if="v.finish" type="default" plain size="small" color="#AFADB0"> 已完成
</u-button> </u-button>
<u-button v-else type="default" plain size="small" color="#99241B"> 未完成</u-button> <u-button v-else type="default" plain size="small" color="#99241B" @click="toFinish(v.name)"> 未完成</u-button>
</view> </view>
</view> </view>
</view> </view>
@ -138,7 +138,7 @@
userPointCount: 0, userPointCount: 0,
}; };
}, },
onLoad() { onShow() {
this.getPoint() this.getPoint()
}, },
methods: { methods: {
@ -150,6 +150,41 @@
url: '/pagesB/MyPoints/pointDetail' url: '/pagesB/MyPoints/pointDetail'
}) })
}, },
toFinish(val) {
if(val == '购买商品' || val == '首次购买商品'){
uni.redirectTo({
url: '/pagesC/shop/Shop'
})
}else if(val == '收藏一件作品' || val == '关注一名作者' || val == '查看一件作品' || val == '点赞一件作品'){
uni.navigateTo({
url: '/pagesB/ArtWorks/ArtWorks'
})
}else if(val == '查看一条政策'){
uni.navigateTo({
url: '/pagesC/PolicyExpress/PolicyExpress'
})
}else if(val == '查看一条动态'){
uni.redirectTo({
url: '/pagesC/activity/activity'
})
}else if(val == '首次上传作品'){
uni.navigateTo({
url: '/pagesB/PublishWorks/PublishWorks'
})
}else if(val == '首次文艺接单'){
uni.navigateTo({
url: '/pagesB/orderHall/orderHall'
})
}else if(val == '首次上传头像'){
uni.navigateTo({
url: '/pagesB/PersonalCenter/PersonalCenter'
})
}else if(val == '首次参加文艺活动'){
uni.navigateTo({
url: '/pagesC/ArtActivities/ArtActivities'
})
}
},
getPoint() { getPoint() {
let _this = this let _this = this
this.dayWork = [] this.dayWork = []

16
src/pagesB/improveData/improveData.vue
View File

@ -370,21 +370,9 @@
}, { }, {
min: 6, min: 6,
max: 20, max: 20,
message: '密码长度应大于等于6个字符小于20个字符!', message: '密码需由长度不小于12位的大小写英文、数字及特殊符号组成!',
trigger: ['blur', 'change'] trigger: ['blur', 'change']
}, { },],
trigger: ['blur', 'change'],
validator: (rule, value, callback) => {
var passwordreg =
/^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?!([^(0-9a-zA-Z)])+$).{6,20}$/;
if (!passwordreg.test(value)) {
callback(new Error('密码包含 数字,英文,字符中的两种以上'))
} else {
callback()
}
}
}],
'userInfo.serverInstrutor': [{ 'userInfo.serverInstrutor': [{
type: 'string', type: 'string',
required: true, required: true,

2
src/pagesB/orderHall/orderHall.vue
View File

@ -94,7 +94,7 @@ export default {
this.pages++ this.pages++
this.getData(); this.getData();
}, },
onShow () { onLoad () {
this.pages = 1 this.pages = 1
this.load = true this.load = true
this.mainList = [] this.mainList = []

15
src/pagesC/ArtActivities/ArtActivities.vue
View File

@ -14,6 +14,7 @@
<u-tag text="报名中" type="warning" v-if="v.hdStatus == '0'"></u-tag> <u-tag text="报名中" type="warning" v-if="v.hdStatus == '0'"></u-tag>
<u-tag text="进行中" type="success" v-else-if="v.hdStatus == '1'"></u-tag> <u-tag text="进行中" type="success" v-else-if="v.hdStatus == '1'"></u-tag>
<u-tag text="已结束" type="error" v-else-if="v.hdStatus == '2'"></u-tag> <u-tag text="已结束" type="error" v-else-if="v.hdStatus == '2'"></u-tag>
<u-tag text="未开始" type="primary" v-else-if="v.hdStatus == '3'"></u-tag>
</view> </view>
</view> </view>
<view class="addIcon" @click="toAddOrder" v-if="isAdmin"> <view class="addIcon" @click="toAddOrder" v-if="isAdmin">
@ -40,11 +41,12 @@
onLoad() { onLoad() {
this.isAdmin = uni.getStorageSync('isAdmin') this.isAdmin = uni.getStorageSync('isAdmin')
this.userType = uni.getStorageSync('userType') this.userType = uni.getStorageSync('userType')
},
onShow() {
this.pages = 1 this.pages = 1
this.list2 = [] this.list2 = []
this.getData() this.getData()
},
onShow() {
}, },
// 下拉刷新 // 下拉刷新
onPullDownRefresh() { onPullDownRefresh() {
@ -100,10 +102,10 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
page { // page {
width: 686rpx; // width: 686rpx;
margin: 0px 32rpx; // margin: 0px 32rpx;
} // }
image { image {
width: 100%; width: 100%;
@ -113,6 +115,7 @@
.main{ .main{
width: 686rpx; width: 686rpx;
margin: 0px 32rpx; margin: 0px 32rpx;
padding-bottom: 32rpx;
} }
.art_act_itm { .art_act_itm {

10
src/pagesC/OrderDetail/OrderDetail.vue
View File

@ -222,6 +222,7 @@
let _this = this let _this = this
this.http.request('/goods/' + this.id, {}, "GET").then(res => { this.http.request('/goods/' + this.id, {}, "GET").then(res => {
if (res.code == 200) { if (res.code == 200) {
console.log('1')
let fileArr = res.data.domainInfo.file.split(',') let fileArr = res.data.domainInfo.file.split(',')
fileArr.forEach(function(item) { fileArr.forEach(function(item) {
let gs = item.substr(item.lastIndexOf(".") + 1) let gs = item.substr(item.lastIndexOf(".") + 1)
@ -233,6 +234,7 @@
if (this.img < 1) { if (this.img < 1) {
this.img.push('../../static/fileImg/pdfS.png') this.img.push('../../static/fileImg/pdfS.png')
} }
console.log('2')
this.goodInfo = res.data.domainInfo this.goodInfo = res.data.domainInfo
this.userInfo = res.data.shopInfo this.userInfo = res.data.shopInfo
this.orderDet[0].goodsId = res.data.id this.orderDet[0].goodsId = res.data.id
@ -240,13 +242,21 @@
this.orderDet[0].img = this.img[0] this.orderDet[0].img = this.img[0]
this.orderDet[0].userName = res.data.shopInfo.userName this.orderDet[0].userName = res.data.shopInfo.userName
this.buyType = res.data.domainInfo.buy this.buyType = res.data.domainInfo.buy
console.log('3')
if(res.data.shopInfo.images){
let src = res.data.shopInfo.images.split(',') let src = res.data.shopInfo.images.split(',')
this.orderDet[0].userImg = src[0] this.orderDet[0].userImg = src[0]
}else{
this.orderDet[0].userImg = '../../static/txIcon.png'
}
this.serveList = res.data this.serveList = res.data
console.log('4')
res.data.scores.forEach(function(item) { res.data.scores.forEach(function(item) {
let img = item.avatar.split(',') let img = item.avatar.split(',')
item.avatar = img[0] item.avatar = img[0]
}) })
console.log('5')
this.allScor = res.data.scores this.allScor = res.data.scores
this.scoresLen = res.data.scores.length this.scoresLen = res.data.scores.length
if (this.scoresLen > 5) { if (this.scoresLen > 5) {

2
src/pagesC/activity/activity.vue
View File

@ -57,7 +57,7 @@
this.zwHeight = this.statusHeight + this.titleHeight this.zwHeight = this.statusHeight + this.titleHeight
// #endif // #endif
}, },
onShow() { onLoad() {
this.pages = 1 this.pages = 1
this.list2 = [] this.list2 = []
this.getData() this.getData()

33
src/pagesC/mediaProp/mediaProp.vue
View File

@ -21,13 +21,22 @@
</view> </view>
<image src="../../static/help/helpBg.png" mode="" class="helpBg"></image> <image src="../../static/help/helpBg.png" mode="" class="helpBg"></image>
<view class="group" :style="{'top':topHeight+'px'}"> <view class="group" :style="{'top':topHeight+'px'}">
<view class="group-item" v-for="(item,index) in QRlist" :key="index"> <!-- <view class="group-item" v-for="(item,index) in QRlist" :key="index">
<view class="codeTitle">公众号链接/二维码</view> <view class="codeTitle">公众号链接/二维码</view>
<view class="codeImg"> <view class="codeImg">
<view class="codeEle"> <view class="codeEle">
<uqrcode ref="uQRCode" canvas-id="uQRCode" :value="item.text" :size="QRsize" :start="true" :auto="true"></uqrcode> <uqrcode ref="uQRCode" canvas-id="uQRCode" :value="item.text" :size="QRsize" :start="true" :auto="true"></uqrcode>
<!-- <uqrcode :id="'uQRCode'+index" ref="uQRCode0" :size='QRsize' :text='item' /> --> </view>
<!-- <image src="../../static/icon12.jpg" mode="" class="code"></image> --> <view class="remark">
识别二维码跳转至公众号
</view>
</view>
</view> -->
<view class="group-item" v-for="(item,index) in dataList" :key="index">
<view class="codeTitle">{{item.name}}</view>
<view class="codeImg">
<view class="codeEle">
<image :src="item.photo" mode="" class="code"></image>
</view> </view>
<view class="remark"> <view class="remark">
识别二维码跳转至公众号 识别二维码跳转至公众号
@ -54,7 +63,8 @@
{ {
text: 'https://www.uviewui.com/components/tooltip.html' text: 'https://www.uviewui.com/components/tooltip.html'
}, },
] ],
dataList: [],
}; };
}, },
onPageScroll(e) { onPageScroll(e) {
@ -77,10 +87,25 @@
this.topHeight = this.statusHeight + this.titleHeight this.topHeight = this.statusHeight + this.titleHeight
// #endif // #endif
}, },
onShow() {
this.getData()
},
methods: { methods: {
goBack() { goBack() {
uni.navigateBack() uni.navigateBack()
},
getData() {
this.http.request('/medium/list', {}, "GET").then(res => {
if (res.code == 200) {
this.dataList = res.data
} }
}).catch(e => {
uni.showToast({
title: e.data.message,
icon: "none",
});
})
},
} }
} }
</script> </script>

2
src/pagesC/shop/Shop.vue
View File

@ -123,7 +123,7 @@
// this.pages++ // this.pages++
// this.getMoreData(); // this.getMoreData();
// }, // },
onShow() { onLoad() {
this.list1 = [{ this.list1 = [{
name: '全部', name: '全部',
type: '', type: '',

9
src/pagesD/jgsz/detail.vue
View File

@ -16,10 +16,10 @@
<view class="textList"> <view class="textList">
<view class="type"> <view class="type">
<img class="textImg" src="../../static/detailIcon/icon10.png" alt="" /> <img class="textImg" src="../../static/detailIcon/icon10.png" alt="" />
<view class="text1">办点</view> <view class="text1">办电</view>
</view> </view>
<view class="text2"> <view class="text2">
{{ data.officePhone }} {{ data.officePhone ? data.officePhone : '暂无' }}
</view> </view>
</view> </view>
<view class="textList"> <view class="textList">
@ -28,7 +28,7 @@
<view class="text1">手机</view> <view class="text1">手机</view>
</view> </view>
<view class="text2"> <view class="text2">
{{ data.phone }} {{ data.phone ? data.phone : '暂无' }}
</view> </view>
</view> </view>
<view class="textList"> <view class="textList">
@ -37,7 +37,8 @@
<view class="text1">简介</view> <view class="text1">简介</view>
</view> </view>
<view class="text2"> <view class="text2">
<u-parse :content="data.introduce"></u-parse> <u-parse v-if="data.introduce" :content="data.introduce"></u-parse>
<text v-else>暂无</text>
</view> </view>
</view> </view>
</view> </view>

12
src/pagesD/jgsz/index.vue
View File

@ -27,8 +27,8 @@
<view class="teamBox" v-for="item in list" :key="item.id" @click="toDetail(item.id)"> <view class="teamBox" v-for="item in list" :key="item.id" @click="toDetail(item.id)">
<view class="teamBox-right"> <view class="teamBox-right">
<view class="item-image"> <view class="item-image">
{{ item.userName }} <!-- {{ item.userName }} -->
<!-- <image src="../../static/txIcon.png" mode=""></image> --> <image src="../../static/txIcon.png" mode=""></image>
</view> </view>
</view> </view>
<view class="teamBox-left"> <view class="teamBox-left">
@ -37,10 +37,10 @@
<view class="street">{{ item.identity }}</view> <view class="street">{{ item.identity }}</view>
</view> </view>
<view class="teamMinbox-bottom"> <view class="teamMinbox-bottom">
办电：{{ item.officePhone }} 办电：{{ item.officePhone ? item.officePhone : '暂无' }}
</view> </view>
<view class="teamMinbox-bottom"> <view class="teamMinbox-bottom">
手机：{{ item.phone }} 手机：{{ item.phone ? item.phone : '暂无' }}
</view> </view>
</view> </view>
</view> </view>
@ -69,7 +69,7 @@
export default { export default {
data() { data() {
return { return {
tabC: "0", tabC: "2",
list: [], list: [],
background:'', background:'',
zzjg: '', zzjg: '',
@ -117,7 +117,7 @@
}, },
//获取背景图 //获取背景图
getBackgroundImage() { getBackgroundImage() {
this.http.request('/indexImage/wlBackgroundImage', {}, "GET").then(res => { this.http.request('/indexImage/wlBackgroundImage', {type:'4'}, "GET").then(res => {
if (res.code == 200) { if (res.code == 200) {
this.zzjg = res.data[0].imagePath this.zzjg = res.data[0].imagePath
this.background = res.data[1].imagePath this.background = res.data[1].imagePath

42
src/pagesD/wyxx/index.vue
View File

@ -26,6 +26,8 @@
<view class="teamBox-left"> <view class="teamBox-left">
<view class="teamMinbox-top"> <view class="teamMinbox-top">
<view class="title">{{ item.name }}</view> <view class="title">{{ item.name }}</view>
</view>
<view class="teamMinbox-top">
<view class="street">{{ item.villageName }}</view> <view class="street">{{ item.villageName }}</view>
</view> </view>
<view class="teamMinbox-bottom"> <view class="teamMinbox-bottom">
@ -49,6 +51,8 @@
<view class="teamBox-left"> <view class="teamBox-left">
<view class="teamMinbox-top"> <view class="teamMinbox-top">
<view class="title">{{ item.name }}</view> <view class="title">{{ item.name }}</view>
</view>
<view class="teamMinbox-top">
<view class="street">{{ item.villageName }}</view> <view class="street">{{ item.villageName }}</view>
</view> </view>
<view class="teamMinbox-bottom"> <view class="teamMinbox-bottom">
@ -109,6 +113,8 @@
isadmin: false, isadmin: false,
page: 1, page: 1,
size: 9999, size: 9999,
img1: '',
img2: '',
}; };
}, },
methods: { methods: {
@ -150,6 +156,22 @@
url: `/pagesD/wyxx/addindex`, url: `/pagesD/wyxx/addindex`,
}); });
}, },
//获取背景图
getBackgroundImage() {
this.http.request('/indexImage/wlBackgroundImage', {type:'5'}, "GET").then(res => {
if (res.code == 200) {
this.img1 = res.data[0].imagePath
this.img2 = res.data[1].imagePath
this.RuralDevelopmentPlanlist()
this.teamandprogram()
}
}).catch(e => {
uni.showToast({
title: e.data.message,
icon: "none",
});
})
},
teamandprogram() { teamandprogram() {
this.http this.http
.request("/artTeam/list", { .request("/artTeam/list", {
@ -161,16 +183,23 @@
this.team = []; this.team = [];
this.program = []; this.program = [];
res.data.records.forEach((item, index) => { res.data.records.forEach((item, index) => {
if (item.type == "team") {
let image = [] let image = []
if(item.file){ if(item.file){
image = item.file.split(',') image = item.file.split(',')
item.file = image[0] item.file = image[0]
}else{ }else{
item.file = '../../static/txIcon.png' item.file = this.img1
} }
if (item.type == "team") {
this.team.push(item); this.team.push(item);
} else { } else {
let image = []
if(item.file){
image = item.file.split(',')
item.file = image[0]
}else{
item.file = this.img2
}
this.program.push(item); this.program.push(item);
} }
}); });
@ -191,8 +220,7 @@
}, },
async onShow() { async onShow() {
this.isadmin = uni.getStorageSync("isAdmin"); this.isadmin = uni.getStorageSync("isAdmin");
await this.teamandprogram(); await this.getBackgroundImage();
await this.RuralDevelopmentPlanlist();
}, },
}; };
</script> </script>
@ -272,12 +300,11 @@
// width: 400rpx; // width: 400rpx;
.teamMinbox-top { .teamMinbox-top {
display: flex; display: flex;
margin-bottom: 16rpx; margin-bottom: 10rpx;
.title { .title {
font-weight: 600; font-weight: 600;
font-size: 32rpx; font-size: 32rpx;
max-width: 160rpx;
overflow: hidden; overflow: hidden;
/* 超出一行文字自动隐藏 */ /* 超出一行文字自动隐藏 */
text-overflow: ellipsis; text-overflow: ellipsis;
@ -290,7 +317,6 @@
border-radius: 30rpx; border-radius: 30rpx;
background-color: rgba(240, 240, 240, 1); background-color: rgba(240, 240, 240, 1);
color: #a02521; color: #a02521;
margin-left: 18rpx;
padding: 2rpx 20rpx; padding: 2rpx 20rpx;
overflow: hidden; overflow: hidden;
/* 超出一行文字自动隐藏 */ /* 超出一行文字自动隐藏 */
@ -305,7 +331,7 @@
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 3; -webkit-line-clamp: 2;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
} }

5
src/pagesD/xskz/index.vue
View File

@ -24,7 +24,7 @@
{{ item.likes }} {{ item.likes }}
</view> </view>
</view> </view>
<view class="interactive"> <!-- <view class="interactive">
<image src="../../static/workDetail/star2.png" class="bot_img" v-if="item.isColl" <image src="../../static/workDetail/star2.png" class="bot_img" v-if="item.isColl"
@click="clickStar(item.isColl, item.id)"></image> @click="clickStar(item.isColl, item.id)"></image>
<image src="../../static/workDetail/star1.png" class="bot_img" v-else <image src="../../static/workDetail/star1.png" class="bot_img" v-else
@ -33,7 +33,7 @@
<view class="title" @click="clickStar(item.isColl, item.id)"> <view class="title" @click="clickStar(item.isColl, item.id)">
{{ item.collections }} {{ item.collections }}
</view> </view>
</view> </view> -->
</view> </view>
</view> </view>
</view> </view>
@ -264,6 +264,7 @@
.interactive { .interactive {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 10rpx 20rpx;
image { image {
width: 30rpx; width: 30rpx;

4
src/request/interface.js
View File

@ -7,8 +7,8 @@ export default {
config: { config: {
// baseUrl: "http://192.168.1.4:8080/h5/api", //俞燕红-小程序不能配跨域 // baseUrl: "http://192.168.1.4:8080/h5/api", //俞燕红-小程序不能配跨域
// baseUrl: "/pre", //俞燕红-跨域 // baseUrl: "/pre", //俞燕红-跨域
baseUrl: "https://yxx.ydool.net/h5/api", //线上 // baseUrl: "https://yxx.ydool.net/h5/api", //线上
// baseUrl: "/h5/api", //h5 baseUrl: "/h5/api", //h5
header: { header: {
'Content-Type': 'application/json;charset=UTF-8', 'Content-Type': 'application/json;charset=UTF-8',
// 'Content-Type':'application/x-www-form-urlencoded' // 'Content-Type':'application/x-www-form-urlencoded'