Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-05-28 21f11949452248769ca26f4c4dfb97a3cd642a10

Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

 admin/src/api/business/hiddenDanger.js

@@ -17,6 +17,9 @@
export function create (data) {
  return request.post('/visitsAdmin/cloudService/business/hiddenDanger/create', data)
}
export function transferHiddenDanger (data) {
  return request.post('/visitsAdmin/cloudService/business/hiddenDanger/transferHiddenDanger', data)
}

// ä¿®æ”¹
export function updateById (data) {

 admin/src/api/business/hiddenDangerParam.js

@@ -11,6 +11,11 @@
    trim: true
  })
}
export function memberList (data) {
  return request.post('/visitsAdmin/cloudService/business/hiddenDangerParam/findHiddenAreaMemberList', data, {
    trim: true
  })
}
// åˆ›å»º
export function create (data) {
  return request.post('/visitsAdmin/cloudService/business/hiddenDangerParam/create', data)

 h5/manifest.json

@@ -1,6 +1,6 @@
{
    "name": "laborVisitors",
    "appid": "__UNI__E9B0763",
    "appid" : "__UNI__E3BA820",
    "description": "",
    "versionName": "1.0.0",
    "versionCode": "100",
@@ -58,10 +58,7 @@
            "minified": true
        },
        "usingComponents": true,
        "requiredPrivateInfos": [
            "getLocation",
            "chooseLocation"
        ],
        "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ],
        "permission": {
            "scope.userLocation": {
                "desc": "用于获取周边房源位置"
@@ -85,14 +82,15 @@
        "router": {
            "mode": "hash",
            "base": "/"
            // "base" : "/h5/"
        },
        // "base" : "/h5/"
        "devServer": {
            "port": 8090,
            "historyApiFallback": true,
            "disableHostCheck": true,
            "proxy": {
                "/api": { // è¿™ä¸ªå­—段名需与你配置的basePrefixUrl一致，系统识别到带有/dev-api请求的地址时，会在前面拼接上代理服务器地址
                "/api" : {
                    // è¿™ä¸ªå­—段名需与你配置的basePrefixUrl一致，系统识别到带有/dev-api请求的地址时，会在前面拼接上代理服务器地址
                    "target": "http://192.168.0.143:10010", // ä»£ç†æœåŠ¡å™¨åŸŸåæˆ–IP地址
                    "changeOrigin": true, // å…è®¸è·¨åŸŸ 
                    "pathRewrite": {

 h5/package-lock.json

@@ -1,35 +1,23 @@
{
    "name": "图片裁剪 å››è§’拖动 å›¾ç‰‡ç¼©æ”¾ç§»åŠ¨",
    "version": "1.0.0",
    "lockfileVersion": 3,
    "lockfileVersion": 1,
    "requires": true,
    "packages": {
        "": {
            "name": "图片裁剪 å››è§’拖动 å›¾ç‰‡ç¼©æ”¾ç§»åŠ¨",
            "version": "1.0.0",
            "dependencies": {
                "dayjs": "^1.11.11",
                "uniapp-qrcode": "^1.0.2",
                "uview-ui": "^2.0.37"
            }
        },
        "node_modules/dayjs": {
        "dayjs": {
            "version": "1.11.11",
            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.11.tgz",
            "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.11.tgz",
            "integrity": "sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg=="
        },
        "node_modules/uniapp-qrcode": {
        "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=="
        },
        "node_modules/uview-ui": {
        "uview-ui": {
            "version": "2.0.37",
            "resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-2.0.37.tgz",
            "integrity": "sha512-iBcWNmQa01Wr+z004G6XIVPDctOrJIAx7LObQceUAPxZh6kJYjIOAMp5JE1K4VpoMV5bKYDpCd0gmX+M4nTEQQ==",
            "engines": {
                "HBuilderX": "^3.1.0"
            }
            "integrity": "sha512-iBcWNmQa01Wr+z004G6XIVPDctOrJIAx7LObQceUAPxZh6kJYjIOAMp5JE1K4VpoMV5bKYDpCd0gmX+M4nTEQQ=="
        }
    }
}

 h5/package.json

@@ -1,7 +1,6 @@
{
    "id": "tly-picture-cut",
    "name": "图片裁剪 å››è§’拖动 å›¾ç‰‡ç¼©æ”¾ç§»åŠ¨",
    "displayName": "图片裁剪 å››è§’拖动 å›¾ç‰‡ç¼©æ”¾ç§»åŠ¨",
    "version": "1.0.0",
    "description": "图片裁剪组件 æ”¯æŒæ‹–动四角 å·²ä½¿ç”¨å¾®ä¿¡å°ç¨‹åºã€H5 å¹³å°",
    "keywords": [

 h5/static/redirect.html

@@ -6,8 +6,7 @@
  <script>
    var p = location.href.split("?")
    // window.location.href = 'https://dmtest.ahapp.net/hsvisit_h5/#/pages/notice/notice?' + p[1]
    alert(p[1])
    // window.location.href = 'http://xiaopiqiu2.natapp1.cc/#/pages/staff/index?' + p[1]
    window.location.href = 'http://xiaopiqiu2.natapp1.cc/#/pages/notice/notice?' + p[1]
  </script>
</head>
<body>

 h5/unpackage/dist/build/.automator/h5/.automator.json

 h5/unpackage/dist/dev/.automator/mp-weixin/.automator.json

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/n_pages/applicationRecord/applicationRecord.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/n_pages/index/index.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/n_pages/login/login.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/n_pages/visitorApplication/visitorApplication.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/n_pages/visitorApproval/visitorApproval.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-overlay/u-overlay.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-picker/u-picker.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-popup/u-popup.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-search/u-search.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-status-bar/u-status-bar.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-swipe-action-item/u-swipe-action-item.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-swipe-action/u-swipe-action.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-toolbar/u-toolbar.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-upload/u-upload.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/pages/answer/answer.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/pages/applicationRecord/applicationRecord.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/pages/appointmentDetails/appointmentDetails.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/pages/changePassword/changePassword.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/pages/laborApplication/laborApplication.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/pages/newPersonnel/newPersonnel.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/pages/notice/notice.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/pages/personnel/personnel.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/pages/userinfo/userinfo.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/pages/visitorApplication/visitorApplication.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/.sourcemap/mp-weixin/pages/visitorApproval/visitorApproval.js.map

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/app.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/app.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/app.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/common/main.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/common/main.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/common/runtime.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/common/vendor.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/n_pages/applicationRecord/applicationRecord.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/n_pages/applicationRecord/applicationRecord.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/n_pages/applicationRecord/applicationRecord.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/n_pages/applicationRecord/applicationRecord.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/n_pages/index/index.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/n_pages/index/index.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/n_pages/index/index.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/n_pages/index/index.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/n_pages/login/login.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/n_pages/login/login.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/n_pages/login/login.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/n_pages/login/login.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/n_pages/visitorApplication/visitorApplication.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/n_pages/visitorApplication/visitorApplication.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/n_pages/visitorApplication/visitorApplication.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/n_pages/visitorApplication/visitorApplication.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/n_pages/visitorApproval/visitorApproval.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/n_pages/visitorApproval/visitorApproval.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/n_pages/visitorApproval/visitorApproval.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/n_pages/visitorApproval/visitorApproval.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-overlay/u-overlay.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-overlay/u-overlay.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-overlay/u-overlay.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-overlay/u-overlay.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-picker/u-picker.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-picker/u-picker.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-picker/u-picker.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-picker/u-picker.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-popup/u-popup.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-popup/u-popup.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-popup/u-popup.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-popup/u-popup.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-status-bar/u-status-bar.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-status-bar/u-status-bar.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-status-bar/u-status-bar.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-status-bar/u-status-bar.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swipe-action-item/index.wxs

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swipe-action-item/u-swipe-action-item.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swipe-action-item/u-swipe-action-item.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swipe-action-item/u-swipe-action-item.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swipe-action-item/u-swipe-action-item.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swipe-action/u-swipe-action.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swipe-action/u-swipe-action.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-swipe-action/u-swipe-action.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-toolbar/u-toolbar.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-toolbar/u-toolbar.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-toolbar/u-toolbar.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-toolbar/u-toolbar.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-upload/u-upload.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-upload/u-upload.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-upload/u-upload.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-upload/u-upload.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/answer/answer.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/answer/answer.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/answer/answer.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/answer/answer.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/applicationRecord/applicationRecord.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/applicationRecord/applicationRecord.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/applicationRecord/applicationRecord.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/applicationRecord/applicationRecord.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/appointmentDetails/appointmentDetails.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/appointmentDetails/appointmentDetails.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/appointmentDetails/appointmentDetails.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/appointmentDetails/appointmentDetails.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/changePassword/changePassword.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/changePassword/changePassword.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/changePassword/changePassword.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/changePassword/changePassword.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/index/index.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/index/index.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/index/index.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/index/index.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/laborApplication/laborApplication.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/laborApplication/laborApplication.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/laborApplication/laborApplication.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/laborApplication/laborApplication.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/login/login.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/login/login.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/login/login.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/login/login.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/newPersonnel/newPersonnel.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/newPersonnel/newPersonnel.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/newPersonnel/newPersonnel.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/newPersonnel/newPersonnel.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/notice/notice.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/notice/notice.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/notice/notice.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/notice/notice.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/personnel/personnel.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/personnel/personnel.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/personnel/personnel.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/personnel/personnel.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/userinfo/userinfo.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/userinfo/userinfo.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/userinfo/userinfo.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/userinfo/userinfo.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/visitorApplication/visitorApplication.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/visitorApplication/visitorApplication.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/visitorApplication/visitorApplication.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/visitorApplication/visitorApplication.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/visitorApproval/visitorApproval.js

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/visitorApproval/visitorApproval.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/visitorApproval/visitorApproval.wxml

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/pages/visitorApproval/visitorApproval.wxss

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/project.config.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/project.private.config.json

ÎļþÒÑɾ³ý

 h5/unpackage/dist/dev/mp-weixin/static/banner_dati.jpg

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/checkbo1x_sel@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/checkbox@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/checkbox_disable@3x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/checkbox_sel@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/checkbox_wrong@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/ic_boy@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/ic_call@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/ic_edit@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/ic_girl@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/ic_laifang@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/ic_mima@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/ic_new@3x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/ic_passed@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/ic_refused@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/ic_renyuan@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/ic_search@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/ic_shenqing@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/ic_tip@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/ic_wrong@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/login_ic_password@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/login_ic_phone@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/logo@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/n/banner@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/n/ic_laifang@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/n/ic_mima@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/n/ic_renyuan@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/n/ic_search@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/n/ic_shaixuan@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/n/ic_shenqing@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/video@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/video_error@2x.png

Binary files differ

 h5/unpackage/dist/dev/mp-weixin/static/video_sel@2x.png

Binary files differ

 server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java

@@ -147,4 +147,5 @@
        LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions,null);
        return  userInfo;
    }

}

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java

@@ -3,6 +3,8 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
@@ -23,6 +25,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -97,9 +100,7 @@

    @ApiOperation("访客记录 - åˆ†é¡µåˆ—表")
    @PostMapping("/visitPage")
    public ApiResponse<PageData<Visits>> visitPage (@RequestBody PageWrap<Visits> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        LoginUserInfo loginUserInfo = getLoginUser(token);
        pageWrap.getModel().setMemberId(loginUserInfo.getMemberId());
    public ApiResponse<PageData<Visits>> visitPage (@RequestBody PageWrap<Visits> pageWrap) {
        return ApiResponse.success(visitsService.findPage(pageWrap));
    }


 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java

@@ -61,6 +61,7 @@
            || Objects.isNull(hiddenDanger.getAreaId())
            || Objects.isNull(hiddenDanger.getCateId())
            || Objects.isNull(hiddenDanger.getApplyCheckUserId())
            || Objects.isNull(hiddenDanger.getCheckUserId())
            || Objects.isNull(hiddenDanger.getSubmitTime())
            || StringUtils.isBlank(hiddenDanger.getContent())
        ){
@@ -68,6 +69,7 @@
        }
        hiddenDanger.setIsdeleted(Constants.ZERO);
        hiddenDanger.setCreateDate(new Date());
        hiddenDanger.setEditDate(new Date());
        HiddenDangerParam hiddenDangerParam = hiddenDangerParamMapper.selectById(hiddenDanger.getAreaId());
        if(Objects.isNull(hiddenDangerParam)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到隐患区域");
@@ -78,6 +80,10 @@
        if(StringUtils.isBlank(hiddenDangerParam.getMemberIds())
        || hiddenDangerParam.getMemberIds().indexOf(hiddenDanger.getApplyCheckUserId().toString())<0){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"隐患区域与处理人不匹配");
        }
        Member member = memberMapper.selectById(hiddenDanger.getCheckUserId());
        if(Objects.isNull(member)|| !Constants.equalsInteger(member.getStatus(),Constants.ZERO) || Constants.equalsInteger(member.getIsdeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未查询到隐患处理人员信息或已被禁用");
        }
        hiddenDangerMapper.insert(hiddenDanger);
        //存储 æ“ä½œæ—¥å¿—
@@ -302,9 +308,6 @@
        }
        if (!model.getCheckUserId().equals(hiddenDanger.getEditor())) {
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"处理人非当前人员！");
        }
        if(!(hiddenDanger.getStatus().equals(Constants.ONE)||hiddenDanger.getStatus().equals(Constants.TWO))){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"业务类型错误！");
        }
        //整改前文件
        if(hiddenDanger.getStatus().equals(Constants.ONE)){

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -1589,6 +1589,7 @@
        if(!Objects.isNull(tokenJson.get("access_token"))){
            openId = tokenJson.getString("openid");
        }
//        String openId = "12345";
        WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO();
        wxAuthorizeVO.setOpenid(openId);
        //根据openId æŸ¥è¯¢ç”¨æˆ·ä¿¡æ¯
@@ -1615,11 +1616,11 @@
            String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
                    systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
            member.setPrefixUrl(prefixUrl);
            JwtPayLoad payLoad = new JwtPayLoad(Integer.toString(member.getId()));
            String token = JwtTokenUtil.generateToken(payLoad);
            //存储token至redis
            RedisUtil.addObject(redisTemplate,Constants.RedisKeys.INTERNAL_TOKEN+"_"+member.getId(),token,Constants.RedisKeys.EXPIRE_TIME);
            wxAuthorizeVO.setToken(token);
//            JwtPayLoad payLoad = new JwtPayLoad(Integer.toString(member.getId()));
//            String token = JwtTokenUtil.generateToken(payLoad);
//            //存储token至redis
//            RedisUtil.addObject(redisTemplate,Constants.RedisKeys.INTERNAL_TOKEN+"_"+member.getId(),token,Constants.RedisKeys.EXPIRE_TIME);
//            wxAuthorizeVO.setToken(token);
            wxAuthorizeVO.setMember(member);
        }
        return wxAuthorizeVO;