diff --git a/README.md b/README.md index e7c85a8..85719b7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ 小程序 - 宝贝回家 ## 产品 +[Figma org](https://www.figma.com/@airdb) +[设计图 - new](https://www.figma.com/file/xcoF6ywUadcB81F4mVn8cW/mina) + [设计图](https://org.modao.cc/app/9358480b82ba8ef102789b663a3e4715) diff --git a/build/miniprogram.config.js b/build/miniprogram.config.js index 867e9b9..cee51c9 100644 --- a/build/miniprogram.config.js +++ b/build/miniprogram.config.js @@ -73,11 +73,19 @@ module.exports = { share: true, windowScroll: false, backgroundColor: '#F7F7F7', + reachBottom: true, }, pages: { home: { enablePullDownRefresh: true, pullDownRefresh: true, + permission: { + scope: { + userLocation: "aa" + } + // "desc": "你的位置信息将用于小程序位置接口的效果展示" // 高速公路行驶持续后台定位 + //} + } }, }, optimization: { diff --git a/mina_wepy/package.json b/mina_wepy/package.json deleted file mode 100644 index 0fd3ab7..0000000 --- a/mina_wepy/package.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "name": "mini", - "version": "0.0.2", - "description": "宝贝回家小程序", - "main": "dist/app.js", - "scripts": { - "dev": "wepy build --watch", - "build": "cross-env NODE_ENV=production wepy build --no-cache", - "dev:web": "wepy build --output web", - "clean": "find ./dist -maxdepth 1 -not -name 'project.config.json' -not -name 'dist' | xargs rm -rf", - "test": "echo \"Error: no test specified\" && exit 1" - }, - "wepy": { - "module-a": false, - "./src/components/list": "./src/components/wepy-list.wpy" - }, - "author": "pignn", - "license": "MIT", - "dependencies": { - "babel-plugin-transform-runtime": "^6.23.0", - "sass": "^1.20.1", - "scss": "^0.2.4", - "util": "^0.12.0", - "wepy": "^1.6.0", - "wepy-async-function": "^1.4.4", - "wepy-com-toast": "^1.0.2" - }, - "devDependencies": { - "babel-eslint": "^7.2.1", - "babel-plugin-transform-class-properties": "^6.24.1", - "babel-plugin-transform-decorators-legacy": "^1.3.4", - "babel-plugin-transform-export-extensions": "^6.22.0", - "babel-plugin-transform-object-rest-spread": "^6.26.0", - "babel-preset-env": "^1.6.1", - "cross-env": "^5.1.3", - "eslint": "^3.18.0", - "eslint-config-standard": "^7.1.0", - "eslint-friendly-formatter": "^2.0.7", - "eslint-plugin-html": "^2.0.1", - "eslint-plugin-promise": "^3.5.0", - "eslint-plugin-standard": "^2.0.1", - "less": "^3.8.1", - "wepy-compiler-babel": "^1.5.1", - "wepy-compiler-less": "^1.3.10", - "wepy-compiler-sass": "^1.3.12", - "wepy-eslint": "^1.5.3" - } -} diff --git a/package-lock.json b/package-lock.json index 640641e..26c0bce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5530,9 +5530,9 @@ "dev": true }, "http-proxy": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz", - "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==", + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", + "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", "dev": true, "requires": { "eventemitter3": "^4.0.0", diff --git a/src/api/commont.js b/src/api/commont.js index 7c1394c..33feb5e 100644 --- a/src/api/commont.js +++ b/src/api/commont.js @@ -66,7 +66,7 @@ export function articleDetail(id) { * @description 文章详情 * @param {number} id */ - return get('/article/detail', { id }) + return get('/article/query', { id }) } export function getSources(p) { diff --git a/src/article/Index.vue b/src/article/Index.vue index 66acc39..036f91b 100644 --- a/src/article/Index.vue +++ b/src/article/Index.vue @@ -27,6 +27,7 @@ diff --git a/src/me/Index.vue b/src/me/Index.vue index 1bc4dde..0359a71 100644 --- a/src/me/Index.vue +++ b/src/me/Index.vue @@ -21,11 +21,13 @@ 浏览记录 - + + 联系我们 + 设置 @@ -81,6 +83,23 @@ export default Vue.extend({ setting() { console.log('xx') wx.openSetting() + }, + hello() { + console.log('xxxaa') + // 可以通过 wx.getSetting 先查询一下用户是否授权了 "scope.record" 这个 scope + wx.getSetting({ + success(res) { + if (!res.authSetting['scope.userLocation']) { + wx.authorize({ + scope: 'scope.userLocation', + success() { + // 用户已经同意小程序使用录音功能,后续调用 wx.startRecord 接口不会弹窗询问 + wx.startRecord() + } + }) + } + } + }) } } diff --git a/src/utils/request.js b/src/utils/request.js index c3dfcb9..d7c1614 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,4 +1,5 @@ -const baseUrl = 'https://scf.baobeihuijia.com/release/mina' +// const baseUrl = 'https://scf.baobeihuijia.com/release/mina' +const baseUrl = 'https://scf.baobeihuijia.com/release/mina/v1' function request({ url, data, method }) { const header = { diff --git a/yarn.lock b/yarn.lock index 5177889..cdb4399 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2251,7 +2251,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: dependencies: ms "2.0.0" -debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5: +debug@^3.1.0, debug@^3.1.1, debug@^3.2.5: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -2856,9 +2856,9 @@ etag@~1.8.1: integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= eventemitter3@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb" - integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg== + version "4.0.7" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" + integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== events@^3.0.0: version "3.1.0" @@ -3215,11 +3215,9 @@ flush-write-stream@^1.0.0: readable-stream "^2.3.6" follow-redirects@^1.0.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.10.0.tgz#01f5263aee921c6a54fb91667f08f4155ce169eb" - integrity sha512-4eyLK6s6lH32nOvLLwlIOnr9zrL8Sm+OvW4pVTJNoXeGzYIkHVf+pADQi+OJ0E67hiuSLezPVPyBcIZO50TmmQ== - dependencies: - debug "^3.0.0" + version "1.13.0" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db" + integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA== for-in@^1.0.2: version "1.0.2" @@ -3705,9 +3703,9 @@ http-proxy-middleware@0.19.1: micromatch "^3.1.10" http-proxy@^1.17.0: - version "1.18.0" - resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz#dbe55f63e75a347db7f3d99974f2692a314a6a3a" - integrity sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ== + version "1.18.1" + resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" + integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== dependencies: eventemitter3 "^4.0.0" follow-redirects "^1.0.0"