diff --git a/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue b/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue index c32814375..2e151e6d6 100644 --- a/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue +++ b/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue @@ -396,11 +396,9 @@ export default { logistics.shippingNodelivery({ tempId: this.tempId }).then(res => { res.data.forEach((item, index) => { // item.title = JSON.parse(item.title) - item.city_ids = item.cityId.split(',') + item.city_ids = JSON.parse(item.title) }) this.ruleForm.noDelivery = res.data - console.log(this.ruleForm.noDelivery ) - }) }, removeChild(list){ @@ -507,13 +505,10 @@ export default { // }) } if (this.ruleForm.noDelivery) { - param.shippingTemplatesNoDeliveryRespVOS = [{ - cityId:[], - }] - this.ruleForm.noRegion.forEach((item,index) => { - param.shippingTemplatesNoDeliveryRespVOS[0].cityId.push(item[2]) - }) - param.shippingTemplatesNoDeliveryRespVOS[0].cityId = param.shippingTemplatesNoDeliveryRespVOS[0].cityId.join(",") + param.shippingTemplatesNoDeliveryRespVOS = { + title:JSON.stringify(this.ruleForm.noRegion), + cityId:this.ruleForm.noRegion.join(','), + } } if (this.type === 0) { logistics.shippingSave(param).then(res => { diff --git a/yudao-ui-app/components/paymentMember/index.vue b/yudao-ui-app/components/paymentMember/index.vue index 122525432..a55247b9c 100644 --- a/yudao-ui-app/components/paymentMember/index.vue +++ b/yudao-ui-app/components/paymentMember/index.vue @@ -216,7 +216,7 @@ width: 100%; border-radius: 16rpx 16rpx 0 0; background-color: #fff; - padding-bottom: 100rpx; + padding-bottom: 20%; z-index: 99; transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9); transform: translate3d(0, 100%, 0); diff --git a/yudao-ui-app/pages.json b/yudao-ui-app/pages.json index 2d84fc156..310088462 100644 --- a/yudao-ui-app/pages.json +++ b/yudao-ui-app/pages.json @@ -22,6 +22,12 @@ "navigationBarTitleText": "权益明细" } }, + { + "path": "pages/member_back/index", + "style": { + "navigationBarTitleText": "话费返回" + } + }, { "path": "pages/member_equity/index", "style": { diff --git a/yudao-ui-app/pages/member_equity/index.vue b/yudao-ui-app/pages/member_equity/index.vue index dca63215d..edb9e0303 100644 --- a/yudao-ui-app/pages/member_equity/index.vue +++ b/yudao-ui-app/pages/member_equity/index.vue @@ -257,11 +257,11 @@ } button { + border-radius: 18rpx; margin-top: 10rpx; padding: 7rpx 16rpx; background: #F22E60; border-image: linear-gradient(0deg, #A8052E, #FFFFFF) 10 10; - border-radius: 18rpx; font-size: 22rpx; font-family: PingFang SC; font-weight: 400; diff --git a/yudao-ui-app/pages/member_others/index.vue b/yudao-ui-app/pages/member_others/index.vue index 37371e058..76c3d5af7 100644 --- a/yudao-ui-app/pages/member_others/index.vue +++ b/yudao-ui-app/pages/member_others/index.vue @@ -43,7 +43,6 @@