From 0e1bce71603c5cbb92b3fe6387c87430528d18a9 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期二, 18 七月 2023 16:14:45 +0800
Subject: [PATCH] no message
---
uniapp/pages/goods/goodsDetail.vue | 50 +++++++++++++++++--------
uniapp/pages.json | 6 +-
uniapp/static/images/tabBar/compareprice.png | 0
uniapp/App.vue | 1
uniapp/components/indexPage.vue | 16 +++++++-
uniapp/pages/rankinglist/compareprice.vue | 2
uniapp/pages/index/index.vue | 8 +++
uniapp/pages/login/setInviteCode.vue | 5 ++
uniapp/static/images/tabBar/compareprice_activity.png | 0
9 files changed, 64 insertions(+), 24 deletions(-)
diff --git a/uniapp/App.vue b/uniapp/App.vue
index ecd99d1..adf7563 100644
--- a/uniapp/App.vue
+++ b/uniapp/App.vue
@@ -11,6 +11,7 @@
// #endif
export default {
onLaunch: function() {
+
// #ifdef APP-PLUS
//鎺ㄩ�佸紑濮�
/* var info = plus.push.getClientInfo()
diff --git a/uniapp/components/indexPage.vue b/uniapp/components/indexPage.vue
index b0ccdaf..b508431 100644
--- a/uniapp/components/indexPage.vue
+++ b/uniapp/components/indexPage.vue
@@ -580,6 +580,7 @@
}
this.$u.api.checkPreferenceGoods({
}).then(e => {
+ console.log(e);
if(e.code != 0)
{
that.currentPage = 1;
@@ -845,7 +846,7 @@
this.loadingState = false
var that = this;
- if(that.currentPage==7&&that.preferData)
+ if(that.bottomType==7&&that.preferData)
{//鐚滀綘鍠滄
this.$u.api.gussessLikeGoods({
platefrom:that.preferData.p_platefrom,
@@ -853,7 +854,18 @@
pageId:this.currentPage,
pageSize:10
}).then(e=>{
- console.log(e)
+ console.log(e);
+ if (e.code != 0) return that.$alert(e.msg)
+ var res = e.data.list;
+ if (res.length < 10) {
+ that.loadingState = false
+ that.loadstatus = 'normal'
+ } else {
+ that.currentPage++
+ that.loadstatus = 'loading'
+ that.loadingState = true
+ }
+ that.bottomGoodsList = that.bottomGoodsList.concat(res);
})
}
else{
diff --git a/uniapp/pages.json b/uniapp/pages.json
index 2cdb146..0b182d2 100644
--- a/uniapp/pages.json
+++ b/uniapp/pages.json
@@ -915,9 +915,9 @@
},
{
"pagePath": "pages/rankinglist/compareprice",
- "iconPath": "static/images/tabBar/ne_bend.png",
- "selectedIconPath": "static/images/tabBar/ne_bend_act.png",
- "text": "姣斾环"
+ "iconPath": "static/images/tabBar/compareprice.png",
+ "selectedIconPath": "static/images/tabBar/compareprice_activity.png",
+ "text": "鎼滀綆浠�"
},
{
"pagePath": "pages/rankinglist/xianbao",
diff --git a/uniapp/pages/goods/goodsDetail.vue b/uniapp/pages/goods/goodsDetail.vue
index bc5f29f..48d87d0 100644
--- a/uniapp/pages/goods/goodsDetail.vue
+++ b/uniapp/pages/goods/goodsDetail.vue
@@ -329,7 +329,8 @@
inviteCodeShow: false,
inviterShow: false,
frompage:'',
- isshowpdd:false
+ isshowpdd:false,
+ beforePddAuth:false,
};
},
onPageScroll(e) {
@@ -406,6 +407,12 @@
} else {
this.memberId = ''
}
+ console.log(this.user);
+ if(this.user.pdd_authority_ios==1||this.user.pdd_authority_android==1)
+ {
+ this.beforePddAuth=true;
+ }
+ console.log(this.beforePddAuth);
} catch (e) {
this.memberId = ''
}
@@ -419,10 +426,10 @@
this.pageInfo.showImgs.push(a)
this.getrecommend()
} else if (this.pageType == 'pdd') {
- if(this.optionsInfo.predictPromotionRate==0)
+ /* if(this.optionsInfo.predictPromotionRate==0)
{//姣斾环璁㈠崟
this.remindModel=true;
- }
+ } */
} else if (this.pageType == 'jd') {
@@ -445,6 +452,7 @@
},
getPageInfo(e) {
var that = this;
+ console.log(this.faction)
if (this.faction == 'j') {
this.$u.api.getJdsDetail({
goodsId: this.optionsInfo.goodsId,
@@ -472,14 +480,7 @@
this.optionsInfo = res
}).catch(function(err) {})
} else if (this.faction == 'p') {
- var that = this;
- this.$u.api.getPddDetail({
- goods_sign: this.optionsInfo.goods_sign
- }).then(e => {
- var res = e.data;
- that.pageInfo = res;
- that.optionsInfo.imgs = that.pageInfo.imgs;
- })
+ this.getPddGoodsDetail(this.optionsInfo.goods_sign);
} else if (this.faction == 'w') {
var that = this;
this.$u.api.getWphGoodsDetail({
@@ -508,17 +509,28 @@
})
}
},
-
-
+ getPddGoodsDetail(goods_sign)
+ {
+ var that = this;
+ this.$u.api.getPddDetail({
+ goods_sign: goods_sign
+ }).then(e => {
+ var res = e.data;
+ that.pageInfo = res;
+ console.log(res);
+ that.optionsInfo.imgs = that.pageInfo.imgs;
+ if(res.predictPromotionRate==0)
+ {//姣斾环璁㈠崟
+ this.remindModel=true;
+ }
+ })
+ },
goDetails(info) {
info.searchSource = 1
uni.navigateTo({
url: './goodsDetail?info=' + encodeURIComponent(JSON.stringify(info))
})
},
-
-
-
getrecommend() {
var that = this;
this.$u.api.getSimilerGoods({
@@ -618,8 +630,14 @@
updataUser() {
var that = this;
this.$u.api.getUserInfo({}).then(e => {
+ console.log(e)
utils.setCache('userInfo', e.data.userinfo)
that.user = e.data.userinfo;
+ if(that.pageType == 'pdd'&&!that.beforePddAuth&&(e.data.userinfo.pdd_authority_ios == 1||e.data.userinfo.pdd_authority_android == 1))
+ {//閲嶆柊鏌ヨ鍟嗗搧璇︽儏
+ console.log('閲嶆柊鏌ヨpdd鍟嗗搧');
+ that.getPddGoodsDetail(that.optionsInfo.goods_sign);0
+ }
}).catch(function(err) {})
},
diff --git a/uniapp/pages/index/index.vue b/uniapp/pages/index/index.vue
index 843231d..5104307 100644
--- a/uniapp/pages/index/index.vue
+++ b/uniapp/pages/index/index.vue
@@ -369,6 +369,11 @@
</script>
<style lang="scss">
+ uni-image
+ {
+ width:30rem;
+ height:25rem
+ }
.index-wrapper {
height: 100vh;
overflow: hidden;
@@ -585,9 +590,10 @@
// height: 100vw;
}
}
+
.clone {
position:absolute;
- bottom: -150rpx;
+ bottom: -30rpx;
transform: translate(calc(50% - 32rpx));
.image {
width: 64rpx;
diff --git a/uniapp/pages/login/setInviteCode.vue b/uniapp/pages/login/setInviteCode.vue
index 2f9dab5..efa0c41 100644
--- a/uniapp/pages/login/setInviteCode.vue
+++ b/uniapp/pages/login/setInviteCode.vue
@@ -186,8 +186,11 @@
},
setinvite() {
var that = this;
+ let deviceInfo = uni.getDeviceInfo();
+ console.log(deviceInfo.deviceId);
this.$u.api.bindInvitation({
- invite_code:this.inviteCode
+ invite_code:this.inviteCode,
+ deviceid:deviceInfo.deviceId
}).then(e => {
if(e.code != 0) return that.$alert(e.msg)
uni.showToast({
diff --git a/uniapp/pages/rankinglist/compareprice.vue b/uniapp/pages/rankinglist/compareprice.vue
index c9bf8f5..6fff353 100644
--- a/uniapp/pages/rankinglist/compareprice.vue
+++ b/uniapp/pages/rankinglist/compareprice.vue
@@ -38,7 +38,7 @@
else{
const value = uni.getStorageSync('userInfo');
console.log(value)
- this.webviewUrl = encodeURI('https://appapitest.ushopvip.com/html/compareprice.html?token='+value.token);
+ this.webviewUrl = encodeURI('http://appapitest.ushopvip.com/html/compareprice.html?token='+value.token);
}
},
diff --git a/uniapp/static/images/tabBar/compareprice.png b/uniapp/static/images/tabBar/compareprice.png
new file mode 100644
index 0000000..404fb5d
--- /dev/null
+++ b/uniapp/static/images/tabBar/compareprice.png
Binary files differ
diff --git a/uniapp/static/images/tabBar/compareprice_activity.png b/uniapp/static/images/tabBar/compareprice_activity.png
new file mode 100644
index 0000000..e3f6505
--- /dev/null
+++ b/uniapp/static/images/tabBar/compareprice_activity.png
Binary files differ
--
Gitblit v1.9.3