From 6479fb873fc2dcd9d8418b10f355c825b64b82eb Mon Sep 17 00:00:00 2001
From: Liuyi <candymxq888@outlook.com>
Date: 星期一, 30 九月 2024 17:01:26 +0800
Subject: [PATCH] 修改主页会员卡信息，修改会员卡绑定
---
pages/userInfo/index.vue | 51 ++++
unpackage/dist/dev/mp-weixin/pages/index/index.wxss | 174 ++++-----------
pages.json | 6
unpackage/dist/dev/mp-weixin/pages/index/index.wxml | 2
unpackage/dist/dev/mp-weixin/app.js | 1
unpackage/dist/dev/mp-weixin/app.json | 1
pages/address/index.vue | 2
pages/addCard/index.vue | 27 +
pages/addressAdd/index.vue | 3
unpackage/dist/dev/mp-weixin/pages/index/index.js | 55 +++-
unpackage/dist/dev/mp-weixin/pages/addCard/index.wxml | 2
api/index.js | 2
unpackage/dist/dev/mp-weixin/pages/addCard/index.js | 35 +-
pages/index/index.vue | 240 ++++++++-------------
unpackage/dist/dev/mp-weixin/common/assets.js | 20 -
unpackage/dist/dev/mp-weixin/pages/address/index.js | 2
16 files changed, 286 insertions(+), 337 deletions(-)
diff --git a/api/index.js b/api/index.js
index 6c865b5..0a07eac 100644
--- a/api/index.js
+++ b/api/index.js
@@ -14,7 +14,7 @@
export function getRegionApi(code){
return request(`/sysRegion/getListChild?code=${code}`,{},'GET')
}
-//创建用户档案、送水地址
+//开卡、用户档案、送水地址
export function creatUserArchive(data){
return request('/userArchives/realName',data,'POST')
}
diff --git a/pages.json b/pages.json
index db15a38..8ac4177 100644
--- a/pages.json
+++ b/pages.json
@@ -13,6 +13,12 @@
}
},
{
+ "path" : "pages/userInfo/index",
+ "style": {
+ "navigationStyle":"custom"
+ }
+ },
+ {
"path" : "pages/balanceRecord/index",
"style": {
"navigationStyle":"custom"
diff --git a/pages/addCard/index.vue b/pages/addCard/index.vue
index 11b54c8..a9d81c4 100644
--- a/pages/addCard/index.vue
+++ b/pages/addCard/index.vue
@@ -1,15 +1,24 @@
<script setup>
import { onMounted,ref} from 'vue';
+import{ creatUserArchive } from '../../api/index.js'
const form = ref({
- waterwaterCardNumber:'',
+ waterCardNumber:'',
userName:'',
userPhone:'',
- address:'',
remark:'',
})
-function submit(){
- console('res')
+async function submit(){
+ await creatUserArchive(form.value).then((res) =>{
+ if(res.code == 200){
+ uni.showToast({
+ title: '绑定成功',
+ image: '../../static/images/other/success.svg',
+ duration:500
+ })
+ uni.navigateBack()
+ }
+ })
}
onMounted(() =>{
})
@@ -28,23 +37,23 @@
</view>
<view class="form-item">
<text>姓名：</text>
- <input v-model="form.waterCardNumber" placeholder="请输入姓名"/>
+ <input v-model="form.userName" placeholder="请输入姓名"/>
</view>
<view class="form-item">
<text>联系方式：</text>
- <input v-model="form.waterCardNumber" placeholder="请输入手机号"/>
+ <input v-model="form.userPhone" placeholder="请输入手机号"/>
</view>
- <view class="form-item">
+ <!-- <view class="form-item">
<text>区域：</text>
<input v-model="form.waterCardNumber" placeholder="请选择区域"/>
</view>
<view class="form-item">
<text>地址：</text>
<input v-model="form.waterCardNumber" placeholder="请输入地址"/>
- </view>
+ </view> -->
<view class="form-item">
<text>备注：</text>
- <input v-model="form.waterCardNumber" placeholder="请输入内容"/>
+ <input v-model="form.remark" placeholder="请输入内容"/>
</view>
</view>
<view class="tips">
diff --git a/pages/address/index.vue b/pages/address/index.vue
index 2343167..13eb465 100644
--- a/pages/address/index.vue
+++ b/pages/address/index.vue
@@ -53,7 +53,7 @@
})
}
function navToAdd(){
- let id = null
+ let id = ''
uni.navigateTo({
url:`/pages/addressAdd/index?id=${id}`
})
diff --git a/pages/addressAdd/index.vue b/pages/addressAdd/index.vue
index df127cf..d8fd2a3 100644
--- a/pages/addressAdd/index.vue
+++ b/pages/addressAdd/index.vue
@@ -26,9 +26,10 @@
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)
})
+ }else{
+ console.log('xiznzeng')
}
}
onLoad(async(option)=>{
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3665b00..004c816 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,25 +1,42 @@
<script setup>
import { onMounted, ref } from "vue";
- import { getVipInfoApi } from '../../api/index.js'
- import { getUserInfo } from '../../api/index.js'
- //胶囊高度
+ import { getVipInfoApi,getUserInfo } from '../../api/index.js'
+ import { onShow } from '@dcloudio/uni-app'
+ //状态栏高度
const topHeight = ref(0)
function getTopHeight(){
if(uni.getMenuButtonBoundingClientRect){
- topHeight.value = (uni.getMenuButtonBoundingClientRect().top + uni.getMenuButtonBoundingClientRect().height) * 2
+ // topHeight.value = (uni.getMenuButtonBoundingClientRect().top + uni.getMenuButtonBoundingClientRect().height) * 2
+ topHeight.value = uni.getMenuButtonBoundingClientRect().top * 2
}
}
/**
* 会员卡相关
*/
- const vipInfo = ref()
+ const cardInfo = ref({
+ userName:'',
+ headImg:'',
+
+ waterCardNumber:'',
+ balance:'',
+ count:'',
+ userPhone:'',
+ })
const isVip = ref(false)
//获取会员卡信息
async function getVipInfo(){
let res = await getUserInfo()
+ cardInfo.value.userName = res.data.userInfo.userName
+ cardInfo.value.headImg = res.data.userInfo.headImg
+ cardInfo.value.userPhone = res.data.userInfo.userPhone
if(res.data.userInfo.waterCardNumber){
let res1 = await getVipInfoApi()
- vipInfo.value = res1.data
+ cardInfo.value.waterCardNumber = res1.data.userInfo.waterCardNumber
+ if(res1.data.cardType == 1){
+ cardInfo.value.balance = res1.data.balance
+ }else if(res1.data.cardType == 2){
+ cardInfo.value.count = res1.data.count
+ }
isVip.value = true
}else{
isVip.value = false
@@ -74,38 +91,35 @@
await getVipInfo()
// await getUserLocation()
})
+ onShow(async() =>{
+ await getVipInfo()
+ })
</script>
<template>
<view class="container">
<view class="content">
<view class="card-box" :style="{paddingTop:topHeight + 'rpx'}">
- <view class="card">
+ <view class="user-info">
+ <image class="user-img" src='../../static/images/index/hend1.png' alt=''></image>
+ <text>{{cardInfo.userName}}</text>
+ <image class="uesr-more"src="../../static/images/index/back.png"></image>
+ </view>
+ <view class="card" @click="navTo('/pages/userInfo/index')">
<view class="card-content">
- <view v-if="isVip" class="card-title">
- <view>会员卡</view>
- <image src="../../static/images/index/code1.png" alt=""></image>
- </view>
- <view v-else class="card-add">
- <view @click="navTo('/pages/addCard/index')">
- <image src="../../static/images/index/vip-add.png" alt=""></image>
- <text>添加会员卡</text>
- </view>
- </view>
- <view class="card-info">
- <view class="info-head"><image src="../../static/images/index/hend1.png" alt=""></image></view>
- <view class="info-content">
- <view class="info-content-top">
- <view>张大左</view>
- <view>vip1</view>
+ <view class="card-left">
+ <view class="left-top">
+ <view>
+ <image src="../../static/images/index/code1.png" alt=""></image>
+ <text>会员卡</text>
</view>
- <view class="info-content-bottom">YL123654987521</view>
+ <view>ID:{{cardInfo.waterCardNumber}}</view>
</view>
- <view class="info-more"><image src="../../static/images/index/back.png"></image></view>
+ <view></view>
</view>
- <view class="card-bottom">
- <view>我的积分：200</view>
- <view>消费折扣：9.9折</view>
+ <view class="card-right">
+ <view></view>
+ <view></view>
</view>
</view>
</view>
@@ -202,146 +216,68 @@
.card-box{
width: 100%;
height: auto;
- // background: #a0b5c7;
box-sizing: border-box;
padding: 0 32rpx;
background: linear-gradient(to bottom,#5EA1FA,#D2F2FE);
+ .user-info{
+ width:100%;
+ height:100rpx;
+ // background: #06BF5E;
+ display: flex;
+ align-items: center;
+ padding-left:15rpx;
+ box-sizing: border-box;
+ margin-bottom: 14rpx;
+ .user-img{
+ width:90rpx;
+ height:90rpx;
+ margin-right:20rpx;
+ }
+ text{
+ margin-right:20rpx;
+ color: #fff;
+ }
+ .uesr-more{
+ width: 12rpx;
+ height: 28rpx;;
+ }
+ }
.card{
width: 100%;
- height: 304rpx;
+ height: 290rpx;
background-image: url("../../static/images/index/card1.png");
background-repeat: no-repeat;
- background-size: 100%;
+ background-size: 100% 100%;
.card-content{
width: 100%;
height: 100%;
box-sizing: border-box;
- // background: #AFD5FF;
- padding: 14rpx 42rpx 64rpx 22rpx;
- .card-title{
- width:100%;
- height:64rpx;
+ padding:15rpx;
+ display: flex;
+ justify-content:space-between;
+ .card-left{
+ height:100%;
display: flex;
- justify-content: flex-end;
- // background: #82fec5;
- align-items: center;
- view{
- font-weight:300;
- font-size: 36rpx;
- color: #FFFFFF;
- letter-spacing:5rpx;
- text-align: left;
- }
- image{
- width:64rpx;
- height:64rpx;
- }
- }
- .card-add{
- width:100%;
- height:64rpx;
- display: flex;
- justify-content: flex-end;
- align-items: center;
- view{
- width: 172rpx;
- height:38rpx;
- border-radius:24rpx;
- background: #fff;
- display: flex;
- justify-content:flex-start;
- align-items:center;
- image{
- width:22rpx;
- height:22rpx;
- margin-left:15rpx;
- }
- text{
- font-weight: 300;
- font-size: 20rpx;
- color: #0088FF;
- margin-left:15rpx;
- }
- }
- }
- .card-info{
- width: 100%;
- height:100rpx;
- // background: #8ff6c3;
- margin-top: 18rpx;
- display: flex;
- justify-content: flex-start;
- align-items: center;
- .info-head{
- width: 100rpx;
- height:100rpx;
- margin-right: 20rpx;
- image{
- width: 100rpx;
- height:100rpx;
- }
- }
- .info-content{
- width: 216rpx;//108+86+22
- height:100rpx;
- // background: #54dac4;
+ justify-content:space-between;
+ flex-direction:column;
+ align-items:flex-start;
+ .left-top{
display: flex;
flex-direction: column;
- justify-content: flex-start;
- align-items: flex-start;
- .info-content-top{
- width: 100%;
+ view:first-child{
display: flex;
- justify-content:space-between;
- align-items:center;
- margin-bottom:8rpx;
- view:first-child{
- width: 108rpx;
- height: 50rpx;
- font-weight: 400;
+ align-items: center;
+ image{
+ width:70rpx;
+ height:70rpx;
+ }
+ text{
+ font-weight: 300;
font-size: 36rpx;
color: #FFFFFF;
- text-align: left;
- }
- view:last-child{
- width: 86rpx;
- height: 32rpx;
- font-weight:300;
- font-size: 26rpx;
- color: #FFFFFF;
- text-align: center;
- background-image: url('../../static/images/index/vip1.png');
}
}
- .info-content-bottom{
- width: 100%;
- font-weight: 300;
- font-size: 20rpx;
- color: #FFFFFF;
- letter-spacing:5rpx;
- text-align: left;
- }
}
- .info-more{
- width: 12rpx;
- height: 28rpx;
- margin-left:274rpx;
- image{
- width: 12rpx;
- height: 28rpx;
- }
- }
- }
- .card-bottom{
- margin-top:36rpx;
- width:100%;
- display: flex;
- justify-content:space-evenly;
- font-weight: 300;
- font-size: 20rpx;
- color: #D8D8D8;
- line-height: 0rpx;
- text-align: center;
}
}
}
@@ -349,7 +285,7 @@
.function-box1{
width:100%;
box-sizing:border-box;
- height: 227rpx;
+ height: 215rpx;
padding: 20rpx 32rpx 15rpx;
// background: rgba(85, 170, 0, 0.1);
display:flex;
@@ -357,7 +293,7 @@
align-items:center;
.box1-bg{
width:212rpx;
- height:200rpx;
+ height:180rpx;
border-radius:24rpx;
background: #fff;
box-shadow:0 0 12rpx 2rpx rgba(13,118,255,0.16);
@@ -437,7 +373,7 @@
.function-box2{
width:100%;
box-sizing:border-box;
- height: 443rpx;//374 + 44 + 距离 + 底部padding32
+ height: 429rpx;//374 + 44 + 距离 + 底部padding32
padding:0 32rpx 15rpx;
// background: rgba(46, 121, 170, 0.5);
.box2-title{
@@ -453,7 +389,7 @@
box-sizing: border-box;
padding:22rpx 35rpx;
width: 686rpx;
- height:374rpx;
+ height:360rpx;
background: #fff;
border-radius: 24rpx;
box-shadow: 0 0 12rpx 2rpx rgba(0, 0, 0, 0.1);
diff --git a/pages/userInfo/index.vue b/pages/userInfo/index.vue
new file mode 100644
index 0000000..3b17850
--- /dev/null
+++ b/pages/userInfo/index.vue
@@ -0,0 +1,51 @@
+<script setup>
+ import { ref } from 'vue'
+ const infoList = ref([
+ {text:'',value:''},
+ {text:'',value:''},
+ {text:'',value:''},
+ {text:'',value:''},
+ ])
+</script>
+<template>
+ <view class="container">
+ <navbar title = '账户详情'></navbar>
+ <view class="content">
+ <view class="info-box">
+ <view class="info-up"></view>
+ <view class="info-list">
+ <block v-for="(item,index) in infoList" :key = index>
+ <view class="item">
+ <text></text>
+ <text></text>
+ </view>
+ </block>
+ </view>
+ </view>
+ </view>
+ </view>
+</template>
+
+<style lang="scss">
+ .container{
+ width: 100%;
+ height: 100vh;
+ .content{
+ width: 100%;
+ height:calc(100vh - 176rpx);
+ background:linear-gradient(to top,#FFFFFF,#E8EFFF);
+ padding-top:36rpx;
+ .info-box{
+ width: 100%;
+ .info-up{
+ height:308rpx;
+ width:100%;
+ background: #FFFFFF;
+ }
+ .info-list{
+ width:100%;
+ }
+ }
+ }
+ }
+</style>
diff --git a/unpackage/dist/dev/mp-weixin/app.js b/unpackage/dist/dev/mp-weixin/app.js
index 30574fa..9db9338 100644
--- a/unpackage/dist/dev/mp-weixin/app.js
+++ b/unpackage/dist/dev/mp-weixin/app.js
@@ -5,6 +5,7 @@
if (!Math) {
"./pages/index/index.js";
"./pages/addCard/index.js";
+ "./pages/userInfo/index.js";
"./pages/balanceRecord/index.js";
"./pages/scanWater/index.js";
"./pages/recharge/index.js";
diff --git a/unpackage/dist/dev/mp-weixin/app.json b/unpackage/dist/dev/mp-weixin/app.json
index 1dcbc21..5aca3f5 100644
--- a/unpackage/dist/dev/mp-weixin/app.json
+++ b/unpackage/dist/dev/mp-weixin/app.json
@@ -2,6 +2,7 @@
"pages": [
"pages/index/index",
"pages/addCard/index",
+ "pages/userInfo/index",
"pages/balanceRecord/index",
"pages/scanWater/index",
"pages/recharge/index",
diff --git a/unpackage/dist/dev/mp-weixin/common/assets.js b/unpackage/dist/dev/mp-weixin/common/assets.js
index ba30338..4342d8c 100644
--- a/unpackage/dist/dev/mp-weixin/common/assets.js
+++ b/unpackage/dist/dev/mp-weixin/common/assets.js
@@ -1,14 +1,13 @@
"use strict";
-const _imports_0$5 = "/static/images/index/code1.png";
-const _imports_1$1 = "/static/images/index/vip-add.png";
-const _imports_2 = "/static/images/index/hend1.png";
-const _imports_3 = "/static/images/index/back.png";
-const _imports_4 = "/static/images/index/home21.png";
-const _imports_5 = "/static/images/index/icon23.png";
-const _imports_6 = "/static/images/index/bg4.png";
-const _imports_7 = "/static/images/index/icon51.png";
-const _imports_8 = "/static/images/index/more-info5.png";
-const _imports_9 = "/static/images/index/notice5.png";
+const _imports_0$5 = "/static/images/index/hend1.png";
+const _imports_1$1 = "/static/images/index/back.png";
+const _imports_2 = "/static/images/index/code1.png";
+const _imports_3 = "/static/images/index/home21.png";
+const _imports_4 = "/static/images/index/icon23.png";
+const _imports_5 = "/static/images/index/bg4.png";
+const _imports_6 = "/static/images/index/icon51.png";
+const _imports_7 = "/static/images/index/more-info5.png";
+const _imports_8 = "/static/images/index/notice5.png";
const _imports_0$4 = "/static/images/addCard/code.png";
const _imports_0$3 = "/static/images/address/edit.png";
const _imports_1 = "/static/images/address/delete.png";
@@ -30,4 +29,3 @@
exports._imports_6 = _imports_6;
exports._imports_7 = _imports_7;
exports._imports_8 = _imports_8;
-exports._imports_9 = _imports_9;
diff --git a/unpackage/dist/dev/mp-weixin/pages/addCard/index.js b/unpackage/dist/dev/mp-weixin/pages/addCard/index.js
index 7951bc9..fb13dd7 100644
--- a/unpackage/dist/dev/mp-weixin/pages/addCard/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/addCard/index.js
@@ -1,6 +1,7 @@
"use strict";
const common_vendor = require("../../common/vendor.js");
const common_assets = require("../../common/assets.js");
+const api_index = require("../../api/index.js");
if (!Array) {
const _easycom_navbar2 = common_vendor.resolveComponent("navbar");
_easycom_navbar2();
@@ -13,14 +14,22 @@
__name: "index",
setup(__props) {
const form = common_vendor.ref({
- waterwaterCardNumber: "",
+ waterCardNumber: "",
userName: "",
userPhone: "",
- address: "",
remark: ""
});
- function submit() {
- console("res");
+ async function submit() {
+ await api_index.creatUserArchive(form.value).then((res) => {
+ if (res.code == 200) {
+ common_vendor.index.showToast({
+ title: "绑定成功",
+ image: "../../static/images/other/success.svg",
+ duration: 500
+ });
+ common_vendor.index.navigateBack();
+ }
+ });
}
common_vendor.onMounted(() => {
});
@@ -32,17 +41,13 @@
b: form.value.waterCardNumber,
c: common_vendor.o(($event) => form.value.waterCardNumber = $event.detail.value),
d: common_assets._imports_0$2,
- e: form.value.waterCardNumber,
- f: common_vendor.o(($event) => form.value.waterCardNumber = $event.detail.value),
- g: form.value.waterCardNumber,
- h: common_vendor.o(($event) => form.value.waterCardNumber = $event.detail.value),
- i: form.value.waterCardNumber,
- j: common_vendor.o(($event) => form.value.waterCardNumber = $event.detail.value),
- k: form.value.waterCardNumber,
- l: common_vendor.o(($event) => form.value.waterCardNumber = $event.detail.value),
- m: form.value.waterCardNumber,
- n: common_vendor.o(($event) => form.value.waterCardNumber = $event.detail.value),
- o: common_vendor.o(($event) => submit())
+ e: form.value.userName,
+ f: common_vendor.o(($event) => form.value.userName = $event.detail.value),
+ g: form.value.userPhone,
+ h: common_vendor.o(($event) => form.value.userPhone = $event.detail.value),
+ i: form.value.remark,
+ j: common_vendor.o(($event) => form.value.remark = $event.detail.value),
+ k: common_vendor.o(($event) => submit())
};
};
}
diff --git a/unpackage/dist/dev/mp-weixin/pages/addCard/index.wxml b/unpackage/dist/dev/mp-weixin/pages/addCard/index.wxml
index 6f32ead..8831a4f 100644
--- a/unpackage/dist/dev/mp-weixin/pages/addCard/index.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/addCard/index.wxml
@@ -1 +1 @@
-<view class="container data-v-4c5e7c86"><view class="content data-v-4c5e7c86"><navbar wx:if="{{a}}" class="data-v-4c5e7c86" u-i="4c5e7c86-0" bind:__l="__l" u-p="{{a}}"></navbar><view class="main data-v-4c5e7c86"><view class="title data-v-4c5e7c86">请填写卡及个人信息</view><view class="form data-v-4c5e7c86"><view class="form-item card-item data-v-4c5e7c86"><text class="data-v-4c5e7c86">卡号：</text><input class="data-v-4c5e7c86" placeholder="请输入卡号" value="{{b}}" bindinput="{{c}}"/><image class="data-v-4c5e7c86" src="{{d}}" alt=""></image></view><view class="form-item data-v-4c5e7c86"><text class="data-v-4c5e7c86">姓名：</text><input class="data-v-4c5e7c86" placeholder="请输入姓名" value="{{e}}" bindinput="{{f}}"/></view><view class="form-item data-v-4c5e7c86"><text class="data-v-4c5e7c86">联系方式：</text><input class="data-v-4c5e7c86" placeholder="请输入手机号" value="{{g}}" bindinput="{{h}}"/></view><view class="form-item data-v-4c5e7c86"><text class="data-v-4c5e7c86">区域：</text><input class="data-v-4c5e7c86" placeholder="请选择区域" value="{{i}}" bindinput="{{j}}"/></view><view class="form-item data-v-4c5e7c86"><text class="data-v-4c5e7c86">地址：</text><input class="data-v-4c5e7c86" placeholder="请输入地址" value="{{k}}" bindinput="{{l}}"/></view><view class="form-item data-v-4c5e7c86"><text class="data-v-4c5e7c86">备注：</text><input class="data-v-4c5e7c86" placeholder="请输入内容" value="{{m}}" bindinput="{{n}}"/></view></view><view class="tips data-v-4c5e7c86"><text class="data-v-4c5e7c86">1、完成实名认证，方便遗失挂失及补卡等。</text><text class="data-v-4c5e7c86">2、绑卡后，运营商可以看到您实名时填写的 姓名和电话。</text></view><view class="subBtn data-v-4c5e7c86" bindtap="{{o}}">提交信息</view></view></view></view>
\ No newline at end of file
+<view class="container data-v-4c5e7c86"><view class="content data-v-4c5e7c86"><navbar wx:if="{{a}}" class="data-v-4c5e7c86" u-i="4c5e7c86-0" bind:__l="__l" u-p="{{a}}"></navbar><view class="main data-v-4c5e7c86"><view class="title data-v-4c5e7c86">请填写卡及个人信息</view><view class="form data-v-4c5e7c86"><view class="form-item card-item data-v-4c5e7c86"><text class="data-v-4c5e7c86">卡号：</text><input class="data-v-4c5e7c86" placeholder="请输入卡号" value="{{b}}" bindinput="{{c}}"/><image class="data-v-4c5e7c86" src="{{d}}" alt=""></image></view><view class="form-item data-v-4c5e7c86"><text class="data-v-4c5e7c86">姓名：</text><input class="data-v-4c5e7c86" placeholder="请输入姓名" value="{{e}}" bindinput="{{f}}"/></view><view class="form-item data-v-4c5e7c86"><text class="data-v-4c5e7c86">联系方式：</text><input class="data-v-4c5e7c86" placeholder="请输入手机号" value="{{g}}" bindinput="{{h}}"/></view><view class="form-item data-v-4c5e7c86"><text class="data-v-4c5e7c86">备注：</text><input class="data-v-4c5e7c86" placeholder="请输入内容" value="{{i}}" bindinput="{{j}}"/></view></view><view class="tips data-v-4c5e7c86"><text class="data-v-4c5e7c86">1、完成实名认证，方便遗失挂失及补卡等。</text><text class="data-v-4c5e7c86">2、绑卡后，运营商可以看到您实名时填写的 姓名和电话。</text></view><view class="subBtn data-v-4c5e7c86" bindtap="{{k}}">提交信息</view></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/address/index.js b/unpackage/dist/dev/mp-weixin/pages/address/index.js
index ea55123..3be78a3 100644
--- a/unpackage/dist/dev/mp-weixin/pages/address/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/address/index.js
@@ -63,7 +63,7 @@
});
}
function navToAdd() {
- let id = null;
+ let id = "";
common_vendor.index.navigateTo({
url: `/pages/addressAdd/index?id=${id}`
});
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.js b/unpackage/dist/dev/mp-weixin/pages/index/index.js
index 897b02d..ab50f11 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.js
@@ -8,16 +8,31 @@
const topHeight = common_vendor.ref(0);
function getTopHeight() {
if (common_vendor.index.getMenuButtonBoundingClientRect) {
- topHeight.value = (common_vendor.index.getMenuButtonBoundingClientRect().top + common_vendor.index.getMenuButtonBoundingClientRect().height) * 2;
+ topHeight.value = common_vendor.index.getMenuButtonBoundingClientRect().top * 2;
}
}
- const vipInfo = common_vendor.ref();
+ const cardInfo = common_vendor.ref({
+ userName: "",
+ headImg: "",
+ waterCardNumber: "",
+ balance: "",
+ count: "",
+ userPhone: ""
+ });
const isVip = common_vendor.ref(false);
async function getVipInfo() {
let res = await api_index.getUserInfo();
+ cardInfo.value.userName = res.data.userInfo.userName;
+ cardInfo.value.headImg = res.data.userInfo.headImg;
+ cardInfo.value.userPhone = res.data.userInfo.userPhone;
if (res.data.userInfo.waterCardNumber) {
let res1 = await api_index.getVipInfoApi();
- vipInfo.value = res1.data;
+ cardInfo.value.waterCardNumber = res1.data.userInfo.waterCardNumber;
+ if (res1.data.cardType == 1) {
+ cardInfo.value.balance = res1.data.balance;
+ } else if (res1.data.cardType == 2) {
+ cardInfo.value.count = res1.data.count;
+ }
isVip.value = true;
} else {
isVip.value = false;
@@ -49,22 +64,22 @@
getTopHeight();
await getVipInfo();
});
+ common_vendor.onShow(async () => {
+ await getVipInfo();
+ });
return (_ctx, _cache) => {
- return common_vendor.e({
- a: isVip.value
- }, isVip.value ? {
- b: common_assets._imports_0$1
- } : {
+ return {
+ a: common_assets._imports_0$1,
+ b: common_vendor.t(cardInfo.value.userName),
c: common_assets._imports_1,
- d: common_vendor.o(($event) => navTo("/pages/addCard/index"))
- }, {
- e: common_assets._imports_2,
- f: common_assets._imports_3,
+ d: common_assets._imports_2,
+ e: common_vendor.t(cardInfo.value.waterCardNumber),
+ f: common_vendor.o(($event) => navTo("/pages/userInfo/index")),
g: topHeight.value + "rpx",
- h: common_assets._imports_4,
+ h: common_assets._imports_3,
i: common_vendor.o(($event) => navTo("/pages/sendWater/index")),
j: common_vendor.o(($event) => navTo("/pages/recharge/index")),
- k: common_assets._imports_5,
+ k: common_assets._imports_4,
l: common_vendor.o(($event) => toScan()),
m: common_vendor.f(functionList.value, (item, index, i0) => {
return {
@@ -74,12 +89,12 @@
d: index
};
}),
- 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
- });
+ n: common_assets._imports_5,
+ o: common_assets._imports_6,
+ p: common_assets._imports_7,
+ q: common_assets._imports_8,
+ r: common_assets._imports_7
+ };
};
}
};
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.wxml b/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
index 2bc1dd2..5ab305d 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" 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
+<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="user-info data-v-1cf27b2a"><image class="user-img data-v-1cf27b2a" src="{{a}}" alt=""></image><text class="data-v-1cf27b2a">{{b}}</text><image class="uesr-more data-v-1cf27b2a" src="{{c}}"></image></view><view class="card data-v-1cf27b2a" bindtap="{{f}}"><view class="card-content data-v-1cf27b2a"><view class="card-left data-v-1cf27b2a"><view class="left-top data-v-1cf27b2a"><view class="data-v-1cf27b2a"><image class="data-v-1cf27b2a" src="{{d}}" alt=""></image><text class="data-v-1cf27b2a">会员卡</text></view><view class="data-v-1cf27b2a">ID:{{e}}</view></view><view class="data-v-1cf27b2a"></view></view><view class="card-right data-v-1cf27b2a"><view class="data-v-1cf27b2a"></view><view class="data-v-1cf27b2a"></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/index/index.wxss b/unpackage/dist/dev/mp-weixin/pages/index/index.wxss
index 42bc800..7cde08c 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.wxss
@@ -40,145 +40,71 @@
padding: 0 32rpx;
background: linear-gradient(to bottom, #5EA1FA, #D2F2FE);
}
+.container .content .card-box .user-info.data-v-1cf27b2a {
+ width: 100%;
+ height: 100rpx;
+ display: flex;
+ align-items: center;
+ padding-left: 15rpx;
+ box-sizing: border-box;
+ margin-bottom: 14rpx;
+}
+.container .content .card-box .user-info .user-img.data-v-1cf27b2a {
+ width: 90rpx;
+ height: 90rpx;
+ margin-right: 20rpx;
+}
+.container .content .card-box .user-info text.data-v-1cf27b2a {
+ margin-right: 20rpx;
+ color: #fff;
+}
+.container .content .card-box .user-info .uesr-more.data-v-1cf27b2a {
+ width: 12rpx;
+ height: 28rpx;
+}
.container .content .card-box .card.data-v-1cf27b2a {
width: 100%;
- height: 304rpx;
+ height: 290rpx;
background-image: url("data:image/png;base64,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");
background-repeat: no-repeat;
- background-size: 100%;
+ background-size: 100% 100%;
}
.container .content .card-box .card .card-content.data-v-1cf27b2a {
width: 100%;
height: 100%;
box-sizing: border-box;
- padding: 14rpx 42rpx 64rpx 22rpx;
-}
-.container .content .card-box .card .card-content .card-title.data-v-1cf27b2a {
- width: 100%;
- height: 64rpx;
- display: flex;
- justify-content: flex-end;
- align-items: center;
-}
-.container .content .card-box .card .card-content .card-title view.data-v-1cf27b2a {
- font-weight: 300;
- font-size: 36rpx;
- color: #FFFFFF;
- letter-spacing: 5rpx;
- text-align: left;
-}
-.container .content .card-box .card .card-content .card-title image.data-v-1cf27b2a {
- width: 64rpx;
- height: 64rpx;
-}
-.container .content .card-box .card .card-content .card-add.data-v-1cf27b2a {
- width: 100%;
- height: 64rpx;
- display: flex;
- justify-content: flex-end;
- align-items: center;
-}
-.container .content .card-box .card .card-content .card-add view.data-v-1cf27b2a {
- width: 172rpx;
- height: 38rpx;
- border-radius: 24rpx;
- background: #fff;
- display: flex;
- justify-content: flex-start;
- align-items: center;
-}
-.container .content .card-box .card .card-content .card-add view image.data-v-1cf27b2a {
- width: 22rpx;
- height: 22rpx;
- margin-left: 15rpx;
-}
-.container .content .card-box .card .card-content .card-add view text.data-v-1cf27b2a {
- font-weight: 300;
- font-size: 20rpx;
- color: #0088FF;
- margin-left: 15rpx;
-}
-.container .content .card-box .card .card-content .card-info.data-v-1cf27b2a {
- width: 100%;
- height: 100rpx;
- margin-top: 18rpx;
- display: flex;
- justify-content: flex-start;
- align-items: center;
-}
-.container .content .card-box .card .card-content .card-info .info-head.data-v-1cf27b2a {
- width: 100rpx;
- height: 100rpx;
- margin-right: 20rpx;
-}
-.container .content .card-box .card .card-content .card-info .info-head image.data-v-1cf27b2a {
- width: 100rpx;
- height: 100rpx;
-}
-.container .content .card-box .card .card-content .card-info .info-content.data-v-1cf27b2a {
- width: 216rpx;
- height: 100rpx;
- display: flex;
- flex-direction: column;
- justify-content: flex-start;
- align-items: flex-start;
-}
-.container .content .card-box .card .card-content .card-info .info-content .info-content-top.data-v-1cf27b2a {
- width: 100%;
+ padding: 15rpx;
display: flex;
justify-content: space-between;
- align-items: center;
- margin-bottom: 8rpx;
}
-.container .content .card-box .card .card-content .card-info .info-content .info-content-top view.data-v-1cf27b2a:first-child {
- width: 108rpx;
- height: 50rpx;
- font-weight: 400;
+.container .content .card-box .card .card-content .card-left.data-v-1cf27b2a {
+ height: 100%;
+ display: flex;
+ justify-content: space-between;
+ flex-direction: column;
+ align-items: flex-start;
+}
+.container .content .card-box .card .card-content .card-left .left-top.data-v-1cf27b2a {
+ display: flex;
+ flex-direction: column;
+}
+.container .content .card-box .card .card-content .card-left .left-top view.data-v-1cf27b2a:first-child {
+ display: flex;
+ align-items: center;
+}
+.container .content .card-box .card .card-content .card-left .left-top view:first-child image.data-v-1cf27b2a {
+ width: 70rpx;
+ height: 70rpx;
+}
+.container .content .card-box .card .card-content .card-left .left-top view:first-child text.data-v-1cf27b2a {
+ font-weight: 300;
font-size: 36rpx;
color: #FFFFFF;
- text-align: left;
-}
-.container .content .card-box .card .card-content .card-info .info-content .info-content-top view.data-v-1cf27b2a:last-child {
- width: 86rpx;
- height: 32rpx;
- font-weight: 300;
- font-size: 26rpx;
- color: #FFFFFF;
- text-align: center;
- background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACsAAAAQCAYAAACP4IauAAAAAXNSR0IArs4c6QAAAdxJREFUSEvNlr1LHFEUxe85d3ZnEvGjt5RowgpbaJvKNGIVsisEQsAmJllm/UC0SJ3WTaNs0oh/RNKIzbo2SaMkLIhY2llIEg3ix8i8mdFRRMzoDk4zb97c995vzpz37oVcul79mO7xPH0L0SFCO0F9SFAAFVAlapNhH1SiNk0Mxdz9MSY+3nce678n/bhwziB2H9BtUr+KxeqMk9+I4yF66Pv8JtOdb/sonk6QapnJLgFeBRvBBIveDvYCOHkEZiqb9r8PX9B/6HMa2MFvrt3WnlkC9On5F98M1iwQqnynsNHfBOtZJ/usjEcHBna4PlaF6Kiv3P/CNk3Z0ErGKsLqpPP4HV7USzkVax2imgS22cqGvj4WYR6FmlsBOB75814qG2zWTyjWyg0BniSFTUdZs38aKNbcvwK2JIVNxbOBsnu+DX4DbE0Km5ayoP5BccX9KcLepLBpKUvoLxRq5VkAE0lh01JWoBU8Xy33WidYI5IdXWkoS+ixl2U+SAqrY3Pw9P29PWep85PZntKt023zlWU9Y8fSrakPNl27fefBHIERQHnTQqZpnqWeAFywHafk1wVnhUy8DHv5fSZHz3oNcIBkF6Ad15WId6osdZfQLQDLlucsTrXmGnG2Ux7nYTiYHiPjAAAAAElFTkSuQmCC");
-}
-.container .content .card-box .card .card-content .card-info .info-content .info-content-bottom.data-v-1cf27b2a {
- width: 100%;
- font-weight: 300;
- font-size: 20rpx;
- color: #FFFFFF;
- letter-spacing: 5rpx;
- text-align: left;
-}
-.container .content .card-box .card .card-content .card-info .info-more.data-v-1cf27b2a {
- width: 12rpx;
- height: 28rpx;
- margin-left: 274rpx;
-}
-.container .content .card-box .card .card-content .card-info .info-more image.data-v-1cf27b2a {
- width: 12rpx;
- height: 28rpx;
-}
-.container .content .card-box .card .card-content .card-bottom.data-v-1cf27b2a {
- margin-top: 36rpx;
- width: 100%;
- display: flex;
- justify-content: space-evenly;
- font-weight: 300;
- font-size: 20rpx;
- color: #D8D8D8;
- line-height: 0rpx;
- text-align: center;
}
.container .content .function-box1.data-v-1cf27b2a {
width: 100%;
box-sizing: border-box;
- height: 227rpx;
+ height: 215rpx;
padding: 20rpx 32rpx 15rpx;
display: flex;
justify-content: space-between;
@@ -186,7 +112,7 @@
}
.container .content .function-box1 .box1-bg.data-v-1cf27b2a {
width: 212rpx;
- height: 200rpx;
+ height: 180rpx;
border-radius: 24rpx;
background: #fff;
box-shadow: 0 0 12rpx 2rpx rgba(13, 118, 255, 0.16);
@@ -263,7 +189,7 @@
.container .content .function-box2.data-v-1cf27b2a {
width: 100%;
box-sizing: border-box;
- height: 443rpx;
+ height: 429rpx;
padding: 0 32rpx 15rpx;
}
.container .content .function-box2 .box2-title.data-v-1cf27b2a {
@@ -279,7 +205,7 @@
box-sizing: border-box;
padding: 22rpx 35rpx;
width: 686rpx;
- height: 374rpx;
+ height: 360rpx;
background: #fff;
border-radius: 24rpx;
box-shadow: 0 0 12rpx 2rpx rgba(0, 0, 0, 0.1);
--
Gitblit v1.9.3