Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/qingduTicketing

董国庆

2025-12-30 939567a9c8c54052f89e60d8e7151af4c0d451a4

Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/qingduTicketing

 miniprogram/pages.json

@@ -50,8 +50,8 @@
        }
    ],
    "tabBar": {
        "color": "#B9BAC0",
        "selectedColor": "#1BA8EC",
        "color": "#A5A3AF",
        "selectedColor": "#06C584",
        "borderStyle": "black",
        "backgroundColor": "#ffffff",
        "list": [{

 miniprogram/pages/login/login.vue

@@ -1,10 +1,10 @@
<template>
    <view>
        <image src="/static/image/login/back.png" class="w-38 h-35 mt-117 ml-27" @tap.stop="back" />
        <view class="mt-123 ml-77 fs-46 lh-63 font-bold">{{
        <view class="mt-100 ml-77 fs-46 lh-63 font-bold">{{
            loginType ? "快捷登录注册" : "验证码登录"
        }}</view>
        <view v-if="loginType" class="mt-165">
        <view v-if="loginType" class="mt-100">
            <button v-if="isChecked" open-type="getPhoneNumber" @getphonenumber="getphonenumber" :disabled="!isChecked"
                class="lh-96 txt-center br-67 mx-77 white fs-35 font-bold bgcolor1">
                一键登录
@@ -13,8 +13,8 @@
                一键登录
            </button>

            <view @tap.stop="loginType = false" class="txt-center mt-46 fs-27 lh-38">其他手机号登录</view>
            <view class="absolute flex a-center j-center w100 po-absolute">
            <view @tap.stop="loginType = false" class="txt-center mt-46 fs-27 lh-38 color11">其他手机号登录</view>
            <view class="absolute flex a-center w100 po-absolute">
                <image @tap.stop="isChecked = !isChecked" v-if="isChecked" src="/static/image/login/checkbox.png"
                    class="w-35 h-35 shrink0 mr-19" />
                <view @tap.stop="isChecked = !isChecked" v-else class="w-35 h-35 shrink0 mr-19 br50 border1" />
@@ -240,9 +240,16 @@
    }
</style>
<style lang="scss" scoped>
    .color11 {
        font-family: PingFangSC, PingFang SC;
        font-weight: 500;
        font-size: 27rpx;
        color: rgba(0, 0, 0, 0.85);
    }

    .bgcolor1 {
        background: linear-gradient(270deg, #6beadf 0%, #1ba8ec 100%);
        box-shadow: 0rpx 8rpx 19rpx 0rpx rgba(27, 168, 236, 0.3);
        background: linear-gradient(270deg, #08C866 0%, #06C584 100%);
        box-shadow: 0rpx 4rpx 25rpx 0rpx rgba(6, 197, 132, 0.15), 0rpx 8rpx 19rpx 0rpx rgba(6, 197, 132, 0.19);
    }

    .bgcolor2 {
@@ -258,13 +265,14 @@
    }

    .color2 {
        color: #1ba8ec;
        color: #06C584;
    }

    .po-absolute {
        left: 50%;
        bottom: 108rpx;
        transform: translate(-50%);
        margin-left: 27rpx;
        position: fixed;
        bottom: 111.54rpx;
        left: 27rpx;
    }

    ::v-deep .placeholder-class {

 miniprogram/static/image/login/checkbox.png

 miniprogram/static/image/mine/Group@2x (1).png

Binary files differ

 miniprogram/static/image/mine/Group@2x (2).png

Binary files differ

 miniprogram/static/image/mine/Group@2x (3).png

Binary files differ

 miniprogram/static/image/mine/Group@2x.png

Binary files differ

 miniprogram/static/image/mine/Path@2x.png

Binary files differ

 miniprogram/static/image/mine/Shape@2x.png

Binary files differ

 miniprogram/static/image/mine/account.png

 miniprogram/static/image/mine/avater.png

Binary files differ

 miniprogram/static/image/mine/avaterTwo.png

Binary files differ

 miniprogram/static/image/mine/bg.png

 miniprogram/static/image/mine/edit.png

Binary files differ

 miniprogram/static/image/mine/list.png

 miniprogram/static/image/mine/location.png

 miniprogram/static/image/mine/notpay.png

 miniprogram/static/image/mine/returnM.png

 miniprogram/static/image/mine/tip.png

 miniprogram/static/image/mine/userd.png

 miniprogram/static/image/mine/waitUse.png

 miniprogram/utils/request.js

@@ -15,7 +15,7 @@
            mask: true,
        })
    }
    return new Promise(function (resolve, reject) {
    return new Promise(function(resolve, reject) {
        let token = uni.getStorageSync('token')
        let header = {
            'content-type': type ? 'application/x-www-form-urlencoded;charset=UTF-8' : 'application/json',
@@ -61,12 +61,12 @@
                if (res.data.code == 401 || res.data.code == 510 || res.data.code == 504 || res
                    .data
                    .code == 505) {
                    uni.clearStorageSync()
                    handleLogout('登录过期，请重新登录')
                    uni.navigateTo({
                        url: '/pages/login/login'
                    })
                    return
                    // uni.clearStorageSync()
                    // handleLogout('登录过期，请重新登录')
                    // uni.navigateTo({
                    //     url: '/pages/login/login'
                    // })
                    // return
                }

                if (res.data.code == 501) {
@@ -126,7 +126,7 @@
            title: '提示',
            content: str,
            showCancel: false,
            success: function (res) {
            success: function(res) {
                if (res.confirm) {
                    if (routeStr == 'pages/login/login') {
                        return