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

修改

This commit is contained in:
lnn19986213 2022-07-28 14:26:43 +08:00
parent e825f9e895
commit b472961bbb
19 changed files with 107 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/manifest.json
View File

@ -1,6 +1,6 @@
{
"name" : "艺象心",
"appid" : "__UNI__C2FB70F",
"appid" : "__UNI__77CA6BC",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",

67
src/pages/ArtActivities/ArtActivities.vue
View File

@ -1,10 +1,9 @@
<template>
<view>
<view class="art_act_itm" v-for="(v,i) in 3" :key="i" @click="goActDeat(i)">
<image src="../../static/artWork.png" mode=""></image>
<view class="art_act_itm" v-for="(v,i) in list2" :key="i" @click="goActDeat(i)">
<image :src="v.image" mode=""></image>
<view class="title">
露凝而白｜鸿雁来清秋满怀
{{v.title}}
</view>
</view>
</view>
@ -14,13 +13,19 @@
export default {
data() {
return {
list2: [{
image: '../../static/hd1.png',
title: '昨夜星辰昨夜风，画楼西畔桂堂东',
}, {
image: '../../static/hd2.png',
title: '身无彩凤双飞翼，心有灵犀一点通'
}],
};
},
methods:{
goActDeat(id){
methods: {
goActDeat(id) {
uni.navigateTo({
url:`/pages/ActivitiesDetail/ActivitiesDetail?id=${id}`
url: `/pages/ActivitiesDetail/ActivitiesDetail?id=${id}`
})
}
}
@ -28,32 +33,36 @@
</script>
<style lang="scss">
page{
page {
width: calc(100% - 32px);
margin: 0px 16px;
}
image{
image {
width: 100%;
height: 100%;
}
.art_act_itm{
margin-top: 12px;
height: 164px;
border-radius: 8px;
border: 1px solid transparnt;
position: relative;
.title{
position: absolute;
bottom: 0;
background: #000000;
border-radius: 0px 0px 8px 8px;
opacity: 0.3;
height: 44px;
color: #FFFFFF;
line-height: 44px;
font-size: 14px;
padding-left: 12px;
.art_act_itm {
margin-top: 12px;
height: 328rpx;
border-radius: 8px;
border: 1px solid transparnt;
position: relative;
.title {
position: absolute;
bottom: 0;
background: #000000;
border-radius: 0px 0px 8px 8px;
opacity: 0.3;
height: 88rpx;
color: #FFFFFF;
line-height: 88rpx;
font-size: 28rpx;
padding-left: 24rpx;
width: calc(100% - 24rpx);
}
}
}
</style>

47
src/pages/activity/activity.vue
View File

@ -11,17 +11,17 @@
<view class="left">
<view class="content">
<view class="title">
<text class="zd">置顶</text>
送万福、进万家文艺惠民 暖人心嫁得好风扇电机接收到删掉就惊世毒妃
<text class="zd" v-if="v.is">置顶</text>
{{v.name}}
</view>
</view>
<view class="clidate">
<view class="cliNum">点击量:15万</view>
<view class="date">2022-01-11</view>
<view class="cliNum">点击量:{{v.click}}</view>
<view class="date">{{v.time}}</view>
</view>
</view>
<view class="right">
<image src="../../static/icon12.jpg" mode=""></image>
<image :src="v.url" mode=""></image>
</view>
</view>
@ -36,7 +36,29 @@
statusHeight: 0,
titleHeight: 50,
zwHeight: 0,
num:4,
num:[
{
is: true,
click: '1522',
time: '2022-02-01',
name: '送万福、进万家文艺惠民暖人心',
url: '../../static/dt2.png'
},
{
is: false,
click: '1522',
time: '2022-02-01',
name: '虎年新春活动再上央视《新闻联播》',
url: '../../static/dt1.png'
},
{
is: false,
click: '1522',
time: '2022-02-01',
name: '文联送欢乐 安置点享真情',
url: '../../static/dt1.png'
}
],
id:'',
};
},
@ -106,8 +128,8 @@
.activity {
display: flex;
padding-top:10px;
padding-bottom:10px;
padding-top:20rpx;
padding-bottom:20rpx;
border-bottom:1px solid #F5F5F5;
&:last-of-type{
border-bottom:none;
@ -122,7 +144,8 @@
align-items: center;
.title {
font-size: 16px;
font-size: 32rpx;
font-weight: 700;
}
}
@ -136,11 +159,11 @@
}
.right {
margin-left: 10px;
margin-left: 20rpx;
image {
width: 124px;
height: 93px;
width: 240rpx;
height: 160rpx;
border-radius:4px;
}
}

10
src/pages/my/My.vue
View File

@ -12,7 +12,7 @@
</view>
<view class="user_name">
<view class="user_name_de">
{{userName}}
{{userName}}<text class="sf_text">({{yhsf}})</text>
</view>
</view>
<view class="arrow">
@ -139,6 +139,7 @@
colNum: '',
fans:'',
care:'',
yhsf: '',
};
},
onShow() {
@ -154,6 +155,7 @@
this.image = img[0]
this.userName = res.data.userName
this.userId = res.data.id
this.yhsf = res.data.yhsf
this.point = res.data.point
this.getCol()
}
@ -320,9 +322,11 @@
.user_name_de {
color: #251B1D;
font-size: 20px;
font-size: 40rpx;
font-weight: 600;
.sf_text {
font-size: 32rpx;
}
}
.words {

28
src/pages/orderHall/addOrder.vue
View File

@ -82,7 +82,7 @@
</view>
</view>
<u-popup :show="showUser" @close="close" closeOnClickOverlay :round="5" customStyle="padding: 16px;">
<u-radio-group @change="selectForm2" v-model="userType" :borderBottom="true" placement="column"
<!-- <u-radio-group @change="selectForm2" v-model="userType" :borderBottom="true" placement="column"
iconPlacement="right">
<u-radio :customStyle="{marginBottom: '16px' }" v-for="(item, index) in radiolist2" :key="index"
:label="item.label" labelSize="28rpx" labelColor="#231F1C" :name="item.label"
@ -90,16 +90,16 @@
</u-radio>
<u-button class="custom-style" style="background-color:#99241B ; color: #FFFFFF; margin-top: 32rpx;"
type="default" @click="showUser=false">确认</u-button>
</u-radio-group>
<!-- <u-checkbox-group @change="selectForm2" v-model="radiovalue2" :borderBottom="true" placement="column"
</u-radio-group> -->
<u-checkbox-group v-model="radiovalue2" :borderBottom="true" placement="column"
iconPlacement="right">
<u-checkbox :customStyle="{marginBottom: '16px' }" v-for="(item, index) in radiolist2" :key="index"
:label="item.label" labelSize="28rpx" labelColor="#231F1C" :name="item.label"
activeColor="#99241B ">
</u-checkbox>
<u-button class="custom-style" style="background-color:#99241B ; color: #FFFFFF; margin-top: 32rpx;"
type="default" @click="showUser=false">确认</u-button>
</u-checkbox-group> -->
type="default" @click="selectForm2">确认</u-button>
</u-checkbox-group>
</u-popup>
<view class="form_line">
<view class="form_left">
@ -157,7 +157,7 @@
showUser: false,
userType: '',
userTypeValue: '',
// radiovalue2: [],
radiovalue2: [],
radiolist2: [],
morePer: true,
perNumber: 1,
@ -221,15 +221,19 @@
}
this.showTime = false
},
selectForm2(form) {
selectForm2() {
let _this = this
let code = []
this.radiolist2.forEach(function(item) {
if (item.label == form) {
_this.userTypeValue = item.value
}
_this.radiovalue2.forEach(function(ele){
if(item.label == ele) {
code.push(item.value)
}
})
})
// let data = form
// this.userType = data.join(',')
this.userTypeValue = code.join(',')
this.userType = this.radiovalue2.join(',')
this.showUser = false
},
changeTrue(e) {
console.log('change', e);

9
src/pages/orderHall/orderHallDetails.vue
View File

@ -50,6 +50,10 @@
<view class="left">类型：</view>
<view class="right">{{data.typeName}}</view>
</view>
<view class="formList">
<view class="left">可接单人才类型：</view>
<view class="right">{{data.rclx}}</view>
</view>
<view class="formList">
<view class="left">可接单人数：</view>
<view class="right"><text style="color: #99241B;">{{data.jdrs}}</text>/{{data.quantity}}</view>
@ -137,6 +141,7 @@
})
}
this.data = res.data
this.data.rclx = this.data.yhsf.join(',')
this.userList = res.data.users
this.userList.forEach(function(el){
let img = JSON.stringify(el.userTx)
@ -308,12 +313,10 @@
.form {
padding: 32rpx 32rpx 24rpx;
margin-bottom: 116rpx;
.formList {
display: flex;
justify-content: space-between;
height: 40rpx;
line-height: 40rpx;
margin-bottom: 40rpx;
.left {

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

@ -110,10 +110,10 @@
titleHeight: 50,
list: [],
list2: [{
image: 'https://cdn.uviewui.com/uview/swiper/swiper2.png',
image: '../../static/hd1.png',
title: '昨夜星辰昨夜风，画楼西畔桂堂东',
}, {
image: 'https://cdn.uviewui.com/uview/swiper/swiper1.png',
image: '../../static/hd2.png',
title: '身无彩凤双飞翼，心有灵犀一点通'
}],
menus: [{

4
src/request/interface.js
View File

@ -7,8 +7,8 @@ export default {
config: {
// baseUrl: "http://192.168.0.57:8080/h5/api", //王锡
// baseUrl: "http://192.168.124.110:8088/api", //周源
baseUrl: "http://10.0.0.54:8080/h5/api", //俞燕红
// baseUrl: "https://yxx.ydool.net/h5/api", //线上
// baseUrl: "http://10.0.0.78:8080/h5/api", //俞燕红
baseUrl: "https://yxx.ydool.net/h5/api", //线上
header: {
'Content-Type': 'application/json;charset=UTF-8',
// 'Content-Type':'application/x-www-form-urlencoded'

BIN
src/static/RewardWork/fightVirus1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 128 KiB

BIN
src/static/artWork.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 22 KiB

BIN
src/static/dt1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 176 KiB

BIN
src/static/dt2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 178 KiB

BIN
src/static/fileImg/xlsS.bmp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 75 KiB

BIN
src/static/fileImg/xlsS.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.6 KiB

BIN
src/static/fileImg/xlsS.tif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 75 KiB

BIN
src/static/hd1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 576 KiB

BIN
src/static/hd2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 318 KiB

BIN
src/static/icon12.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 39 KiB

BIN
src/static/maqian.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 64 KiB