Merge remote-tracking branch 'origin/master'

jiangping

2024-10-08 e8a54d02091da6674054d9c3c176ef012df3751e

Merge remote-tracking branch 'origin/master'

 admin/src/views/task/driverDetail.vue

@@ -78,12 +78,11 @@
              <div v-if="item.checkInfo" class="remark">
                {{ item.checkInfo }}
              </div>
              <div v-if="item.approveType == 1" class="carbon">
              <div v-if="item.approveType == 0 || item.type == 1 || item.approveType == 1" class="carbon">
                <div class="carbon_item" v-for="child in item.approveList" :key="child.id">
                  <img :src="child.faceImg
                    ? child.faceImg
                    : require('@/assets/avatar/man.png')
                    "></img>
                  <img v-if="child.faceImg != null && child.faceImg != ''" :src="child.faceImg" class="avatar" alt="" />
                  <img v-if="child.faceImg == null || child.faceImg == ''" src="@/assets/avatar/man.png" class="avatar"
                    alt="" />
                  <div class="text">{{ child.memberName }}</div>
                </div>
              </div>

 h5_meeting/manifest.json

@@ -85,30 +85,26 @@
            }
        }
    },
    "h5" : {
        "router" : {
            "mode" : "hash",
            "base" : "./"
        },
        // "base" : "/h5/"
        "devServer" : {
            "port" : 8090,
            "historyApiFallback" : true,
            "disableHostCheck" : true,
            "proxy" : {
                "/gateway_interface" : {
                    // 这个字段名需与你配置的basePrefixUrl一致，系统识别到带有/dev-api请求的地址时，会在前面拼接上代理服务器地址
                    // "target": "http://192.168.137.1:10010", // 代理服务器域名或IP地址
                    // "target" : "http://192.168.31.42:10010", // 代理服务器域名或IP地址
                    "target" : "http://10.50.250.178:8088", // 代理服务器域名或IP地址
                    "changeOrigin" : true, // 允许跨域 
                    "pathRewrite" : {
                        "^/gateway_interface" : ""
                    }
                }
            },
            "https" : false
        }
    "h5": {
        "router": {
            "mode": "hash",
            "base": "./"
        },
        "devServer": {
            "port": 8091,
            "historyApiFallback": true,
            "disableHostCheck": true,
            // "proxy": {
            //     "/gateway_interface": {
            //         "target" : "http://10.50.250.253:8088/gateway_interface", // 代理服务器域名或IP地址
            //         "changeOrigin": true, // 允许跨域 
            //         "pathRewrite": {
            //             "^/gateway_interface": "" 
            //         }
            //     }
            // },
            "https": false
        }
    },
    /* 快应用特有相关 */
    "quickapp" : {},

 h5_meeting/pages/index/index.vue

@@ -191,7 +191,7 @@
    }

    .main_app {

        width: 100%;

        min-height: 100vh;

        height: 100vh;

        position: relative;

        font-size: 28rpx;

        display: flex;


 h5_meeting/utils/service.js

@@ -14,7 +14,7 @@
            })
            const param = uni.getStorageSync('param') || {}
            uni.request({
                url: param.baseUrl || baseUrl + options.url,
                url: (param.baseUrl || baseUrl) + options.url,
                data: options.data || {},
                method: options.method || 'GET',
                header: options.header || {