weipengfei
/
purchase-let
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add

This commit is contained in:
zmj 2024-07-02 17:06:39 +08:00
parent c53c0b8cc4
commit 39cda88ba1
4 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/goodPopup.vue
View File

@ -37,13 +37,13 @@
<view v-if="datas.is_bulk" class="row" style="height: 100rpx;">
<view>购买重量<text style="color: #F55726;">*</text></view>
<view style="justify-content: end;">
<up-number-box v-model="datas.cart_num" @change="valChange"></up-number-box>
<up-number-box :min="0" v-model="datas.cart_num" @change="valChange"></up-number-box>
</view>
</view>
<view v-else class="row" style="height: 100rpx;">
<view>购买数量<text style="color: #F55726;">*</text></view>
<view style="justify-content: end;">
<up-number-box v-model="datas.cart_num" @change="valChange"></up-number-box>
<up-number-box :min="0" v-model="datas.cart_num" @change="valChange"></up-number-box>
</view>
</view>
<view class="row" style="padding-top: 30px;padding-bottom: 30rpx;">

12
multipleShop/index/index.vue
View File

@ -14,9 +14,9 @@
@click="onChooseShop(item)">
<view class="multiple-card-item-left">
<view class="multiple-card-item-left-title">{{item.name}}</view>
<view class="multiple-card-item-left-tag" v-if="item.reservation">
<text class="yellow" v-if="item.reservation">次日可提</text>
<text class="green" v-else>当日可提</text>
<view class="multiple-card-item-left-tag">
<text class="yellow" v-if="item.reservation==1">次日可提</text>
<text class="green" v-if='item.reservation==0'>当日可提</text>
</view>
<view class="multiple-card-item-left-info">
<u-image src="../../multipleShop/images/location_small.jpg" width="24rpx"
@ -86,8 +86,6 @@
onLoad((opt) => {
event = opt.event
if (opt.cart_id) queryParams.cart_id = opt.cart_id;
console.log(event)
// 获取定位
getLocation();
});
@ -179,8 +177,8 @@
let location = uni.getStorageSync('location');
if (location) {
location = JSON.parse(location);
queryParams.longitude = location.lat
queryParams.latitude = location.long
queryParams.longitude = location.long
queryParams.latitude = location.lat
// 加载店铺列表
getShopList();
} else {

8
pages/my/my.vue
View File

@ -24,7 +24,7 @@
<template>
<view style="flex-grow: 1;overflow-y: auto;">
<view class="user-info"
:style="{backgroundImage: userInfo.user_ship!=1?'url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e3a7b202404261113002322.webp)':'url(https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/aace1202407021022357574.png)' }">
:style="{backgroundImage: [0,4].includes(userInfo.user_ship)?'url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e3a7b202404261113002322.webp)':'url(https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/aace1202407021022357574.png)' }">
<view class="u-card">
<view style="display: flex;" @click="updataInfp">
<up-image :src="userInfo.avatar" mode="aspectFill" width="112rpx" height="112rpx"
@ -36,13 +36,13 @@
<view style="margin:0 20rpx;">
{{userInfo.id}}
</view>
<view v-if="userInfo.user_ship==1"
<view v-if="![0,4].includes(userInfo.user_ship)"
style="display: flex;align-items: center;background-color: #F6EECD;padding: 4rpx 10rpx;border-radius: 20rpx;">
<view style="margin-right: 10rpx;">
<up-icon
name="https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/e8621202406281618363287.png"></up-icon>
</view>
{{userInfo.label_name}}会员
{{userInfo.vip_name}}会员
</view>
</view>
</view>
@ -291,7 +291,7 @@
userInfo.value = res.data;
formData.avatar = res.data.avatar
formData.nick_name = res.data.nickname
if (res.data.user_ship == 1) {
if (![0, 4].includes(res.data.user_ship)) {
uni.setNavigationBarColor({
frontColor: "#000000",
backgroundColor: "#EAFFE1"

17
pagesOrder/settle/settle.vue
View File

@ -31,13 +31,14 @@
</view>
</view>
</view> -->
<view class="m-card m-address" style="margin-top: 20rpx;">
<view class="address-info"
style='display: flex;justify-content: space-between;width: 690rpx;align-items: center;'>
<view class="top" style="align-items: flex-start;">
<view style="color: #333;">
<view style="margin: 0 10rpx;color:#20B128">推荐自提点</view>
<view style=" margin: 0 10rpx;margin-top:5rpx;color:#20B128"> {{reservation?"次日可提":"当日可提" }}
<view style="color: #333;width: 190rpx;">
<view style="margin: 0 10rpx;color:#20B128;text-align: center;">推荐自提点</view>
<view class="isreser"> {{reservation?"次日可提":"当日可提" }}
</view>
</view>
<view>
@ -572,6 +573,16 @@
</script>
<style lang="scss">
.isreser {
// margin: 0 10rpx;
margin-top: 5rpx;
color: black;
background-color: #F6EECD;
padding: 5rpx 10rpx;
border-radius: 10rpx;
text-align: center;
}
.m-card {
margin: 20rpx;
border-radius: 14rpx;