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-15 18:29:16 +08:00
parent 09c5731597
commit 228e6fc157
12 changed files with 1143 additions and 835 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

885
pages/index/index.vue
View File

File diff suppressed because it is too large Load Diff

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

@ -681,7 +681,6 @@ export default {
let height = uni.getStorageSync("safeHeight"); let height = uni.getStorageSync("safeHeight");
this.safeHeight = Number(height); this.safeHeight = Number(height);
console.log("queryqueryquery", query);
if (query.selectIndex) { if (query.selectIndex) {
this.activeTabs = Number(query.selectIndex); this.activeTabs = Number(query.selectIndex);
@ -727,7 +726,7 @@ export default {
this.showContent = true; this.showContent = true;
this.isFirstLoad = false; this.isFirstLoad = false;
} }
}, 800); }, 200);
} else { } else {
// 非首次访问直接显示内容 // 非首次访问直接显示内容
this.showContent = true; this.showContent = true;

663
pages/user/index.vue
View File

File diff suppressed because it is too large Load Diff

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/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

@ -473,13 +473,13 @@ var _default = {
onLoad: function onLoad(options) { onLoad: function onLoad(options) {
var _this2 = this; var _this2 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() { return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
var systemInfo, height, currentService, seatInfo, res, _this3, funList, newFunList, loadPromises; var systemInfo, height, currentService, seatInfo, res, _this3, funList, newFunList;
return _regenerator.default.wrap(function _callee$(_context) { return _regenerator.default.wrap(function _callee$(_context) {
while (1) { while (1) {
switch (_context.prev = _context.next) { switch (_context.prev = _context.next) {
case 0: case 0:
// 初始化骨架屏控制 // 初始化骨架屏控制
_this2.skeletonControl = (0, _skeletonManager.useSkeletonControl)('/pages/index/index', options.pageType); _this2.skeletonControl = (0, _skeletonManager.useSkeletonControl)("/pages/index/index", options.pageType);
_this2.isPageLoading = _this2.skeletonControl.showSkeleton; _this2.isPageLoading = _this2.skeletonControl.showSkeleton;
// if (!this.user.MEMBERSHIP_ID) { // if (!this.user.MEMBERSHIP_ID) {
@ -546,30 +546,26 @@ var _default = {
return _this2.handleGetAdvertisementData(); return _this2.handleGetAdvertisementData();
case 13: case 13:
// 并行加载所有数据 // 并行加载所有数据
loadPromises = [_this2.handleGetHighwayHeadlines() // 高速头条播报 // const loadPromises = [
];
// ];
_this2.handleGetHighwayHeadlines(); // 高速头条播报
_this2.handleGetSpecialOffers(); // 促销单品 _this2.handleGetSpecialOffers(); // 促销单品
_this2.handleGetProductsList(); // 甄选商品 _this2.handleGetProductsList(); // 甄选商品
_this2.handleGetShoppingMall(); // 商城的内容 _this2.handleGetShoppingMall(); // 商城的内容
_this2.handleGetShopMallData(); _this2.handleGetShopMallData();
if (_this2.seat.latitude && _this2.seat.longitude) { if (_this2.seat.latitude && _this2.seat.longitude) {
// 景区信息 // 景区信息
loadPromises.push(_this2.handleGetScenicData()); _this2.handleGetScenicData();
} }
// 等待所有数据加载完成 // 等待所有数据加载完成
_context.prev = 19; // try {
_context.next = 22; // await Promise.all(loadPromises);
return Promise.all(loadPromises); // } catch (error) {
case 22: // console.error("数据加载失败:", error);
_context.next = 27; // }
break;
case 24:
_context.prev = 24;
_context.t0 = _context["catch"](19);
console.error('数据加载失败:', _context.t0);
case 27:
// this.handleAes() // this.handleAes()
_this2.$utils.addUserBehaviorNew({ _this2.$utils.addUserBehaviorNew({
behaviorRecordDesc: "进入了首页" behaviorRecordDesc: "进入了首页"
@ -577,19 +573,19 @@ var _default = {
// 所有数据加载完成，隐藏骨架屏 // 所有数据加载完成，隐藏骨架屏
if (!(_this2.skeletonControl && _this2.skeletonControl.showSkeleton)) { if (!(_this2.skeletonControl && _this2.skeletonControl.showSkeleton)) {
_context.next = 34; _context.next = 26;
break; break;
} }
_context.next = 31; _context.next = 23;
return _this2.skeletonControl.showContentAfterLoading(500); return _this2.skeletonControl.showContentAfterLoading(200);
case 31: case 23:
_this2.isPageLoading = false; _this2.isPageLoading = false;
_context.next = 35; _context.next = 27;
break; break;
case 34: case 26:
// 非首次访问直接显示内容 // 非首次访问直接显示内容
_this2.isPageLoading = false; _this2.isPageLoading = false;
case 35: case 27:
// 骨架屏结束后显示广告弹窗 // 骨架屏结束后显示广告弹窗
_this2.$nextTick(function () { _this2.$nextTick(function () {
// 稍微延迟一下让页面渲染完成 // 稍微延迟一下让页面渲染完成
@ -607,12 +603,12 @@ var _default = {
} }
}, 300); }, 300);
}); });
case 36: case 28:
case "end": case "end":
return _context.stop(); return _context.stop();
} }
} }
}, _callee, null, [[19, 24]]); }, _callee);
}))(); }))();
}, },
onShow: function onShow() { onShow: function onShow() {
@ -762,7 +758,7 @@ var _default = {
case 6: case 6:
_context3.next = 8; _context3.next = 8;
return _this6.$api.$get("/EShangApiMain/FrameWork/GetFieldEnumTree", { return _this6.$api.$get("/EShangApiMain/FrameWork/GetFieldEnumTree", {
FieldExplainField: 'SCENICAREA_TYPE' FieldExplainField: "SCENICAREA_TYPE"
}); });
case 8: case 8:
field = _context3.sent; field = _context3.sent;
@ -780,13 +776,13 @@ var _default = {
latitude: latitude || _this6.seat.latitude || "", latitude: latitude || _this6.seat.latitude || "",
longitude: longitude || _this6.seat.longitude || "", longitude: longitude || _this6.seat.longitude || "",
ServerpartID: _this6.serviceDetail.SERVERPART_ID || "", ServerpartID: _this6.serviceDetail.SERVERPART_ID || "",
type: 'encryption' type: "encryption"
}; };
_context3.next = 16; _context3.next = 16;
return _this6.$api.$zzyLocalPost("/WisdomServerpart/GetScenicAreaListByLocation", req); return _this6.$api.$zzyLocalPost("/WisdomServerpart/GetScenicAreaListByLocation", req);
case 16: case 16:
data = _context3.sent; data = _context3.sent;
console.log('景区数据 ', data); console.log("景区数据 ", data);
list = data.Result_Data.List; list = data.Result_Data.List;
res = []; res = [];
if (list && list.length > 0) { if (list && list.length > 0) {
@ -829,7 +825,7 @@ var _default = {
return; return;
} }
uni.navigateTo({ uni.navigateTo({
url: '/pages/scenicList/scenicList' url: "/pages/scenicList/scenicList"
}); });
}, },
// 拿到广告数据 // 拿到广告数据
@ -848,7 +844,7 @@ var _default = {
USERDEFINEDTYPE_STATE: 1 USERDEFINEDTYPE_STATE: 1
}, },
SortStr: "OPERATE_DATE desc", SortStr: "OPERATE_DATE desc",
type: 'encryption' type: "encryption"
}; };
_context4.next = 3; _context4.next = 3;
return _this8.$api.$zzyLocalPost("/MallBasic/GetUSERDEFINEDTYPEList", req); return _this8.$api.$zzyLocalPost("/MallBasic/GetUSERDEFINEDTYPEList", req);
@ -861,14 +857,14 @@ var _default = {
USERDEFINEDTYPE_STATE: 1 USERDEFINEDTYPE_STATE: 1
}, },
SortStr: "OPERATE_DATE desc", SortStr: "OPERATE_DATE desc",
type: 'encryption' type: "encryption"
}; };
_context4.next = 7; _context4.next = 7;
return _this8.$api.$zzyLocalPost("/MallBasic/GetUSERDEFINEDTYPEList", req2); return _this8.$api.$zzyLocalPost("/MallBasic/GetUSERDEFINEDTYPEList", req2);
case 7: case 7:
data2 = _context4.sent; data2 = _context4.sent;
console.log('datadatadatadatadatadatadatadatadata', data1); console.log("datadatadatadatadatadatadatadatadata", data1);
console.log('datadatadatadatadatadatadatadatadata', data2); console.log("datadatadatadatadatadatadatadatadata", data2);
res1 = data1.Result_Data.List; res1 = data1.Result_Data.List;
res2 = data2.Result_Data.List; // 修改一下 使用的是 当前时间在的范围内的第一个 res2 = data2.Result_Data.List; // 修改一下 使用的是 当前时间在的范围内的第一个
firstObj1 = {}; firstObj1 = {};
@ -922,7 +918,7 @@ var _default = {
// this.swiperList.unshift(firstObj1.USERDEFINEDTYPE_ICO) // this.swiperList.unshift(firstObj1.USERDEFINEDTYPE_ICO)
_this8.swiperList.splice(1, 0, firstObj1.USERDEFINEDTYPE_ICO); _this8.swiperList.splice(1, 0, firstObj1.USERDEFINEDTYPE_ICO);
} }
console.log('firstObj2firstObj2firstObj2', firstObj2); console.log("firstObj2firstObj2firstObj2", firstObj2);
_this8.poster = firstObj2; _this8.poster = firstObj2;
// this.swiperList.unshift(res1[0].USERDEFINEDTYPE_ICO) // this.swiperList.unshift(res1[0].USERDEFINEDTYPE_ICO)
@ -947,7 +943,7 @@ var _default = {
req = { req = {
waybillNo: "434491081179331", waybillNo: "434491081179331",
mobile: "15558136957", mobile: "15558136957",
type: 'encryption' type: "encryption"
}; };
str = JSON.stringify(req); // let jiami = encryptAES(str) str = JSON.stringify(req); // let jiami = encryptAES(str)
// let jiemi = decryptAES(jiami) // let jiemi = decryptAES(jiami)
@ -1016,15 +1012,15 @@ var _default = {
return _this10.handleGetNewPosition(); return _this10.handleGetNewPosition();
case 4: case 4:
seatInfo = _context7.sent; seatInfo = _context7.sent;
console.log('seatInfoseatInfoseatInfo', seatInfo); console.log("seatInfoseatInfoseatInfo", seatInfo);
// 拿到旧的经纬度 // 拿到旧的经纬度
oldSeatInfo = uni.getStorageSync('seatInfo'); oldSeatInfo = uni.getStorageSync("seatInfo");
if (oldSeatInfo) { if (oldSeatInfo) {
oldSeatInfo = JSON.parse(oldSeatInfo); oldSeatInfo = JSON.parse(oldSeatInfo);
} }
// 两次经纬度的相距距离 // 两次经纬度的相距距离
distance = (0, _publicMethods.getDistanceBetweenCoordinates)(seatInfo, oldSeatInfo); distance = (0, _publicMethods.getDistanceBetweenCoordinates)(seatInfo, oldSeatInfo);
console.log('distancedistancedistancedistance', distance); console.log("distancedistancedistancedistance", distance);
if (!(distance < 10)) { if (!(distance < 10)) {
_context7.next = 16; _context7.next = 16;
break; break;
@ -1064,7 +1060,7 @@ var _default = {
return _this10.handleGetNearService(seatInfo.longitude, seatInfo.latitude); return _this10.handleGetNearService(seatInfo.longitude, seatInfo.latitude);
case 20: case 20:
objInfo = _context7.sent; objInfo = _context7.sent;
console.log('objInfo', objInfo); console.log("objInfo", objInfo);
_obj = _this10.handleMergeDetail(objInfo); _obj = _this10.handleMergeDetail(objInfo);
_newObj = _objectSpread(_objectSpread({}, objInfo), {}, { _newObj = _objectSpread(_objectSpread({}, objInfo), {}, {
sumDetail: _obj, sumDetail: _obj,
@ -1250,7 +1246,7 @@ var _default = {
method: "POST", method: "POST",
success: function success(res) { success: function success(res) {
var list = res.data; var list = res.data;
console.log('充电', res); console.log("充电", res);
var result = []; var result = [];
if (list && list.length > 0) { if (list && list.length > 0) {
list.forEach(function (item) { list.forEach(function (item) {
@ -1822,15 +1818,15 @@ var _default = {
// req // req
// ); // );
_context10.next = 4; _context10.next = 4;
return _this17.$api.$javaGet('/third-party/getServerPartList', req); return _this17.$api.$javaGet("/third-party/getServerPartList", req);
case 4: case 4:
data = _context10.sent; data = _context10.sent;
_this17.serverPartList = data.Result_Data.List; _this17.serverPartList = data.Result_Data.List;
console.log('this.serverPartListthis.serverPartListthis.serverPartList2312', _this17.serverPartList); console.log("this.serverPartListthis.serverPartListthis.serverPartList2312", _this17.serverPartList);
uni.setStorageSync("serverPartList", JSON.stringify(_this17.serverPartList)); uni.setStorageSync("serverPartList", JSON.stringify(_this17.serverPartList));
nearService = _this17.serverPartList[0]; nearService = _this17.serverPartList[0];
uni.setStorageSync("nearService", nearService); uni.setStorageSync("nearService", nearService);
console.log('nearServicenearServicenearService', nearService); console.log("nearServicenearServicenearService", nearService);
nearService.sumDetail = _this17.handleMergeDetail(nearService); nearService.sumDetail = _this17.handleMergeDetail(nearService);
newObj = _objectSpread(_objectSpread({}, nearService), {}, { newObj = _objectSpread(_objectSpread({}, nearService), {}, {
sumDetail: nearService.sumDetail, sumDetail: nearService.sumDetail,
@ -2095,22 +2091,22 @@ var _default = {
uni.setStorageSync("isPaddingShopData", true); uni.setStorageSync("isPaddingShopData", true);
// 拿到顶部商品大类的方法 // 拿到顶部商品大类的方法
this.$api.$javaGet('/third-party/getWeChatGetMallGoodsType', { this.$api.$javaGet("/third-party/getWeChatGetMallGoodsType", {
ownerUnitId: 911, ownerUnitId: 911,
commodityNature: 5070 // 类型 commodityNature: 5070 // 类型
}).then(function (data) { }).then(function (data) {
console.log('拿到顶部商品大类的方法', data); console.log("拿到顶部商品大类的方法", data);
uni.setStorageSync("getWeChatGetMallGoodsType", data.Data.List); uni.setStorageSync("getWeChatGetMallGoodsType", data.Data.List);
}); });
// 拿到每周特惠的内容 // 拿到每周特惠的内容
this.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', { this.$api.$javaGet("/third-party/getWeChatGetMallGoodsInfo", {
ownerUnitId: 911, ownerUnitId: 911,
userdefinedtypeId: 4597, userdefinedtypeId: 4597,
userdefinedTypeId: 4597, userdefinedTypeId: 4597,
justCommodity: 1 justCommodity: 1
}).then(function (data) { }).then(function (data) {
console.log('拿到每周特惠的内容', data); console.log("拿到每周特惠的内容", data);
uni.setStorageSync("getWeChatGetMallGoodsInfo", data.Data.List); uni.setStorageSync("getWeChatGetMallGoodsInfo", data.Data.List);
var list = data.Data.List; var list = data.Data.List;
var res = []; var res = [];
@ -2138,13 +2134,13 @@ var _default = {
}); });
// 拿模块活动的商品 // 拿模块活动的商品
this.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', { this.$api.$javaGet("/third-party/getWeChatGetMallGoodsInfo", {
ownerUnitId: 911, ownerUnitId: 911,
userdefinedtypeId: 4797, userdefinedtypeId: 4797,
userdefinedTypeId: 4797, userdefinedTypeId: 4797,
justCommodity: 1 justCommodity: 1
}).then(function (data) { }).then(function (data) {
console.log('拿到模块活动的内容', data); console.log("拿到模块活动的内容", data);
uni.setStorageSync("moduleActivity", data.Data.List); uni.setStorageSync("moduleActivity", data.Data.List);
var list = data.Data.List; var list = data.Data.List;
var res = []; var res = [];
@ -2167,14 +2163,14 @@ var _default = {
} }
}); });
} }
console.log('moduleActivitymoduleActivitymoduleActivitymoduleActivity', JSON.parse(JSON.stringify(res2))); console.log("moduleActivitymoduleActivitymoduleActivitymoduleActivity", JSON.parse(JSON.stringify(res2)));
// this.everyWeekShopData = res // this.everyWeekShopData = res
_this24.marketingCampaign = res2; _this24.marketingCampaign = res2;
}); });
// 拿到特价优惠的内容 // 拿到特价优惠的内容
this.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfoExclude', { this.$api.$javaGet("/third-party/getWeChatGetMallGoodsInfoExclude", {
ownerUnitId: 911, ownerUnitId: 911,
// COMMODITYNATURE: 5030,//特价优惠 // COMMODITYNATURE: 5030,//特价优惠
COMMODITYNATURE: 5021, COMMODITYNATURE: 5021,
@ -2186,12 +2182,12 @@ var _default = {
excludeNature: 5070, excludeNature: 5070,
justCommodity: 1 justCommodity: 1
}).then(function (data) { }).then(function (data) {
console.log('拿到特价优惠的内容', data); console.log("拿到特价优惠的内容", data);
uni.setStorageSync("getWeChatGetMallGoodsInfoExclude", data.Data.List); uni.setStorageSync("getWeChatGetMallGoodsInfoExclude", data.Data.List);
}); });
// 拿到今日推荐的商品列表 // 拿到今日推荐的商品列表
this.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfoExclude', { this.$api.$javaGet("/third-party/getWeChatGetMallGoodsInfoExclude", {
ownerUnitId: 911, ownerUnitId: 911,
// COMMODITYNATURE: 4598,// 原今日推荐 // COMMODITYNATURE: 4598,// 原今日推荐
COMMODITYNATURE: 5022, COMMODITYNATURE: 5022,
@ -2203,13 +2199,13 @@ var _default = {
excludeNature: 5070, excludeNature: 5070,
justCommodity: 1 justCommodity: 1
}).then(function (data) { }).then(function (data) {
console.log('拿到今日推荐的商品列表', data); console.log("拿到今日推荐的商品列表", data);
uni.setStorageSync("getWeChatGetMallGoodsInfoExcludeToday", data.Data.List); uni.setStorageSync("getWeChatGetMallGoodsInfoExcludeToday", data.Data.List);
}); });
// 工会商城的三个榜单的内容 // 工会商城的三个榜单的内容
// 新品榜单 // 新品榜单
this.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', { this.$api.$javaGet("/third-party/getWeChatGetMallGoodsInfo", {
action_type: "WeChat_GetMallGoodsInfo", action_type: "WeChat_GetMallGoodsInfo",
ownerUnitId: 911, ownerUnitId: 911,
COMMODITYNATURE: 5070, COMMODITYNATURE: 5070,
@ -2220,7 +2216,7 @@ var _default = {
uni.setStorageSync("newShowList", data1); uni.setStorageSync("newShowList", data1);
}); });
// 热销榜 // 热销榜
this.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', { this.$api.$javaGet("/third-party/getWeChatGetMallGoodsInfo", {
action_type: "WeChat_GetMallGoodsInfo", action_type: "WeChat_GetMallGoodsInfo",
ownerUnitId: 911, ownerUnitId: 911,
COMMODITYNATURE: 5070, COMMODITYNATURE: 5070,
@ -2233,7 +2229,7 @@ var _default = {
}); });
// 推荐榜 // 推荐榜
this.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', { this.$api.$javaGet("/third-party/getWeChatGetMallGoodsInfo", {
action_type: "WeChat_GetMallGoodsInfo", action_type: "WeChat_GetMallGoodsInfo",
ownerUnitId: 911, ownerUnitId: 911,
COMMODITYNATURE: 5070, COMMODITYNATURE: 5070,
@ -2241,7 +2237,7 @@ var _default = {
justCommodity: 1, justCommodity: 1,
userdefinedTypeId: "1319" userdefinedTypeId: "1319"
}).then(function (data3) { }).then(function (data3) {
console.log('data3data3data3', data3); console.log("data3data3data3", data3);
uni.setStorageSync("goodShopList", data3); uni.setStorageSync("goodShopList", data3);
}); });
} }

