1.修改时间 显示

2.增加充值话费
yj-dev
杨杰 4 years ago
parent f8f7114fc9
commit 939d6656c8
  1. 8
      components/Authorize.vue
  2. 2
      pages copy.json
  3. 27
      pages.json
  4. 10
      pages/goods/coupon-details/coupon-details.vue
  5. 10
      pages/goods/coupons-info-details/coupons-info-details.vue
  6. 10
      pages/goods/externalCoupon/externalCoupon.vue
  7. 10
      pages/goods/recording/recording.vue
  8. 8
      pages/login/register.vue
  9. 10
      pages/order/confirmation.vue
  10. 10
      pages/pay/success/success.vue
  11. 7
      pages/tabBar/user/user.vue
  12. 233
      pages/user/Charge/Charge.vue
  13. 10
      pages/user/agentCoupons/agentCoupons.vue
  14. 10
      pages/user/coupon/coupon.vue
  15. 10
      pages/user/mineCouponsDestails/mineCouponsDestails.vue
  16. 10
      pages/user/order_details/order_details.vue
  17. 10
      pages/user/runningWater/runningWater.vue

@ -17,7 +17,7 @@
<!-- #endif -->
<!-- #ifdef H5 -->
<button class='item grant' type="primary" @click="getH5userinfo" lang="zh_CN"
withCredentials="true">微信授权</button>
withCredentials="true">去登录</button>
<!-- #endif -->
</view>
</view>
@ -127,8 +127,10 @@
that.isShowAuth = false
},
getH5userinfo(){
console.log('[=========]')
location.href='https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsgcs.dctpay.com%2FH5%2Findex.html%23%2F&response_type=code&scope=snsapi_userinfo#wechat_redirect';
uni.navigateTo({
url:'/pages/login/register'
})
// location.href='https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsgcs.dctpay.com%2FH5%2Findex.html%23%2F&response_type=code&scope=snsapi_userinfo#wechat_redirect';
},
close() {
uni.reLaunch({

@ -120,7 +120,7 @@
{
"path": "pages/login/register",
"style": {
"navigationBarTitleText": "注册账号",
"navigationBarTitleText": "手机号登录",
"navigationBarBackgroundColor": "#f06c7a",
"navigationBarTextStyle": "white",
"app-plus": {

@ -118,7 +118,7 @@
{
"path": "pages/login/register",
"style": {
"navigationBarTitleText": "注册账号",
"navigationBarTitleText": "手机号登录",
"navigationBarBackgroundColor": "#f06c7a",
"navigationBarTextStyle": "white",
"app-plus": {
@ -311,15 +311,14 @@
"enablePullDownRefresh": false
}
}
, {
}, {
"path": "pages/user/agentCoupons/agentCoupons",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},{
}, {
"path": "pages/user/minePromotion/minePromotion",
"style": {
"navigationBarTitleText": "",
@ -330,19 +329,27 @@
}
},
{
"path" : "pages/user/runningWater/runningWater",
"style" :
{
"enablePullDownRefresh": false,
"path": "pages/user/runningWater/runningWater",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "",
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#f06c7a",
"backgroundColorTop": "#f06c7a",
"navigationBarTextStyle": "white"
}
}
}, {
"path": "pages/user/Charge/Charge",
"style": {
"navigationBarBackgroundColor": "#ffffff",
"navigationBarTitleText": "充值",
"backgroundColorTop": "#ffffff",
"backgroundColorBottom": "#ffffff"
}
}
],
],
"globalStyle": {
"navigationBarTextStyle": "black",

@ -87,11 +87,11 @@
let h = data.getHours();
let mm = data.getMinutes();
let s = data.getSeconds();
month = month > 10 ? month : "0" + month;
day = day > 10 ? day : "0" + day;
h = h > 10 ? h : "0" + h;
mm = mm > 10 ? mm : "0" + mm;
s = s > 10 ? s : "0" + s;
month = month >= 10 ? month : "0" + month;
day = day >= 10 ? day : "0" + day;
h = h >= 10 ? h : "0" + h;
mm = mm >= 10 ? mm : "0" + mm;
s = s >= 10 ? s : "0" + s;
return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
}
},

@ -88,11 +88,11 @@
let h = data.getHours();
let mm = data.getMinutes();
let s = data.getSeconds();
month = month > 10 ? month : "0" + month;
day = day > 10 ? day : "0" + day;
h = h > 10 ? h : "0" + h;
mm = mm > 10 ? mm : "0" + mm;
s = s > 10 ? s : "0" + s;
month = month >= 10 ? month : "0" + month;
day = day >= 10 ? day : "0" + day;
h = h >= 10 ? h : "0" + h;
mm = mm >= 10 ? mm : "0" + mm;
s = s >= 10 ? s : "0" + s;
return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
}
},

@ -96,11 +96,11 @@
let h = data.getHours();
let mm = data.getMinutes();
let s = data.getSeconds();
month = month > 10 ? month : "0" + month;
day = day > 10 ? day : "0" + day;
h = h > 10 ? h : "0" + h;
mm = mm > 10 ? mm : "0" + mm;
s = s > 10 ? s : "0" + s;
month = month >= 10 ? month : "0" + month;
day = day >= 10 ? day : "0" + day;
h = h >= 10 ? h : "0" + h;
mm = mm >= 10 ? mm : "0" + mm;
s = s >= 10 ? s : "0" + s;
return `${year}${spe}${month}${spe}${day}`;
}
},

