mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
weipengfei 2024-01-22 18:51:10 +08:00
parent f2940b9c8a
commit 94377b4afd
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "惠农生活", "name" : "惠农生活",
"appid" : "__UNI__3A527D1", "appid" : "__UNI__3A527D1",
"description" : "", "description" : "",
"versionName" : "1.7.6", "versionName" : "1.7.7",
"versionCode" : 176, "versionCode" : 177,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {

10
pages/index/index.vue
View File

@ -284,7 +284,11 @@ import activityCard from "@/components/activityCard.vue"
} }
this.connectstatus = connectStr 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.street_id = newValue.split(',')[1]
}); });
this.$nextTick(()=>{
this.$refs.activityPopup.open();
})

25
pages/nongKe/cloud_entrepot/indexh.vue
View File

@ -102,10 +102,12 @@
<view class="r_name"> <view class="r_name">
<text v-if="item.mer_labels_name" class="mer-labels">{{item.mer_labels_name}}</text>{{item.product.store_name}} <text v-if="item.mer_labels_name" class="mer-labels">{{item.mer_labels_name}}</text>{{item.product.store_name}}
</view> </view>
<view class="r_type"> <view style="display: flex;justify-content: flex-start;margin-top: 5rpx;">
<view v-if="item.product.store_info">{{item.product.store_info}}</view> <view class="r_street" v-if="item.merchant">{{item.merchant.street_name}}</view>
<view v-else-if="getSkuName(item)">{{getSkuName(item)}}</view> <view class="r_type" v-if="item.product.store_info||getSkuName(item)||item.unit_name">
<view v-else-if="item.unit_name">{{item.unit_name}}</view> <view v-if="getSkuName(item)">{{getSkuName(item)}}</view>
<view v-else-if="item.unit_name">{{item.unit_name}}</view>
</view>
</view> </view>
<view class="r_btn" v-if="item.product && item.product.price"> <view class="r_btn" v-if="item.product && item.product.price">
<view>￥<text style="font-size: 33rpx;">{{ item.product.price.split('.')[0] }}.</text>{{item.product.price.split('.')[1]}}</view> <view>￥<text style="font-size: 33rpx;">{{ item.product.price.split('.')[0] }}.</text>{{item.product.price.split('.')[1]}}</view>
@ -1183,18 +1185,16 @@
.r_type { .r_type {
font-size: 22.78rpx; font-size: 22.78rpx;
color: #737373; color: #737373;
width: 300rpx; flex: 1;
overflow: hidden;
display: flex;
view { view {
height: 39rpx; height: 39rpx;
line-height: 39rpx; line-height: 39rpx;
background: #FEF5F3; background: #FEF5F3;
display: inline-block;
padding: 0 16rpx; padding: 0 16rpx;
border-radius: 39rpx; border-radius: 39rpx;
max-width: 100%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
} }
@ -1206,6 +1206,13 @@
color: #F84221; color: #F84221;
align-items: center; align-items: center;
} }
.r_street{
font-size: 24rpx;
height: 39rpx;
line-height: 39rpx;
color: #7f7f7f;
padding-right: 10rpx;
}
} }
} }
} }