main
fanfan 6 months ago
parent 779959d34b
commit 4926abaeed
  1. 5
      pages/activity/intimate.vue
  2. 2
      pages/news/recycling/confirm.vue
  3. 5
      pages/news/recycling/detail.vue
  4. 49
      pages/news/user/withdrawal.vue
  5. 165
      pages/news3/JoinDistribution.vue
  6. 4
      pages/refund/index.vue

@ -31,7 +31,10 @@
</view>
<scroll-view scroll-y class="l">
<view class="item" v-for="(a,i) in list1" :key="i" @click="openPage(2,a)">
<image :src="a.server_image" mode="widthFix"></image>
<view style="width: 100%;height: 230rpx;align-items: center;display: flex;">
<image :src="a.server_image" mode="widthFix" style="height: 100%;"></image>
</view>
<view class="title">
<!-- <text>自营</text> -->
{{a.server_name}}

@ -56,7 +56,7 @@
<view class="item">
<view class="a">服务时间</view>
<view class="b" @click="openPage(1)">
<view class="select" :class="server_time?'select-on':''">{{server_time?server_time:'请选择预约到店时间'}}
<view class="select" :class="server_time?'select-on':''">{{server_time?server_time:(type == 2?'请选择预约上门时间':'请选择预约到店时间')}}
</view>
<u-icon style="margin-left: 10rpx;" name="arrow-right"></u-icon>
</view>

@ -45,10 +45,10 @@
<u-icon name="arrow-right"></u-icon>
</view>
</view>
<view class="item">
<view class="item" v-if="serviceContent">
<view class="a">服务</view>
<view class="b" @click="getCarouselList()">
<text v-html="serviceContent"></text>
<view v-html="serviceContent"></view>
<u-icon name="arrow-right"></u-icon>
</view>
</view>
@ -152,6 +152,7 @@
this.userInfo = {}
this.isToken = false;
}
this.getCarouselList()
uni.removeStorageSync("yuyueTime")
},

