ylj/caiyunyi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ylj20011123 2025-12-17 18:09:28 +08:00
parent 228e6fc157
commit 631385d5a9
14 changed files with 3861 additions and 3227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
pages/index/index.vue
View File

@ -915,34 +915,10 @@ export default {
}
await this.handleGetAdvertisementData();
// 并行加载所有数据
// const loadPromises = [
// ];
this.handleGetHighwayHeadlines(); // 高速头条播报
this.handleGetSpecialOffers(); // 促销单品
this.handleGetProductsList(); // 甄选商品
this.handleGetShoppingMall(); // 商城的内容
this.handleGetShopMallData();
if (this.seat.latitude && this.seat.longitude) {
// 景区信息
this.handleGetScenicData();
}
// 等待所有数据加载完成
// try {
// await Promise.all(loadPromises);
// } catch (error) {
// console.error("数据加载失败:", error);
// }
// this.handleAes()
this.$utils.addUserBehaviorNew({
behaviorRecordDesc: "进入了首页",
});
// 所有数据加载完成，隐藏骨架屏
if (this.skeletonControl && this.skeletonControl.showSkeleton) {
// 如果是首次访问，延迟隐藏骨架屏并标记已访问
@ -973,6 +949,29 @@ export default {
}
}, 300);
});
if (this.seat.latitude && this.seat.longitude) {
// 景区信息
this.handleGetScenicData();
}
this.handleGetHighwayHeadlines(); // 高速头条播报
this.handleGetSpecialOffers(); // 促销单品
this.handleGetProductsList(); // 甄选商品
this.handleGetShoppingMall(); // 商城的内容
this.handleGetShopMallData();
// 等待所有数据加载完成
// try {
// await Promise.all(loadPromises);
// } catch (error) {
// console.error("数据加载失败:", error);
// }
// this.handleAes()
this.$utils.addUserBehaviorNew({
behaviorRecordDesc: "进入了首页",
});
},
async onShow() {
// onShow 中不控制骨架屏，骨架屏只在 onLoad 中控制一次
@ -1192,8 +1191,6 @@ export default {
req2
);
console.log("datadatadatadatadatadatadatadatadata", data1);
console.log("datadatadatadatadatadatadatadatadata", data2);
let res1 = data1.Result_Data.List;
let res2 = data2.Result_Data.List;
@ -1480,6 +1477,7 @@ export default {
}, 300);
});
},
// 关闭广告 并跳转到指定页面
handleHidePopup() {
uni.setStorageSync("showIndexPoster", 1);
this.$refs.noticeRef.close();
@ -1488,11 +1486,17 @@ export default {
uni.navigateTo({
url: `/pages/shopMallPage/shopType/index?selectIndex=3&pageType=`,
});
} else {
if (this.poster.SERVERPARTSHOP_ID) {
uni.navigateTo({
url: `/pages/shopMallPage/shopType/index?indexDefaultLeftSelect=${this.poster.SERVERPARTSHOP_ID}`,
});
} else {
uni.navigateTo({
url: `/pages/shopMallPage/shopType/index`,
});
}
}
},
// 回到顶部
handleGoBack() {
@ -1800,9 +1804,18 @@ export default {
url: `/pages/shopMallPage/shopType/index?selectIndex=3`,
});
} else if (obj.index === 1) {
if (this.firstObj1.SERVERPARTSHOP_ID) {
uni.navigateTo({
url: `/pages/shopMallPage/shopType/index?comeForm=index&indexDefaultLeftSelect=${this.firstObj1.SERVERPARTSHOP_ID}`,
});
} else {
uni.navigateTo({
url: `/pages/shopMallPage/shopType/index?comeForm=index`,
});
}
// uni.navigateTo({
// url: `/pages/shopMallPage/shopType/index?comeForm=index`,
// });
} else {
uni.navigateTo({
url: `/pages/highwayHeadlines/attractInvestment`,

1283
pages/shopMallPage/index/index.vue
View File

File diff suppressed because it is too large Load Diff

108
pages/shopMallPage/shopType/index.vue
View File

@ -617,6 +617,7 @@ export default {
{ label: "由高到低", value: 2 },
],
selectSortType: 1,
indexDefaultLeftSelect: -1,
};
},
watch: {
@ -667,6 +668,7 @@ export default {
return this.rightShopList.length * this.itemHeight;
},
},
// 若有一天这个页面改版的话 去看看出行平台的 首页广告页面 跳转路径 是否还能生效
onLoad(query) {
// 初始化骨架屏控制
this.skeletonControl = useSkeletonControl(
@ -689,7 +691,7 @@ export default {
this.pageType = query.pageType;
}
if (query.leftId) {
this.leftId = query.leftId;
this.leftId = Number(query.leftId);
}
if (query.comeForm) {
@ -699,6 +701,11 @@ export default {
}
}
// 首页跳转默认把左边选择起来的 字段
if (query.indexDefaultLeftSelect) {
this.indexDefaultLeftSelect = Number(query.indexDefaultLeftSelect);
}
let shopCarList = [];
if (this.pageType === "UnionMall") {
shopCarList = this.$store.state.unionMyShopCar;
@ -1151,8 +1158,6 @@ export default {
});
}
console.log("resListresListresList", resList);
this.shopTypeList = resList;
this.handleGetAllShopItem(resList[this.activeTabs].UserdefinedType_Id);
@ -1299,6 +1304,41 @@ export default {
this.handleGetShopTypeShowData(typeList);
},
// 处理一下分类里面找出对应的id 并输出索引
findRootIndexByUserdefinedTypeId(treeList, targetId) {
if (!Array.isArray(treeList) || treeList.length === 0) {
return -1;
}
// 深度优先遍历
function dfs(node) {
if (!node) return false;
if (node.UserdefinedType_Id === targetId) {
return true;
}
var children = node.UserdefinedTypeList;
if (Array.isArray(children) && children.length > 0) {
for (var i = 0; i < children.length; i++) {
if (dfs(children[i])) {
return true;
}
}
}
return false;
}
// 只遍历第一层（最大层级）
for (var index = 0; index < treeList.length; index++) {
if (dfs(treeList[index])) {
return index;
}
}
return -1;
},
// 拿到全部商品的分类显示数据的方法
handleGetShopTypeShowData(typeList) {
let resList = [];
@ -1312,6 +1352,19 @@ export default {
}
this.shopTypeList = resList;
console.log(
"this.shopTypeListthis.shopTypeList",
JSON.parse(JSON.stringify(this.shopTypeList))
);
if (this.indexDefaultLeftSelect !== -1) {
let bigTab = this.findRootIndexByUserdefinedTypeId(
resList,
Number(this.indexDefaultLeftSelect)
);
console.log("bigTabbigTabbigTab", bigTab);
this.activeTabs = Number(bigTab) === -1 ? this.activeTabs : Number(bigTab);
}
if (this.activeTabs === 999999) {
this.handleGoPointsMall();
@ -1376,9 +1429,6 @@ export default {
// )
// uni.hideLoading()
let list = data.Data.List;
console.log("ididid", id);
console.log("listlistlistlist", JSON.parse(JSON.stringify(list)));
let thisAllType = [];
if (this.shopTypeList && this.shopTypeList.length > 0) {
@ -1390,8 +1440,6 @@ export default {
}
let haveAll = false;
console.log("thisAllTypethisAllType", JSON.parse(JSON.stringify(thisAllType)));
// 添加一个子类的全部
list.unshift({
UserdefinedType_Name: "全部",
@ -1413,14 +1461,6 @@ export default {
UserdefinedType_Id: -1,
});
}
console.log(
"thisAllTypethisAllTypethisAllType",
JSON.parse(JSON.stringify(thisAllType))
);
console.log(
"this.leftIdthis.leftIdthis.leftId",
JSON.parse(JSON.stringify(this.leftId))
);
let leftIndex = -1;
// if (this.pageType === "UnionMall" && this.leftId) {
@ -1447,11 +1487,24 @@ export default {
if (leftIndex === -1) {
leftIndex = this.leftSelectIndex;
}
console.log(
"indexDefaultLeftSelectindexDefaultLeftSelectindexDefaultLeftSelect",
this.indexDefaultLeftSelect
);
if (this.indexDefaultLeftSelect !== -1) {
if (thisAllType && thisAllType.length > 0) {
thisAllType.forEach((item, index) => {
if (item.UserdefinedType_Id === Number(this.indexDefaultLeftSelect)) {
leftIndex = index;
}
});
}
}
// 当前选中的商品列表
let shopList = [];
console.log("listlistlistlistlist", JSON.parse(JSON.stringify(list)));
if (list && list.length > 0) {
// 这一大类的全部商品
let thisTypeAllShop = [];
@ -1476,24 +1529,8 @@ export default {
}
});
console.log(
"thisTypeAllShopthisTypeAllShop",
JSON.parse(JSON.stringify(thisTypeAllShop))
);
console.log(
"allShopIDallShopIDallShopIDallShopID",
JSON.parse(JSON.stringify(allShopID))
);
list[0].COMMODITYLIST = thisTypeAllShop;
console.log("listlistlistlistlistlist", JSON.parse(JSON.stringify(list)));
console.log("leftIndexleftIndexleftIndex", JSON.parse(JSON.stringify(leftIndex)));
console.log(
"this.leftIdthis.leftIdthis.leftIdthis.leftId",
JSON.parse(JSON.stringify(this.leftId))
);
if (
leftIndex !== -1 &&
list[leftIndex] &&
@ -1527,7 +1564,6 @@ export default {
}
}
console.log("222222", JSON.parse(JSON.stringify(shopList)));
if (shopList && shopList.length > 0) {
shopList.forEach((item) => {
@ -1611,8 +1647,6 @@ export default {
newList[0].COMMODITYLIST = allShopList;
this.leftTypeList = newList;
console.log("shopListshopListshopList", JSON.parse(JSON.stringify(shopList)));
this.leftSelectIndex = leftIndex;
this.rightShopList = shopList;
this.visibleList = shopList.slice(0, this.visibleCount + this.buffer * 2);
@ -1739,8 +1773,6 @@ export default {
this.leftSelectIndex = index;
let shopList = this.leftTypeList[index].COMMODITYLIST;
console.log("shopListshopList", shopList);
if (shopList && shopList.length > 0) {
shopList.forEach((item) => {
// 判断当前的购物车里面 是不是已经有数据了 有数据的话 把原本的商品数量赋值进去

671
pages/shopMallPage/user/newIndex.vue
View File

File diff suppressed because it is too large Load Diff

24
pages/user/index.vue
View File

@ -562,12 +562,9 @@ export default {
// this.cards = userData.LicencePlate && userData.LicencePlate.List && userData.LicencePlate.List.length > 0 ? userData.LicencePlate.List[0].License_Plate : ""
}
// 拿用户信息
this.handleGetUserDetail();
await this.handleGetUserDetail();
// let shopOrderStatus = uni.getStorageSync('shopOrderStatus')
// if (!shopOrderStatus) {
// 拿到订单信息
this.handleGetOrderDetail();
// }
// 请求一下云南那边的积分信息
@ -582,17 +579,20 @@ export default {
if (this.skeletonControl && this.skeletonControl.showSkeleton) {
setTimeout(async () => {
if (this.skeletonControl) {
await this.skeletonControl.showContentAfterLoading(0);
await this.skeletonControl.showContentAfterLoading(10);
this.showContent = true;
this.isFirstLoad = false;
}
}, 200);
}, 20);
} else {
// 非首次访问直接显示内容
this.showContent = true;
this.isFirstLoad = false;
}
// 拿到订单信息
// this.handleGetOrderDetail();
this.$utils.addUserBehaviorNew({
behaviorRecordDesc: "进入了我的页面",
});
@ -735,9 +735,9 @@ export default {
this.$forceUpdate();
}
await this.handleGetOrderDetail();
this.handleGetOrderDetail();
// 拿用户信息
await this.handleGetUserDetail();
this.handleGetUserDetail();
this.$forceUpdate();
},
@ -1229,13 +1229,12 @@ export default {
// 拿到用户详情
async handleGetUserDetail() {
let _this = this;
_this.$api
.getCoop({
const data = await _this.$api.getCoop({
action_type: "GetMembershipInfo",
WechatUserId: _this.user.WechatUserId,
noLoading: true,
})
.then(function (data) {
});
if (data.ResultCode === "100") {
let _data = data;
_this.userInfo = _data.Data;
@ -1264,7 +1263,6 @@ export default {
// _this.setUser({});
_this.$store.commit("setUser", user);
}
});
},
// 跳转去售后 即已完成的列表
handleGo(url) {

BIN
static/images/caiyunyi1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1002 KiB

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopMallPage/index/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopMallPage/shopType/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

112
unpackage/dist/dev/mp-weixin/pages/index/index.js vendored
View File

@ -545,47 +545,20 @@ var _default = {
_context.next = 13;
return _this2.handleGetAdvertisementData();
case 13:
// 并行加载所有数据
// const loadPromises = [
// ];
_this2.handleGetHighwayHeadlines(); // 高速头条播报
_this2.handleGetSpecialOffers(); // 促销单品
_this2.handleGetProductsList(); // 甄选商品
_this2.handleGetShoppingMall(); // 商城的内容
_this2.handleGetShopMallData();
if (_this2.seat.latitude && _this2.seat.longitude) {
// 景区信息
_this2.handleGetScenicData();
}
// 等待所有数据加载完成
// try {
// await Promise.all(loadPromises);
// } catch (error) {
// console.error("数据加载失败:", error);
// }
// this.handleAes()
_this2.$utils.addUserBehaviorNew({
behaviorRecordDesc: "进入了首页"
});
// 所有数据加载完成，隐藏骨架屏
if (!(_this2.skeletonControl && _this2.skeletonControl.showSkeleton)) {
_context.next = 26;
_context.next = 19;
break;
}
_context.next = 23;
_context.next = 16;
return _this2.skeletonControl.showContentAfterLoading(200);
case 23:
case 16:
_this2.isPageLoading = false;
_context.next = 27;
_context.next = 20;
break;
case 26:
case 19:
// 非首次访问直接显示内容
_this2.isPageLoading = false;
case 27:
case 20:
// 骨架屏结束后显示广告弹窗
_this2.$nextTick(function () {
// 稍微延迟一下让页面渲染完成
@ -603,6 +576,27 @@ var _default = {
}
}, 300);
});
if (_this2.seat.latitude && _this2.seat.longitude) {
// 景区信息
_this2.handleGetScenicData();
}
_this2.handleGetHighwayHeadlines(); // 高速头条播报
_this2.handleGetSpecialOffers(); // 促销单品
_this2.handleGetProductsList(); // 甄选商品
_this2.handleGetShoppingMall(); // 商城的内容
_this2.handleGetShopMallData();
// 等待所有数据加载完成
// try {
// await Promise.all(loadPromises);
// } catch (error) {
// console.error("数据加载失败:", error);
// }
// this.handleAes()
_this2.$utils.addUserBehaviorNew({
behaviorRecordDesc: "进入了首页"
});
case 28:
case "end":
return _context.stop();
@ -863,56 +857,54 @@ var _default = {
return _this8.$api.$zzyLocalPost("/MallBasic/GetUSERDEFINEDTYPEList", req2);
case 7:
data2 = _context4.sent;
console.log("datadatadatadatadatadatadatadatadata", data1);
console.log("datadatadatadatadatadatadatadatadata", data2);
res1 = data1.Result_Data.List;
res2 = data2.Result_Data.List; // 修改一下 使用的是 当前时间在的范围内的第一个
firstObj1 = {};
if (!(res1 && res1.length > 0)) {
_context4.next = 23;
_context4.next = 21;
break;
}
i = 0;
case 15:
case 13:
if (!(i < res1.length)) {
_context4.next = 23;
_context4.next = 21;
break;
}
item = res1[i];
if (!(new Date(item.PRESALE_STARTTIME).getTime() < new Date().getTime() && new Date().getTime() < new Date(item.PRESALE_ENDTIME).getTime())) {
_context4.next = 20;
_context4.next = 18;
break;
}
firstObj1 = item;
return _context4.abrupt("break", 23);
case 20:
return _context4.abrupt("break", 21);
case 18:
i++;
_context4.next = 15;
_context4.next = 13;
break;
case 23:
case 21:
firstObj2 = {};
if (!(res2 && res2.length > 0)) {
_context4.next = 34;
_context4.next = 32;
break;
}
_i = 0;
case 26:
case 24:
if (!(_i < res2.length)) {
_context4.next = 34;
_context4.next = 32;
break;
}
_item = res2[_i];
if (!(new Date(_item.PRESALE_STARTTIME).getTime() < new Date().getTime() && new Date().getTime() < new Date(_item.PRESALE_ENDTIME).getTime())) {
_context4.next = 31;
_context4.next = 29;
break;
}
firstObj2 = _item;
return _context4.abrupt("break", 34);
case 31:
return _context4.abrupt("break", 32);
case 29:
_i++;
_context4.next = 26;
_context4.next = 24;
break;
case 34:
case 32:
_this8.firstObj1 = firstObj1;
if (firstObj1.USERDEFINEDTYPE_ICO) {
// this.swiperList.unshift(firstObj1.USERDEFINEDTYPE_ICO)
@ -923,7 +915,7 @@ var _default = {
// this.swiperList.unshift(res1[0].USERDEFINEDTYPE_ICO)
// this.poster = res2[0]
case 38:
case 36:
case "end":
return _context4.stop();
}
@ -1203,6 +1195,7 @@ var _default = {
}, _callee7);
}))();
},
// 关闭广告 并跳转到指定页面
handleHidePopup: function handleHidePopup() {
uni.setStorageSync("showIndexPoster", 1);
this.$refs.noticeRef.close();
@ -1210,11 +1203,17 @@ var _default = {
uni.navigateTo({
url: "/pages/shopMallPage/shopType/index?selectIndex=3&pageType="
});
} else {
if (this.poster.SERVERPARTSHOP_ID) {
uni.navigateTo({
url: "/pages/shopMallPage/shopType/index?indexDefaultLeftSelect=".concat(this.poster.SERVERPARTSHOP_ID)
});
} else {
uni.navigateTo({
url: "/pages/shopMallPage/shopType/index"
});
}
}
},
// 回到顶部
handleGoBack: function handleGoBack() {
@ -1541,9 +1540,18 @@ var _default = {
url: "/pages/shopMallPage/shopType/index?selectIndex=3"
});
} else if (obj.index === 1) {
if (this.firstObj1.SERVERPARTSHOP_ID) {
uni.navigateTo({
url: "/pages/shopMallPage/shopType/index?comeForm=index&indexDefaultLeftSelect=".concat(this.firstObj1.SERVERPARTSHOP_ID)
});
} else {
uni.navigateTo({
url: "/pages/shopMallPage/shopType/index?comeForm=index"
});
}
// uni.navigateTo({
// url: `/pages/shopMallPage/shopType/index?comeForm=index`,
// });
} else {
uni.navigateTo({
url: "/pages/highwayHeadlines/attractInvestment"

66
unpackage/dist/dev/mp-weixin/pages/shopMallPage/index/index.js vendored
View File

@ -639,11 +639,8 @@ var _default = {
switch (_context2.prev = _context2.next) {
case 0:
// 初始化骨架屏控制
_this2.skeletonControl = (0, _skeletonManager.useSkeletonControl)('/pages/shopMallPage/index/index', '');
console.log("query", query);
console.log("user", _this2.user);
_this2.skeletonControl = (0, _skeletonManager.useSkeletonControl)("/pages/shopMallPage/index/index", "");
_this2.menu = uni.getMenuButtonBoundingClientRect();
// this.pageType = query.pageType;
// 判断这个用户是不是第一次进入到商城
@ -703,14 +700,15 @@ var _default = {
// uni.showLoading({
// title: "加载中"
// })
// 拿到顶部商品大类的方法
_context2.next = 9;
return _this2.handleGetShopBigType();
case 9:
// 拿到每周优惠的内容
_this2.handleGetEveryWeekShop();
// 拿到模块商品的数据
_this2.handleGetModalProducetShop();
// 拿到顶部商品大类的方法
_context2.next = 13;
return _this2.handleGetShopBigType();
case 13:
// 拿到特价优惠的
_this2.handleGetSpecialOffers();
// 拿到今日推荐的商品列表
@ -750,7 +748,7 @@ var _default = {
_this2.showContent = true;
_this2.isFirstLoad = false;
}
case 18:
case 16:
case "end":
return _context2.stop();
}
@ -855,7 +853,7 @@ var _default = {
this.selectShopSort = type;
},
handleShowModalActivityImg: function handleShowModalActivityImg(e) {
console.log('eee', e);
console.log("eee", e);
this.showModalActivityImg = true;
},
handleHideExportFun: function handleHideExportFun() {
@ -871,7 +869,7 @@ var _default = {
// this.showExportObj = e.detail
},
handleFocus: function handleFocus(e) {
console.log('eee', e);
console.log("eee", e);
// 安卓 / iOS 可能不一样，可以用 e.detail.height 获取键盘高度
this.popupBottom = 200; // 默认抬高
},
@ -929,7 +927,7 @@ var _default = {
break;
}
data1 = newShowList;
_this4.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', {
_this4.$api.$javaGet("/third-party/getWeChatGetMallGoodsInfo", {
action_type: "WeChat_GetMallGoodsInfo",
ownerUnitId: 911,
COMMODITYNATURE: 5070,
@ -946,7 +944,7 @@ var _default = {
break;
case 8:
_context3.next = 10;
return _this4.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', {
return _this4.$api.$javaGet("/third-party/getWeChatGetMallGoodsInfo", {
action_type: "WeChat_GetMallGoodsInfo",
ownerUnitId: 911,
COMMODITYNATURE: 5070,
@ -967,7 +965,7 @@ var _default = {
break;
}
data2 = hotShopList;
_this4.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', {
_this4.$api.$javaGet("/third-party/getWeChatGetMallGoodsInfo", {
action_type: "WeChat_GetMallGoodsInfo",
ownerUnitId: 911,
COMMODITYNATURE: 5070,
@ -985,7 +983,7 @@ var _default = {
break;
case 19:
_context3.next = 21;
return _this4.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', {
return _this4.$api.$javaGet("/third-party/getWeChatGetMallGoodsInfo", {
action_type: "WeChat_GetMallGoodsInfo",
ownerUnitId: 911,
COMMODITYNATURE: 5070,
@ -1007,7 +1005,7 @@ var _default = {
break;
}
data3 = goodShopList;
_this4.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', {
_this4.$api.$javaGet("/third-party/getWeChatGetMallGoodsInfo", {
action_type: "WeChat_GetMallGoodsInfo",
ownerUnitId: 911,
COMMODITYNATURE: 5070,
@ -1024,7 +1022,7 @@ var _default = {
break;
case 30:
_context3.next = 32;
return _this4.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', {
return _this4.$api.$javaGet("/third-party/getWeChatGetMallGoodsInfo", {
action_type: "WeChat_GetMallGoodsInfo",
ownerUnitId: 911,
COMMODITYNATURE: 5070,
@ -1141,7 +1139,7 @@ var _default = {
// 写死
// sortStr: `${this.sortTypeList[this.sortType]} ${new Date().getTime % 2 > 0 ? "" : "desc"
// }`, // 排序
sortStr: "".concat(_this5.selectShopSort === 0 ? 'COMMODITY_INDEX,COMMODITY_EN,COMMODITY_MEMBERPRICE,OPERATE_DATE' : _this5.selectShopSort === 1 ? 'COMMODITY_MEMBERPRICE' : _this5.selectShopSort === 2 ? 'COMMODITY_EN' : _this5.selectShopSort === 3 ? 'OPERATE_DATE' : '', " ").concat(_this5.selectSortType === 0 ? 'asc' : 'desc')
sortStr: "".concat(_this5.selectShopSort === 0 ? "COMMODITY_INDEX,COMMODITY_EN,COMMODITY_MEMBERPRICE,OPERATE_DATE" : _this5.selectShopSort === 1 ? "COMMODITY_MEMBERPRICE" : _this5.selectShopSort === 2 ? "COMMODITY_EN" : _this5.selectShopSort === 3 ? "OPERATE_DATE" : "", " ").concat(_this5.selectSortType === 0 ? "asc" : "desc")
});
case 3:
data = _context4.sent;
@ -1287,13 +1285,13 @@ var _default = {
case 0:
_this = _this8;
typeList = [];
getWeChatGetMallGoodsType = uni.getStorageSync('getWeChatGetMallGoodsType');
getWeChatGetMallGoodsType = uni.getStorageSync("getWeChatGetMallGoodsType");
if (!getWeChatGetMallGoodsType) {
_context7.next = 8;
break;
}
typeList = getWeChatGetMallGoodsType;
_this8.$api.$javaGet('/third-party/getWeChatGetMallGoodsType', {
_this8.$api.$javaGet("/third-party/getWeChatGetMallGoodsType", {
ownerUnitId: 911,
commodityNature: 5070 // 类型
}).then(function (data) {
@ -1307,7 +1305,7 @@ var _default = {
break;
case 8:
_context7.next = 10;
return _this8.$api.$javaGet('/third-party/getWeChatGetMallGoodsType', {
return _this8.$api.$javaGet("/third-party/getWeChatGetMallGoodsType", {
ownerUnitId: 911,
commodityNature: 5070 // 类型
});
@ -1317,7 +1315,7 @@ var _default = {
typeList = data.Data.List;
uni.setStorageSync("getWeChatGetMallGoodsType", typeList);
case 14:
console.log('typeList', typeList);
console.log("typeList", typeList);
_this8.handleShowPageShopBigType(typeList);
case 16:
case "end":
@ -1362,7 +1360,7 @@ var _default = {
switch (_context8.prev = _context8.next) {
case 0:
_context8.next = 2;
return _this10.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfoExclude',
return _this10.$api.$javaGet("/third-party/getWeChatGetMallGoodsInfoExclude",
// url,
{
ownerUnitId: 911,
@ -1417,7 +1415,7 @@ var _default = {
break;
}
list = getWeChatGetMallGoodsInfoExclude;
url = '/third-party/getWeChatGetMallGoodsInfoExclude';
url = "/third-party/getWeChatGetMallGoodsInfoExclude";
_this11.$api.$javaGet(url, {
ownerUnitId: 911,
// COMMODITYNATURE: 5030,//特价优惠
@ -1439,7 +1437,7 @@ var _default = {
_context9.next = 14;
break;
case 9:
_url = '/third-party/getWeChatGetMallGoodsInfoExclude';
_url = "/third-party/getWeChatGetMallGoodsInfoExclude";
_context9.next = 12;
return _this11.$api.$javaGet(
// '/third-party/getExcludeWeChatGetMallGoodsInfo',
@ -1516,7 +1514,7 @@ var _default = {
break;
}
list = getWeChatGetMallGoodsInfo;
_this12.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', {
_this12.$api.$javaGet("/third-party/getWeChatGetMallGoodsInfo", {
ownerUnitId: 911,
userdefinedtypeId: 4597,
userdefinedTypeId: 4597,
@ -1532,7 +1530,7 @@ var _default = {
break;
case 8:
_context10.next = 10;
return _this12.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', {
return _this12.$api.$javaGet("/third-party/getWeChatGetMallGoodsInfo", {
ownerUnitId: 911,
userdefinedtypeId: 4597,
userdefinedTypeId: 4597,
@ -1569,7 +1567,7 @@ var _default = {
break;
}
list = moduleActivity;
_this13.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', {
_this13.$api.$javaGet("/third-party/getWeChatGetMallGoodsInfo", {
ownerUnitId: 911,
userdefinedtypeId: 4797,
userdefinedTypeId: 4797,
@ -1585,7 +1583,7 @@ var _default = {
break;
case 8:
_context11.next = 10;
return _this13.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', {
return _this13.$api.$javaGet("/third-party/getWeChatGetMallGoodsInfo", {
ownerUnitId: 911,
userdefinedtypeId: 4797,
userdefinedTypeId: 4797,
@ -1629,7 +1627,7 @@ var _default = {
}
});
}
console.log('weeklySpecialOfferweeklySpecialOfferweeklySpecialOfferweeklySpecialOffer', shopList);
console.log("weeklySpecialOfferweeklySpecialOfferweeklySpecialOfferweeklySpecialOffer", shopList);
this.weeklySpecialOffer = shopList;
},
// 模块商品显示数据的方法
@ -1675,7 +1673,7 @@ var _default = {
break;
}
list = getWeChatGetMallGoodsInfoExcludeToday;
_this14.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfoExclude', {
_this14.$api.$javaGet("/third-party/getWeChatGetMallGoodsInfoExclude", {
ownerUnitId: 911,
// COMMODITYNATURE: 4598,// 原今日推荐
COMMODITYNATURE: 5022,
@ -1697,7 +1695,7 @@ var _default = {
break;
case 8:
_context12.next = 10;
return _this14.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfoExclude', {
return _this14.$api.$javaGet("/third-party/getWeChatGetMallGoodsInfoExclude", {
ownerUnitId: 911,
// COMMODITYNATURE: 4598,// 原今日推荐
COMMODITYNATURE: 5022,
@ -1785,7 +1783,7 @@ var _default = {
title: "加载中"
});
_context13.next = 3;
return _this15.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', {
return _this15.$api.$javaGet("/third-party/getWeChatGetMallGoodsInfo", {
ownerUnitId: 911,
justCommodity: 1,
payMethod: "2000,3000",
@ -1794,7 +1792,7 @@ var _default = {
case 3:
data = _context13.sent;
list = data.Data.List;
console.log('积分商城', list);
console.log("积分商城", list);
resList = [];
thisResList = [];
if (_this15.shopMsg.pageIndex > 1) {

79
unpackage/dist/dev/mp-weixin/pages/shopMallPage/shopType/index.js vendored
View File

@ -324,7 +324,8 @@ var _default = {
label: "由高到低",
value: 2
}],
selectSortType: 1
selectSortType: 1,
indexDefaultLeftSelect: -1
};
},
watch: {
@ -374,6 +375,7 @@ var _default = {
return this.rightShopList.length * this.itemHeight;
}
}),
// 若有一天这个页面改版的话 去看看出行平台的 首页广告页面 跳转路径 是否还能生效
onLoad: function onLoad(query) {
var _this2 = this;
// 初始化骨架屏控制
@ -391,7 +393,7 @@ var _default = {
this.pageType = query.pageType;
}
if (query.leftId) {
this.leftId = query.leftId;
this.leftId = Number(query.leftId);
}
if (query.comeForm) {
this.comeForm = query.comeForm;
@ -399,6 +401,11 @@ var _default = {
this.comeService = query.comeService;
}
}
// 首页跳转默认把左边选择起来的 字段
if (query.indexDefaultLeftSelect) {
this.indexDefaultLeftSelect = Number(query.indexDefaultLeftSelect);
}
var shopCarList = [];
if (this.pageType === "UnionMall") {
shopCarList = this.$store.state.unionMyShopCar;
@ -851,10 +858,9 @@ var _default = {
}
});
}
console.log("resListresListresList", resList);
_this6.shopTypeList = resList;
_this6.handleGetAllShopItem(resList[_this6.activeTabs].UserdefinedType_Id);
case 10:
case 9:
case "end":
return _context3.stop();
}
@ -1016,6 +1022,35 @@ var _default = {
}
}, _callee5);
}))();
}), (0, _defineProperty2.default)(_methods, "findRootIndexByUserdefinedTypeId", function findRootIndexByUserdefinedTypeId(treeList, targetId) {
if (!Array.isArray(treeList) || treeList.length === 0) {
return -1;
}
// 深度优先遍历
function dfs(node) {
if (!node) return false;
if (node.UserdefinedType_Id === targetId) {
return true;
}
var children = node.UserdefinedTypeList;
if (Array.isArray(children) && children.length > 0) {
for (var i = 0; i < children.length; i++) {
if (dfs(children[i])) {
return true;
}
}
}
return false;
}
// 只遍历第一层（最大层级）
for (var index = 0; index < treeList.length; index++) {
if (dfs(treeList[index])) {
return index;
}
}
return -1;
}), (0, _defineProperty2.default)(_methods, "handleGetShopTypeShowData", function handleGetShopTypeShowData(typeList) {
var resList = [];
var indexOfList = [3186, 3175, 4597, 4797];
@ -1027,6 +1062,12 @@ var _default = {
});
}
this.shopTypeList = resList;
console.log("this.shopTypeListthis.shopTypeList", JSON.parse(JSON.stringify(this.shopTypeList)));
if (this.indexDefaultLeftSelect !== -1) {
var bigTab = this.findRootIndexByUserdefinedTypeId(resList, Number(this.indexDefaultLeftSelect));
console.log("bigTabbigTabbigTab", bigTab);
this.activeTabs = Number(bigTab) === -1 ? this.activeTabs : Number(bigTab);
}
if (this.activeTabs === 999999) {
this.handleGoPointsMall();
} else {
@ -1087,8 +1128,6 @@ var _default = {
// )
// uni.hideLoading()
list = data.Data.List;
console.log("ididid", id);
console.log("listlistlistlist", JSON.parse(JSON.stringify(list)));
thisAllType = [];
if (_this9.shopTypeList && _this9.shopTypeList.length > 0) {
_this9.shopTypeList.forEach(function (item) {
@ -1097,10 +1136,7 @@ var _default = {
}
});
}
haveAll = false;
console.log("thisAllTypethisAllType", JSON.parse(JSON.stringify(thisAllType)));
// 添加一个子类的全部
haveAll = false; // 添加一个子类的全部
list.unshift({
UserdefinedType_Name: "全部",
UserdefinedType_Id: -1
@ -1119,8 +1155,6 @@ var _default = {
UserdefinedType_Id: -1
});
}
console.log("thisAllTypethisAllTypethisAllType", JSON.parse(JSON.stringify(thisAllType)));
console.log("this.leftIdthis.leftIdthis.leftId", JSON.parse(JSON.stringify(_this9.leftId)));
leftIndex = -1; // if (this.pageType === "UnionMall" && this.leftId) {
// if (thisAllType && thisAllType.length > 0) {
// thisAllType.forEach((item, index) => {
@ -1143,10 +1177,19 @@ var _default = {
if (leftIndex === -1) {
leftIndex = _this9.leftSelectIndex;
}
console.log("indexDefaultLeftSelectindexDefaultLeftSelectindexDefaultLeftSelect", _this9.indexDefaultLeftSelect);
if (_this9.indexDefaultLeftSelect !== -1) {
if (thisAllType && thisAllType.length > 0) {
thisAllType.forEach(function (item, index) {
if (item.UserdefinedType_Id === Number(_this9.indexDefaultLeftSelect)) {
leftIndex = index;
}
});
}
}
// 当前选中的商品列表
shopList = [];
console.log("listlistlistlistlist", JSON.parse(JSON.stringify(list)));
if (list && list.length > 0) {
// 这一大类的全部商品
thisTypeAllShop = []; // 当前的全部商品id
@ -1164,12 +1207,7 @@ var _default = {
}
}
});
console.log("thisTypeAllShopthisTypeAllShop", JSON.parse(JSON.stringify(thisTypeAllShop)));
console.log("allShopIDallShopIDallShopIDallShopID", JSON.parse(JSON.stringify(allShopID)));
list[0].COMMODITYLIST = thisTypeAllShop;
console.log("listlistlistlistlistlist", JSON.parse(JSON.stringify(list)));
console.log("leftIndexleftIndexleftIndex", JSON.parse(JSON.stringify(leftIndex)));
console.log("this.leftIdthis.leftIdthis.leftIdthis.leftId", JSON.parse(JSON.stringify(_this9.leftId)));
if (leftIndex !== -1 && list[leftIndex] && list[leftIndex].COMMODITYLIST && list[leftIndex].COMMODITYLIST.length > 0) {
if (_this9.pageType === "UnionMall" && _this9.leftId) {
if (_this9.leftId) {
@ -1192,7 +1230,6 @@ var _default = {
shopList = list[leftIndex].COMMODITYLIST;
}
}
console.log("222222", JSON.parse(JSON.stringify(shopList)));
if (shopList && shopList.length > 0) {
shopList.forEach(function (item) {
// 判断当前的购物车里面 是不是已经有数据了 有数据的话 把原本的商品数量赋值进去
@ -1265,7 +1302,6 @@ var _default = {
}
newList[0].COMMODITYLIST = allShopList;
_this9.leftTypeList = newList;
console.log("shopListshopListshopList", JSON.parse(JSON.stringify(shopList)));
_this9.leftSelectIndex = leftIndex;
_this9.rightShopList = shopList;
_this9.visibleList = shopList.slice(0, _this9.visibleCount + _this9.buffer * 2);
@ -1277,7 +1313,7 @@ var _default = {
_this9.rightShopList = [];
}
uni.hideLoading();
case 24:
case 20:
case "end":
return _context6.stop();
}
@ -1383,7 +1419,6 @@ var _default = {
this.leftToView = "left_".concat(index, "_") + this.leftTypeList[index].USERDEFINEDTYPE_ID;
this.leftSelectIndex = index;
var shopList = this.leftTypeList[index].COMMODITYLIST;
console.log("shopListshopList", shopList);
if (shopList && shopList.length > 0) {
shopList.forEach(function (item) {
// 判断当前的购物车里面 是不是已经有数据了 有数据的话 把原本的商品数量赋值进去

40
unpackage/dist/dev/mp-weixin/pages/user/index.js vendored
View File

@ -293,12 +293,11 @@ var _default = {
// this.cards = userData.LicencePlate && userData.LicencePlate.List && userData.LicencePlate.List.length > 0 ? userData.LicencePlate.List[0].License_Plate : ""
}
// 拿用户信息
_this2.handleGetUserDetail();
_context2.next = 11;
return _this2.handleGetUserDetail();
case 11:
// let shopOrderStatus = uni.getStorageSync('shopOrderStatus')
// if (!shopOrderStatus) {
// 拿到订单信息
_this2.handleGetOrderDetail();
// }
// 请求一下云南那边的积分信息
@ -321,7 +320,7 @@ var _default = {
break;
}
_context.next = 3;
return _this2.skeletonControl.showContentAfterLoading(0);
return _this2.skeletonControl.showContentAfterLoading(10);
case 3:
_this2.showContent = true;
_this2.isFirstLoad = false;
@ -331,12 +330,16 @@ var _default = {
}
}
}, _callee);
})), 200);
})), 20);
} else {
// 非首次访问直接显示内容
_this2.showContent = true;
_this2.isFirstLoad = false;
}
// 拿到订单信息
// this.handleGetOrderDetail();
_this2.$utils.addUserBehaviorNew({
behaviorRecordDesc: "进入了我的页面"
});
@ -488,14 +491,11 @@ var _default = {
// this.cards = userData.LicencePlate.List && userData.LicencePlate.List.length > 0 ? userData.LicencePlate.List[0].License_Plate : ""
_this3.$forceUpdate();
}
_context3.next = 25;
return _this3.handleGetOrderDetail();
case 25:
_context3.next = 27;
return _this3.handleGetUserDetail();
case 27:
_this3.handleGetOrderDetail();
// 拿用户信息
_this3.handleGetUserDetail();
_this3.$forceUpdate();
case 28:
case 26:
case "end":
return _context3.stop();
}
@ -1103,19 +1103,22 @@ var _default = {
handleGetUserDetail: function handleGetUserDetail() {
var _this9 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10() {
var _this;
var _this, data, _data;
return _regenerator.default.wrap(function _callee10$(_context10) {
while (1) {
switch (_context10.prev = _context10.next) {
case 0:
_this = _this9;
_this.$api.getCoop({
_context10.next = 3;
return _this.$api.getCoop({
action_type: "GetMembershipInfo",
WechatUserId: _this.user.WechatUserId,
noLoading: true
}).then(function (data) {
});
case 3:
data = _context10.sent;
if (data.ResultCode === "100") {
var _data = data;
_data = data;
_this.userInfo = _data.Data;
_this.user.MEMBERSHIP_ID = _data.Data.MEMBERSHIP_ID || "";
_this.user.MEMBERSHIP_NAME = _data.Data.MEMBERSHIP_NAME || "";
@ -1141,8 +1144,7 @@ var _default = {
// _this.setUser({});
_this.$store.commit("setUser", user);
}
});
case 2:
case 5:
case "end":
return _context10.stop();
}