master
张少康 2 years ago
parent 42ab76939f
commit 42e8bb0a11

@ -33,7 +33,8 @@
"pages/mine/seeIdCard/index",
"pages/mine/versionPage/index",
"pages/mine/myJob/index",
"pages/mine/wxMoney/index",
"pages/message/index",
"pages/messageDetail/index",

@ -4,7 +4,8 @@
page {
height: 100vh;
background: #f5f5f5;
--color-ysd: #0dcc91;
--color-ysd: #0dcc91;
--color-ysd-bg:#E8FFF8;
--color-hover: #3DD6A7;
--color-be: #ff4400;
--color-f40: #ff4400;
@ -2027,4 +2028,8 @@ page {
width: 56px;
color: #666;
text-align: center;
}
.btnHover,.loginBtn:active,.loginOut:active{
color: #fff;
background-color: var(--color-hover) !important;
}

@ -1101,17 +1101,7 @@ Page({
},
onReady() {
let that = this;
var query = wx.createSelectorQuery();
query.select(".navigator").boundingClientRect();
query.exec(function (res) {
//res就是 所有标签为v1的元素的信息 的数组
console.log(res);
//取高度
console.log(res[0].height);
that.setData({
navigatorBarHeight: res[0].height + 15,
});
});
},
/**
* 智能匹配结束

@ -56,9 +56,9 @@
<view class="tarbar" bindtap="collectChange" data-id="0">
<view class="tarbarText {{choiceCollect == '0'?'collectActive':''}}">全部</view>
</view>
<!-- <view class="tarbar" style="margin-left: 24px;" bindtap="collectChange" data-id="1">
<view class="tarbar" style="margin-left: 24px;" bindtap="collectChange" data-id="1">
<view class="tarbarText {{choiceCollect == '1'?'collectActive':''}}">收藏</view>
</view> -->
</view>
</view>
<view class="xgxg" id="menu">
<view class="fsa" style="justify-content:space-beteween; height: 44px">
@ -473,7 +473,7 @@
<image src="{{item.logo || 'https://matripe.oss-cn-beijing.aliyuncs.com/default.png'}}" mode="aspectFit" class="logoClass" alt></image>
<image class="pendant" wx:if="{{item.hotJob == 1}}" src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/hot.png" mode="aspectFit|aspectFill|widthFix" binderror bindload></image>
</view>
<!-- <button wx:if="{{isLogin && hasUserInfo - 0 == 0}}" class="collect biggerSize2 v-center {{item.collected - 1 == 0 ? 'collectred':''}}" open-type="getUserInfo" style="width:52px;" catchtap="getUserInfoBtn" data-type="4" data-collected="{{item.collected}}" data-jobid="{{item.id}}" hover-stop-propagation>
<button wx:if="{{isLogin && hasUserInfo - 0 == 0}}" class="collect biggerSize2 v-center {{item.collected - 1 == 0 ? 'collectred':''}}" open-type="getUserInfo" style="width:52px;" catchtap="getUserInfoBtn" data-type="4" data-collected="{{item.collected}}" data-jobid="{{item.id}}" hover-stop-propagation>
<icon class="iconfont icon-shoucang lh12" style="color: #888" wx:if="{{item.collected - 2 == 0}}"></icon>
<icon class="iconfont icon-yishoucang lh12 color-f40" style wx:else></icon>
<text class="f10 {{item.collected - 1 == 0 ? 'color-f40':'c8'}}" style="line-height: 36px; margin-left: 2px">{{item.collected - 2 == 0 ? '收藏' : '已收藏'}}</text>
@ -486,7 +486,7 @@
<button wx:if="{{!isLogin}}" style="width:52px;" class="collect biggerSize" open-type="getPhoneNumber" catchgetphonenumber="getPhoneNumber" catchtap="emptyMethod" data-collected="{{item.collected}}" data-jobid="{{item.id}}" hover-stop-propagation>
<icon class="iconfont icon-shoucang" style="color: #888"></icon>
<text class="f10 c8" style="line-height: 18px; margin-left: 2px">收藏</text>
</button> -->
</button>
</view>
<view class="flex-1 vsb">
<view class="display-flex">

@ -15,15 +15,14 @@
<view class="fr cf fw500 f18 mr16">{{item.bankNo}}</view>
</view>
<view wx:if="{{user.idauth == 0}}" class="addcard v-center mt16" hover-class="thover" bindtap="showDialog">
<!-- <view wx:if="{{user.idauth == 0}}" class="addcard v-center mt16" hover-class="thover" bindtap="showDialog">
<i class="iconfont icon-tianjia mr8"></i>
绑定银行卡
</view>
<navigator wx:if="{{user.idauth == 1}}" url="/pages/bindBankCard/index" class="addcard mt16 v-center" hover-class="thover">
<i class="iconfont icon-tianjia mr8"></i>
绑定银行卡
</navigator>
<!-- <view class="tc f14 c9" style="margin-top:30px;">暂时仅支持绑定“微信零钱”账户(可用于提现)</view> -->
</navigator> -->
</view>
<scroll-view class="fadeIn" wx:if="{{iosDialog1}}" style="position: relative;z-index: 999;">
<view class="weui-mask"></view>

@ -1,7 +1,7 @@
<!-- pages/changeGender/index.wxml -->
<view>
<radio-group class="radio-group" bindchange="radioChange" hover-class="none">
<label class="weui-cell weui-cell_active weui-check__label {{index == 0 ? 'bb1':''}}" hover-class="none" wx:for="{{items}}" wx:key="name" wx:for-index="index">
<label class="weui-cell weui-check__label {{index == 0 ? 'bb1':''}}" hover-class="none" wx:for="{{items}}" wx:key="name" wx:for-index="index">
<view class="weui-cell__bd">
<view class="fw500">{{item.name}}</view>
</view>

@ -23,7 +23,8 @@ Page({
underReviewList: [],
searchParam: {},
recordBillType: "",
configInfo:{}
configInfo:{},
balance:'0.00'
// agencyStatus: 0, // 是否是代理判断
},
@ -49,10 +50,20 @@ Page({
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {},
openEyes:function(){
this.setData({
showMoney:false
})
},
closeEyes:function(){
this.setData({
showMoney:true
})
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
console.log("isshow");
let that = this;

@ -49,7 +49,26 @@
</view>
</navigator>
<!-- <navigator class url="{{isLogin? '/pages/mine/myJob/index': '/pages/login/index'}}" hover-class="none" hover-stop-propagation="false">
<view class="mt10" style="padding-bottom:0;">
<view class="moneyView" hover-class="thover">
<navigator url="{{'/pages/mine/wxMoney/index'}}" class="display-flex" hover-class="none">
<view class="moneyText flex-1">账户余额(元)
<view class="iconfont icon-zhengyan f14 dib" style="padding: 8px;margin-left: -8px;" wx:if="{{showMoney}}" catchtap="openEyes" hover-stop-propagation></view>
<view class="iconfont icon-biyan f14 dib" style="padding: 8px;margin-left: -8px;" wx:if="{{!showMoney}}" catchtap="closeEyes" hover-stop-propagation></view>
<view class="v-center mt8">
<view class="moneyM" wx:if="{{showMoney}}">{{balance}}</view>
<view class="moneyM" wx:if="{{!showMoney}}">****</view>
</view>
</view>
<view class="fr f14 va-center">
<view class="dib">详情</view>
<i class="iconfont icon-gengduo11 f12 c9 ml4 dib pr" style="line-height:1;top:1px;"></i>
</view>
</navigator>
</view>
</view>
<navigator class url="{{isLogin? '/pages/mine/myJob/index': '/pages/login/index'}}" hover-class="none" hover-stop-propagation="false">
<view class="br_8" hover-class="none" style="background-color:#fff" hover-stop-propagation="false">
<view class="setting mt_10" hover-class="thover">
<view>
@ -61,7 +80,7 @@
</view>
</view>
</view>
</navigator> -->
</navigator>
<!-- 我的服务 -->
<view class="myserve mt_10 br_8">
@ -69,13 +88,12 @@
<view class="ml16 f16 c3 fw500">我的服务</view>
</view>
<view class="content">
<view>
<!-- url="{{isLogin? '/pages/addUserCard/index': '/pages/login/index'}}" -->
<!-- <view>
<navigator url="{{isLogin? '/pages/mine/myJob/index': '/pages/login/index'}}" hover-class="thover" open-type="navigate">
<image class src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/gz92.svg" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror bindload></image>
<view>工作</view>
</navigator>
</view>
</view> -->
<view>
<!-- url="{{isLogin? '/pages/addUserCard/index': '/pages/login/index'}}" -->
<navigator url="{{isLogin? './addUserCard/index': '/pages/login/index'}}" hover-class="thover" open-type="navigate">
@ -84,12 +102,12 @@
</navigator>
</view>
<!-- <view>
<navigator class target url="{{isLogin? '/pages/addCard/index': '/pages/login/index'}}" hover-class="thover" aria-role="navigate" open-type="navigate">
<view>
<navigator class target url="{{isLogin? '/pages/mine/addCard/index': '/pages/login/index'}}" hover-class="thover" aria-role="navigate" open-type="navigate">
<image class src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/yhk92.svg" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror bindload></image>
<view>银行卡</view>
</navigator>
</view> -->
</view>
<!-- <view>
<navigator class="" target="" url="/pages/myEnroll/index" hover-class="none" open-type="navigate">
<image class="" src="/assets/images/wdbm.svg" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
@ -139,8 +157,9 @@
</view>
</view>
<view class hover-class="none" hover-stop-propagation="false">
<view class="t-icon t-icon-dianhua mr10" bindtap="makePhoneCall" hover-class="thover06" style="width:40px;height:40px "></view>
<view class="t-icon t-icon-qiyeweixin1" bindtap="showdialog" hover-class="thover06" style="width:40px;height:40px "></view>
<view class="iconfont icon-qiyeweixin dib" bindtap="showdialog" hover-class="thover06" style="width:40px;height:40px;border-radius: 50%;background-color: var(--color-ysd-bg);color:var(--color-hover);display: flex;align-items: center;justify-content: center;font-size: 20px;float: right;"></view>
<view class="iconfont icon-dianhua mr10 dib" bindtap="makePhoneCall" hover-class="thover06" style="width:40px;height:40px;border-radius: 50%;background-color: var(--color-ysd-bg);color:var(--color-hover);display: flex;align-items: center;justify-content: center;font-size: 20px;float: right;"></view>
</view>
<!-- <view class="display-flex bt1 serviceBottom" hover-class="none" hover-stop-propagation="false">
<view class="display-flex br1 f14" bindtap="makePhoneCall" hover-class="thover">
@ -160,10 +179,24 @@
</view>-->
</view>
<navigator hover-class target url="{{isLogin? './setting/index': '/pages/login/index'}}">
<view class="br_8" hover-class="none" style="background-color:#fff" hover-stop-propagation="false">
<view class="setting" hover-class="thover" style="margin-top:10px;">
<view>
<!-- <image class src="/assets/images/sz.svg" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror bindload></image> -->
<view class="t-icon t-icon-shezhi mr6" style="width:22px;height:22px" hover-class="none" hover-stop-propagation="false"></view>
<view class>反馈与建议</view>
</view>
<view class="iconfont icon-gengduo11"></view>
</view>
</view>
</navigator>
<!-- url="{{isLogin? '/pages/setting/index': '/pages/login/index'}}" -->
<navigator class="mb32" hover-class style="margin-bottom: 200px;" target url="{{isLogin? './setting/index': '/pages/login/index'}}">
<navigator class="mb32" hover-class target url="{{isLogin? './setting/index': '/pages/login/index'}}">
<view class="br_8" hover-class="none" style="background-color:#fff" hover-stop-propagation="false">
<view class="setting" hover-class="thover" style="margin-top: 32px;">
<view class="setting" hover-class="thover" style="margin-top: 10px;">
<view>
<!-- <image class src="/assets/images/sz.svg" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror bindload></image> -->
<view class="t-icon t-icon-shezhi mr6" style="width:22px;height:22px" hover-class="none" hover-stop-propagation="false"></view>
@ -174,6 +207,20 @@
</view>
</navigator>
<navigator class="mb32" hover-class style="margin-bottom:80px;" target url="{{isLogin? './setting/index': '/pages/login/index'}}">
<view class="br_8" hover-class="none" style="background-color:#fff" hover-stop-propagation="false">
<view class="setting" hover-class="thover" style="margin-top: 32px;">
<view>
<!-- <image class src="/assets/images/sz.svg" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror bindload></image> -->
<view class="t-icon t-icon-shezhi mr6" style="width:22px;height:22px" hover-class="none" hover-stop-propagation="false"></view>
<view class>商家后台</view>
</view>
<view class="iconfont icon-gengduo11"></view>
</view>
</view>
</navigator>
<!-- <view class="login" wx:if="{{!isLogin}}">
<navigator class="" target="" url="../login/index" hover-class="none" open-type="navigate">
<button class="loginBtn" style="font-weight:400;margin-top:0px;" type="primary" role="button" bindtap=''>登录</button>

@ -135,7 +135,7 @@ page {
/* width: 355px; */
/* height: 96px; */
box-sizing: border-box;
color: #fff;
color: #333;
background-color: #fff;
}
.container .userbalance > navigator {
@ -367,3 +367,46 @@ page {
bottom: -5px;
transform: translateX(-50%);
}
.moneyView{
padding:12px 12px 12px 20px;
background-color: #fff;
border-radius: 8px;
}
.moneyText{
flex: 1;
font-size: 14px;
color: #333;
line-height: 20px;
}
.moneyM{
flex: 1;
font-size: 26px;
color: #333;
line-height: 30px;
}
.moneyCash{
width: 44px;
height: 20px;
border: 1px solid #ffffff;
border-radius: 4px;
font-size: 12px;
color: #ffffff;
text-align: center;
line-height: 20px;
}
.moneyCashBtn{
width: 44px;
height: 22px;
border: 1px solid #ffffff;
border-radius: 4px;
font-size: 12px;
color: #ffffff;
text-align: center;
line-height: 22px;
padding: 0;
margin: 0;
background-color: transparent !important;
}
.thover06{
opacity: 0.6;
}

@ -0,0 +1,205 @@
// pages/wxMoney/index.js
const app = getApp();
const commonUtil = require("../../../utils/commonUtil.js");
Page({
/**
* 页面的初始数据
*/
data: {
balance: '0.00',
auth: 0,
openId: '',
isLogin: false,
hasUserInfo: {},
agencyStatus: 0,
},
getWalletInfo: function() {
var that = this;
wx.request({
url: app.globalData.ip + "/wallet/info",
data: {
},
header: app.globalData.headers,
method: "GET",
success: function(res) {
console.log(res)
if(res.data.status == 200) {
console.log(res);
//绑定成功
// console.log(new Number(res.data.data.balance / 100).toFixed(2));
// console.log( commonUtil.moneyToFixed(res.data.data.balance) + '');
that.setData({
balance: new Number(res.data.data.balance / 100).toFixed(2),
auth: res.data.data.auth,
openId: res.data.data.openId,
});
wx.hideLoading({
success: (res) => {},
})
} else {
wx.showToast({
icon: "none",
title: res.data.msg,
})
}
},
fail: function(res) {
console.log("操作失败");
}
})
},
wxLogin() {
var that = this;
wx.login({
success(res) {
if (res.code) {
that.setData({
wxCode: res.code
});
} else {
console.log('获取code失败' + res.errMsg)
}
}
})
},
goWithDraw(){
wx.navigateTo({
url: '/pages/withdraw/index',
})
},
getUserInfoBtn: function(e) {
console.log(e)
let that = this;
wx.getUserProfile({
desc: '用于完善会员资料', // 声明获取用户个人信息后的用途,后续会展示在弹窗中,请谨慎填写
success: (res) => {
console.log(res)
let encryptedData = res.encryptedData;
let iv = res.iv;
//发起网络请求
wx.request({
url: app.globalData.ip + '/decodeUserInfo',
data: {
encryptedData: encryptedData,
iv: iv,
code: that.data.wxCode,
// type: 'dtdl',
},
method: "POST",
header: app.globalData.headers,
success: function(res) {
console.log(res);
if(res.data.status == 200) {//设置头像昵称成功,进去提现页面
wx.navigateTo({
url: '/pages/withdraw/index',
})
} else {
wx.showToast({
icon: "none",
title: res.data.msg,
})
}
},
fail: function(res) {
}
})
},
fail: (res) => {
console.log(res);
wx.showToast({
icon: "none",
title: '获取授权失败,将影响您的提现。',
})
}
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
wx.showLoading({
title: '加载中...',
})
this.wxLogin();
if (app.globalData.isLogin) {
this.setData({
isLogin: app.globalData.isLogin,
hasUserInfo: app.globalData.hasUserInfo,
agencyStatus: app.globalData.agencyStatus,
user: app.globalData.user,
});
this.getWalletInfo();
} else {
// 由于 userLogin 是网络请求,可能会在 Page.onLoad 之后才返回
// 所以此处加入 callback 以防止这种情况
app.userLoginCallback = res => {
this.setData({
isLogin: app.globalData.isLogin,
hasUserInfo: app.globalData.hasUserInfo,
agencyStatus: app.globalData.agencyStatus,
user: app.globalData.user,
});
this.getWalletInfo();
}
}
wx.hideLoading()
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})

@ -0,0 +1,5 @@
{
"backgroundColorTop":"#f5f5f5",
"backgroundColor": "#f5f5f5",
"navigationBarTitleText": "账户余额"
}

@ -0,0 +1,22 @@
<view class="p10">
<view class="bgf tc br8" style="height:calc(100vh - 20px);">
<i class="iconfont icon-zhanghuyue"></i>
<view class="mt30 f16 c3">账户余额</view>
<view class="wxMoney">
<text class="moneyFu">¥</text>{{balance}}</view>
<view>
<!-- <navigator url="/pages/withdraw/index" class="loginOut dib" style="font-weight:400;margin-top:70px;">
提现
</navigator> -->
<button class="loginOut dib" catchtap="goWithDraw" style="font-weight:400;margin-top:70px;">提现</button>
<button class="loginOut dib" wx:if="{{isLogin && (openId == '' || openId == null || openId == 'undefined')}}" open-type="getUserInfo" catchtap="getUserInfoBtn" style="font-weight:400;margin-top:80px;">提现</button>
</view>
<navigator url="/pages/withdrawDetail/index" class="txmx" hover-class="thover">提现明细</navigator>
</view>
<!-- <navigator wx:if="{{isLogin && openId != '' && openId != null && openId != 'undefined'}}" url="/pages/withdraw/index" class="moneyCash">提现</navigator>
<button wx:if="{{isLogin && (openId == '' || openId == null || openId == 'undefined')}}" type="primary" class="moneyCashBtn" hover-class="thover" open-type="getUserInfo" catchtap="getUserInfoBtn">提现</button> -->
</view>

@ -0,0 +1,34 @@
page{
background-color: #f5f5f5;
}
.icon-zhanghuyue{
font-size: 50px;
display: block;
padding-top: 60px;
color: var(--color-ysd);
}
.wxMoney{
margin-top: 12px;
font-size: 40px;
font-weight: 601;
color: #333333;
line-height: 40px;
display: inline-flex;
align-items: flex-start;
}
.moneyFu{
font-size: 26px;
font-weight: 601;
color: #333333;
line-height: 30px;
/* vertical-align: top; */
}
.txmx{
margin-top: 10px;
font-size: 14px;
font-weight: 400;
text-align: center;
color: var(--color-ysd);
line-height: 28px;
}
Loading…
Cancel
Save