diff --git a/App.vue b/App.vue index 9e4a0fe..08a81ad 100644 --- a/App.vue +++ b/App.vue @@ -396,9 +396,16 @@ display: flex; justify-content: center; align-items: center; - margin-top: -40rpx; + margin-top: -50rpx; // box-shadow: 0px 5px 10px 1px rgba(32, 161, 98, 0.3); } + .custom_style-txt{ + display: flex; + flex-direction: column; + align-items: center; + margin-top: 5rpx; + + } } .bg-color-red { diff --git a/components/realselist/realselist.vue b/components/realselist/realselist.vue index e1b31f6..6f5053e 100644 --- a/components/realselist/realselist.vue +++ b/components/realselist/realselist.vue @@ -9,7 +9,7 @@ - X + @@ -395,13 +395,18 @@ width: 44rpx; height: 44rpx; line-height: 44rpx; - border: 2rpx solid #fff; + border-radius: 50%; text-align: center; - color: #fff; + position: absolute; top: -150rpx; right: 30rpx; + + image { + width: 100%; + height: 100%; + } } .search { diff --git a/components/shoppinglist/shoppinglist.vue b/components/shoppinglist/shoppinglist.vue index 29d6598..f578055 100644 --- a/components/shoppinglist/shoppinglist.vue +++ b/components/shoppinglist/shoppinglist.vue @@ -9,7 +9,7 @@ - X + @@ -352,8 +352,6 @@ \ No newline at end of file diff --git a/pages/commissionedSales/delegation_details/index.vue b/pages/commissionedSales/delegation_details/index.vue index bf4a44a..0bd7f4f 100644 --- a/pages/commissionedSales/delegation_details/index.vue +++ b/pages/commissionedSales/delegation_details/index.vue @@ -117,7 +117,7 @@ 拒绝原因: - + 通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺 @@ -272,7 +272,7 @@ .center-twob { width: 360rpx; text-align: right; - border: 1px solid; + word-wrap: break-word; font-size: 32rpx; font-family: PingFang SC; diff --git a/pages/commissionedSales/initiateDelegation/index.vue b/pages/commissionedSales/initiateDelegation/index.vue index 1f8eaf2..e066e04 100644 --- a/pages/commissionedSales/initiateDelegation/index.vue +++ b/pages/commissionedSales/initiateDelegation/index.vue @@ -317,6 +317,10 @@ // url: '/pages/commissionedSales/delegation_details/index' // }) }, + //获取分类数据 + commislist(){ + + }, //选择 tabClick(e) { //点击获取当前标签数据 @@ -808,7 +812,7 @@ .entrust_bg-content { position: absolute; - top: 404rpx; + top: 304rpx; .bg-content-a { margin-left: 242rpx; @@ -854,7 +858,7 @@ .bg-content_textarea { width: 624rpx; - height: 152rpx; + height: 242rpx; padding: 25rpx 18rpx; background: #F5F5F5; diff --git a/pages/commissionedSales/receivedCommission/index.vue b/pages/commissionedSales/receivedCommission/index.vue index 4df6855..4009e74 100644 --- a/pages/commissionedSales/receivedCommission/index.vue +++ b/pages/commissionedSales/receivedCommission/index.vue @@ -738,7 +738,7 @@ .entrust_bg-content { position: absolute; - top: 404rpx; + top: 304rpx; .bg-content-a { margin-left: 242rpx; @@ -784,7 +784,7 @@ .bg-content_textarea { width: 624rpx; - height: 152rpx; + height: 242rpx; padding: 25rpx 18rpx; background: #F5F5F5; diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue index 8baff7b..d7a80d2 100644 --- a/pages/gather/gather.vue +++ b/pages/gather/gather.vue @@ -74,6 +74,9 @@ --> @@ -357,7 +360,6 @@ }, confirm(e) { this.street = e.value[1].name - this.$nextTick(() => { this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code); }) @@ -383,7 +385,6 @@ this.$nextTick(() => { this.$bus.$emit('value-updated', this.street + ',' + street_id); - }) }).catch(err => { diff --git a/pages/index/index.vue b/pages/index/index.vue index 5a9597f..86bccf5 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -42,10 +42,13 @@ - @@ -197,13 +200,13 @@ // #endif }, onTabItemTap(e) { - - uni.pageScrollTo({ - selector: ".Circle_friends", - scrollTop: 0 - }) - + uni.pageScrollTo({ + selector: ".Circle_friends", + scrollTop: 0 + }) + + }, onReachBottom() { if (this.status == 'nomore') return; @@ -249,7 +252,7 @@ this.backColor = 'rgba(252, 252, 252, 1.0)' this.isFshow = true this.show = false - this.$nextTick(()=>{ + this.$nextTick(() => { uni.setTabBarItem({ index: 0, text: '返回顶部', diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue index cd2f1b5..9c098a5 100644 --- a/pages/moreProject/moreProject.vue +++ b/pages/moreProject/moreProject.vue @@ -124,7 +124,7 @@ 商户设置 - @@ -140,7 +140,7 @@ 发布管理 - + --> @@ -237,6 +239,7 @@ }, onLoad() { + this.list() this.Area() @@ -320,7 +323,9 @@ if (id) { spuInfo(id, this.where1).then(res => { this.cateGoods.push(...res.data.list) + }) + } else { getProductHot(this.where.page, this.where.limit).then(res => { this.cateGoods.push(...res.data.list) @@ -390,7 +395,8 @@ this.street = e.value[1].name this.street_id = e.value[1].code this.town = e.value[1].name - + this.cateGoods=[] + this.list(this.street_id) this.$nextTick(() => { this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code); @@ -480,6 +486,8 @@ this.street = e.value[1].name this.street_id = e.value[1].code this.town = e.value[1].name + this.cateGoods=[] + this.list(this.street_id) }, selfLocation() { if (uni.getStorageSync('loction') == true) { diff --git a/pages/user/index.vue b/pages/user/index.vue index c514b00..0f97ec5 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -228,6 +228,9 @@ -->