diff --git a/App.vue b/App.vue index 04c0b21..987696c 100644 --- a/App.vue +++ b/App.vue @@ -5,6 +5,11 @@ }, onLaunch: function() { console.log('App Launch'); + // 检查非生产环境下是否打开了调试模式,没有打开时自动打开 + if(process.env.NODE_ENV !== 'production'){ + let baseInfo = (uni.canIUse('getAppBaseInfo') && uni.getAppBaseInfo()) || {}; + !baseInfo.enableDebug && uni.setEnableDebug({enableDebug: true}); + } }, onShow: function() { console.log('App Show') diff --git a/packages/addAddress/addAddress.vue b/packages/addAddress/addAddress.vue index 5c879ab..242fcc0 100644 --- a/packages/addAddress/addAddress.vue +++ b/packages/addAddress/addAddress.vue @@ -43,7 +43,7 @@ @@ -38,13 +35,16 @@ overflow-y: auto; height: 100%; } + .justify-between{ + padding: 20rpx 0; + } .group_4 { padding: 2rpx 0 16rpx; flex: 1 1 auto; overflow-y: auto; } .section_2 { - padding: 40rpx 30rpx 40rpx 32rpx; + padding: 20rpx 30rpx 20rpx 32rpx; background-color: rgb(255, 255, 255); } diff --git a/pages/index/index.vue b/pages/index/index.vue index 7f6790a..d2d8e8f 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -150,23 +150,9 @@ class="image_8" /> - - - 2021chronic - - - - 2021chronic - - - - 2021chronic + + + {{ item.title }} @@ -196,7 +182,8 @@ isConsentAgreement: false, rateIndex: 0, user: {}, - dots: {} + dots: {}, + evaluated_order: [] }; }, onLoad(){ @@ -207,6 +194,7 @@ let res = await my(); this.user = res.data.datas.user; this.dots = res.data.datas.dots; + this.evaluated_order = res.data.datas.evaluated_order; }, nextToGrading(){ if(!this.isConsentAgreement) return this.$msg('请先阅读并同意协议'); @@ -416,7 +404,7 @@ .equal-division_1 { margin-top: 40rpx; - padding: 0 8rpx; + padding: 0 32rpx; color: rgb(51, 51, 51); font-size: 28rpx; font-weight: 500; @@ -520,7 +508,12 @@ } .equal-division-item_3 { - flex: 1 1 244rpx; + // flex: 1 1 244rpx; + align-items: flex-start; + margin-right: 42rpx; + &:nth-child(3n){ + margin-right: 0rpx; + } } .equal-division-item_4 { diff --git a/pages/order/order.vue b/pages/order/order.vue index f97890a..ba1d2a0 100644 --- a/pages/order/order.vue +++ b/pages/order/order.vue @@ -27,7 +27,7 @@ 按收货确认时间 - {{ item.label }} + {{ item.label }} @@ -45,7 +45,7 @@ 按送评信息 - + @@ -57,7 +57,7 @@ - + @@ -67,7 +67,7 @@ - + - + @@ -84,27 +84,43 @@ src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/62677e395a7e3f03107ffc5f/62677e4a35a7e10011e93a80/16509497798740970822.png" class="image_7" /> - 在线送评 + 在线送评 todo - 待确认 + {{ ['','待确认','评级中','待付款','待收货'][item.status] }} - 李丽丽 - 15273936409 + {{ item.owner }} + {{ item.tel }} - 共5件 + 共{{ item.num }}件 - 更多 - - + + + + 取消 - + 寄送藏品 + + + 更改地址 + + + + + 付款 + + + + + 确认收货 + + @@ -128,12 +144,13 @@