Merge remote-tracking branch 'origin/master'

jiangping

2024-05-09 a168fee5f88202e1cb3bec88b3d78d02c2368774

Merge remote-tracking branch 'origin/master'

 h5/App.vue

@@ -142,6 +142,10 @@
    .card .content {
        color: #222;
    }
    .placeholder9{
        color: #999999;
        font-size: 28rpx;
    }
        //设置圆角
        checkbox .uni-checkbox-input{
            border-radius: 50%;
@@ -173,7 +177,7 @@
            align-items: center;
        }
        .main_app{
            padding: 0 30rpx;
            padding: 30rpx;
            font-size: 28rpx;
            color: #222222;
        }
@@ -187,4 +191,6 @@
            margin-right: 6rpx;
        }

		

</style>

 h5/package-lock.json

@@ -1,18 +1,35 @@
{
  "name": "图片裁剪 四角拖动 图片缩放移动",
  "version": "1.0.0",
  "lockfileVersion": 1,
    "lockfileVersion": 3,
  "requires": true,
    "packages": {
        "": {
            "name": "图片裁剪 四角拖动 图片缩放移动",
            "version": "1.0.0",
  "dependencies": {
    "uniapp-qrcode": {
                "dayjs": "^1.11.11",
                "uniapp-qrcode": "^1.0.2",
                "uview-ui": "^2.0.37"
            }
        },
        "node_modules/dayjs": {
            "version": "1.11.11",
            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.11.tgz",
            "integrity": "sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg=="
        },
        "node_modules/uniapp-qrcode": {
      "version": "1.0.2",
      "resolved": "https://registry.npmmirror.com/uniapp-qrcode/-/uniapp-qrcode-1.0.2.tgz",
      "integrity": "sha512-jcWwWz4yXsO7if/+78MMXj5VUdZTLu2D6L/IKb4mJkIw87oF11pO3WS/jS27SUcPCrX/BKcir5a2R1uvkaoR9g=="
    },
    "uview-ui": {
        "node_modules/uview-ui": {
      "version": "2.0.37",
      "resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-2.0.37.tgz",
      "integrity": "sha512-iBcWNmQa01Wr+z004G6XIVPDctOrJIAx7LObQceUAPxZh6kJYjIOAMp5JE1K4VpoMV5bKYDpCd0gmX+M4nTEQQ=="
            "integrity": "sha512-iBcWNmQa01Wr+z004G6XIVPDctOrJIAx7LObQceUAPxZh6kJYjIOAMp5JE1K4VpoMV5bKYDpCd0gmX+M4nTEQQ==",
            "engines": {
                "HBuilderX": "^3.1.0"
            }
    }
  }
}

 h5/package.json

@@ -14,6 +14,7 @@
        ]
    },
    "dependencies": {
        "dayjs": "^1.11.11",
        "uniapp-qrcode": "^1.0.2",
        "uview-ui": "^2.0.37"
    }

 h5/pages/staff/meetingSub.vue

@@ -1,9 +1,9 @@
<template>
    <view class="main_app">
        <view class="heade_title">
            <image class="icon" src="../../static/staff/ar_left@2x.png" mode="widthFix"></image>
            <text class="date">{{ activeDate }}</text>
            <image class="icon" src="../../static/staff/ar_right@2x.png" mode="widthFix"></image>
            <image class="icon" src="../../static/staff/ar_left@2x.png" @click="changeDate(-1)" mode="widthFix"></image>
            <text class="date">{{ activeDateCum }}</text>
            <image class="icon" src="../../static/staff/ar_right@2x.png" @click="changeDate(1)" mode="widthFix"></image>
        </view>
        <!--  -->
        <view class="meeting_list">
@@ -56,11 +56,12 @@
</template>

<script>
    import dayjs from 'dayjs'
    export default {
        data() {
            return {
                activeDate: '2022年',
                isShowDetail: true,
                activeDate: '',
                isShowDetail: false,
                meetingList: [
                    { name: '201会议室' },
                    { name: '201会议室' },
@@ -81,6 +82,23 @@
                ]
                
            };
        },
        computed: {
            activeDateCum(){
                const { activeDate } = this
                let weeks = ['周日', '周一','周二','周三','周四','周五','周六']
                return dayjs(activeDate).format('YYYY年M月D日') + ' ' + weeks[dayjs(activeDate).day()]
            }
        },
        created() {
            this.activeDate = dayjs().format('YYYY-MM-DD')
        },
        methods: {
            changeDate(num){
                const { activeDate } = this
                let fn = num > 0 ? 'add' : 'subtract'
                this.activeDate = dayjs(activeDate)[fn](1, 'days').format('YYYY-MM-DD')
            }
        }
    }
</script>

 h5/pages/staff/meetingSubOrder.vue

@@ -1,6 +1,45 @@
<template>
    <view>
    <view class="main_app">
        <view class="module_list">
            <view class="item">
                <view class="name">会议时间</view>
                <view class="line">
                    <view class="label">2022年22月2日 1000000000</view>
                    <u-icon name="arrow-right" color="#999999" size="14" />
                </view>
            </view>
            <view class="item">
                <view class="name">会议室</view>
                <view class="line">
                    <view class="label">aaaaaaaa</view>
                </view>
            </view>
            <view class="item">
                <view class="name">预约人</view>
                <view class="line">
                    <view class="label">aaaaaaaa</view>
                </view>
            </view>
            <view class="empty"></view>
            <view class="item">
                <view class="name">
                    <text>会议主题</text>
                    <text class="star">*</text>
                </view>
                <view class="line">
                    <input type="text" v-model="param.aaa" placeholder="请输入会议主题" placeholder-class="placeholder9" class="label">
                </view>
            </view>
            <view class="item">
                <view class="name">
                    <text>会议内容</text>
                </view>
                <view class="line">
                    <textarea v-model="param.aaa" :maxlength="300" placeholder="请输入会议内容" placeholder-class="placeholder9" class="label" />
                </view>
            </view>
        
        </view>
    </view>
</template>

@@ -8,12 +47,38 @@
    export default {
        data() {
            return {
				
                param: {}
            };
        }
    }
</script>

<style lang="scss">
.module_list{
    .item{
        border-bottom: 1rpx solid #E5E5E5;
        padding: 30rpx 0;
        .name{
            color: #666666;
            margin-bottom: 30rpx;
        }
        .line{
            display: flex;
            .label{
                flex: 1;
            }

        }
    }
}
.empty {
    width: 750rpx;
    height: 20rpx;
    background-color: #f7f7f7;
    margin: 0 -30rpx;
}
.star{
    margin-left: 4rpx;
    color: #e42d2d;
}
</style>

 h5/pages/staff/memberSel.vue

@@ -1,7 +1,7 @@
<template>
    <view class="main_app">
        <view class="search_inp df_ac">
            <u-icon size="28" class="mr12" color="#B2B2B2" name="search" />
            <image class="mr12 search" src="../../static/ic_search@2x.png" mode="widthFix"></image>
            <input type="text" placeholder="搜索" placeholder-style="color: #999999;" />
        </view>
        <view class="member_list">
@@ -207,6 +207,9 @@
    background: #f7f7f7;
    border-radius: 4rpx;
    padding-left: 16rpx;
    .search{
        width: 28rpx;
    }
    input {
        flex: 1;
        font-size: 28rpx;