diff --git a/property-uniapp-project/pages.json b/property-uniapp-project/pages.json index 056a77c..90256d8 100644 --- a/property-uniapp-project/pages.json +++ b/property-uniapp-project/pages.json @@ -381,7 +381,14 @@ "navigationBarTitleText": "", "navigationStyle": "custom" } + }, { + "path": "addHydropower", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } } + ] }, { diff --git a/property-uniapp-project/pages/my/myHouseIndex.vue b/property-uniapp-project/pages/my/myHouseIndex.vue index 5488422..44744ab 100644 --- a/property-uniapp-project/pages/my/myHouseIndex.vue +++ b/property-uniapp-project/pages/my/myHouseIndex.vue @@ -326,6 +326,7 @@ margin-top:10rpx; display: flex; justify-content: space-between; + align-items: center; z-index: 99 !important; } diff --git a/property-uniapp-project/pages/payment-list/addHydropower.vue b/property-uniapp-project/pages/payment-list/addHydropower.vue new file mode 100644 index 0000000..4323d94 --- /dev/null +++ b/property-uniapp-project/pages/payment-list/addHydropower.vue @@ -0,0 +1,519 @@ + + + + + + \ No newline at end of file diff --git a/property-uniapp-project/pages/payment-list/addPayment.vue b/property-uniapp-project/pages/payment-list/addPayment.vue index 15b382f..d31e782 100644 --- a/property-uniapp-project/pages/payment-list/addPayment.vue +++ b/property-uniapp-project/pages/payment-list/addPayment.vue @@ -66,7 +66,7 @@ - + @@ -75,10 +75,8 @@ 我已阅并同意 《协议链接》 - - diff --git a/property-uniapp-project/pages/payment-list/paymentIndex.vue b/property-uniapp-project/pages/payment-list/paymentIndex.vue index f52b235..128f219 100644 --- a/property-uniapp-project/pages/payment-list/paymentIndex.vue +++ b/property-uniapp-project/pages/payment-list/paymentIndex.vue @@ -180,13 +180,23 @@ }, // 跳转到新增缴费 goToAdd(type) { + if (type.name == '燃气') { + uni.redirectTo({ + url: '/pages/payment-list/selectPaymentEntity', + success: res => {}, + fail: () => {}, + complete: () => {} + }); + }else if(type.name == '水'||type.name == '电') { + uni.redirectTo({ + url: '/pages/payment-list/addHydropower', + success: res => {}, + fail: () => {}, + complete: () => {} + }); + } uni.setStorageSync('addPaymentType', type.name) - uni.redirectTo({ - url: '/pages/payment-list/selectPaymentEntity', - success: res => {}, - fail: () => {}, - complete: () => {} - }); + }, goBack() { uni.switchTab({ diff --git a/property-uniapp-project/static/propertyImgs/scanTheCodeIcon.png b/property-uniapp-project/static/propertyImgs/scanTheCodeIcon.png new file mode 100644 index 0000000..1d93291 Binary files /dev/null and b/property-uniapp-project/static/propertyImgs/scanTheCodeIcon.png differ