|
@@ -3,155 +3,140 @@
|
|
|
<view class="vheigh"></view>
|
|
|
<scroll-view class="content-box" scroll-y="true">
|
|
|
<view class="user-section">
|
|
|
- <view class="bg"></view>
|
|
|
+ <view class="bg">
|
|
|
+ <image src="../../static/user/bg.png" mode=""></image>
|
|
|
+ </view>
|
|
|
<view class="user-info-box ">
|
|
|
<view class="detail flex" @click="navTo('/pages/set/userinfo')">
|
|
|
- <view class="portrait-box"><image class="portrait" :src="userInfo.avatar || '/static/error/missing-face.png'"></image></view>
|
|
|
+ <view class="portrait-box">
|
|
|
+ <image class="portrait" :src="userInfo.avatar || '/static/error/missing-face.png'"></image>
|
|
|
+ </view>
|
|
|
<view class="info-box">
|
|
|
- <view class="username">{{ userInfo.nickname || '游客' }}</view>
|
|
|
- <view class="font-size-sm" v-if="userInfo.spread_uid">邀请码:{{ userInfo.spread_uid }}</view>
|
|
|
+ <view class="username">{{ userInfo.nickname || '游客' }}111111</view>
|
|
|
+ <view class="phone">
|
|
|
+ 18952592739
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="config iconfont">
|
|
|
- <text class="setting iconsetting" @click="navTo('/pages/set/set')"></text>
|
|
|
- <text class="message iconmessage" @click="navTo('/pages/user/notice')"></text>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- <!-- 会员卡功能 -->
|
|
|
- <view class="vip-card-box">
|
|
|
- <image class="card-bg" src="/static/img/vip-card-bg.png" mode=""></image>
|
|
|
- <view class="b-btn">我要升级</view>
|
|
|
- <view class="tit">
|
|
|
- <text class="iconfont icon-iLinkapp-"></text>
|
|
|
- 升级专享优惠权益
|
|
|
- </view>
|
|
|
- <text class="e-m">DCloud Union</text>
|
|
|
- <text class="e-b">开通会员开发无bug 一测就上线</text>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
+ <view class="config-img">
|
|
|
+ <image src="../../static/user/set.png" mode=""></image>
|
|
|
+ </view>
|
|
|
+ <text class="setting " @click="navTo('/pages/set/set')">设置</text>
|
|
|
|
|
|
- <view
|
|
|
- class="cover-container"
|
|
|
- :style="[
|
|
|
- {
|
|
|
- transform: coverTransform,
|
|
|
- transition: coverTransition
|
|
|
- }
|
|
|
- ]"
|
|
|
- @touchstart="coverTouchstart"
|
|
|
- @touchmove="coverTouchmove"
|
|
|
- @touchend="coverTouchend"
|
|
|
- >
|
|
|
- <image class="arc" src="/static/img/arc.png"></image>
|
|
|
-
|
|
|
- <view class="tj-sction">
|
|
|
- <view class="tj-item" @click="navTo('/pages/money/wallet')">
|
|
|
- <text class="num">{{ userInfo.now_money || '0.00' }}</text>
|
|
|
- <text>余额</text>
|
|
|
- </view>
|
|
|
- <view class="tj-item" @click="navTo('/pages/user/award')">
|
|
|
- <text class="num">{{ userInfo.brokerage_price || '0.00' }}</text>
|
|
|
- <text>佣金</text>
|
|
|
- </view>
|
|
|
- <view class="tj-item" @click="navTo('/pages/user/scoreAccumulate')">
|
|
|
- <text class="num">{{ userInfo.integral || '0.00' }}</text>
|
|
|
- <text>积分</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <!-- 订单 -->
|
|
|
|
|
|
- <view class="item-box">
|
|
|
- <!-- <view class="box-title flex borde-b">
|
|
|
- <view class="title"><text>我的订单</text></view>
|
|
|
- <view class="link" @click="navTo('/pages/order/order?state=0')" hover-class="common-hover">
|
|
|
- <text>全部订单</text>
|
|
|
- <text class="iconfont iconenter"></text>
|
|
|
- </view>
|
|
|
- </view> -->
|
|
|
- <view class="order-section">
|
|
|
- <view class="order-item" @click="navTo('/pages/order/order?state=0')" hover-class="common-hover" :hover-stay-time="50">
|
|
|
- <view class=" icon position-relative">
|
|
|
- <image class="icon-img" src="/static/icon/i1.png" mode="aspectFit"></image>
|
|
|
- <view class="corner" v-if="orderInfo.unpaid_count > 0">
|
|
|
- <text>{{ orderInfo.unpaid_count }}</text>
|
|
|
- </view>
|
|
|
+
|
|
|
+ </view>
|
|
|
+ <view class="order-box">
|
|
|
+ <view class="order">
|
|
|
+ <text class="order-font">我的订单</text>
|
|
|
+ <image src="../../static/user/right01.png" mode=""></image>
|
|
|
+ </view>
|
|
|
+ <view class="order1">
|
|
|
+ <view class="order-content1">
|
|
|
+ <view class="order-item1" @click="navTo('/pages/money/wallet')" hover-class="common-hover"
|
|
|
+ :hover-stay-time="50">
|
|
|
+ <view class="icon1">
|
|
|
+ <image class="icon-img1" src="/static/user/user01.png" mode="aspectFit"></image>
|
|
|
</view>
|
|
|
<text>待付款</text>
|
|
|
</view>
|
|
|
- <view class="order-item" @click="navTo('/pages/order/order?state=1')" hover-class="common-hover" :hover-stay-time="50">
|
|
|
- <view class=" icon position-relative">
|
|
|
- <image class="icon-img" src="/static/icon/i2.png" mode="aspectFit"></image>
|
|
|
- <view class="corner" v-if="orderInfo.unshipped_count > 0">
|
|
|
- <text>{{ orderInfo.unshipped_count }}</text>
|
|
|
- </view>
|
|
|
+ </view>
|
|
|
+ <view class="order-content1">
|
|
|
+ <view class="order-item1" @click="navTo('/pages/money/wallet')" hover-class="common-hover"
|
|
|
+ :hover-stay-time="50">
|
|
|
+ <view class="icon1">
|
|
|
+ <image class="icon-img1" src="/static/user/user02.png" mode="aspectFit"></image>
|
|
|
</view>
|
|
|
<text>待发货</text>
|
|
|
</view>
|
|
|
- <view class="order-item" @click="navTo('/pages/order/order?state=2')" hover-class="common-hover" :hover-stay-time="50">
|
|
|
- <view class="icon position-relative">
|
|
|
- <image class="icon-img" src="/static/icon/i3.png" mode="aspectFit"></image>
|
|
|
- <view class="corner" v-if="orderInfo.received_count > 0">
|
|
|
- <text>{{ orderInfo.received_count }}</text>
|
|
|
- </view>
|
|
|
+ </view>
|
|
|
+ <view class="order-content1">
|
|
|
+ <view class="order-item1" @click="navTo('/pages/money/wallet')" hover-class="common-hover"
|
|
|
+ :hover-stay-time="50">
|
|
|
+ <view class="icon1">
|
|
|
+ <image class="icon-img1" src="/static/user/user03.png" mode="aspectFit"></image>
|
|
|
</view>
|
|
|
<text>待收货</text>
|
|
|
</view>
|
|
|
- <view class="order-item" @click="navTo('/pages/order/order?state=3')" hover-class="common-hover" :hover-stay-time="50">
|
|
|
- <view class="icon position-relative">
|
|
|
- <image class="icon-img" src="/static/icon/i4.png" mode="aspectFit"></image>
|
|
|
- <!-- <view class="corner" v-if="orderInfo.complete_count > 0">
|
|
|
- <text>{{ orderInfo.complete_count }}</text>
|
|
|
- </view> -->
|
|
|
+ </view>
|
|
|
+ <view class="order-content1">
|
|
|
+ <view class="order-item1" @click="navTo('/pages/money/wallet')" hover-class="common-hover"
|
|
|
+ :hover-stay-time="50">
|
|
|
+ <view class="icon1">
|
|
|
+ <image class="icon-img1" src="/static/user/user04.png" mode="aspectFit"></image>
|
|
|
</view>
|
|
|
<text>已完成</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view class="cover-container" @touchstart="coverTouchstart" @touchmove="coverTouchmove"
|
|
|
+ @touchend="coverTouchend">
|
|
|
+ <!-- <image class="arc" src="/static/img/arc.png"></image> -->
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
<view class="item-box">
|
|
|
<!-- <view class="box-title flex borde-b">
|
|
|
<view class="title"><text>我的资产</text></view>
|
|
|
</view> -->
|
|
|
<view class="order-section">
|
|
|
- <view class="order-item" @click="navTo('/pages/money/wallet')" hover-class="common-hover" :hover-stay-time="50">
|
|
|
- <view class="icon"><image class="icon-img" src="/static/icon/u1.png" mode="aspectFit"></image></view>
|
|
|
- <text>我的钱包</text>
|
|
|
+ <view class="order-item" @click="navTo('/pages/money/wallet')" hover-class="common-hover"
|
|
|
+ :hover-stay-time="50">
|
|
|
+ <view class="icon">
|
|
|
+ <image class="icon-img" src="/static/user/user09.png" mode="aspectFit"></image>
|
|
|
+ </view>
|
|
|
+ <text>我的余额</text>
|
|
|
</view>
|
|
|
- <view class="order-item" @click="navTo('/pages/user/award')" hover-class="common-hover" :hover-stay-time="50">
|
|
|
- <view class="icon"><image class="icon-img" src="/static/icon/u2.png" mode="aspectFit"></image></view>
|
|
|
- <text>奖励明细</text>
|
|
|
+ <view class="order-item" @click="navTo('/pages/user/award')" hover-class="common-hover"
|
|
|
+ :hover-stay-time="50">
|
|
|
+ <view class="icon">
|
|
|
+ <image class="icon-img" src="/static/user/user06.png" mode="aspectFit"></image>
|
|
|
+ </view>
|
|
|
+ <text>我的佣金</text>
|
|
|
</view>
|
|
|
- <view class="order-item" @click="navTo('/pages/user/award')" hover-class="common-hover" :hover-stay-time="50">
|
|
|
- <view class="icon"><image class="icon-img" src="/static/icon/u3.png" mode="aspectFit"></image></view>
|
|
|
- <text>积分明细</text>
|
|
|
+ <view class="order-item" @click="navTo('/pages/user/award')" hover-class="common-hover"
|
|
|
+ :hover-stay-time="50">
|
|
|
+ <view class="icon">
|
|
|
+ <image class="icon-img" src="/static/user/user18.png" mode="aspectFit"></image>
|
|
|
+ </view>
|
|
|
+ <text>我的积分</text>
|
|
|
</view>
|
|
|
- <view class="order-item" @click="navTo('/pages/order/order?state=4')" hover-class="common-hover" :hover-stay-time="50">
|
|
|
- <view class="icon"><image class="icon-img" src="/static/icon/u4.png" mode="aspectFit"></image></view>
|
|
|
- <text>通用币</text>
|
|
|
+ <view class="order-item" @click="navTo('/pages/order/order?state=4')" hover-class="common-hover"
|
|
|
+ :hover-stay-time="50">
|
|
|
+ <view class="icon">
|
|
|
+ <image class="icon-img" src="/static/user/user07.png" mode="aspectFit"></image>
|
|
|
+ </view>
|
|
|
+ <text>购物积分</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
- <!-- 浏览历史 -->
|
|
|
+
|
|
|
<view class="history-section icon">
|
|
|
- <view class="sec-header">
|
|
|
- <text class="iconfont iconfavor"></text>
|
|
|
- <text>浏览历史</text>
|
|
|
- </view>
|
|
|
- <scroll-view scroll-x class="h-list">
|
|
|
- <image
|
|
|
- class="h-list-image"
|
|
|
- @click="navTo('/pages/product/product')"
|
|
|
- src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1553105186633&di=c121a29beece4e14269948d990f9e720&imgtype=0&src=http%3A%2F%2Fimg004.hc360.cn%2Fm8%2FM04%2FDE%2FDE%2FwKhQplZ-QteEBvsbAAAAADUkobU751.jpg"
|
|
|
- mode="aspectFill"
|
|
|
- ></image>
|
|
|
- </scroll-view>
|
|
|
+
|
|
|
+
|
|
|
<uni-list>
|
|
|
- <uni-list-item title="我的钱包" @click="navTo('/pages/money/wallet')" thumb="/static/icon/img11.png"></uni-list-item>
|
|
|
- <uni-list-item title="我的卡卷" @click="navTo('/pages/user/coupon')" thumb="/static/icon/img12.png"></uni-list-item>
|
|
|
- <uni-list-item title="我的收藏" @click="navTo('/pages/user/favorites')" thumb="/static/icon/img02.png"></uni-list-item>
|
|
|
- <uni-list-item title="商户入驻" @click="navTo('/pages/set/address')" thumb="/static/icon/img05.png"></uni-list-item>
|
|
|
- <uni-list-item title="邀请好友" @click="navTo('/pages/user/shareQrCode')" thumb="/static/icon/img10.png"></uni-list-item>
|
|
|
- <uni-list-item title="关于我们" @click="navTo('/pages/shareQrCode/index')" thumb="/static/icon/img09.png"></uni-list-item>
|
|
|
+ <uni-list-item title="我的推广" @click="navTo('/pages/money/wallet')"
|
|
|
+ thumb="/static/user/user12.png"></uni-list-item>
|
|
|
+ <uni-list-item title="USDT专区" @click="navTo('/pages/user/coupon')"
|
|
|
+ thumb="/static/user/user16.png">
|
|
|
+ </uni-list-item>
|
|
|
+ <uni-list-item title="收款方式" @click="navTo('/pages/user/favorites')"
|
|
|
+ thumb="/static/user/user15.png"></uni-list-item>
|
|
|
+ <uni-list-item title="邀请好友" @click="navTo('/pages/set/address')"
|
|
|
+ thumb="/static/user/user11.png">
|
|
|
+ </uni-list-item>
|
|
|
+ <uni-list-item title="我的收藏" @click="navTo('/pages/user/shareQrCode')"
|
|
|
+ thumb="/static/user/user14.png"></uni-list-item>
|
|
|
+ <uni-list-item title="收货地址" @click="navTo('/pages/shareQrCode/index')"
|
|
|
+ thumb="/static/user/user13.png"></uni-list-item>
|
|
|
</uni-list>
|
|
|
</view>
|
|
|
</view>
|
|
@@ -159,398 +144,505 @@
|
|
|
</view>
|
|
|
</template>
|
|
|
<script>
|
|
|
-import { mapState, mapMutations } from 'vuex';
|
|
|
-import uniList from '@/components/uni-list/uni-list.vue';
|
|
|
-import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
|
|
|
-import { orderData, userinfo } from '@/api/user.js';
|
|
|
-import { saveUrl, interceptor } from '@/utils/loginUtils.js';
|
|
|
-let startY = 0,
|
|
|
- moveY = 0,
|
|
|
- pageAtTop = true;
|
|
|
-export default {
|
|
|
- components: {
|
|
|
- uniList,
|
|
|
- uniListItem
|
|
|
- },
|
|
|
- data() {
|
|
|
- return {
|
|
|
- coverTransform: 'translateY(0px)',
|
|
|
- coverTransition: '0s',
|
|
|
- moving: false,
|
|
|
- userDowm: 0, //卡片升级专属高度
|
|
|
- userMaxDowm: 0 //卡片最高高度
|
|
|
- };
|
|
|
- },
|
|
|
- onShow() {
|
|
|
- // 判断是否已经登录
|
|
|
- if (this.hasLogin) {
|
|
|
- this.loadBaseData();
|
|
|
- }
|
|
|
- },
|
|
|
- onReady() {
|
|
|
- // 初始化获取页面宽度
|
|
|
- uni.createSelectorQuery()
|
|
|
- .select('.container')
|
|
|
- .fields(
|
|
|
- {
|
|
|
- size: true
|
|
|
- },
|
|
|
- data => {
|
|
|
- // 计算最多下拉的高度
|
|
|
- this.userDowm = Math.floor((data.width / 750) * 185);
|
|
|
- // 计算最大触发修改高度事件
|
|
|
- this.userMaxDowm = Math.floor((data.width / 750) * 250);
|
|
|
- }
|
|
|
- )
|
|
|
- .exec();
|
|
|
- },
|
|
|
- // #ifndef MP
|
|
|
- // onNavigationBarButtonTap(e) {
|
|
|
- // const index = e.index;
|
|
|
- // if (index === 0) {
|
|
|
- // this.navTo('/pages/set/set');
|
|
|
- // } else if (index === 1) {
|
|
|
- // // #ifdef APP-PLUS
|
|
|
- // const pages = getCurrentPages();
|
|
|
- // const page = pages[pages.length - 1];
|
|
|
- // const currentWebview = page.$getAppWebview();
|
|
|
- // currentWebview.hideTitleNViewButtonRedDot({
|
|
|
- // index
|
|
|
- // });
|
|
|
- // // #endif
|
|
|
- // uni.navigateTo({
|
|
|
- // url: '/pages/user/notice'
|
|
|
- // });
|
|
|
- // }
|
|
|
- // },
|
|
|
- // #endif
|
|
|
- computed: {
|
|
|
- ...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
|
|
|
- },
|
|
|
- methods: {
|
|
|
- ...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
|
|
|
- // 加载初始数据
|
|
|
- loadBaseData() {
|
|
|
- userinfo({})
|
|
|
- .then(({ data }) => {
|
|
|
- this.setUserInfo(data);
|
|
|
- // 获取用户数据完毕后在获取订单数据防止多次跳转到登录页
|
|
|
- orderData({})
|
|
|
- .then(({ data }) => {
|
|
|
- this.setOrderInfo(data);
|
|
|
- })
|
|
|
- .catch(e => {
|
|
|
- this.setOrderInfo({
|
|
|
- complete_count: 0, //完成
|
|
|
- received_count: 0, //待收货
|
|
|
- unshipped_count: 0, //待发货
|
|
|
- order_count: 0, //订单总数
|
|
|
- unpaid_count: 0 //待付款
|
|
|
- });
|
|
|
- });
|
|
|
- })
|
|
|
- .catch(e => {
|
|
|
- console.log(e);
|
|
|
- });
|
|
|
+ import {
|
|
|
+ mapState,
|
|
|
+ mapMutations
|
|
|
+ } from 'vuex';
|
|
|
+ import uniList from '@/components/uni-list/uni-list.vue';
|
|
|
+ import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
|
|
|
+ import {
|
|
|
+ orderData,
|
|
|
+ userinfo
|
|
|
+ } from '@/api/user.js';
|
|
|
+ import {
|
|
|
+ saveUrl,
|
|
|
+ interceptor
|
|
|
+ } from '@/utils/loginUtils.js';
|
|
|
+ let startY = 0,
|
|
|
+ moveY = 0,
|
|
|
+ pageAtTop = true;
|
|
|
+ export default {
|
|
|
+ components: {
|
|
|
+ uniList,
|
|
|
+ uniListItem
|
|
|
+ },
|
|
|
+ data() {
|
|
|
+ return {
|
|
|
+ coverTransform: 'translateY(0px)',
|
|
|
+ coverTransition: '0s',
|
|
|
+ moving: false,
|
|
|
+ userDowm: 0, //卡片升级专属高度
|
|
|
+ userMaxDowm: 0 //卡片最高高度
|
|
|
+ };
|
|
|
},
|
|
|
- /**
|
|
|
- * 统一跳转接口,拦截未登录路由
|
|
|
- * navigator标签现在默认没有转场动画,所以用view
|
|
|
- */
|
|
|
- navTo(url) {
|
|
|
- if (!this.hasLogin) {
|
|
|
- // 保存地址
|
|
|
- saveUrl();
|
|
|
- // 登录拦截
|
|
|
- interceptor();
|
|
|
- } else {
|
|
|
- uni.navigateTo({
|
|
|
- url
|
|
|
- });
|
|
|
+ onShow() {
|
|
|
+ // 判断是否已经登录
|
|
|
+ if (this.hasLogin) {
|
|
|
+ this.loadBaseData();
|
|
|
}
|
|
|
},
|
|
|
+ onReady() {
|
|
|
+ // 初始化获取页面宽度
|
|
|
+ uni.createSelectorQuery()
|
|
|
+ .select('.container')
|
|
|
+ .fields({
|
|
|
+ size: true
|
|
|
+ },
|
|
|
+ data => {
|
|
|
+ // 计算最多下拉的高度
|
|
|
+ this.userDowm = Math.floor((data.width / 750) * 185);
|
|
|
+ // 计算最大触发修改高度事件
|
|
|
+ this.userMaxDowm = Math.floor((data.width / 750) * 250);
|
|
|
+ }
|
|
|
+ )
|
|
|
+ .exec();
|
|
|
+ },
|
|
|
+ // #ifndef MP
|
|
|
+ // onNavigationBarButtonTap(e) {
|
|
|
+ // const index = e.index;
|
|
|
+ // if (index === 0) {
|
|
|
+ // this.navTo('/pages/set/set');
|
|
|
+ // } else if (index === 1) {
|
|
|
+ // // #ifdef APP-PLUS
|
|
|
+ // const pages = getCurrentPages();
|
|
|
+ // const page = pages[pages.length - 1];
|
|
|
+ // const currentWebview = page.$getAppWebview();
|
|
|
+ // currentWebview.hideTitleNViewButtonRedDot({
|
|
|
+ // index
|
|
|
+ // });
|
|
|
+ // // #endif
|
|
|
+ // uni.navigateTo({
|
|
|
+ // url: '/pages/user/notice'
|
|
|
+ // });
|
|
|
+ // }
|
|
|
+ // },
|
|
|
+ // #endif
|
|
|
+ computed: {
|
|
|
+ ...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
|
|
|
+ },
|
|
|
+ methods: {
|
|
|
+ ...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
|
|
|
+ // 加载初始数据
|
|
|
+ loadBaseData() {
|
|
|
+ userinfo({})
|
|
|
+ .then(({
|
|
|
+ data
|
|
|
+ }) => {
|
|
|
+ this.setUserInfo(data);
|
|
|
+ // 获取用户数据完毕后在获取订单数据防止多次跳转到登录页
|
|
|
+ orderData({})
|
|
|
+ .then(({
|
|
|
+ data
|
|
|
+ }) => {
|
|
|
+ this.setOrderInfo(data);
|
|
|
+ })
|
|
|
+ .catch(e => {
|
|
|
+ this.setOrderInfo({
|
|
|
+ complete_count: 0, //完成
|
|
|
+ received_count: 0, //待收货
|
|
|
+ unshipped_count: 0, //待发货
|
|
|
+ order_count: 0, //订单总数
|
|
|
+ unpaid_count: 0 //待付款
|
|
|
+ });
|
|
|
+ });
|
|
|
+ })
|
|
|
+ .catch(e => {
|
|
|
+ console.log(e);
|
|
|
+ });
|
|
|
+ },
|
|
|
+ /**
|
|
|
+ * 统一跳转接口,拦截未登录路由
|
|
|
+ * navigator标签现在默认没有转场动画,所以用view
|
|
|
+ */
|
|
|
+ navTo(url) {
|
|
|
+ if (!this.hasLogin) {
|
|
|
+ // 保存地址
|
|
|
+ saveUrl();
|
|
|
+ // 登录拦截
|
|
|
+ interceptor();
|
|
|
+ } else {
|
|
|
+ uni.navigateTo({
|
|
|
+ url
|
|
|
+ });
|
|
|
+ }
|
|
|
+ },
|
|
|
|
|
|
- /**
|
|
|
- * 会员卡下拉和回弹
|
|
|
- * 1.关闭bounce避免ios端下拉冲突
|
|
|
- * 2.由于touchmove事件的缺陷(以前做小程序就遇到,比如20跳到40,h5反而好很多),下拉的时候会有掉帧的感觉
|
|
|
- * transition设置0.1秒延迟,让css来过渡这段空窗期
|
|
|
- * 3.回弹效果可修改曲线值来调整效果,推荐一个好用的bezier生成工具 http://cubic-bezier.com/
|
|
|
- */
|
|
|
- coverTouchstart(e) {
|
|
|
- // console.log(e);
|
|
|
- if (pageAtTop === false) {
|
|
|
- return;
|
|
|
- }
|
|
|
+ /**
|
|
|
+ * 会员卡下拉和回弹
|
|
|
+ * 1.关闭bounce避免ios端下拉冲突
|
|
|
+ * 2.由于touchmove事件的缺陷(以前做小程序就遇到,比如20跳到40,h5反而好很多),下拉的时候会有掉帧的感觉
|
|
|
+ * transition设置0.1秒延迟,让css来过渡这段空窗期
|
|
|
+ * 3.回弹效果可修改曲线值来调整效果,推荐一个好用的bezier生成工具 http://cubic-bezier.com/
|
|
|
+ */
|
|
|
+ coverTouchstart(e) {
|
|
|
+ // console.log(e);
|
|
|
+ if (pageAtTop === false) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
- this.coverTransition = 'transform .1s linear';
|
|
|
- startY = e.touches[0].clientY;
|
|
|
- },
|
|
|
- coverTouchmove(e) {
|
|
|
- // console.log(e);
|
|
|
- moveY = e.touches[0].clientY;
|
|
|
- let moveDistance = moveY - startY;
|
|
|
- let maxDowm = this.userMaxDowm;
|
|
|
- let Dowm = this.userDowm;
|
|
|
- if (moveDistance < 0) {
|
|
|
- this.moving = false;
|
|
|
- return;
|
|
|
- }
|
|
|
- this.moving = true;
|
|
|
- if (moveDistance >= Dowm && moveDistance < maxDowm) {
|
|
|
- moveDistance = Dowm;
|
|
|
- }
|
|
|
+ this.coverTransition = 'transform .1s linear';
|
|
|
+ startY = e.touches[0].clientY;
|
|
|
+ },
|
|
|
+ coverTouchmove(e) {
|
|
|
+ // console.log(e);
|
|
|
+ moveY = e.touches[0].clientY;
|
|
|
+ let moveDistance = moveY - startY;
|
|
|
+ let maxDowm = this.userMaxDowm;
|
|
|
+ let Dowm = this.userDowm;
|
|
|
+ if (moveDistance < 0) {
|
|
|
+ this.moving = false;
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ this.moving = true;
|
|
|
+ if (moveDistance >= Dowm && moveDistance < maxDowm) {
|
|
|
+ moveDistance = Dowm;
|
|
|
+ }
|
|
|
|
|
|
- if (moveDistance > 0 && moveDistance <= Dowm) {
|
|
|
- this.coverTransform = `translateY(${moveDistance}px)`;
|
|
|
- }
|
|
|
- },
|
|
|
- coverTouchend() {
|
|
|
- if (this.moving === false) {
|
|
|
- return;
|
|
|
+ if (moveDistance > 0 && moveDistance <= Dowm) {
|
|
|
+ this.coverTransform = `translateY(${moveDistance}px)`;
|
|
|
+ }
|
|
|
+ },
|
|
|
+ coverTouchend() {
|
|
|
+ if (this.moving === false) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ this.moving = false;
|
|
|
+ this.coverTransition = 'transform 0.3s cubic-bezier(.21,1.93,.53,.64)';
|
|
|
+ this.coverTransform = 'translateY(0px)';
|
|
|
}
|
|
|
- this.moving = false;
|
|
|
- this.coverTransition = 'transform 0.3s cubic-bezier(.21,1.93,.53,.64)';
|
|
|
- this.coverTransform = 'translateY(0px)';
|
|
|
}
|
|
|
- }
|
|
|
-};
|
|
|
+ };
|
|
|
</script>
|
|
|
<style lang="scss">
|
|
|
-page {
|
|
|
- height: 100%;
|
|
|
-}
|
|
|
-%flex-center {
|
|
|
- display: flex;
|
|
|
- flex-direction: column;
|
|
|
- justify-content: center;
|
|
|
- align-items: center;
|
|
|
-}
|
|
|
-%section {
|
|
|
- display: flex;
|
|
|
- justify-content: space-around;
|
|
|
- align-content: center;
|
|
|
- background: #fff;
|
|
|
- border-radius: 10rpx;
|
|
|
-}
|
|
|
-.container {
|
|
|
- height: 100%;
|
|
|
- background-color: $page-color-base;
|
|
|
-}
|
|
|
-.content-box {
|
|
|
- height: 100%;
|
|
|
-}
|
|
|
-.vheigh {
|
|
|
- height: var(--status-bar-height);
|
|
|
- background-color: $base-color;
|
|
|
-}
|
|
|
-.user-section {
|
|
|
- height: 435rpx;
|
|
|
- padding: 15rpx 30rpx 0;
|
|
|
- position: relative;
|
|
|
- .bg {
|
|
|
- position: absolute;
|
|
|
- left: 0;
|
|
|
- top: 0;
|
|
|
- width: 100%;
|
|
|
+ page {
|
|
|
height: 100%;
|
|
|
- background-color: $base-color;
|
|
|
}
|
|
|
-}
|
|
|
-.user-info-box {
|
|
|
- height: 180rpx;
|
|
|
- color: white;
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- justify-content: space-between;
|
|
|
- position: relative;
|
|
|
- z-index: 1;
|
|
|
- .detail {
|
|
|
- height: 130rpx;
|
|
|
- .portrait-box {
|
|
|
- height: 100%;
|
|
|
- .portrait {
|
|
|
- width: 130rpx;
|
|
|
+
|
|
|
+ %flex-center {
|
|
|
+ display: flex;
|
|
|
+ flex-direction: column;
|
|
|
+ justify-content: center;
|
|
|
+ align-items: center;
|
|
|
+ }
|
|
|
+
|
|
|
+ %section {
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-around;
|
|
|
+ align-content: center;
|
|
|
+ background: #fff;
|
|
|
+ border-radius: 10rpx;
|
|
|
+ }
|
|
|
+
|
|
|
+ .container {
|
|
|
+ height: 100%;
|
|
|
+ background-color: $page-color-base;
|
|
|
+ }
|
|
|
+
|
|
|
+ .user-section {
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: space-between;
|
|
|
+ position: relative;
|
|
|
+ top: 0;
|
|
|
+ left: 0;
|
|
|
+ right: 0;
|
|
|
+
|
|
|
+ .bg {
|
|
|
+
|
|
|
+ width: 100%;
|
|
|
+ height: 400rpx;
|
|
|
+
|
|
|
+ image {
|
|
|
+ width: 100%;
|
|
|
height: 100%;
|
|
|
- border: 5rpx solid #fff;
|
|
|
- border-radius: 50%;
|
|
|
}
|
|
|
}
|
|
|
- .info-box {
|
|
|
- margin-left: 20rpx;
|
|
|
- line-height: 1.5;
|
|
|
- .username {
|
|
|
- font-size: $font-lg + 6rpx;
|
|
|
- height: 100%;
|
|
|
+
|
|
|
+ .user-info-box {
|
|
|
+ width: 100%;
|
|
|
+
|
|
|
+ position: absolute;
|
|
|
+
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-between;
|
|
|
+ align-items: center;
|
|
|
+
|
|
|
+
|
|
|
+ .detail {
|
|
|
+ margin-left: 20rpx;
|
|
|
+
|
|
|
+ .portrait-box {
|
|
|
+ width: 127rpx;
|
|
|
+ height: 127rpx;
|
|
|
+ border-radius: 50%;
|
|
|
+
|
|
|
+ .portrait {
|
|
|
+ width: 100%;
|
|
|
+ height: 100%;
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ .info-box {
|
|
|
+ padding-left: 15rpx;
|
|
|
+ display: flex;
|
|
|
+ flex-direction: column;
|
|
|
+ justify-content: center;
|
|
|
+
|
|
|
+ .username {
|
|
|
+ font-size: 34rpx;
|
|
|
+ font-family: PingFang SC;
|
|
|
+ font-weight: bold;
|
|
|
+ color: #FFFFFF;
|
|
|
+ line-height: 44rpx;
|
|
|
+ }
|
|
|
+
|
|
|
+ .phone {
|
|
|
+ font-size: 26rpx;
|
|
|
+ font-family: PingFang SC;
|
|
|
+ font-weight: 500;
|
|
|
+ color: #FFFFFF;
|
|
|
+ line-height: 44rpx;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ .config {
|
|
|
+ width: 165rpx;
|
|
|
+ height: 64rpx;
|
|
|
+ background: #FFFFFF;
|
|
|
+ border-radius: 32px 0px 0px 32px;
|
|
|
+ display: flex;
|
|
|
+ justify-content: center;
|
|
|
+ align-items: center;
|
|
|
+
|
|
|
+ .config-img {
|
|
|
+ width: 32rpx;
|
|
|
+ height: 32rpx;
|
|
|
+ margin-right: 5rpx;
|
|
|
+
|
|
|
+ image {
|
|
|
+ width: 100%;
|
|
|
+ height: 100%;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ .setting {
|
|
|
+ margin-left: 5rpx;
|
|
|
+ font-size: 28rpx;
|
|
|
+ font-family: PingFang SC;
|
|
|
+ font-weight: 500;
|
|
|
+ color: #438BED;
|
|
|
+ line-height: 72rpx;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- .config {
|
|
|
- font-size: 48rpx;
|
|
|
- height: 130rpx;
|
|
|
- .setting {
|
|
|
- margin-right: 51rpx;
|
|
|
- }
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-.vip-card-box {
|
|
|
- display: flex;
|
|
|
- flex-direction: column;
|
|
|
- color: #f7d680;
|
|
|
- height: 240rpx;
|
|
|
- background: linear-gradient(left, rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.8));
|
|
|
- border-radius: 16rpx 16rpx 0 0;
|
|
|
- overflow: hidden;
|
|
|
- position: relative;
|
|
|
- padding: 20rpx 24rpx;
|
|
|
- .card-bg {
|
|
|
- position: absolute;
|
|
|
- top: 20rpx;
|
|
|
- right: 0;
|
|
|
- width: 380rpx;
|
|
|
- height: 260rpx;
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ .content-box {
|
|
|
+ height: 100%;
|
|
|
}
|
|
|
- .b-btn {
|
|
|
- position: absolute;
|
|
|
- right: 20rpx;
|
|
|
- top: 16rpx;
|
|
|
- width: 132rpx;
|
|
|
- height: 40rpx;
|
|
|
- text-align: center;
|
|
|
- line-height: 40rpx;
|
|
|
- font-size: 22rpx;
|
|
|
- color: #36343c;
|
|
|
- border-radius: 20px;
|
|
|
- background: linear-gradient(left, #f9e6af, #ffd465);
|
|
|
- z-index: 1;
|
|
|
+
|
|
|
+ .vheigh {
|
|
|
+ height: var(--status-bar-height);
|
|
|
+ background-color: $base-color;
|
|
|
}
|
|
|
- .tit {
|
|
|
- font-size: $font-base + 2rpx;
|
|
|
- color: #f7d680;
|
|
|
- margin-bottom: 28rpx;
|
|
|
- .iconfont {
|
|
|
- color: #f6e5a3;
|
|
|
- margin-right: 16rpx;
|
|
|
+
|
|
|
+ .cover-container {
|
|
|
+ background: $page-color-base;
|
|
|
+
|
|
|
+ padding: 0 20rpx;
|
|
|
+ position: relative;
|
|
|
+ background: #f5f5f5;
|
|
|
+ padding-bottom: 20rpx;
|
|
|
+
|
|
|
+ .arc {
|
|
|
+ position: absolute;
|
|
|
+ left: 0;
|
|
|
+ top: -34rpx;
|
|
|
+ width: 100%;
|
|
|
+ height: 36rpx;
|
|
|
}
|
|
|
}
|
|
|
- .e-b {
|
|
|
- font-size: $font-sm;
|
|
|
- color: #d8cba9;
|
|
|
- margin-top: 10rpx;
|
|
|
- }
|
|
|
-}
|
|
|
-.cover-container {
|
|
|
- background: $page-color-base;
|
|
|
- margin-top: -150rpx;
|
|
|
- padding: 0 30rpx;
|
|
|
- position: relative;
|
|
|
- background: #f5f5f5;
|
|
|
- padding-bottom: 20rpx;
|
|
|
- .arc {
|
|
|
- position: absolute;
|
|
|
- left: 0;
|
|
|
- top: -34rpx;
|
|
|
- width: 100%;
|
|
|
- height: 36rpx;
|
|
|
- }
|
|
|
-}
|
|
|
-.tj-sction {
|
|
|
- @extend %section;
|
|
|
- .tj-item {
|
|
|
- @extend %flex-center;
|
|
|
+
|
|
|
+ .order-box {
|
|
|
+ position: relative;
|
|
|
+ margin: -80rpx 20rpx 0 20rpx;
|
|
|
+ display: flex;
|
|
|
flex-direction: column;
|
|
|
- height: 140rpx;
|
|
|
- font-size: $font-sm;
|
|
|
- color: #75787d;
|
|
|
- }
|
|
|
- .num {
|
|
|
- font-size: $font-lg;
|
|
|
- color: $font-color-dark;
|
|
|
- margin-bottom: 8rpx;
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-.item-box {
|
|
|
- border-radius: 10rpx;
|
|
|
- background-color: white;
|
|
|
- margin-top: 20rpx;
|
|
|
- .box-title {
|
|
|
- line-height: 1;
|
|
|
- padding: 30rpx;
|
|
|
- .title {
|
|
|
- font-size: $font-lg;
|
|
|
- font-weight: bold;
|
|
|
+ justify-content: center;
|
|
|
+ width: 710rpx;
|
|
|
+ height: 221rpx;
|
|
|
+ background: #FFFFFF;
|
|
|
+ box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(50, 50, 52, 0.06);
|
|
|
+ border-radius: 20rpx;
|
|
|
+
|
|
|
+ .order {
|
|
|
+
|
|
|
+ width: 100%;
|
|
|
+ height: 80rpx;
|
|
|
+ padding: 0 35rpx;
|
|
|
+ border-bottom: #F5F5F5 solid 2rpx;
|
|
|
+
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: space-between;
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ .order-font {
|
|
|
+ font-size: 30rpx;
|
|
|
+ font-family: PingFang SC;
|
|
|
+ font-weight: bold;
|
|
|
+ color: #333333;
|
|
|
+
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ image {
|
|
|
+ width: 12rpx;
|
|
|
+ height: 22rpx;
|
|
|
+ }
|
|
|
}
|
|
|
- .link {
|
|
|
- font-size: $font-base - 2rpx;
|
|
|
- color: $font-color-light;
|
|
|
+
|
|
|
+ .order1 {
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ height: 170rpx;
|
|
|
+
|
|
|
+ .order-content1 {
|
|
|
+ width: 25%;
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ .order-item1 {
|
|
|
+ display: flex;
|
|
|
+ flex-direction: column;
|
|
|
+
|
|
|
+ align-items: center;
|
|
|
+
|
|
|
+
|
|
|
+ .icon1 {
|
|
|
+ width: 42rpx;
|
|
|
+ height: 38rpx;
|
|
|
+
|
|
|
+ .icon-img1 {
|
|
|
+ width: 100%;
|
|
|
+ height: 100%;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ text {
|
|
|
+ font-size: 24rpx;
|
|
|
+ font-family: PingFang SC;
|
|
|
+ font-weight: 500;
|
|
|
+ color: #333333;
|
|
|
+ line-height: 54rpx;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
- .order-section {
|
|
|
- @extend %section;
|
|
|
- padding: 28rpx 0;
|
|
|
- .order-item {
|
|
|
- @extend %flex-center;
|
|
|
- width: 120rpx;
|
|
|
- height: 120rpx;
|
|
|
- border-radius: 10rpx;
|
|
|
- font-size: $font-sm;
|
|
|
- color: $font-color-dark;
|
|
|
- }
|
|
|
- .iconfont {
|
|
|
- font-size: 48rpx;
|
|
|
- margin-bottom: 18rpx;
|
|
|
- color: #fa436a;
|
|
|
- }
|
|
|
- .icon-shouhoutuikuan {
|
|
|
- font-size: 44rpx;
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ .item-box {
|
|
|
+ border-radius: 10rpx;
|
|
|
+ background-color: white;
|
|
|
+ margin-top: 20rpx;
|
|
|
+
|
|
|
+ .box-title {
|
|
|
+ line-height: 1;
|
|
|
+ padding: 20rpx;
|
|
|
+
|
|
|
+ .title {
|
|
|
+ font-size: $font-lg;
|
|
|
+ font-weight: bold;
|
|
|
+ }
|
|
|
+
|
|
|
+ .link {
|
|
|
+ font-size: $font-base - 2rpx;
|
|
|
+ color: $font-color-light;
|
|
|
+ }
|
|
|
}
|
|
|
- .icon {
|
|
|
- height: 50rpx;
|
|
|
- width: 48rpx;
|
|
|
- margin-bottom: 18rpx;
|
|
|
- background-size: 100%;
|
|
|
- background-repeat: no-repeat;
|
|
|
- background-position: center;
|
|
|
- .icon-img {
|
|
|
- width: 100%;
|
|
|
- height: 100%;
|
|
|
+
|
|
|
+ .order-section {
|
|
|
+ @extend %section;
|
|
|
+ padding: 28rpx 0;
|
|
|
+
|
|
|
+ .order-item {
|
|
|
+ @extend %flex-center;
|
|
|
+ width: 120rpx;
|
|
|
+ height: 120rpx;
|
|
|
+ border-radius: 10rpx;
|
|
|
+ font-size: $font-sm;
|
|
|
+ color: $font-color-dark;
|
|
|
+ }
|
|
|
+
|
|
|
+ .iconfont {
|
|
|
+ font-size: 48rpx;
|
|
|
+ margin-bottom: 18rpx;
|
|
|
+ color: #fa436a;
|
|
|
+ }
|
|
|
+
|
|
|
+ .icon-shouhoutuikuan {
|
|
|
+ font-size: 44rpx;
|
|
|
+ }
|
|
|
+
|
|
|
+ .icon {
|
|
|
+ height: 90rpx;
|
|
|
+ width: 90rpx;
|
|
|
+ margin-bottom: 18rpx;
|
|
|
+ background-size: 100%;
|
|
|
+ background-repeat: no-repeat;
|
|
|
+ background-position: center;
|
|
|
+
|
|
|
+ .icon-img {
|
|
|
+ width: 100%;
|
|
|
+ height: 100%;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-}
|
|
|
-
|
|
|
-.history-section {
|
|
|
- // padding: 30rpx 0 0;
|
|
|
- margin-top: 20rpx;
|
|
|
- background: #fff;
|
|
|
- border-radius: 10rpx;
|
|
|
- .sec-header {
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- font-size: $font-base;
|
|
|
- color: $font-color-dark;
|
|
|
- line-height: 40rpx;
|
|
|
- margin-left: 30rpx;
|
|
|
- padding-top: 30rpx;
|
|
|
- .iconfont {
|
|
|
- font-size: 44rpx;
|
|
|
- color: $color-red;
|
|
|
- margin-right: 16rpx;
|
|
|
+
|
|
|
+ .history-section {
|
|
|
+ // padding: 30rpx 0 0;
|
|
|
+ margin-top: 20rpx;
|
|
|
+ background: #fff;
|
|
|
+ border-radius: 10rpx;
|
|
|
+
|
|
|
+ .sec-header {
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ font-size: $font-base;
|
|
|
+ color: $font-color-dark;
|
|
|
line-height: 40rpx;
|
|
|
+ margin-left: 30rpx;
|
|
|
+ padding-top: 30rpx;
|
|
|
+
|
|
|
+ .iconfont {
|
|
|
+ font-size: 44rpx;
|
|
|
+ color: $color-red;
|
|
|
+ margin-right: 16rpx;
|
|
|
+ line-height: 40rpx;
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- .h-list {
|
|
|
- white-space: nowrap;
|
|
|
- padding: 30rpx 30rpx 0;
|
|
|
- .h-list-image {
|
|
|
- display: inline-block;
|
|
|
- width: 160rpx;
|
|
|
- height: 160rpx;
|
|
|
- margin-right: 20rpx;
|
|
|
- border-radius: 10rpx;
|
|
|
+
|
|
|
+ .h-list {
|
|
|
+ white-space: nowrap;
|
|
|
+ padding: 30rpx 30rpx 0;
|
|
|
+
|
|
|
+ .h-list-image {
|
|
|
+ display: inline-block;
|
|
|
+ width: 160rpx;
|
|
|
+ height: 160rpx;
|
|
|
+ margin-right: 20rpx;
|
|
|
+ border-radius: 10rpx;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
-}
|
|
|
</style>
|