From 308839a66f188507cdede277774a1c993bf4a7c5 Mon Sep 17 00:00:00 2001 From: syt <854400391@qq.com> Date: Sun, 24 Mar 2024 21:15:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E4=B8=8E=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.js | 1 + core/config/defaultConfig.js | 1 + manifest.json | 6 +-- pages.json | 1 - pages/news/recycling/confirm1.vue | 15 ++++++- pages/news/recycling/detail.vue | 9 +++-- pages/news/recycling/timer.vue | 43 ++++++++++++++++++-- pages/news1/setting.vue | 3 +- pages/order/detail.vue | 20 +++++----- pages/order/refund/index.vue | 12 +++--- pages/order/refund/refund.vue | 9 +++-- pages/refund/detail.vue | 66 ++++++++++++++++--------------- pages/user/index.vue | 14 ++++++- pages/user/vip/goods.vue | 8 +++- 14 files changed, 138 insertions(+), 70 deletions(-) diff --git a/config.js b/config.js index f672fa1..9325d95 100644 --- a/config.js +++ b/config.js @@ -15,6 +15,7 @@ export default { * 可在超管后台-商城列表中查看10025 */ storeId: 10001, + // storeId: 10037, /** diff --git a/core/config/defaultConfig.js b/core/config/defaultConfig.js index 6bdeff8..cad7412 100644 --- a/core/config/defaultConfig.js +++ b/core/config/defaultConfig.js @@ -16,6 +16,7 @@ export default { * 可在超管后台-商城列表中查看 */ storeId: 10001, + // storeId: 10037, /** * 是否启用商城设置缓存 diff --git a/manifest.json b/manifest.json index 7e39406..47311b8 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { - "name" : "惠云商", + "name" : "装小易", "appid" : "__UNI__1D774AF", - "description" : "慧云商是一款提供家电，3C数码，家装建材为一体的批发采购平台，一站式解决找货方案，简化采购流程", + "description" : "装采要省力，就找装小易！ —— 家装工厂供应链对接平台", "versionName" : "1.0.0", "versionCode" : 1, "transformPx" : false, @@ -92,7 +92,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wx68d198de972a9e9d", + "appid" : "wxd87b1a7332d974d0", "libVersion" : "latest", "setting" : { // 是否检查安全域名和 TLS 版本 diff --git a/pages.json b/pages.json index 8358f8b..4030922 100644 --- a/pages.json +++ b/pages.json @@ -723,7 +723,6 @@ "path": "recycling/timer", "style": { "navigationBarTitleText": "选择时间", - "navigationStyle": "custom", "enablePullDownRefresh": false } }, diff --git a/pages/news/recycling/confirm1.vue b/pages/news/recycling/confirm1.vue index 578961e..64168d3 100644 --- a/pages/news/recycling/confirm1.vue +++ b/pages/news/recycling/confirm1.vue @@ -66,7 +66,7 @@ 服务时间 - {{obj.server_time?obj.server_time:(tabIndex <= 1?'请选择预约到店时间':'请选择预计寄出商品的时间')}} + {{obj.server_time?obj.server_time:(obj.server_time?'请选择预约到店时间':'请选择预计寄出商品的时间')}} @@ -235,6 +235,13 @@ this.getOrderDetail(op.order_id) } }, + onShow() { + if(uni.getStorageSync("yuyueTime").time){ + this.obj.server_time = uni.getStorageSync("yuyueTime").time + }else{ + this.obj.server_time = "" + } + }, methods: { radioChange(e) { this.sexValue = e @@ -344,7 +351,10 @@ }); } if (i == 3) { //服务事件 - this.show = true + // this.show = true + uni.navigateTo({ + url: "/pages/news/recycling/timer?type=1&shop_id="+this.storeInfo.shop_id + }) } if (i == 4) { //提交 if (this.source == 2) { @@ -462,6 +472,7 @@ } }, onLook() { + uni.removeStorageSync("yuyueTime") uni.redirectTo({ url: "/pages/news/recycling/recoveryList" }) diff --git a/pages/news/recycling/detail.vue b/pages/news/recycling/detail.vue index f24ab8c..8e19d6a 100644 --- a/pages/news/recycling/detail.vue +++ b/pages/news/recycling/detail.vue @@ -138,14 +138,13 @@ console.log(info.content) } this.info = info; - this.type = o.type + this.type = o.type; uni.setNavigationBarTitle({ title: o.type == 1 ? "服务详情" : '旧物回收' - }) - + }) }, onShow() { - if (uni.getStorageSync("AccessToken")) { + if (uni.getStorageSync("userInfo").user_id) { this.getList() this.userInfo = uni.getStorageSync("userInfo"); this.isToken = true; @@ -153,6 +152,7 @@ this.userInfo = {} this.isToken = false; } + uni.removeStorageSync("yuyueTime") }, methods: { @@ -269,6 +269,7 @@ width: 100%; overflow: hidden; + padding-bottom: 30rpx; &-hd { padding: 30rpx 60rpx; position: relative; diff --git a/pages/news/recycling/timer.vue b/pages/news/recycling/timer.vue index 0e2fb16..3502e59 100644 --- a/pages/news/recycling/timer.vue +++ b/pages/news/recycling/timer.vue @@ -30,14 +30,16 @@ tabIndex: 0, dataList: [], timeList: [], - infor: '', - time: '' + infor: {}, + time: '', + type: 3 } }, onLoad(op) { if(op.infor){ this.infor = op.infor ? JSON.parse(decodeURIComponent(op.infor)) : '' } + this.type = op.type?op.type:"" this.getstopTimes(op.shop_id) }, methods: { @@ -49,6 +51,13 @@ }) return } + if(this.type == 1){ + uni.setStorageSync("yuyueTime",this.infor.yuyueTime) + uni.navigateBack({ + delta: 1 + }) + return ; + } let { status, message, @@ -64,6 +73,7 @@ * 时间 */ async getstopTimes(shop_id) { + const that = this; let { status, message, @@ -72,14 +82,41 @@ shop_id: shop_id }); if (status == 200) { + let arr = [] + if(data && data.length> 0){ + data.map(a=>{ + if(a.list && a.list.length > 0){ + a.list.map(b=>{ + b.date = a.date + }) + } + }) + } + if(this.type == 1 && uni.getStorageSync("yuyueTime").time){ + if(data && data.length> 0){ + data.map((a,idx)=>{ + if(a.date == uni.getStorageSync("yuyueTime").date){ + that.tabIndex = idx + } + if(a.list && a.list.length > 0){ + a.list.map((b,idx1)=>{ + if(b.value == uni.getStorageSync("yuyueTime").value){ + that.tabIndex1 = idx1 + } + }) + } + }) + } + } this.dataList = data; - this.timeList = data[0].list + this.timeList = data[this.tabIndex].list } }, tabItem1(i, item) { this.tabIndex1 = i this.time = item.value this.infor.server_time = item.time + this.infor.yuyueTime = item }, tabItem(index, item) { this.tabIndex = index; diff --git a/pages/news1/setting.vue b/pages/news1/setting.vue index e2d21fe..2baf802 100644 --- a/pages/news1/setting.vue +++ b/pages/news1/setting.vue @@ -205,8 +205,7 @@ export default { title: '退出成功', icon: 'none', duration: 2000 - }) - uni.clearStorage() + }) uni.clearStorageSync() setTimeout(function () { uni.navigateBack({ diff --git a/pages/order/detail.vue b/pages/order/detail.vue index 320de1d..61083e4 100644 --- a/pages/order/detail.vue +++ b/pages/order/detail.vue @@ -126,18 +126,18 @@ x{{ goods.total_num }} - 退款 - + --> - 退款 + v-if="order.isAllowRefund && order.delivery_status == DeliveryStatusEnum.DELIVERED.value"> + 售后 - 换货 - + --> @@ -558,14 +558,14 @@ // 跳转到门店详情页 handleTargetExtract(shopId) { - this.$navTo('/pages/shop/detail', { + this.$navTo('pages/shop/detail', { shopId }) }, // 跳转到物流跟踪页面 handleTargetExpress() { - this.$navTo('/pages/order/express/index', { + this.$navTo('pages/order/express/index', { orderId: this.orderId }) }, @@ -674,14 +674,14 @@ }, // 点击去支付 onPay(orderId) { - this.$navTo('/pages/checkout/cashier/index', { + this.$navTo('pages/checkout/cashier/index', { orderId }) }, // 跳转到订单评价页 handleTargetComment(orderId) { - this.$navTo('/pages/order/comment/index', { + this.$navTo('pages/order/comment/index', { orderId }) }, diff --git a/pages/order/refund/index.vue b/pages/order/refund/index.vue index 8fadd52..989a0c2 100644 --- a/pages/order/refund/index.vue +++ b/pages/order/refund/index.vue @@ -4,7 +4,7 @@ 出柜：已签收，签收人凭取取件码.. - + 退货运费规则 @@ -17,22 +17,22 @@ 我要退货退款已收到货，需要退还已收到的货物 - + 我要退款（无需退货）未收到货，或与商家协商之后申请 - + - + @@ -64,7 +64,7 @@ }) } else { uni.navigateTo({ - url: '/pages/order/refund/refund?orderId=' + this.orderId + '&order=' + JSON.stringify(this + url: '/pages/order/refund/refund?type='+index+'&orderId=' + this.orderId + '&order=' + JSON.stringify(this .order) + "&deliveryStatus=" + this.deliveryStatus + '&receiptStatus=' + this.deliveryStatus }) diff --git a/pages/order/refund/refund.vue b/pages/order/refund/refund.vue index 13b72b5..25494b9 100644 --- a/pages/order/refund/refund.vue +++ b/pages/order/refund/refund.vue @@ -14,7 +14,7 @@ 申请类型 - {{((deliveryStatus == DeliveryStatusEnum.DELIVERED.value) && (receiptStatus == ReceiptStatusEnum.RECEIVED.value))?'我要退款（需退货)':'我要退款（无需退货)'}} + {{type==1?'我要退货退款':'我要退款（无需退货)'}} @@ -138,7 +138,8 @@ maxImageLength: 6, imagesId: '', action: '', - header: '', + header: '', + type: 1, } }, onReady() { @@ -151,6 +152,7 @@ }, onLoad(op) { this.deliveryStatus = op.deliveryStatus; + this.type = op.type; this.receiptStatus = op.receiptStatus; this.orderId = op.orderId this.order = op.order ? JSON.parse(op.order) : ''; @@ -233,8 +235,7 @@ } app.isLoading = true; let obj = { - type: (app.deliveryStatus == DeliveryStatusEnum.DELIVERED.value) && (app.receiptStatus == - ReceiptStatusEnum.RECEIVED.value) ? 20 : 10, + type: app.type == 1? 10 : 30, content: app.contentNotes, images: app.imagesId, phone: app.phone, diff --git a/pages/refund/detail.vue b/pages/refund/detail.vue index 5552979..a794d54 100644 --- a/pages/refund/detail.vue +++ b/pages/refund/detail.vue @@ -57,7 +57,7 @@ 售后类型： - {{ RefundTypeEnum[detail.type].name }} + {{ detail.type == 30?'退款':'退货' }} @@ -116,37 +116,39 @@ - - - 商家退货地址 - - - - 收货人：{{ detail.address.name }} - - - 联系电话：{{ detail.address.phone }} - - - - 详细地址： - - - {{ region }} - {{ detail.address.detail }} - - - - - - · 未与卖家协商一致情况下，请勿寄到付或平邮 - - - · 请填写真实有效物流信息 - - - +