Compare commits
No commits in common. "c58d7cd2ba2fb3ebef97194dbc0fcfdb8232cdd7" and "71332e070af09ab55302adddb689b14d0d5c28d8" have entirely different histories.
c58d7cd2ba
...
71332e070a
@ -124,9 +124,9 @@ export default {
|
||||
return item;
|
||||
});
|
||||
|
||||
// 过滤出距离1km以内的数据，确保距离为0的值也能被正确保留
|
||||
// 过滤出距离1km以内的数据
|
||||
processedList = processedList.filter(item =>
|
||||
item.distanceValue !== undefined && item.distanceValue !== null && item.distanceValue <= 1
|
||||
item.distanceValue && item.distanceValue <= 1
|
||||
);
|
||||
|
||||
// 调用腾讯地图API获取附近1km的小区（包含图片信息）
|
||||
@ -179,10 +179,10 @@ export default {
|
||||
mergedList = uniqueByField(mergedList, 'community_id');
|
||||
}
|
||||
|
||||
// 根据距离排序，确保距离为0的值也能正确排序
|
||||
// 根据距离排序
|
||||
mergedList.sort((a, b) => {
|
||||
const distanceA = a.distanceValue !== undefined && a.distanceValue !== null ? a.distanceValue : Infinity;
|
||||
const distanceB = b.distanceValue !== undefined && b.distanceValue !== null ? b.distanceValue : Infinity;
|
||||
const distanceA = a.distanceValue || Infinity;
|
||||
const distanceB = b.distanceValue || Infinity;
|
||||
|
||||
return distanceA - distanceB;
|
||||
});
|
||||
|
||||
@ -315,11 +315,11 @@ page {
|
||||
}
|
||||
|
||||
.CateList_Box {
|
||||
width: 95%;
|
||||
width: 71.5%;
|
||||
display: flex;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
/* position: fixed; */
|
||||
/* position: relative; */
|
||||
position: fixed;
|
||||
z-index: 15;
|
||||
padding: 20rpx 10rpx;
|
||||
background-color: #ffffff;
|
||||
@ -368,7 +368,7 @@ page {
|
||||
}
|
||||
|
||||
.CateIte {
|
||||
/* margin-top: 80rpx; */
|
||||
margin-top: 80rpx;
|
||||
}
|
||||
|
||||
.CateInfo {
|
||||
|
||||
@ -63,8 +63,7 @@
|
||||
{{ item.category_name }}
|
||||
</view>
|
||||
</view>
|
||||
<view class="Con_right" v-if="tagList1.length > 0" ref="conRightRef"
|
||||
:style="{ overflow: cateListShow ? 'hidden' : 'auto' }">
|
||||
<view class="Con_right" v-if="tagList1.length > 0">
|
||||
<view class="CateList_Box" :class="cateListShow ? 'bgf' : ''">
|
||||
<view class="CateList" ref="cateListRef">
|
||||
<view class="CateList_Item" v-for="(item, index) in tagList" :key="item.id"
|
||||
@ -136,14 +135,14 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="gg" @click="chooseGG(item, items)" v-if="
|
||||
<view class="gg" @click="chooseGG(item,items)" v-if="
|
||||
items.commodity_goods_info_list.length > 1 && !items.isShow
|
||||
">
|
||||
选择规格
|
||||
<u-icon name="arrow-down" size="26rpx" color="#FF370B"></u-icon>
|
||||
</view>
|
||||
|
||||
<view class="gg" @click="chooseGG(item, items)" v-if="
|
||||
<view class="gg" @click="chooseGG(item,items)" v-if="
|
||||
items.commodity_goods_info_list.length > 1 && items.isShow
|
||||
">
|
||||
收起
|
||||
@ -153,8 +152,7 @@
|
||||
</view>
|
||||
|
||||
<view class="GGList" v-if="items.isShow">
|
||||
<view class="GGItem" v-for="ite in items.commodity_goods_info_list" :key="ite.id"
|
||||
@click="goods(ite, items)">
|
||||
<view class="GGItem" v-for="ite in items.commodity_goods_info_list" :key="ite.id" @click="goods(ite,items)">
|
||||
<view class="GGItem_Image">
|
||||
<view class="tag tag-img" v-if="ite.is_same_day">当日达</view>
|
||||
<image :src="picUrl + ite.commodity_pic" mode="aspectFill"></image>
|
||||
@ -229,7 +227,6 @@ export default {
|
||||
search: "",
|
||||
value: "1",
|
||||
cateListShow: false,
|
||||
scrollTop: 0,
|
||||
conRightElement: null,
|
||||
iconList: [
|
||||
{
|
||||
@ -328,20 +325,6 @@ export default {
|
||||
//顶部分类点击
|
||||
changeCateListShow() {
|
||||
this.cateListShow = !this.cateListShow;
|
||||
// 当cateListShow展开时，禁止Con_right滚动
|
||||
if (this.conRightRef) {
|
||||
if (this.cateListShow) {
|
||||
// 保存当前滚动位置
|
||||
this.scrollTop = this.conRightRef.scrollTop;
|
||||
} else {
|
||||
// 恢复滚动位置
|
||||
setTimeout(() => {
|
||||
if (this.conRightRef) {
|
||||
this.conRightRef.scrollTop = this.scrollTop || 0;
|
||||
}
|
||||
}, 0);
|
||||
}
|
||||
}
|
||||
},
|
||||
//选择右下角分类
|
||||
checkItem(index) {
|
||||
@ -355,7 +338,7 @@ export default {
|
||||
this.topShow = !this.topShow;
|
||||
},
|
||||
// 选择商品规格
|
||||
chooseGG(item, targetItems) {
|
||||
chooseGG(item,targetItems) {
|
||||
// 根据两个参数的id判断点击的数据
|
||||
if (item && targetItems && item.id) {
|
||||
for (let i = 1; i < this.tagList.length; i++) {
|
||||
@ -379,7 +362,7 @@ export default {
|
||||
NavgateTo("../search/index");
|
||||
},
|
||||
//商品详情页
|
||||
goods(ite, items) {
|
||||
goods(ite,items) {
|
||||
NavgateTo(`../goods/index?item=${JSON.stringify(ite)}`);
|
||||
},
|
||||
|
||||
@ -464,7 +447,7 @@ export default {
|
||||
let currentQuantity = 0;
|
||||
let stockQuantity = 0;
|
||||
let goodsToUpdate = null;
|
||||
|
||||
|
||||
// 对于有规格的主商品（绑定到items.commodity_goods_info_list[0].quantity）
|
||||
if (
|
||||
item.commodity_goods_info_list &&
|
||||
@ -482,7 +465,7 @@ export default {
|
||||
stockQuantity = item.stock_quantity || 0;
|
||||
goodsToUpdate = item;
|
||||
}
|
||||
|
||||
|
||||
// 判断是否增加数量且库存不足
|
||||
if (quantity > currentQuantity && currentQuantity >= stockQuantity) {
|
||||
uni.showToast({
|
||||
@ -491,7 +474,7 @@ export default {
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// 使用$set确保响应式更新
|
||||
this.$set(goodsToUpdate, 'quantity', quantity);
|
||||
|
||||
|
||||
@ -76,6 +76,7 @@ export default {
|
||||
}
|
||||
},
|
||||
async onLoad() {
|
||||
uni.removeStorageSync('changeWorkOrderData');
|
||||
const workOrderPermission = uni.getStorageSync('work_order_permission');
|
||||
const orderDispatchPermission = uni.getStorageSync('order_dispatch_permission');
|
||||
this.showWorkOrderSection = !(workOrderPermission === false && orderDispatchPermission === false);
|
||||
@ -89,21 +90,8 @@ export default {
|
||||
});
|
||||
this.communityList = res.rows;
|
||||
|
||||
const changeCommData = uni.getStorageSync('changeWorkOrderData');
|
||||
// 检查本地存储的小区是否存在于返回的列表中
|
||||
if (changeCommData) {
|
||||
const exists = res.rows.some(item => item.community_id === changeCommData.id);
|
||||
// 如果不存在，则清除数据并设置为第一个
|
||||
if (!exists && res.rows.length > 0) {
|
||||
uni.setStorageSync('changeWorkOrderData', { id: res.rows[0].community_id, name: res.rows[0].name });
|
||||
this.communityVal = res.rows[0].name;
|
||||
} else if (!exists) {
|
||||
// 如果列表为空，则清除数据
|
||||
uni.removeStorageSync('changeWorkOrderData');
|
||||
this.communityVal = "切换小区";
|
||||
}
|
||||
} else if (res.rows.length > 0) {
|
||||
// 如果没有选中的小区且有小区列表，则默认选中第一个
|
||||
// 如果没有选中的小区且有小区列表，则默认选中第一个
|
||||
if (!uni.getStorageSync('changeWorkOrderData') && res.rows.length > 0) {
|
||||
uni.setStorageSync('changeWorkOrderData', { id: res.rows[0].community_id, name: res.rows[0].name });
|
||||
this.communityVal = res.rows[0].name;
|
||||
}
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
<view>巡检人：{{ item.inspection_plan_info.community_worker_info.name }}</view>
|
||||
</view>
|
||||
<view class="item-content-right">
|
||||
<button class="Btn" @click="goInspection(item)" :disabled="item.inspection_plan_info.community_worker_info.inspection_permission != 1">去巡检</button>
|
||||
<button class="Btn" @click="goInspection(item)">去巡检</button>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user