更新bug

components/handleModule/index.wxml

@@ -43,7 +43,7 @@
         <text wx:if="{{isRequired}}" class="{{value?'text-green':'text-red'}}">*</text>
         <text class="van-cell-text">{{title}}</text>
     </view>
-    <van-stepper value="{{ value }}" bind:change="getValue" data-type="1" integer max="{{stepperMax}}" min="{{0}}" />
+    <van-stepper value="{{ value }}" bind:change="getValue" data-type="1" integer max="{{stepperMax}}" min="{{1}}" />
 </van-cell>
 <!-- 单选 -->
 <van-cell border="{{ false }}" class="label-sm" wx:if="{{type === 'radio'}}" title-width="200rpx">

components/meetingLayout/index.js

@@ -51,8 +51,7 @@ Component({
      */
     data: {},
     lifetimes: {
-        attached: function () {
-        },
+        attached: function () {},
         detached: function () {
             // 在组件实例被从页面节点树移除时执行
         },
@@ -62,23 +61,30 @@ Component({
      * 组件的方法列表
      */
     methods: {
+        // 茶水
         getWater(e) {
             if (!this.data.isDisable) {
                 this.triggerEvent('teaWater', e)
             }
         },
+        cleaeTea(e) {
+            this.triggerEvent('cleaeTea', e)
+        },
+        // 点心
         getSnack(e) {
             if (!this.data.isDisable) {
                 this.triggerEvent('snack', e)
             }
         },
+        // 桌签
         getMonogram(e) {
             let dataset = e.currentTarget.dataset
+            let {leftList,rightList}=this.data
             if (!this.data.isDisable) {
                 var that = this;
                 wx.showModal({
                     title: '桌签内容',
-                    content: '',
+                    content: dataset.type === 'left' ? leftList[dataset.index].monogram : rightList[dataset.index].monogram,
                     showCancel: true,
                     editable: true,
                     success: function (res) {
@@ -91,6 +97,7 @@ Component({
             }
 
         },
+        // 大屏/投影
         largeScreenFun(e) {
             // console.log(e);
             if (!this.data.isDisable) {

components/meetingLayout/index.wxml

@@ -6,15 +6,18 @@
     </view>
     <view class="content flex">
         <view class="left">
-            <view class="item"  wx:for="{{leftList}}" wx:key="index">
-                <view class="item-top over basics bor1 {{item.monogram?'bgc':''}}" bindtap="getMonogram" data-type="left" data-index="{{index}}"  wx:if="{{utils.indexOf1(itemData.meetingBeforeServiceNameList,'准备桌签')}}">{{item.monogram||'桌签'}}</view>
+            <view class="item" wx:for="{{leftList}}" wx:key="index">
+                <view class="item-top over basics bor1 {{item.monogram?'bgc':''}}" bindtap="getMonogram" data-type="left" data-index="{{index}}" wx:if="{{utils.indexOf1(itemData.meetingBeforeServiceNameList,'准备桌签')}}">{{item.monogram||'桌签'}}</view>
 
                 <view class="flex">
-                    <picker  disabled="{{isDisable}}" class="picker" range="{{itemData.meetingBeforeTeaList}}" bindchange="getWater" data-type="left" data-index="{{index}}" wx:if="{{utils.indexOf1(itemData.meetingBeforeServiceNameList,'准备茶水')}}">
-                        <view class="item-bottom basics bor1 {{item.teaWater?'bgc':''}}">{{item.teaWater || '茶水'}}</view>
+                <van-icon name="clear" class="clear-icon" bindtap="cleaeTea" data-index="{{index}}" data-type="left" wx:if="{{item.teaWater}}"/>
+                    <picker disabled="{{isDisable}}" class="picker" range="{{itemData.meetingBeforeTeaList}}" bindchange="getWater" data-type="left" data-index="{{index}}" wx:if="{{utils.indexOf1(itemData.meetingBeforeServiceNameList,'准备茶水')}}">
+                        <view class="wid item-bottom basics bor1 {{item.teaWater?'bgc':''}}">
+                            {{item.teaWater || '茶水'}}
+                        </view>
                     </picker>
 
-                    <view wx:if="{{utils.indexOf1(itemData.meetingBeforeServiceNameList,'允许点心')}}" class="item-bottom basics bor1 m-l {{item.snack?'bgc':''}}" bindtap="getSnack" data-type="left" data-index="{{index}}">点心</view>
+                    <view wx:if="{{utils.indexOf1(itemData.meetingBeforeServiceNameList,'允许点心')}}" class="wid item-bottom basics bor1 m-l {{item.snack?'bgc':''}}" bindtap="getSnack" data-type="left" data-index="{{index}}">点心</view>
                 </view>
             </view>
         </view>
@@ -29,14 +32,15 @@
         </view>
         <view class="right">
             <view class="item" wx:for="{{rightList}}" wx:key="index">
-                <view class="item-top over basics bor1 {{item.monogram?'bgc':''}}" bindtap="getMonogram" data-type="right" data-index="{{index}}"  wx:if="{{utils.indexOf1(itemData.meetingBeforeServiceNameList,'准备桌签')}}">{{item.monogram||'桌签'}}</view>
+                <view class="item-top over basics bor1 {{item.monogram?'bgc':''}}" bindtap="getMonogram" data-type="right" data-index="{{index}}" wx:if="{{utils.indexOf1(itemData.meetingBeforeServiceNameList,'准备桌签')}}">{{item.monogram||'桌签'}}</view>
 
                 <view class="flex">
-                    <picker  disabled="{{isDisable}}" class="picker" range="{{itemData.meetingBeforeTeaList}}" bindchange="getWater" data-type="right" data-index="{{index}}" wx:if="{{utils.indexOf1(itemData.meetingBeforeServiceNameList,'准备茶水')}}">
-                        <view class="item-bottom basics bor1 {{item.teaWater?'bgc':''}}">{{item.teaWater || '茶水'}}</view>
+                    <van-icon name="clear" class="clear-icon" bindtap="cleaeTea" data-index="{{index}}" data-type="right" wx:if="{{item.teaWater}}"/>
+                    <picker disabled="{{isDisable}}" class="picker" range="{{itemData.meetingBeforeTeaList}}" bindchange="getWater" data-type="right" data-index="{{index}}" wx:if="{{utils.indexOf1(itemData.meetingBeforeServiceNameList,'准备茶水')}}">
+                        <view class="wid item-bottom basics bor1 {{item.teaWater?'bgc':''}}">{{item.teaWater || '茶水'}}</view>
                     </picker>
 
-                    <view wx:if="{{utils.indexOf1(itemData.meetingBeforeServiceNameList,'允许点心')}}" class="item-bottom basics bor1 m-l {{item.snack?'bgc':''}}" bindtap="getSnack" data-type="right" data-index="{{index}}">点心</view>
+                    <view wx:if="{{utils.indexOf1(itemData.meetingBeforeServiceNameList,'允许点心')}}" class="wid item-bottom basics bor1 m-l {{item.snack?'bgc':''}}" bindtap="getSnack" data-type="right" data-index="{{index}}">点心</view>
                 </view>
             </view>
         </view>

components/meetingLayout/index.wxss

@@ -43,13 +43,14 @@
 .flex {
     display: flex;
     justify-content: center;
+position: relative;
 }
 
 .item {
     /* width: 236rpx; */
     color: rgba(58, 60, 101, 0.50);
     text-align: center;
-    font-size: 27rpx;
+    font-size: 25rpx;
     font-weight: 500;
     margin-bottom: 48rpx;
 }
@@ -68,12 +69,18 @@
 
 .item-bottom {
     background-color: #fbfcfe;
-    padding: 0 28rpx;
+
+    /* padding: 0 28rpx; */
     font-weight: 400;
     height: 58rpx;
     line-height: 58rpx;
 }
 
+.wid {
+    width: 120rpx;
+    position: relative;
+}
+
 .center {
     margin: 0 20rpx;
     background-color: #f1f4fd;
@@ -98,9 +105,19 @@
     background-color: #cffff8;
     color: #3A3C65;
 }
-.over{
+
+.over {
     width: 206rpx;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
+}
+
+.clear-icon {
+    position: absolute;
+    top: -4rpx;
+    left: 100rpx;
+    margin-right: 0;
+    font-size: 33rpx;
+    z-index: 999;
 }

pages/home/home.js

@@ -23,7 +23,7 @@ Page({
         meetingList: [],
         funList: [{
                 id: '1',
-                name: '会议室',
+                name: '会议室预约',
                 img: '/static/home/home-1.png',
                 url: '/pages/meeting/index/index?type=meeting-detail',
                 jurisdiction: [1, 2],
@@ -95,6 +95,11 @@ Page({
     //         accountId: this.data.accountList[e.detail.value].id
     //     })
     // },
+    gotomy(){
+        wx.switchTab({
+          url: '/pages/mine/index/index',
+        })
+    },
     // 我的会议室-数据
     myMeeting() {
         let data = {

pages/home/home.wxml

@@ -22,7 +22,7 @@
                     <text>请输入会议室</text>
                 </view>
             </view> -->
-            <view class="bg">
+            <view class="bg" bindtap="gotomy">
                 <image src="/static/home/bg.png" mode="" />
             </view>
             <!-- 功能区 -->

pages/login/index.js

@@ -84,6 +84,8 @@ Page({
                             }, 800)
                         }
                     })
+                }).catch(err=>{
+                    wx.hideLoading()
                 })
             }
         })

pages/meeting/appointmentDetail/index.js

@@ -2,7 +2,7 @@
 import {
     cancellationMeeting,
     getMeetingInServiceList,
-    meetingServiceListSubmit
+    meetingServiceListSubmit,appointmentDateRecordList
 } from '../../../utils/api/meeting'
 const app = getApp();
 Page({
@@ -39,6 +39,7 @@ Page({
         rightList: [],
         projection: false,
         aircondition: false,
+        nextMeetingStartTime:null,
     },
     // 是否显示提示框区域
     showFun() {
@@ -88,6 +89,13 @@ Page({
                 data.meetingInServiceList.push(item.name)
             }
         })
+        if(data.meetingInServiceList.length<=0){
+            wx.showToast({
+              title: '请选择服务项',
+              icon: 'none',
+            })
+            return
+        }
         meetingServiceListSubmit(data).then(res => {
             wx.showToast({
                 title: '点单成功',
@@ -192,6 +200,30 @@ Page({
             })
         })
     },
+    // 本会议室预约的会议列表
+    appointmentDateRecordList() {
+        let item = this.data.item
+        let data = {
+            appointmentDate:item.appointmentDate,
+            meetingRoomId: item.meetingRoomId
+        }
+        appointmentDateRecordList(data).then(res => {
+          let index =  res.data.findIndex(data=>{
+              return data.appointmentStartTime ==item.appointmentStartTime
+          })
+          if(index+1>=res.data.length){
+            this.setData({
+                nextMeetingStartTime:null
+            })
+          }else if(index>-1){
+              this.setData({
+                  nextMeetingStartTime:res.data[index+1].appointmentStartTime
+              })
+          }
+            console.log(index);
+        })
+    },
+
     /**
      * 生命周期函数--监听页面加载
      */
@@ -208,6 +240,11 @@ Page({
                 meetingData: item.meetingRoomVo || item
             })
         }
+        console.log(this.data.type);
+        console.log(this.data.item);
+        if (this.data.type == 'my-meeting'){
+            this.appointmentDateRecordList()
+        }
         if (this.data.type == 'my-meeting' && this.data.item.status == 2) {
             this.getMeetingInServiceList()
         }

pages/meeting/appointmentDetail/index.wxml

@@ -14,8 +14,8 @@
 
             <text class="status-text {{item.status==1?'status1':item.status==2?'status2':item.status==3?'status3':''}}" wx:if="{{type=='my-meeting'}}">{{item.status==1?'未开始':item.status==2?'进行中':item.status==3?'已结束':''}}</text>
         </view>
-
-        <van-icon name="apps-o" color="#fff" size="50rpx" class="apps-o" bindtap="showFun" wx:if="{{type=='my-meeting' &&item.status!=3}}" />
+        <view class="apps-o" bindtap="showFun" wx:if="{{type=='my-meeting' &&item.status!=3}}">更多</view>
+        <!-- <van-icon name="apps-o" color="#fff" size="50rpx" class="apps-o" bindtap="showFun" wx:if="{{type=='my-meeting' &&item.status!=3}}" /> -->
         <view wx:if="{{type=='my-subscribe' || type=='subscribe-audit'}}">
             <view class="audit" bindtap="gotoFun" data-id="1">
                 <text>审核详情</text>
@@ -40,9 +40,8 @@
     <view class="fun border-radius-20" wx:if="{{isShowFun}}">
         <view class="fun-box">
             <!--  三角区域 -->
-            <!--  -->
             <view class="info-panel-triple"></view>
-            <view class="fun-item" wx:for="{{funList}}" wx:key="index" wx:for-item="item1" data-item="{{item1}}" bindtap="clickFun" wx:if="{{utils.indexOf1(item1.status,item.status)}}">{{item1.name}}</view>
+            <view class="fun-item" wx:for="{{funList}}" wx:key="index" wx:for-item="item1" data-item="{{item1}}" bindtap="clickFun" wx:if="{{utils.indexOf2(item1.status,item1.name,item.status,item.continueMeeting)}}">{{item1.name}}</view>
         </view>
     </view>
 </view>
@@ -76,7 +75,11 @@
         <text>会议中可提供服务： <text wx:for="{{item.meetingRoomVo.meetingInServiceList}}" wx:key="index" wx:for-item="item1">{{item1}}{{item.meetingRoomVo.meetingInServiceList.length>index+1?'、':''}}</text></text>
         <!-- <text wx:else>会议中可提供服务： <text wx:for="{{item.meetingInServiceList}}" wx:key="index" wx:for-item="item1">{{item1}}{{item.meetingInServiceList.length>index+1?'、':''}}</text></text> -->
     </view>
-
+    <view class="yellow-bg" wx:if="{{type=='my-meeting' &&item.status!=3 }}">
+        <van-icon name="info" />
+        <text wx:if="{{nextMeetingStartTime}}">本会议室中，与本场会议时间相邻的下一场会议是{{nextMeetingStartTime}}开始。</text>
+        <text wx:else>本会议室中，暂无与本场会议时间相邻的下一场会议，最晚可预约至{{item.meetingRoomVo.canAppointmentEndTime}}点</text>
+    </view>
 
     <view class="service border-radius-20" wx:if="{{type=='meeting-detail' || type=='subscribe-audit'}}">
         <!-- <image src="/static/img/air.png" mode="" /> -->

pages/meeting/appointmentDetail/index.wxss

@@ -11,6 +11,7 @@
     font-size: 30rpx;
     font-weight: 500;
 }
+
 .p-t {
     padding-top: 200rpx;
     position: relative;
@@ -18,6 +19,7 @@
     box-sizing: border-box;
     height: 464rpx;
 }
+
 .room-detail-bg {
     position: absolute;
     width: 100%;
@@ -51,7 +53,7 @@
 }
 
 .apps-o {
-    font-size: 50rpx;
+    font-size: 35rpx;
     position: absolute;
     bottom: 200rpx;
     right: 10rpx;
@@ -154,7 +156,7 @@
     width: 220rpx;
     position: absolute;
     background-color: #fff;
-    bottom: -360rpx;
+    top:300rpx;
     right: 12rpx;
 }
 
@@ -186,7 +188,7 @@
     font-size: 32rpx;
     font-weight: 500;
     background-color: #ff8641;
-    padding: 0rpx 24rpx;
+    padding: 15rpx 24rpx 20rpx;
     border-radius: 75rpx;
 }
 
@@ -259,3 +261,11 @@
 .status3 {
     color: #9BAED5;
 }
+
+.yellow-bg {
+    color: rgba(58, 60, 101, 0.85);
+    font-size: 26rpx;
+    background-color: rgba(247, 147, 26, 0.10);
+    padding: 16rpx 26rpx;
+    border-radius: 8rpx;
+}

pages/meeting/detail/index.js

@@ -99,6 +99,7 @@ Page({
         })
         this.appointmentDateRecordList(item.year)
     },
+    // 本会议室预约的会议列表
     appointmentDateRecordList(year) {
         let data = {
             appointmentDate: year,

pages/meeting/detail/index.wxml

@@ -47,6 +47,14 @@
                 <text class="letter" wx:for="{{itemData.meetingInServiceList}}" wx:key="index">{{item}} {{itemData.meetingInServiceList.length>index+1?'/':''}}</text>
             </view>
         </view>
+        <view wx:if="{{itemData.imgList &&itemData.imgList.length>0}}">
+            <view class="picture-tit">
+                会议室实景图
+            </view>
+            <view class="picture-box">
+                <image class="picture-img" wx:for="{{itemData.imgList}}" wx:key="index" src="{{item}}" mode="" />
+            </view>
+        </view>
         <view class="contnt-box">
             <view class="tit">
                 已预约的会议

pages/meeting/detail/index.wxss

@@ -65,7 +65,8 @@
     color: #99683F;
     font-size: 26rpx;
     font-weight: 400;
-    margin-left: 36rpx;    letter-spacing: 4rpx;
+    margin-left: 36rpx;
+    letter-spacing: 4rpx;
 }
 
 .contnt-box {
@@ -83,7 +84,7 @@
 
 .flex {
     display: flex;
-    justify-content:left;
+    justify-content: left;
     overflow-x: auto;
 }
 
@@ -182,14 +183,37 @@
     color: rgba(58, 60, 101, 0.70);
     font-size: 28rpx;
 }
-.subscribe-user >image{
+
+.subscribe-user>image {
     width: 56rpx;
     height: 56rpx;
     vertical-align: middle;
 }
-.m-b{
+
+.m-b {
     margin-bottom: 200rpx;
 }
-.letter{
+
+.letter {
     letter-spacing: 5rpx;
+}
+
+.picture-tit {
+    color: #3A3A4D;
+    font-size: 28rpx;
+    font-weight: 500;
+    margin: 16rpx 0 16rpx 0;
+}
+
+.picture-box {
+    width: 100%;
+    overflow-x: auto;
+    overflow-y: hidden;
+    white-space: nowrap;
+
+}
+
+.picture-img {
+    height: 320rpx;
+    margin: 0 16rpx;
 }

pages/meeting/subscribe/index.js

@@ -14,7 +14,7 @@ Page({
         itemData: {},
         appointmentList: [],
         form: {
-            meetingNum: 0,
+            meetingNum: 1,
             appointmentDate: null,
             aircondition: false,
             projection: false,
@@ -46,9 +46,9 @@ Page({
         let rightList = []
         for (let i = 0; i < seatNum; i++) {
             let data = {
-                monogram: null,
+                monogram: '',
                 snack: false,
-                teaWater: null,
+                teaWater: '',
             }
             if (i % 2 == 0) {
                 leftList.push(data)
@@ -77,6 +77,22 @@ Page({
             })
         }
     },
+    // 清除茶水
+    getCleaeTea(e) {
+        let dataset = e.detail.currentTarget.dataset
+        let name = "leftList[" + dataset.index + "].teaWater"
+        let name1 = "rightList[" + dataset.index + "].teaWater"
+        if (dataset.type === 'left') {
+            this.setData({
+                [name]: ''
+            })
+        }
+        if (dataset.type === 'right') {
+            this.setData({
+                [name1]: ''
+            })
+        }
+    },
     // 点心
     getSnack(e) {
         let dataset = e.detail.currentTarget.dataset
@@ -117,9 +133,6 @@ Page({
         if (type == "appointmentDate") {
             this.appointmentDateRecordList(e.detail)
         }
-        // if (type == "meetingNum") {
-        //     this.getSeat()
-        // }
     },
     getValue1(e) {
         this.setData({
@@ -147,9 +160,10 @@ Page({
             rightList,
             type
         } = this.data
+        let that = this
         if (!form.appointmentStartTime || !form.appointmentEndTime) {
             wx.showToast({
-                title: '请填写完整',
+                title: '会议时间不能为空',
                 icon: 'none'
             })
             return
@@ -167,43 +181,38 @@ Page({
         }
         wx.requestSubscribeMessage({
             tmplIds: ['mJs6TXjIFuwgPu2JOEIpu3lO9ym9rnai-schUPuLuok'],
-            success(res) {
-                if (type == 'transfer-audit') {
-                    checkTurnMeeting(form).then(res => {
-                        wx.showToast({
-                            title: '提交成功',
-                            icon: 'none',
-                            duration: 800,
-                            mask: true,
-                            success: function () {
-                                setTimeout(function () {
-                                    wx.switchTab({
-                                        url: '/pages/home/home',
-                                    })
-                                }, 800)
-                            }
-                        })
-                    })
-                } else {
-                    insertMeetingRecord(form).then(res => {
-                        wx.showToast({
-                            title: '提交成功',
-                            icon: 'none',
-                            duration: 800,
-                            mask: true,
-                            success: function () {
-                                setTimeout(function () {
-                                    wx.switchTab({
-                                        url: '/pages/home/home',
-                                    })
-                                }, 800)
-                            }
-                        })
-                    })
-                }
+            success() {
+                that.check()
             }
         })
     },
+    async check() {
+        let {
+            form,
+            type
+        } = this.data
+        let res
+        if (type == 'transfer-audit') {
+            res = await checkTurnMeeting(form)
+        } else {
+            res = await insertMeetingRecord(form)
+        }
+        if (res.code == 200) {
+            wx.showToast({
+                title: '提交成功',
+                icon: 'none',
+                duration: 800,
+                mask: true,
+                success: function () {
+                    setTimeout(function () {
+                        wx.switchTab({
+                            url: '/pages/home/home',
+                        })
+                    }, 800)
+                }
+            })
+        }
+    },
     // 获取预约日期
     getStartDate() {
         let {
@@ -263,9 +272,8 @@ Page({
                 let timeStart = Date.parse(form.appointmentDate + ' ' + item.appointmentStartTime + ':00')
                 let timeEnd = Date.parse(form.appointmentDate + ' ' + appointmentList[(index == 0 ? index : index - 1)].appointmentEndTime + ':00')
                 let timeEnd1 = Date.parse(form.appointmentDate + ' ' + appointmentList[(index == 0 ? index : index - 1)].appointmentEndTime + ':00')
-
                 timePeriodList.push({
-                    startTime: appointmentList.length == 0 ? itemData.canAppointmentStartTime : this.convertTime(timeEnd + ttt),
+                    startTime: index==0 ? itemData.canAppointmentStartTime : this.convertTime(timeEnd + ttt),
                     endTime: this.convertTime(timeStart - ttt),
                     type: 1, //1：可点击；2：禁用
                     id: index + 'q'

pages/meeting/subscribe/index.wxml

@@ -33,12 +33,12 @@
     </view>
 
 
-    <handle-module type="stepper" title="参会人数" data-type="meetingNum" bindchange="getValue" value="{{form.meetingNum}}" stepperMax="{{itemData.seatNum}}" />
+    <handle-module type="stepper" title="参会人数" data-type="meetingNum" bindchange="getValue" value="{{form.meetingNum}}" />
     <handle-module type="radio" title="会标" data-type="meetingMonogramStatus" bindchange="getValue" value="{{form.meetingMonogramStatus}}" listErgodic="{{logoList}}" name1="name" key1="id" wx:if="{{utils.indexOf1(itemData.meetingBeforeServiceNameList,'准备会标')}}" />
     <handle-module wx:if="{{form.meetingMonogramStatus}}" title="会标名称" placeholder="请输入会标名称" data-type="meetingMonogram" bindchange="getValue" value="{{form.meetingMonogram}}" />
     <view class="layout">
         <view class="layout-tit">会议室布局安排</view>
-        <meeting-layout isDisable="{{false}}" aircondition="{{form.aircondition}}" projection="{{form.projection}}" leftList="{{leftList}}" rightList="{{rightList}}" itemData="{{itemData}}" bindchange="getValue1" bindteaWater="getTeaWater" bindsnack="getSnack" bindmonogram="getMonogram"></meeting-layout>
+        <meeting-layout isDisable="{{false}}" aircondition="{{form.aircondition}}" projection="{{form.projection}}" leftList="{{leftList}}" rightList="{{rightList}}" itemData="{{itemData}}" bindchange="getValue1" bindteaWater="getTeaWater" bindcleaeTea="getCleaeTea" bindsnack="getSnack" bindmonogram="getMonogram"></meeting-layout>
     </view>
 </view>
 <view class="btn-area">

pages/myRenewalContract/detail/index.wxml

@@ -20,7 +20,7 @@
             <text>审核详情</text>
             <van-icon name="arrow" />
         </view>
-        <image class="status-img" src="/static/status/audit.png" mode="" />
+        <image class="status-img" src="/static/status/{{item.status==1?'audit':item.status==2?'pass':item.status==3?'refuse':'cancel'}}.png" mode="" />
     </view> 
     </view>
 </view>

pages/myRenewalContract/detail/index.wxss

@@ -210,7 +210,7 @@
     display: inline-block;
     position: absolute;
     right: 0;
-    top: 17rpx;
+    top: 220rpx;
     height: 56rpx;
     line-height: 56rpx;
     border-radius: 20rpx 0 0 20rpx;
@@ -220,6 +220,6 @@
     width: 120rpx;
     height: 112rpx;
     position: absolute;
-    bottom: 100rpx;
+    bottom: 45rpx;
     right: 65rpx;
 }

project.private.config.json

@@ -14,6 +14,13 @@
                     "query": "type=renewalContract-audit",
                     "launchMode": "default",
                     "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/login/index",
+                    "query": "adminId=2",
+                    "launchMode": "default",
+                    "scene": null
                 }
             ]
         }

utils/util.wxs

@@ -33,6 +33,20 @@ function indexOf1(array, value) {
     }
 }
 
+function indexOf2(array, name,status, continueMeeting) {
+    if (array) {
+        if (array.indexOf(status) < 0) {
+            return false;
+        } else {
+            var isTrue = true
+            if (name == '会议续约') {
+                continueMeeting ? isTrue = true : isTrue = false
+            }
+            return isTrue
+        }
+    }
+}
+
 function getVehicleType(id) {
     var drivingModelList = [{
             id: 1,
@@ -107,4 +121,5 @@ module.exports = {
     indexOf1: indexOf1,
     getVehicleType: getVehicleType,
     desensitization: desensitization,
+    indexOf2:indexOf2,
 }