diff --git a/api/request.js b/api/request.js index c94c50d..b3be29b 100644 --- a/api/request.js +++ b/api/request.js @@ -16,8 +16,8 @@ const httpRequest = (params) => { const json_data = { appcode: 'DOPE+', //应用编码 - appchannel: 'DOPEGOOGLE', //应用发布渠道 - appver: '1.5.0', //应用版本 + appchannel: 'DOPEFACEBOOK', //应用发布渠道 + appver: '1.5.1', //应用版本 appname: 'cnic_buyer', //应用名称 manufacturer: 'HUAWEI', //设备生产商 phonebrand: 'HORNOR', //设备品牌 diff --git a/pages/account/index.vue b/pages/account/index.vue index d7df6e5..953aff6 100644 --- a/pages/account/index.vue +++ b/pages/account/index.vue @@ -191,7 +191,7 @@ url: '../category/index' }, { - src: '../../static/img/min.png', + src: '../../static/img/mini.png', url: '../index/index2', name: '' }, @@ -309,12 +309,12 @@ if (res.error == 0) { // if(res.data.page_code == 'HOMESALEICON'){ if (res.data.page_code == 'HOMESALEICON') { - let src = - 'https://www.dopeplus.com/images/mapp_customized/202210/1665653173499940520.png' + let src = '../../static/img/mini.png' + // 'https://www.dopeplus.com/images/mapp_customized/202210/1665653173499940520.png' // let src = 'https://www.dopeplus.com/images/mapp_customized/202211/1667961215280331818.png' if (src == res.data.zones[0].blocks[0].block_pic) { // this.tarbar[2].src = 'https://www.dopeplus.com/images/mapp_customized/202211/1667961215280331818.png' - this.tarbar[2].src = '../../static/img/min.png' + this.tarbar[2].src = '../../static/img/mini.png' } else { src = res.data.zones[0].blocks[0].block_pic // this.tabar[2].src=src diff --git a/pages/category/index.vue b/pages/category/index.vue index 3267b1a..385fd14 100644 --- a/pages/category/index.vue +++ b/pages/category/index.vue @@ -91,7 +91,7 @@ url:'../category/index' }, { - src:'../../static/img/min.png', + src:'../../static/img/mini.png', name:'', url:'../index/index2' }, diff --git a/pages/index/index.vue b/pages/index/index.vue index f026d1f..01429a3 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -155,7 +155,7 @@ src: '../../static/img/Category1.png' }, { - src: '' + src: '../../static/img/mini.png', }, { src: '../../static/img/cart1.png' @@ -736,10 +736,10 @@ let url if (res.error == 0) { if (res.data.page_code == 'HOMESALEICON') { - let src = - 'https://www.dopeplus.com/images/mapp_customized/202211/1667961215280331818.png' + let src = '../../static/img/mini.png' + // 'https://www.dopeplus.com/images/mapp_customized/202301/1672798872921358750.png' if (src == res.data.zones[0].blocks[0].block_pic) { - this.tarbar[2].src = '../../static/img/min.png' + this.tarbar[2].src = '../../static/img/mini.png' } else { src = res.data.zones[0].blocks[0].block_pic // this.tabar[2].src=src @@ -1298,7 +1298,7 @@ console.log(item,'item') // console.log(item.block_link.includes('dope.adspecial')) let goodid - console.log(goodid); + // console.log(goodid); if (item.goodid) { uni.navigateTo({ url: '../productDetails/index?goodid=' + item.goodid @@ -1307,6 +1307,7 @@ const i = item.block_link.indexOf('?') goodid = item.block_link.substring(i); //////console.log(item.block_link) + console.log(item.block_link); if (item.block_link.includes('goodslist')) { uni.navigateTo({ url: '../category/productList' + goodid + '&tag=1' @@ -1323,7 +1324,11 @@ uni.navigateTo({ url: '../specialTitle/index' + goodid }) - } + } else if (item.block_link.includes('dope.fenlei')) { + uni.switchTab({ + url: '../category/index' + }) + } } this.countdownTime2 = 0 }, diff --git a/pages/login/index.vue b/pages/login/index.vue index 399214e..1cc7c1c 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -277,32 +277,33 @@ } } appleOauth.login( function(oauth){ - console.log(oauth); - uni.navigateBack({ - delta: 1 - }); - // 授权成功，苹果授权返回的信息在 oauth.target.appleInfo 中 - // const openid = JSON.parse(oauth.target.appleInfo.identityToken) - // console.log(openid); let data = { _action: 'loginbyapple', ap_user_id: oauth.target.appleInfo.user, - ap_user_name: oauth.target.appleInfo.familyName, - ap_user_first_name: oauth.target.appleInfo.familyName, - ap_user_middle_name: oauth.target.appleInfo.givenName, - ap_user_last_name: oauth.target.appleInfo.familyName, + ap_user_name: oauth.target.appleInfo.fullName.familyName, + ap_user_first_name: oauth.target.appleInfo.fullName.familyName, + ap_user_middle_name: oauth.target.appleInfo.fullName.givenName, + ap_user_last_name: oauth.target.appleInfo.fullName.familyName, ap_user_email: oauth.target.appleInfo.email } - uni.setStorageSync('isLogin', 1) // uni.setStorageSync('user_info', {nickname: oauth.target.appleInfo.familyName}) // uni.setStorageSync('user_info', {email: oauth.target.appleInfo.email}) defaultRequest(data).then(res => { console.info(res) - uni.showLoading({ - title: 'Logining', - }) + // uni.showLoading({ + // title: 'Logining', + // }) + uni.navigateBack({ + delta: 1 + }); }) + console.log(oauth); + uni.setStorageSync('isLogin', 1) + // 授权成功，苹果授权返回的信息在 oauth.target.appleInfo 中 + // const openid = JSON.parse(oauth.target.appleInfo.identityToken) + // console.log(openid); + console.log(this.loginDate) defaultRequest1(this.loginDate).then(res => { app.globalData.error = res.error @@ -347,9 +348,8 @@ } } }) - uni.navigateBack({ - delta: 1 - }); + + // defaultRequest(data).then(res => { // console.info(res) // console.log('===================================='); @@ -518,9 +518,13 @@ // uni.setStorageSync('user_info.data.nickname', 'googleOauth.authResult.nickName'); defaultRequest(data).then(res => { console.info(res) - uni.showLoading({ - title: 'Logining', - }) + // uni.showLoading({ + // title: 'Logining', + // duration: 2000 + // }) + uni.navigateBack({ + delta: 1 + }); }) console.log(this.loginDate) defaultRequest1(this.loginDate).then(res => { @@ -566,9 +570,8 @@ } } }) - uni.navigateBack({ - delta: 1 - }); + + }, function(err) { console.log(err); uni.showLoading({ diff --git a/pages/productDetails/index.vue b/pages/productDetails/index.vue index 83eb202..49f799c 100644 --- a/pages/productDetails/index.vue +++ b/pages/productDetails/index.vue @@ -38,7 +38,7 @@ -