From 7cbda90b02e31447122f1d22c9797b423d7bd9fc Mon Sep 17 00:00:00 2001
From: Liuyi <candymxq888@outlook.com>
Date: 星期三, 16 十月 2024 17:26:06 +0800
Subject: [PATCH] 添加扫码成功操作页，修改主页面样式，更换主页图标
---
pages/infoBreakdown/index.vue | 4
static/images/index/icon36.png | 0
pages/functionList/rechargeRecord/index.vue | 4
unpackage/dist/dev/mp-weixin/static/images/index/icon32.png | 0
static/images/index/icon31.png | 0
unpackage/dist/dev/mp-weixin/static/images/index/icon31.png | 0
unpackage/dist/dev/mp-weixin/static/images/index/icon36.png | 0
config/baseUrl.js | 4
unpackage/dist/dev/mp-weixin/pages/index/index.js | 60 ++++++++---
pages/functionList/paymentRecord/index.vue | 4
static/images/index/icon32.png | 0
unpackage/dist/dev/mp-weixin/static/images/index/icon33.png | 0
static/images/index/icon33.png | 0
unpackage/dist/dev/mp-weixin/static/images/index/icon37.png | 0
unpackage/dist/dev/mp-weixin/pages/recharge/index.wxml | 2
static/images/index/icon37.png | 0
pages/index/index.vue | 72 ++++++++++---
unpackage/dist/dev/mp-weixin/static/images/index/code1.png | 0
pages/scanWater/index.vue | 61 +++++++++++-
static/images/other/success.png | 0
static/images/index/icon34.png | 0
unpackage/dist/dev/mp-weixin/pages/index/index.wxss | 17 ++
unpackage/dist/dev/mp-weixin/pages/index/index.wxml | 2
unpackage/dist/dev/mp-weixin/static/images/index/icon34.png | 0
static/images/code1.png | 0
static/images/index/icon38.png | 0
unpackage/dist/dev/mp-weixin/config/baseUrl.js | 2
static/images/index/icon21.png | 0
pages/recharge/index.vue | 3
unpackage/dist/dev/mp-weixin/static/images/index/icon22.png | 0
static/images/index/icon35.png | 0
unpackage/dist/dev/mp-weixin/static/images/index/icon35.png | 0
unpackage/dist/dev/mp-weixin/static/images/index/icon38.png | 0
static/images/index/code1.png | 0
unpackage/dist/dev/mp-weixin/pages/recharge/index.js | 5
static/images/index/icon22.png | 0
static/images/other/success1.png | 0
unpackage/dist/dev/mp-weixin/common/assets.js | 2
38 files changed, 177 insertions(+), 65 deletions(-)
diff --git a/config/baseUrl.js b/config/baseUrl.js
index ce2bd99..46e327b 100644
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -1,3 +1,3 @@
// export const BASE_URL = 'http://113.250.189.120:8031'
-export const BASE_URL = 'http://192.168.0.105:8031'
-// export const BASE_URL = 'https://www.huiwuyuntong.com/water-drinking-beta'
\ No newline at end of file
+// export const BASE_URL = 'http://192.168.0.105:8031'
+export const BASE_URL = 'https://www.huiwuyuntong.com/water-drinking-beta'
\ No newline at end of file
diff --git a/pages/functionList/paymentRecord/index.vue b/pages/functionList/paymentRecord/index.vue
index b502a0a..eed3143 100644
--- a/pages/functionList/paymentRecord/index.vue
+++ b/pages/functionList/paymentRecord/index.vue
@@ -49,7 +49,7 @@
<picker mode="date" :value="datePay" :fields="'month'" @change="bindDateChange">
<view class="date-text">
<text class="uni-input">{{datePay}}</text>
- <image src="../../../static/images/other/more.png" alt=''></image>
+ <image src="../../../static/images/other/expand.png" alt=''></image>
</view>
</picker>
</view>
@@ -93,7 +93,7 @@
text{
font-weight: 300;
font-size: 32rpx;
- color: #000000;
+ color: #5487f4;
margin-right:10rpx;
}
image{
diff --git a/pages/functionList/rechargeRecord/index.vue b/pages/functionList/rechargeRecord/index.vue
index fd9aa3e..e794bab 100644
--- a/pages/functionList/rechargeRecord/index.vue
+++ b/pages/functionList/rechargeRecord/index.vue
@@ -49,7 +49,7 @@
<picker mode="date" :value="datePay" :fields="'month'" @change="bindDateChange">
<view class="date-text">
<text class="uni-input">{{datePay}}</text>
- <image src="../../../static/images/other/more.png" alt=''></image>
+ <image src="../../../static/images/other/expand.png" alt=''></image>
</view>
</picker>
</view>
@@ -93,7 +93,7 @@
text{
font-weight: 300;
font-size: 32rpx;
- color: #000000;
+ color: #5487f4;
margin-right:10rpx;
}
image{
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 0ce994b..5610509 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,7 +1,7 @@
<script setup>
import { onMounted, ref } from "vue";
import { getVipInfoApi,getUserInfo,reportLossApi,removeCardApi } from '../../api/index.js'
- import { onShow } from '@dcloudio/uni-app'
+ import { onShow,getCurrentPages } from '@dcloudio/uni-app'
//状态栏高度
const topHeight = ref(0)
function getTopHeight(){
@@ -67,7 +67,7 @@
* 扫码取水相关
*/
function toScan(){
- // 调用二维码扫描接口
+ //调用二维码扫描接口
uni.scanCode({
scanType: ['qrCode'],
success: function (res) {
@@ -82,14 +82,14 @@
* 功能列表相关
*/
const functionList = ref([
- {text:'余额记录',icon:'../../static/images/index/icon31.png',url:'/pages/functionList/balanceRecord/index',isUrl:1},
- {text:'消费记录',icon:'../../static/images/index/icon32.png',url:'/pages/functionList/paymentRecord/index',isUrl:1},
- {text:'充值记录',icon:'../../static/images/index/icon33.png',url:'/pages/functionList/rechargeRecord/index',isUrl:1},
- {text:'账户共享',icon:'../../static/images/index/icon34.png',url:'',isUrl:1},
- {text:'故障上报',icon:'../../static/images/index/icon35.png',url:'/pages/infoBreakdown/index',isUrl:1},
- {text:'电子发票',icon:'../../static/images/index/icon36.png',url:'',isUrl:1},
- {text:'会员卡挂失',icon:'../../static/images/index/icon37.png',url:'',isUrl:2},
- {text:'会员卡注销',icon:'../../static/images/index/icon38.png',url:'',isUrl:3},
+ {text:'余额记录',icon:'../../static/images/index/icon31.png',bgColor:'#16b387',bgColor:'',url:'/pages/functionList/balanceRecord/index',isUrl:1},
+ {text:'消费记录',icon:'../../static/images/index/icon32.png',bgColor:'#329ae8',url:'/pages/functionList/paymentRecord/index',isUrl:1},
+ {text:'充值记录',icon:'../../static/images/index/icon33.png',bgColor:'#faaf0f',url:'/pages/functionList/rechargeRecord/index',isUrl:1},
+ {text:'账户共享',icon:'../../static/images/index/icon34.png',bgColor:'#faaf0f',url:'',isUrl:4},
+ {text:'故障上报',icon:'../../static/images/index/icon35.png',bgColor:'#a88ff1',url:'/pages/infoBreakdown/index',isUrl:1},
+ {text:'优惠卷',icon:'../../static/images/index/icon36.png',bgColor:'#18bfc4',url:'',isUrl:4},
+ {text:'会员卡挂失',icon:'../../static/images/index/icon37.png',bgColor:'#4875f0',url:'',isUrl:2},
+ {text:'会员卡注销',icon:'../../static/images/index/icon38.png',bgColor:'#f45088',url:'',isUrl:3},
])
function navTo(itemUrl){
if(itemUrl){
@@ -159,7 +159,20 @@
}
}
})
+ }else{
+ uni.showToast({
+ title: '该功能正在升级中！',
+ duration: 2000,
+ icon:'none',
+ });
}
+ }
+ function upGrade(){
+ uni.showToast({
+ title: '该功能正在升级中！',
+ duration: 2000,
+ icon:'none',
+ });
}
onMounted( async() =>{
getTopHeight()
@@ -167,6 +180,18 @@
onShow(async() =>{
await getInfo()
})
+ uni.showShareMenu({
+ withShareTicket: true,
+ menus: ['shareAppMessage', 'shareTimeline'],
+ success: function () {
+ console.log('分享菜单显示成功');
+ },
+ fail: function (err) {
+ console.error('分享菜单显示失败', err);
+ }
+ });
+
+
</script>
<template>
@@ -188,7 +213,7 @@
<view class="card-left">
<view class="left-top">
<view>
- <image v-if="isVip" src="../../static/images/index/code1.png" alt=""></image>
+ <image v-if="isVip" src="../../static/images/index/code1.png" alt=""></image>
<text>会员卡 </text>
<text class="lossed" v-if="isLoss && isVip"> [已挂失]</text>
</view>
@@ -212,7 +237,7 @@
</view>
</view>
<view class="function-box1">
- <view class="box1-bg box1-one" @click="navTo('/pages/sendWater/index')">
+ <view class="box1-bg box1-one" @click="upGrade()">
<image src="../../static/images/index/home21.png" alt=""></image>
<view>送水到家</view>
</view>
@@ -238,13 +263,13 @@
<view class="box2-content">
<block v-for="(item,index) in functionList" :key="index">
<view class="box2-item" @click="setEvent(item.isUrl,item.url)">
- <image :src= "item.icon" alt=""></image>
+ <view class="box2-item-img" :style="{background:item.bgColor}"><image :src= "item.icon" alt=""></image></view>
<view class="box2-item-text">{{item.text}}</view>
</view>
</block>
</view>
</view>
- <view class="advertisement-box"><image src="../../static/images/index/bg4.png" alt=""></image></view>
+ <view class="advertisement-box" @click="upGrade"><image src="../../static/images/index/bg4.png" alt=""></image></view>
<view class="service-box">
<view class="service-title"><text>服务指南</text></view>
<view class="service-content">
@@ -259,7 +284,7 @@
<image src="../../static/images/index/more-info5.png" alt=""></image>
</view>
</view>
- <view class="service-bg">
+ <view class="service-bg" @click="upGrade">
<view>
<image src="../../static/images/index/notice5.png" alt=""></image>
<text>公示公告</text>
@@ -368,8 +393,8 @@
display: flex;
align-items: center;
image{
- width:70rpx;
- height:70rpx;
+ width:48rpx;
+ height:48rpx;
}
text{
font-weight:400;
@@ -377,7 +402,7 @@
color: #FFFFFF;
}
.lossed{
- color:#344ede;
+ color:#fff;
}
}
view:last-child{
@@ -546,9 +571,18 @@
flex-direction:column;
justify-content:space-between;
align-items: center;
- image{
+ .box2-item-img{
width: 90rpx;
height:90rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ background: #65A7FD;
+ border-radius:50%;
+ image{
+ width: 48rpx;
+ height:48rpx;
+ }
}
.box2-item-text{
width:100%;
diff --git a/pages/infoBreakdown/index.vue b/pages/infoBreakdown/index.vue
index 291c0f3..7155b05 100644
--- a/pages/infoBreakdown/index.vue
+++ b/pages/infoBreakdown/index.vue
@@ -97,7 +97,7 @@
</view>
<view class="form-item">
<view class="label">问题类型：</view>
- <input class="item-input" name="input" v-model="form.type" placeholder="请选择问题类型" />
+ <input class="item-input" name="input" v-model="form.type" placeholder="请输入数字" />
</view>
<view class="form-item">
<view class="label">问题描述：</view>
@@ -163,7 +163,7 @@
border-bottom: 1rpx solid rgba(111, 111, 111, 0.1);
height:100rpx;
.label{
- width:160rpx;
+ width:180rpx;
}
input{
width:340rpx;
diff --git a/pages/recharge/index.vue b/pages/recharge/index.vue
index 086f8e5..d025a07 100644
--- a/pages/recharge/index.vue
+++ b/pages/recharge/index.vue
@@ -51,7 +51,6 @@
// payList.value[index1].checked = true
// payMethod.value = payList.value[index1].value
// }
- const e = ref('123125')
async function submit(){
let money = ''
if(disabled.value){
@@ -60,7 +59,6 @@
money = Number(otherMoney.value)
}
await wxPayApi({businessType:1,tradeAmount:money}).then((res) =>{
- e.value = res
if(res.code == 200){
//调用微信官方支付接口弹出付款界面,输入密码扣款
wx.requestPayment({
@@ -143,7 +141,6 @@
</view>
</view>
</view>
- <text>{{e}}</text>
<view class="submit-btn" @click="submit()">立即充值</view>
</view>
</view>
diff --git a/pages/scanWater/index.vue b/pages/scanWater/index.vue
index 383a3fe..5d4f5eb 100644
--- a/pages/scanWater/index.vue
+++ b/pages/scanWater/index.vue
@@ -1,14 +1,63 @@
<template>
- <view>
- <navbar title ='设备详情'></navbar>
- 扫码后跳转的页面
+ <view class="container">
+ <navbar title ='扫码成功'></navbar>
+ <view class="content">
+ <view class="img-box">
+ <image class="img" src="../../static/images/other/success.png" alt=""></image>
+ <view class="text text1">操作成功~</view>
+ </view>
+ <view class="text">请在设备上操作</view>
+ <view class="back" @click="navBack()">返回首页</view>
+ </view>
</view>
</template>
<script setup>
-
+ function navBack(){
+ uni.navigateBack()
+ }
</script>
-<style>
-
+<style lang="scss">
+ .container{
+ width: 100%;
+ height: 100vh;
+ .content{
+ width: 100%;
+ height:calc(100vh - 176rpx);
+ background:linear-gradient(to top,#FFFFFF,#E8EFFF);
+ box-sizing: border-box;
+ display: flex;
+ padding:200rpx 0 600rpx;
+ justify-content: space-between;
+ flex-direction: column;
+ align-items: center;
+ .img-box{
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ }
+ .img{
+ width:580rpx;
+ height: 385rpx;
+ }
+ .text{
+ font-weight: 300;
+ font-size: 32rpx;
+ color: #548AFF;
+ }
+ .back{
+ width: 300rpx;
+ height: 80rpx;
+ background: #FFFFFF;
+ border:1rpx solid rgba(95, 117, 244, 0.6);
+ color: #548AFF;
+ border-radius:40rpx;
+ line-height:80rpx;
+ text-align: center;
+ }
+
+ }
+ }
</style>
diff --git a/static/images/code1.png b/static/images/code1.png
new file mode 100644
index 0000000..cd9f6cf
--- /dev/null
+++ b/static/images/code1.png
Binary files differ
diff --git a/static/images/index/code1.png b/static/images/index/code1.png
index 8001fc0..e917b08 100644
--- a/static/images/index/code1.png
+++ b/static/images/index/code1.png
Binary files differ
diff --git a/static/images/index/icon21.png b/static/images/index/icon21.png
new file mode 100644
index 0000000..2c9ff29
--- /dev/null
+++ b/static/images/index/icon21.png
Binary files differ
diff --git a/static/images/index/icon22.png b/static/images/index/icon22.png
index dcb3f07..38b8928 100644
--- a/static/images/index/icon22.png
+++ b/static/images/index/icon22.png
Binary files differ
diff --git a/static/images/index/icon31.png b/static/images/index/icon31.png
index c9b32b8..9413f85 100644
--- a/static/images/index/icon31.png
+++ b/static/images/index/icon31.png
Binary files differ
diff --git a/static/images/index/icon32.png b/static/images/index/icon32.png
index 2f7cd6a..2119427 100644
--- a/static/images/index/icon32.png
+++ b/static/images/index/icon32.png
Binary files differ
diff --git a/static/images/index/icon33.png b/static/images/index/icon33.png
index 6ad869f..767168c 100644
--- a/static/images/index/icon33.png
+++ b/static/images/index/icon33.png
Binary files differ
diff --git a/static/images/index/icon34.png b/static/images/index/icon34.png
index fc68121..97c9d23 100644
--- a/static/images/index/icon34.png
+++ b/static/images/index/icon34.png
Binary files differ
diff --git a/static/images/index/icon35.png b/static/images/index/icon35.png
index de64596..0f3e8f8 100644
--- a/static/images/index/icon35.png
+++ b/static/images/index/icon35.png
Binary files differ
diff --git a/static/images/index/icon36.png b/static/images/index/icon36.png
index 98909ac..c7eed78 100644
--- a/static/images/index/icon36.png
+++ b/static/images/index/icon36.png
Binary files differ
diff --git a/static/images/index/icon37.png b/static/images/index/icon37.png
index c8fa025..86f01b2 100644
--- a/static/images/index/icon37.png
+++ b/static/images/index/icon37.png
Binary files differ
diff --git a/static/images/index/icon38.png b/static/images/index/icon38.png
index 1d19344..78010d9 100644
--- a/static/images/index/icon38.png
+++ b/static/images/index/icon38.png
Binary files differ
diff --git a/static/images/other/success.png b/static/images/other/success.png
new file mode 100644
index 0000000..9ce1a8e
--- /dev/null
+++ b/static/images/other/success.png
Binary files differ
diff --git a/static/images/other/success1.png b/static/images/other/success1.png
new file mode 100644
index 0000000..74ae878
--- /dev/null
+++ b/static/images/other/success1.png
Binary files differ
diff --git a/unpackage/dist/dev/mp-weixin/common/assets.js b/unpackage/dist/dev/mp-weixin/common/assets.js
index bb3afc4..f428dac 100644
--- a/unpackage/dist/dev/mp-weixin/common/assets.js
+++ b/unpackage/dist/dev/mp-weixin/common/assets.js
@@ -13,7 +13,7 @@
const _imports_11 = "/static/images/index/notice5.png";
const _imports_0$7 = "/static/images/addCard/code.png";
const _imports_0$6 = "/static/images/other/expand.png";
-const _imports_0$5 = "/static/images/other/more.png";
+const _imports_0$5 = "/static/images/other/success.png";
const _imports_0$4 = "/static/images/address/edit.png";
const _imports_1$1 = "/static/images/address/delete.png";
const _imports_0$3 = "/static/images/address/expand.png";
diff --git a/unpackage/dist/dev/mp-weixin/config/baseUrl.js b/unpackage/dist/dev/mp-weixin/config/baseUrl.js
index 4c47d63..f5ac894 100644
--- a/unpackage/dist/dev/mp-weixin/config/baseUrl.js
+++ b/unpackage/dist/dev/mp-weixin/config/baseUrl.js
@@ -1,3 +1,3 @@
"use strict";
-const BASE_URL = "http://192.168.0.105:8031";
+const BASE_URL = "https://www.huiwuyuntong.com/water-drinking-beta";
exports.BASE_URL = BASE_URL;
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.js b/unpackage/dist/dev/mp-weixin/pages/index/index.js
index 07b6a79..648355d 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.js
@@ -69,14 +69,14 @@
});
}
const functionList = common_vendor.ref([
- { text: "余额记录", icon: "../../static/images/index/icon31.png", url: "/pages/functionList/balanceRecord/index", isUrl: 1 },
- { text: "消费记录", icon: "../../static/images/index/icon32.png", url: "/pages/functionList/paymentRecord/index", isUrl: 1 },
- { text: "充值记录", icon: "../../static/images/index/icon33.png", url: "/pages/functionList/rechargeRecord/index", isUrl: 1 },
- { text: "账户共享", icon: "../../static/images/index/icon34.png", url: "", isUrl: 1 },
- { text: "故障上报", icon: "../../static/images/index/icon35.png", url: "/pages/infoBreakdown/index", isUrl: 1 },
- { text: "电子发票", icon: "../../static/images/index/icon36.png", url: "", isUrl: 1 },
- { text: "会员卡挂失", icon: "../../static/images/index/icon37.png", url: "", isUrl: 2 },
- { text: "会员卡注销", icon: "../../static/images/index/icon38.png", url: "", isUrl: 3 }
+ { text: "余额记录", icon: "../../static/images/index/icon31.png", bgColor: "#16b387", bgColor: "", url: "/pages/functionList/balanceRecord/index", isUrl: 1 },
+ { text: "消费记录", icon: "../../static/images/index/icon32.png", bgColor: "#329ae8", url: "/pages/functionList/paymentRecord/index", isUrl: 1 },
+ { text: "充值记录", icon: "../../static/images/index/icon33.png", bgColor: "#faaf0f", url: "/pages/functionList/rechargeRecord/index", isUrl: 1 },
+ { text: "账户共享", icon: "../../static/images/index/icon34.png", bgColor: "#faaf0f", url: "", isUrl: 4 },
+ { text: "故障上报", icon: "../../static/images/index/icon35.png", bgColor: "#a88ff1", url: "/pages/infoBreakdown/index", isUrl: 1 },
+ { text: "优惠卷", icon: "../../static/images/index/icon36.png", bgColor: "#18bfc4", url: "", isUrl: 4 },
+ { text: "会员卡挂失", icon: "../../static/images/index/icon37.png", bgColor: "#4875f0", url: "", isUrl: 2 },
+ { text: "会员卡注销", icon: "../../static/images/index/icon38.png", bgColor: "#f45088", url: "", isUrl: 3 }
]);
function navTo(itemUrl) {
if (itemUrl) {
@@ -145,13 +145,36 @@
}
}
});
+ } else {
+ common_vendor.index.showToast({
+ title: "该功能正在升级中！",
+ duration: 2e3,
+ icon: "none"
+ });
}
+ }
+ function upGrade() {
+ common_vendor.index.showToast({
+ title: "该功能正在升级中！",
+ duration: 2e3,
+ icon: "none"
+ });
}
common_vendor.onMounted(async () => {
getTopHeight();
});
common_vendor.onShow(async () => {
await getInfo();
+ });
+ common_vendor.index.showShareMenu({
+ withShareTicket: true,
+ menus: ["shareAppMessage", "shareTimeline"],
+ success: function() {
+ console.log("分享菜单显示成功");
+ },
+ fail: function(err) {
+ console.error("分享菜单显示失败", err);
+ }
});
return (_ctx, _cache) => {
return common_vendor.e({
@@ -187,7 +210,7 @@
} : {}, {
t: topHeight.value + "rpx",
v: common_assets._imports_5,
- w: common_vendor.o(($event) => navTo("/pages/sendWater/index")),
+ w: common_vendor.o(($event) => upGrade()),
x: common_assets._imports_1,
y: common_vendor.o(($event) => navTo("/pages/facilityList/index")),
z: common_assets._imports_7,
@@ -195,17 +218,20 @@
B: common_vendor.f(functionList.value, (item, index, i0) => {
return {
a: item.icon,
- b: common_vendor.t(item.text),
- c: common_vendor.o(($event) => setEvent(item.isUrl, item.url), index),
- d: index
+ b: item.bgColor,
+ c: common_vendor.t(item.text),
+ d: common_vendor.o(($event) => setEvent(item.isUrl, item.url), index),
+ e: index
};
}),
C: common_assets._imports_8,
- D: common_assets._imports_9,
- E: common_assets._imports_10,
- F: common_vendor.o(($event) => navTo("/pages/station/index")),
- G: common_assets._imports_11,
- H: common_assets._imports_10
+ D: common_vendor.o(upGrade),
+ E: common_assets._imports_9,
+ F: common_assets._imports_10,
+ G: common_vendor.o(($event) => navTo("/pages/station/index")),
+ H: common_assets._imports_11,
+ I: common_assets._imports_10,
+ J: common_vendor.o(upGrade)
});
};
}
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.wxml b/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
index 81f43ff..de28df1 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:' + t}}"><view class="user-info data-v-1cf27b2a"><image class="user-img data-v-1cf27b2a" src="{{a}}" alt=""></image><text class="data-v-1cf27b2a" bindtap="{{c}}">{{b}}</text><image bindtap="{{d}}" class="user-more data-v-1cf27b2a" src="{{e}}"></image><view class="user-add-card data-v-1cf27b2a" bindtap="{{g}}"><image class="data-v-1cf27b2a" src="{{f}}" alt=""></image><text class="data-v-1cf27b2a">添加会员卡</text></view></view><view class="card data-v-1cf27b2a"><image class="card-bg data-v-1cf27b2a" src="{{h}}" alt=""></image><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 wx:if="{{i}}" class="data-v-1cf27b2a" src="{{j}}" alt=""></image><text class="data-v-1cf27b2a">会员卡 </text><text wx:if="{{k}}" class="lossed data-v-1cf27b2a"> [已挂失]</text></view><view wx:if="{{l}}" class="data-v-1cf27b2a">ID:{{m}}</view></view></view><view class="card-right data-v-1cf27b2a"><view class="card-right-top data-v-1cf27b2a"><text wx:if="{{n}}" class="data-v-1cf27b2a">金额卡</text><text wx:if="{{o}}" class="data-v-1cf27b2a">未绑定会员卡</text><text wx:if="{{p}}" class="data-v-1cf27b2a">{{q}}元</text></view><view wx:if="{{r}}" class="card-right-bottom data-v-1cf27b2a" bindtap="{{s}}">充值</view></view></view></view></view><view class="function-box1 data-v-1cf27b2a"><view class="box1-bg box1-one data-v-1cf27b2a" bindtap="{{w}}"><image class="data-v-1cf27b2a" src="{{v}}" alt=""></image><view class="data-v-1cf27b2a">送水到家</view></view><view bindtap="{{y}}" class="box1-bg box1-two data-v-1cf27b2a"><image class="data-v-1cf27b2a" src="{{x}}" alt=""></image><view class="data-v-1cf27b2a">附近设备</view></view><view class="box1-bg box1-three data-v-1cf27b2a" bindtap="{{A}}"><image class="data-v-1cf27b2a" src="{{z}}" 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="{{B}}" 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="{{C}}" 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" bindtap="{{F}}"><view class="data-v-1cf27b2a"><image class="data-v-1cf27b2a" src="{{D}}" 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="{{E}}" alt=""></image></view></view><view class="service-bg data-v-1cf27b2a"><view class="data-v-1cf27b2a"><image class="data-v-1cf27b2a" src="{{G}}" 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="{{H}}" 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:' + t}}"><view class="user-info data-v-1cf27b2a"><image class="user-img data-v-1cf27b2a" src="{{a}}" alt=""></image><text class="data-v-1cf27b2a" bindtap="{{c}}">{{b}}</text><image bindtap="{{d}}" class="user-more data-v-1cf27b2a" src="{{e}}"></image><view class="user-add-card data-v-1cf27b2a" bindtap="{{g}}"><image class="data-v-1cf27b2a" src="{{f}}" alt=""></image><text class="data-v-1cf27b2a">添加会员卡</text></view></view><view class="card data-v-1cf27b2a"><image class="card-bg data-v-1cf27b2a" src="{{h}}" alt=""></image><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 wx:if="{{i}}" class="data-v-1cf27b2a" src="{{j}}" alt=""></image><text class="data-v-1cf27b2a">会员卡 </text><text wx:if="{{k}}" class="lossed data-v-1cf27b2a"> [已挂失]</text></view><view wx:if="{{l}}" class="data-v-1cf27b2a">ID:{{m}}</view></view></view><view class="card-right data-v-1cf27b2a"><view class="card-right-top data-v-1cf27b2a"><text wx:if="{{n}}" class="data-v-1cf27b2a">金额卡</text><text wx:if="{{o}}" class="data-v-1cf27b2a">未绑定会员卡</text><text wx:if="{{p}}" class="data-v-1cf27b2a">{{q}}元</text></view><view wx:if="{{r}}" class="card-right-bottom data-v-1cf27b2a" bindtap="{{s}}">充值</view></view></view></view></view><view class="function-box1 data-v-1cf27b2a"><view class="box1-bg box1-one data-v-1cf27b2a" bindtap="{{w}}"><image class="data-v-1cf27b2a" src="{{v}}" alt=""></image><view class="data-v-1cf27b2a">送水到家</view></view><view bindtap="{{y}}" class="box1-bg box1-two data-v-1cf27b2a"><image class="data-v-1cf27b2a" src="{{x}}" alt=""></image><view class="data-v-1cf27b2a">附近设备</view></view><view class="box1-bg box1-three data-v-1cf27b2a" bindtap="{{A}}"><image class="data-v-1cf27b2a" src="{{z}}" 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="{{B}}" wx:for-item="item" wx:key="e"><view class="box2-item data-v-1cf27b2a" bindtap="{{item.d}}"><view class="box2-item-img data-v-1cf27b2a" style="{{'background:' + item.b}}"><image class="data-v-1cf27b2a" src="{{item.a}}" alt=""></image></view><view class="box2-item-text data-v-1cf27b2a">{{item.c}}</view></view></block></view></view><view class="advertisement-box data-v-1cf27b2a" bindtap="{{D}}"><image class="data-v-1cf27b2a" src="{{C}}" 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" bindtap="{{G}}"><view class="data-v-1cf27b2a"><image class="data-v-1cf27b2a" src="{{E}}" 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="{{F}}" alt=""></image></view></view><view class="service-bg data-v-1cf27b2a" bindtap="{{J}}"><view class="data-v-1cf27b2a"><image class="data-v-1cf27b2a" src="{{H}}" 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="{{I}}" 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 34d0ddd..1b324bd 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.wxss
@@ -122,8 +122,8 @@
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;
+ width: 48rpx;
+ height: 48rpx;
}
.container .content .card-box .card .card-content .card-left .left-top view:first-child text.data-v-1cf27b2a {
font-weight: 400;
@@ -131,7 +131,7 @@
color: #FFFFFF;
}
.container .content .card-box .card .card-content .card-left .left-top view:first-child .lossed.data-v-1cf27b2a {
- color: #344ede;
+ color: #fff;
}
.container .content .card-box .card .card-content .card-left .left-top view.data-v-1cf27b2a:last-child {
margin-left: 10rpx;
@@ -261,9 +261,18 @@
justify-content: space-between;
align-items: center;
}
-.container .content .function-box2 .box2-content .box2-item image.data-v-1cf27b2a {
+.container .content .function-box2 .box2-content .box2-item .box2-item-img.data-v-1cf27b2a {
width: 90rpx;
height: 90rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ background: #65A7FD;
+ border-radius: 50%;
+}
+.container .content .function-box2 .box2-content .box2-item .box2-item-img image.data-v-1cf27b2a {
+ width: 48rpx;
+ height: 48rpx;
}
.container .content .function-box2 .box2-content .box2-item .box2-item-text.data-v-1cf27b2a {
width: 100%;
diff --git a/unpackage/dist/dev/mp-weixin/pages/recharge/index.js b/unpackage/dist/dev/mp-weixin/pages/recharge/index.js
index 50d8e81..1bb393f 100644
--- a/unpackage/dist/dev/mp-weixin/pages/recharge/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/recharge/index.js
@@ -49,7 +49,6 @@
{ text: "微信支付", value: 2, checked: true, img: "../../static/images/recharge/wx.png" }
// {text:"余额",value:3,checked:false,img:'../../static/images/recharge/balance.png'},
]);
- const e = common_vendor.ref("123125");
async function submit() {
let money = "";
if (disabled.value) {
@@ -58,7 +57,6 @@
money = Number(otherMoney.value);
}
await api_index.wxPayApi({ businessType: 1, tradeAmount: money }).then((res) => {
- e.value = res;
if (res.code == 200) {
common_vendor.wx$1.requestPayment({
//预支付订单信息
@@ -125,8 +123,7 @@
d: item.checked
};
}),
- h: common_vendor.t(e.value),
- i: common_vendor.o(($event) => submit())
+ h: common_vendor.o(($event) => submit())
};
};
}
diff --git a/unpackage/dist/dev/mp-weixin/pages/recharge/index.wxml b/unpackage/dist/dev/mp-weixin/pages/recharge/index.wxml
index 022fece..d0c5a29 100644
--- a/unpackage/dist/dev/mp-weixin/pages/recharge/index.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/recharge/index.wxml
@@ -1 +1 @@
-<view class="container data-v-f06186df"><navbar wx:if="{{a}}" class="data-v-f06186df" u-i="f06186df-0" bind:__l="__l" u-p="{{a}}"></navbar><view class="content data-v-f06186df"><view class="main data-v-f06186df"><view class="money data-v-f06186df"><view class="money-title data-v-f06186df"><view class="title-icon data-v-f06186df"></view><view class="title-text data-v-f06186df">充值金额</view></view><view class="money-list data-v-f06186df"><block wx:for="{{b}}" wx:for-item="item" wx:key="d"><view class="money-box data-v-f06186df" style="{{item.b}}" bindtap="{{item.c}}">￥{{item.a}}</view></block></view></view><view class="other-money data-v-f06186df"><view class="money-title data-v-f06186df"><view class="title-icon data-v-f06186df"></view><view class="title-text data-v-f06186df">其他金额</view></view><view class="money-input data-v-f06186df"><input class="data-v-f06186df" disabled="{{c}}" focus="{{d}}" placeholder="请输入其他金额" value="{{e}}" bindinput="{{f}}"/></view></view><view class="pay-methods data-v-f06186df"><view class="methods-list data-v-f06186df"><block wx:for="{{g}}" wx:for-item="item"><view class="pay-item data-v-f06186df"><view class="pay-item-right data-v-f06186df"><image class="data-v-f06186df" src="{{item.a}}" alt=""></image><view class="data-v-f06186df">{{item.b}}</view></view><radio class="data-v-f06186df" value="{{item.c}}" checked="{{item.d}}"/></view></block></view></view></view><text class="data-v-f06186df">{{h}}</text><view class="submit-btn data-v-f06186df" bindtap="{{i}}">立即充值</view></view></view>
\ No newline at end of file
+<view class="container data-v-f06186df"><navbar wx:if="{{a}}" class="data-v-f06186df" u-i="f06186df-0" bind:__l="__l" u-p="{{a}}"></navbar><view class="content data-v-f06186df"><view class="main data-v-f06186df"><view class="money data-v-f06186df"><view class="money-title data-v-f06186df"><view class="title-icon data-v-f06186df"></view><view class="title-text data-v-f06186df">充值金额</view></view><view class="money-list data-v-f06186df"><block wx:for="{{b}}" wx:for-item="item" wx:key="d"><view class="money-box data-v-f06186df" style="{{item.b}}" bindtap="{{item.c}}">￥{{item.a}}</view></block></view></view><view class="other-money data-v-f06186df"><view class="money-title data-v-f06186df"><view class="title-icon data-v-f06186df"></view><view class="title-text data-v-f06186df">其他金额</view></view><view class="money-input data-v-f06186df"><input class="data-v-f06186df" disabled="{{c}}" focus="{{d}}" placeholder="请输入其他金额" value="{{e}}" bindinput="{{f}}"/></view></view><view class="pay-methods data-v-f06186df"><view class="methods-list data-v-f06186df"><block wx:for="{{g}}" wx:for-item="item"><view class="pay-item data-v-f06186df"><view class="pay-item-right data-v-f06186df"><image class="data-v-f06186df" src="{{item.a}}" alt=""></image><view class="data-v-f06186df">{{item.b}}</view></view><radio class="data-v-f06186df" value="{{item.c}}" checked="{{item.d}}"/></view></block></view></view></view><view class="submit-btn data-v-f06186df" bindtap="{{h}}">立即充值</view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/static/images/index/code1.png b/unpackage/dist/dev/mp-weixin/static/images/index/code1.png
index 8001fc0..e917b08 100644
--- a/unpackage/dist/dev/mp-weixin/static/images/index/code1.png
+++ b/unpackage/dist/dev/mp-weixin/static/images/index/code1.png
Binary files differ
diff --git a/unpackage/dist/dev/mp-weixin/static/images/index/icon22.png b/unpackage/dist/dev/mp-weixin/static/images/index/icon22.png
index dcb3f07..38b8928 100644
--- a/unpackage/dist/dev/mp-weixin/static/images/index/icon22.png
+++ b/unpackage/dist/dev/mp-weixin/static/images/index/icon22.png
Binary files differ
diff --git a/unpackage/dist/dev/mp-weixin/static/images/index/icon31.png b/unpackage/dist/dev/mp-weixin/static/images/index/icon31.png
index c9b32b8..9413f85 100644
--- a/unpackage/dist/dev/mp-weixin/static/images/index/icon31.png
+++ b/unpackage/dist/dev/mp-weixin/static/images/index/icon31.png
Binary files differ
diff --git a/unpackage/dist/dev/mp-weixin/static/images/index/icon32.png b/unpackage/dist/dev/mp-weixin/static/images/index/icon32.png
index 2f7cd6a..2119427 100644
--- a/unpackage/dist/dev/mp-weixin/static/images/index/icon32.png
+++ b/unpackage/dist/dev/mp-weixin/static/images/index/icon32.png
Binary files differ
diff --git a/unpackage/dist/dev/mp-weixin/static/images/index/icon33.png b/unpackage/dist/dev/mp-weixin/static/images/index/icon33.png
index 6ad869f..767168c 100644
--- a/unpackage/dist/dev/mp-weixin/static/images/index/icon33.png
+++ b/unpackage/dist/dev/mp-weixin/static/images/index/icon33.png
Binary files differ
diff --git a/unpackage/dist/dev/mp-weixin/static/images/index/icon34.png b/unpackage/dist/dev/mp-weixin/static/images/index/icon34.png
index fc68121..97c9d23 100644
--- a/unpackage/dist/dev/mp-weixin/static/images/index/icon34.png
+++ b/unpackage/dist/dev/mp-weixin/static/images/index/icon34.png
Binary files differ
diff --git a/unpackage/dist/dev/mp-weixin/static/images/index/icon35.png b/unpackage/dist/dev/mp-weixin/static/images/index/icon35.png
index de64596..0f3e8f8 100644
--- a/unpackage/dist/dev/mp-weixin/static/images/index/icon35.png
+++ b/unpackage/dist/dev/mp-weixin/static/images/index/icon35.png
Binary files differ
diff --git a/unpackage/dist/dev/mp-weixin/static/images/index/icon36.png b/unpackage/dist/dev/mp-weixin/static/images/index/icon36.png
index 98909ac..c7eed78 100644
--- a/unpackage/dist/dev/mp-weixin/static/images/index/icon36.png
+++ b/unpackage/dist/dev/mp-weixin/static/images/index/icon36.png
Binary files differ
diff --git a/unpackage/dist/dev/mp-weixin/static/images/index/icon37.png b/unpackage/dist/dev/mp-weixin/static/images/index/icon37.png
index c8fa025..86f01b2 100644
--- a/unpackage/dist/dev/mp-weixin/static/images/index/icon37.png
+++ b/unpackage/dist/dev/mp-weixin/static/images/index/icon37.png
Binary files differ
diff --git a/unpackage/dist/dev/mp-weixin/static/images/index/icon38.png b/unpackage/dist/dev/mp-weixin/static/images/index/icon38.png
index 1d19344..78010d9 100644
--- a/unpackage/dist/dev/mp-weixin/static/images/index/icon38.png
+++ b/unpackage/dist/dev/mp-weixin/static/images/index/icon38.png
Binary files differ
--
Gitblit v1.9.3