yangjun
/
sadjv3_user
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: yangjun:6a51eb9a5527cfcc1d40ed4ec428718cad14c142
Branches Tags
yangjun:master
..
compare: yangjun:90d182aae7a1284ef3f473118e093f24a60087d9
Branches Tags
yangjun:master

No commits in common. "6a51eb9a5527cfcc1d40ed4ec428718cad14c142" and "90d182aae7a1284ef3f473118e093f24a60087d9" have entirely different histories.
6a51eb9a55 ... 90d182aae7

6 changed files with 39 additions and 46 deletions
Show Stats Expand all files Collapse all files

2
components/t-refresh/t-refresh.vue
View File

@ -2,7 +2,9 @@
<view style="width: 100%;" class="refresh-body" @touchmove.stop.prevent>
<scroll-view scroll-y @scroll="scroll" @touchstart="touchstart" @scrolltolower="loadMore" @touchmove="touchmove" @touchend="touchend" class="refresh-scroll">
<view class="content">
<!-- 内容 -->
<slot name="content"></slot>
<!-- 上拉加载 -->
<view class="t-loading-box" v-if="loadingType!=3&&openLoadMore" @click="loadMore">
<view class="t-line"></view>
<view class="t-loading-text">

7
my/hongbao/xinrenhongbao.vue
View File

@ -1,5 +1,5 @@
<template>
<view style="height: 100vh;width: 100%;overflow: scroll;">
<view style="height: 100vh;">
<!-- <view class="flex align-center justify-between you-nav">
<view v-for="(item,index) in tab" :key="index" class="text-center box"
:class="tabIndex == index?'tanColor':''" @click="bindTab(item.state)">
@ -7,7 +7,7 @@
<view class="" :class="tabIndex == index?'line':''"></view>
</view>
</view> -->
<t-refresh ref="refresh" v-if="hongbao.length>0" @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType" :tPadding="0">
<t-refresh ref="refresh" style="margin-bottom: 150px;" v-if="hongbao.length>0" @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType" :tPadding="0">
<template slot="content">
<checkbox-group @change="checkboxChange">
<view>
@ -146,9 +146,6 @@
</script>
<style scoped>
/deep/.refresh-body{
height: 870px !important;
}
.que-btn{
display: inline-block;
width: 90%;

39
my/order/pay.vue
View File

@ -290,19 +290,16 @@
</view>
<view class="showBtn" v-if="order.status==6" :style="{'justify-content':order.status ==6||order.status ==1?'space-between':'flex-end'}">
<view class="gengduo" @click.stop="gengBtn">更多</view>
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
>
取消订单
</u-button>
<u-button
shape="circle" :plain="true"
@click="toggle('center',order)"
@click="goNav('/my/wallet/index?artificerId='+order.artificerId)"
class="btns">
提前结束
充值
</u-button>
<u-button v-if="order.oldOrdersId==null && order.status == 6&&order.addNum==null"
shape="circle" :plain="true"
@tap="saveJZS(order.artificerId)"
class="btns">
服务升级
</u-button>
<u-button
v-if="order.addNum ==null"
shape="circle" :plain="true"
@ -313,15 +310,11 @@
<view class="showBtn-view" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}">
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button>
<u-button @click="cancelOrder(order)" shape="circle" class="btns" :hair-line="false"
>
取消订单
</u-button>
<u-button
<u-button v-if="order.oldOrdersId==null && order.status == 6&&order.addNum==null"
shape="circle" :plain="true"
@click="goNav('/my/wallet/index?artificerId='+order.artificerId)"
@tap="saveJZS(order.artificerId)"
class="btns">
充值
服务升级
</u-button>
<u-button :custom-style="customStyle2"
shape="circle" :plain="true"
@ -329,7 +322,12 @@
class="dingshi">
去投诉
</u-button>
<u-button
shape="circle" :plain="true"
@click="toggle('center',order)"
class="btns">
提前结束
</u-button>
</view>
</view>
<view class="showBtn" v-if="order.status ==7">
@ -365,7 +363,7 @@
class="dingshi">联系客服</u-button>
</view>
<view class="showBtn" v-if="order.status ==9">
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
>
取消订单
</u-button>
@ -1639,9 +1637,6 @@
</script>
<style lang="scss" scoped>
/deep/.u-size-default{
width: 80px !important;
}
/deep/.padding-bottom{
padding-bottom: 20rpx;
}
@ -1826,7 +1821,7 @@
color: #fff !important;
}
/deep/.u-size-default{
// margin: 5px 0px 0px 0px;
margin: 5px 0px 0px 0px;
}
.showBtn-mian{

1
pages/my/fuwuxiangm.vue
View File

@ -179,7 +179,6 @@
.content-view{
width: 100%;
height: 100vh;
padding-bottom: 100px;
overflow: hidden;
background-color: #f7f7f7;
}

15
pages/my/historyMy.vue
View File

@ -1,7 +1,20 @@
<!-- 自定义下拉刷新与上拉加载演示(vue) -->
<template>
<view class="content-view">
<view class="service-head-top">
<view class="service-head-top-left">
<image @click="backImg" src="../../static/fanhui.png" mode="widthFix"></image>
<span>浏览历史</span>
</view>
<!-- <view>
<uni-search-bar @service="serviceTrue" @confirm="search" :cancelext="'取消'" v-model="searchValue" @input="input"
@clear="clear">
</uni-search-bar>
<view class="search-btn" @click="searchBtn">
搜索
</view>
</view> -->
</view>
<t-refresh ref="refresh" v-if="dataList.length>0" @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType" :tPadding="0">
<template slot="content">
<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">

21
pages/my/indextaociliaoList.vue
View File

@ -72,7 +72,6 @@
titleNmae:'',
classifyId:'',
getName:'',
scrollTop: false,
}
},
onLoad(e){
@ -85,17 +84,6 @@
this.page = 1;
this.getData()
},
onPageScroll: function(e) {
this.scrollTop = e.scrollTop > 200;
},
onReachBottom: function() {
this.page = this.page + 1;
this.getData('');
},
onPullDownRefresh: function() {
this.page = 1;
this.getData('Refresh');
},
methods: {
// 加载更多
loadMore: async function() {
@ -174,15 +162,14 @@
background-color: #f7f7f7;
}
/deep/.refresh-body{
border-top: 2px solid #f7f7f7;
margin-top: 50px;
height: 800px !important;
overflow: scroll;
height: 100% !important;
border-top: 2px solid #f7f7f7;
margin: 50px 0px;
}
.content-view{
width: 100%;
height: 100vh;
overflow: scroll;
overflow: auto;
background-color: #f7f7f7;
position: relative;
}