This commit is contained in:
parent
31e2035808
commit
4600f3a84f
|
@ -95,7 +95,7 @@
|
||||||
"vueVersion" : "3",
|
"vueVersion" : "3",
|
||||||
"h5" : {
|
"h5" : {
|
||||||
"router" : {
|
"router" : {
|
||||||
"base" : "/h5x/",
|
"base" : "/h5/",
|
||||||
"mode" : "hash"
|
"mode" : "hash"
|
||||||
},
|
},
|
||||||
"devServer" : {
|
"devServer" : {
|
||||||
|
|
|
@ -34,10 +34,10 @@
|
||||||
</view>
|
</view>
|
||||||
</uni-section>
|
</uni-section>
|
||||||
<button style="background-color:#2979ff;color:white" @click="login(current)">登录</button>
|
<button style="background-color:#2979ff;color:white" @click="login(current)">登录</button>
|
||||||
<view style="text-align: center;margin-top: 20rpx;">
|
<!-- <view style="text-align: center;margin-top: 20rpx;">
|
||||||
<uni-icons type="weixin" size="36" color="green" @click="wxmpLogin"></uni-icons>
|
<uni-icons type="weixin" size="36" color="green" @click="wxmpLogin"></uni-icons>
|
||||||
<view style="text-align: center;font-size: 32rpx;">微信登陆</view>
|
<view style="text-align: center;font-size: 32rpx;">微信登陆</view>
|
||||||
</view>
|
</view> -->
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
@ -235,7 +235,23 @@
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
ranStr(e) {
|
||||||
|
//形参e,需要产生随机字符串的长度
|
||||||
|
//如果没有传参,默认生成32位长度随机字符串
|
||||||
|
e = e || 32;
|
||||||
|
//模拟随机字符串库
|
||||||
|
var t = "ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz0123456789",
|
||||||
|
a = t.length,//字符串t的长度,随机数生成最大值
|
||||||
|
n = "";
|
||||||
|
for (let i = 0; i < e; i++) {
|
||||||
|
//随机生成长度为e的随机字符串拼接
|
||||||
|
n += t.charAt(Math.floor(Math.random() * a));
|
||||||
|
}
|
||||||
|
//返回随机组合字符串
|
||||||
|
return n
|
||||||
|
},
|
||||||
bindXX() {
|
bindXX() {
|
||||||
|
let that = this;
|
||||||
// #ifdef APP-PLUS
|
// #ifdef APP-PLUS
|
||||||
let userInfo = uni.getStorageSync("userInfo")
|
let userInfo = uni.getStorageSync("userInfo")
|
||||||
let secret = that.ranStr(12)
|
let secret = that.ranStr(12)
|
||||||
|
@ -249,6 +265,19 @@
|
||||||
uni.setStorageSync('mySecret', JSON.stringify(mySecret))
|
uni.setStorageSync('mySecret', JSON.stringify(mySecret))
|
||||||
}).catch(e => {})
|
}).catch(e => {})
|
||||||
// #endif
|
// #endif
|
||||||
|
// #ifdef H5
|
||||||
|
let userInfo = uni.getStorageSync("userInfo")
|
||||||
|
let secret = that.ranStr(12)
|
||||||
|
let mySecret = {
|
||||||
|
'username': userInfo.username,
|
||||||
|
'secret': secret
|
||||||
|
}
|
||||||
|
this.$api.bindSecret({
|
||||||
|
secret: secret
|
||||||
|
}).then(res => {
|
||||||
|
uni.setStorageSync('mySecret', JSON.stringify(mySecret))
|
||||||
|
}).catch(e => {})
|
||||||
|
// #endif
|
||||||
// #ifdef MP-WEIXIN
|
// #ifdef MP-WEIXIN
|
||||||
if(this.wxmp_openid != null) {
|
if(this.wxmp_openid != null) {
|
||||||
this.$api.bindWxmp({"openid": this.wxmp_openid}).then(res=>{
|
this.$api.bindWxmp({"openid": this.wxmp_openid}).then(res=>{
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
</template>
|
</template>
|
||||||
</uni-section>
|
</uni-section>
|
||||||
<uni-section title="功能入口" type="line">
|
<uni-section title="功能入口" type="line">
|
||||||
<uni-grid :column="4" :show-border="false" :square="false">
|
<uni-grid :column="5" :show-border="false" :square="false">
|
||||||
<uni-grid-item v-for="(item ,index) in moduleList" :index="index" :key="index">
|
<uni-grid-item v-for="(item ,index) in moduleList" :index="index" :key="index">
|
||||||
<view class="grid-item-box" @click="pageEnter(item)">
|
<view class="grid-item-box" @click="pageEnter(item)">
|
||||||
<image class="image" :src="item.url" mode="aspectFill" />
|
<image class="image" :src="item.url" mode="aspectFill" />
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
</uni-section>
|
</uni-section>
|
||||||
<view style="height: 12rpx;"></view>
|
<view style="height: 12rpx;"></view>
|
||||||
<uni-row :gutter="12">
|
<uni-row :gutter="12">
|
||||||
<uni-col :span="12">
|
<uni-col :span="12" style="border-radius: 20upx;">
|
||||||
<navigator class="middleNavigator" url="../wf/index?category=duty">
|
<navigator class="middleNavigator" url="../wf/index?category=duty">
|
||||||
<span>待办</span>
|
<span>待办</span>
|
||||||
<span class="numSpan">3</span>
|
<span class="numSpan">3</span>
|
||||||
|
@ -56,25 +56,20 @@
|
||||||
moduleList: [{
|
moduleList: [{
|
||||||
navigate:'/pages/ofm/booking',
|
navigate:'/pages/ofm/booking',
|
||||||
url: '/static/yuding.png',
|
url: '/static/yuding.png',
|
||||||
text: '预定会议室',
|
text: '会议预定',
|
||||||
type: "primary",
|
type: "primary",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
navigate:'/pages/ofm/bookingRecord',
|
navigate:'/pages/ofm/bookingRecord',
|
||||||
url: '/static/meetingRecord.png',
|
url: '/static/meetingRecord.png',
|
||||||
text: '历史预定',
|
text: '预定记录',
|
||||||
type: "success"
|
type: "success"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
navigate:'/pages/ofm/mroom',
|
navigate:'/pages/ofm/mroom',
|
||||||
url: '/static/huiyishi.png',
|
url: '/static/huiyishi.png',
|
||||||
text: '会议室列表',
|
text: '会议室',
|
||||||
type: "warning"
|
type: "warning"
|
||||||
},
|
|
||||||
{
|
|
||||||
url: '/static/renyuan.png',
|
|
||||||
text: '人员列表',
|
|
||||||
type: "error"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@ -109,16 +104,16 @@
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
.image {
|
.image {
|
||||||
width: 120rpx;
|
width: 60upx;
|
||||||
height: 120rpx;
|
height: 60upx;
|
||||||
padding: 10rpx;
|
padding: 5upx;
|
||||||
border-radius: 30rpx;
|
border-radius: 20upx;
|
||||||
background-color: #2979ff;
|
background-color: #2979ff;
|
||||||
}
|
}
|
||||||
|
|
||||||
.text {
|
.text {
|
||||||
font-size: 14px;
|
font-size: 24upx;
|
||||||
margin-top: 5px;
|
margin-top: 10upx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.grid-item-box {
|
.grid-item-box {
|
||||||
|
@ -142,6 +137,7 @@
|
||||||
background-color: white;
|
background-color: white;
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content : space-between;
|
justify-content : space-between;
|
||||||
|
border-radius: 10upx;
|
||||||
}
|
}
|
||||||
.numSpan{
|
.numSpan{
|
||||||
color: #2979ff;
|
color: #2979ff;
|
||||||
|
|
|
@ -1,19 +1,21 @@
|
||||||
<template>
|
<template>
|
||||||
<view class="container">
|
<view class="container">
|
||||||
<view v-for="item in dataList" class="uni-list-item">
|
<uni-list v-for="item in dataList" class="uniListItem">
|
||||||
<view class="uni-list-item__container">
|
<!-- #169316 -->
|
||||||
<view class="uni-list-item__content" @click="handleClick(item)">
|
<uni-icons v-if="item.state==2" custom-prefix="iconfont" color="#ea7878" type="icon-yijieshu4" size="35" class="stateIcon yiwancheng"></uni-icons>
|
||||||
<view class="uni-list-item__content-title">{{item.title}}</view>
|
<uni-icons v-if="item.state==1" custom-prefix="iconfont" color="#659fed" type="icon-jinhangzhong" size="35" class="stateIcon"></uni-icons>
|
||||||
<view class="uni-list-item__content-note">预约日期:{{item.mdate}}</view>
|
<uni-icons v-if="item.state==0" custom-prefix="iconfont" color="#7ed47e" type="icon-weikaishi2" size="35" class="stateIcon"></uni-icons>
|
||||||
<view class="uni-list-item__content-note">参加人数:{{item.participant_count}}</view>
|
<uni-list-item :title="item.title" :note="'预约时间:'+item.mdate" :rightText="item.mroom_name">
|
||||||
<view class="uni-list-item__content-note">所属部门:{{item.belong_dept_name}}</view>
|
<text>预约时间段;</text>
|
||||||
<view class="uni-list-item__content-note">参会领导:{{item.key_participants}}</view>
|
</uni-list-item>
|
||||||
<view class="uni-list-item__content-note">预约会议室:{{item.mroom_name}}</view>
|
|
||||||
<view class="uni-list-item__content-note">预约时间:<text v-for="range in item.time_ranges">{{range}}、</text></view>
|
</uni-list>
|
||||||
<view v-if="item.note!==null" class="uni-list-item__content-note">备注:{{item.note}}</view>
|
<!-- <uni-list-chat v-for="item in dataList" :title="item.meetingName" note="您收到一条新的消息" time="2020-02-02 20:20" >
|
||||||
</view>
|
<view class="chat-custom-right">
|
||||||
|
<text class="chat-custom-text">刚刚</text>
|
||||||
|
<uni-icons type="star-filled" color="#999" size="18"></uni-icons>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</uni-list-chat> -->
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
@ -36,11 +38,6 @@
|
||||||
that.dataList = res.results;
|
that.dataList = res.results;
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
handleClick(item){
|
|
||||||
uni.navigateTo({
|
|
||||||
url:'/pages/ofm/booking?item='+item,
|
|
||||||
})
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
@ -49,6 +46,7 @@
|
||||||
.container{
|
.container{
|
||||||
height: 100%;
|
height: 100%;
|
||||||
padding: 0!important;
|
padding: 0!important;
|
||||||
|
background-color: #ffffff;
|
||||||
}
|
}
|
||||||
.chat-custom-right {
|
.chat-custom-right {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
|
@ -76,51 +74,4 @@
|
||||||
.yiwancheng{
|
.yiwancheng{
|
||||||
color: #ff0000;
|
color: #ff0000;
|
||||||
}
|
}
|
||||||
.uni-list-item{
|
|
||||||
display: flex;
|
|
||||||
font-size: 16px;
|
|
||||||
position: relative;
|
|
||||||
justify-content: space-between;
|
|
||||||
align-items: center;
|
|
||||||
flex-direction: row;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
.uni-list-item__container{
|
|
||||||
position: relative;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
padding:20upx 30upx;
|
|
||||||
padding-left: 30upx;
|
|
||||||
flex: 1;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
.uni-list-item__content{
|
|
||||||
display: flex;
|
|
||||||
flex: 1;
|
|
||||||
color: #3b4144;
|
|
||||||
background-color: #c4f0f6;
|
|
||||||
flex-direction: column;
|
|
||||||
justify-content: space-between;
|
|
||||||
overflow: hidden;
|
|
||||||
border: 5upx solid #9ce7f1;
|
|
||||||
box-sizing: border-box;
|
|
||||||
padding: 20upx;
|
|
||||||
border-radius: 20upx;
|
|
||||||
box-shadow: 0 0 10upx 10upx rgba(196,232,246,.3);
|
|
||||||
}
|
|
||||||
/* .uni-list-item__content:hover,
|
|
||||||
.uni-list-item__content:focus{
|
|
||||||
border: 1px solid #7ed47e;
|
|
||||||
} */
|
|
||||||
.uni-list-item__content-title{
|
|
||||||
font-size: 14px;
|
|
||||||
color: #3b4144;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
.uni-list-item__content-note{
|
|
||||||
margin-top: 0.1875rem;
|
|
||||||
color: #999;
|
|
||||||
font-size: 12px;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
Loading…
Reference in New Issue