From 614dc61169bcc1a4c7dba3ff924797d4ad064ab3 Mon Sep 17 00:00:00 2001
From: Liuyi <candymxq888@outlook.com>
Date: 星期二, 15 十月 2024 17:25:23 +0800
Subject: [PATCH] 测试修改故障上报，会员卡注册，新增地址，资金记录等页面样式及接口
---
pages/infoBreakdown/index.vue | 41 ++++
pages/userInfo/index.vue | 6
pages/functionList/rechargeRecord/index.vue | 14
static/images/other/expand.png | 0
static/images/index/head.png | 0
config/baseUrl.js | 4
pages/addressAdd/index.vue | 8
unpackage/dist/dev/mp-weixin/pages/index/index.js | 64 ++++---
pages/functionList/paymentRecord/index.vue | 2
pages/functionList/balanceRecord/index.vue | 26 ++
unpackage/dist/dev/mp-weixin/pages/addCard/index.js | 23 ++
unpackage/dist/dev/mp-weixin/pages/recharge/index.wxml | 2
pages/index/index.vue | 11
static/images/other/img-add.png | 0
unpackage/dist/dev/mp-weixin/api/index.js | 4
unpackage/dist/dev/mp-weixin/pages/index/index.wxml | 2
static/images/other/date.png | 0
unpackage/dist/dev/mp-weixin/config/baseUrl.js | 2
pages/addCard/index.vue | 23 ++
pages/recharge/index.vue | 49 ++++--
pages/station/index.vue | 29 +++
manifest.json | 2
unpackage/dist/dev/mp-weixin/pages/recharge/index.js | 67 +++++---
api/index.js | 4
unpackage/dist/dev/mp-weixin/common/assets.js | 44 +++--
25 files changed, 282 insertions(+), 145 deletions(-)
diff --git a/api/index.js b/api/index.js
index f460163..8219649 100644
--- a/api/index.js
+++ b/api/index.js
@@ -62,6 +62,10 @@
export function balanceChangeApi(date){
return request(`/userCapitalChange/getListByUser?date=${date}`,{},'GET')
}
+//用户充值消费金额统计
+export function balanceStatisticsApi(date){
+ return request(`/userCapitalChange/getAmountStatistics?date=${date}`,{},'GET')
+}
//消费记录
export function paymentChangeApi(date){
return request(`/paymentRecords/getListByUser?date=${date}`,{},'GET')
diff --git a/config/baseUrl.js b/config/baseUrl.js
index 46e327b..ce2bd99 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/manifest.json b/manifest.json
index 21af97b..a65ec45 100644
--- a/manifest.json
+++ b/manifest.json
@@ -60,7 +60,7 @@
"desc" : "你的位置信息将用于计算直饮水设备与您的距离"
}
},
- "requiredPrivateInfos": ["getLocation"]
+ "requiredPrivateInfos" : [ "getLocation" ]
},
"mp-alipay" : {
"usingComponents" : true
diff --git a/pages/addCard/index.vue b/pages/addCard/index.vue
index bdfecb6..8e0ef25 100644
--- a/pages/addCard/index.vue
+++ b/pages/addCard/index.vue
@@ -4,7 +4,7 @@
const form = ref({
id:JSON.parse(uni.getStorageSync('userInfo')).id,
- waterCardNumber:'023B7C45',
+ waterCardNumber:'',
userName:'',
userPhone:'',
remark:'',
@@ -15,7 +15,9 @@
scanType: ['qrCode'],
success: function (res) {
console.log('条码内容：' + res.result);
- form.value.waterCardNumber = res.result
+ let data = res.result.split('&id=')
+ form.value.waterCardNumber = data[1]
+ console.log('form.value.waterCardNumber',form.value.waterCardNumber)
}
});
}
@@ -25,9 +27,22 @@
uni.showToast({
title: '添加成功！',
image: '../../static/images/other/success.svg',
- duration:500
+ duration:2000
+ }).then(() =>{
+ uni.navigateBack()
})
- uni.navigateBack()
+ }else if(res.code == 300){
+ uni.showToast({
+ title: res.msg,
+ duration:2000,
+ icon:'none'
+ })
+ }else{
+ uni.showToast({
+ title:'绑卡失败',
+ duration:2000,
+ icon:'none'
+ })
}
})
}
diff --git a/pages/addressAdd/index.vue b/pages/addressAdd/index.vue
index d8fd2a3..3276ff9 100644
--- a/pages/addressAdd/index.vue
+++ b/pages/addressAdd/index.vue
@@ -7,6 +7,7 @@
const pageTitle = ref('新增地址')
const isCheckedDefault =ref(false)
const form = ref({
+ id:'',
userName:'',
userPhone:'',
listRegion:[],
@@ -50,7 +51,6 @@
if(res.code == 200){
uni.showToast({
title: '修改成功',
- image: '../../static/images/other/success.svg',
duration:500
})
setTimeout(() =>{
@@ -61,17 +61,17 @@
})
}else{
//新增地址
+ form.value.id = JSON.parse(uni.getStorageSync('userInfo')).id
await creatUserArchive(form.value).then((res) =>{
if(res.code == 200){
uni.showToast({
title: '新增成功',
- image: '../../static/images/other/success.svg',
- duration:500
+ duration:1000
})
setTimeout(() =>{
uni.navigateBack()
form.value = {}
- },500)
+ },1000)
}
})
}
diff --git a/pages/functionList/balanceRecord/index.vue b/pages/functionList/balanceRecord/index.vue
index 2c24692..e02df72 100644
--- a/pages/functionList/balanceRecord/index.vue
+++ b/pages/functionList/balanceRecord/index.vue
@@ -1,6 +1,6 @@
<script setup>
import { computed, onMounted, ref } from 'vue'
- import { balanceChangeApi } from '../../../api/index.js'
+ import { balanceChangeApi,balanceStatisticsApi} from '../../../api/index.js'
//返回
function navBackTo(){
uni.navigateBack()
@@ -23,6 +23,15 @@
datePay.value = e.detail.value
await getBalanceList(datePay.value)
}
+ //获取用户资金变动统计
+ const rechargeSta = ref()
+ const expendSta = ref()
+ async function getStatistics(val){
+ await balanceStatisticsApi(val).then((res) =>{
+ rechargeSta.value = res.data.rechargeAmount
+ expendSta.value = res.data.expenditureAmount
+ })
+ }
//获取余额变动列表
const banlanceList = ref([])
@@ -32,6 +41,7 @@
banlanceList.value = res.data
}
})
+ await getStatistics(val)
}
//动态设置用户支出收入对应样式
function setStyleMoney(val){
@@ -44,6 +54,7 @@
onMounted(async() =>{
getDate()
await getBalanceList(datePay.value)
+ // await getStatistics()
})
</script>
<template>
@@ -53,14 +64,15 @@
<view class="picker">
<picker mode="date" :value="datePay" :fields="'month'" @change="bindDateChange">
<view class="date-text">
+ <!-- <text>日期：</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>
<view class="date-money">
- <text>支出￥5341.05</text>
- <text>充值￥941.59</text>
+ <text>支出￥{{expendSta}}</text>
+ <text>充值￥{{rechargeSta}}</text>
</view>
</view>
<view class="main">
@@ -105,11 +117,11 @@
text{
font-weight: 300;
font-size: 32rpx;
- color: #000000;
+ color: #5487f4;
margin-right:10rpx;
}
image{
- width: 28rpx;
+ width:32rpx;
height:32rpx;
transform: rotate(90deg);
// margin-top:10rpx;
@@ -127,7 +139,7 @@
}
.main{
width:99%;
- height: calc(100vh - 84rpx - 176rpx - 70rpx);
+ height:1200rpx;
background: #fff;
border-radius:20rpx;
margin: 0 auto;
diff --git a/pages/functionList/paymentRecord/index.vue b/pages/functionList/paymentRecord/index.vue
index 6b413b1..b502a0a 100644
--- a/pages/functionList/paymentRecord/index.vue
+++ b/pages/functionList/paymentRecord/index.vue
@@ -107,7 +107,7 @@
}
.main{
width:99%;
- height: calc(100vh - 84rpx - 176rpx - 70rpx);
+ height:1200rpx;
background: #fff;
border-radius:20rpx;
margin: 0 auto;
diff --git a/pages/functionList/rechargeRecord/index.vue b/pages/functionList/rechargeRecord/index.vue
index 0f20179..fd9aa3e 100644
--- a/pages/functionList/rechargeRecord/index.vue
+++ b/pages/functionList/rechargeRecord/index.vue
@@ -58,12 +58,12 @@
<block v-for="(item,index) in banlanceList">
<view class="item">
<view class="item-left">
- <text>购水</text>
- <text class="methods">消费方式：{{item.consumptionTypeView}}</text>
- <text>{{item.payTime}}</text>
+ <!-- <text>充值</text> -->
+ <text class="methods">水卡充值</text>
+ <text>{{item.createTimeView}}</text>
</view>
<view class="item-right">
- <text class="money">{{item.paymentAmount}}</text>
+ <text class="money">{{item.rechargeAmount}}</text>
<text>元</text>
</view>
</view>
@@ -107,7 +107,7 @@
}
.main{
width:99%;
- height: calc(100vh - 84rpx - 176rpx - 70rpx);
+ height:1200rpx;
background: #fff;
border-radius:20rpx;
margin: 0 auto;
@@ -117,11 +117,11 @@
// background: #7E7E7E;
.item{
width:100%;
- height:184rpx;
+ height:140rpx;
// background:rgba(170, 216, 255, 0.2);
border-bottom:1rpx solid #D8D8D8;
box-sizing:border-box;
- padding-bottom:38rpx;
+ padding-bottom:20rpx;
justify-content:space-between;
align-items: flex-end;
display: flex;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2e1b8cc..0ce994b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -139,6 +139,7 @@
uni.showToast({
title: '已注销',
duration: 2000,
+ icon:'none',
});
await getVipInfoApi().then((res) =>{
if(res.code == 200){
@@ -172,10 +173,10 @@
<view class="container">
<view class="content">
<view class="card-box" :style="{paddingTop:topHeight + 'rpx'}">
- <view class="user-info" @click="navTo('/pages/userInfo/index')">
- <image class="user-img" src='../../static/images/index/hend1.png' alt=''></image>
- <text>{{cardInfo.userName}}</text>
- <image class="user-more"src="../../static/images/index/back.png"></image>
+ <view class="user-info" >
+ <image class="user-img" src='../../static/images/index/head.png' alt=''></image>
+ <text @click="navTo('/pages/userInfo/index')">{{cardInfo.userName}}</text>
+ <image @click="navTo('/pages/userInfo/index')" class="user-more"src="../../static/images/index/back.png"></image>
<view class="user-add-card" @click="navTo('/pages/addCard/index')">
<image src='../../static/images/index/vip-add.png' alt=''></image>
<text>添加会员卡</text>
@@ -252,7 +253,7 @@
<image src="../../static/images/index/icon51.png" alt=""></image>
<text>附近站点</text>
</view>
- <view class="service-info">蔡家供水服务中心正在营业中……</view>
+ <view class="service-info">服务中心正在营业中……</view>
<view>
<text>查看更多</text>
<image src="../../static/images/index/more-info5.png" alt=""></image>
diff --git a/pages/infoBreakdown/index.vue b/pages/infoBreakdown/index.vue
index ecaec78..291c0f3 100644
--- a/pages/infoBreakdown/index.vue
+++ b/pages/infoBreakdown/index.vue
@@ -42,6 +42,17 @@
}
});
}
+
+ function toScan(){
+ // 调用二维码扫描接口
+ uni.scanCode({
+ scanType: ['qrCode'],
+ success: function (res) {
+ console.log('条码内容：' + res.result);
+ form.value.facilityCode = res.result
+ }
+ });
+ }
async function submit(){
form.value.url = uploadList.value
//去掉数组中空字符串，数组转字符串
@@ -77,8 +88,8 @@
<form>
<view class="form-item">
<view class="label">设备号：</view>
- <input class="item-input" v-model="form.facilityCode" name="input" placeholder="请扫描水机站牌二维码或输入设备号" />
- <image src="../../static/images/addCard/code.png" alt=""></image>
+ <input class="item-input" v-model="form.facilityCode" name="input" placeholder="请扫描或输入设备号" />
+ <image @click="toScan()" src="../../static/images/addCard/code.png" alt=""></image>
</view>
<view class="form-item">
<view class="label">联系方式：</view>
@@ -100,6 +111,7 @@
<block v-for="(item,index) in uploadList">
<view @click="uploadImg(index)" class="upload-img-item">
<image v-if="item" :src="item"></image>
+ <image v-else class="default-img" src="../../static/images/other/img-add.png" alt=""></image>
</view>
</block>
</view>
@@ -150,8 +162,14 @@
align-items: center;
border-bottom: 1rpx solid rgba(111, 111, 111, 0.1);
height:100rpx;
+ .label{
+ width:160rpx;
+ }
+ input{
+ width:340rpx;
+ }
image{
- margin-left:60rpx;
+ margin-left:50rpx;
width:50rpx;
height:50rpx;
}
@@ -159,8 +177,8 @@
}
.upload-box{
.upload-title{
- color: #5b93dc;
- margin: 10rpx 20rpx 0;
+ color: #6a717e;
+ margin-top: 10rpx;
}
.upload-img{
display: flex;
@@ -174,9 +192,16 @@
border-radius:20rpx;
border:1rpx dashed #b7d4ff;
margin-bottom: 10rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
image{
- width:180rpx;
- height:180rpx;
+ width:170rpx;
+ height:170rpx;
+ }
+ .default-img{
+ width:120rpx;
+ height:120rpx;
}
}
}
@@ -192,6 +217,8 @@
left: calc(50% - 35%);
text-align: center;
border-radius:50rpx;
+ color: #5b93dc;
+ letter-spacing:5rpx;
}
}
}
diff --git a/pages/recharge/index.vue b/pages/recharge/index.vue
index 5d64e33..086f8e5 100644
--- a/pages/recharge/index.vue
+++ b/pages/recharge/index.vue
@@ -51,6 +51,7 @@
// payList.value[index1].checked = true
// payMethod.value = payList.value[index1].value
// }
+ const e = ref('123125')
async function submit(){
let money = ''
if(disabled.value){
@@ -59,10 +60,10 @@
money = Number(otherMoney.value)
}
await wxPayApi({businessType:1,tradeAmount:money}).then((res) =>{
- console.log('reswxpay',res)
-
- //调用微信官方支付接口弹出付款界面,输入密码扣款
- wx.requestPayment({
+ e.value = res
+ if(res.code == 200){
+ //调用微信官方支付接口弹出付款界面,输入密码扣款
+ wx.requestPayment({
//预支付订单信息
// appId: res.data.appId,
timeStamp: res.data.timeStamp, //时间戳
@@ -70,20 +71,33 @@
package: res.data.package, //prepay_id
signType: res.data.signType, //签名算法MD5
paySign: res.data.paySign ,//微信签名
- success (res) {
- if (res.errMsg == "requestPayment:ok"){
- console.log('支付成功', res)
- }else{
- console.log('支付失败')
- }
- },
- fail (res) {
- console.log('支付失败', res)
- }
- })
+ success (res) {
+ if (res.errMsg == "requestPayment:ok"){
+ console.log('支付成功', res)
+ uni.showToast({
+ title: '支付成功',
+ duration: 2000,
+ });
+ uni.navigateBack()
+ }else{
+ uni.showToast({
+ title: '支付失败',
+ duration: 2000,
+ icon:'none'
+ });
+ }
+
+ },
+ fail (res) {
+ uni.showToast({
+ title: '微信支付失败',
+ duration: 2000,
+ icon:'none'
+ });
+ }
+ })
+ }
})
-
-
}
</script>
<template>
@@ -129,6 +143,7 @@
</view>
</view>
</view>
+ <text>{{e}}</text>
<view class="submit-btn" @click="submit()">立即充值</view>
</view>
</view>
diff --git a/pages/station/index.vue b/pages/station/index.vue
index cbe1f70..0e93cd8 100644
--- a/pages/station/index.vue
+++ b/pages/station/index.vue
@@ -23,6 +23,7 @@
<text>{{item.distanceValue}}km</text>
</view>
</view>
+ <view class="info-phone" @click="toCall(item.phone)">电话:{{ item.phone}}</view>
</view>
</view>
</block>
@@ -43,6 +44,7 @@
<text>{{item.distanceValue}}km</text>
</view>
</view>
+ <view class="info-phone" @click="toCall(item.phone)">电话:{{ item.phone}}</view>
</view>
</view>
</block>
@@ -95,6 +97,19 @@
scale:18
})
}
+ function toCall(phone){
+ // #ifdef MP-WEIXIN
+ wx.makePhoneCall({
+ phoneNumber: phone,
+ success: function() {
+ console.log("拨打电话成功！")
+ },
+ fail: function() {
+ console.log("拨打电话失败！")
+ }
+ })
+ // #endif
+ }
onMounted(async() =>{
userLocation.value = JSON.parse(uni.getStorageSync('userLocation'))
await getSiteList()
@@ -143,26 +158,28 @@
padding:0 32rpx;
box-sizing: border-box;
.item{
- height:200rpx;
+ height:230rpx;
width:100%;
background-color: #FFFFFF;
border-radius: 24rpx;
- padding:0 20rpx;
+ padding:36rpx 20rpx;
margin-bottom:20rpx;
box-sizing: border-box;
display: flex;
align-items:center;
.item-img{
image{
- width:130rpx;
- height: 130rpx;
+ width:140rpx;
+ height: 140rpx;
}
}
.item-info{
+ height:100%;
display: flex;
flex-direction: column;
margin-left:20rpx;
justify-content: space-between;
+ overflow: hidden;
.info-name{
color:#222c35;
}
@@ -190,6 +207,10 @@
}
}
}
+ .info-phone{
+ font-size:26rpx;
+ color: #778bce;
+ }
}
}
}
diff --git a/pages/userInfo/index.vue b/pages/userInfo/index.vue
index f7d58b8..b6e4b2e 100644
--- a/pages/userInfo/index.vue
+++ b/pages/userInfo/index.vue
@@ -47,7 +47,7 @@
<view class="info-up">
<view class="info-img">
<text>头像</text>
- <image src='../../static/logo.png' alt=''></image>
+ <image src='../../static/images/index/head.png' alt=''></image>
</view>
<view class="info-name">
<text>用户名称</text>
@@ -67,8 +67,8 @@
<text>联系方式</text>
<view>
<input v-if="isEdit" v-model="editForm.userPhone" placeholder="请输入新联系方式"/>
- <text v-if="userInfo.userPhone">{{userInfo.userPhone}}</text>
- <text v-if="!userInfo.userPhone">未添加联系方式</text>
+ <text v-if="userInfo.userPhone && !isEdit">{{userInfo.userPhone}}</text>
+ <text v-if="!userInfo.userPhone && !isEdit">未添加联系方式</text>
<!-- <image class="edit"src="../../static/images//other/more.png" alt=''></image> -->
</view>
</view>
diff --git a/static/images/index/head.png b/static/images/index/head.png
new file mode 100644
index 0000000..c89c53e
--- /dev/null
+++ b/static/images/index/head.png
Binary files differ
diff --git a/static/images/other/date.png b/static/images/other/date.png
new file mode 100644
index 0000000..ea38bbc
--- /dev/null
+++ b/static/images/other/date.png
Binary files differ
diff --git a/static/images/other/expand.png b/static/images/other/expand.png
new file mode 100644
index 0000000..dacbdfe
--- /dev/null
+++ b/static/images/other/expand.png
Binary files differ
diff --git a/static/images/other/img-add.png b/static/images/other/img-add.png
new file mode 100644
index 0000000..14ad1e7
--- /dev/null
+++ b/static/images/other/img-add.png
Binary files differ
diff --git a/unpackage/dist/dev/mp-weixin/api/index.js b/unpackage/dist/dev/mp-weixin/api/index.js
index ff61c33..05e1a08 100644
--- a/unpackage/dist/dev/mp-weixin/api/index.js
+++ b/unpackage/dist/dev/mp-weixin/api/index.js
@@ -45,6 +45,9 @@
function balanceChangeApi(date) {
return util_request.request(`/userCapitalChange/getListByUser?date=${date}`, {}, "GET");
}
+function balanceStatisticsApi(date) {
+ return util_request.request(`/userCapitalChange/getAmountStatistics?date=${date}`, {}, "GET");
+}
function paymentChangeApi(date) {
return util_request.request(`/paymentRecords/getListByUser?date=${date}`, {}, "GET");
}
@@ -61,6 +64,7 @@
return util_request.request("/waterFacilityMalfunction/create", data, "POST");
}
exports.balanceChangeApi = balanceChangeApi;
+exports.balanceStatisticsApi = balanceStatisticsApi;
exports.creatUserArchive = creatUserArchive;
exports.deleteAddressApi = deleteAddressApi;
exports.editAddressApi = editAddressApi;
diff --git a/unpackage/dist/dev/mp-weixin/common/assets.js b/unpackage/dist/dev/mp-weixin/common/assets.js
index bbbf469..bb3afc4 100644
--- a/unpackage/dist/dev/mp-weixin/common/assets.js
+++ b/unpackage/dist/dev/mp-weixin/common/assets.js
@@ -1,35 +1,39 @@
"use strict";
-const _imports_0$7 = "/static/images/index/hend1.png";
-const _imports_1$2 = "/static/images/index/back.png";
+const _imports_0$8 = "/static/images/index/head.png";
+const _imports_1$3 = "/static/images/index/back.png";
const _imports_2 = "/static/images/index/vip-add.png";
const _imports_3 = "/static/images/index/card11.png";
const _imports_4 = "/static/images/index/code1.png";
const _imports_5 = "/static/images/index/home21.png";
-const _imports_1$1 = "/static/images/index/icon22.png";
+const _imports_1$2 = "/static/images/index/icon22.png";
const _imports_7 = "/static/images/index/icon23.png";
const _imports_8 = "/static/images/index/bg4.png";
const _imports_9 = "/static/images/index/icon51.png";
const _imports_10 = "/static/images/index/more-info5.png";
const _imports_11 = "/static/images/index/notice5.png";
-const _imports_0$6 = "/static/images/addCard/code.png";
-const _imports_0$5 = "/static/logo.png";
-const _imports_0$4 = "/static/images/other/more.png";
-const _imports_0$3 = "/static/images/address/edit.png";
-const _imports_1 = "/static/images/address/delete.png";
-const _imports_0$2 = "/static/images/address/expand.png";
-const _imports_0$1 = "/static/images/other/success.svg";
+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$4 = "/static/images/address/edit.png";
+const _imports_1$1 = "/static/images/address/delete.png";
+const _imports_0$3 = "/static/images/address/expand.png";
+const _imports_0$2 = "/static/images/other/success.svg";
+const _imports_0$1 = "/static/logo.png";
+const _imports_1 = "/static/images/other/img-add.png";
const _imports_0 = "/static/images/addCard/back.png";
exports._imports_0 = _imports_0;
-exports._imports_0$1 = _imports_0$7;
-exports._imports_0$2 = _imports_0$6;
-exports._imports_0$3 = _imports_0$5;
-exports._imports_0$4 = _imports_0$4;
-exports._imports_0$5 = _imports_0$3;
-exports._imports_0$6 = _imports_0$2;
-exports._imports_0$7 = _imports_0$1;
-exports._imports_1 = _imports_1$1;
-exports._imports_1$1 = _imports_1$2;
-exports._imports_1$2 = _imports_1;
+exports._imports_0$1 = _imports_0$8;
+exports._imports_0$2 = _imports_0$7;
+exports._imports_0$3 = _imports_0$6;
+exports._imports_0$4 = _imports_0$5;
+exports._imports_0$5 = _imports_0$4;
+exports._imports_0$6 = _imports_0$3;
+exports._imports_0$7 = _imports_0$2;
+exports._imports_0$8 = _imports_0$1;
+exports._imports_1 = _imports_1$2;
+exports._imports_1$1 = _imports_1$3;
+exports._imports_1$2 = _imports_1$1;
+exports._imports_1$3 = _imports_1;
exports._imports_10 = _imports_10;
exports._imports_11 = _imports_11;
exports._imports_2 = _imports_2;
diff --git a/unpackage/dist/dev/mp-weixin/config/baseUrl.js b/unpackage/dist/dev/mp-weixin/config/baseUrl.js
index f5ac894..4c47d63 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 = "https://www.huiwuyuntong.com/water-drinking-beta";
+const BASE_URL = "http://192.168.0.105:8031";
exports.BASE_URL = BASE_URL;
diff --git a/unpackage/dist/dev/mp-weixin/pages/addCard/index.js b/unpackage/dist/dev/mp-weixin/pages/addCard/index.js
index 82220fa..ac15582 100644
--- a/unpackage/dist/dev/mp-weixin/pages/addCard/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/addCard/index.js
@@ -15,7 +15,7 @@
setup(__props) {
const form = common_vendor.ref({
id: JSON.parse(common_vendor.index.getStorageSync("userInfo")).id,
- waterCardNumber: "023B7C45",
+ waterCardNumber: "",
userName: "",
userPhone: "",
remark: ""
@@ -25,7 +25,9 @@
scanType: ["qrCode"],
success: function(res) {
console.log("条码内容：" + res.result);
- form.value.waterCardNumber = res.result;
+ let data = res.result.split("&id=");
+ form.value.waterCardNumber = data[1];
+ console.log("form.value.waterCardNumber", form.value.waterCardNumber);
}
});
}
@@ -35,9 +37,22 @@
common_vendor.index.showToast({
title: "添加成功！",
image: "../../static/images/other/success.svg",
- duration: 500
+ duration: 2e3
+ }).then(() => {
+ common_vendor.index.navigateBack();
});
- common_vendor.index.navigateBack();
+ } else if (res.code == 300) {
+ common_vendor.index.showToast({
+ title: res.msg,
+ duration: 2e3,
+ icon: "none"
+ });
+ } else {
+ common_vendor.index.showToast({
+ title: "绑卡失败",
+ duration: 2e3,
+ icon: "none"
+ });
}
});
}
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.js b/unpackage/dist/dev/mp-weixin/pages/index/index.js
index 7e671ae..07b6a79 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.js
@@ -124,7 +124,8 @@
if (res2.code == 200) {
common_vendor.index.showToast({
title: "已注销",
- duration: 2e3
+ duration: 2e3,
+ icon: "none"
});
await api_index.getVipInfoApi().then((res3) => {
if (res3.code == 200) {
@@ -156,41 +157,42 @@
return common_vendor.e({
a: common_assets._imports_0$1,
b: common_vendor.t(cardInfo.value.userName),
- c: common_assets._imports_1$1,
- d: common_assets._imports_2,
- e: common_vendor.o(($event) => navTo("/pages/addCard/index")),
- f: common_vendor.o(($event) => navTo("/pages/userInfo/index")),
- g: common_assets._imports_3,
- h: isVip.value
+ c: common_vendor.o(($event) => navTo("/pages/userInfo/index")),
+ d: common_vendor.o(($event) => navTo("/pages/userInfo/index")),
+ e: common_assets._imports_1$1,
+ f: common_assets._imports_2,
+ g: common_vendor.o(($event) => navTo("/pages/addCard/index")),
+ h: common_assets._imports_3,
+ i: isVip.value
}, isVip.value ? {
- i: common_assets._imports_4
+ j: common_assets._imports_4
} : {}, {
- j: isLoss.value && isVip.value
+ k: isLoss.value && isVip.value
}, isLoss.value && isVip.value ? {} : {}, {
- k: isVip.value
+ l: isVip.value
}, isVip.value ? {
- l: common_vendor.t(cardInfo.value.waterCardNumber)
+ m: common_vendor.t(cardInfo.value.waterCardNumber)
} : {}, {
- m: isVip.value
+ n: isVip.value
}, isVip.value ? {} : {}, {
- n: !isVip.value
+ o: !isVip.value
}, !isVip.value ? {} : {}, {
- o: isVip.value
+ p: isVip.value
}, isVip.value ? {
- p: common_vendor.t(cardInfo.value.balance)
+ q: common_vendor.t(cardInfo.value.balance)
} : {}, {
- q: isVip.value
+ r: isVip.value
}, isVip.value ? {
- r: common_vendor.o(($event) => navTo("/pages/recharge/index"))
+ s: common_vendor.o(($event) => navTo("/pages/recharge/index"))
} : {}, {
- s: topHeight.value + "rpx",
- t: common_assets._imports_5,
- v: common_vendor.o(($event) => navTo("/pages/sendWater/index")),
- w: common_assets._imports_1,
- x: common_vendor.o(($event) => navTo("/pages/facilityList/index")),
- y: common_assets._imports_7,
- z: common_vendor.o(($event) => toScan()),
- A: common_vendor.f(functionList.value, (item, index, i0) => {
+ t: topHeight.value + "rpx",
+ v: common_assets._imports_5,
+ w: common_vendor.o(($event) => navTo("/pages/sendWater/index")),
+ x: common_assets._imports_1,
+ y: common_vendor.o(($event) => navTo("/pages/facilityList/index")),
+ z: common_assets._imports_7,
+ A: common_vendor.o(($event) => toScan()),
+ B: common_vendor.f(functionList.value, (item, index, i0) => {
return {
a: item.icon,
b: common_vendor.t(item.text),
@@ -198,12 +200,12 @@
d: index
};
}),
- B: common_assets._imports_8,
- C: common_assets._imports_9,
- D: common_assets._imports_10,
- E: common_vendor.o(($event) => navTo("/pages/station/index")),
- F: common_assets._imports_11,
- G: common_assets._imports_10
+ 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
});
};
}
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.wxml b/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
index 8e56bca..81f43ff 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:' + s}}"><view class="user-info data-v-1cf27b2a" bindtap="{{f}}"><image class="user-img data-v-1cf27b2a" src="{{a}}" alt=""></image><text class="data-v-1cf27b2a">{{b}}</text><image class="user-more data-v-1cf27b2a" src="{{c}}"></image><view class="user-add-card data-v-1cf27b2a" bindtap="{{e}}"><image class="data-v-1cf27b2a" src="{{d}}" alt=""></image><text class="data-v-1cf27b2a">添加会员卡</text></view></view><view class="card data-v-1cf27b2a"><image class="card-bg data-v-1cf27b2a" src="{{g}}" 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="{{h}}" class="data-v-1cf27b2a" src="{{i}}" alt=""></image><text class="data-v-1cf27b2a">会员卡 </text><text wx:if="{{j}}" class="lossed data-v-1cf27b2a"> [已挂失]</text></view><view wx:if="{{k}}" class="data-v-1cf27b2a">ID:{{l}}</view></view></view><view class="card-right data-v-1cf27b2a"><view class="card-right-top data-v-1cf27b2a"><text wx:if="{{m}}" class="data-v-1cf27b2a">金额卡</text><text wx:if="{{n}}" class="data-v-1cf27b2a">未绑定会员卡</text><text wx:if="{{o}}" class="data-v-1cf27b2a">{{p}}元</text></view><view wx:if="{{q}}" class="card-right-bottom data-v-1cf27b2a" bindtap="{{r}}">充值</view></view></view></view></view><view class="function-box1 data-v-1cf27b2a"><view class="box1-bg box1-one data-v-1cf27b2a" bindtap="{{v}}"><image class="data-v-1cf27b2a" src="{{t}}" alt=""></image><view class="data-v-1cf27b2a">送水到家</view></view><view bindtap="{{x}}" class="box1-bg box1-two data-v-1cf27b2a"><image class="data-v-1cf27b2a" src="{{w}}" alt=""></image><view class="data-v-1cf27b2a">附近设备</view></view><view class="box1-bg box1-three data-v-1cf27b2a" bindtap="{{z}}"><image class="data-v-1cf27b2a" src="{{y}}" 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="{{A}}" 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="{{B}}" 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="{{E}}"><view class="data-v-1cf27b2a"><image class="data-v-1cf27b2a" src="{{C}}" 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="{{D}}" alt=""></image></view></view><view class="service-bg data-v-1cf27b2a"><view class="data-v-1cf27b2a"><image class="data-v-1cf27b2a" src="{{F}}" 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="{{G}}" 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="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
diff --git a/unpackage/dist/dev/mp-weixin/pages/recharge/index.js b/unpackage/dist/dev/mp-weixin/pages/recharge/index.js
index 2872b67..50d8e81 100644
--- a/unpackage/dist/dev/mp-weixin/pages/recharge/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/recharge/index.js
@@ -49,6 +49,7 @@
{ 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) {
@@ -57,31 +58,46 @@
money = Number(otherMoney.value);
}
await api_index.wxPayApi({ businessType: 1, tradeAmount: money }).then((res) => {
- console.log("reswxpay", res);
- common_vendor.wx$1.requestPayment({
- //预支付订单信息
- // appId: res.data.appId,
- timeStamp: res.data.timeStamp,
- //时间戳
- nonceStr: res.data.nonceStr,
- //随机串
- package: res.data.package,
- //prepay_id
- signType: res.data.signType,
- //签名算法MD5
- paySign: res.data.paySign,
- //微信签名
- success(res2) {
- if (res2.errMsg == "requestPayment:ok") {
- console.log("支付成功", res2);
- } else {
- console.log("支付失败");
+ e.value = res;
+ if (res.code == 200) {
+ common_vendor.wx$1.requestPayment({
+ //预支付订单信息
+ // appId: res.data.appId,
+ timeStamp: res.data.timeStamp,
+ //时间戳
+ nonceStr: res.data.nonceStr,
+ //随机串
+ package: res.data.package,
+ //prepay_id
+ signType: res.data.signType,
+ //签名算法MD5
+ paySign: res.data.paySign,
+ //微信签名
+ success(res2) {
+ if (res2.errMsg == "requestPayment:ok") {
+ console.log("支付成功", res2);
+ common_vendor.index.showToast({
+ title: "支付成功",
+ duration: 2e3
+ });
+ common_vendor.index.navigateBack();
+ } else {
+ common_vendor.index.showToast({
+ title: "支付失败",
+ duration: 2e3,
+ icon: "none"
+ });
+ }
+ },
+ fail(res2) {
+ common_vendor.index.showToast({
+ title: "微信支付失败",
+ duration: 2e3,
+ icon: "none"
+ });
}
- },
- fail(res2) {
- console.log("支付失败", res2);
- }
- });
+ });
+ }
});
}
return (_ctx, _cache) => {
@@ -109,7 +125,8 @@
d: item.checked
};
}),
- h: common_vendor.o(($event) => submit())
+ h: common_vendor.t(e.value),
+ i: 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 d0c5a29..022fece 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><view class="submit-btn data-v-f06186df" bindtap="{{h}}">立即充值</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><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
--
Gitblit v1.9.3