From 9db774bc03a08ef8085e0057199eeca6e4b51af9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=8B=E4=BF=8A=E6=9D=B0?= <741531167@qq.com> Date: Fri, 5 Feb 2021 18:30:18 +0800 Subject: [PATCH] 2.5 --- components/goodsList.vue | 2 +- packageA/scan/scan.vue | 43 +++++++++++++ packageA/scan/scanFail.vue | 100 ++++++++++++++++++++++++++++++ pages.json | 15 +++++ pages/find/find.vue | 25 +++++--- pages/goodsDetail/goodsDetail.vue | 13 ++-- pages/index/index.vue | 84 ++++++++++++++++++++----- pages/login/login.vue | 4 +- pages/mobileLogin/mobileLogin.vue | 2 +- pages/search/search.vue | 24 ++++++- pages/shop/shop.vue | 12 ++-- 11 files changed, 284 insertions(+), 40 deletions(-) create mode 100644 packageA/scan/scan.vue create mode 100644 packageA/scan/scanFail.vue diff --git a/components/goodsList.vue b/components/goodsList.vue index a386739..db8bca2 100644 --- a/components/goodsList.vue +++ b/components/goodsList.vue @@ -110,7 +110,7 @@ url: "/pages/goodsDetail/goodsDetail?id=" + id }) } - }, + } } diff --git a/packageA/scan/scan.vue b/packageA/scan/scan.vue new file mode 100644 index 0000000..13d7ffa --- /dev/null +++ b/packageA/scan/scan.vue @@ -0,0 +1,43 @@ + + + + + diff --git a/packageA/scan/scanFail.vue b/packageA/scan/scanFail.vue new file mode 100644 index 0000000..35f4c10 --- /dev/null +++ b/packageA/scan/scanFail.vue @@ -0,0 +1,100 @@ + + + + + + + diff --git a/pages.json b/pages.json index cdc824f..4b49f35 100644 --- a/pages.json +++ b/pages.json @@ -549,6 +549,21 @@ "enablePullDownRefresh": false } }, + // 扫码 + { + "path": "scan/scanFail", + "style": { + "navigationBarTitleText": "识别失败", + "enablePullDownRefresh": false + } + }, + { + "path": "scan/scan", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, { "path": "invoiceTitle/invoiceTitle", "style": { diff --git a/pages/find/find.vue b/pages/find/find.vue index 5818ba0..89f5bd5 100644 --- a/pages/find/find.vue +++ b/pages/find/find.vue @@ -68,20 +68,25 @@ } }, onShareAppMessage(res) { + let pages = getCurrentPages() // 获取加载的页面 + let currentPage = pages[pages.length - 1] // 获取当前页面的对象 + let url = currentPage.route // 当前页面url + let shareObj = { + title: "", + path: url + "?invite=" + this.$store.state.invitationNo, + imageUrl: '' + } console.log(res) // let goodsMsg = res.target.dataset.goods if (res.from === 'button') { // 来自页面内分享按钮 - console.log(res.target) - } - return res.from === 'button' ? { - title: "我在看" + res.target.dataset.goods.name + ",快来加入吧！", - path: '/pages/goodsDetail/goodsDetail?id=' + res.target.dataset.goods.id + "&type=share", - imageUrl: this.IMAGE_URL + res.target.dataset.goods.mainPhotoURL - } : { - title: '阿库网络公司正在邀请您加入瑞库客，0成本带您玩转副业', - path: '/pages/mobileLogin/mobileLogin?invitationNo=' + this.invitationNo, - imageUrl: this.STATIC_URL + 'invite.jpg' + shareObj = { + title: "我在看" + res.target.dataset.goods.name + ",快来加入吧！", + path: '/pages/goodsDetail/goodsDetail?id=' + res.target.dataset.goods.id + "&type=share&invite=" + this.$store.state.invitationNo, + imageUrl: this.IMAGE_URL + res.target.dataset.goods.mainPhotoURL + } } + console.log(shareObj) + return shareObj } } diff --git a/pages/goodsDetail/goodsDetail.vue b/pages/goodsDetail/goodsDetail.vue index 2e7406d..6af7ef0 100644 --- a/pages/goodsDetail/goodsDetail.vue +++ b/pages/goodsDetail/goodsDetail.vue @@ -896,20 +896,23 @@ } if (res.from === 'button') { // 来自页面内分享按钮 console.log(this.$store.state.invitationNo) - shareObj = { - title: "阿库网络公司正在邀请您加入瑞库客，0成本带您玩转副业", - path: '/pages/login/login?type=share&invite=' + this.$store.state.invitationNo, - imageUrl: this.STATIC_URL + 'invite.jpg' + if (this.roleLevel == 500) { + shareObj = { + title: uni.getStorageSync('userInfo').nickname+"正在邀请您加入瑞库客，0成本带您玩转副业", + path: '/pages/login/login?type=share&invite=' + this.$store.state.invitationNo, + imageUrl: this.STATIC_URL + 'invite.jpg' + } } } else { if (!this.isLogin) { shareObj = { title: "阿库网络公司正在邀请您加入瑞库客，0成本带您玩转副业", - path: '/pages/index/index', + path: '/pages/index/index?invite=' + this.$store.state.invitationNo, imageUrl: this.STATIC_URL + 'invite.jpg' } } } + console.log(shareObj) return shareObj } } diff --git a/pages/index/index.vue b/pages/index/index.vue index 98ead27..a35f956 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -4,9 +4,9 @@ - - + + @@ -242,19 +242,21 @@ this.getWeather() } }, - onShareAppMessage(res) { - if (res.from === 'button') { // 来自页面内分享按钮 - console.log(res.target.dataset) - } - return { - title: '阿库网络公司正在邀请您加入瑞库客，0成本带您玩转副业', - path: '/pages/index/index', - imageUrl: this.STATIC_URL + 'invite.jpg' - } - }, onLoad() { // uni.getStorageSync("userInfo").id + let pages = getCurrentPages() // 获取加载的页面 + let currentPage = pages[pages.length - 1] // 获取当前页面的对象 + let url = currentPage.route // 当前页面url + let options = currentPage.options // 如果要获取url中所带的参数可以查看options + console.log(options) + + + if(options.invite){ + console.log(options) + this.$store.commit('setinvite', options.invite); + } + if (uni.getStorageSync("localCity")) { //已授权定位 this.currentCity = this.cityName = uni.getStorageSync("localCity") @@ -513,15 +515,40 @@ let M = timestr.split(" ")[1].split(":")[1] return H + ":" + M }, + + // 扫码 scan() { + let that = this uni.scanCode({ success: function(res) { - // console.log('条码类型：' + res.scanType); - // console.log('条码内容：' + res.result); + console.log(res) + let code = res.result + that.$u.post('/api/v1/goods/code/search', {code: code}).then(res => { + console.log(res) + if (res.code === 'FAIL') { + return + } + if (res.data.code === 'FAIL') { + uni.reLaunch({ + url: "/packageA/scan/scanFail?code=" + code + }) + } + uni.navigateTo({ + url: "/pages/goodsDetail/goodsDetail?id=" + res.data.data.goodsId + }) + }); } }); }, + // scan() { + // console.log('1234') + // uni.navigateTo({ + // url: '/pages/scan/scan' + // }) + // }, + + toDeitail(id,src){ if(src !== ''){ let data = { @@ -614,7 +641,34 @@ }, onPullDownRefresh() { this.getGoodsList() - } + }, + onShareAppMessage(res) { + let shareObj = { + title: '', + path: "/pages/index/index?invite=" + this.$store.state.invitationNo, + imageUrl: '' + } + if (res.from === 'button') { // 来自页面内分享按钮 + console.log(res) + if (res.target.dataset.title) { + shareObj = { + title: "我在买" + res.target.dataset.title + ",快来看看吧！", + path: '/pages/goodsDetail/goodsDetail?id=' + res.target.dataset.id + "&type=share&invite=" + this.$store.state.invitationNo, + imageUrl: this.IMAGE_URL + res.target.dataset.url + } + } else { + shareObj = { + title: uni.getStorageSync("userInfo").nickname + '正在邀请您加入瑞库客，0成本带您玩转副业', + path: '/pages/login/login?type=share&invite=' + this.$store.state.invitationNo, + imageUrl: this.STATIC_URL + 'invite.jpg' + } + } + } else { + + } + console.log(shareObj) + return shareObj + }, } diff --git a/pages/login/login.vue b/pages/login/login.vue index b9be93b..87347cc 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -96,12 +96,12 @@ if (that.$store.state.url) { let url = that.$store.state.url console.log(url) - uni.navigateTo({ + uni.reLaunch({ url: url }) that.$store.commit('removeUrl') } else { - uni.reLaunch({ + uni.navigateTo({ url:"../index/index" }) } diff --git a/pages/mobileLogin/mobileLogin.vue b/pages/mobileLogin/mobileLogin.vue index ca6024d..421e4cb 100644 --- a/pages/mobileLogin/mobileLogin.vue +++ b/pages/mobileLogin/mobileLogin.vue @@ -33,7 +33,7 @@ time:60, showTime:false, timer:null, - invitationNo:"000000", + invitationNo:"NXR0L3", wxUnionId:null }; }, diff --git a/pages/search/search.vue b/pages/search/search.vue index 2cfaf34..3b9baa3 100644 --- a/pages/search/search.vue +++ b/pages/search/search.vue @@ -171,7 +171,29 @@ this.goodsList.push(...goodsList) }); } - } + }, + onShareAppMessage(res) { + let pages = getCurrentPages() // 获取加载的页面 + let currentPage = pages[pages.length - 1] // 获取当前页面的对象 + let url = currentPage.route // 当前页面url + let shareObj = { + title: "", + path: url + "?invite=" + this.$store.state.invitationNo, + imageUrl: '' + } + if (res.from === 'button') { // 来自页面内分享按钮 + console.log(res) + if (res.target.dataset.title) { + shareObj = { + title: "我在买" + res.target.dataset.title + ",快来看看吧！", + path: '/pages/goodsDetail/goodsDetail?id=' + res.target.dataset.id + "&type=share&invite=" + this.$store.state.invitationNo, + imageUrl: this.IMAGE_URL + res.target.dataset.url + } + } + } + console.log(shareObj) + return shareObj + }, } diff --git a/pages/shop/shop.vue b/pages/shop/shop.vue index 0ba77d3..c465d5a 100644 --- a/pages/shop/shop.vue +++ b/pages/shop/shop.vue @@ -482,14 +482,16 @@ } }, onShareAppMessage(res) { - if (res.from === 'button') { // 来自页面内分享按钮 - console.log(res.target) - } - return { - title: '阿库网络公司正在邀请您加入瑞库客，0成本带您玩转副业', + let shareObj = { + title: uni.getStorageSync('userInfo').nickname+'正在邀请您加入瑞库客，0成本带您玩转副业', path: '/pages/login/login?type=share&invite=' + this.$store.state.invitationNo, imageUrl: this.STATIC_URL + 'invite.jpg' } + if (res.from === 'button') { // 来自页面内分享按钮 + console.log(res.target) + } + console.log(shareObj) + return shareObj } }