Skip to content

F
FuLiMini
Commit 7f3cd96e by wangjian
Options

修改UI

parent d89da6d8
Showing with 131 additions and 71 deletions
common/net.js
......@@ -33,6 +33,7 @@ export function post (url, params) {
// })
tokenSave('')
store.commit('refreshUserInfo', {})
store.commit('refreshUserLogin', false)
uni.showToast({
title:'登录信息已失效，请重新登录'
})
......@@ -84,6 +85,7 @@ export function get (url, params) {
// })
tokenSave('')
store.commit('refreshUserInfo', {})
store.commit('refreshUserLogin', false)
uni.showToast({
title:'登录信息已失效，请重新登录'
})
......
components/AlertRecover/AlertRecover.vue
<template>
<view class="container">
<view class="content">
<image class="close" src="@/static/close-gray.png" mode="" @click="close()"></image>
<image class="close" src="@/static/close-w.png" mode="" @click="close()"></image>
<view class="top">
<view class="title">卡券回收</view>
</view>
......@@ -64,6 +64,8 @@
.content {
margin: 50% 55rpx;
border-radius: 16rpx;
border-top-left-radius: 100rpx;
border-top-right-radius: 100rpx;
background-color: #FFFFFF;
// width: 640rpx;
height: 1018rpx;
......
components/AlertSelectStatus/AlertSelectStatus.vue
......@@ -54,7 +54,7 @@
background-color: rgba($color: #000000, $alpha: 0.7);
z-index: 99999;
.content {
margin: 50% 55rpx;
margin: 80% 55rpx;
border-radius: 16rpx;
background-color: #FFFFFF;
padding: 48rpx 40rpx;
......@@ -104,7 +104,6 @@
color: #FFFFFF;
font-size: 32rpx;
z-index: 99999;
margin-bottom: 32rpx;
}
}
}
......
components/AlertUnlock/AlertUnlock.vue
......@@ -41,7 +41,7 @@
background-color: rgba($color: #000000, $alpha: 0.7);
z-index: 99999;
.content {
margin: 50% 55rpx;
margin: 80% 55rpx 40%;
border-radius: 16rpx;
background-color: #FFFFFF;
padding: 48rpx 40rpx;
......@@ -86,7 +86,6 @@
color: #FFFFFF;
font-size: 32rpx;
z-index: 99999;
margin-bottom: 32rpx;
}
}
}
......
components/pwdCodeAlert/pwdCodeAlert.vue
......@@ -105,7 +105,7 @@
}
}
.buy-bottom {
margin-top: 96rpx;
margin-top: 64rpx;
border-radius: 40rpx;
height: 80rpx;
width: 560rpx;
......@@ -115,7 +115,6 @@
color: #FFFFFF;
font-size: 32rpx;
z-index: 99999;
margin-bottom: 32rpx;
}
}
}
......
components/setPwdAlert/setPwdAlert.vue
......@@ -100,7 +100,7 @@
background-color: rgba($color: #000000, $alpha: 0.7);
z-index: 99999;
.content {
margin: 50% 28rpx;
margin: 40% 56rpx 60%;
border-radius: 16rpx;
background-color: #FFFFFF;
padding: 48rpx 40rpx;
......@@ -157,7 +157,7 @@
}
}
.buy-bottom {
margin: 64rpx 0 48rpx;
margin: 64rpx 0 0;
border-radius: 40rpx;
height: 80rpx;
background-color: #FF0520;
......
pages.json
......@@ -5,7 +5,8 @@
"style" :
{
"navigationBarTitleText": "懒人企业福利社",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
}
}
,{
......@@ -13,7 +14,8 @@
"style" :
{
"navigationBarTitleText": "订单",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
}
}
......@@ -24,7 +26,8 @@
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom",
"backgroundColor":"#F5F5F5"
"backgroundColor":"#F5F5F5",
"navigationBarBackgroundColor": "#FFFFFF"
}
}
......@@ -36,14 +39,16 @@
"path": "login/login",
"style": {
"navigationBarTitleText": "登录",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
}
},{
"path" : "integral/integral",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
}
}
......@@ -52,7 +57,8 @@
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
}
}
......@@ -61,7 +67,8 @@
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
}
}
......@@ -78,42 +85,48 @@
"path": "GoodSkuList/GoodSkuList",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
}
}, {
"path": "integralDetail/integralDetail",
"style": {
"navigationBarTitleText": "积分明细",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
}
}, {
"path": "setting/setting",
"style": {
"navigationBarTitleText": "设置",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
}
}, {
"path": "VertifyPhone/VertifyPhone",
"style": {
"navigationBarTitleText": "验证手机号",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
}
}, {
"path": "SetPwd/SetPwd",
"style": {
"navigationBarTitleText": "设置支付密码",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
}
}, {
"path": "orderDetail/orderDetail",
"style": {
"navigationBarTitleText": "订单详情",
"enablePullDownRefresh": false,
"navigationStyle":"custom"
"navigationStyle":"custom",
"navigationBarBackgroundColor": "#FFFFFF"
}
}
,{
......@@ -122,7 +135,8 @@
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle":"custom"
"navigationStyle":"custom",
"navigationBarBackgroundColor": "#FFFFFF"
}
}
......@@ -132,7 +146,8 @@
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
"navigationStyle": "custom",
"navigationBarBackgroundColor": "#FFFFFF"
}
}
......@@ -141,7 +156,8 @@
"style" :
{
"navigationBarTitleText": "隐私协议",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
}
}
......@@ -150,7 +166,8 @@
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
}
}
......
pages/home/home.vue
......@@ -271,6 +271,7 @@ export default {
width: 90rpx;
height: 90rpx;
border-radius: 90rpx;
border: 2rpx solid #EEEEEE;
}
.item-right {
display: flex;
......
pages/mine/mine.vue
......@@ -241,10 +241,10 @@
margin-left: 30rpx;
height: 110rpx;
width: 110rpx;
border-radius: 110rpx;
border-radius: 55rpx;
}
.info {
margin-top: 50rpx;
margin-top: 44rpx;
margin-left: 20rpx;
width: 380rpx;
.name {
......@@ -256,7 +256,7 @@
overflow: hidden;
}
.shop {
margin-top: 20rpx;
margin-top: 14rpx;
font-size: 24rpx;
color: #999999;
white-space: nowrap;
......@@ -285,13 +285,14 @@
}
}
.user-integral {
margin: 0 70rpx;
margin: 0 35rpx;
display: flex;
justify-content: space-between;
border-top: 2rpx solid #F5F5F5;
.item {
text-align: center;
margin-top: 34rpx;
flex: 1;
.num {
font-size: 36rpx;
color: #333333;
......@@ -315,7 +316,8 @@
}
.item {
display: flex;
padding: 26rpx 30rpx;
padding: 26rpx 0;
margin: 0 30rpx;
align-items: center;
justify-content: space-between;
border-bottom: 2rpx solid#F5F5F5;
......
pages/order/order.vue
<template>
<view class="container">
<view class="empty" v-if="orderLists.length<=0 && loadingType != 'loading'">
<image class="empty-img" src="../../static/empty-coupon.png" mode=""></image>
<image class="empty-img" src="../../static/integral-empty-icon.png" mode=""></image>
<view class="empty-text">暂无订单</view>
</view>
<view class="order-list">
......@@ -27,6 +27,7 @@
</view>
</view>
</view>
<!-- <view class="line" v-if="item.state === 200"></view> -->
<view class="btn" v-if="item.state === 200">
<view class="btn-item pay-btn" @click.stop="goCoupon(item)">
查看卡券
......@@ -193,12 +194,19 @@
}
}
}
.line {
margin-top: 32rpx;
height: 2rpx;
width: 100%;
background-color: #F5F5F5;
content: ' ';
}
.btn {
width: 654rpx;
display: flex;
justify-content: flex-end;
.btn-item {
margin-top: 40rpx;
margin-top: 32rpx;
height: 62rpx;
width: 176rpx;
border-radius: 32rpx;
......@@ -219,10 +227,12 @@
}
}
.empty {
padding: 432rpx 136rpx 0;
padding: 400rpx 136rpx 0;
text-align: center;
.empty-img {
height: 280rpx;
width: 480rpx;
margin: 0 auto;
height: 300rpx;
width: 394rpx;
}
.empty-text {
font-size: 28rpx;
......
pagesA/GoodSkuList/GoodSkuList.vue
......@@ -56,6 +56,12 @@ export default {
};
</script>
<style>
page{
background-color: #f5f5f5;
}
</style>
<style lang="scss" scoped>
.layout {
width: 100%;
......@@ -64,14 +70,14 @@ export default {
.list {
display: flex;
flex-direction: column;
padding: 6rpx 12rpx;
padding: 0 24rpx;
.item {
display: flex;
flex-direction: row;
// align-items: center;
background: #ffffff;
padding: 20rpx 20rpx;
padding: 24rpx;
border-radius: 16rpx;
margin: 12rpx 0;
margin-top: 24rpx;
.img {
width: 200rpx;
height: 200rpx;
......@@ -85,8 +91,8 @@ export default {
.item-title {
font-size: 28rpx;
color: #333333;
height: 58rpx;
line-height: 28rpx;
height: 80rpx;
line-height: 40rpx;
overflow: hidden;
min-inline-size: 2;
line-clamp: 2;
......@@ -96,7 +102,7 @@ export default {
.item-brand {
background: rgba(255, 5, 32, 0.03);
border-radius: 4rpx;
border: 1rpx solid #ff0520;
border: 2rpx solid #ff0520;
font-size: 22rpx;
color: #ff0520;
margin-top: 12rpx;
......
pagesA/VertifyPhone/VertifyPhone.vue
......@@ -3,7 +3,7 @@
<view class="first-line">请完成以下认证</view>
<view class="sencond-line">请输入{{ phone }}收到的短信验证码</view>
<view class="code-layout">
<input class="input" placeholder="请输入短信验证码" v-model="code" type="number" maxlength="8" />
<input class="input" placeholder="请输入短信验证码" placeholder-style="color:#999999;font-weight:400" v-model="code" type="number" maxlength="8" />
<text class="vertify-code" @click="getCode()">{{ verifyCode }}</text>
</view>
<view :class="code.length > 0 ? 'submit1' : 'submit'" @click="submit">下一步</view>
......@@ -91,21 +91,19 @@ export default {
font-size: 36rpx;
font-weight: bolder;
color: #333333;
line-height: 48rpx;
margin: 80rpx 49rpx 0 49rpx;
}
.sencond-line {
font-size: 26rpx;
color: #333333;
line-height: 48rpx;
margin: 29rpx 49rpx 0 49rpx;
margin: 24rpx 49rpx 0 49rpx;
}
.code-layout {
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
margin: 29rpx 49rpx 0 49rpx;
margin: 119rpx 49rpx 0 49rpx;
border-bottom: solid 2rpx #ff0520;
padding-bottom: 30rpx;
.input {
......
pagesA/coupon/coupon.vue
......@@ -32,9 +32,9 @@
<image v-if="isExpired(item)" class="expired" src="../../static/expired.png" mode=""></image>
<view class="goods-info">
<image v-if="!isExpired(item)" class="bg-img" src="../../static/coupon-top-h.png" mode=""></image>
<image v-if="isExpired(item)" class="bg-img" src="../../static/coupon-top-gray.png" mode=""></image>
<view v-if="isExpired(item)" class="bg-img"></view>
<view class="left">
<image class="img" :src="item.brandImg" mode=""></image>
<image class="img" :style="{'opacity':isExpired(item)?'0.5':''}" :src="item.brandImg" mode=""></image>
<view class="info">
<view class="name">{{item.brandName}}</view>
<view class="spec">{{item.attrName}}:{{item.denomination}}</view>
......@@ -395,6 +395,7 @@
margin-right: 16rpx;
width: 32rpx;
height: 32rpx;
flex-shrink: 0;
}
.coupon-big {
flex: 1;
......@@ -412,6 +413,9 @@
width: 100%;
height: 120rpx;
z-index: -1;
background-color: #999999;
border-top-left-radius: 16rpx;
border-top-right-radius: 16rpx;
}
.left {
display: flex;
......@@ -509,14 +513,15 @@
}
.empty {
padding: 100rpx 136rpx 0;
text-align: center;
.empty-img {
height: 280rpx;
width: 480rpx;
height: 300rpx;
width: 394rpx;
}
.empty-text {
font-size: 28rpx;
color: #BFBFBF;
margin-top: 48rpx;
margin-top: 24rpx;
width: 480rpx;
text-align: center;
}
......
pagesA/goods/goods.vue
......@@ -31,12 +31,12 @@
<!--商品属性-->
<view class="good-attr">
<view class="good-attr-rule" @click="showSkuDialog" >
<text class="attr-name">已选</text>
<text class="attr-name">已&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;选</text>
<text>:</text>
<text class="attrs">{{goods.skuDetail.denomination}}</text>
<image class="right-row" src="../../static/arrow-right.png"></image>
</view>
<view class="good-attr-rule">
<view class="good-attr-rule" style="border: none;">
<text class="attr-name">购买限制</text>
<text>:</text>
<text class="attrs">{{goods.skuDetail.validityType}}</text>
......@@ -295,7 +295,7 @@
display: flex;
.goods-info-left {
width: 606rpx;
padding-top: 8rpx;
// padding-top: 8rpx;
.good-price-share {
display: flex;
justify-content: space-between;
......@@ -336,7 +336,7 @@
.good-title {
font-size: 30upx;
font-weight: bolder;
line-height: 48upx;
line-height: 42upx;
margin-top: 10upx;
max-lines: 3;
line-clamp: 3;
......@@ -394,11 +394,22 @@
align-items: center;
.attr-name {
font-size: 28upx;
color: #848689;
color: #333333;
line-height: 40upx;
white-space: nowrap;
width: 120rpx;
text-align-last: justify;
// text-align-last: justify;
// -webkit-text-align-last: justify;
text-align: justify;
text-align-last: center;
-moz-text-align-last: center;
}
.attr-name::after {
content: ' ';
width: 100%;
height: 0;
display: inline-block;
visibility: hidden;
}
.attr-name-icon {
font-size: 28upx;
......@@ -413,7 +424,7 @@
}
.right-row {
width: 12upx;
height: 24upx;
height: 20upx;
position: absolute;
right: 48upx;
}
......
pagesA/integralDetail/integralDetail.vue
......@@ -33,7 +33,7 @@
<uni-load-more v-if="integralList.length > 0" :status="loadingType"></uni-load-more>
</view>
<view v-else-if="!isLoading && integralList.length <= 0" class="empty">
<image class="empty-icon" src="../../static/integral-empty-icon.png"></image>
<image class="empty-icon" src="@/static/integral-empty-icon.png"></image>
<text class="empty-desc">本月暂时没有支出积分哦</text>
</view>
<uni-popup class="pop" ref="timeShow" type="bottom" background-color="#fff" safeArea="true">
......@@ -217,7 +217,7 @@ export default {
width: 90rpx;
height: 90rpx;
background: #ffffff;
border: 2px solid #efefef;
border: 2rpx solid #efefef;
border-radius: 50%;
margin-left: 30rpx;
}
......
pagesA/login/login.vue
......@@ -244,13 +244,13 @@
.login-btn {
margin: 80rpx auto 0;
background-color: #ff0520;
height: 80rpx;
height: 96rpx;
width: 590rpx;
line-height: 82rpx;
line-height: 98rpx;
font-size: 32rpx;
color: #ffffff;
text-align: center;
border-radius: 40rpx;
border-radius: 48rpx;
}
}
</style>
pagesA/orderDetail/orderDetail.vue
......@@ -196,7 +196,6 @@
top: 0;
left: 0;
right: 0;
background-color: #FF0520;
align-items: center;
.back {
padding: 0 34rpx;
......@@ -243,7 +242,7 @@
.goods {
border-radius: 16rpx;
background-color: #FFFFFF;
margin-bottom: 24rpx;
// margin-bottom: 24rpx;
padding: 32rpx 24rpx;
display: flex;
padding: 24rpx;
......@@ -351,6 +350,7 @@
display: flex;
align-items: center;
justify-content: center;
margin-top: 40rpx;
view {
font-size: 26rpx;
color: #999999;
......@@ -378,7 +378,7 @@
.coupon-btn {
// height: 120rpx;
bottom: 0;
background-color: #FFFFFF;
background-color: transparent;
display: flex;
padding: 0 24rpx;
// align-items: center;
......@@ -387,7 +387,7 @@
left: 0;
right: 0;
.btn {
background-color: rgba($color: #FF0520, $alpha: 0.5);
background-color: #F97D8B;
border-radius: 40rpx;
height: 80rpx;
width: 100%;
......
pagesA/selectAccount/selectAccount.vue
......@@ -86,15 +86,18 @@
padding: 64rpx;
.top {
font-size: 40rpx;
font-weight: bolder;
line-height: 56rpx;
color: #333333;
}
.sub {
font-size: 24rpx;
line-height: 34rpx;
color: #666666;
margin-top: 16rpx;
}
.account-content {
height: 550rpx;
height: 570rpx;
overflow-y: auto;
margin-top: 128rpx;
.first-item{
......@@ -128,6 +131,7 @@
}
.middle-next-item {
margin-top: 14rpx;
color: #666666;
}
}
.right {
......
pagesA/submitOrder/submitOrder.vue
......@@ -7,7 +7,7 @@
<view class="right">
<view class="goods-title">{{goods.title}}</view>
<view class="bottom-info">
<view class="integral">{{goods.sellingPrice}}积分</view>
<view class="integral">{{goods.sellingPrice}}<text>积分</text></view>
<view class="buy-button">
<image v-if="goodsNum===1" class="reduce" src="../../static/reduce.png" mode="" @click="reduce()"></image>
<image v-else class="reduce" src="../../static/reduce-h.png" mode="" @click="reduce()"></image>
......@@ -170,6 +170,7 @@
width: 200rpx;
display: block;
border-radius: 8rpx;
border: 1rpx solid #EEEEEE;
}
.right {
margin-left: 16rpx;
......@@ -203,6 +204,10 @@
height: 36rpx;
line-height: 36rpx;
color: #FF0520;
font-weight: bolder;
text{
font-weight: 400;
}
}
.buy-button {
position: relative;
......
static/eye-off.png
static/eye-off.png

2.51 KB | W: | H:

static/eye-off.png

1.42 KB | W: | H:

static/eye-off.png
static/eye-off.png
static/eye-off.png
static/eye-off.png
  • 2-up
  • Swipe
  • Onion skin
static/eye-open.png
static/eye-open.png

1.83 KB | W: | H:

static/eye-open.png

1.38 KB | W: | H:

static/eye-open.png
static/eye-open.png
static/eye-open.png
static/eye-open.png
  • 2-up
  • Swipe
  • Onion skin
static/integral-empty-icon.png
static/integral-empty-icon.png

106 KB | W: | H:

static/integral-empty-icon.png

22.9 KB | W: | H:

static/integral-empty-icon.png
static/integral-empty-icon.png
static/integral-empty-icon.png
static/integral-empty-icon.png
  • 2-up
  • Swipe
  • Onion skin
static/select-h.png
static/select-h.png

1.55 KB | W: | H:

static/select-h.png

1.5 KB | W: | H:

static/select-h.png
static/select-h.png
static/select-h.png
static/select-h.png
  • 2-up
  • Swipe
  • Onion skin
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