Skip to content

S
shop_mobile_uni
Commit aa261a21 authored by 王建威's avatar 王建威
Browse files
Options

bug fix

parent b4684456
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 38 deletions
manifest.json
View file @ aa261a21
......@@ -2,7 +2,7 @@
"name": "shop_mobile_uni",
"appid": "__UNI__F904656",
"description": "",
"versionName": "1.0.15",
"versionName": "1.0.16",
"versionCode": "100",
"transformPx": false,
"app-plus": {
......@@ -51,7 +51,7 @@
"mode": "history",
"base": "/uni"
},
"publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/test/1.0.15/",
"publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/test/1.0.16/",
"optimization": {
"treeShaking": {
"enable": true
......
package.json
View file @ aa261a21
{
"name": "shop_mobile_uni",
"version": "1.0.13",
"version": "1.0.16",
"description": "谛宝多多商城",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
......
pages/integralRecord/integralRecord.vue
View file @ aa261a21
<template>
<view class="main">
<view class="return_icon"><view class="eosfont">&#xe622;</view></view>
<view class="return_icon" @click="$backup()"><view class="eosfont">&#xe622;</view></view>
<view class="card">
<view>可用积分</view>
<view>{{integral}}</view>
......
pages/signRecord/signRecord.vue
View file @ aa261a21
<template>
<view class="main">
<view class="card">
<view class="return_icon"><view class="eosfont">&#xe622;</view></view>
<view class="return_icon" @click="$backup()"><view class="eosfont">&#xe622;</view></view>
<view class="days">{{sign_days_continues}}</view>
<view class="title">连续签到</view>
</view>
......
pages/signin/signin.vue
View file @ aa261a21
<template>
<view class="main">
<view class="sign_top_card">
<view class="return_icon"><view class="eosfont">&#xe622;</view></view>
<view class="title">我的积分<text class="eosfont">&#xe608;</text></view>
<view class="return_icon" @click="$backup()"><view class="eosfont">&#xe622;</view></view>
<view class="title" @click="$jump('/pages/integralRecord/integralRecord')">我的积分<text class="eosfont">&#xe608;</text></view>
<view class="integral">{{integral}}</view>
<view class="sign_tab">
<text class="title2">花积分：</text>
......@@ -20,7 +20,8 @@
<view class="days">
<view class="day_item" v-for="(item, index) in sign_list" :key="index">
<view class="item_bg" :class="{act: item.is_sign === '1'}">+{{item.point}}</view>
<view class="day">第{{index+1}}天</view>
<view class="day" v-if="item.date_diff !== '0'" :class="{seven: index === 6}">第{{index+1}}天</view>
<view class="day actDay" v-else>今天</view>
</view>
</view>
<view class="sign_btn" @click="signin" v-if="is_sign_today === '0'"></view>
......@@ -32,7 +33,7 @@
<swiper :autoplay="true" style="height:380rpx" @change="changeCurrent">
<swiper-item v-for="(item, index) in grade_list" :key="index" >
<view class="swiper_item">
<view class="benefit_item" v-for="(vo, key) in item" :key="key">{{vo.title}}</view>
<view class="benefit_item" v-for="(vo, key) in item" :key="key">{{vo.short_title}}</view>
</view>
</swiper-item>
</swiper>
......@@ -59,7 +60,8 @@
<view class="dialog_content">
<view class="day_item day_item2" v-for="(item, index) in sign_list" :key="index">
<view class="item_bg item_bg2" :class="{act: item.is_sign === '1'}">+{{item.point}}</view>
<view class="day">第{{index+1}}天</view>
<view class="day" v-if="item.date_diff !== '0'">第{{index+1}}天</view>
<view class="day actDay" v-else>今天</view>
</view>
<view class="dialog_btn" @click="signin">立即签到</view>
</view>
......@@ -315,6 +317,11 @@
align-items: center;
margin: 40rpx auto 30rpx;
}
.actDay {
color: #FF6600 !important;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
}
.sign_btn {
width: 536rpx;
height: 100rpx;
......@@ -354,6 +361,7 @@
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
box-sizing: border-box;
margin: 0 auto;
}
.item_bg2 {
width: 96rpx;
......@@ -371,6 +379,15 @@
line-height: 34rpx;
text-align: center;
}
.seven {
width: 90rpx;
height: 38rpx;
line-height: 38rpx;
border-radius: 19rpx;
background:linear-gradient(135deg,rgba(255,236,73,1) 0%,rgba(255,211,30,1) 100%);
box-shadow:0px 2px 8px 0px rgba(255,230,62,0.5);
color: #000000;
}
}
.day_item2 {
margin-right: 36rpx;
......
pages/vipCenter/vipCenter.vue
View file @ aa261a21
......@@ -4,34 +4,51 @@
<view class="top_bg">
<view class="swiper_content">
<swiper style="height: 284rpx;" @change="swiperChange">
<swiper-item v-for="(val, key) in member_list" :key="key" style="left: -30rpx;" :style="[key === index ? {'left':0} : null]">
<view class="swiper_card" :class="[{scale: key !== index}, `level${val.grade}`]" :style="[member_list.length === 1 ? {width: '100%'} : null]">
<text class="now_level">当前等级</text>
<swiper-item style="left: -30rpx;" :style="[0 === index ? {'left':0} : null]">
<view class="swiper_card" :class="[{scale: 0 !== index}, `level${member_list[0].grade}`]" :style="[member_list.length === 1 ? {width: '100%'} : null]">
<text class="now_level">{{member_list[0].grade_name}}</text>
<view class="card_flex">
<image :src="val.portrait || $defaultPortrait"></image>
<image :src="member_list[0].portrait || $defaultPortrait"></image>
<view>
<view class="customer_name">{{val.user_name}}</view>
<view class="card_bar" v-if="val.growth_diff > 1">
<view class="customer_name">{{member_list[0].user_name}}</view>
<view class="card_bar">
<view class="process_bar"
:style="`width: ${Number(val.total_integral)*100/(Number(val.total_integral)+val.growth_diff).toFixed(2)}%`"></view>
:style="`width: ${Number(member_list[0].total_integral)*100/(Number(member_list[0].total_integral)+member_list[0].growth_diff).toFixed(2)}%`"></view>
</view>
<view class="diff" v-if="val.growth_diff > 1">{{val.total_integral}}/{{Number(val.total_integral)+val.growth_diff}} 升至{{member_list[1].grade_name}}</view>
<view class="diff" v-if="member_list.length > 1">{{member_list[0].total_integral}}/{{Number(member_list[0].total_integral)+member_list[0].growth_diff}} 升至{{member_list[1].grade_name}}</view>
</view>
</view>
<view class="card_bottom">
<text class="growth_diff" v-if="val.growth_diff !== 0">您距离下一等级还需{{val.growth_diff}}经验值</text>
<text v-else></text>
<view class="levelStrategy" @click="$jump('/pages/levelStrategy/levelStrategy' ,2)"><text class="picon" :class="`picon${val.grade}`"></text><text>升级攻略</text></view>
<text class="growth_diff">您距离下一等级还需{{member_list[0].growth_diff}}经验值</text>
<view class="levelStrategy" @click="$jump('/pages/levelStrategy/levelStrategy' ,2)"><text class="picon" :class="`picon${member_list[0].grade}`"></text><text>升级攻略</text></view>
</view>
</view>
</swiper-item>
<swiper-item style="left: -30rpx;" :style="[1 === index ? {'left':0} : null]">
<view class="swiper_card" :class="[{scale: 1 !== index}, `level${member_list[1].grade}`]" :style="[member_list.length === 1 ? {width: '100%'} : null]">
<text class="now_level">{{member_list[1].grade_name}}</text>
<view class="card_flex">
<image :src="member_list[1].portrait || $defaultPortrait"></image>
<view>
<view class="customer_name">{{member_list[1].user_name}}</view>
<view class="card_bar"></view>
<view class="diff">{{member_list[1].grade_name}}</view>
</view>
</view>
<view class="card_bottom">
<text></text>
<view class="levelStrategy" @click="$jump('/pages/levelStrategy/levelStrategy' ,2)"><text class="picon" :class="`picon${member_list[1].grade}`"></text><text>升级攻略</text></view>
</view>
</view>
</swiper-item>
</swiper>
</view>
<view class="top_title">当前等级权益</view>
<view class="now_benefit" v-for="(val, key) in member_list" v-if="key === index" :key="key" :style="[heightFlag ? {'height': height+'rpx'} : null]">
<view class="benefit_item" v-for="(item, k) in val.grade_list" :key="k">
{{item.title}}
<text class="dia"></text>
<view class="now_benefit" v-for="(val, key) in member_list" v-if="key === index" :key="key" :style="[heightFlag ? {'height': height+'rpx'} : null]" :class="val.grade_list.length > 4 ? 'height1' : 'height2'">
<view class="benefit_item" v-for="(item, k) in val.grade_list" :key="k" :style="[key != 0 ? {color: 'rgba(255,255,255,0.4)'} : null]">
{{item.short_title}}
<text class="dia" v-if="key === 0"></text>
<text v-else class="unlock"><text class="eosfont">&#xe645;</text>{{val.grade_name.substr(0,2)}}解锁</text>
</view>
</view>
<view class="collapse_btn" @click="moreBenefit()" v-if="moreFlag"><text v-if="!heightFlag">查看更多</text><text v-else>收起</text><text class="eosfont" v-if="!heightFlag">&#xe729;</text><text class="eosfont" v-else>&#xe728;</text></text></view>
......@@ -60,7 +77,13 @@
heightFlag: false,
animationData: {},
integral_list: [],
member_list: [],
member_list: [{
grade: '',
grade_name: ''
}, {
grade: '',
grade_name: ''
}],
index: 0,
moreFlag: true,
php: php
......@@ -236,23 +259,23 @@
}
}
.level1 {
background: url('https://dbc-static.oss-cn-beijing.aliyuncs.com/static/1%E9%9D%92%E9%93%9C.png') no-repeat;
background: url('https://dbc-static.oss-cn-beijing.aliyuncs.com/static/level1%402x.png') no-repeat;
background-size: 100% 100%;
}
.level2 {
background: url('https://dbc-static.oss-cn-beijing.aliyuncs.com/static/2%E7%99%BD%E9%93%B6.png') no-repeat;
background: url('https://dbc-static.oss-cn-beijing.aliyuncs.com/static/level2%402x.png') no-repeat;
background-size: 100% 100%;
}
.level3 {
background: url('https://dbc-static.oss-cn-beijing.aliyuncs.com/static/3%E9%BB%84%E9%87%91.png') no-repeat;
background: url('https://dbc-static.oss-cn-beijing.aliyuncs.com/static/level3%402x.png') no-repeat;
background-size: 100% 100%;
}
.level4 {
background: url('https://dbc-static.oss-cn-beijing.aliyuncs.com/static/4%E7%99%BD%E9%87%91.png') no-repeat;
background: url('https://dbc-static.oss-cn-beijing.aliyuncs.com/static/level4%402x.png') no-repeat;
background-size: 100% 100%;
}
.level5 {
background: url('https://dbc-static.oss-cn-beijing.aliyuncs.com/static/5%E9%92%BB%E7%9F%B3.png') no-repeat;
background: url('https://dbc-static.oss-cn-beijing.aliyuncs.com/static/level5%402x.png') no-repeat;
background-size: 100% 100%;
}
}
......@@ -280,7 +303,6 @@
display: flex;
flex-wrap: wrap;
margin-top: 54rpx;
height: 336rpx;
overflow: hidden;
transition: height 0.3s;
.benefit_item {
......@@ -296,6 +318,21 @@
position: relative;
overflow: hidden;
margin-left: 20rpx;
.unlock {
font-size: 16rpx;
color: rgba(255,255,255,0.4);
display: flex;
align-items: center;
justify-content: center;
width: 120rpx;
height: 36rpx;
line-height: 36rpx;
position: absolute;
bottom: 16rpx;
left: 20rpx;
background-color: #2E3136;
border-radius: 18rpx;
}
.dia {
position: absolute;
right: -10rpx;
......@@ -310,6 +347,12 @@
margin-left: 0;
}
}
.height1 {
height: 352rpx;
}
.height2 {
height: 176rpx;
}
.collapse_btn {
width: 408rpx;
height: 68rpx;
......
static/iconfont.css
View file @ aa261a21
@font-face {
font-family: "eosfont";
src: url('https://at.alicdn.com/t/font_1878093_g9p5eg1qexv.eot');
src: url('https://at.alicdn.com/t/font_1878093_g9p5eg1qexv.eot?#iefix') format('embedded-opentype'),
url('https://at.alicdn.com/t/font_1878093_g9p5eg1qexv.woff2') format('woff2'),
url('https://at.alicdn.com/t/font_1878093_g9p5eg1qexv.woff') format('woff'),
url('https://at.alicdn.com/t/font_1878093_g9p5eg1qexv.ttf') format('truetype'),
url('https://at.alicdn.com/t/font_1878093_g9p5eg1qexv.svg#iconfont') format('svg');
src: url('https://at.alicdn.com/t/font_1878093_yggdekpesv.eot');
src: url('https://at.alicdn.com/t/font_1878093_yggdekpesv.eot?#iefix') format('embedded-opentype'),
url('https://at.alicdn.com/t/font_1878093_yggdekpesv.woff2') format('woff2'),
url('https://at.alicdn.com/t/font_1878093_yggdekpesv.woff') format('woff'),
url('https://at.alicdn.com/t/font_1878093_yggdekpesv.ttf') format('truetype'),
url('https://at.alicdn.com/t/font_1878093_yggdekpesv.svg#iconfont') format('svg');
}
.eosfont {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment