diff --git a/components/shopTabbar.vue b/components/shopTabbar.vue index fb176318..266bd041 100644 --- a/components/shopTabbar.vue +++ b/components/shopTabbar.vue @@ -105,7 +105,15 @@ export default { }, methods: { goPages(pageIndex) { - if (pageIndex === "/pages/shopMallPage/shopCar/index") { + if (this.selectIndex === pageIndex) { + return + } + + if (pageIndex === '/pages/shopMallPage/index/index') { + uni.navigateBack({ + delta: 1, + }); + } else if (pageIndex === "/pages/shopMallPage/shopCar/index") { if (!this.user && !this.user.MEMBERSHIP_ID) { uni.showModal({ title: "温馨提示", diff --git a/pages/index/index.vue b/pages/index/index.vue index 40338b08..b9bd1593 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -68,7 +68,7 @@ {{ serviceDetail.SERVERPART_NAME || "-" - }} + }} 营业中 爆满 @@ -76,10 +76,10 @@ - {{ serviceDetail.SERVERPART_DISTANCE || "-" }}km + {{ serviceDetail.SERVERPART_DISTANCE || "-" }} km {{ serviceDetail.SERVERPART_ADDRESS || "-" - }} + }} @@ -345,7 +345,7 @@ }} --> {{ item.bigNumber || "" }}.{{ item.smallNumber || "00" - }} + }} 已售罄 @@ -2293,7 +2293,7 @@ export default { font-family: PingFangSC, PingFang SC; font-weight: 400; font-size: 24rpx; - color: #716f69; + color: #000; line-height: 36rpx; text-align: left; font-style: normal; diff --git a/pages/order/buyOrder/index.vue b/pages/order/buyOrder/index.vue index c75be9da..ef0df253 100644 --- a/pages/order/buyOrder/index.vue +++ b/pages/order/buyOrder/index.vue @@ -576,7 +576,7 @@ export default { .bigTabItem { font-family: PingFangSC, PingFang SC; font-weight: 400; - font-size: 30rpx; + font-size: 28rpx; color: #333333; line-height: 40rpx; text-align: left; @@ -606,7 +606,7 @@ export default { .smallTypeBox { width: 100%; - height: 28px; + height: 32px; margin-top: 22rpx; box-sizing: border-box; padding: 0 42rpx 0 30rpx; diff --git a/pages/order/orderSearch/index.vue b/pages/order/orderSearch/index.vue index ffb47ffe..4ba6a6db 100644 --- a/pages/order/orderSearch/index.vue +++ b/pages/order/orderSearch/index.vue @@ -5,8 +5,8 @@ - + @@ -116,9 +116,8 @@ export default { this.orderList = [] await this.handleGetOrder() }, - // 查询订单 + // 查询订单 async handleGetOrder() { - uni.showLoading({ title: "正在加载...", mask: true, @@ -184,6 +183,26 @@ export default { delta: 1, }); }, + // 订单详情 + goEvaluate(item) { + uni.navigateTo({ + url: + "/pages/order/orderdetail/index?sellchildid=" + + (item.OrderChildId || "") + + "&orderInternal=" + + item.OrderId + + "&orderStatus=" + + item.OrderState + + "&SUPPLIER_NAME=" + + item.SUPPLIER_NAME, + }); + }, + handleGoShopDetail(item, index) { + let obj = item.DetailList[index] + uni.navigateTo({ + url: `/pages/shopPages/shopDetail/index?id=${obj.GoodsId}`, + }); + } } } diff --git a/pages/register/index.vue b/pages/register/index.vue index 76cdf366..61105e4c 100644 --- a/pages/register/index.vue +++ b/pages/register/index.vue @@ -97,7 +97,8 @@ export default { showPrivacy: false, // 隐私弹框的东西 showBtn: false, // 隐私权限有了之后 就会出来这俩按钮 showCancel: true, // 显示取消按钮 - pageSession_key: "" + pageSession_key: "", + backTo: "" }; }, computed: { @@ -107,7 +108,17 @@ export default { InviteCode: "InviteCode", }), }, - onLoad() { + onLoad(query) { + if (this.user.MEMBERSHIP_ID) { + uni.switchTab({ + url: '/pages/index/index', + }); + } + + + if (query.backTo) { + this.backTo = query.backTo + } if ( !this.user.MEMBERSHIP_ID || @@ -211,9 +222,17 @@ export default { await _this.handleGetUserDetail() - uni.navigateBack({ - delta: 1, - }); + if (_this.backTo === 'index') { + uni.switchTab({ + url: '/pages/index/index', + }); + } else { + uni.navigateBack({ + delta: 1, + }); + } + + }); } }, diff --git a/pages/shopMallPage/index/index.vue b/pages/shopMallPage/index/index.vue index 7cd8b68a..1eaa4551 100644 --- a/pages/shopMallPage/index/index.vue +++ b/pages/shopMallPage/index/index.vue @@ -9,6 +9,7 @@ : 'url(https://eshangtech.com/ShopICO/ahyd-mall/wechatesAH/indexBg.png)', backgroundSize: pageType === 'UnionMall' ? '100% 480rpx' : '100% 300rpx', + paddingBottom: '16rpx' }"> - +
@@ -190,7 +192,7 @@
-