2
unpackage/dist/dev/mp-weixin/pages/index/index.wxml vendored
View File

File diff suppressed because one or more lines are too long

12
unpackage/dist/dev/mp-weixin/pages/index/index.wxss vendored
View File

@ -191,7 +191,7 @@
} }
.main .content .funItemList .funItem .no-border-btn.data-v-57280228::after, .main .content .funItemList .funItem .no-border-btn.data-v-57280228::after,
.main .content .funItemList .funItem .no-border-btn.data-v-57280228::before { .main .content .funItemList .funItem .no-border-btn.data-v-57280228::before {
content: '' !important; content: "" !important;
border: 0 !important; border: 0 !important;
box-shadow: none !important; box-shadow: none !important;
display: none !important; display: none !important;
@ -268,7 +268,7 @@
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 400; font-weight: 400;
font-size: 22rpx; font-size: 22rpx;
color: #FF5959; color: #ff5959;
line-height: 32rpx; line-height: 32rpx;
text-align: justify; text-align: justify;
font-style: normal; font-style: normal;
@ -418,7 +418,7 @@
box-sizing: border-box; box-sizing: border-box;
padding: 24rpx 20rpx; padding: 24rpx 20rpx;
margin-top: 18rpx; margin-top: 18rpx;
background: #FFFFFF; background: #ffffff;
border-radius: 16rpx; border-radius: 16rpx;
} }
.main .content .nearbyScenic .nearbyScenicTop.data-v-57280228 { .main .content .nearbyScenic .nearbyScenicTop.data-v-57280228 {
@ -500,7 +500,7 @@
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 400; font-weight: 400;
font-size: 22rpx; font-size: 22rpx;
color: #3D7FFF; color: #3d7fff;
line-height: 32rpx; line-height: 32rpx;
text-align: right; text-align: right;
font-style: normal; font-style: normal;
@ -563,7 +563,7 @@
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 400; font-weight: 400;
font-size: 20rpx; font-size: 20rpx;
color: #F13216; color: #f13216;
line-height: 28rpx; line-height: 28rpx;
text-align: left; text-align: left;
font-style: normal; font-style: normal;
@ -572,7 +572,7 @@
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 600; font-weight: 600;
font-size: 40rpx; font-size: 40rpx;
color: #F13216; color: #f13216;
line-height: 40rpx; line-height: 40rpx;
text-align: right; text-align: right;
font-style: normal; font-style: normal;

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

@ -384,7 +384,6 @@ var _default = {
this.systemInfo = systemInfo; this.systemInfo = systemInfo;
var height = uni.getStorageSync("safeHeight"); var height = uni.getStorageSync("safeHeight");
this.safeHeight = Number(height); this.safeHeight = Number(height);
console.log("queryqueryquery", query);
if (query.selectIndex) { if (query.selectIndex) {
this.activeTabs = Number(query.selectIndex); this.activeTabs = Number(query.selectIndex);
} }
@ -441,7 +440,7 @@ var _default = {
} }
} }
}, _callee); }, _callee);
})), 800); })), 200);
} else { } else {
// 非首次访问直接显示内容 // 非首次访问直接显示内容
this.showContent = true; this.showContent = true;

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

@ -274,7 +274,7 @@ var _default = {
switch (_context2.prev = _context2.next) { switch (_context2.prev = _context2.next) {
case 0: case 0:
// 初始化骨架屏控制 // 初始化骨架屏控制
_this2.skeletonControl = (0, _skeletonManager.useSkeletonControl)('/pages/user/index', options.pageType); _this2.skeletonControl = (0, _skeletonManager.useSkeletonControl)("/pages/user/index", options.pageType);
_this2.showContent = _this2.skeletonControl.showContent; _this2.showContent = _this2.skeletonControl.showContent;
_this2.isFirstLoad = _this2.skeletonControl.showSkeleton; _this2.isFirstLoad = _this2.skeletonControl.showSkeleton;
if (!_this2.user.MEMBERSHIP_ID) { if (!_this2.user.MEMBERSHIP_ID) {
@ -287,18 +287,18 @@ var _default = {
_this2.safeHeight = Number(height); _this2.safeHeight = Number(height);
// 拿到新的缓存数据 // 拿到新的缓存数据
userData = uni.getStorageSync('userData'); userData = uni.getStorageSync("userData");
if (userData) { if (userData) {
_this2.userInfo = userData; _this2.userInfo = userData;
// this.cards = userData.LicencePlate && userData.LicencePlate.List && userData.LicencePlate.List.length > 0 ? userData.LicencePlate.List[0].License_Plate : "" // this.cards = userData.LicencePlate && userData.LicencePlate.List && userData.LicencePlate.List.length > 0 ? userData.LicencePlate.List[0].License_Plate : ""
} }
// 拿用户信息 // 拿用户信息
_context2.next = 11; _this2.handleGetUserDetail();
return _this2.handleGetUserDetail();
case 11: // let shopOrderStatus = uni.getStorageSync('shopOrderStatus')
_context2.next = 13; // if (!shopOrderStatus) {
return _this2.handleGetOrderDetail(); // 拿到订单信息
case 13: _this2.handleGetOrderDetail();
// } // }
// 请求一下云南那边的积分信息 // 请求一下云南那边的积分信息
@ -331,7 +331,7 @@ var _default = {
} }
} }
}, _callee); }, _callee);
})), 500); })), 200);
} else { } else {
// 非首次访问直接显示内容 // 非首次访问直接显示内容
_this2.showContent = true; _this2.showContent = true;
@ -340,7 +340,7 @@ var _default = {
_this2.$utils.addUserBehaviorNew({ _this2.$utils.addUserBehaviorNew({
behaviorRecordDesc: "进入了我的页面" behaviorRecordDesc: "进入了我的页面"
}); });
case 15: case 13:
case "end": case "end":
return _context2.stop(); return _context2.stop();
} }
@ -372,8 +372,8 @@ var _default = {
_this3.inShop = _inShop; _this3.inShop = _inShop;
// 拿到订单的缓存数据 // 拿到订单的缓存数据
_shopOrderStatus = uni.getStorageSync('shopOrderStatus'); _shopOrderStatus = uni.getStorageSync("shopOrderStatus");
_foodOrderStatus = uni.getStorageSync('foodOrderStatus'); _foodOrderStatus = uni.getStorageSync("foodOrderStatus");
_this3.mallOrderCountList = _shopOrderStatus ? _shopOrderStatus : []; _this3.mallOrderCountList = _shopOrderStatus ? _shopOrderStatus : [];
if (_foodOrderStatus && _foodOrderStatus.length > 0) { if (_foodOrderStatus && _foodOrderStatus.length > 0) {
foodTab = JSON.parse(JSON.stringify(_this3.foodFunList)); foodTab = JSON.parse(JSON.stringify(_this3.foodFunList));
@ -406,7 +406,7 @@ var _default = {
} }
// 拿到新的缓存数据 // 拿到新的缓存数据
_userData = uni.getStorageSync('userData'); _userData = uni.getStorageSync("userData");
if (_userData) { if (_userData) {
_this3.userInfo = _userData; _this3.userInfo = _userData;
// this.cards = userData.LicencePlate.List && userData.LicencePlate.List.length > 0 ? userData.LicencePlate.List[0].License_Plate : "" // this.cards = userData.LicencePlate.List && userData.LicencePlate.List.length > 0 ? userData.LicencePlate.List[0].License_Plate : ""
@ -418,9 +418,9 @@ var _default = {
_this3.inShop = inShop; _this3.inShop = inShop;
// 拿到订单的缓存数据 // 拿到订单的缓存数据
shopOrderStatus = uni.getStorageSync('shopOrderStatus'); shopOrderStatus = uni.getStorageSync("shopOrderStatus");
foodOrderStatus = uni.getStorageSync('foodOrderStatus'); foodOrderStatus = uni.getStorageSync("foodOrderStatus");
console.log('foodOrderStatusfoodOrderStatusfoodOrderStatus', foodOrderStatus); console.log("foodOrderStatusfoodOrderStatusfoodOrderStatus", foodOrderStatus);
_this3.mallOrderCountList = shopOrderStatus ? shopOrderStatus : []; _this3.mallOrderCountList = shopOrderStatus ? shopOrderStatus : [];
if (foodOrderStatus && foodOrderStatus.length > 0) { if (foodOrderStatus && foodOrderStatus.length > 0) {
_foodTab = JSON.parse(JSON.stringify(_this3.foodFunList)); _foodTab = JSON.parse(JSON.stringify(_this3.foodFunList));
@ -482,7 +482,7 @@ var _default = {
} }
// 拿到新的缓存数据 // 拿到新的缓存数据
userData = uni.getStorageSync('userData'); userData = uni.getStorageSync("userData");
if (userData) { if (userData) {
_this3.userInfo = userData; _this3.userInfo = userData;
// this.cards = userData.LicencePlate.List && userData.LicencePlate.List.length > 0 ? userData.LicencePlate.List[0].License_Plate : "" // this.cards = userData.LicencePlate.List && userData.LicencePlate.List.length > 0 ? userData.LicencePlate.List[0].License_Plate : ""
@ -528,7 +528,7 @@ var _default = {
// 服务热线 // 服务热线
handleServiceHotline: function handleServiceHotline() { handleServiceHotline: function handleServiceHotline() {
uni.makePhoneCall({ uni.makePhoneCall({
phoneNumber: '087167199960' //仅为示例 phoneNumber: "087167199960" //仅为示例
}); });
}, },
handleGoPointsRedemption: function handleGoPointsRedemption() { handleGoPointsRedemption: function handleGoPointsRedemption() {
@ -573,14 +573,14 @@ var _default = {
"content-type": "text/plain" "content-type": "text/plain"
}, },
success: function success(res) { success: function success(res) {
console.log('res2112', res); console.log("res2112", res);
resolve(res.data.Result_Data); resolve(res.data.Result_Data);
} }
}); });
}); });
case 6: case 6:
sign = _context4.sent; sign = _context4.sent;
console.log('signsignsignsignsignsignsignsign', sign); console.log("signsignsignsignsignsignsignsign", sign);
// console.log('signTextsignTextsignTextsignText', signText); // console.log('signTextsignTextsignTextsignText', signText);
req.sign = sign.sign; req.sign = sign.sign;
@ -594,7 +594,7 @@ var _default = {
"content-type": "application/x-www-form-urlencoded" "content-type": "application/x-www-form-urlencoded"
}, },
success: function success(res) { success: function success(res) {
console.log('res', res); console.log("res", res);
if (res.data.response.data) { if (res.data.response.data) {
resolve(res.data.response.data); resolve(res.data.response.data);
} else { } else {
@ -602,13 +602,13 @@ var _default = {
} }
}, },
reject: function reject(res) { reject: function reject(res) {
console.log('res', res); console.log("res", res);
} }
}); });
}); });
case 11: case 11:
tweetsData = _context4.sent; tweetsData = _context4.sent;
console.log('tweetsDatatweetsDatatweetsData', tweetsData); console.log("tweetsDatatweetsDatatweetsData", tweetsData);
case 13: case 13:
case "end": case "end":
return _context4.stop(); return _context4.stop();
@ -944,7 +944,7 @@ var _default = {
// 跳转到我的购物车 // 跳转到我的购物车
handleGoShopCar: function handleGoShopCar() { handleGoShopCar: function handleGoShopCar() {
uni.navigateTo({ uni.navigateTo({
url: '/pages/shopMallPage/shopCar/index' url: "/pages/shopMallPage/shopCar/index"
}); });
}, },
// 跳转会员设置 // 跳转会员设置
@ -965,7 +965,7 @@ var _default = {
return; return;
} }
uni.navigateTo({ uni.navigateTo({
url: '/pages/useConfig/userConfig' url: "/pages/useConfig/userConfig"
}); });
}, },
// 跳转到积分页面 // 跳转到积分页面
@ -986,7 +986,7 @@ var _default = {
return; return;
} }
uni.navigateTo({ uni.navigateTo({
url: '/pages/useConfig/pointsDetail' url: "/pages/useConfig/pointsDetail"
}); });
}, },
// 跳转券包 // 跳转券包
@ -1007,7 +1007,7 @@ var _default = {
return; return;
} }
uni.navigateTo({ uni.navigateTo({
url: '/pages/homeFn/myCoupon/index' url: "/pages/homeFn/myCoupon/index"
}); });
}, },
// 用户上传头像 // 用户上传头像
@ -1135,7 +1135,7 @@ var _default = {
_this.user.MEMBERSHIP_HEADIMAGEURL = _data.Data.MEMBERSHIP_HEADIMAGEURL; _this.user.MEMBERSHIP_HEADIMAGEURL = _data.Data.MEMBERSHIP_HEADIMAGEURL;
_this.user.TEST_MEMBER = _data.Data.TEST_MEMBER || ""; _this.user.TEST_MEMBER = _data.Data.TEST_MEMBER || "";
_this.$store.commit("setUser", _this.user); _this.$store.commit("setUser", _this.user);
uni.setStorageSync('userData', _this.user); uni.setStorageSync("userData", _this.user);
_this.$forceUpdate(); _this.$forceUpdate();
} else { } else {
// _this.setUser({}); // _this.setUser({});
@ -1431,7 +1431,7 @@ var _default = {
// 商城订单数据 // 商城订单数据
req = { req = {
action_type: "GetMallOrderList", action_type: "GetMallOrderList",
salebillType: '3000,3001,3002,3999', salebillType: "3000,3001,3002,3999",
salebillState: "", salebillState: "",
PageIndex: 1, PageIndex: 1,
pageSize: 99999, pageSize: 99999,

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

@ -153,7 +153,7 @@
.main.data-v-137d5072 { .main.data-v-137d5072 {
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
background-image: url('https://eshangtech.com/minTestImg/pageBg.png'); background-image: url("https://eshangtech.com/minTestImg/pageBg.png");
transition: all 0.3s ease; transition: all 0.3s ease;
} }
.main.refreshing .pageTop.data-v-137d5072 { .main.refreshing .pageTop.data-v-137d5072 {
@ -174,7 +174,7 @@
.main .fixedHeader.data-v-137d5072 { .main .fixedHeader.data-v-137d5072 {
width: 100vw; width: 100vw;
position: fixed; position: fixed;
background-image: url('https://eshangtech.com/minTestImg/pageBg.png'); background-image: url("https://eshangtech.com/minTestImg/pageBg.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100vh; background-size: 100% 100vh;
top: 0; top: 0;
@ -191,7 +191,7 @@
} }
.main .pageTop.data-v-137d5072 { .main .pageTop.data-v-137d5072 {
width: 100vw; width: 100vw;
background-image: url('https://eshangtech.com/minTestImg/pageBg.png'); background-image: url("https://eshangtech.com/minTestImg/pageBg.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100vh; background-size: 100% 100vh;
box-sizing: border-box; box-sizing: border-box;
@ -200,7 +200,7 @@
.main .pageTop .userTopInfo.data-v-137d5072 { .main .pageTop .userTopInfo.data-v-137d5072 {
width: calc(100vw - 64rpx); width: calc(100vw - 64rpx);
margin-left: 32rpx; margin-left: 32rpx;
background: linear-gradient(270deg, #27B25F 0%, #4CCC7F 100%); background: linear-gradient(270deg, #27b25f 0%, #4ccc7f 100%);
border-radius: 16rpx; border-radius: 16rpx;
} }
.main .pageTop .userTopInfo .userInfoBox.data-v-137d5072 { .main .pageTop .userTopInfo .userInfoBox.data-v-137d5072 {
@ -245,7 +245,7 @@
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 500; font-weight: 500;
font-size: 30rpx; font-size: 30rpx;
color: #FFFFFF; color: #ffffff;
line-height: 40rpx; line-height: 40rpx;
text-align: left; text-align: left;
font-style: normal; font-style: normal;
@ -268,7 +268,7 @@
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 500; font-weight: 500;
font-size: 24rpx; font-size: 24rpx;
color: #716F69; color: #716f69;
line-height: 34rpx; line-height: 34rpx;
text-align: left; text-align: left;
font-style: normal; font-style: normal;
@ -296,7 +296,7 @@
font-style: normal; font-style: normal;
padding: 4rpx 22rpx 2rpx 22rpx; padding: 4rpx 22rpx 2rpx 22rpx;
border-radius: 32rpx; border-radius: 32rpx;
color: #716F69; color: #716f69;
background-color: #fff; background-color: #fff;
display: inline-block; display: inline-block;
} }
@ -309,7 +309,7 @@
font-style: normal; font-style: normal;
padding: 4rpx 22rpx 2rpx 22rpx; padding: 4rpx 22rpx 2rpx 22rpx;
border-radius: 32rpx; border-radius: 32rpx;
color: #716F69; color: #716f69;
background-color: #fff; background-color: #fff;
display: inline-block; display: inline-block;
} }
@ -379,7 +379,7 @@
.main .pageTop .userTopInfo .couponBox .CouponContent .line.data-v-137d5072 { .main .pageTop .userTopInfo .couponBox .CouponContent .line.data-v-137d5072 {
width: 2rpx; width: 2rpx;
height: 48rpx; height: 48rpx;
background-color: #B9B6B6; background-color: #b9b6b6;
border-radius: 1rpx; border-radius: 1rpx;
} }
.main .pageContent.data-v-137d5072 { .main .pageContent.data-v-137d5072 {
@ -390,7 +390,7 @@
} }
.main .pageContent .basicBox.data-v-137d5072 { .main .pageContent .basicBox.data-v-137d5072 {
width: 100%; width: 100%;
background: #FFFFFF; background: #ffffff;
border-radius: 14rpx; border-radius: 14rpx;
margin-top: 24rpx; margin-top: 24rpx;
box-sizing: border-box; box-sizing: border-box;
@ -434,7 +434,7 @@
margin-bottom: 16rpx; margin-bottom: 16rpx;
} }
.main .pageContent .basicBox .basicBoxContent .basicItem .basicText.data-v-137d5072 { .main .pageContent .basicBox .basicBoxContent .basicItem .basicText.data-v-137d5072 {
font-family: 'PingFangSC'; font-family: "PingFangSC";
font-weight: 400; font-weight: 400;
font-size: 24rpx; font-size: 24rpx;
color: #000; color: #000;
@ -444,7 +444,7 @@
} }
.main .pageContent .userOrder.data-v-137d5072 { .main .pageContent .userOrder.data-v-137d5072 {
width: 100%; width: 100%;
background: #FFFFFF; background: #ffffff;
border-radius: 14rpx; border-radius: 14rpx;
margin-top: 24rpx; margin-top: 24rpx;
box-sizing: border-box; box-sizing: border-box;
@ -511,7 +511,7 @@
.main .pageContent .oftenFunBox.data-v-137d5072 { .main .pageContent .oftenFunBox.data-v-137d5072 {
width: 100%; width: 100%;
margin-top: 24rpx; margin-top: 24rpx;
background: #FFFFFF; background: #ffffff;
border-radius: 14rpx; border-radius: 14rpx;
box-sizing: border-box; box-sizing: border-box;
padding: 22rpx 32rpx; padding: 22rpx 32rpx;
@ -541,7 +541,7 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
background: #F1F5FA; background: #f1f5fa;
border-radius: 9rpx; border-radius: 9rpx;
} }
.main .pageContent .oftenFunBox .funListBox .funItemBox .funItemImg.data-v-137d5072 { .main .pageContent .oftenFunBox .funListBox .funItemBox .funItemImg.data-v-137d5072 {
@ -561,7 +561,7 @@
.main .pageContent .customerServiceBox.data-v-137d5072 { .main .pageContent .customerServiceBox.data-v-137d5072 {
width: 100%; width: 100%;
margin-top: 24rpx; margin-top: 24rpx;
background: #FFFFFF; background: #ffffff;
border-radius: 14rpx; border-radius: 14rpx;
box-sizing: border-box; box-sizing: border-box;
padding: 22rpx 32rpx; padding: 22rpx 32rpx;
@ -586,14 +586,14 @@
height: 130rpx; height: 130rpx;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
background-image: url('https://eshangtech.com/caiyunyiImg/customerServiceItem1.png'); background-image: url("https://eshangtech.com/caiyunyiImg/customerServiceItem1.png");
box-sizing: border-box; box-sizing: border-box;
padding: 20rpx; padding: 20rpx;
/* 覆盖系统生成的伪元素 */ /* 覆盖系统生成的伪元素 */
} }
.main .pageContent .customerServiceBox .customerServiceContent .customerServiceItem .no-border-btn.data-v-137d5072::after, .main .pageContent .customerServiceBox .customerServiceContent .customerServiceItem .no-border-btn.data-v-137d5072::after,
.main .pageContent .customerServiceBox .customerServiceContent .customerServiceItem .no-border-btn.data-v-137d5072::before { .main .pageContent .customerServiceBox .customerServiceContent .customerServiceItem .no-border-btn.data-v-137d5072::before {
content: '' !important; content: "" !important;
border: 0 !important; border: 0 !important;
box-shadow: none !important; box-shadow: none !important;
display: none !important; display: none !important;
@ -606,7 +606,7 @@
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 500; font-weight: 500;
font-size: 28rpx; font-size: 28rpx;
color: #FFFFFF; color: #ffffff;
line-height: 40rpx; line-height: 40rpx;
text-align: left; text-align: left;
font-style: normal; font-style: normal;
@ -615,14 +615,14 @@
font-family: STYuanti-SC, STYuanti-SC; font-family: STYuanti-SC, STYuanti-SC;
font-weight: 400; font-weight: 400;
font-size: 20rpx; font-size: 20rpx;
color: #0754F3; color: #0754f3;
line-height: 28rpx; line-height: 28rpx;
text-align: left; text-align: left;
font-style: normal; font-style: normal;
margin-top: 8rpx; margin-top: 8rpx;
} }
.main .pageContent .customerServiceBox .customerServiceContent .customerServiceItemBg2.data-v-137d5072 { .main .pageContent .customerServiceBox .customerServiceContent .customerServiceItemBg2.data-v-137d5072 {
background-image: url('https://eshangtech.com/caiyunyiImg/customerServiceItem2.png'); background-image: url("https://eshangtech.com/caiyunyiImg/customerServiceItem2.png");
} }
.main .pageContent .serviceDetail.data-v-137d5072 { .main .pageContent .serviceDetail.data-v-137d5072 {
width: 100%; width: 100%;