Skip to content
GitLab
"vscode:/vscode.git/clone" did not exist on "613d2dba2039b1af92977c05b519ac2be378bdad"
Unverified Commit 3759c910 authored by linlinjava's avatar linlinjava Committed by GitHub
Browse files

Merge pull request #31 from usgeek/master 

小程序前端界面调整及部分功能实现，java后端添加阿里云对象存储
parents 70763a2e 4a911bd5
Show whitespace changes
Inline Side-by-side
litemall-os-api/pom.xml
View file @ 3759c910
...@@ -28,6 +28,11 @@ ...@@ -28,6 +28,11 @@
<version>5.4.4</version> <version>5.4.4</version>
</dependency> </dependency>
<dependency>
<groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId>
<version>2.5.0</version>
</dependency>
</dependencies> </dependencies>
......
litemall-os-api/src/main/java/org/linlinjava/litemall/os/service/AliyunOsService.java 0 → 100644
View file @ 3759c910
package org.linlinjava.litemall.os.service;
import com.aliyun.oss.OSSClient;
import com.aliyun.oss.model.ObjectMetadata;
import com.aliyun.oss.model.PutObjectRequest;
import com.aliyun.oss.model.PutObjectResult;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.PropertySource;
import org.springframework.core.io.Resource;
import org.springframework.core.io.UrlResource;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.net.MalformedURLException;
import java.net.URL;
import java.nio.file.Path;
import java.util.stream.Stream;
/**
* @author Yogeek
* @date 2018/7/16 16:10
* @decrpt 阿里云对象存储服务
*/
@PropertySource(value = "classpath:aliyun.properties")
@Service("aos")
public class AliyunOsService implements ObjectStorageService {
@Value("${aliyun.os.ENDPOINT}")
private String ENDPOINT;
@Value("${aliyun.os.ACCESS_KEY_ID}")
private String ACCESS_KEY_ID;
@Value("${aliyun.os.ACCESS_KEY_SECRET}")
private String ACCESS_KEY_SECRET;
@Value("${aliyun.os.BUCKET_NAME}")
private String BUCKET_NAME;
// @Value("${aliyun.os.FOLDER}")
// private String FOLDER;
/**
* 获取阿里云OSS客户端对象
*
* @return ossClient
*/
private OSSClient getOSSClient(){
return new OSSClient(ENDPOINT,ACCESS_KEY_ID, ACCESS_KEY_SECRET);
}
private String getBaseUrl() {
return "https://" + BUCKET_NAME + "." + ENDPOINT + "/" ;
}
/**
* 阿里云OSS对象存储简单上传实现
*/
@Override
public void store(MultipartFile file, String keyName) {
try {
// 简单文件上传, 最大支持 5 GB, 适用于小文件上传, 建议 20M以下的文件使用该接口
ObjectMetadata objectMetadata = new ObjectMetadata();
objectMetadata.setContentLength(file.getSize());
objectMetadata.setContentType(file.getContentType());
// 对象键（Key）是对象在存储桶中的唯一标识。
PutObjectRequest putObjectRequest = new PutObjectRequest(BUCKET_NAME, keyName, file.getInputStream(), objectMetadata);
PutObjectResult putObjectResult = getOSSClient().putObject(putObjectRequest);
} catch (Exception ex) {
ex.printStackTrace();
}
}
@Override
public Stream<Path> loadAll() {
return null;
}
@Override
public Path load(String keyName) {
return null;
}
@Override
public Resource loadAsResource(String keyName) {
try {
URL url = new URL(getBaseUrl() + keyName);
Resource resource = new UrlResource(url);
if (resource.exists() || resource.isReadable()) {
return resource;
} else {
return null;
}
} catch (MalformedURLException e) {
e.printStackTrace();
return null;
}
}
@Override
public void delete(String keyName) {
try {
getOSSClient().deleteObject(BUCKET_NAME, keyName);
}catch (Exception e){
e.printStackTrace();
}
}
@Override
public String generateUrl(String keyName) {
return getBaseUrl() + keyName;
}
}
litemall-os-api/src/main/resources/aliyun.properties 0 → 100644
View file @ 3759c910
# 阿里云对象存储配置信息
aliyun.os.ENDPOINT=oss-cn-shenzhen.aliyuncs.com
aliyun.os.ACCESS_KEY_ID=
aliyun.os.ACCESS_KEY_SECRET=
aliyun.os.BUCKET_NAME=
#aliyun.os.FOLDER="xxxxxx"
\ No newline at end of file
litemall-wx/app.json
View file @ 3759c910
...@@ -31,43 +31,45 @@ ...@@ -31,43 +31,45 @@
"pages/shopping/checkout/checkout", "pages/shopping/checkout/checkout",
"pages/shopping/address/address", "pages/shopping/address/address",
"pages/shopping/addressAdd/addressAdd", "pages/shopping/addressAdd/addressAdd",
"pages/goods/goods" "pages/goods/goods",
"pages/about/index"
], ],
"window": { "window": {
"navigationBarTitleText": "litemall小程序商城",
"navigationBarTextStyle": "#FFFFFF",
"navigationBarBackgroundColor": "#696969",
"backgroundColor": "#FFFFFF",
"backgroundTextStyle": "dark", "backgroundTextStyle": "dark",
"navigationBarBackgroundColor": "#fff", "enablePullDownRefresh": false
"navigationBarTitleText": "仿网易严选",
"navigationBarTextStyle": "black",
"enablePullDownRefresh": true
}, },
"tabBar": { "tabBar": {
"backgroundColor": "#fafafa", "backgroundColor": "#fafafa",
"borderStyle": "white", "borderStyle": "white",
"selectedColor": "#b4282d", "selectedColor": "#AB956D",
"color": "#666", "color": "#666",
"list": [ "list": [
{ {
"pagePath": "pages/index/index", "pagePath": "pages/index/index",
"iconPath": "static/images/ic_menu_choice_nor.png", "iconPath": "static/images/ic_menu_choice_nor.png",
"selectedIconPath": "static/images/ic_menu_choice_pressed.png", "selectedIconPath": "static/images/home@selected.png",
"text": "首页" "text": "首页"
}, },
{ {
"pagePath": "pages/catalog/catalog", "pagePath": "pages/catalog/catalog",
"iconPath": "static/images/ic_menu_sort_nor.png", "iconPath": "static/images/ic_menu_sort_nor.png",
"selectedIconPath": "static/images/ic_menu_sort_pressed.png", "selectedIconPath": "static/images/category@selected.png",
"text": "分类" "text": "分类"
}, },
{ {
"pagePath": "pages/cart/cart", "pagePath": "pages/cart/cart",
"iconPath": "static/images/ic_menu_shoping_nor.png", "iconPath": "static/images/ic_menu_shoping_nor.png",
"selectedIconPath": "static/images/ic_menu_shoping_pressed.png", "selectedIconPath": "static/images/cart@selected.png",
"text": "购物车" "text": "购物车"
}, },
{ {
"pagePath": "pages/ucenter/index/index", "pagePath": "pages/ucenter/index/index",
"iconPath": "static/images/ic_menu_me_nor.png", "iconPath": "static/images/ic_menu_me_nor.png",
"selectedIconPath": "static/images/ic_menu_me_pressed.png", "selectedIconPath": "static/images/my@selected.png",
"text": "个人" "text": "个人"
} }
] ]
......
litemall-wx/pages/about/index.js 0 → 100644
View file @ 3759c910
// index.js
var app = getApp()
var util = require("../../utils/util.js");
var api = require("../../config/api.js");
Page({
/**
* 页面的初始数据
*/
data: {
load_statue: true,
shopInfo: {
name: 'litemall',
address: 'https://github.com/linlinjava/litemall',
latitude: 22.60,
longitude: 116.87,
linkPhone: '0755-xxxx-xxxx',
qqNumber: '738696120'
},
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
showLocation: function (e) {
var that = this
wx.openLocation({
latitude: that.data.shopInfo.latitude,
longitude: that.data.shopInfo.longitude,
name: that.data.shopInfo.name,
address: that.data.shopInfo.address,
})
},
callPhone: function (e) {
var that = this
wx.makePhoneCall({
phoneNumber: that.data.shopInfo.linkPhone,
})
},
reLoad: function (e) {
this.loadShopInfo();
}
})
\ No newline at end of file
litemall-wx/pages/about/index.json 0 → 100644
View file @ 3759c910
{}
\ No newline at end of file
litemall-wx/pages/about/index.wxml 0 → 100644
View file @ 3759c910
<view class="container">
<view class="about-item">
<view class="item-left">
<label>项目名称: </label>
<text>{{shopInfo.name}}</text>
</view>
</view>
<view class="about-item">
<view class="item-left">
<label>项目地址: </label>
<text>{{shopInfo.address}}</text>
</view>
<view class="item-right" bindtap="showLocation">
<image src="/static/images/ico-addr.png" class="right-icon"></image>
</view>
</view>
<view class="about-item">
<view class="item-left">
<label>电话号码: </label>
<text>{{shopInfo.linkPhone}}</text>
</view>
<view class="item-right" bindtap="callPhone">
<image src="/static/images/telephone.png" class="right-icon"></image>
</view>
</view>
<view class="about-item">
<view class="item-left">
<label>litemall交流群: </label>
<text>{{shopInfo.qqNumber}}</text>
</view>
<view class="item-right">
<image src="/static/images/mobile.png" class="right-icon"></image>
</view>
</view>
</view>
\ No newline at end of file
litemall-wx/pages/about/index.wxss 0 → 100644
View file @ 3759c910
/* index.wxss */
page{
height: 100%;
background-color: #F2f2f2;
}
.page-view{
height: 100%;
}
.banner-image{
width: 100%;
height: 350rpx;
background: #ee1;
margin-bottom: 30rpx;
border-bottom: solid #f2f2f2 0.5dp;
}
.about-item{
background: white;
border-top: solid #f2f2f2 0.5rpx;
border-bottom: solid #f2f2f2 0.5rpx;
width: 100%;
height: 100rpx;
display: flex;
flex-direction: row;
justify-content: space-between;
}
.item-left{
font-size: 32rpx;
margin-left: 15rpx;
margin-top: auto;
margin-bottom: auto;
}
.item-right{
margin-right: 15rpx;
margin-top: auto;
margin-bottom: auto;
}
.right-icon{
width: 40rpx;
height: 40rpx;
}
\ No newline at end of file
litemall-wx/pages/goods/goods.js
View file @ 3759c910
...@@ -42,7 +42,7 @@ Page({ ...@@ -42,7 +42,7 @@ Page({
// 这里检测一下 // 这里检测一下
let _productPrice = res.data.productList[0].price; let _productPrice = res.data.productList[0].price;
let _goodsPrice = res.data.info.retailPrice; let _goodsPrice = res.data.info.retailPrice;
if (_productPrice != _goodsPrice){ if (_productPrice != _goodsPrice) {
console.error('商品数量价格和货品不一致'); console.error('商品数量价格和货品不一致');
} }
...@@ -206,13 +206,13 @@ Page({ ...@@ -206,13 +206,13 @@ Page({
} }
let checkedProduct = checkedProductArray[0]; let checkedProduct = checkedProductArray[0];
if (checkedProduct.number > 0){ if (checkedProduct.number > 0) {
this.setData({ this.setData({
checkedSpecPrice: checkedProduct.price, checkedSpecPrice: checkedProduct.price,
soldout: false soldout: false
}); });
} }
else{ else {
this.setData({ this.setData({
checkedSpecPrice: this.data.goods.retailPrice, checkedSpecPrice: this.data.goods.retailPrice,
soldout: true soldout: true
...@@ -220,7 +220,7 @@ Page({ ...@@ -220,7 +220,7 @@ Page({
} }
} }
else{ else {
this.setData({ this.setData({
checkedSpecText: '规格数量选择', checkedSpecText: '规格数量选择',
checkedSpecPrice: this.data.goods.retailPrice, checkedSpecPrice: this.data.goods.retailPrice,
...@@ -276,28 +276,33 @@ Page({ ...@@ -276,28 +276,33 @@ Page({
}); });
} }
}, },
closeAttrOrCollect: function () { closeAttr: function () {
let that = this;
if (this.data.openAttr) {
this.setData({ this.setData({
openAttr: false, openAttr: false,
}); });
if (that.data.userHasCollect == 1) { },
that.setData({ addCollectOrNot: function () {
collectBackImage: that.data.hasCollectImage let that = this;
}); // if (this.data.openAttr) {
} else { // this.setData({
that.setData({ // openAttr: false,
collectBackImage: that.data.noCollectImage // });
}); // if (that.data.userHasCollect == 1) {
} // that.setData({
} else { // collectBackImage: that.data.hasCollectImage
// });
// } else {
// that.setData({
// collectBackImage: that.data.noCollectImage
// });
// }
// } else {
//添加或是取消收藏 //添加或是取消收藏
util.request(api.CollectAddOrDelete, { type: 0, valueId: this.data.id }, "POST") util.request(api.CollectAddOrDelete, { type: 0, valueId: this.data.id }, "POST")
.then(function (res) { .then(function (res) {
let _res = res; let _res = res;
if (_res.errno == 0) { if (_res.errno == 0) {
if ( _res.data.type == 'add') { if (_res.data.type == 'add') {
that.setData({ that.setData({
collectBackImage: that.data.hasCollectImage collectBackImage: that.data.hasCollectImage
}); });
...@@ -316,7 +321,6 @@ Page({ ...@@ -316,7 +321,6 @@ Page({
} }
}); });
}
}, },
openCartPage: function () { openCartPage: function () {
...@@ -394,7 +398,7 @@ Page({ ...@@ -394,7 +398,7 @@ Page({
//打开规格选择窗口 //打开规格选择窗口
this.setData({ this.setData({
openAttr: !this.data.openAttr, openAttr: !this.data.openAttr,
collectBackImage: '/static/images/detail_back.png' // collectBackImage: '/static/images/detail_back.png'
}); });
} else { } else {
......
litemall-wx/pages/goods/goods.wxml
View file @ 3759c910
<scroll-view class="container" scroll-y="true"> <view class="container">
<view wx:if="{{!openAttr}}">
<swiper class="goodsimgs" indicator-dots="true" autoplay="true" interval="3000" duration="1000"> <swiper class="goodsimgs" indicator-dots="true" autoplay="true" interval="3000" duration="1000">
<swiper-item wx:for="{{goods.gallery}}" wx:key="*this"> <swiper-item wx:for="{{goods.gallery}}" wx:key="*this">
<image src="{{item}}" background-size="cover"></image> <image src="{{item}}" background-size="cover"></image>
...@@ -16,7 +15,7 @@ ...@@ -16,7 +15,7 @@
<text class="desc">{{goods.goodsBrief}}</text> <text class="desc">{{goods.goodsBrief}}</text>
<text class="price">￥{{checkedSpecPrice}}</text> <text class="price">￥{{checkedSpecPrice}}</text>
<view class="brand" wx:if="{{brand.name}}"> <view class="brand" wx:if="{{brand.name}}">
<navigator url="/pages/brandDetail/brandDetail?id={{brand.id}}"> <navigator url="../brandDetail/brandDetail?id={{brand.id}}">
<text>{{brand.name}}</text> <text>{{brand.name}}</text>
</navigator> </navigator>
</view> </view>
...@@ -46,15 +45,16 @@ ...@@ -46,15 +45,16 @@
{{item.content}} {{item.content}}
</view> </view>
<view class="imgs" wx:if="{{item.picList.length > 0}}"> <view class="imgs" wx:if="{{item.picList.length > 0}}">
<image class="img" wx:for="{{item.picList}}" wx:key="*this" wx:for-item="iitem" src="{{iitem}}"></image> <image class="img" wx:for="{{item.picList}}" wx:key="*this" wx:for-item="iitem" src="{{iitem}} "></image>
</view> </view>
<!-- <view class="spec">白色 2件</view> -->
</view> </view>
</view> </view>
</view> </view>
<view class="goods-attr"> <view class="goods-attr">
<view class="t">商品参数</view> <view class="t">商品参数</view>
<view class="l"> <view class="l">
<view class="item" wx:for="{{attribute}}" wx:key="item"> <view class="item" wx:for="{{attribute}}" wx:key="name">
<text class="left">{{item.attribute}}</text> <text class="left">{{item.attribute}}</text>
<text class="right">{{item.value}}</text> <text class="right">{{item.value}}</text>
</view> </view>
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
<template is="wxParse" data="{{wxParseData:goodsDetail.nodes}}" /> <template is="wxParse" data="{{wxParseData:goodsDetail.nodes}}" />
</view> </view>
<view class="common-problem"> <view class="common-problem">
<view class="h"> <view class="h">
<view class="line"></view> <view class="line"></view>
...@@ -99,14 +100,18 @@ ...@@ -99,14 +100,18 @@
</view> </view>
</view> </view>
</view> </view>
</view>
<view class="attr-pop-box" hidden="{{!openAttr}}">
<view class="attr-pop">
<view class="close" bindtap="closeAttr">
<image class="icon" src="/static/images/icon_close.png"></image>
</view> </view>
<view wx:if="{{openAttr}}" class="attr-pop">
<view class="img-info"> <view class="img-info">
<image class="img" src="{{goods.picUrl}}"></image> <image class="img" src="{{goods.picUrl}}"></image>
<view class="info"> <view class="info">
<view class="c"> <view class="c">
<view class="p">价格：￥{{checkedSpecPrice}}</view> <view class="p">价格：￥{{checkedSpecPrice}}</view>
<view class="a">{{tmpSpecText}}</view> <view class="a" wx:if="{{productList.length>0}}">已选择：{{checkedSpecText}}</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -114,9 +119,7 @@ ...@@ -114,9 +119,7 @@
<view class="spec-item" wx:for="{{specificationList}}" wx:key="name"> <view class="spec-item" wx:for="{{specificationList}}" wx:key="name">
<view class="name">{{item.name}}</view> <view class="name">{{item.name}}</view>
<view class="values"> <view class="values">
<view class="value {{vitem.checked ? 'selected' : ''}}" bindtap="clickSkuValue" wx:for="{{item.valueList}}" wx:for-item="vitem" wx:key="id" data-value-id="{{vitem.id}}" data-name="{{vitem.specification}}"> <view class="value {{vitem.checked ? 'selected' : ''}}" bindtap="clickSkuValue" wx:for="{{item.valueList}}" wx:for-item="vitem" wx:key="{{vitem.id}}" data-value-id="{{vitem.id}}" data-name-id="{{vitem.specification}}">{{vitem.value}}</view>
{{vitem.value}}
</view>
</view> </view>
</view> </view>
...@@ -130,9 +133,13 @@ ...@@ -130,9 +133,13 @@
</view> </view>
</view> </view>
</view> </view>
</scroll-view> </view>
<view class="contact">
<contact-button style="opacity:0;position:absolute;" type="default-dark" session-from="weapp" size="27">
</contact-button>
</view>
<view class="bottom-btn"> <view class="bottom-btn">
<view class="l l-collect {{ openAttr ? 'back' : ''}}" bindtap="closeAttrOrCollect"> <view class="l l-collect" bindtap="addCollectOrNot">
<image class="icon" src="{{ collectBackImage }}"></image> <image class="icon" src="{{ collectBackImage }}"></image>
</view> </view>
<view class="l l-cart"> <view class="l l-cart">
......
litemall-wx/pages/goods/goods.wxss
View file @ 3759c910
.container{ .container {
margin-bottom: 100rpx; margin-bottom: 100rpx;
} }
.goodsimgs{
.goodsimgs {
width: 750rpx; width: 750rpx;
height: 750rpx; height: 750rpx;
} }
.goodsimgs image{ .goodsimgs image {
width: 750rpx; width: 750rpx;
height: 750rpx; height: 750rpx;
} }
.service-policy{ .service-policy {
width: 750rpx; width: 750rpx;
height: 73rpx; height: 73rpx;
background: #f4f4f4; background: #f4f4f4;
...@@ -22,7 +23,7 @@ ...@@ -22,7 +23,7 @@
justify-content: space-between; justify-content: space-between;
} }
.service-policy .item{ .service-policy .item {
background: url(http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/servicePolicyRed-518d32d74b.png) 0 center no-repeat; background: url(http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/servicePolicyRed-518d32d74b.png) 0 center no-repeat;
background-size: 10rpx; background-size: 10rpx;
padding-left: 15rpx; padding-left: 15rpx;
...@@ -32,14 +33,14 @@ ...@@ -32,14 +33,14 @@
color: #666; color: #666;
} }
.goods-info{ .goods-info {
width: 750rpx; width: 750rpx;
height: 306rpx; height: 306rpx;
overflow: hidden; overflow: hidden;
background: #fff; background: #fff;
} }
.goods-info .c{ .goods-info .c {
display: block; display: block;
width: 718.75rpx; width: 718.75rpx;
height: 100%; height: 100%;
...@@ -48,20 +49,20 @@ ...@@ -48,20 +49,20 @@
border-bottom: 1px solid #f4f4f4; border-bottom: 1px solid #f4f4f4;
} }
.goods-info .c text{ .goods-info .c text {
display: block; display: block;
width: 687.5rpx; width: 687.5rpx;
text-align: center; text-align: center;
} }
.goods-info .name{ .goods-info .name {
height: 41rpx; height: 41rpx;
margin-bottom: 5.208rpx; margin-bottom: 5.208rpx;
font-size: 41rpx; font-size: 41rpx;
line-height: 41rpx; line-height: 41rpx;
} }
.goods-info .desc{ .goods-info .desc {
height: 43rpx; height: 43rpx;
margin-bottom: 41rpx; margin-bottom: 41rpx;
font-size: 24rpx; font-size: 24rpx;
...@@ -69,21 +70,20 @@ ...@@ -69,21 +70,20 @@
color: #999; color: #999;
} }
.goods-info .price {
.goods-info .price{
height: 35rpx; height: 35rpx;
font-size: 35rpx; font-size: 35rpx;
line-height: 35rpx; line-height: 35rpx;
color: #b4282d; color: #b4282d;
} }
.goods-info .brand{ .goods-info .brand {
margin-top: 23rpx; margin-top: 23rpx;
min-height: 40rpx; min-height: 40rpx;
text-align: center; text-align: center;
} }
.goods-info .brand text{ .goods-info .brand text {
display: inline-block; display: inline-block;
width: auto; width: auto;
padding: 2px 30rpx 2px 10.5rpx; padding: 2px 30rpx 2px 10.5rpx;
...@@ -96,14 +96,14 @@ ...@@ -96,14 +96,14 @@
background-size: 10.75rpx 18.75rpx; background-size: 10.75rpx 18.75rpx;
} }
.section-nav{ .section-nav {
width: 750rpx; width: 750rpx;
height: 108rpx; height: 108rpx;
background: #fff; background: #fff;
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }
.section-nav .t{ .section-nav .t {
float: left; float: left;
width: 600rpx; width: 600rpx;
height: 108rpx; height: 108rpx;
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
margin-left: 31.25rpx; margin-left: 31.25rpx;
} }
.section-nav .i{ .section-nav .i {
float: right; float: right;
width: 52rpx; width: 52rpx;
height: 52rpx; height: 52rpx;
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
margin-top: 28rpx; margin-top: 28rpx;
} }
.section-act .t{ .section-act .t {
float: left; float: left;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -134,14 +134,14 @@ ...@@ -134,14 +134,14 @@
margin-left: 31.25rpx; margin-left: 31.25rpx;
} }
.section-act .label{ .section-act .label {
color: #999; color: #999;
} }
.section-act .tag{ .section-act .tag {
display: flex; display: flex;
align-items: center; align-items: center;
padding:0 10rpx; padding: 0 10rpx;
border-radius: 3px; border-radius: 3px;
height: 37rpx; height: 37rpx;
width: auto; width: auto;
...@@ -149,10 +149,10 @@ ...@@ -149,10 +149,10 @@
overflow: hidden; overflow: hidden;
border: 1px solid #f48f18; border: 1px solid #f48f18;
font-size: 25rpx; font-size: 25rpx;
margin:0 10rpx; margin: 0 10rpx;
} }
.section-act .text{ .section-act .text {
display: flex; display: flex;
align-items: center; align-items: center;
height: 37rpx; height: 37rpx;
...@@ -162,15 +162,15 @@ ...@@ -162,15 +162,15 @@
font-size: 29rpx; font-size: 29rpx;
} }
.comments{ .comments {
width: 100%; width: 100%;
height: auto; height: auto;
padding-left:30rpx; padding-left: 30rpx;
background: #fff; background: #fff;
margin: 20rpx 0; margin: 20rpx 0;
} }
.comments .h{ .comments .h {
height: 102.5rpx; height: 102.5rpx;
line-height: 100.5rpx; line-height: 100.5rpx;
width: 718.75rpx; width: 718.75rpx;
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
border-bottom: 1px solid #d9d9d9; border-bottom: 1px solid #d9d9d9;
} }
.comments .h .t{ .comments .h .t {
display: block; display: block;
float: left; float: left;
width: 50%; width: 50%;
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
color: #333; color: #333;
} }
.comments .h .i{ .comments .h .i {
display: block; display: block;
float: right; float: right;
width: 164rpx; width: 164rpx;
...@@ -196,24 +196,24 @@ ...@@ -196,24 +196,24 @@
background-size: 52rpx; background-size: 52rpx;
} }
.comments .b{ .comments .b {
height: auto; height: auto;
width: 720rpx; width: 720rpx;
} }
.comments .item{ .comments .item {
height: auto; height: auto;
width: 720rpx; width: 720rpx;
overflow: hidden; overflow: hidden;
} }
.comments .info{ .comments .info {
height: 127rpx; height: 127rpx;
width: 100%; width: 100%;
padding: 33rpx 0 27rpx 0; padding: 33rpx 0 27rpx 0;
} }
.comments .user{ .comments .user {
float: left; float: left;
width: auto; width: auto;
height: 67rpx; height: 67rpx;
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
font-size: 0; font-size: 0;
} }
.comments .user image{ .comments .user image {
float: left; float: left;
width: 67rpx; width: 67rpx;
height: 67rpx; height: 67rpx;
...@@ -229,7 +229,7 @@ ...@@ -229,7 +229,7 @@
border-radius: 50%; border-radius: 50%;
} }
.comments .user text{ .comments .user text {
display: inline-block; display: inline-block;
width: auto; width: auto;
height: 66rpx; height: 66rpx;
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
line-height: 66rpx; line-height: 66rpx;
} }
.comments .time{ .comments .time {
display: block; display: block;
float: right; float: right;
width: auto; width: auto;
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
margin-right: 30rpx; margin-right: 30rpx;
} }
.comments .content{ .comments .content {
width: 720rpx; width: 720rpx;
padding-right: 30rpx; padding-right: 30rpx;
line-height: 45.8rpx; line-height: 45.8rpx;
...@@ -257,20 +257,19 @@ ...@@ -257,20 +257,19 @@
margin-bottom: 24rpx; margin-bottom: 24rpx;
} }
.comments .imgs{ .comments .imgs {
width: 720rpx; width: 720rpx;
height: auto; height: auto;
margin-bottom: 25rpx; margin-bottom: 25rpx;
} }
.comments .imgs .img{ .comments .imgs .img {
height: 150rpx; height: 150rpx;
width: 150rpx; width: 150rpx;
margin-right: 28rpx; margin-right: 28rpx;
} }
.comments .spec {
.comments .spec{
width: 720rpx; width: 720rpx;
padding-right: 30rpx; padding-right: 30rpx;
line-height: 30rpx; line-height: 30rpx;
...@@ -279,8 +278,7 @@ ...@@ -279,8 +278,7 @@
margin-bottom: 30rpx; margin-bottom: 30rpx;
} }
.goods-attr {
.goods-attr{
width: 750rpx; width: 750rpx;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
...@@ -288,14 +286,14 @@ ...@@ -288,14 +286,14 @@
background: #fff; background: #fff;
} }
.goods-attr .t{ .goods-attr .t {
width: 687.5rpx; width: 687.5rpx;
height: 104rpx; height: 104rpx;
line-height: 104rpx; line-height: 104rpx;
font-size: 38.5rpx; font-size: 38.5rpx;
} }
.goods-attr .item{ .goods-attr .item {
width: 687.5rpx; width: 687.5rpx;
height: 68rpx; height: 68rpx;
padding: 11rpx 20rpx; padding: 11rpx 20rpx;
...@@ -304,7 +302,7 @@ ...@@ -304,7 +302,7 @@
font-size: 38.5rpx; font-size: 38.5rpx;
} }
.goods-attr .left{ .goods-attr .left {
float: left; float: left;
font-size: 25rpx; font-size: 25rpx;
width: 134rpx; width: 134rpx;
...@@ -314,7 +312,7 @@ ...@@ -314,7 +312,7 @@
color: #999; color: #999;
} }
.goods-attr .right{ .goods-attr .right {
float: left; float: left;
font-size: 36.5rpx; font-size: 36.5rpx;
margin-left: 20rpx; margin-left: 20rpx;
...@@ -325,25 +323,24 @@ ...@@ -325,25 +323,24 @@
color: #333; color: #333;
} }
.detail{ .detail {
width: 750rpx; width: 750rpx;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
} }
.detail image{ .detail image {
width: 750rpx; width: 750rpx;
display: block; display: block;
} }
.common-problem {
.common-problem{
width: 750rpx; width: 750rpx;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
} }
.common-problem .h{ .common-problem .h {
position: relative; position: relative;
height: 145.5rpx; height: 145.5rpx;
width: 750rpx; width: 750rpx;
...@@ -352,7 +349,7 @@ ...@@ -352,7 +349,7 @@
text-align: center; text-align: center;
} }
.common-problem .h .line{ .common-problem .h .line {
display: inline-block; display: inline-block;
position: absolute; position: absolute;
top: 72rpx; top: 72rpx;
...@@ -364,7 +361,7 @@ ...@@ -364,7 +361,7 @@
background: #ccc; background: #ccc;
} }
.common-problem .h .title{ .common-problem .h .title {
display: inline-block; display: inline-block;
position: absolute; position: absolute;
top: 56.125rpx; top: 56.125rpx;
...@@ -376,22 +373,21 @@ ...@@ -376,22 +373,21 @@
background: #fff; background: #fff;
} }
.common-problem .b{ .common-problem .b {
width: 750rpx; width: 750rpx;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
padding: 0rpx 30rpx; padding: 0rpx 30rpx;
background: #fff; background: #fff;
} }
.common-problem .item{ .common-problem .item {
height: auto; height: auto;
overflow: hidden; overflow: hidden;
padding-bottom: 25rpx; padding-bottom: 25rpx;
} }
.common-problem .question-box .spot{ .common-problem .question-box .spot {
float: left; float: left;
display: block; display: block;
height: 8rpx; height: 8rpx;
...@@ -401,7 +397,7 @@ ...@@ -401,7 +397,7 @@
margin-top: 11rpx; margin-top: 11rpx;
} }
.common-problem .question-box .question{ .common-problem .question-box .question {
float: left; float: left;
line-height: 30rpx; line-height: 30rpx;
padding-left: 8rpx; padding-left: 8rpx;
...@@ -411,21 +407,20 @@ ...@@ -411,21 +407,20 @@
color: #303030; color: #303030;
} }
.common-problem .answer{ .common-problem .answer {
line-height: 36rpx; line-height: 36rpx;
padding-left: 16rpx; padding-left: 16rpx;
font-size: 26rpx; font-size: 26rpx;
color: #787878; color: #787878;
} }
.related-goods {
.related-goods{
width: 750rpx; width: 750rpx;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
} }
.related-goods .h{ .related-goods .h {
position: relative; position: relative;
height: 145.5rpx; height: 145.5rpx;
width: 750rpx; width: 750rpx;
...@@ -435,7 +430,7 @@ ...@@ -435,7 +430,7 @@
border-bottom: 1px solid #f4f4f4; border-bottom: 1px solid #f4f4f4;
} }
.related-goods .h .line{ .related-goods .h .line {
display: inline-block; display: inline-block;
position: absolute; position: absolute;
top: 72rpx; top: 72rpx;
...@@ -447,7 +442,7 @@ ...@@ -447,7 +442,7 @@
background: #ccc; background: #ccc;
} }
.related-goods .h .title{ .related-goods .h .title {
display: inline-block; display: inline-block;
position: absolute; position: absolute;
top: 56.125rpx; top: 56.125rpx;
...@@ -459,13 +454,13 @@ ...@@ -459,13 +454,13 @@
background: #fff; background: #fff;
} }
.related-goods .b{ .related-goods .b {
width: 750rpx; width: 750rpx;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
} }
.related-goods .b .item{ .related-goods .b .item {
float: left; float: left;
background: #fff; background: #fff;
width: 375rpx; width: 375rpx;
...@@ -477,12 +472,12 @@ ...@@ -477,12 +472,12 @@
border-bottom: 1px solid #f4f4f4; border-bottom: 1px solid #f4f4f4;
} }
.related-goods .item .img{ .related-goods .item .img {
width: 311.45rpx; width: 311.45rpx;
height: 311.45rpx; height: 311.45rpx;
} }
.related-goods .item .name{ .related-goods .item .name {
display: block; display: block;
width: 311.45rpx; width: 311.45rpx;
height: 35rpx; height: 35rpx;
...@@ -493,7 +488,7 @@ ...@@ -493,7 +488,7 @@
color: #333; color: #333;
} }
.related-goods .item .price{ .related-goods .item .price {
display: block; display: block;
width: 311.45rpx; width: 311.45rpx;
height: 30rpx; height: 30rpx;
...@@ -502,10 +497,10 @@ ...@@ -502,10 +497,10 @@
color: #b4282d; color: #b4282d;
} }
.bottom-btn{ .bottom-btn {
position: fixed; position: fixed;
left:0; left: 0;
bottom:0; bottom: 0;
z-index: 10; z-index: 10;
width: 750rpx; width: 750rpx;
height: 100rpx; height: 100rpx;
...@@ -513,7 +508,7 @@ ...@@ -513,7 +508,7 @@
background: #fff; background: #fff;
} }
.bottom-btn .l{ .bottom-btn .l {
float: left; float: left;
height: 100rpx; height: 100rpx;
width: 162rpx; width: 162rpx;
...@@ -521,63 +516,84 @@ ...@@ -521,63 +516,84 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.bottom-btn .l.l-collect{ .bottom-btn .l.l-collect {
border-right: none; border-right: none;
border-left: none; border-left: none;
text-align: center; text-align: center;
width: 90rpx;
}
.bottom-btn .l.l-kefu {
position: relative;
height:54rpx;
width: 63rpx;
} }
.bottom-btn .l.l-cart .box {
.bottom-btn .l.l-cart .box{
position: relative; position: relative;
height: 60rpx; height: 60rpx;
width: 60rpx; width: 60rpx;
} }
.bottom-btn .l.l-cart .cart-count{ .bottom-btn .l.l-cart .cart-count {
height: 28rpx; height: 28rpx;
width: 28rpx; width: 28rpx;
z-index: 10; z-index: 10;
position: absolute; position: absolute;
top: 0; top: 0;
right:0; right: 0;
background: #b4282d; background: #b4282d;
text-align: center; text-align: center;
font-size: 18rpx; font-size: 18rpx;
color: #fff; color: #fff;
line-height: 28rpx; line-height: 28rpx;
border-radius: 50%; border-radius: 50%;
} }
.bottom-btn .l.l-cart .icon{ .bottom-btn .l.l-cart .icon {
position: absolute; position: absolute;
top: 10rpx; top: 10rpx;
left:0; left: 0;
} }
.bottom-btn .l.l-kefu .kefu-count {
height: 28rpx;
width: 28rpx;
z-index: 10;
position: absolute;
top: 0;
right: 0;
/* background: #b4282d; */
text-align: center;
font-size: 18rpx;
color: #fff;
line-height: 28rpx;
border-radius: 50%;
}
.bottom-btn .l.l-kefu .icon{
position: absolute;
top: 10rpx;
left: 0;
}
.bottom-btn .l .icon{ .bottom-btn .l .icon {
display: block; display: block;
height: 44rpx; height: 44rpx;
width: 44rpx; width: 44rpx;
} }
.bottom-btn .c{ .bottom-btn .c{
float: left; float: left;
background: #f48f18;
height: 100rpx; height: 100rpx;
line-height: 96rpx; line-height: 96rpx;
flex: 1; flex: 1;
text-align: center; text-align: center;
color: #333; color: #fff;
border-top: 1px solid #f4f4f4; /* border-top: 2px solid #f4f4f4; */
border-bottom: 1px solid #f4f4f4; /* border-bottom: 2px solid #f4f4f4; */
} }
.bottom-btn .r{ .bottom-btn .r{
...@@ -591,33 +607,51 @@ ...@@ -591,33 +607,51 @@
color: #fff; color: #fff;
} }
.bottom-btn .n{
border:1px solid #f4f4f4;
background: #f4f4f4;
float: left;
height: 100rpx;
line-height: 96rpx;
flex: 1;
text-align: center;
}
@import "../../lib/wxParse/wxParse.wxss"; @import "../../lib/wxParse/wxParse.wxss";
.attr-pop{ .attr-pop-box {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: fixed;
background: rgba(0, 0, 0, .5);
z-index: 8;
bottom: 0;
/* display: none; */
}
.attr-pop {
width: 100%;
height: auto;
max-height: 780rpx;
padding: 31.25rpx; padding: 31.25rpx;
background: #fff; background: #fff;
position: fixed;
z-index: 9;
bottom: 100rpx;
} }
.attr-pop .img-info{ .attr-pop .close {
position: absolute;
width: 48rpx;
height: 48rpx;
right: 31.25rpx;
overflow: hidden;
top: 31.25rpx;
}
.attr-pop .close .icon {
width: 48rpx;
height: 48rpx;
}
.attr-pop .img-info {
width: 687.5rpx; width: 687.5rpx;
height: 177rpx; height: 177rpx;
overflow: hidden; overflow: hidden;
margin-bottom: 41.5rpx; margin-bottom: 41.5rpx;
} }
.attr-pop .img{ .attr-pop .img {
float: left; float: left;
height: 177rpx; height: 177rpx;
width: 177rpx; width: 177rpx;
...@@ -625,14 +659,14 @@ ...@@ -625,14 +659,14 @@
margin-right: 31.25rpx; margin-right: 31.25rpx;
} }
.attr-pop .info{ .attr-pop .info {
float: left; float: left;
height: 177rpx; height: 177rpx;
display: flex; display: flex;
align-items: center; align-items: center;
} }
.attr-pop .p{ .attr-pop .p {
font-size: 33rpx; font-size: 33rpx;
color: #333; color: #333;
height: 33rpx; height: 33rpx;
...@@ -640,33 +674,33 @@ ...@@ -640,33 +674,33 @@
margin-bottom: 10rpx; margin-bottom: 10rpx;
} }
.attr-pop .a{ .attr-pop .a {
font-size: 29rpx; font-size: 29rpx;
color: #333; color: #333;
height: 40rpx; height: 40rpx;
line-height: 40rpx; line-height: 40rpx;
} }
.spec-con{ .spec-con {
width: 100%; width: 100%;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
} }
.spec-con .name{ .spec-con .name {
height: 32rpx; height: 32rpx;
margin-bottom: 22rpx; margin-bottom: 22rpx;
font-size: 29rpx; font-size: 29rpx;
color: #333; color: #333;
} }
.spec-con .values{ .spec-con .values {
height: auto; height: auto;
margin-bottom: 31.25rpx; margin-bottom: 31.25rpx;
font-size: 0; font-size: 0;
} }
.spec-con .value{ .spec-con .value {
display: inline-block; display: inline-block;
height: 62rpx; height: 62rpx;
padding: 0 35rpx; padding: 0 35rpx;
...@@ -679,31 +713,31 @@ ...@@ -679,31 +713,31 @@
color: #333; color: #333;
} }
.spec-con .value.disable{ .spec-con .value.disable {
border: 1px solid #ccc; border: 1px solid #ccc;
color: #ccc; color: #ccc;
} }
.spec-con .value.selected{ .spec-con .value.selected {
border: 1px solid #b4282d; border: 1px solid #b4282d;
color: #b4282d; color: #b4282d;
} }
.number-item .selnum{ .number-item .selnum {
width: 322rpx; width: 322rpx;
height: 71rpx; height: 71rpx;
border: 1px solid #ccc; border: 1px solid #ccc;
display: flex; display: flex;
} }
.number-item .cut{ .number-item .cut {
width: 93.75rpx; width: 93.75rpx;
height: 100%; height: 100%;
text-align: center; text-align: center;
line-height: 65rpx; line-height: 65rpx;
} }
.number-item .number{ .number-item .number {
flex: 1; flex: 1;
height: 100%; height: 100%;
text-align: center; text-align: center;
...@@ -713,11 +747,55 @@ ...@@ -713,11 +747,55 @@
float: left; float: left;
} }
.number-item .add{ .number-item .add {
width: 93.75rpx; width: 93.75rpx;
height: 100%; height: 100%;
text-align: center; text-align: center;
line-height: 65rpx; line-height: 65rpx;
} }
.contact{
height: 100rpx;
width: 100rpx;
background-color: #008000;
border-radius: 100%;
position: fixed;
bottom: 150rpx;
right: 20rpx;
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;
color: #008000;
box-sizing: border-box;
background: url("https://litemall.oss-cn-shenzhen.aliyuncs.com/kefu.png") no-repeat center 21rpx;
background-size: 55rpx auto;
}
.contact .name{
font-size: 32rpx;
max-width: 80rpx;
color: #fff;
text-align: center;
}
litemall-wx/pages/ucenter/index/index.js
View file @ 3759c910
...@@ -80,6 +80,23 @@ Page({ ...@@ -80,6 +80,23 @@ Page({
wx.navigateTo({ url: "/pages/auth/login/login" }); wx.navigateTo({ url: "/pages/auth/login/login" });
}; };
}, },
aboutUs: function () {
// wx.navigateTo({
// url: '/page/about/index',
// })
wx.navigateTo({
url: '../../about/index',//页面跳转相对路径要写清楚且准确
success: function (res) {
console.log('跳转到news页面成功')// success
},
fail: function () {
console.log('跳转到news页面失败') // fail
},
complete: function () {
console.log('跳转到news页面完成') // complete
}
})
},
exitLogin: function () { exitLogin: function () {
wx.showModal({ wx.showModal({
title: '', title: '',
......
litemall-wx/pages/ucenter/index/index.wxml
View file @ 3759c910
...@@ -27,13 +27,13 @@ ...@@ -27,13 +27,13 @@
</view> --> </view> -->
<view class="item"> <view class="item">
<view class="a" bindtap="goCollect"> <view class="a" bindtap="goCollect">
<text class="icon collect"></text> <image class="user-menu .icon.collect" src="/static/images/icon_collect.png"></image>
<text class="txt">我的收藏</text> <text class="txt">我的收藏</text>
</view> </view>
</view> </view>
<view class="item"> <view class="item">
<view class="a" bindtap="goFootprint"> <view class="a" bindtap="goFootprint">
<text class="icon security"></text> <image class="user-menu .icon.collect" src="/static/images/foot.png"></image>
<text class="txt">我的足迹</text> <text class="txt">我的足迹</text>
</view> </view>
</view> </view>
...@@ -55,19 +55,27 @@ ...@@ -55,19 +55,27 @@
<text class="txt">账号安全</text> <text class="txt">账号安全</text>
</view> </view>
</view> --> </view> -->
<!-- <view class="item no-border"> <!-- 能力有限，此添加方式开发环境看不到效果，但是线上环境可以正常使用-->
<button class="item no-border" open-type="contact" size="20" session-from="weapp">
<view class="a"> <view class="a">
<text class="icon kefu"></text> <text class="icon kefu"></text>
<text class="txt">联系客服</text> <text class="txt">联系客服</text>
</view> </view>
</view> --> </button>
<!-- <view class="item item-bottom"> <button view class="item" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">
<view class="a"> <view class="a">
<text class="icon help"></text> <image class="user-menu .icon.phone" src="/static/images/mobile.png"></image>
<text class="txt">帮助中心</text> <text class="txt">绑定手机号码</text>
</view>
</button>
<view class="item">
<view class="a" bindtap="aboutUs">
<image class="user-menu .icon.collect" src="/static/images/about_us.png"></image>
<text class="txt">关于我们</text>
</view> </view>
</view> -->
</view> </view>
</view>
<!--<view class="logout" bindtap="exitLogin">退出登录</view>--> <!--<view class="logout" bindtap="exitLogin">退出登录</view>-->
</view> </view>
\ No newline at end of file
litemall-wx/pages/ucenter/index/index.wxss
View file @ 3759c910
page{ page {
height: 100%; height: 100%;
width: 100%; width: 100%;
background: #f4f4f4; background: #f4f4f4;
} }
.container{
.container {
background: #f4f4f4; background: #f4f4f4;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
width: 100%; width: 100%;
} }
.profile-info{
.profile-info {
width: 100%; width: 100%;
height: 280rpx; height: 280rpx;
display: flex; display: flex;
...@@ -20,19 +22,19 @@ page{ ...@@ -20,19 +22,19 @@ page{
background: #333; background: #333;
} }
.profile-info .avatar{ .profile-info .avatar {
height: 148rpx; height: 148rpx;
width: 148rpx; width: 148rpx;
border-radius: 50%; border-radius: 50%;
} }
.profile-info .info{ .profile-info .info {
flex: 1; flex: 1;
height: 85rpx; height: 85rpx;
padding-left: 31.25rpx; padding-left: 31.25rpx;
} }
.profile-info .name{ .profile-info .name {
display: block; display: block;
height: 45rpx; height: 45rpx;
line-height: 45rpx; line-height: 45rpx;
...@@ -41,7 +43,7 @@ page{ ...@@ -41,7 +43,7 @@ page{
margin-bottom: 10rpx; margin-bottom: 10rpx;
} }
.profile-info .level{ .profile-info .level {
display: block; display: block;
height: 30rpx; height: 30rpx;
line-height: 30rpx; line-height: 30rpx;
...@@ -50,23 +52,23 @@ page{ ...@@ -50,23 +52,23 @@ page{
font-size: 30rpx; font-size: 30rpx;
} }
.user-menu{ .user-menu {
width: 100%; width: 100%;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
background: #fff; background: #fff;
} }
.user-menu .item{ .user-menu .item {
float: left; float: left;
width: 33.33333%; width: 33.33333%;
height: 187.5rpx; height: 187.5rpx;
border-right: 1px solid rgba(0,0,0,.15); border-right: 1px solid rgba(0, 0, 0, 0.15);
border-bottom: 1px solid rgba(0,0,0,.15); border-bottom: 1px solid rgba(0, 0, 0, 0.15);
text-align: center; text-align: center;
} }
.user-menu .item .a{ .user-menu .item .a {
display: flex; display: flex;
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -83,7 +85,7 @@ page{ ...@@ -83,7 +85,7 @@ page{
border-bottom: none; border-bottom: none;
} }
.user-menu .icon{ .user-menu .icon {
margin: 0 auto; margin: 0 auto;
display: block; display: block;
height: 52.803rpx; height: 52.803rpx;
...@@ -91,61 +93,69 @@ page{ ...@@ -91,61 +93,69 @@ page{
margin-bottom: 16rpx; margin-bottom: 16rpx;
} }
.user-menu .icon.order{ .user-menu .icon.order {
background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -437.5rpx no-repeat; background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -437.5rpx no-repeat;
background-size: 52.803rpx; background-size: 52.803rpx;
} }
.user-menu .icon.coupon{ .user-menu .icon.coupon {
background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -62.4997rpx no-repeat; background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -62.4997rpx no-repeat;
background-size: 52.803rpx; background-size: 52.803rpx;
} }
.user-menu .icon.collect{ .user-menu .icon.phone {
background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -62.4997rpx no-repeat; display: block;
height: 55rpx;
width: 55rpx;
background-size: 52.803rpx; background-size: 52.803rpx;
} }
.user-menu .icon.gift{ .user-menu .icon.gift {
background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -187.5rpx no-repeat; background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -187.5rpx no-repeat;
background-size: 52.803rpx; background-size: 52.803rpx;
} }
.user-menu .icon.address{ .user-menu .icon.address {
background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 0 no-repeat; background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 0 no-repeat;
background-size: 52.803rpx; background-size: 52.803rpx;
} }
.user-menu .icon.security{ .user-menu .icon.security {
background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -500rpx no-repeat; background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -500rpx no-repeat;
background-size: 52.803rpx; background-size: 52.803rpx;
} }
.user-menu .icon.kefu{ .user-menu .icon.kefu {
background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -312.5rpx no-repeat; background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -312.5rpx no-repeat;
background-size: 52.803rpx; background-size: 52.803rpx;
} }
.user-menu .icon.help{ .user-menu .icon.help {
background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -250rpx no-repeat; background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -250rpx no-repeat;
background-size: 52.803rpx; background-size: 52.803rpx;
} }
.user-menu .icon.about {
/* background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -62.4997rpx no-repeat; */
display: block;
height: 55rpx;
width: 55rpx;
background-size: 52.803rpx;
}
.user-menu .icon.feedback{ .user-menu .icon.feedback {
background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -125rpx no-repeat; background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -125rpx no-repeat;
background-size: 52.803rpx; background-size: 52.803rpx;
} }
.user-menu .txt {
.user-menu .txt{
display: block; display: block;
height: 24rpx; height: 24rpx;
width: 100%; width: 100%;
font-size: 24rpx; font-size: 24rpx;
color:#333; color: #333;
} }
.logout{ .logout {
margin-top: 50rpx; margin-top: 50rpx;
height: 101rpx; height: 101rpx;
width: 100%; width: 100%;
...@@ -155,3 +165,13 @@ page{ ...@@ -155,3 +165,13 @@ page{
color: #333; color: #333;
font-size: 30rpx; font-size: 30rpx;
} }
.about {
width: 100%;
background: url(https://cdn.it120.cc/images/weappshop/arrow-right.png) no-repeat 750rpx center;
background-size: 16rpx auto, 750rpx auto;
margin: 20rpx 0;
height: 80rpx;
line-height: 80rpx;
padding-left: 100rpx;
}
Supports Markdown
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