diff --git a/app/api/property.js b/app/api/property.js index d4d7dde..9649c1a 100644 --- a/app/api/property.js +++ b/app/api/property.js @@ -71,3 +71,21 @@ export function listHouses(params) { ); } +// 投诉与建议 - 删除 +export function deleteComplaintSuggestion(ids) { + return request.post( + 'autogencode/pmcomplaintsuggestion/delete', + ids, + { useAdminUrl: true } + ); +} + +// 报修单 - 更新状态 +export function updateMaintenanceOrderStatus(data) { + return request.post( + 'autogencode/pmmaintenanceorder/updateStatusAndRemark', + data, + { useAdminUrl: true } + ); +} + diff --git a/app/api/pubnotice.js b/app/api/pubnotice.js new file mode 100644 index 0000000..f783071 --- /dev/null +++ b/app/api/pubnotice.js @@ -0,0 +1,42 @@ +import request from '@/utils/request.js'; + +/** + * pubnotice 新增 + * @param {Object} data + */ +export function pubnoticeCreateApi(data) { + return request.post('autogencode/pubnotice/save', data, { useAdminUrl: true }); +} + +/** + * pubnotice 更新 + * @param {Object} data + */ +export function pubnoticeUpdateApi(data) { + return request.post('autogencode/pubnotice/update', data, { useAdminUrl: true }); +} + +/** + * pubnotice 详情 + * @param {string} id noticeId + */ +export function pubnoticeDetailApi(id) { + return request.get(`autogencode/pubnotice/info/${id}`, {}, { useAdminUrl: true }); +} + +/** + * pubnotice 批量删除 + * @param {string[]|string} ids + */ +export function pubnoticeDeleteApi(ids) { + return request.post('autogencode/pubnotice/delete', ids, { useAdminUrl: true }); +} + +/** + * pubnotice 列表 + * @param {Object} params query params (page/limit + 各字段条件) + */ +export function pubnoticeListApi(params) { + return request.get('autogencode/pubnotice/list', params, { useAdminUrl: true }); +} + diff --git a/app/libs/login.js b/app/libs/login.js index 0428390..66c50ec 100644 --- a/app/libs/login.js +++ b/app/libs/login.js @@ -39,39 +39,45 @@ export function _toLogin(push, pathLogin) { Cache.set('login_back_url',path); } - // #ifdef H5 - if (isWeixin()) { - let urlData = location.pathname + location.search - if (urlData.indexOf('?') !== -1) { - urlData += '&go_longin=1'; - } else { - urlData += '?go_longin=1'; - } - if (!Cache.has('snsapiKey')) { - auth.oAuth('snsapi_base', urlData); - } else { - if (['/pages/user/index'].indexOf(login_back_url) == -1) { - uni.navigateTo({ - url: '/pages/users/wechat_login/index' - }) - } - } - } else { - if (['/pages/user/index'].indexOf(login_back_url) == -1) { - uni.navigateTo({ - url: '/pages/users/login/index' - }) - } - } - // #endif + // // #ifdef H5 + // if (isWeixin()) { + // let urlData = location.pathname + location.search + // if (urlData.indexOf('?') !== -1) { + // urlData += '&go_longin=1'; + // } else { + // urlData += '?go_longin=1'; + // } + // if (!Cache.has('snsapiKey')) { + // auth.oAuth('snsapi_base', urlData); + // } else { + // if (['/pages/user/index'].indexOf(login_back_url) == -1) { + // uni.navigateTo({ + // url: '/pages/users/wechat_login/index' + // }) + // } + // } + // } else { + // if (['/pages/user/index'].indexOf(login_back_url) == -1) { + // uni.navigateTo({ + // url: '/pages/users/login/index' + // }) + // } + // } + // // #endif + + // if (['pages/user/index','/pages/user/index'].indexOf(login_back_url) == -1) { + // // #ifdef MP + // uni.navigateTo({ + // url: '/pages/users/wechat_login/index' + // }) + // // #endif + // } if (['pages/user/index','/pages/user/index'].indexOf(login_back_url) == -1) { - // #ifdef MP uni.navigateTo({ - url: '/pages/users/wechat_login/index' + url: '/pages/users/login/index' }) - // #endif - } + } } diff --git a/app/manifest.json b/app/manifest.json index b8daba4..cfca746 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -122,7 +122,8 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "", + "appid" : "wxacb083448570908a", + "libVersion" : "latest", "setting" : { "urlCheck" : true, "minified" : true, diff --git a/app/package-lock.json b/app/package-lock.json index 22d2fc8..ee8d0b9 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,446 +1,46 @@ { + "name": "app", + "version": "1.0.0", + "lockfileVersion": 2, "requires": true, - "lockfileVersion": 1, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" - }, - "babel-code-frame": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", - "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", - "requires": { - "chalk": "^1.1.3", - "esutils": "^2.0.2", - "js-tokens": "^3.0.2" - } - }, - "babel-core": { - "version": "6.26.3", - "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz", - "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", - "requires": { - "babel-code-frame": "^6.26.0", - "babel-generator": "^6.26.0", - "babel-helpers": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-register": "^6.26.0", - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "convert-source-map": "^1.5.1", - "debug": "^2.6.9", - "json5": "^0.5.1", - "lodash": "^4.17.4", - "minimatch": "^3.0.4", - "path-is-absolute": "^1.0.1", - "private": "^0.1.8", - "slash": "^1.0.0", - "source-map": "^0.5.7" - } - }, - "babel-generator": { - "version": "6.26.1", - "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", - "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", - "requires": { - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "detect-indent": "^4.0.0", - "jsesc": "^1.3.0", - "lodash": "^4.17.4", - "source-map": "^0.5.7", - "trim-right": "^1.0.1" - } - }, - "babel-helpers": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz", - "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", - "requires": { - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-messages": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", - "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-register": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", - "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", - "requires": { - "babel-core": "^6.26.0", - "babel-runtime": "^6.26.0", - "core-js": "^2.5.0", - "home-or-tmp": "^2.0.0", - "lodash": "^4.17.4", - "mkdirp": "^0.5.1", - "source-map-support": "^0.4.15" - } - }, - "babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" - } - }, - "babel-template": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", - "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", - "requires": { - "babel-runtime": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "lodash": "^4.17.4" - } - }, - "babel-traverse": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", - "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", - "requires": { - "babel-code-frame": "^6.26.0", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "debug": "^2.6.8", - "globals": "^9.18.0", - "invariant": "^2.2.2", - "lodash": "^4.17.4" - } - }, - "babel-types": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", - "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", - "requires": { - "babel-runtime": "^6.26.0", - "esutils": "^2.0.2", - "lodash": "^4.17.4", - "to-fast-properties": "^1.0.3" - } - }, - "babylon": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", - "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==" - }, - "balanced-match": { + "packages": { + "": { + "name": "app", "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "license": "ISC", + "dependencies": { + "json-bigint": "^1.0.0" } }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" + "node_modules/bignumber.js": { + "version": "9.3.1", + "resolved": "https://registry.npmmirror.com/bignumber.js/-/bignumber.js-9.3.1.tgz", + "integrity": "sha512-Ko0uX15oIUS7wJ3Rb30Fs6SkVbLmPBAKdlm7q9+ak9bbIeFf0MwuBsQV6z7+X768/cHsfg+WlysDWJcmthjsjQ==", + "engines": { + "node": "*" } }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" - }, - "convert-source-map": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", - "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", - "requires": { - "safe-buffer": "~5.1.1" - } - }, - "core-image-xhr": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/core-image-xhr/-/core-image-xhr-1.0.3.tgz", - "integrity": "sha1-khHXtcQSGa9atpuThMoqR9VytHY=" - }, - "core-js": { - "version": "2.6.11", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", - "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==" - }, - "daycaca": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/daycaca/-/daycaca-1.0.11.tgz", - "integrity": "sha512-2SJTpnpmxUGVWbFPTRhaZLvisCD7bYjvuFpLAhjfAAvtnBb26dAqIqaZ9Jq8yvSlugpEGY+v/YXHXGP3paVV9A==" - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "detect-indent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", - "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", - "requires": { - "repeating": "^2.0.0" - } - }, - "dom7": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.3.tgz", - "integrity": "sha512-QTxHHDox+M6ZFz1zHPAHZKI3JOHY5iY4i9BK2uctlggxKQwRhO3q3HHFq1BKsT25Bm/ySSj70K6Wk/G4bs9rMQ==", - "requires": { - "ssr-window": "^1.0.1" - } - }, - "emoji-awesome": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/emoji-awesome/-/emoji-awesome-0.0.2.tgz", - "integrity": "sha512-ggortYTr4+f4Jqp/R3vV9FAec+wRkIyRM458LUrv81mKQSKIJW9+xDlbqHsUpMeNKCLG45RsbbCyprrOoGZ6UQ==" - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" - }, - "esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" - }, - "globals": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==" - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "home-or-tmp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", - "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.1" - } - }, - "invariant": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", - "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", - "requires": { - "loose-envify": "^1.0.0" - } - }, - "is-finite": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz", - "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==" - }, - "js-tokens": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" - }, - "jsesc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", - "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=" - }, - "json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=" - }, - "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" - }, - "loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" - } - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" - }, - "mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "requires": { - "minimist": "^1.2.5" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" - }, - "private": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", - "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==" - }, - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" - }, - "repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "requires": { - "is-finite": "^1.0.0" - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "slash": { + "node_modules/json-bigint": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=" - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" - }, - "source-map-support": { - "version": "0.4.18", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", - "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", - "requires": { - "source-map": "^0.5.6" + "resolved": "https://registry.npmmirror.com/json-bigint/-/json-bigint-1.0.0.tgz", + "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==", + "dependencies": { + "bignumber.js": "^9.0.0" } + } + }, + "dependencies": { + "bignumber.js": { + "version": "9.3.1", + "resolved": "https://registry.npmmirror.com/bignumber.js/-/bignumber.js-9.3.1.tgz", + "integrity": "sha512-Ko0uX15oIUS7wJ3Rb30Fs6SkVbLmPBAKdlm7q9+ak9bbIeFf0MwuBsQV6z7+X768/cHsfg+WlysDWJcmthjsjQ==" }, - "ssr-window": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-1.0.1.tgz", - "integrity": "sha512-dgFqB+f00LJTEgb6UXhx0h+SrG50LJvti2yMKMqAgzfUmUXZrLSv2fjULF7AWGwK25EXu8+smLR3jYsJQChPsg==" - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" - }, - "swiper": { - "version": "5.3.8", - "resolved": "https://registry.npmjs.org/swiper/-/swiper-5.3.8.tgz", - "integrity": "sha512-bCxrayTgzC2bZBRuFwAx7T4exWeHqMADBpcuTQ7PNCOIIzJRPqNh4ySIvW06LEEU3Q0KncaNre4hrn+jXcWivQ==", - "requires": { - "dom7": "^2.1.3", - "ssr-window": "^1.0.1" - } - }, - "to-fast-properties": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=" - }, - "trim-right": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", - "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=" - }, - "vue": { - "version": "2.6.11", - "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz", - "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==" - }, - "vue-awesome-swiper": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/vue-awesome-swiper/-/vue-awesome-swiper-4.1.1.tgz", - "integrity": "sha512-50um10t6N+lJaORkpwSi1wWuMmBI1sgFc9Znsi5oUykw2cO5DzLaBHcO2JNX21R+Ue4TGoIJDhhxjBHtkFrTEQ==" - }, - "vue-core-image-upload": { - "version": "2.4.11", - "resolved": "https://registry.npmjs.org/vue-core-image-upload/-/vue-core-image-upload-2.4.11.tgz", - "integrity": "sha512-He0OcNqUaL2yHQebFwk4IxLr1Q8m1S7u8zTUek7pMaOUHW76MXOOn6sHoJMruURNvsv3SyeqFEt4N7JQBnMviA==", + "json-bigint": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/json-bigint/-/json-bigint-1.0.0.tgz", + "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==", "requires": { - "babel-core": "^6.26.0", - "core-image-xhr": "^1.0.3", - "daycaca": "^1.0.6", - "vue": "^2.5.13" + "bignumber.js": "^9.0.0" } } } diff --git a/app/package.json b/app/package.json new file mode 100644 index 0000000..07fab71 --- /dev/null +++ b/app/package.json @@ -0,0 +1,14 @@ +{ + "name": "app", + "version": "1.0.0", + "description": "", + "main": "main.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "zombie", + "license": "ISC", + "dependencies": { + "json-bigint": "^1.0.0" + } +} diff --git a/app/pages.json b/app/pages.json index 57959ae..c684964 100644 --- a/app/pages.json +++ b/app/pages.json @@ -184,6 +184,10 @@ "navigationBarTitleText": "溯源信息查看", "navigationBarBackgroundColor": "#409EFF", "navigationBarTextStyle": "white" + // #ifdef H5 + , + "navigationStyle": "custom" + // #endif } }, { @@ -192,6 +196,10 @@ "navigationBarTitleText": "食材满意度评价", "navigationBarBackgroundColor": "#409EFF", "navigationBarTextStyle": "white" + // #ifdef H5 + , + "navigationStyle": "custom" + // #endif } }, { @@ -200,6 +208,10 @@ "navigationBarTitleText": "物供相关查询", "navigationBarBackgroundColor": "#409EFF", "navigationBarTextStyle": "white" + // #ifdef H5 + , + "navigationStyle": "custom" + // #endif } }, { @@ -208,6 +220,10 @@ "navigationBarTitleText": "采购相关操作", "navigationBarBackgroundColor": "#409EFF", "navigationBarTextStyle": "white" + // #ifdef H5 + , + "navigationStyle": "custom" + // #endif } }, { @@ -216,6 +232,10 @@ "navigationBarTitleText": "库存查询", "navigationBarBackgroundColor": "#409EFF", "navigationBarTextStyle": "white" + // #ifdef H5 + , + "navigationStyle": "custom" + // #endif } }, { @@ -224,6 +244,10 @@ "navigationBarTitleText": "审批处理", "navigationBarBackgroundColor": "#409EFF", "navigationBarTextStyle": "white" + // #ifdef H5 + , + "navigationStyle": "custom" + // #endif } }, { @@ -232,6 +256,10 @@ "navigationBarTitleText": "物资领用", "navigationBarBackgroundColor": "#409EFF", "navigationBarTextStyle": "white" + // #ifdef H5 + , + "navigationStyle": "custom" + // #endif } }, { @@ -240,6 +268,10 @@ "navigationBarTitleText": "投诉与建议", "navigationBarBackgroundColor": "#409EFF", "navigationBarTextStyle": "white" + // #ifdef H5 + , + "navigationStyle": "custom" + // #endif } }, { @@ -248,6 +280,34 @@ "navigationBarTitleText": "报修服务", "navigationBarBackgroundColor": "#409EFF", "navigationBarTextStyle": "white" + // #ifdef H5 + , + "navigationStyle": "custom" + // #endif + } + }, + { + "path": "notice/index", + "style": { + "navigationBarTitleText": "通知公告列表", + "navigationBarBackgroundColor": "#409EFF", + "navigationBarTextStyle": "white" + // #ifdef H5 + , + "navigationStyle": "custom" + // #endif + } + }, + { + "path": "notice_detail/index", + "style": { + "navigationBarTitleText": "通知详情", + "navigationBarBackgroundColor": "#409EFF", + "navigationBarTextStyle": "white" + // #ifdef H5 + , + "navigationStyle": "custom" + // #endif } } ] diff --git a/app/pages/index/index.vue b/app/pages/index/index.vue index 28da406..cb53012 100644 --- a/app/pages/index/index.vue +++ b/app/pages/index/index.vue @@ -50,60 +50,67 @@ - - - - + + 物业服务 + - - + + 投诉与建议 - - + + 报修服务 + + + + + + 通知公告 @@ -1345,6 +1352,20 @@ .productList .list .item .pictrue image.on { border-radius: 6rpx; + } + + .picsmall { + display: flex; + align-items: center; + justify-content: center; + margin-bottom: 12rpx; + // width: 50%; + // height: 50%; + } + + .image { + width: 60rpx !important; + height: 60rpx !important; } .productList .list .item .text { @@ -1426,6 +1447,16 @@ color: #454545; } + .property-service-title { + width: 100%; + box-sizing: border-box; + padding: 20rpx 24rpx 8rpx; + font-size: 28rpx; + font-weight: 600; + color: #2f3a4a; + letter-spacing: 1rpx; + } + .mp-bg { position: absolute; left: 0; diff --git a/app/pages/supply_chain/approval/index.vue b/app/pages/supply_chain/approval/index.vue index aa29fc5..c2ca75a 100644 --- a/app/pages/supply_chain/approval/index.vue +++ b/app/pages/supply_chain/approval/index.vue @@ -1,13 +1,5 @@