@ -67,11 +67,11 @@
let h = data.getHours();
let mm = data.getMinutes();
let s = data.getSeconds();
month = month > 10 ? month : "0" + month;
day = day > 10 ? day : "0" + day;
h = h > 10 ? h : "0" + h;
mm = mm > 10 ? mm : "0" + mm;
s = s > 10 ? s : "0" + s;
month = month >= 10 ? month : "0" + month;
day = day >= 10 ? day : "0" + day;
h = h >= 10 ? h : "0" + h;
mm = mm >= 10 ? mm : "0" + mm;
s = s >= 10 ? s : "0" + s;
return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
}
},

@ -13,13 +13,13 @@
<view class="code">
<input placeholder="请输入验证码" v-model="code" placeholder-style="color: rgba(255,255,255,0.8);"/>
</view>
<view class="password">
<!-- <view class="password">
<input placeholder="请输入密码" v-model="passwd" password=true placeholder-style="color: rgba(255,255,255,0.8);"/>
</view>
</view> -->
<view class="btn" @tap="doReg">立即注册</view>
<view class="res">
<!-- <view class="res">
<view @tap="toLogin">已有账号立即登录</view>
</view>
</view> -->
</view>
</view>

@ -246,11 +246,11 @@
let h = data.getHours();
let mm = data.getMinutes();
let s = data.getSeconds();
month = month > 10 ? month : "0" + month;
day = day > 10 ? day : "0" + day;
h = h > 10 ? h : "0" + h;
mm = mm > 10 ? mm : "0" + mm;
s = s > 10 ? s : "0" + s;
month = month >= 10 ? month : "0" + month;
day = day >= 10 ? day : "0" + day;
h = h >= 10 ? h : "0" + h;
mm = mm >= 10 ? mm : "0" + mm;
s = s >= 10 ? s : "0" + s;
return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
}
},

@ -85,11 +85,11 @@
let h = data.getHours();
let mm = data.getMinutes();
let s = data.getSeconds();
month = month > 10 ? month : "0" + month;
day = day > 10 ? day : "0" + day;
h = h > 10 ? h : "0" + h;
mm = mm > 10 ? mm : "0" + mm;
s = s > 10 ? s : "0" + s;
month = month >= 10 ? month : "0" + month;
day = day >= 10 ? day : "0" + day;
h = h >= 10 ? h : "0" + h;
mm = mm >= 10 ? mm : "0" + mm;
s = s >= 10 ? s : "0" + s;
return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
}
},