@ -13,9 +13,10 @@
<view class="a">
<view class="l">提现金</view>
<view class="r">
<view class="p"><input type="number" @input="onCheck" v-model="obj.money" placeholder="请输入金额" />
<view class="p"><input type="digit" @input="onCheck" v-model="obj.money" placeholder="请输入金额" />
</view>
<view class="w" @click="allMoeny" style="color:#FF3126 ;width: 140rpx;text-align: right;">全部提现
</view>
<view class="w" @click="allMoeny" style="color:#FF3126 ;">全部提现</view>
</view>
</view>
<view class="b">
@ -239,8 +240,8 @@
getCode() {
//
const that = this
if(that.isClick == false){
return ;
if (that.isClick == false) {
return;
}
if (!that.validatePhoneNumber(that.obj.bank_phone)) {
uni.showToast({
@ -287,17 +288,43 @@
})
},
onCheck(e) {
if (Number(e.detail.value) > Number(this.balance)) {
let amount = e.detail.value
let num = null
num = amount.replace(new RegExp('^(\\d+\\.\\d{2}).+'), '$1')
const startPoint = /^\./g
if (startPoint.test(num)) {
num = amount.replace(startPoint, '0.')
}
if (num && !num.includes('.') && num !== '0') {
num = +num
}
const morePoint = /\.+(\d*|\.+)\./g
if (morePoint.test(num)) {
num = amount
.replace(/\.{2,}/g, ".")
.replace(".", "$#$")
.replace(/\./g, "")
.replace("$#$", ".")
}
console.log(num)
if (num > Number(this.balance)) { // value100, 100100
uni.showToast({
title: '输入金额不能大于可提现金额',
title: this.balance > 0 ? `最多可用${Number(this.balance)}元, 请重新输入` : '暂无可提现金额',
icon: 'none',
duration: 2000
})
this.obj.money = this.balance
return
this.obj.money = this.balance > 0 ? this.balance : ''
this.$forceUpdate();
} else {
this.obj.money = e.detail.value
if (!num) { // value,amount0,
this.obj.money = ''
this.$forceUpdate();
} else {
this.obj.money = num
this.$forceUpdate();
}
}
},
allMoeny() { //
this.obj.money = this.balance
@ -325,9 +352,11 @@
min-height: 100%;
}
.invoice {
overflow: hidden;
padding-bottom: 60rpx;
&-goods {
padding: 0 60rpx;
overflow: hidden;
@ -493,6 +522,7 @@
}
}
&-company {
width: 710rpx;
background: #F55349;
@ -584,6 +614,7 @@
}
}
}
.invoice-fd {
width: 664rpx;
height: 104rpx;

@ -2,7 +2,9 @@
<view>
<view style="width:100%;position: fixed;top:var(--status-bar-height);z-index:99">
<view class="navBarContent">
<u-icon name="arrow-left" @click="goToPreviousPage" style="position: absolute;top:50%;left:40rpx;transform: translateY(-50%);" color="#000" size="24"></u-icon>
<u-icon name="arrow-left" @click="goToPreviousPage"
style="position: absolute;top:50%;left:40rpx;transform: translateY(-50%);" color="#000" size="24">
</u-icon>
<text>加入分销</text>
</view>
@ -12,7 +14,7 @@
<image :src="$picUrl+'/static/news3/join.png'" mode="widthFix"></image>
<view class="userContent">
<view v-if="user">
<image :src="$picUrl+'/static/default-logo.png'" v-if="!user.avatar_url" class="avatar" ></image>
<image :src="$picUrl+'/static/default-logo.png'" v-if="!user.avatar_url" class="avatar"></image>
<image :src="user.avatar_url" v-else mode="aspectFill" class="avatar"></image>
</view>
@ -106,7 +108,7 @@
onLoad(options) {
this.getCenter()
},
methods:{
methods: {
goToPreviousPage() {
uni.navigateBack({
delta: 1 // 1
@ -118,7 +120,7 @@
app.isLoading = true
Api.center()
.then(result => {
if(result.data.length>0){
if (result.data) {
const data = result.data
app.isDealer = data.isDealer
app.user = data.user
@ -126,9 +128,6 @@
app.refereeName = data.refereeName
app.setting = data.setting
}
// api
//
app.setPageTitle()
app.isLoading = false
})
@ -145,76 +144,85 @@
</script>
<style scoped lang="scss">
page{
page {
background-color: #F7F8FA;
min-height: 100%;
padding-bottom: 140upx;
padding-top:200upx;
}
.bgImg{
width:100%;
height:auto;
position:absolute;
top:0;
left:0;
z-index:1;
}
.navBarContent{
height:88upx;
padding-top: 200upx;
}
.bgImg {
width: 100%;
height: auto;
position: absolute;
top: 0;
left: 0;
z-index: 1;
}
.navBarContent {
height: 88upx;
line-height: 88upx;
text-align: center;
position: relative;
text{
text {
font-size: 32upx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
color: #000;
}
}
.userInfo{
}
.userInfo {
position: relative;
z-index:3;
margin:180rpx 30upx 0;
image{
width:100%;
height:auto;
z-index: 3;
margin: 180rpx 30upx 0;
image {
width: 100%;
height: auto;
}
.userContent{
.userContent {
position: absolute;
top:0;
left:0;
width:100%;
height:100%;
top: 0;
left: 0;
width: 100%;
height: 100%;
display: flex;
padding:52upx 30upx;
padding: 52upx 30upx;
display: flex;
align-items: center;
justify-content: space-between;
.avatar{
width:114upx;
height:114upx;
.avatar {
width: 114upx;
height: 114upx;
}
.user{
margin-left:30upx;
flex:1;
.userTop{
.user {
margin-left: 30upx;
flex: 1;
.userTop {
display: flex;
align-items: center;
.name{
.name {
font-size: 36upx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
color: #785B45;
margin-right:20upx;
margin-right: 20upx;
}
.flag{
.flag {
height: 42upx;
background: rgba(255,255,255,0.71);
background: rgba(255, 255, 255, 0.71);
border-radius: 31px 31px 31px 31px;
opacity: 1;
@ -224,22 +232,25 @@ page{
color: #785B45;
line-height: 42upx;
text-align: center;
padding:0 20upx;
padding: 0 20upx;
}
}
.userBottom{
.userBottom {
display: flex;
align-items: center;
justify-content: space-between;
margin-top:26upx;
text{
margin-top: 26upx;
text {
font-size: 24upx;
font-family: PingFang SC, PingFang SC;
font-weight: 400;
color: #785B45;
}
.tixian{
padding:12upx 36upx;
.tixian {
padding: 12upx 36upx;
background: linear-gradient(180deg, #AF8D72 0%, #7D5C45 100%);
border-radius: 29px 29px 29px 29px;
opacity: 1;
@ -253,22 +264,25 @@ page{
}
}
}
.yongjinContent{
}
.yongjinContent {
background: #FFFFFF;
border-radius: 6px 6px 6px 6px;
opacity: 1;
padding:42upx 0;
padding: 42upx 0;
display: flex;
align-items: center;
justify-content: space-around;
margin:20upx 30upx;
.item{
margin: 20upx 30upx;
.item {
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
.num{
.num {
font-size: 40upx;
font-family: PingFang SC, PingFang SC;
@ -276,42 +290,47 @@ page{
color: #414141;
}
.text{
.text {
font-size: 28upx;
font-family: PingFang SC, PingFang SC;
font-weight: 400;
color: #616161;
margin-top:10upx;
margin-top: 10upx;
}
}
}
.gridContent{
}
.gridContent {
display: flex;
background-color: #fff;
flex-wrap: wrap;
margin:0upx 30upx;
padding:20upx 0;
.gridItem{
width:33%;
margin:30upx 0;
margin: 0upx 30upx;
padding: 20upx 0;
.gridItem {
width: 33%;
margin: 30upx 0;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
image{
height:auto;
width:50upx;
image {
height: auto;
width: 50upx;
}
text{
text {
font-size: 28upx;
font-family: PingFang SC, PingFang SC;
font-weight: 400;
color: #616161;
margin-top:16upx;
margin-top: 16upx;
}
}
}
}
</style>

@ -17,7 +17,7 @@
</view>
<!-- 退款/售后单 -->
<view class="widget-list">
<view class="widget-detail" v-if="list.data.length>0" v-for="(item, index) in list.data" :key="index">
<view class="widget-detail" v-for="(item, index) in list.data" :key="index">
<view class="row-block dis-flex flex-y-center">
<view class="flex-box">{{ item.create_time }}</view>
<view class="flex-box t-r">
@ -55,9 +55,7 @@
</view>
</view>
</view>
<u-empty text="暂无数据显示哦~" v-else mode="list"></u-empty>
</view>
</mescroll-body>
</view>

Loading…
Cancel
Save