From 0560eed4a389f806dc3254a526e929e8476c868a Mon Sep 17 00:00:00 2001
From: Liuyi <candymxq888@outlook.com>
Date: 星期日, 29 九月 2024 18:52:51 +0800
Subject: [PATCH] 完成地址管理新增、删除、编辑、设置默认地址，修改navbar组件
---
pages/scanWater/index.vue | 14 ++
unpackage/dist/dev/mp-weixin/api/index.js | 16 ++
pages.json | 12
unpackage/dist/dev/mp-weixin/pages/index/index.wxml | 2
unpackage/dist/dev/mp-weixin/app.js | 2
unpackage/dist/dev/mp-weixin/app.json | 2
pages/address/index.vue | 64 ++++++--
pages/recharge/index.vue | 4
components/navbar/navbar.vue | 9 +
pages/addressAdd/index.vue | 115 +++++++++++-----
unpackage/dist/dev/mp-weixin/pages/index/index.js | 20 +-
/dev/null | 22 ---
unpackage/dist/dev/mp-weixin/components/navbar/navbar.js | 11 +
unpackage/dist/dev/mp-weixin/pages/recharge/index.js | 2
api/index.js | 16 ++
unpackage/dist/dev/mp-weixin/pages/address/index.wxml | 2
pages/index/index.vue | 12 +
unpackage/dist/dev/mp-weixin/pages/address/index.js | 57 ++++++-
unpackage/dist/dev/mp-weixin/pages/recharge/index.wxss | 2
19 files changed, 273 insertions(+), 111 deletions(-)
diff --git a/api/index.js b/api/index.js
index f48caa0..6c865b5 100644
--- a/api/index.js
+++ b/api/index.js
@@ -22,4 +22,20 @@
export function searchAddress(data){
return request('/userAddress/search',data,'POST')
}
+//编辑地址
+export function editAddressApi(data){
+ return request('/userAddress/modify',data,'POST')
+}
+//根据id获取地址
+export function getAddressApi(id){
+ return request(`/userAddress/get?id=${id}`,{},'GET')
+}
+//删除
+export function deleteAddressApi(id){
+ return request(`/userAddress/remove?id=${id}`,{},'GET')
+}
+//设置默认值
+export function setAddressDefaultApi(id){
+ return request(`/userAddress/editDefault?id=${id}`,{},'GET')
+}
diff --git a/components/navbar/navbar.vue b/components/navbar/navbar.vue
index de430d4..26a5679 100644
--- a/components/navbar/navbar.vue
+++ b/components/navbar/navbar.vue
@@ -6,7 +6,7 @@
</template>
<script setup>
- import { ref } from 'vue'
+ import { onMounted, ref ,watch} from 'vue'
function navBackTo(){
uni.navigateBack()
}
@@ -16,7 +16,12 @@
default:''
}
})
- const title = ref(props.title)
+ const pageTitle = ref(props.title)
+ watch(props.title,(New, Old)=>{
+ pageTitle.value = New
+ },
+ {immediate: true},
+ )
</script>
<style lang="scss">
diff --git a/pages.json b/pages.json
index 093e383..db15a38 100644
--- a/pages.json
+++ b/pages.json
@@ -19,6 +19,12 @@
}
},
{
+ "path" : "pages/scanWater/index",
+ "style": {
+ "navigationStyle":"custom"
+ }
+ },
+ {
"path" : "pages/recharge/index",
"style": {
"navigationStyle":"custom"
@@ -38,12 +44,6 @@
},
{
"path" : "pages/address/index",
- "style": {
- "navigationStyle":"custom"
- }
- },
- {
- "path" : "pages/addressEdit/index",
"style": {
"navigationStyle":"custom"
}
diff --git a/pages/address/index.vue b/pages/address/index.vue
index d2c53f5..2343167 100644
--- a/pages/address/index.vue
+++ b/pages/address/index.vue
@@ -1,17 +1,14 @@
<script setup>
import { ref ,onMounted } from 'vue'
- import { searchAddress } from '../../api/index.js';
+ import { searchAddress,editAddress,setAddressDefaultApi,deleteAddressApi } from '../../api/index.js';
+ import { onShow } from "@dcloudio/uni-app"
const addressList = ref([])
async function getAddressList(){
await searchAddress({limit:100,page:1}).then((res) =>{
if(res.code == 200){
res.data.list.forEach((item) =>{
res.data.list.forEach((item) =>{
- if(item.isDefault == 1){
- item.isDefault = true
- }else{
- item.isDefault = false
- }
+ item.isDefault = item.isDefault == 1 ? true : false
item.addressWhole = item.regionName.replace(/[,#]/g,' ') + item.address
})
})
@@ -19,14 +16,49 @@
}
})
}
- function navTo(){
- let title = '新增地址'
- let id = 0
- uni.navigateTo({
- url:'/pages/addressAdd/index'
+ async function setDefault(isDefault,id,index1){
+ if(isDefault == true){
+ console.log('true')
+ }else{
+ console.log('false')
+ await setAddressDefaultApi(id).then((res) =>{
+ if(res.code == 200){
+ getAddressList()
+ }else{
+ uni.showToast({
+ title: '设置失败',
+ image: '../../static/images/other/success.svg',
+ duration:500
+ })
+ }
+ })
+ }
+ }
+ async function deleteAddress(id){
+ await deleteAddressApi(id).then((res) =>{
+ if(res.code == 200){
+ uni.showToast({
+ title: '删除成功',
+ image: '../../static/images/other/success.svg',
+ duration:500
+ })
+ getAddressList()
+ }
})
}
- onMounted(()=>{
+
+ function navToModify(id){
+ uni.navigateTo({
+ url:`/pages/addressAdd/index?id=${id}`
+ })
+ }
+ function navToAdd(){
+ let id = null
+ uni.navigateTo({
+ url:`/pages/addressAdd/index?id=${id}`
+ })
+ }
+ onShow(async() =>{
getAddressList()
})
</script>
@@ -45,15 +77,15 @@
<view class="address-divide"></view>
<view class="handel">
<view class="handel-left">
- <radio color = "#4996E3" :value="item.id" :checked="item.isDefault"></radio>
+ <radio color = "#4996E3" :value="item.id" :checked="item.isDefault" @click="setDefault(item.isDefault,item.id,index)"></radio>
<text>设为默认</text>
</view>
<view class="handel-right">
- <view>
+ <view @click="navToModify(item.id)">
<image src="../../static/images/address/edit.png" alt=""></image>
<text>编辑</text>
</view>
- <view>
+ <view @click="deleteAddress(item.id)">
<image src="../../static/images/address/delete.png" alt=""></image>
<text>删除</text>
</view>
@@ -62,7 +94,7 @@
</view>
</block>
</view>
- <view class="subBtn" @click="navTo()">新增收货地址</view>
+ <view class="subBtn" @click="navToAdd()">新增收货地址</view>
</view>
</view>
</template>
diff --git a/pages/addressAdd/index.vue b/pages/addressAdd/index.vue
index aa462c1..df127cf 100644
--- a/pages/addressAdd/index.vue
+++ b/pages/addressAdd/index.vue
@@ -1,12 +1,86 @@
<script setup>
- import { onMounted, ref } from 'vue';
- import { getRegionApi,creatUserArchive } from '../../api/index.js';
+ import { onMounted, ref, watchEffect } from 'vue';
+ import { getRegionApi,creatUserArchive,getAddressApi,editAddressApi } from '../../api/index.js';
+ import { onLoad } from "@dcloudio/uni-app"
+
+ const addressId = ref()
+ const pageTitle = ref('新增地址')
+ const isCheckedDefault =ref(false)
+ const form = ref({
+ userName:'',
+ userPhone:'',
+ listRegion:[],
+ userAddress:'',
+ isDefault:null,
+ })
+ //获取地址
+ async function getAddress(){
+ if(addressId.value){
+ pageTitle.value = "编辑地址"
+ await getAddressApi(addressId.value).then((res) =>{
+ form.value.id = res.data.id
+ form.value.userName = res.data.userName
+ form.value.userPhone = res.data.userPhone
+ form.value.listRegion = res.data.region.replace(/#/g,'').split(',')
+ form.value.userAddress = res.data.address
+ form.value.isDefault = res.data.isDefault
+ regionName.value = res.data.regionName.replace(/[#,]/g,' ')
+ isCheckedDefault.value = form.value.isDefault == 1 ? true : false
+ pageTitle.value = "编辑地址"
+ console.log('form',form.value)
+ })
+ }
+ }
+ onLoad(async(option)=>{
+ addressId.value = option.id
+ console.log('1')
+ })
+ onMounted(()=>{
+ getAddress()
+ })
+ function change(e){
+ form.value.isDefault = e.detail.value ? 1 : 0
+ }
+ //提交表单数据
+ async function submit(){
+ //修改地址
+ if(form.value.id){
+ await editAddressApi(form.value).then((res) =>{
+ if(res.code == 200){
+ uni.showToast({
+ title: '修改成功',
+ image: '../../static/images/other/success.svg',
+ duration:500
+ })
+ setTimeout(() =>{
+ uni.navigateBack()
+ form.value = {}
+ },500)
+ }
+ })
+ }else{
+ //新增地址
+ await creatUserArchive(form.value).then((res) =>{
+ if(res.code == 200){
+ uni.showToast({
+ title: '新增成功',
+ image: '../../static/images/other/success.svg',
+ duration:500
+ })
+ setTimeout(() =>{
+ uni.navigateBack()
+ form.value = {}
+ },500)
+ }
+ })
+ }
+ }
const DaTreeRef = ref()
const treeListData = ref([])
- const selectRegionName = ref()
const isExpandIcon = ref(false)
const regionName = ref('')
+ //展开关闭选择框
function expandRegion(){
if(isExpandIcon.value){
isExpandIcon.value = false
@@ -40,8 +114,7 @@
nodeList.forEach((item)=>{
nameList.push(item.label)
})
- selectRegionName.value = nameList
- regionName.value = selectRegionName.value.join()
+ regionName.value = nameList.join()
}
//选中区域
function handleTreeChange(e,e2){
@@ -86,42 +159,14 @@
DaTreeRef.value.setExpandedKeys([item.key],true)
}
}
- const isCheckedDefault =ref(false)
- const form = ref({
- userName:'',
- userPhone:'',
- listRegion:[],
- userAddress:'',
- isDefault:null,
- })
- //提交表单数据
- async function submit(){
- console.log('form',form.value)
- await creatUserArchive(form.value).then((res) =>{
- if(res.code == 200){
- uni.showToast({
- title: '新增成功',
- image: '../../static/images/other/success.svg',
- duration:500
- })
- setTimeout(() =>{
- uni.navigateBack()
- form.value = {}
- },500)
- }
- })
- }
- function change(e){
- console.log('e',e)
- form.value.isDefault = e.detail.value ? 1 : null
- }
+
onMounted(async() =>{
await getRegion()
})
</script>
<template>
<view class="container">
- <navbar title ='新增地址'></navbar>
+ <navbar :title ='pageTitle'></navbar>
<view class="content">
<view class="main">
<view class="item">
diff --git a/pages/addressEdit/index.vue b/pages/addressEdit/index.vue
deleted file mode 100644
index c060725..0000000
--- a/pages/addressEdit/index.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
- <view>
- <navbar title ='编辑地址'></navbar>
- </view>
-</template>
-
-<script setup>
- import {ref,onMounted} from 'vue'
- import { onLoad } from "@dcloudio/uni-app"
-
- const title = ref()
- const id = ref()
- onLoad((option)=>{
- title.value = option.title
- id.value = option.id
- console.log('123',title.value,id.value)
- })
-</script>
-
-<style>
-
-</style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f91c3f4..3665b00 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -20,10 +20,18 @@
if(res.data.userInfo.waterCardNumber){
let res1 = await getVipInfoApi()
vipInfo.value = res1.data
- isVip.value = false
+ isVip.value = true
}else{
isVip.value = false
}
+ }
+ /**
+ * 扫码取水相关
+ */
+ function toScan(){
+ uni.navigateTo({
+ url:'/pages/scanWater/index'
+ })
}
/**
* 功能列表相关
@@ -117,7 +125,7 @@
充值
</view>
</view>
- <view class="box1-bg box1-three">
+ <view class="box1-bg box1-three" @click="toScan()">
<image src="../../static/images/index/icon23.png" alt=""></image>
<view>扫码取水</view>
</view>
diff --git a/pages/recharge/index.vue b/pages/recharge/index.vue
index d95a24b..e05745f 100644
--- a/pages/recharge/index.vue
+++ b/pages/recharge/index.vue
@@ -37,7 +37,7 @@
//支付方式
const payMethod = ref()
const payList = ref([
- {text:"支付宝支付",value:1,checked:true,img:'../../static/images/recharge/pay.png'},
+ // {text:"支付宝支付",value:1,checked:true,img:'../../static/images/recharge/pay.png'},
{text:"微信支付",value:2,checked:false,img:'../../static/images/recharge/wx.png'},
{text:"余额",value:3,checked:false,img:'../../static/images/recharge/balance.png'},
])
@@ -182,7 +182,7 @@
padding: 0 20rpx;
box-sizing: border-box;
// background: #49B4E3;
- height:216rpx;
+ height:130rpx;
display: flex;
flex-direction: column;
justify-content: space-between;
diff --git a/pages/scanWater/index.vue b/pages/scanWater/index.vue
new file mode 100644
index 0000000..383a3fe
--- /dev/null
+++ b/pages/scanWater/index.vue
@@ -0,0 +1,14 @@
+<template>
+ <view>
+ <navbar title ='设备详情'></navbar>
+ 扫码后跳转的页面
+ </view>
+</template>
+
+<script setup>
+
+</script>
+
+<style>
+
+</style>
diff --git a/unpackage/dist/dev/mp-weixin/api/index.js b/unpackage/dist/dev/mp-weixin/api/index.js
index 77147eb..6277491 100644
--- a/unpackage/dist/dev/mp-weixin/api/index.js
+++ b/unpackage/dist/dev/mp-weixin/api/index.js
@@ -18,9 +18,25 @@
function searchAddress(data) {
return util_request.request("/userAddress/search", data, "POST");
}
+function editAddressApi(data) {
+ return util_request.request("/userAddress/modify", data, "POST");
+}
+function getAddressApi(id) {
+ return util_request.request(`/userAddress/get?id=${id}`, {}, "GET");
+}
+function deleteAddressApi(id) {
+ return util_request.request(`/userAddress/remove?id=${id}`, {}, "GET");
+}
+function setAddressDefaultApi(id) {
+ return util_request.request(`/userAddress/editDefault?id=${id}`, {}, "GET");
+}
exports.creatUserArchive = creatUserArchive;
+exports.deleteAddressApi = deleteAddressApi;
+exports.editAddressApi = editAddressApi;
+exports.getAddressApi = getAddressApi;
exports.getRegionApi = getRegionApi;
exports.getUserInfo = getUserInfo;
exports.getVipInfoApi = getVipInfoApi;
exports.searchAddress = searchAddress;
+exports.setAddressDefaultApi = setAddressDefaultApi;
exports.wxLoginApi = wxLoginApi;
diff --git a/unpackage/dist/dev/mp-weixin/app.js b/unpackage/dist/dev/mp-weixin/app.js
index 7129ded..30574fa 100644
--- a/unpackage/dist/dev/mp-weixin/app.js
+++ b/unpackage/dist/dev/mp-weixin/app.js
@@ -6,11 +6,11 @@
"./pages/index/index.js";
"./pages/addCard/index.js";
"./pages/balanceRecord/index.js";
+ "./pages/scanWater/index.js";
"./pages/recharge/index.js";
"./pages/sendWater/index.js";
"./pages/preSendWater/index.js";
"./pages/address/index.js";
- "./pages/addressEdit/index.js";
"./pages/addressAdd/index.js";
"./pages/addressLocate/index.js";
"./pages/success/index.js";
diff --git a/unpackage/dist/dev/mp-weixin/app.json b/unpackage/dist/dev/mp-weixin/app.json
index 1286e25..1dcbc21 100644
--- a/unpackage/dist/dev/mp-weixin/app.json
+++ b/unpackage/dist/dev/mp-weixin/app.json
@@ -3,11 +3,11 @@
"pages/index/index",
"pages/addCard/index",
"pages/balanceRecord/index",
+ "pages/scanWater/index",
"pages/recharge/index",
"pages/sendWater/index",
"pages/preSendWater/index",
"pages/address/index",
- "pages/addressEdit/index",
"pages/addressAdd/index",
"pages/addressLocate/index",
"pages/success/index"
diff --git a/unpackage/dist/dev/mp-weixin/components/navbar/navbar.js b/unpackage/dist/dev/mp-weixin/components/navbar/navbar.js
index 7a2c5b4..4ccaa99 100644
--- a/unpackage/dist/dev/mp-weixin/components/navbar/navbar.js
+++ b/unpackage/dist/dev/mp-weixin/components/navbar/navbar.js
@@ -14,12 +14,19 @@
common_vendor.index.navigateBack();
}
const props = __props;
- const title = common_vendor.ref(props.title);
+ const pageTitle = common_vendor.ref(props.title);
+ common_vendor.watch(
+ props.title,
+ (New, Old) => {
+ pageTitle.value = New;
+ },
+ { immediate: true }
+ );
return (_ctx, _cache) => {
return {
a: common_assets._imports_0,
b: common_vendor.o(($event) => navBackTo()),
- c: common_vendor.t(title.value)
+ c: common_vendor.t(__props.title)
};
};
}
diff --git a/unpackage/dist/dev/mp-weixin/pages/address/index.js b/unpackage/dist/dev/mp-weixin/pages/address/index.js
index 97a4669..ea55123 100644
--- a/unpackage/dist/dev/mp-weixin/pages/address/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/address/index.js
@@ -19,11 +19,7 @@
if (res.code == 200) {
res.data.list.forEach((item) => {
res.data.list.forEach((item2) => {
- if (item2.isDefault == 1) {
- item2.isDefault = true;
- } else {
- item2.isDefault = false;
- }
+ item2.isDefault = item2.isDefault == 1 ? true : false;
item2.addressWhole = item2.regionName.replace(/[,#]/g, " ") + item2.address;
});
});
@@ -31,12 +27,48 @@
}
});
}
- function navTo() {
- common_vendor.index.navigateTo({
- url: "/pages/addressAdd/index"
+ async function setDefault(isDefault, id, index1) {
+ if (isDefault == true) {
+ console.log("true");
+ } else {
+ console.log("false");
+ await api_index.setAddressDefaultApi(id).then((res) => {
+ if (res.code == 200) {
+ getAddressList();
+ } else {
+ common_vendor.index.showToast({
+ title: "设置失败",
+ image: "../../static/images/other/success.svg",
+ duration: 500
+ });
+ }
+ });
+ }
+ }
+ async function deleteAddress(id) {
+ await api_index.deleteAddressApi(id).then((res) => {
+ if (res.code == 200) {
+ common_vendor.index.showToast({
+ title: "删除成功",
+ image: "../../static/images/other/success.svg",
+ duration: 500
+ });
+ getAddressList();
+ }
});
}
- common_vendor.onMounted(() => {
+ function navToModify(id) {
+ common_vendor.index.navigateTo({
+ url: `/pages/addressAdd/index?id=${id}`
+ });
+ }
+ function navToAdd() {
+ let id = null;
+ common_vendor.index.navigateTo({
+ url: `/pages/addressAdd/index?id=${id}`
+ });
+ }
+ common_vendor.onShow(async () => {
getAddressList();
});
return (_ctx, _cache) => {
@@ -50,12 +82,15 @@
b: common_vendor.t(item.userPhone),
c: common_vendor.t(item.addressWhole),
d: item.id,
- e: item.isDefault
+ e: item.isDefault,
+ f: common_vendor.o(($event) => setDefault(item.isDefault, item.id)),
+ g: common_vendor.o(($event) => navToModify(item.id)),
+ h: common_vendor.o(($event) => deleteAddress(item.id))
};
}),
c: common_assets._imports_0$3,
d: common_assets._imports_1$1,
- e: common_vendor.o(($event) => navTo())
+ e: common_vendor.o(($event) => navToAdd())
};
};
}
diff --git a/unpackage/dist/dev/mp-weixin/pages/address/index.wxml b/unpackage/dist/dev/mp-weixin/pages/address/index.wxml
index cb5a3bc..5155251 100644
--- a/unpackage/dist/dev/mp-weixin/pages/address/index.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/address/index.wxml
@@ -1 +1 @@
-<view class="container"><navbar wx:if="{{a}}" u-i="696da406-0" bind:__l="__l" u-p="{{a}}"></navbar><view class="content"><view class="main"><block wx:for="{{b}}" wx:for-item="item"><view class="address-item"><view class="user-info"><text>{{item.a}}</text><text>{{item.b}}</text></view><view class="address-info">{{item.c}}</view><view class="address-divide"></view><view class="handel"><view class="handel-left"><radio color="#4996E3" value="{{item.d}}" checked="{{item.e}}"></radio><text>设为默认</text></view><view class="handel-right"><view><image src="{{c}}" alt=""></image><text>编辑</text></view><view><image src="{{d}}" alt=""></image><text>删除</text></view></view></view></view></block></view><view class="subBtn" bindtap="{{e}}">新增收货地址</view></view></view>
\ No newline at end of file
+<view class="container"><navbar wx:if="{{a}}" u-i="696da406-0" bind:__l="__l" u-p="{{a}}"></navbar><view class="content"><view class="main"><block wx:for="{{b}}" wx:for-item="item"><view class="address-item"><view class="user-info"><text>{{item.a}}</text><text>{{item.b}}</text></view><view class="address-info">{{item.c}}</view><view class="address-divide"></view><view class="handel"><view class="handel-left"><radio color="#4996E3" value="{{item.d}}" checked="{{item.e}}" bindtap="{{item.f}}"></radio><text>设为默认</text></view><view class="handel-right"><view bindtap="{{item.g}}"><image src="{{c}}" alt=""></image><text>编辑</text></view><view bindtap="{{item.h}}"><image src="{{d}}" alt=""></image><text>删除</text></view></view></view></view></block></view><view class="subBtn" bindtap="{{e}}">新增收货地址</view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.js b/unpackage/dist/dev/mp-weixin/pages/index/index.js
index 607e0db..897b02d 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.js
@@ -18,10 +18,15 @@
if (res.data.userInfo.waterCardNumber) {
let res1 = await api_index.getVipInfoApi();
vipInfo.value = res1.data;
- isVip.value = false;
+ isVip.value = true;
} else {
isVip.value = false;
}
+ }
+ function toScan() {
+ common_vendor.index.navigateTo({
+ url: "/pages/scanWater/index"
+ });
}
const functionList = common_vendor.ref([
{ text: "余额记录", icon: "../../static/images/index/icon31.png", url: "/pages/balanceRecord/index" },
@@ -60,7 +65,8 @@
i: common_vendor.o(($event) => navTo("/pages/sendWater/index")),
j: common_vendor.o(($event) => navTo("/pages/recharge/index")),
k: common_assets._imports_5,
- l: common_vendor.f(functionList.value, (item, index, i0) => {
+ l: common_vendor.o(($event) => toScan()),
+ m: common_vendor.f(functionList.value, (item, index, i0) => {
return {
a: item.icon,
b: common_vendor.t(item.text),
@@ -68,11 +74,11 @@
d: index
};
}),
- m: common_assets._imports_6,
- n: common_assets._imports_7,
- o: common_assets._imports_8,
- p: common_assets._imports_9,
- q: common_assets._imports_8
+ n: common_assets._imports_6,
+ o: common_assets._imports_7,
+ p: common_assets._imports_8,
+ q: common_assets._imports_9,
+ r: common_assets._imports_8
});
};
}
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.wxml b/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
index 4682a38..2bc1dd2 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
@@ -1 +1 @@
-<view class="container data-v-1cf27b2a"><view class="content data-v-1cf27b2a"><view class="card-box data-v-1cf27b2a" style="{{'padding-top:' + g}}"><view class="card data-v-1cf27b2a"><view class="card-content data-v-1cf27b2a"><view wx:if="{{a}}" class="card-title data-v-1cf27b2a"><view class="data-v-1cf27b2a">会员卡</view><image class="data-v-1cf27b2a" src="{{b}}" alt=""></image></view><view wx:else class="card-add data-v-1cf27b2a"><view class="data-v-1cf27b2a" bindtap="{{d}}"><image class="data-v-1cf27b2a" src="{{c}}" alt=""></image><text class="data-v-1cf27b2a">添加会员卡</text></view></view><view class="card-info data-v-1cf27b2a"><view class="info-head data-v-1cf27b2a"><image class="data-v-1cf27b2a" src="{{e}}" alt=""></image></view><view class="info-content data-v-1cf27b2a"><view class="info-content-top data-v-1cf27b2a"><view class="data-v-1cf27b2a">张大左</view><view class="data-v-1cf27b2a">vip1</view></view><view class="info-content-bottom data-v-1cf27b2a">YL123654987521</view></view><view class="info-more data-v-1cf27b2a"><image class="data-v-1cf27b2a" src="{{f}}"></image></view></view><view class="card-bottom data-v-1cf27b2a"><view class="data-v-1cf27b2a">我的积分：200</view><view class="data-v-1cf27b2a">消费折扣：9.9折</view></view></view></view></view><view class="function-box1 data-v-1cf27b2a"><view class="box1-bg box1-one data-v-1cf27b2a" bindtap="{{i}}"><image class="data-v-1cf27b2a" src="{{h}}" alt=""></image><view class="data-v-1cf27b2a">送水到家</view></view><view class="box1-bg box1-two data-v-1cf27b2a"><view class="data-v-1cf27b2a">账户余额（元)</view><view class="recharge data-v-1cf27b2a"><text class="data-v-1cf27b2a">￥</text><text class="data-v-1cf27b2a">120.00</text></view><view class="data-v-1cf27b2a" bindtap="{{j}}"> 充值 </view></view><view class="box1-bg box1-three data-v-1cf27b2a"><image class="data-v-1cf27b2a" src="{{k}}" alt=""></image><view class="data-v-1cf27b2a">扫码取水</view></view></view><view class="function-box2 data-v-1cf27b2a"><view class="box2-title data-v-1cf27b2a"><text class="data-v-1cf27b2a">功能列表</text></view><view class="box2-content data-v-1cf27b2a"><block wx:for="{{l}}" wx:for-item="item" wx:key="d"><view class="box2-item data-v-1cf27b2a" bindtap="{{item.c}}"><image class="data-v-1cf27b2a" src="{{item.a}}" alt=""></image><view class="box2-item-text data-v-1cf27b2a">{{item.b}}</view></view></block></view></view><view class="advertisement-box data-v-1cf27b2a"><image class="data-v-1cf27b2a" src="{{m}}" alt=""></image></view><view class="service-box data-v-1cf27b2a"><view class="service-title data-v-1cf27b2a"><text class="data-v-1cf27b2a">服务指南</text></view><view class="service-content data-v-1cf27b2a"><view class="service-bg data-v-1cf27b2a"><view class="data-v-1cf27b2a"><image class="data-v-1cf27b2a" src="{{n}}" alt=""></image><text class="data-v-1cf27b2a">附近站点</text></view><view class="service-info data-v-1cf27b2a">蔡家供水服务中心正在营业中……</view><view class="data-v-1cf27b2a"><text class="data-v-1cf27b2a">查看更多</text><image class="data-v-1cf27b2a" src="{{o}}" alt=""></image></view></view><view class="service-bg data-v-1cf27b2a"><view class="data-v-1cf27b2a"><image class="data-v-1cf27b2a" src="{{p}}" alt=""></image><text class="data-v-1cf27b2a">公示公告</text></view><view class="service-info data-v-1cf27b2a">停水公告的部分摘要的内容展示……</view><view class="data-v-1cf27b2a"><text class="data-v-1cf27b2a">查看更多</text><image class="data-v-1cf27b2a" src="{{q}}" alt=""></image></view></view></view></view></view></view>
\ No newline at end of file
+<view class="container data-v-1cf27b2a"><view class="content data-v-1cf27b2a"><view class="card-box data-v-1cf27b2a" style="{{'padding-top:' + g}}"><view class="card data-v-1cf27b2a"><view class="card-content data-v-1cf27b2a"><view wx:if="{{a}}" class="card-title data-v-1cf27b2a"><view class="data-v-1cf27b2a">会员卡</view><image class="data-v-1cf27b2a" src="{{b}}" alt=""></image></view><view wx:else class="card-add data-v-1cf27b2a"><view class="data-v-1cf27b2a" bindtap="{{d}}"><image class="data-v-1cf27b2a" src="{{c}}" alt=""></image><text class="data-v-1cf27b2a">添加会员卡</text></view></view><view class="card-info data-v-1cf27b2a"><view class="info-head data-v-1cf27b2a"><image class="data-v-1cf27b2a" src="{{e}}" alt=""></image></view><view class="info-content data-v-1cf27b2a"><view class="info-content-top data-v-1cf27b2a"><view class="data-v-1cf27b2a">张大左</view><view class="data-v-1cf27b2a">vip1</view></view><view class="info-content-bottom data-v-1cf27b2a">YL123654987521</view></view><view class="info-more data-v-1cf27b2a"><image class="data-v-1cf27b2a" src="{{f}}"></image></view></view><view class="card-bottom data-v-1cf27b2a"><view class="data-v-1cf27b2a">我的积分：200</view><view class="data-v-1cf27b2a">消费折扣：9.9折</view></view></view></view></view><view class="function-box1 data-v-1cf27b2a"><view class="box1-bg box1-one data-v-1cf27b2a" bindtap="{{i}}"><image class="data-v-1cf27b2a" src="{{h}}" alt=""></image><view class="data-v-1cf27b2a">送水到家</view></view><view class="box1-bg box1-two data-v-1cf27b2a"><view class="data-v-1cf27b2a">账户余额（元)</view><view class="recharge data-v-1cf27b2a"><text class="data-v-1cf27b2a">￥</text><text class="data-v-1cf27b2a">120.00</text></view><view class="data-v-1cf27b2a" bindtap="{{j}}"> 充值 </view></view><view class="box1-bg box1-three data-v-1cf27b2a" bindtap="{{l}}"><image class="data-v-1cf27b2a" src="{{k}}" alt=""></image><view class="data-v-1cf27b2a">扫码取水</view></view></view><view class="function-box2 data-v-1cf27b2a"><view class="box2-title data-v-1cf27b2a"><text class="data-v-1cf27b2a">功能列表</text></view><view class="box2-content data-v-1cf27b2a"><block wx:for="{{m}}" wx:for-item="item" wx:key="d"><view class="box2-item data-v-1cf27b2a" bindtap="{{item.c}}"><image class="data-v-1cf27b2a" src="{{item.a}}" alt=""></image><view class="box2-item-text data-v-1cf27b2a">{{item.b}}</view></view></block></view></view><view class="advertisement-box data-v-1cf27b2a"><image class="data-v-1cf27b2a" src="{{n}}" alt=""></image></view><view class="service-box data-v-1cf27b2a"><view class="service-title data-v-1cf27b2a"><text class="data-v-1cf27b2a">服务指南</text></view><view class="service-content data-v-1cf27b2a"><view class="service-bg data-v-1cf27b2a"><view class="data-v-1cf27b2a"><image class="data-v-1cf27b2a" src="{{o}}" alt=""></image><text class="data-v-1cf27b2a">附近站点</text></view><view class="service-info data-v-1cf27b2a">蔡家供水服务中心正在营业中……</view><view class="data-v-1cf27b2a"><text class="data-v-1cf27b2a">查看更多</text><image class="data-v-1cf27b2a" src="{{p}}" alt=""></image></view></view><view class="service-bg data-v-1cf27b2a"><view class="data-v-1cf27b2a"><image class="data-v-1cf27b2a" src="{{q}}" alt=""></image><text class="data-v-1cf27b2a">公示公告</text></view><view class="service-info data-v-1cf27b2a">停水公告的部分摘要的内容展示……</view><view class="data-v-1cf27b2a"><text class="data-v-1cf27b2a">查看更多</text><image class="data-v-1cf27b2a" src="{{r}}" alt=""></image></view></view></view></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/recharge/index.js b/unpackage/dist/dev/mp-weixin/pages/recharge/index.js
index a0cb131..a60365c 100644
--- a/unpackage/dist/dev/mp-weixin/pages/recharge/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/recharge/index.js
@@ -44,7 +44,7 @@
const otherMoney = common_vendor.ref();
const payMethod = common_vendor.ref();
const payList = common_vendor.ref([
- { text: "支付宝支付", value: 1, checked: true, img: "../../static/images/recharge/pay.png" },
+ // {text:"支付宝支付",value:1,checked:true,img:'../../static/images/recharge/pay.png'},
{ text: "微信支付", value: 2, checked: false, img: "../../static/images/recharge/wx.png" },
{ text: "余额", value: 3, checked: false, img: "../../static/images/recharge/balance.png" }
]);
diff --git a/unpackage/dist/dev/mp-weixin/pages/recharge/index.wxss b/unpackage/dist/dev/mp-weixin/pages/recharge/index.wxss
index 2fd1ce5..b64853b 100644
--- a/unpackage/dist/dev/mp-weixin/pages/recharge/index.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/recharge/index.wxss
@@ -98,7 +98,7 @@
width: 100%;
padding: 0 20rpx;
box-sizing: border-box;
- height: 216rpx;
+ height: 130rpx;
display: flex;
flex-direction: column;
justify-content: space-between;
--
Gitblit v1.9.3