@ -95,7 +95,7 @@
</view>
<!-- 占位 -->
<view class="place-bottom"></view>
<authorize></authorize>
<!-- <authorize></authorize> -->
</view>
</template>
<script>
@ -182,6 +182,11 @@
url: '../../login/login?id=2',
text: '我的推广',
img: '/static/img/user/renw.png'
},
{
url: '/pages/user/Charge/Charge',
text: '充话费',
img: '/static/img/user/bank.png'
}
]
}

@ -0,0 +1,233 @@
<template>
<view>
<view class="block">
<view class="title">
我的账户
</view>
<view class="content">
<input type="number" class="my" placeholder="请输入手机号码" v-model="inputPhone" />
</view>
</view>
<view class="block">
<view class="title">
充话费
</view>
<view class="content">
<view class="amount">
<view class="list">
<view class="box" v-for="(amount,index) in amountList" :key="index" @tap="select(amount)" :class="{'on':amount == inputAmount}">
<view class="heTitle">{{amount}}</view>
<view class="mitext">售价{{amount}}</view>
</view>
</view>
<!-- <view class="num">
<view class="text">
自定义充值金额
</view>
<view class="input">
<input type="number" v-model="inputAmount" />
</view>
</view> -->
</view>
</view>
</view>
<view class="pay">
<view class="btn" @tap="doDeposit">立即充值</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
inputAmount:'',//,
inputPhone : '', //
amountList:[30,50,100,200,300,500]//3
};
},
methods:{
select(amount){
this.inputAmount = amount;
},
doDeposit(){
if (parseFloat(this.inputAmount).toString() == "NaN") {
uni.showToast({title:'请输入正确金额',icon:'none'});
return ;
}
if(this.inputAmount<=0){
uni.showToast({title:'请输入大于0的金额',icon:'none'});
return ;
}
if(parseFloat(this.inputAmount).toFixed(2)!=parseFloat(this.inputAmount)){
uni.showToast({title:'最多只能输入两位小数哦~',icon:'none'});
return ;
}
///
uni.showLoading({
title:'支付中...'
});
setTimeout(()=>{
uni.hideLoading();
uni.showToast({
title:'支付成功'
});
setTimeout(()=>{
uni.redirectTo({
url:'../../pay/success/success?amount='+this.inputAmount
});
},300);
},700)
}
},
onLoad() {
},
}
</script>
<style lang="scss">
.block{
width: 94%;
padding: 20upx 3%;
.title{
width: 100%;
font-size: 34upx;
}
.content{
.my{
width: 100%;
height: 120upx;
display: flex;
align-items: center;
font-size: 38upx;
border-bottom: solid 1upx #eee;
}
.amount{
width: 100%;
.list{
// display: flex;
justify-content: space-between;
padding: 20upx 0;
height: 270upx;
.box{
width: 30%;
margin-right: 3%;
margin-top: 20upx;
float: left;
height: 120upx;
// display: flex;
justify-content: center;
align-items: center;
text-align: center;
border-radius: 10upx;
box-shadow: 0upx 5upx 20upx rgba(0,0,0,0.05);
font-size: 36upx;
background-color: #f1f1f1;
color: #f06c7a;
&.on{
background-color: #f06c7a;
color: #ffffff;
}
}
.heTitle{
margin-top: 15upx;
width: 100%;
font-size: 15px;
}
.mitext{
margin-top: 10upx;
width: 100%;
font-size: 12px;
}
}
.num{
margin-top: 40upx;
display: flex;
justify-content: flex-end;
align-items: center;
.text{
padding-right: 10upx;
font-size: 30upx;
}
.input{
width: 28.2vw;
border-bottom: solid 2upx #999;
justify-content: flex-end;
align-items: center;
input{
margin: 0 20upx;
height: 60upx;
font-size: 30upx;
color: #f06c7a;
justify-content: flex-end;
align-items: center;
}
}
}
}
.pay-list{
width: 100%;
border-bottom: solid 1upx #eee;
.row{
width: 100%;
height: 120upx;
display: flex;
align-items: center;
.left{
width: 100upx;
flex-shrink: 0;
display: flex;
align-items: center;
image{
width: 80upx;
height: 80upx;
}
}
.center{
width: 100%;
font-size: 30upx;
}
.right{
width: 100upx;
flex-shrink: 0;
display: flex;
justify-content: flex-end;
}
}
}
}
}
.pay{
margin-top: 100upx;
width: 100%;
display: flex;
justify-content: center;
flex-wrap: wrap;
.btn{
width: 70%;
height: 80upx;
border-radius: 80upx;
display: flex;
justify-content: center;
align-items: center;
color: #fff;
background-color: #f06c7a;
box-shadow: 0upx 5upx 10upx rgba(0,0,0,0.2);
}
.tis{
margin-top: 10upx;
width: 100%;
font-size: 24upx;
display: flex;
justify-content: center;
align-items: baseline;
color: #999;
.terms{
color: #5a9ef7;
}
}
}
</style>

