diff --git a/main.js b/main.js index 817bfc7..9ae0e69 100644 --- a/main.js +++ b/main.js @@ -13,8 +13,8 @@ import * as filters from '@/utils/formatFilter' uni.$http = $http Vue.prototype.$api = api -// $http.baseUrl = 'http://146.56.223.227:9527' -$http.baseUrl = 'http://localhost:85' +$http.baseUrl = 'http://146.56.223.227:9527' +// $http.baseUrl = 'http://localhost:85' $http.beforeRequest = function(options) { uni.showLoading({ diff --git a/manifest.json b/manifest.json index ae694fb..a2142b5 100644 --- a/manifest.json +++ b/manifest.json @@ -16,7 +16,10 @@ "autoclose" : true, "delay" : 0 }, - "modules" : {}, + "modules" : { + "Barcode" : {}, + "Camera" : {} + }, /* 模块配置 */ "distribute" : { /* 应用发布信息 */ @@ -55,7 +58,7 @@ "urlCheck" : false }, "usingComponents" : true, - "requiredPrivateInfos": ["getLocation","onLocationChange","chooseLocation", "chooseAddress"] + "requiredPrivateInfos" : [ "getLocation", "onLocationChange", "chooseLocation", "chooseAddress" ] }, "vueVersion" : "2" } diff --git a/pages/scan/scan.vue b/pages/scan/scan.vue index 2caefbd..5dcd23f 100644 --- a/pages/scan/scan.vue +++ b/pages/scan/scan.vue @@ -27,11 +27,10 @@ methods: { QR() { uni.scanCode({ - onlyFromCamera: true, success: (res) => { console.log('扫描二维码成功,结果:' + res.result); }, - error: (res) => { + fail: (res) => { console.log('扫描二维码出现错误') } }) diff --git a/static/videos/video1/video1.mp4 b/static/videos/video1/video1.mp4 deleted file mode 100755 index 5f8c422..0000000 Binary files a/static/videos/video1/video1.mp4 and /dev/null differ diff --git a/static/videos/video1/video1.ogg b/static/videos/video1/video1.ogg deleted file mode 100755 index b6ef56e..0000000 Binary files a/static/videos/video1/video1.ogg and /dev/null differ diff --git a/static/videos/video1/video1.webm b/static/videos/video1/video1.webm deleted file mode 100755 index d5d41b6..0000000 Binary files a/static/videos/video1/video1.webm and /dev/null differ diff --git a/static/videos/video2/video2.mp4 b/static/videos/video2/video2.mp4 deleted file mode 100755 index 6387b18..0000000 Binary files a/static/videos/video2/video2.mp4 and /dev/null differ diff --git a/static/videos/video3/video3.mp4 b/static/videos/video3/video3.mp4 deleted file mode 100755 index c4c8c8a..0000000 Binary files a/static/videos/video3/video3.mp4 and /dev/null differ diff --git a/subpkg/complete/complete.vue b/subpkg/complete/complete.vue index 46362a7..547b01a 100644 --- a/subpkg/complete/complete.vue +++ b/subpkg/complete/complete.vue @@ -23,7 +23,7 @@ - 炫耀一下 + 炫耀一下 演练回顾 重新挑战 @@ -42,6 +42,15 @@ "ask":"", "answer":"", }; + }, + onShareAppMessage(res) { + if (res.from === 'button') {// 来自页面内分享按钮 + console.log(res.target) + } + return { + title: '自定义分享标题', + path: '/pages/home/home' + } }, onLoad(options) { this.roleId = options.roleId diff --git a/utils/config.js b/utils/config.js index 058ef40..7765cc0 100755 --- a/utils/config.js +++ b/utils/config.js @@ -1,3 +1,3 @@ -// let url_config = 'http://146.56.223.227:9527/' -let url_config = 'http://localhost:85/' +let url_config = 'http://146.56.223.227:9527/' +// let url_config = 'http://localhost:85/' export default url_config \ No newline at end of file