diff --git a/dfslkf b/dfslkf index 84bbaab..433aa72 100644 --- a/dfslkf +++ b/dfslkf @@ -26,13 +26,13 @@ Date: Wed Dec 28 18:34:01 2022 +0800 Author: ZSW <2966211270@qq.com> Date: Tue Dec 27 18:34:44 2022 +0800 - 重写京西菜市商家版 + 重写京西到家商家 commit 1b8cf88cc744e9f0726645082a26124f6567baa6 Author: ZSW <2966211270@qq.com> Date: Mon Dec 26 18:38:37 2022 +0800 - 新京西菜市商家版开发中 + 新京西到家商家开发中 commit 7270386733f06f60a35ebd538b49b5dc6a9af967 Author: ZSW <2966211270@qq.com> @@ -50,7 +50,7 @@ Date: Mon Dec 12 18:29:15 2022 +0800 Author: ZSW <2966211270@qq.com> Date: Fri Dec 9 18:53:54 2022 +0800 - 创建新编京西菜市商家版，兼容微信小程序，安卓App，iso + 创建新编京西到家商家，兼容微信小程序，安卓App，iso commit 6095cb13ce5472a9ea46781bf0be4c4c8b107117 Author: 张树伟 <2966211270@qq.com> diff --git a/package-lock.json b/package-lock.json index 0fdcfac..ad73232 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1270,14 +1270,6 @@ "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.4.5.tgz", "integrity": "sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ==" }, - "node_modules/@vue/reactivity": { - "version": "3.2.45", - "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.2.45.tgz", - "integrity": "sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==", - "dependencies": { - "@vue/shared": "3.2.45" - } - }, "node_modules/@vue/reactivity-transform": { "version": "3.2.45", "resolved": "https://registry.npmmirror.com/@vue/reactivity-transform/-/reactivity-transform-3.2.45.tgz", @@ -1298,25 +1290,6 @@ "sourcemap-codec": "^1.4.8" } }, - "node_modules/@vue/runtime-core": { - "version": "3.2.45", - "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.2.45.tgz", - "integrity": "sha512-gzJiTA3f74cgARptqzYswmoQx0fIA+gGYBfokYVhF8YSXjWTUA2SngRzZRku2HbGbjzB6LBYSbKGIaK8IW+s0A==", - "dependencies": { - "@vue/reactivity": "3.2.45", - "@vue/shared": "3.2.45" - } - }, - "node_modules/@vue/runtime-dom": { - "version": "3.2.45", - "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.2.45.tgz", - "integrity": "sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA==", - "dependencies": { - "@vue/runtime-core": "3.2.45", - "@vue/shared": "3.2.45", - "csstype": "^2.6.8" - } - }, "node_modules/@vue/server-renderer": { "version": "3.2.45", "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.2.45.tgz", @@ -1570,7 +1543,7 @@ }, "node_modules/charenc": { "version": "0.0.2", - "resolved": "https://registry.npmmirror.com/charenc/-/charenc-0.0.2.tgz", + "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz", "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==", "engines": { "node": "*" @@ -1702,7 +1675,7 @@ }, "node_modules/crypt": { "version": "0.0.2", - "resolved": "https://registry.npmmirror.com/crypt/-/crypt-0.0.2.tgz", + "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz", "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==", "engines": { "node": "*" @@ -1755,11 +1728,6 @@ "node": ">=4" } }, - "node_modules/csstype": { - "version": "2.6.21", - "resolved": "https://registry.npmmirror.com/csstype/-/csstype-2.6.21.tgz", - "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==" - }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz", @@ -2602,7 +2570,7 @@ }, "node_modules/is-buffer": { "version": "1.1.6", - "resolved": "https://registry.npmmirror.com/is-buffer/-/is-buffer-1.1.6.tgz", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, "node_modules/is-core-module": { @@ -2762,7 +2730,7 @@ }, "node_modules/md5": { "version": "2.3.0", - "resolved": "https://registry.npmmirror.com/md5/-/md5-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz", "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==", "dependencies": { "charenc": "0.0.2", @@ -3771,6 +3739,42 @@ "vue": "^3.2.0" } }, + "node_modules/vue/node_modules/@vue/reactivity": { + "version": "3.2.45", + "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.45.tgz", + "integrity": "sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==", + "license": "MIT", + "dependencies": { + "@vue/shared": "3.2.45" + } + }, + "node_modules/vue/node_modules/@vue/runtime-core": { + "version": "3.2.45", + "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.45.tgz", + "integrity": "sha512-gzJiTA3f74cgARptqzYswmoQx0fIA+gGYBfokYVhF8YSXjWTUA2SngRzZRku2HbGbjzB6LBYSbKGIaK8IW+s0A==", + "license": "MIT", + "dependencies": { + "@vue/reactivity": "3.2.45", + "@vue/shared": "3.2.45" + } + }, + "node_modules/vue/node_modules/@vue/runtime-dom": { + "version": "3.2.45", + "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.45.tgz", + "integrity": "sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA==", + "license": "MIT", + "dependencies": { + "@vue/runtime-core": "3.2.45", + "@vue/shared": "3.2.45", + "csstype": "^2.6.8" + } + }, + "node_modules/vue/node_modules/csstype": { + "version": "2.6.21", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz", + "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==", + "license": "MIT" + }, "node_modules/vuex": { "version": "4.0.2", "resolved": "https://registry.npmmirror.com/vuex/-/vuex-4.0.2.tgz", @@ -4858,14 +4862,6 @@ "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.4.5.tgz", "integrity": "sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ==" }, - "@vue/reactivity": { - "version": "3.2.45", - "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.2.45.tgz", - "integrity": "sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==", - "requires": { - "@vue/shared": "3.2.45" - } - }, "@vue/reactivity-transform": { "version": "3.2.45", "resolved": "https://registry.npmmirror.com/@vue/reactivity-transform/-/reactivity-transform-3.2.45.tgz", @@ -4888,25 +4884,6 @@ } } }, - "@vue/runtime-core": { - "version": "3.2.45", - "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.2.45.tgz", - "integrity": "sha512-gzJiTA3f74cgARptqzYswmoQx0fIA+gGYBfokYVhF8YSXjWTUA2SngRzZRku2HbGbjzB6LBYSbKGIaK8IW+s0A==", - "requires": { - "@vue/reactivity": "3.2.45", - "@vue/shared": "3.2.45" - } - }, - "@vue/runtime-dom": { - "version": "3.2.45", - "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.2.45.tgz", - "integrity": "sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA==", - "requires": { - "@vue/runtime-core": "3.2.45", - "@vue/shared": "3.2.45", - "csstype": "^2.6.8" - } - }, "@vue/server-renderer": { "version": "3.2.45", "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.2.45.tgz", @@ -5101,7 +5078,7 @@ }, "charenc": { "version": "0.0.2", - "resolved": "https://registry.npmmirror.com/charenc/-/charenc-0.0.2.tgz", + "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz", "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==" }, "chokidar": { @@ -5203,7 +5180,7 @@ }, "crypt": { "version": "0.0.2", - "resolved": "https://registry.npmmirror.com/crypt/-/crypt-0.0.2.tgz", + "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz", "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==" }, "crypto-js": { @@ -5247,11 +5224,6 @@ "resolved": "https://registry.npmmirror.com/cssesc/-/cssesc-3.0.0.tgz", "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==" }, - "csstype": { - "version": "2.6.21", - "resolved": "https://registry.npmmirror.com/csstype/-/csstype-2.6.21.tgz", - "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==" - }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz", @@ -5800,7 +5772,7 @@ }, "is-buffer": { "version": "1.1.6", - "resolved": "https://registry.npmmirror.com/is-buffer/-/is-buffer-1.1.6.tgz", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, "is-core-module": { @@ -5919,7 +5891,7 @@ }, "md5": { "version": "2.3.0", - "resolved": "https://registry.npmmirror.com/md5/-/md5-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz", "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==", "requires": { "charenc": "0.0.2", @@ -6640,6 +6612,40 @@ "@vue/runtime-dom": "3.2.45", "@vue/server-renderer": "3.2.45", "@vue/shared": "3.2.45" + }, + "dependencies": { + "@vue/reactivity": { + "version": "3.2.45", + "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.45.tgz", + "integrity": "sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==", + "requires": { + "@vue/shared": "3.2.45" + } + }, + "@vue/runtime-core": { + "version": "3.2.45", + "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.45.tgz", + "integrity": "sha512-gzJiTA3f74cgARptqzYswmoQx0fIA+gGYBfokYVhF8YSXjWTUA2SngRzZRku2HbGbjzB6LBYSbKGIaK8IW+s0A==", + "requires": { + "@vue/reactivity": "3.2.45", + "@vue/shared": "3.2.45" + } + }, + "@vue/runtime-dom": { + "version": "3.2.45", + "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.45.tgz", + "integrity": "sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA==", + "requires": { + "@vue/runtime-core": "3.2.45", + "@vue/shared": "3.2.45", + "csstype": "^2.6.8" + } + }, + "csstype": { + "version": "2.6.21", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz", + "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==" + } } }, "vue-router": { diff --git a/src/App.ts b/src/App.ts index 51bb292..e5ae486 100644 --- a/src/App.ts +++ b/src/App.ts @@ -147,29 +147,10 @@ function App() { }, () => { }) uni.onPushMessage((res) => { // 监听通知信息/ - // console.log('监听通知信息,门店信息是否一致，9999999999',getStorage("storeName")) if (res.type == 'receive') { - let newData: any = res.data.payload - // console.log(newData.store_title,'监听通知信息,门店信息是否一致',getStorage("storeName")) - // newData = modifyOrderMsg() - // newData.notyTime = 0 // 通知时间 - // orderList.push(newData) if (newData.store_title == getStorage("storeName")) orderList.push(newData) - // console.log(newData.msg_type,'有新的订单 /// 消息 ,,newData,,新消息',newData) - // newData if (newData.msg_type == 'newOrder') { - // let content = JSON.parse(res.data.content) - // content.business_type = 2 // 模拟预订单 - // if(content.business_type && content.business_type === 2 && newData.store_title == getStorage("storeName")){ - // let advanceArderList = JSON.parse(getStorage('advanceArder')) || [] - // let findIndex = advanceArderList.findIndex((item:string) => item === newData.vendor_order_id) - // if(findIndex === -1){ - // advanceArderList.unshift(newData.vendor_order_id) - // if(advanceArderList.length > 10) advanceArderList = advanceArderList.slice(0, 10) - // setStorage('advanceArder', JSON.stringify(advanceArderList)) - // }else return // 预订单存在，不执行通知操作 - // } let data: any = getStorage('commitBTDevCharact') util.notifyBLEState(data.deviceId, data.serviceId, data.uuid).then((res: any) => { if (res == 12) { @@ -208,16 +189,8 @@ function App() { } }) } - - // console.log('当前订单属于哪个门店',newData.store_title) - // console.log('门店信息',getStorage('storeName')) - if(+getStorage('defaultOrderReminder') === 1 || getStorage('defaultOrderReminder') === '' ){ let src = `/static/audio/${newData.msg_type}.mp3` - // playVoid.src = `/static/audio/${newData.msg_type}.mp3` - // playVoid.stop() - // playVoid.play() - // console.log('通知消息，，，',newData) watchAudio(src) // findIndex } } @@ -236,26 +209,6 @@ function App() { }) } - /** - * 模拟订单通知消息 - */ - // const modifyOrderMsg = () => { - // let arr = ['newOrder','newImMsg','newCancelOrder','newAfsOrder'] - // let index = Math.floor(Math.random() * arr.length) - // let obj = { - // "business_type": 1, - // "context": "老板,你有新的订单了!", - // "msg_type": arr[index], - // "order_sqs": "34", - // "store_id": 100296, - // "store_title": "谢卫路店", - // "vendor_name": "美团外卖", - // "vendor_order_id": "3301829894026603225", - // 'notyTime':0 - // } - // return obj - // } - /** * 监听音频播放事件 音频播放结束事件，通知完毕，清除 orderList中的数据 findIndex:number */