diff --git a/api/help.js b/api/help.js index eb03cfc..1561dbc 100644 --- a/api/help.js +++ b/api/help.js @@ -13,6 +13,9 @@ const api = { storyList: 'store/story', upgradeWholesaler: 'invite/upgradeWholesaler', } +export const submitStandard = (param) => { + return request.post('order/submitStandard', param) +} // 店铺设置 export const upgradeWholesaler = (param) => { return request.post(api.upgradeWholesaler, param) diff --git a/pages.json b/pages.json index 18830ba..25f8687 100644 --- a/pages.json +++ b/pages.json @@ -989,6 +989,14 @@ { "root": "pages/order/", "pages": [{ + "path": "reviewOrder", + "style": { + "navigationBarTitleText": "审单", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + + }, { "path": "refund/refund", "style": { "navigationBarTitleText": "申请退款", diff --git a/pages/news1/text.vue b/pages/news1/text.vue index 6bfc642..3da29b1 100644 --- a/pages/news1/text.vue +++ b/pages/news1/text.vue @@ -25,7 +25,7 @@ that.pageFlag = params.pageFlag uni.setNavigationBarTitle({ title: that.pageFlag == 1 ? '用户服务协议' : that.pageFlag == 2 ? '隐私政策' : that.pageFlag == 3 ? - '商家入驻协议' : '关于我们' + '商家入驻协议' : that.pageFlag == 4 ?'平台审单协议': that.pageFlag == 5 ?'审单规则':'关于我们' }) }, watch: { @@ -41,7 +41,7 @@ uni.showLoading({ title: "加载中" }) - let typeVal = this.pageFlag == 1 ? 'user' : this.pageFlag == 2 ? 'policy' : this.pageFlag == 3?'joinMerchant':'about' + let typeVal = this.pageFlag == 1 ? 'user' : this.pageFlag == 2 ? 'policy' : this.pageFlag == 3?'joinMerchant': this.pageFlag == 4 ?'platform_standard': this.pageFlag == 5 ?'standard':'about' let { status, data diff --git a/pages/order/index.vue b/pages/order/index.vue index f5a09a2..21db6b1 100644 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -27,6 +27,13 @@ {{item.storeInfo.store_name}} + + 审核通过 + 审核不通过 + 审核中 + + @@ -63,7 +70,8 @@ v-if="item.order_status == OrderStatusEnum.COMPLETED.value && item.pay_status == PayStatusEnum.SUCCESS.value"> 删除订单 - 取消订单 @@ -75,6 +83,7 @@ v-if="(item.order_status == OrderStatusEnum.COMPLETED.value && item.pay_status == PayStatusEnum.SUCCESS.value)|| (item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value&&item.order_status == OrderStatusEnum.NORMAL.value)"> 更多 + 审单 复制链接 - + + + + + + + 审核通过 + 审核不通过 + 审核中 + + + 该订单已审核通过,订单交付中,请耐心等待收货哦。 + 因为您提交的审单资料,是电商平台单,无法通过,请您取消订单,我们将在2个工作日内为您退款,感谢您的理解! + 我们会尽快审核哦! + + + + 我知道了 + + + + + @@ -199,6 +230,7 @@ cdDia: false, isToggle: false, deleteShow: false, + popShow: false, orderId: '', // 枚举类 DeliveryStatusEnum, @@ -225,6 +257,7 @@ showQRCodePopup: false, // 核销二维码图片url (通过后端获取) qrcodeImage: '', + standard_status: '' } }, @@ -262,6 +295,13 @@ } }, methods: { + onShenOrderTips(standard_status) { + this.standard_status = standard_status + console.log(this.standard_status) + if (this.standard_status) { + this.popShow = true + } + }, handleOk() { }, @@ -340,6 +380,11 @@ } }, + onShenOrder(orderId) { + uni.navigateTo({ + url: '/pages/order/reviewOrder?orderId=' + orderId + }) + }, onCopyLink(str) { uni.setClipboardData({ data: str, // 这里是个坑接受字符串类型 value转化为字符串 @@ -724,6 +769,16 @@ height: 40rpx; margin-right: 24rpx; } + + .shenhe { + margin-left: 25rpx; + font-size: 28rpx; + color: green; + + text { + margin-right: 10rpx; + } + } } .b { @@ -1004,4 +1059,81 @@ } } + + .popcontent { + width: 520upx; + background: linear-gradient(180deg, #FFE4E4 0%, #FFFFFF 100%); + border-radius: 6px; + opacity: 1; + display: flex; + flex-direction: column; + padding:40upx; + align-items: center; + + .poptitle { + font-size: 32upx; + font-family: PingFang SC, PingFang SC; + font-weight: bold; + margin-top: 60upx; + color: #000000; + + } + + .poptext { + font-size: 28upx; + font-family: PingFang SC, PingFang SC; + font-weight: 400; + color: #727272; + margin-top: 32upx; + line-height: 36upx; + + } + + .knowBtn { + width: 400upx; + height: 72upx; + line-height: 72upx; + text-align: center; + background: #F55349; + border-radius: 72upx; + font-size: 28upx; + font-family: PingFang SC, PingFang SC; + font-weight: 400; + color: #FFFFFF; + margin-top: 38upx; + } + + } + + .selfMask { + width: 100%; + height: 100%; + position: fixed; + top: 0; + left: 0; + z-index: 999; + background: rgba(60, 60, 60, 0.52); + display: flex; + justify-content: center; + align-items: center; + } + + .self_popup { + position: relative; + padding-top: 56rpx; + } + + .popimg { + position: absolute; + width: 112upx; + left: 50%; + height: 128upx; + margin-left: -56upx; + top: 0; + z-index: 2; + } + + ::v-deep .u-mode-center-box { + background: transparent; + } diff --git a/pages/order/reviewOrder.vue b/pages/order/reviewOrder.vue new file mode 100644 index 0000000..503524b --- /dev/null +++ b/pages/order/reviewOrder.vue @@ -0,0 +1,625 @@ + + + +