@ -79,11 +79,11 @@
let h = data.getHours();
let mm = data.getMinutes();
let s = data.getSeconds();
month = month > 10 ? month : "0" + month;
day = day > 10 ? day : "0" + day;
h = h > 10 ? h : "0" + h;
mm = mm > 10 ? mm : "0" + mm;
s = s > 10 ? s : "0" + s;
month = month >= 10 ? month : "0" + month;
day = day >= 10 ? day : "0" + day;
h = h >= 10 ? h : "0" + h;
mm = mm >= 10 ? mm : "0" + mm;
s = s >= 10 ? s : "0" + s;
return `${year}${spe}${month}${spe}${day}`;
}
},

@ -147,11 +147,11 @@
let h = data.getHours();
let mm = data.getMinutes();
let s = data.getSeconds();
month = month > 10 ? month : "0" + month;
day = day > 10 ? day : "0" + day;
h = h > 10 ? h : "0" + h;
mm = mm > 10 ? mm : "0" + mm;
s = s > 10 ? s : "0" + s;
month = month >= 10 ? month : "0" + month;
day = day >= 10 ? day : "0" + day;
h = h >= 10 ? h : "0" + h;
mm = mm >= 10 ? mm : "0" + mm;
s = s >= 10 ? s : "0" + s;
return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
}
},

@ -80,11 +80,11 @@
let h = data.getHours();
let mm = data.getMinutes();
let s = data.getSeconds();
month = month > 10 ? month : "0" + month;
day = day > 10 ? day : "0" + day;
h = h > 10 ? h : "0" + h;
mm = mm > 10 ? mm : "0" + mm;
s = s > 10 ? s : "0" + s;
month = month >= 10 ? month : "0" + month;
day = day >= 10 ? day : "0" + day;
h = h >= 10 ? h : "0" + h;
mm = mm >= 10 ? mm : "0" + mm;
s = s >= 10 ? s : "0" + s;
return `${year}${spe}${month}${spe}${day}`;
}
},

@ -267,11 +267,11 @@
let h = data.getHours();
let mm = data.getMinutes();
let s = data.getSeconds();
month = month > 10 ? month : "0" + month;
day = day > 10 ? day : "0" + day;
h = h > 10 ? h : "0" + h;
mm = mm > 10 ? mm : "0" + mm;
s = s > 10 ? s : "0" + s;
month = month >= 10 ? month : "0" + month;
day = day >= 10 ? day : "0" + day;
h = h >= 10 ? h : "0" + h;
mm = mm >= 10 ? mm : "0" + mm;
s = s >= 10 ? s : "0" + s;
return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
}
},

@ -72,11 +72,11 @@
let h = data.getHours();
let mm = data.getMinutes();
let s = data.getSeconds();
month = month > 10 ? month : "0" + month;
day = day > 10 ? day : "0" + day;
h = h > 10 ? h : "0" + h;
mm = mm > 10 ? mm : "0" + mm;
s = s > 10 ? s : "0" + s;
month = month >= 10 ? month : "0" + month;
day = day >= 10 ? day : "0" + day;
h = h >= 10 ? h : "0" + h;
mm = mm >= 10 ? mm : "0" + mm;
s = s >= 10 ? s : "0" + s;
return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
}
},

Loading…
Cancel
Save