maguodong/uniapp-ZHSQ
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: maguodong:814c59cba41d33e84b0e9a108a59f710320e3ea2
Branches Tags
maguodong:master
maguodong:feature/yi
maguodong:feature-yjs
maguodong:qjl
maguodong:myb
..
compare: maguodong:fd462f66bb743b0febd014c1401f4a52fd6b3aa0
Branches Tags
maguodong:master
maguodong:feature/yi
maguodong:feature-yjs
maguodong:qjl
maguodong:myb

No commits in common. "814c59cba41d33e84b0e9a108a59f710320e3ea2" and "fd462f66bb743b0febd014c1401f4a52fd6b3aa0" have entirely different histories.
814c59cba4 ... fd462f66bb

7 changed files with 181 additions and 242 deletions
Show Stats Expand all files Collapse all files

12
packages/myOrders/index/index.vue
View File

@ -243,9 +243,9 @@ export default {
receiving_address: data.merchantAddress,
change_goods_id: data.changeServiceId
}
request(afterSaleApi.afterSaleCreate, "POST", params).then((res) => {
this.getOrderList();
});
// request(afterSaleApi.afterSaleCreate, "POST", params).then((res) => {
// this.getOrderList();
// });
},
@ -376,8 +376,8 @@ export default {
evaluate_status: this.evaluateStatus,
user_id: uni.getStorageSync("userId"),
}).then((res) => {
res.order_list?.forEach(item => {
item.commodity_order_item_list?.forEach(good => {
res.order_list.forEach(item => {
item.commodity_order_item_list.forEach(good => {
good.commodity_pic = picUrl + good.commodity_pic;
})
})
@ -390,7 +390,7 @@ export default {
user_id: uni.getStorageSync('userId'),
}
request(afterSaleApi.afterSalesList, "POST", params).then((res) => {
res.after_sales_list?.forEach(item => {
res.after_sales_list.forEach(item => {
item.commodity_order_item?.forEach(good => {
good.commodity_pic = picUrl + good.commodity_pic;
})

32
packages/park/orderDetail/index.vue
View File

@ -18,14 +18,14 @@
<view class="amount-item" @tap="toggleAmountExpand">
<text class="amount-label">实付金额</text>
<view class="amount-value">
<text>¥{{ orderDetail.pay_method/100 }}</text>
<text>¥{{ orderDetail.pay_method }}</text>
<u-icon :name="amountExpanded ? 'arrow-up' : 'arrow-down'" size="28"></u-icon>
</view>
</view>
<view class="amount-item" v-show="amountExpanded">
<text class="amount-label2">订单金额</text>
<text>¥{{ orderDetail.pay_method/100 }}</text>
<text>¥{{ orderDetail.pay_method }}</text>
</view>
</view>
@ -35,7 +35,7 @@
<view class="info-item">
<text class="info-label">车牌号码</text>
<text>{{ orderDetail.record_info.car_number }}</text>
<text>{{ orderDetail.parking_record.car_number }}</text>
</view>
<view class="info-item">
@ -44,11 +44,8 @@
</view>
<view class="info-item">
<!-- <text class="info-label">停车时长</text>
<text>{{ calculateParkingDuration() }}</text> -->
<text class="info-label">计费时长</text>
<text>{{ getTime(orderDetail.billing_time) }}</text>
<text class="info-label">停车时长</text>
<text>{{ calculateParkingDuration() }}</text>
</view>
<view class="info-item">
@ -121,26 +118,13 @@ export default {
},
// 计算停车时长
getTime(time) {
if (!time) {
return '0分钟';
}
const hourVal = Math.floor(time/60);
const minuteVal = time%60;
if (hourVal === 0) {
return `${minuteVal}分钟`;
}
return `${hourVal}小时${minuteVal}分钟`
},
calculateParkingDuration() {
if (!this.orderDetail || !this.orderDetail.record_info) {
if (!this.orderDetail || !this.orderDetail.parking_record) {
return '0分钟';
}
const inTime = new Date(this.orderDetail.record_info.in_time);
const outTime = new Date(this.orderDetail.record_info.out_time);
const inTime = new Date(this.orderDetail.parking_record.in_time);
const outTime = new Date(this.orderDetail.parking_record.out_time);
// 计算时间差（毫秒）
const diffMs = outTime - inTime;

4
packages/park/temporaryOrder/index.vue
View File

@ -68,7 +68,7 @@
<!-- 停车费展示部分 -->
<view v-if="showCost1">
<view v-if="payStatus === 1" class="cost-container">
<view v-if="payStatus === 2" class="cost-container">
<view>
<image class="cost-image"
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/park/park_orderLoading.png"
@ -381,7 +381,7 @@ export default {
this.isTimeout = false;
// 如果是已支付状态(pay_status=1)
if (this.payStatus === 2 && this.payTime) {
if (this.payStatus === 1 && this.payTime) {
// 计算并显示倒计时
this.updateCountdown();
// 设置定时器，每秒更新一次倒计时

37
packages/shop/groupPurchaseSubmit/index.vue
View File

@ -537,34 +537,9 @@ export default {
return;
}
// 团购活动时间判断
const currentTime = new Date().getTime();
let isGroupBuyValid = true;
// 检查所有商品是否在团购活动时间内
for (let supplierId in this.supplierGroups) {
const group = this.supplierGroups[supplierId];
for (let item of group) {
const activityInfo = item.commodity_goods_info.group_buy_activity_info;
// 如果没有团购活动信息，或者不在活动时间内，则isGroupBuyValid设为false
if (!activityInfo) {
isGroupBuyValid = false;
break;
}
const startTime = new Date(activityInfo.start_time).getTime();
const endTime = new Date(activityInfo.end_time).getTime();
if (!(currentTime >= startTime && currentTime <= endTime)) {
isGroupBuyValid = false;
break;
}
}
if (!isGroupBuyValid) break;
}
const params = {
user_id: uni.getStorageSync('userId'),
is_group_buy: isGroupBuyValid,
is_group_buy: true,
goods_list: Object.keys(this.supplierGroups).map(supplierId => {
const group = this.supplierGroups[supplierId];
const firstItem = group[0];
@ -575,6 +550,9 @@ export default {
// 根据供应商id获取自提点信息
const ztAddress = this.defZTAddress.find(adItem => adItem.id == supplierId) || {};
// 团购活动时间判断
const currentTime = new Date().getTime();
return {
supplier_id: firstItem.supplier_id,
supplier_name: firstItem.supplier_name || '',
@ -584,10 +562,9 @@ export default {
receiving_address: ztAddress.address || '',
group_buy_activity_id: firstItem.commodity_goods_info.group_buy_activity_id,
goods_and_count: group.map(item => {
const activityInfo = item.commodity_goods_info.group_buy_activity_info;
const isGroupBuy = activityInfo &&
currentTime >= new Date(activityInfo.start_time).getTime() &&
currentTime <= new Date(activityInfo.end_time).getTime();
const startTime = new Date(item.commodity_goods_info.group_buy_activity_info?.start_time).getTime();
const endTime = new Date(item.commodity_goods_info.group_buy_activity_info?.end_time).getTime();
const isGroupBuy = currentTime >= startTime && currentTime <= endTime;
return {
goods_id: item.goods_id,
count: item.count,

21
pages/index/index.css
View File

@ -1,7 +1,3 @@
page{
overflow-y: hidden;
}
.not_found_404 {
display: flex;
flex-direction: column;
@ -41,13 +37,6 @@ page{
background-color: #f9f9f9;
}
.mainBox{
height: 80.5vh;
margin-top: 10rpx;
overflow-y: auto;
overflow-x: hidden;
}
.hot-word-container {
width: 60%;
height: 50rpx;
@ -90,7 +79,7 @@ page {
.grid_Pic {
width: 80rpx;
height: 80rpx;
margin-bottom: 10rpx;
margin-bottom: 15rpx;
}
.searchBox {
@ -98,7 +87,6 @@ page {
align-items: center;
background-color: #FFFFFF;
justify-content: space-between;
padding-bottom: 10rpx;
}
.searchBox_add {
@ -509,7 +497,6 @@ page {
box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
overflow: hidden;
position: relative;
padding-top: 90rpx;
}
.tabs-container {
@ -517,7 +504,6 @@ page {
padding: 0 20rpx;
position: relative;
align-items: center;
background-color: #FFFFFF;
}
.tabs-scroll {
@ -536,7 +522,7 @@ page {
.tab-item {
padding: 0 20rpx;
margin-right: 20rpx;
font-size: 24rpx;
font-size: 20rpx;
color: #333;
background-color: #ededed;
height: 50rpx;
@ -637,7 +623,7 @@ page {
.overlay {
position: absolute;
top: 0;
top: 90rpx;
left: 0;
width: 100%;
height: 100%;
@ -753,7 +739,6 @@ page {
padding: 0 20rpx;
width: 100%;
box-sizing: border-box;
position: relative;
}
.merchantList2 {}

38
pages/index/index.vue
View File

@ -9,8 +9,9 @@
</view>
<view v-else>
<view class="container" :style="{ marginTop: top + 'px' }" v-if="loading">
<view class="white_container">
<!-- 城市信息部分 -->
<view class="white_container searchBox" :style="{ height: localHeight + 'px' }">
<view class="searchBox" :style="{ height: localHeight + 'px' }">
<view class="searchBox_add" @tap="map">
<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/Index_add.png" mode="widthFix" />
<view>
@ -37,8 +38,6 @@
</view>
</view>
</view>
<view class="mainBox" ref="mainBox">
<view class="white_container">
<!-- 功能导航区 -->
<view class="function-nav" v-if="showNav">
<view class="function-item" @click="goToShop">
@ -134,7 +133,7 @@
<view :class="['serverItem', `serverItem${index + 4}`]" @click="headerServerClick2(item)"
v-for="(item, index) in homeRightList2" :key="index">
<view class="serverTit">{{ item.title }}</view>
<image :src="item.pic_src" mode="aspectFill" />
<image :src="item.pic_src" mode="" />
<!-- <view>{{ item.ad_position }}</view> -->
</view>
</view>
@ -147,8 +146,8 @@
<image v-for="(item, index) in bottomList" :key="index" class="list_pic" :src="item.pic_src" mode="">
</image>
</view> -->
<!-- 分类标签栏已移至mainBox下方作为子盒子，保持视觉位置不变 -->
<u-sticky>
<!-- 分类标签栏 -->
<view class="category-tabs">
<view class="tabs-container">
<scroll-view scroll-x enable-flex class="tabs-scroll" :scroll-into-view="activeCategoryId">
<view class="tab-item" v-for="item in categoryList1" :key="item.id" :id="'category-' + item.id"
@ -172,7 +171,6 @@
</view>
</view>
</view>
</u-sticky>
<!-- 商家列表展示 -->
<view class="merchantList" :class="{ merchantList2: merchatList.length < 3 }">
@ -206,8 +204,7 @@
</view>
</view>
<view class="merchantItem_right_con_right" @click="toJump(item)">
<image
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/local_review.png"
<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/local_review.png"
mode="aspectFill"></image>
点评
</view>
@ -218,6 +215,7 @@
</view>
</view>
</view>
</view>
<view class="more" v-if="flag">下拉加载后续10条，共计{{ bottomTotal }}条</view>
<nav-footer />
@ -225,8 +223,6 @@
</view>
</view>
</view>
</template>
@ -1051,24 +1047,22 @@ export default {
this.showDropdown = false;
this.$nextTick(() => {
// 获取mainBox元素并使其滚动到底部
const mainBox = this.$refs.mainBox;
if (mainBox) {
mainBox.scrollTop = 1000;
}
uni.pageScrollTo({
scrollTop: 1000,
duration: 300
});
});
},
toggleDropdown() {
this.showDropdown = !this.showDropdown;
// 当展开下拉菜单时，在mainBox内滑动
// 当展开下拉菜单时，页面滑动
if (this.showDropdown) {
this.$nextTick(() => {
// 获取mainBox元素并使其滚动到底部
const mainBox = this.$refs.mainBox;
if (mainBox) {
mainBox.scrollTop = 1000;
}
uni.pageScrollTo({
scrollTop: 1000,
duration: 300
});
})
}
},

3
pages/user/index.css
View File

@ -195,8 +195,7 @@ margin-right: 20rpx;
}
.title-item {
font-size: 28rpx;
font-weight: bold;
font-size: 26rpx;
}
.customer {