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

Merge branch 'master' of git.zdool.com:xs/yyx/h5

This commit is contained in:
duanxiaohai 2023-08-11 13:33:53 +08:00
parent 8fddb02f4b b2a6bb9c82
commit 79650dc9c8
4 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -239,11 +239,12 @@
uni.removeStorageSync('userType');
uni.removeStorageSync('isExpert');
uni.removeStorageSync('isVillageAdmin');
uni.removeStorageSync('isExpert');
uni.removeStorageSync('isWlAdmin');
uni.setStorageSync('isAdmin', res.data.isAdmin)
uni.setStorageSync('userType', res.data.userType)
uni.setStorageSync('isExpert', res.data.isExpert)
uni.setStorageSync('isVillageAdmin', res.data.isVillageAdmin)
uni.setStorageSync('isWlAdmin', res.data.isWlAdmin)
this.getSwpper()
}
}).catch(e => {

15
src/pagesB/ArtRace/ArtRaceDetail.vue
View File

@ -52,16 +52,23 @@
<view class="item_li">
<view class="standard">
<image class="icon" src="../../static/detailIcon/icon7.png" mode="scaleToFill"></image>
<text>报名截止时间:</text>
<text>报名开始时间:</text>
</view>
<view class="content"> {{data.startTime}}</view>
</view>
<view class="item_li">
<view class="standard">
<image class="icon" src="../../static/detailIcon/icon4.png" mode="scaleToFill"></image>
<text>活动结束时间:</text>
<image class="icon" src="../../static/detailIcon/icon7.png" mode="scaleToFill"></image>
<text>报名截止时间:</text>
</view>
<view class="content"> {{data.endTime}} </view>
<view class="content"> {{data.endTime}}</view>
</view>
<view class="item_li">
<view class="standard">
<image class="icon" src="../../static/detailIcon/icon4.png" mode="scaleToFill"></image>
<text>评分截止时间:</text>
</view>
<view class="content"> {{data.scoreEndTime}} </view>
</view>
</view>
</view>

16
src/pagesB/ArtRace/raceWork.vue
View File

@ -29,13 +29,7 @@
<view class="textList" v-if="isExpert">
<view class="type">
<img class='textImg' src="../../static/detailIcon/icon10.png" alt="">
<view class="text1">您的评分：<text class="redText">{{ data.myScore }}</text></view>
</view>
</view>
<view class="textList" v-if="isExpert">
<view class="type">
<img class='textImg' src="../../static/detailIcon/icon10.png" alt="">
<view class="text1">作品平均分：<text class="redText">{{ data.averageScore }}</text></view>
<view class="text1">您的评分：<text class="redText" v-if="data.myScore">{{ data.myScore }}</text><text>暂无</text></view>
</view>
</view>
</view>
@ -66,7 +60,7 @@
</view>
</view>
<view style="margin: 0 32rpx 32rpx;">
<u--input type="number" placeholder="请输入分数" border="surround" v-model="value"></u--input>
<u--input type="number" placeholder="请输入分数" border="surround" v-model="value" @input="changeNum" maxlength="2"></u--input>
</view>
<view
style="display: flex; border-top:2rpx solid #E7E7E7;height: 112rpx;width: 640rpx;line-height: 112rpx; font-size: 32rpx;font-weight: 600;">
@ -171,6 +165,12 @@
icon: "none",
});
})
},
changeNum(value) {
let aaa = Number(value)
if(aaa > 10){
this.value = '10'
}
}
},

12
src/pagesC/DataSearch/DataSearch.vue
View File

@ -10,7 +10,7 @@
</view>
<u-search height=42 margin="12px 0" searchIconColor="black" bgColor="#f8f8f8" searchIconSize="40rpx"
shape="square" :showAction="false" v-model="dataVal" placeholder="请输入资料名称"></u-search>
<view class="car_box " @click="isSelect=false">
<view class="car_box " @click="isSelect=false" v-if="isWlAdmin">
<view class="dd" v-if="isSelect">
<image src="../../static/DataSearch/chexboxs.png" mode=""></image>
</view>
@ -37,7 +37,7 @@
{{ v.createdAt }}
</view>
</view>
<view class="moreImg" @click="clickDot(v.id)" style="position: relative;">
<view class="moreImg" @click="clickDot(v.id)" style="position: relative;" v-if="isWlAdmin">
<image src="../../static/DataSearch/moreFCUN.png" mode=""></image>
</view>
</view>
@ -59,17 +59,17 @@
{{ item.createdAt }}
</view>
</view>
<view class="moreImg" v-if="isSelect" @click="delFile(item.id)">
<view class="moreImg" v-if="isSelect && isWlAdmin" @click="delFile(item.id)">
<image src="../../static/DataSearch/dirDel.png" mode=""></image>
</view>
<view class="moreImg" style="width: 32rpx;height: 32rpx;" v-if="!isSelect">
<view class="moreImg" style="width: 32rpx;height: 32rpx;" v-if="!isSelect && isWlAdmin">
<label class="wr">
<checkbox :value="item.id" :checked="checkedArr.includes(item.id)" />
</label>
</view>
</view>
</checkbox-group>
<view class="bottm" @click="show=!show">
<view class="bottm" @click="show=!show" v-if="isWlAdmin">
<image src="../../static/orderHall/addOrder.png" mode=""></image>
</view>
<!-- 底部对文件的操作栏 -->
@ -156,12 +156,14 @@
checkedArr: [], //复选框选中的值
parentId: '',
oldID: [],
isWlAdmin: true,
};
},
// onLoad() {
// this.getList()
// },
onShow() {
this.isWlAdmin = uni.getStorageSync('isWlAdmin');
this.folderList = []
this.checkboxData = []
this.getList()