diff --git a/manifest.json b/manifest.json index 2b679a9..bc84aeb 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "惠农生活", "appid" : "__UNI__3A527D1", "description" : "", - "versionName" : "1.7.6", - "versionCode" : 176, + "versionName" : "1.7.7", + "versionCode" : 177, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/index/index.vue b/pages/index/index.vue index c2cce31..676ead8 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -284,7 +284,11 @@ import activityCard from "@/components/activityCard.vue" } this.connectstatus = connectStr }) - this.selfLocation() + this.selfLocation(); + + this.$nextTick(()=>{ + this.$refs.activityPopup.open(); + }) }, @@ -318,10 +322,6 @@ import activityCard from "@/components/activityCard.vue" this.street_id = newValue.split(',')[1] }); - - this.$nextTick(()=>{ - this.$refs.activityPopup.open(); - }) diff --git a/pages/nongKe/cloud_entrepot/indexh.vue b/pages/nongKe/cloud_entrepot/indexh.vue index e9c95d2..800d959 100644 --- a/pages/nongKe/cloud_entrepot/indexh.vue +++ b/pages/nongKe/cloud_entrepot/indexh.vue @@ -102,10 +102,12 @@ {{item.mer_labels_name}}{{item.product.store_name}} - - {{item.product.store_info}} - {{getSkuName(item)}} - {{item.unit_name}} + + {{item.merchant.street_name}} + + {{getSkuName(item)}} + {{item.unit_name}} + {{ item.product.price.split('.')[0] }}.{{item.product.price.split('.')[1]}} @@ -1183,18 +1185,16 @@ .r_type { font-size: 22.78rpx; color: #737373; - width: 300rpx; + flex: 1; + overflow: hidden; + display: flex; view { height: 39rpx; line-height: 39rpx; background: #FEF5F3; - display: inline-block; padding: 0 16rpx; border-radius: 39rpx; - max-width: 100%; - overflow: hidden; - white-space: nowrap; text-overflow: ellipsis; } } @@ -1206,6 +1206,13 @@ color: #F84221; align-items: center; } + .r_street{ + font-size: 24rpx; + height: 39rpx; + line-height: 39rpx; + color: #7f7f7f; + padding-right: 10rpx; + } } } }