Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
Litemall
Commits
07420f06
Commit
07420f06
authored
Aug 27, 2018
by
usgeek
Committed by
linlinjava
Aug 27, 2018
Browse files
goods页面微调,登陆按钮微调
parent
cca55492
Changes
4
Show whitespace changes
Inline
Side-by-side
litemall-wx/pages/cart/cart.wxml
View file @
07420f06
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<view class="c">
<view class="c">
<image src="http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/noCart-a8fe3f12e5.png" />
<image src="http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/noCart-a8fe3f12e5.png" />
<text>还没有登录</text>
<text>还没有登录</text>
<button ty
p
e="
primary" plain="true"
bindtap="goLogin">去登录</button>
<button
s
ty
l
e="
background-color:#A9A9A9"
bindtap="goLogin">去登录</button>
</view>
</view>
</view>
</view>
<view class='login' wx:else>
<view class='login' wx:else>
...
...
litemall-wx/pages/goods/goods.js
View file @
07420f06
...
@@ -42,6 +42,17 @@ Page({
...
@@ -42,6 +42,17 @@ Page({
}
}
},
},
shareFriendOrCircle
:
function
()
{
//var that = this;
if
(
this
.
data
.
openShare
===
false
)
{
this
.
setData
({
openShare
:
!
this
.
data
.
openShare
});
}
else
{
return
false
;
}
},
// 保存分享图
// 保存分享图
saveShare
:
function
()
{
saveShare
:
function
()
{
let
that
=
this
;
let
that
=
this
;
...
...
litemall-wx/pages/goods/goods.wxml
View file @
07420f06
...
@@ -26,9 +26,9 @@
...
@@ -26,9 +26,9 @@
</view>
</view>
</view>
</view>
</view>
</view>
<view class="goods-info">
<view class="goods-info">
<view class="c">
<view class="c">
<text class="name">{{goods.name}}</text>
<text class="desc">{{goods.goodsBrief}}</text>
<text class="desc">{{goods.goodsBrief}}</text>
<view class="price">
<view class="price">
<view class="counterPrice">原价:¥{{goods.counterPrice}}</view>
<view class="counterPrice">原价:¥{{goods.counterPrice}}</view>
...
@@ -121,7 +121,6 @@
...
@@ -121,7 +121,6 @@
</view>
</view>
</view>
</view>
</view>
</view>
<!-- 规格选择界面 -->
<!-- 规格选择界面 -->
<view class="attr-pop-box" hidden="{{!openAttr}}">
<view class="attr-pop-box" hidden="{{!openAttr}}">
<view class="attr-pop">
<view class="attr-pop">
...
...
litemall-wx/pages/goods/goods.wxss
View file @
07420f06
...
@@ -12,6 +12,30 @@
...
@@ -12,6 +12,30 @@
height: 750rpx;
height: 750rpx;
}
}
.commodity_screen {
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
background: #000;
opacity: 0.2;
overflow: hidden;
z-index: 1000;
color: #fff;
}
.commodity_attr_box {
width: 100%;
overflow: hidden;
position: fixed;
bottom: 0;
left: 0;
z-index: 2000;
background: #fff;
padding-top: 20rpx;
}
/* .service-policy {
/* .service-policy {
width: 750rpx;
width: 750rpx;
height: 73rpx;
height: 73rpx;
...
@@ -52,14 +76,47 @@
...
@@ -52,14 +76,47 @@
.goods-info .c text {
.goods-info .c text {
display: block;
display: block;
width: 687.5rpx;
width: 687.5rpx;
text-align: center;
text-align: left;
}
.goods_name {
/* border: 1px solid black; */
height: 86rpx;
line-height: 86rpx;
border-bottom: 1px solid #fafafa;
}
}
.goods-info .name {
.goods_name_left {
height: 41rpx;
/* border: 1px solid #757575; */
margin-bottom: 5.208rpx;
float: left;
font-size: 41rpx;
height: 86rpx;
line-height: 41rpx;
font-weight: 550;
line-height: 86rpx;
margin-left: 35rpx;
font-size: 38rpx;
letter-spacing: 1rpx;
}
.goods_name_right {
float: right;
font-weight: 550;
margin-top: 28rpx;
width: 140rpx;
height: 80rpx;
line-height: 82rpx;
padding: 0;
margin: 0;
margin-right: 0rpx;
text-align: center;
font-size: 25rpx;
color: #f4f4f4;
border-top-left-radius: 50rpx;
border-bottom-left-radius: 50rpx;
border-top-right-radius: 0rpx;
border-bottom-right-radius: 0rpx;
letter-spacing: 3rpx;
/* background-image: linear-gradient(to right, #ff7701 100%); */
background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
}
}
.goods-info .desc {
.goods-info .desc {
...
@@ -77,15 +134,14 @@
...
@@ -77,15 +134,14 @@
.goods-info .counterPrice {
.goods-info .counterPrice {
float: left;
float: left;
padding-left:
12
0rpx;
padding-left: 0rpx;
text-decoration: line-through;
text-decoration: line-through;
font-size: 30rpx;
font-size: 30rpx;
color: #999;
color: #999;
}
}
.goods-info .retailPrice {
.goods-info .retailPrice {
/* float: right; */
padding-left: 5%;
padding-left: 60rpx;
font-size: 30rpx;
font-size: 30rpx;
color: #a78845;
color: #a78845;
}
}
...
@@ -93,7 +149,7 @@
...
@@ -93,7 +149,7 @@
.goods-info .brand {
.goods-info .brand {
margin-top: 23rpx;
margin-top: 23rpx;
min-height: 40rpx;
min-height: 40rpx;
text-align:
center
;
text-align:
left
;
}
}
.goods-info .brand text {
.goods-info .brand text {
...
@@ -601,7 +657,7 @@
...
@@ -601,7 +657,7 @@
.bottom-btn .c {
.bottom-btn .c {
float: left;
float: left;
background: #
f48f18
;
background: #
b4282d
;
height: 100rpx;
height: 100rpx;
line-height: 96rpx;
line-height: 96rpx;
flex: 1;
flex: 1;
...
@@ -611,8 +667,8 @@
...
@@ -611,8 +667,8 @@
}
}
.bottom-btn .r {
.bottom-btn .r {
border: 1px solid #
b4282d
;
border: 1px solid #
f48f18
;
background: #
b4282d
;
background: #
f48f18
;
float: left;
float: left;
height: 100rpx;
height: 100rpx;
line-height: 96rpx;
line-height: 96rpx;
...
@@ -767,71 +823,20 @@
...
@@ -767,71 +823,20 @@
line-height: 65rpx;
line-height: 65rpx;
}
}
.contact {
.contact {
height: 100rpx;
height: 100rpx;
width: 100rpx;
width: 100rpx;
background-color: #008000;
border-radius: 100%;
border-radius: 100%;
position: fixed;
position: fixed;
bottom: 150rpx;
bottom: 96rpx;
right: 20rpx;
right: 10rpx;
display: flex;
align-items: center;
justify-content: center;
z-index: 9;
flex-direction: column;
/*line-height: 100rpx;
text-align: center;
padding-top: 26rpx;*/
font-size: 20rpx;
font-size: 20rpx;
color: #008000;
box-sizing: border-box;
box-sizing: border-box;
background: url("https://litemall.oss-cn-shenzhen.aliyuncs.com/kefu.png") no-repeat center 21rpx;
background: url("https://litemall.oss-cn-shenzhen.aliyuncs.com/kefu.png") no-repeat center 21rpx;
background-size: 55rpx auto;
background-size: 55rpx auto;
}
}
/*分享样式*/
.goods_name {
/* border: 1px solid black; */
height: 86rpx;
line-height: 86rpx;
border-bottom: 1px solid #fafafa;
}
.goods_name_left {
/* border: 1px solid #757575; */
float: left;
height: 86rpx;
font-weight: 550;
line-height: 86rpx;
margin-left: 35rpx;
font-size: 38rpx;
letter-spacing: 1rpx;
}
.goods_name_right {
float: right;
font-weight: 550;
margin-top: 28rpx;
width: 140rpx;
height: 80rpx;
line-height: 82rpx;
padding: 0;
margin: 0;
margin-right: 0rpx;
text-align: center;
font-size: 25rpx;
color: #f4f4f4;
border-top-left-radius: 50rpx;
border-bottom-left-radius: 50rpx;
border-top-right-radius: 0rpx;
border-bottom-right-radius: 0rpx;
letter-spacing: 3rpx;
/* background-image: linear-gradient(to right, #ff7701 100%); */
background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
}
.share-pop-box {
.share-pop-box {
width: 100%;
width: 100%;
height: 100%;
height: 100%;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment