Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

qq_41295110

2025-07-28 5a1108c349d0cdeae56fa290ee2922fea52f0407

Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

# Conflicts:
#	pages/index/tab2.vue

 manifest.json

@@ -2,8 +2,8 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",
    "versionName" : "1.0.22",
    "versionCode" : 122,
    "versionName" : "1.0.23",
    "versionCode" : 123,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {

 pages/index/index.vue

@@ -61,17 +61,17 @@
                    },{
                        img: '../../static/icon/icon31.png',
                        text: '生产补料新增',
                        url: '',
                        url: '/pages/shengchanbuliao/form?OperationType=1',
                        id: 8,
                    },{
                        img: '../../static/icon/icon17.png',
                        text: '生产入库新增',
                        url: '',
                        url: '/pages/shengchanrukushengdan/form?OperationType=1',
                        id: 9,
                    },{
                        img: '../../static/icon/icon30.png',
                        text: '委外领料新增',
                        url: '',
                        url: '/pages/weiwailingliao/form?OperationType=1',
                        id: 10,
                    },{
                        img: '../../static/icon/icon17.png',

 pages/index/tab1.vue

@@ -5,9 +5,9 @@
                <image :src="item.img" mode=""></image>
                <view class="texts">
                    <view class="font1">{{item.text}}</view>
                    <view class="font2">{{item.tip}}</view>
                    <!-- <view class="font2">{{item.tip}}</view> -->
                </view>
                <uni-icons type="forward" color="#888" style="position: absolute;right: 70rpx;" size="18"></uni-icons>
                <!-- <uni-icons type="forward" color="#888" style="position: absolute;right: 70rpx;" size="18"></uni-icons> -->
            </view>
        </view>
    </view>
@@ -221,43 +221,71 @@
    page {
        width: 100vw;
        min-height: 100vh;
        background-color: #f5f5f5;
        background-color: #fff;
    }

	
    .mains {
        width: 720rpx;
        margin: 0 auto;
        padding-bottom: 120rpx;

        display: flex;
        flex-wrap: wrap;
        padding-bottom: 80rpx;
	
        .box {
            width: 680rpx;
            margin: 0 auto;
            margin-top: 20rpx;
            display: flex;
            align-items: center;
            background-color: #fff;
            border-radius: 20rpx;
            box-shadow: 2upx 2upx 20upx 0 #ddd;

            width: 25%;
            margin-top: 2.5vh;
            text-align: center;
	
            image {
                width: 78rpx;
                height: 78rpx;
                padding: 10rpx;
                margin: 14rpx 30rpx;
                width: 18vw;
                height: 18vw;
            }

	
            .texts {
                font-size: 30rpx;
                width: 120rpx;
                margin: 0 auto;
                font-size: 29rpx;
                font-weight: normal;
                color: #333333;

                .font1 {}

                .font2 {
                    font-size: 25rpx;
                    color: #999;
                }
                margin-top: .2vh;
            }
        }
    }

    // .mains {
    //     width: 720rpx;
    //     margin: 0 auto;
    //     padding-bottom: 120rpx;

    //     .box {
    //         width: 680rpx;
    //         margin: 0 auto;
    //         margin-top: 20rpx;
    //         display: flex;
    //         align-items: center;
    //         background-color: #fff;
    //         border-radius: 20rpx;
    //         box-shadow: 2upx 2upx 20upx 0 #ddd;

    //         image {
    //             width: 78rpx;
    //             height: 78rpx;
    //             padding: 10rpx;
    //             margin: 14rpx 30rpx;
    //         }

    //         .texts {
    //             font-size: 30rpx;
    //             font-weight: normal;
    //             color: #333333;

    //             .font1 {}

    //             .font2 {
    //                 font-size: 25rpx;
    //                 color: #999;
    //             }
    //         }
    //     }
    // }
</style>

 pages/index/tab2.vue

@@ -6,7 +6,7 @@
                <view class="texts">
                    {{item.text}}
                </view>
                <uni-icons type="forward" color="#888" style="position: absolute;right: 40rpx;" size="18"></uni-icons>
                <!-- <uni-icons type="forward" color="#888" style="position: absolute;right: 40rpx;" size="18"></uni-icons> -->
            </view>
        </view>
    </view>
@@ -174,29 +174,56 @@
</script>

<style lang="scss" scoped>
.mains{
    width: 720rpx;
    margin: 0 auto;
    display: flex;
    flex-wrap: wrap;
    margin-top: 10rpx;
    padding-bottom: 80rpx;
    .box{
        width: 100%;
        margin: 26rpx 26rpx 0 26rpx;
        padding: 0 0 16rpx 10rpx;
// .mains{
//     width: 720rpx;
//     margin: 0 auto;
//     display: flex;
//     flex-wrap: wrap;
//     margin-top: 10rpx;
//     padding-bottom: 80rpx;
//     .box{
//         width: 100%;
//         margin: 26rpx 26rpx 0 26rpx;
//         padding: 0 0 16rpx 10rpx;
//         display: flex;
//         align-items: center;
//         border-bottom: 1px solid #f0f0f0;
//         image{
//             width: 52rpx;
//             height: 52rpx;
//         }
//         .texts{
//             font-size: 30rpx;
//             color: #333333;
//             margin-left: 30rpx;
//         }
//     }
// }
    .mains {
        width: 720rpx;
        margin: 0 auto;
        display: flex;
        align-items: center;
        border-bottom: 1px solid #f0f0f0;
        image{
            width: 52rpx;
            height: 52rpx;
        }
        .texts{
            font-size: 30rpx;
            color: #333333;
            margin-left: 30rpx;
        flex-wrap: wrap;
        padding-bottom: 80rpx;
	
        .box {
            width: 25%;
            margin-top: 2.5vh;
            text-align: center;
	
            image {
                width: 18vw;
                height: 18vw;
            }
	
            .texts {
                width: 120rpx;
                margin: 0 auto;
                font-size: 29rpx;
                font-weight: normal;
                color: #333333;
                margin-top: .2vh;
            }
        }
    }
}
</style>