From 20b97ec89a1422215ebebe4e25ccad533d29af79 Mon Sep 17 00:00:00 2001 From: Junling Bu Date: Fri, 16 Nov 2018 20:11:12 +0800 Subject: [PATCH] =?UTF-8?q?chore[litemall-wx]:=20=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=BC=80=E5=8F=91=E8=80=85=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E7=9A=84=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- litemall-wx/app.js | 8 +- litemall-wx/app.json | 168 +++--- litemall-wx/app.wxss | 22 +- litemall-wx/config/api.js | 134 ++--- .../pages/auth/accountLogin/accountLogin.js | 31 +- litemall-wx/pages/auth/login/login.js | 20 +- litemall-wx/pages/auth/login/login.wxml | 4 +- litemall-wx/pages/auth/register/register.js | 47 +- litemall-wx/pages/auth/register/register.wxml | 48 +- litemall-wx/pages/auth/register/register.wxss | 110 ++-- litemall-wx/pages/auth/reset/reset.js | 42 +- litemall-wx/pages/auth/reset/reset.wxss | 108 ++-- litemall-wx/pages/brand/brand.js | 19 +- litemall-wx/pages/brand/brand.wxml | 28 +- litemall-wx/pages/brand/brand.wxss | 80 +-- litemall-wx/pages/brandDetail/brandDetail.js | 24 +- .../pages/brandDetail/brandDetail.wxml | 44 +- .../pages/brandDetail/brandDetail.wxss | 113 ++-- litemall-wx/pages/cart/cart.js | 566 +++++++++--------- litemall-wx/pages/cart/cart.wxml | 2 +- litemall-wx/pages/cart/cart.wxss | 4 +- litemall-wx/pages/catalog/catalog.js | 158 ++--- litemall-wx/pages/catalog/catalog.wxml | 30 +- litemall-wx/pages/catalog/catalog.wxss | 4 +- litemall-wx/pages/category/category.js | 34 +- litemall-wx/pages/category/category.wxml | 40 +- litemall-wx/pages/category/category.wxss | 121 ++-- litemall-wx/pages/checkout/checkout.js | 326 +++++----- litemall-wx/pages/checkout/checkout.wxml | 154 ++--- litemall-wx/pages/checkout/checkout.wxss | 456 +++++++------- litemall-wx/pages/comment/comment.js | 35 +- litemall-wx/pages/comment/comment.wxml | 14 +- litemall-wx/pages/comment/comment.wxss | 231 ++++--- litemall-wx/pages/commentPost/commentPost.js | 51 +- litemall-wx/pages/goods/goods.wxml | 2 +- litemall-wx/pages/goods/goods.wxss | 5 +- .../groupon/grouponDetail/grouponDetail.js | 534 ++++++++--------- .../groupon/grouponDetail/grouponDetail.json | 2 +- .../groupon/grouponDetail/grouponDetail.wxml | 162 ++--- .../groupon/grouponDetail/grouponDetail.wxss | 450 +++++++------- .../pages/groupon/grouponList/grouponList.js | 27 +- .../groupon/grouponList/grouponList.wxss | 151 ++--- .../pages/groupon/myGroupon/myGroupon.js | 88 +-- .../pages/groupon/myGroupon/myGroupon.json | 8 +- .../pages/groupon/myGroupon/myGroupon.wxml | 94 +-- .../pages/groupon/myGroupon/myGroupon.wxss | 248 ++++---- litemall-wx/pages/hotGoods/hotGoods.js | 43 +- litemall-wx/pages/hotGoods/hotGoods.wxml | 2 +- litemall-wx/pages/hotGoods/hotGoods.wxss | 202 +++---- litemall-wx/pages/index/index.js | 196 +++--- litemall-wx/pages/index/index.json | 8 +- litemall-wx/pages/index/index.wxml | 288 ++++----- litemall-wx/pages/index/index.wxss | 121 ++-- litemall-wx/pages/newGoods/newGoods.js | 29 +- litemall-wx/pages/newGoods/newGoods.wxml | 2 +- litemall-wx/pages/newGoods/newGoods.wxss | 202 +++---- litemall-wx/pages/payResult/payResult.js | 18 +- litemall-wx/pages/payResult/payResult.wxml | 3 +- litemall-wx/pages/payResult/payResult.wxss | 4 +- litemall-wx/pages/search/search.js | 22 +- litemall-wx/pages/search/search.wxml | 74 +-- litemall-wx/pages/search/search.wxss | 435 +++++++------- litemall-wx/pages/topic/topic.js | 157 ++--- litemall-wx/pages/topic/topic.wxml | 28 +- .../pages/topicComment/topicComment.js | 37 +- .../pages/topicComment/topicComment.wxml | 4 - .../pages/topicComment/topicComment.wxss | 159 +++-- .../topicCommentPost/topicCommentPost.js | 54 +- .../topicCommentPost/topicCommentPost.wxml | 4 - litemall-wx/pages/topicDetail/topicDetail.js | 33 +- .../pages/topicDetail/topicDetail.wxml | 54 +- .../pages/topicDetail/topicDetail.wxss | 368 ++++++------ litemall-wx/pages/ucenter/address/address.js | 22 +- .../pages/ucenter/address/address.wxml | 40 +- .../pages/ucenter/address/address.wxss | 138 +++-- .../pages/ucenter/addressAdd/addressAdd.js | 88 ++- .../pages/ucenter/addressAdd/addressAdd.wxml | 56 +- .../pages/ucenter/addressAdd/addressAdd.wxss | 159 +++-- litemall-wx/pages/ucenter/collect/collect.js | 39 +- .../pages/ucenter/collect/collect.wxml | 4 +- .../pages/ucenter/collect/collect.wxss | 82 ++- litemall-wx/pages/ucenter/coupon/coupon.js | 13 +- litemall-wx/pages/ucenter/coupon/coupon.wxml | 2 +- litemall-wx/pages/ucenter/coupon/coupon.wxss | 72 ++- .../pages/ucenter/feedback/feedback.js | 14 +- .../pages/ucenter/feedback/feedback.wxss | 44 +- .../pages/ucenter/footprint/footprint.js | 36 +- .../pages/ucenter/footprint/footprint.wxml | 6 +- .../pages/ucenter/footprint/footprint.wxss | 87 ++- litemall-wx/pages/ucenter/index/index.json | 6 +- litemall-wx/pages/ucenter/index/index.wxml | 10 +- litemall-wx/pages/ucenter/index/index.wxss | 41 +- litemall-wx/pages/ucenter/order/order.js | 105 ++-- litemall-wx/pages/ucenter/order/order.wxml | 86 +-- litemall-wx/pages/ucenter/order/order.wxss | 254 ++++---- .../pages/ucenter/orderDetail/orderDetail.js | 132 ++-- .../ucenter/orderDetail/orderDetail.wxml | 144 ++--- .../ucenter/orderDetail/orderDetail.wxss | 446 +++++++------- litemall-wx/project.config.json | 488 +++++++-------- litemall-wx/utils/check.js | 2 +- litemall-wx/utils/user.js | 21 +- litemall-wx/utils/util.js | 10 +- 102 files changed, 5154 insertions(+), 5087 deletions(-) diff --git a/litemall-wx/app.js b/litemall-wx/app.js index 20f09bcd..1fb78e95 100644 --- a/litemall-wx/app.js +++ b/litemall-wx/app.js @@ -3,13 +3,13 @@ var api = require('./config/api.js'); var user = require('./utils/user.js'); App({ - onLaunch: function () { + onLaunch: function() { const updateManager = wx.getUpdateManager(); - wx.getUpdateManager().onUpdateReady(function () { + wx.getUpdateManager().onUpdateReady(function() { wx.showModal({ title: '更新提示', content: '新版本已经准备好，是否重启应用？', - success: function (res) { + success: function(res) { if (res.confirm) { // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启 updateManager.applyUpdate() @@ -18,7 +18,7 @@ App({ }) }) }, - onShow: function (options) { + onShow: function(options) { user.checkLogin().then(res => { this.globalData.hasLogin = true; }).catch(() => { diff --git a/litemall-wx/app.json b/litemall-wx/app.json index 113eb763..074dcbb2 100644 --- a/litemall-wx/app.json +++ b/litemall-wx/app.json @@ -1,86 +1,86 @@ { - "pages": [ - "pages/index/index", - "pages/catalog/catalog", - "pages/newGoods/newGoods", - "pages/hotGoods/hotGoods", - "pages/ucenter/index/index", - "pages/ucenter/address/address", - "pages/ucenter/addressAdd/addressAdd", - "pages/ucenter/feedback/feedback", - "pages/ucenter/footprint/footprint", - "pages/ucenter/order/order", - "pages/ucenter/orderDetail/orderDetail", - "pages/ucenter/coupon/coupon", - "pages/ucenter/collect/collect", - "pages/auth/login/login", - "pages/auth/accountLogin/accountLogin", - "pages/auth/register/register", - "pages/auth/reset/reset", - "pages/payResult/payResult", - "pages/comment/comment", - "pages/commentPost/commentPost", - "pages/topic/topic", - "pages/topicComment/topicComment", - "pages/topicDetail/topicDetail", - "pages/topicCommentPost/topicCommentPost", - "pages/brand/brand", - "pages/brandDetail/brandDetail", - "pages/search/search", - "pages/category/category", - "pages/cart/cart", - "pages/checkout/checkout", - "pages/goods/goods", - "pages/about/about", - "pages/groupon/myGroupon/myGroupon", - "pages/groupon/grouponDetail/grouponDetail", - "pages/groupon/grouponList/grouponList" - ], - "window": { - "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTitleText": "litemall小程序商城", - "enablePullDownRefresh": true, - "navigationBarTextStyle": "black", - "backgroundColor": "#FFFFFF", - "backgroundTextStyle": "dark" - }, - "tabBar": { - "backgroundColor": "#fafafa", - "borderStyle": "white", - "selectedColor": "#AB956D", - "color": "#666", - "list": [ - { - "pagePath": "pages/index/index", - "iconPath": "static/images/home.png", - "selectedIconPath": "static/images/home@selected.png", - "text": "首页" - }, - { - "pagePath": "pages/catalog/catalog", - "iconPath": "static/images/category.png", - "selectedIconPath": "static/images/category@selected.png", - "text": "分类" - }, - { - "pagePath": "pages/cart/cart", - "iconPath": "static/images/cart.png", - "selectedIconPath": "static/images/cart@selected.png", - "text": "购物车" - }, - { - "pagePath": "pages/ucenter/index/index", - "iconPath": "static/images/my.png", - "selectedIconPath": "static/images/my@selected.png", - "text": "个人" - } - ] - }, - "networkTimeout": { - "request": 10000, - "connectSocket": 10000, - "uploadFile": 10000, - "downloadFile": 10000 - }, - "debug": true + "pages": [ + "pages/index/index", + "pages/catalog/catalog", + "pages/newGoods/newGoods", + "pages/hotGoods/hotGoods", + "pages/ucenter/index/index", + "pages/ucenter/address/address", + "pages/ucenter/addressAdd/addressAdd", + "pages/ucenter/feedback/feedback", + "pages/ucenter/footprint/footprint", + "pages/ucenter/order/order", + "pages/ucenter/orderDetail/orderDetail", + "pages/ucenter/coupon/coupon", + "pages/ucenter/collect/collect", + "pages/auth/login/login", + "pages/auth/accountLogin/accountLogin", + "pages/auth/register/register", + "pages/auth/reset/reset", + "pages/payResult/payResult", + "pages/comment/comment", + "pages/commentPost/commentPost", + "pages/topic/topic", + "pages/topicComment/topicComment", + "pages/topicDetail/topicDetail", + "pages/topicCommentPost/topicCommentPost", + "pages/brand/brand", + "pages/brandDetail/brandDetail", + "pages/search/search", + "pages/category/category", + "pages/cart/cart", + "pages/checkout/checkout", + "pages/goods/goods", + "pages/about/about", + "pages/groupon/myGroupon/myGroupon", + "pages/groupon/grouponDetail/grouponDetail", + "pages/groupon/grouponList/grouponList" + ], + "window": { + "navigationBarBackgroundColor": "#FFFFFF", + "navigationBarTitleText": "litemall小程序商城", + "enablePullDownRefresh": true, + "navigationBarTextStyle": "black", + "backgroundColor": "#FFFFFF", + "backgroundTextStyle": "dark" + }, + "tabBar": { + "backgroundColor": "#fafafa", + "borderStyle": "white", + "selectedColor": "#AB956D", + "color": "#666", + "list": [ + { + "pagePath": "pages/index/index", + "iconPath": "static/images/home.png", + "selectedIconPath": "static/images/home@selected.png", + "text": "首页" + }, + { + "pagePath": "pages/catalog/catalog", + "iconPath": "static/images/category.png", + "selectedIconPath": "static/images/category@selected.png", + "text": "分类" + }, + { + "pagePath": "pages/cart/cart", + "iconPath": "static/images/cart.png", + "selectedIconPath": "static/images/cart@selected.png", + "text": "购物车" + }, + { + "pagePath": "pages/ucenter/index/index", + "iconPath": "static/images/my.png", + "selectedIconPath": "static/images/my@selected.png", + "text": "个人" + } + ] + }, + "networkTimeout": { + "request": 10000, + "connectSocket": 10000, + "uploadFile": 10000, + "downloadFile": 10000 + }, + "debug": true } \ No newline at end of file diff --git a/litemall-wx/app.wxss b/litemall-wx/app.wxss index 3d70f731..fc5ee9e4 100644 --- a/litemall-wx/app.wxss +++ b/litemall-wx/app.wxss @@ -1,19 +1,19 @@ /**app.wxss**/ + .container { box-sizing: border-box; background-color: #f4f4f4; - font-family: PingFangSC-Light,helvetica,'Heiti SC'; -} - -view,image,text,navigator{ - box-sizing: border-box; - padding:0; - margin:0; - + font-family: PingFangSC-Light, helvetica, 'Heiti SC'; } -view,text{ - font-family: PingFangSC-Light,helvetica,'Heiti SC'; +view, image, text, navigator { + box-sizing: border-box; + padding: 0; + margin: 0; +} + +view, text { + font-family: PingFangSC-Light, helvetica, 'Heiti SC'; font-size: 29rpx; color: #333; -} \ No newline at end of file +} diff --git a/litemall-wx/config/api.js b/litemall-wx/config/api.js index 2b852716..cc56d889 100644 --- a/litemall-wx/config/api.js +++ b/litemall-wx/config/api.js @@ -1,6 +1,6 @@ // 以下是业务服务器API地址 // 本机开发时使用 - var WxApiRoot = 'http://localhost:8080/wx/'; +var WxApiRoot = 'http://localhost:8080/wx/'; // 局域网测试使用 // var WxApiRoot = 'http://192.168.0.101:8080/wx/'; // 云平台部署时使用 @@ -9,87 +9,87 @@ // var WxApiRoot = 'https://www.menethil.com.cn/wx/'; module.exports = { - IndexUrl: WxApiRoot + 'home/index', //首页数据接口 - CatalogList: WxApiRoot + 'catalog/index', //分类目录全部分类数据接口 - CatalogCurrent: WxApiRoot + 'catalog/current', //分类目录当前分类数据接口 + IndexUrl: WxApiRoot + 'home/index', //首页数据接口 + CatalogList: WxApiRoot + 'catalog/index', //分类目录全部分类数据接口 + CatalogCurrent: WxApiRoot + 'catalog/current', //分类目录当前分类数据接口 - AuthLoginByWeixin: WxApiRoot + 'auth/login_by_weixin', //微信登录 - AuthLoginByAccount: WxApiRoot + 'auth/login', //账号登录 - AuthLogout: WxApiRoot + 'auth/logout', //账号登出 - AuthRegister: WxApiRoot + 'auth/register', //账号注册 - AuthReset: WxApiRoot + 'auth/reset', //账号密码重置 - AuthRegisterCaptcha: WxApiRoot + 'auth/regCaptcha', //验证码 - AuthBindPhone: WxApiRoot + 'auth/bindPhone', //绑定微信手机号 + AuthLoginByWeixin: WxApiRoot + 'auth/login_by_weixin', //微信登录 + AuthLoginByAccount: WxApiRoot + 'auth/login', //账号登录 + AuthLogout: WxApiRoot + 'auth/logout', //账号登出 + AuthRegister: WxApiRoot + 'auth/register', //账号注册 + AuthReset: WxApiRoot + 'auth/reset', //账号密码重置 + AuthRegisterCaptcha: WxApiRoot + 'auth/regCaptcha', //验证码 + AuthBindPhone: WxApiRoot + 'auth/bindPhone', //绑定微信手机号 - GoodsCount: WxApiRoot + 'goods/count', //统计商品总数 - GoodsList: WxApiRoot + 'goods/list', //获得商品列表 - GoodsCategory: WxApiRoot + 'goods/category', //获得分类数据 - GoodsDetail: WxApiRoot + 'goods/detail', //获得商品的详情 - GoodsNew: WxApiRoot + 'goods/new', //新品 - GoodsHot: WxApiRoot + 'goods/hot', //热门 - GoodsRelated: WxApiRoot + 'goods/related', //商品详情页的关联商品（大家都在看） + GoodsCount: WxApiRoot + 'goods/count', //统计商品总数 + GoodsList: WxApiRoot + 'goods/list', //获得商品列表 + GoodsCategory: WxApiRoot + 'goods/category', //获得分类数据 + GoodsDetail: WxApiRoot + 'goods/detail', //获得商品的详情 + GoodsNew: WxApiRoot + 'goods/new', //新品 + GoodsHot: WxApiRoot + 'goods/hot', //热门 + GoodsRelated: WxApiRoot + 'goods/related', //商品详情页的关联商品（大家都在看） - BrandList: WxApiRoot + 'brand/list', //品牌列表 - BrandDetail: WxApiRoot + 'brand/detail', //品牌详情 + BrandList: WxApiRoot + 'brand/list', //品牌列表 + BrandDetail: WxApiRoot + 'brand/detail', //品牌详情 - CartList: WxApiRoot + 'cart/index', //获取购物车的数据 - CartAdd: WxApiRoot + 'cart/add', // 添加商品到购物车 - CartFastAdd: WxApiRoot + 'cart/fastadd', // 立即购买商品 - CartUpdate: WxApiRoot + 'cart/update', // 更新购物车的商品 - CartDelete: WxApiRoot + 'cart/delete', // 删除购物车的商品 - CartChecked: WxApiRoot + 'cart/checked', // 选择或取消选择商品 - CartGoodsCount: WxApiRoot + 'cart/goodscount', // 获取购物车商品件数 - CartCheckout: WxApiRoot + 'cart/checkout', // 下单前信息确认 + CartList: WxApiRoot + 'cart/index', //获取购物车的数据 + CartAdd: WxApiRoot + 'cart/add', // 添加商品到购物车 + CartFastAdd: WxApiRoot + 'cart/fastadd', // 立即购买商品 + CartUpdate: WxApiRoot + 'cart/update', // 更新购物车的商品 + CartDelete: WxApiRoot + 'cart/delete', // 删除购物车的商品 + CartChecked: WxApiRoot + 'cart/checked', // 选择或取消选择商品 + CartGoodsCount: WxApiRoot + 'cart/goodscount', // 获取购物车商品件数 + CartCheckout: WxApiRoot + 'cart/checkout', // 下单前信息确认 - CollectList: WxApiRoot + 'collect/list', //收藏列表 - CollectAddOrDelete: WxApiRoot + 'collect/addordelete', //添加或取消收藏 + CollectList: WxApiRoot + 'collect/list', //收藏列表 + CollectAddOrDelete: WxApiRoot + 'collect/addordelete', //添加或取消收藏 - CommentList: WxApiRoot + 'comment/list', //评论列表 - CommentCount: WxApiRoot + 'comment/count', //评论总数 - CommentPost: WxApiRoot + 'comment/post', //发表评论 + CommentList: WxApiRoot + 'comment/list', //评论列表 + CommentCount: WxApiRoot + 'comment/count', //评论总数 + CommentPost: WxApiRoot + 'comment/post', //发表评论 - TopicList: WxApiRoot + 'topic/list', //专题列表 - TopicDetail: WxApiRoot + 'topic/detail', //专题详情 - TopicRelated: WxApiRoot + 'topic/related', //相关专题 + TopicList: WxApiRoot + 'topic/list', //专题列表 + TopicDetail: WxApiRoot + 'topic/detail', //专题详情 + TopicRelated: WxApiRoot + 'topic/related', //相关专题 - SearchIndex: WxApiRoot + 'search/index', //搜索关键字 - SearchResult: WxApiRoot + 'search/result', //搜索结果 - SearchHelper: WxApiRoot + 'search/helper', //搜索帮助 - SearchClearHistory: WxApiRoot + 'search/clearhistory', //搜索历史清楚 + SearchIndex: WxApiRoot + 'search/index', //搜索关键字 + SearchResult: WxApiRoot + 'search/result', //搜索结果 + SearchHelper: WxApiRoot + 'search/helper', //搜索帮助 + SearchClearHistory: WxApiRoot + 'search/clearhistory', //搜索历史清楚 - AddressList: WxApiRoot + 'address/list', //收货地址列表 - AddressDetail: WxApiRoot + 'address/detail', //收货地址详情 - AddressSave: WxApiRoot + 'address/save', //保存收货地址 - AddressDelete: WxApiRoot + 'address/delete', //保存收货地址 + AddressList: WxApiRoot + 'address/list', //收货地址列表 + AddressDetail: WxApiRoot + 'address/detail', //收货地址详情 + AddressSave: WxApiRoot + 'address/save', //保存收货地址 + AddressDelete: WxApiRoot + 'address/delete', //保存收货地址 - ExpressQuery: WxApiRoot + 'express/query', //物流查询 + ExpressQuery: WxApiRoot + 'express/query', //物流查询 - RegionList: WxApiRoot + 'region/list', //获取区域列表 + RegionList: WxApiRoot + 'region/list', //获取区域列表 - OrderSubmit: WxApiRoot + 'order/submit', // 提交订单 - OrderPrepay: WxApiRoot + 'order/prepay', // 订单的预支付会话 - OrderList: WxApiRoot + 'order/list', //订单列表 - OrderDetail: WxApiRoot + 'order/detail', //订单详情 - OrderCancel: WxApiRoot + 'order/cancel', //取消订单 - OrderRefund: WxApiRoot + 'order/refund', //退款取消订单 - OrderDelete: WxApiRoot + 'order/delete', //删除订单 - OrderConfirm: WxApiRoot + 'order/confirm', //确认收货 - OrderGoods: WxApiRoot + 'order/goods', // 代评价商品信息 - OrderComment: WxApiRoot + 'order/comment', // 评价订单商品信息 + OrderSubmit: WxApiRoot + 'order/submit', // 提交订单 + OrderPrepay: WxApiRoot + 'order/prepay', // 订单的预支付会话 + OrderList: WxApiRoot + 'order/list', //订单列表 + OrderDetail: WxApiRoot + 'order/detail', //订单详情 + OrderCancel: WxApiRoot + 'order/cancel', //取消订单 + OrderRefund: WxApiRoot + 'order/refund', //退款取消订单 + OrderDelete: WxApiRoot + 'order/delete', //删除订单 + OrderConfirm: WxApiRoot + 'order/confirm', //确认收货 + OrderGoods: WxApiRoot + 'order/goods', // 代评价商品信息 + OrderComment: WxApiRoot + 'order/comment', // 评价订单商品信息 - FeedbackAdd: WxApiRoot + 'feedback/submit', //添加反馈 - FootprintList: WxApiRoot + 'footprint/list', //足迹列表 - FootprintDelete: WxApiRoot + 'footprint/delete', //删除足迹 + FeedbackAdd: WxApiRoot + 'feedback/submit', //添加反馈 + FootprintList: WxApiRoot + 'footprint/list', //足迹列表 + FootprintDelete: WxApiRoot + 'footprint/delete', //删除足迹 - UserFormIdCreate: WxApiRoot + 'formid/create', //用户FromId，用于发送模版消息 + UserFormIdCreate: WxApiRoot + 'formid/create', //用户FromId，用于发送模版消息 - GroupOnList: WxApiRoot + 'groupon/list', //团购列表 - GroupOn: WxApiRoot + 'groupon/query', //团购API-查询 - GroupOnMy: WxApiRoot + 'groupon/my', //团购API-我的团购 - GroupOnDetail: WxApiRoot + 'groupon/detail', //团购API-详情 - GroupOnJoin: WxApiRoot + 'groupon/join', //团购API-详情 - StorageUpload: WxApiRoot + 'storage/upload', //图片上传, + GroupOnList: WxApiRoot + 'groupon/list', //团购列表 + GroupOn: WxApiRoot + 'groupon/query', //团购API-查询 + GroupOnMy: WxApiRoot + 'groupon/my', //团购API-我的团购 + GroupOnDetail: WxApiRoot + 'groupon/detail', //团购API-详情 + GroupOnJoin: WxApiRoot + 'groupon/join', //团购API-详情 + StorageUpload: WxApiRoot + 'storage/upload', //图片上传, - UserIndex: WxApiRoot + 'user/index', //个人页面用户相关信息 + UserIndex: WxApiRoot + 'user/index', //个人页面用户相关信息 }; \ No newline at end of file diff --git a/litemall-wx/pages/auth/accountLogin/accountLogin.js b/litemall-wx/pages/auth/accountLogin/accountLogin.js index 51c6154c..959f37e2 100644 --- a/litemall-wx/pages/auth/accountLogin/accountLogin.js +++ b/litemall-wx/pages/auth/accountLogin/accountLogin.js @@ -10,26 +10,26 @@ Page({ code: '', loginErrorCount: 0 }, - onLoad: function (options) { + onLoad: function(options) { // 页面初始化 options为页面跳转所带来的参数 // 页面渲染完成 }, - onReady: function () { + onReady: function() { }, - onShow: function () { + onShow: function() { // 页面显示 }, - onHide: function () { + onHide: function() { // 页面隐藏 }, - onUnload: function () { + onUnload: function() { // 页面关闭 }, - accountLogin: function () { + accountLogin: function() { var that = this; if (this.data.password.length < 1 || this.data.username.length < 1) { @@ -51,24 +51,23 @@ Page({ header: { 'content-type': 'application/json' }, - success: function (res) { - if (res.data.errno == 0){ + success: function(res) { + if (res.data.errno == 0) { that.setData({ loginErrorCount: 0 }); app.globalData.hasLogin = true; wx.setStorageSync('userInfo', res.data.data.userInfo); wx.setStorage({ - key:"token", + key: "token", data: res.data.data.token, - success: function(){ + success: function() { wx.switchTab({ url: '/pages/ucenter/index/index' }); } }); - } - else{ + } else { that.setData({ loginErrorCount: that.data.loginErrorCount + 1 }); @@ -78,25 +77,25 @@ Page({ } }); }, - bindUsernameInput: function (e) { + bindUsernameInput: function(e) { this.setData({ username: e.detail.value }); }, - bindPasswordInput: function (e) { + bindPasswordInput: function(e) { this.setData({ password: e.detail.value }); }, - bindCodeInput: function (e) { + bindCodeInput: function(e) { this.setData({ code: e.detail.value }); }, - clearInput: function (e) { + clearInput: function(e) { switch (e.currentTarget.id) { case 'clear-username': this.setData({ diff --git a/litemall-wx/pages/auth/login/login.js b/litemall-wx/pages/auth/login/login.js index 9567ecae..4a0796ed 100644 --- a/litemall-wx/pages/auth/login/login.js +++ b/litemall-wx/pages/auth/login/login.js @@ -4,27 +4,27 @@ var user = require('../../../utils/user.js'); var app = getApp(); Page({ - onLoad: function (options) { + onLoad: function(options) { // 页面初始化 options为页面跳转所带来的参数 // 页面渲染完成 }, - onReady: function () { + onReady: function() { }, - onShow: function () { + onShow: function() { // 页面显示 }, - onHide: function () { + onHide: function() { // 页面隐藏 }, - onUnload: function () { + onUnload: function() { // 页面关闭 }, - wxLogin: function (e) { - if (e.detail.userInfo == undefined){ + wxLogin: function(e) { + if (e.detail.userInfo == undefined) { app.globalData.hasLogin = false; util.showErrorToast('微信登录失败'); return; @@ -45,7 +45,9 @@ Page({ }); }, - accountLogin: function () { - wx.navigateTo({ url: "/pages/auth/accountLogin/accountLogin" }); + accountLogin: function() { + wx.navigateTo({ + url: "/pages/auth/accountLogin/accountLogin" + }); } }) \ No newline at end of file diff --git a/litemall-wx/pages/auth/login/login.wxml b/litemall-wx/pages/auth/login/login.wxml index 429ff36c..c2b604b0 100644 --- a/litemall-wx/pages/auth/login/login.wxml +++ b/litemall-wx/pages/auth/login/login.wxml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/litemall-wx/pages/auth/register/register.js b/litemall-wx/pages/auth/register/register.js index 37408bc7..54453db0 100644 --- a/litemall-wx/pages/auth/register/register.js +++ b/litemall-wx/pages/auth/register/register.js @@ -1,4 +1,3 @@ - var api = require('../../../config/api.js'); var check = require('../../../utils/check.js'); @@ -11,27 +10,27 @@ Page({ mobile: '', code: '' }, - onLoad: function (options) { + onLoad: function(options) { // 页面初始化 options为页面跳转所带来的参数 // 页面渲染完成 }, - onReady: function () { + onReady: function() { }, - onShow: function () { + onShow: function() { // 页面显示 }, - onHide: function () { + onHide: function() { // 页面隐藏 }, - onUnload: function () { + onUnload: function() { // 页面关闭 }, - sendCode: function () { + sendCode: function() { let that = this; if (this.data.mobile.length == 0) { @@ -61,15 +60,14 @@ Page({ header: { 'content-type': 'application/json' }, - success: function (res) { + success: function(res) { if (res.data.errno == 0) { wx.showModal({ title: '发送成功', content: '验证码已发送', showCancel: false }); - } - else { + } else { wx.showModal({ title: '错误信息', content: res.data.errmsg, @@ -79,7 +77,7 @@ Page({ } }); }, - requestRegister: function (wxCode) { + requestRegister: function(wxCode) { let that = this; wx.request({ url: api.AuthRegister, @@ -94,21 +92,20 @@ Page({ header: { 'content-type': 'application/json' }, - success: function (res) { + success: function(res) { if (res.data.errno == 0) { app.globalData.hasLogin = true; wx.setStorageSync('userInfo', res.data.data.userInfo); wx.setStorage({ key: "token", data: res.data.data.token, - success: function () { + success: function() { wx.switchTab({ url: '/pages/ucenter/index/index' }); } }); - } - else { + } else { wx.showModal({ title: '错误信息', content: res.data.errmsg, @@ -118,7 +115,7 @@ Page({ } }); }, - startRegister: function () { + startRegister: function() { var that = this; if (this.data.password.length < 6 || this.data.username.length < 6) { @@ -156,9 +153,9 @@ Page({ }); return false; } - + wx.login({ - success: function (res) { + success: function(res) { if (!res.code) { wx.showModal({ title: '错误信息', @@ -171,37 +168,37 @@ Page({ } }); }, - bindUsernameInput: function (e) { + bindUsernameInput: function(e) { this.setData({ username: e.detail.value }); }, - bindPasswordInput: function (e) { + bindPasswordInput: function(e) { this.setData({ password: e.detail.value }); }, - bindConfirmPasswordInput: function (e) { + bindConfirmPasswordInput: function(e) { this.setData({ confirmPassword: e.detail.value }); }, - bindMobileInput: function (e) { + bindMobileInput: function(e) { this.setData({ mobile: e.detail.value }); }, - bindCodeInput: function (e) { + bindCodeInput: function(e) { this.setData({ code: e.detail.value }); }, - clearInput: function (e) { + clearInput: function(e) { switch (e.currentTarget.id) { case 'clear-username': this.setData({ @@ -222,7 +219,7 @@ Page({ this.setData({ mobile: '' }); - break; + break; case 'clear-code': this.setData({ code: '' diff --git a/litemall-wx/pages/auth/register/register.wxml b/litemall-wx/pages/auth/register/register.wxml index 4db893fe..06964963 100644 --- a/litemall-wx/pages/auth/register/register.wxml +++ b/litemall-wx/pages/auth/register/register.wxml @@ -1,35 +1,35 @@ - + - - - - + + + + - - - - + + + + - - - - + + + + - + - - - - - - - 获取验证码 - - - + + + + + + 获取验证码 + + + + \ No newline at end of file diff --git a/litemall-wx/pages/auth/register/register.wxss b/litemall-wx/pages/auth/register/register.wxss index 965a125d..6878ce64 100644 --- a/litemall-wx/pages/auth/register/register.wxss +++ b/litemall-wx/pages/auth/register/register.wxss @@ -1,69 +1,69 @@ -.form-box{ - width: 100%; - height: auto; - overflow: hidden; - padding: 0 40rpx; - margin-top: 96rpx; - background: #fff; +.form-box { + width: 100%; + height: auto; + overflow: hidden; + padding: 0 40rpx; + margin-top: 96rpx; + background: #fff; } -.form-item{ - position: relative; - background: #fff; - height: 96rpx; - border-bottom: 1px solid #d9d9d9; +.form-item { + position: relative; + background: #fff; + height: 96rpx; + border-bottom: 1px solid #d9d9d9; } -.form-item .username, .form-item .password, .form-item .mobile, .form-item .code{ - position: absolute; - top: 26rpx; - left: 0; - display: block; - width: 100%; - height: 44rpx; - background: #fff; - color: #333; - font-size: 30rpx; +.form-item .username, .form-item .password, .form-item .mobile, .form-item .code { + position: absolute; + top: 26rpx; + left: 0; + display: block; + width: 100%; + height: 44rpx; + background: #fff; + color: #333; + font-size: 30rpx; } -.form-item-code{ - margin-top:32rpx; - height: auto; - overflow: hidden; - width: 100%; +.form-item-code { + margin-top: 32rpx; + height: auto; + overflow: hidden; + width: 100%; } -.form-item-code .form-item{ - float: left; - width: 350rpx; +.form-item-code .form-item { + float: left; + width: 350rpx; } -.form-item-code .code-btn{ - float: right; - padding: 20rpx 40rpx; - border: 1px solid #d9d9d9; - border-radius: 10rpx; - color: #fff; - background: green; +.form-item-code .code-btn { + float: right; + padding: 20rpx 40rpx; + border: 1px solid #d9d9d9; + border-radius: 10rpx; + color: #fff; + background: green; } -.form-item .clear{ - position: absolute; - top: 26rpx; - right: 18rpx; - z-index: 2; - display: block; - background: #fff; - height: 44rpx; - width: 44rpx; +.form-item .clear { + position: absolute; + top: 26rpx; + right: 18rpx; + z-index: 2; + display: block; + background: #fff; + height: 44rpx; + width: 44rpx; } -.register-btn{ - margin: 60rpx 0 40rpx 0; - height: 96rpx; - line-height: 96rpx; - color: #fff; - font-size: 30rpx; - width: 100%; - border-radius: 6rpx; -} \ No newline at end of file +.register-btn { + margin: 60rpx 0 40rpx 0; + height: 96rpx; + line-height: 96rpx; + color: #fff; + font-size: 30rpx; + width: 100%; + border-radius: 6rpx; +} diff --git a/litemall-wx/pages/auth/reset/reset.js b/litemall-wx/pages/auth/reset/reset.js index 775c3a41..3b821ee2 100644 --- a/litemall-wx/pages/auth/reset/reset.js +++ b/litemall-wx/pages/auth/reset/reset.js @@ -9,28 +9,28 @@ Page({ password: '', confirmPassword: '' }, - onLoad: function (options) { + onLoad: function(options) { // 页面初始化 options为页面跳转所带来的参数 // 页面渲染完成 - - }, - onReady: function () { }, - onShow: function () { + onReady: function() { + + }, + onShow: function() { // 页面显示 }, - onHide: function () { + onHide: function() { // 页面隐藏 }, - onUnload: function () { + onUnload: function() { // 页面关闭 }, - sendCode: function () { + sendCode: function() { let that = this; wx.request({ url: api.AuthRegisterCaptcha, @@ -41,15 +41,14 @@ Page({ header: { 'content-type': 'application/json' }, - success: function (res) { + success: function(res) { if (res.data.errno == 0) { wx.showModal({ title: '发送成功', content: '验证码已发送', showCancel: false }); - } - else { + } else { wx.showModal({ title: '错误信息', content: res.data.errmsg, @@ -59,7 +58,7 @@ Page({ } }); }, - startReset: function(){ + startReset: function() { var that = this; if (this.data.mobile.length == 0 || this.data.code.length == 0) { @@ -109,11 +108,10 @@ Page({ header: { 'content-type': 'application/json' }, - success: function (res) { + success: function(res) { if (res.data.errno == 0) { wx.navigateBack(); - } - else{ + } else { wx.showModal({ title: '密码重置失败', content: res.data.errmsg, @@ -123,32 +121,32 @@ Page({ } }); }, - bindPasswordInput: function (e) { + bindPasswordInput: function(e) { this.setData({ password: e.detail.value }); }, - bindConfirmPasswordInput: function (e) { + bindConfirmPasswordInput: function(e) { this.setData({ confirmPassword: e.detail.value }); }, - bindMobileInput: function (e) { + bindMobileInput: function(e) { this.setData({ mobile: e.detail.value }); }, - bindCodeInput: function(e){ - + bindCodeInput: function(e) { + this.setData({ code: e.detail.value }); }, - clearInput: function(e){ - switch (e.currentTarget.id){ + clearInput: function(e) { + switch (e.currentTarget.id) { case 'clear-password': this.setData({ password: '' diff --git a/litemall-wx/pages/auth/reset/reset.wxss b/litemall-wx/pages/auth/reset/reset.wxss index 94fca0b8..4f61be72 100644 --- a/litemall-wx/pages/auth/reset/reset.wxss +++ b/litemall-wx/pages/auth/reset/reset.wxss @@ -1,68 +1,68 @@ -.form-box{ - width: 100%; - height: auto; - overflow: hidden; - padding: 0 40rpx; - margin-top: 96rpx; - background: #fff; +.form-box { + width: 100%; + height: auto; + overflow: hidden; + padding: 0 40rpx; + margin-top: 96rpx; + background: #fff; } -.form-item{ - position: relative; - background: #fff; - height: 96rpx; - border-bottom: 1px solid #d9d9d9; +.form-item { + position: relative; + background: #fff; + height: 96rpx; + border-bottom: 1px solid #d9d9d9; } -.form-item .mobile, .form-item .password, .form-item .code{ - position: absolute; - top: 26rpx; - left: 0; - display: block; - width: 100%; - height: 44rpx; - background: #fff; - color: #333; - font-size: 30rpx; +.form-item .mobile, .form-item .password, .form-item .code { + position: absolute; + top: 26rpx; + left: 0; + display: block; + width: 100%; + height: 44rpx; + background: #fff; + color: #333; + font-size: 30rpx; } -.form-item-code{ - margin-top:32rpx; - height: auto; - overflow: hidden; - width: 100%; +.form-item-code { + margin-top: 32rpx; + height: auto; + overflow: hidden; + width: 100%; } -.form-item-code .form-item{ - float: left; - width: 350rpx; +.form-item-code .form-item { + float: left; + width: 350rpx; } -.form-item-code .code-btn{ - float: right; - padding: 20rpx 40rpx; - border: 1px solid #d9d9d9; - border-radius: 10rpx; +.form-item-code .code-btn { + float: right; + padding: 20rpx 40rpx; + border: 1px solid #d9d9d9; + border-radius: 10rpx; } -.form-item .clear{ - position: absolute; - top: 26rpx; - right: 18rpx; - z-index: 2; - display: block; - background: #fff; - height: 44rpx; - width: 44rpx; +.form-item .clear { + position: absolute; + top: 26rpx; + right: 18rpx; + z-index: 2; + display: block; + background: #fff; + height: 44rpx; + width: 44rpx; } -.reset-btn{ - margin: 60rpx 0 40rpx 0; - height: 96rpx; - line-height: 96rpx; - color: #fff; - font-size: 30rpx; - width: 100%; - background: #b4282d; - border-radius: 6rpx; -} \ No newline at end of file +.reset-btn { + margin: 60rpx 0 40rpx 0; + height: 96rpx; + line-height: 96rpx; + color: #fff; + font-size: 30rpx; + width: 100%; + background: #b4282d; + border-radius: 6rpx; +} diff --git a/litemall-wx/pages/brand/brand.js b/litemall-wx/pages/brand/brand.js index 4689c9d6..7e1920bf 100644 --- a/litemall-wx/pages/brand/brand.js +++ b/litemall-wx/pages/brand/brand.js @@ -8,16 +8,19 @@ Page({ size: 10, totalPages: 1 }, - onLoad: function (options) { + onLoad: function(options) { // 页面初始化 options为页面跳转所带来的参数 this.getBrandList(); }, - getBrandList: function () { + getBrandList: function() { wx.showLoading({ title: '加载中...', }); let that = this; - util.request(api.BrandList, { page: that.data.page, size: that.data.size }).then(function (res) { + util.request(api.BrandList, { + page: that.data.page, + size: that.data.size + }).then(function(res) { if (res.errno === 0) { that.setData({ brandList: that.data.brandList.concat(res.data.brandList), @@ -27,7 +30,7 @@ Page({ wx.hideLoading(); }); }, - onReachBottom (){ + onReachBottom() { if (this.data.totalPages > this.data.page) { this.setData({ page: this.data.page + 1 @@ -38,18 +41,18 @@ Page({ this.getBrandList(); }, - onReady: function () { + onReady: function() { }, - onShow: function () { + onShow: function() { // 页面显示 }, - onHide: function () { + onHide: function() { // 页面隐藏 }, - onUnload: function () { + onUnload: function() { // 页面关闭 } diff --git a/litemall-wx/pages/brand/brand.wxml b/litemall-wx/pages/brand/brand.wxml index 9cce1491..ef2e2b9a 100644 --- a/litemall-wx/pages/brand/brand.wxml +++ b/litemall-wx/pages/brand/brand.wxml @@ -1,16 +1,16 @@ - - - - - - - - {{item.name}} - | - {{item.floorPrice}}元起 - - - - + + + + + + + + {{item.name}} + | + {{item.floorPrice}}元起 + + + + \ No newline at end of file diff --git a/litemall-wx/pages/brand/brand.wxss b/litemall-wx/pages/brand/brand.wxss index 71de4d69..4fdc8c57 100644 --- a/litemall-wx/pages/brand/brand.wxss +++ b/litemall-wx/pages/brand/brand.wxss @@ -1,52 +1,52 @@ -.brand-list .item{ - display: block; - width: 750rpx; - height: 416rpx; - position: relative; - margin-bottom: 4rpx; +.brand-list .item { + display: block; + width: 750rpx; + height: 416rpx; + position: relative; + margin-bottom: 4rpx; } -.brand-list .item .img-bg{ - position: absolute; - left:0; - top:0; - z-index: 0; - width: 750rpx; - height: 417rpx; - overflow: hidden; +.brand-list .item .img-bg { + position: absolute; + left: 0; + top: 0; + z-index: 0; + width: 750rpx; + height: 417rpx; + overflow: hidden; } -.brand-list .item .img-bg image{ - width: 750rpx; - height: 416rpx; +.brand-list .item .img-bg image { + width: 750rpx; + height: 416rpx; } -.brand-list .item .txt-box{ - position: absolute; - left:0; - top:0; - display: table; - z-index: 0; - width: 750rpx; - height: 417rpx; +.brand-list .item .txt-box { + position: absolute; + left: 0; + top: 0; + display: table; + z-index: 0; + width: 750rpx; + height: 417rpx; } -.brand-list .item .line{ - display: table-cell; - vertical-align: middle; - text-align: center; - height: 63rpx; - line-height: 63rpx; +.brand-list .item .line { + display: table-cell; + vertical-align: middle; + text-align: center; + height: 63rpx; + line-height: 63rpx; } -.brand-list .item .line text{ - font-size: 35rpx; - font-weight: 700; - text-shadow: 1rpx 1rpx rgba(0,0,0,.32); - color: #fff; +.brand-list .item .line text { + font-size: 35rpx; + font-weight: 700; + text-shadow: 1rpx 1rpx rgba(0, 0, 0, 0.32); + color: #fff; } -.brand-list .item .line .s{ - padding: 0 10rpx; - font-size: 40rpx; -} \ No newline at end of file +.brand-list .item .line .s { + padding: 0 10rpx; + font-size: 40rpx; +} diff --git a/litemall-wx/pages/brandDetail/brandDetail.js b/litemall-wx/pages/brandDetail/brandDetail.js index 7881f67c..d8222ff7 100644 --- a/litemall-wx/pages/brandDetail/brandDetail.js +++ b/litemall-wx/pages/brandDetail/brandDetail.js @@ -12,7 +12,7 @@ Page({ page: 1, size: 100 }, - onLoad: function (options) { + onLoad: function(options) { // 页面初始化 options为页面跳转所带来的参数 var that = this; that.setData({ @@ -20,9 +20,11 @@ Page({ }); this.getBrand(); }, - getBrand: function () { + getBrand: function() { let that = this; - util.request(api.BrandDetail, { id: that.data.id }).then(function (res) { + util.request(api.BrandDetail, { + id: that.data.id + }).then(function(res) { if (res.errno === 0) { that.setData({ brand: res.data.brand @@ -35,8 +37,12 @@ Page({ getGoodsList() { var that = this; - util.request(api.GoodsList, { brandId: that.data.id, page: that.data.page, size: that.data.size}) - .then(function (res) { + util.request(api.GoodsList, { + brandId: that.data.id, + page: that.data.page, + size: that.data.size + }) + .then(function(res) { if (res.errno === 0) { that.setData({ goodsList: res.data.goodsList @@ -44,19 +50,19 @@ Page({ } }); }, - onReady: function () { + onReady: function() { // 页面渲染完成 }, - onShow: function () { + onShow: function() { // 页面显示 }, - onHide: function () { + onHide: function() { // 页面隐藏 }, - onUnload: function () { + onUnload: function() { // 页面关闭 } diff --git a/litemall-wx/pages/brandDetail/brandDetail.wxml b/litemall-wx/pages/brandDetail/brandDetail.wxml index ba2f0c7f..bf4e9ed4 100644 --- a/litemall-wx/pages/brandDetail/brandDetail.wxml +++ b/litemall-wx/pages/brandDetail/brandDetail.wxml @@ -1,28 +1,28 @@ - - - - - - {{brand.name}} - - - - - - {{brand.desc}} + + + + + + {{brand.name}} + + + + {{brand.desc}} + + - - - - - - {{iitem.name}} - ￥{{iitem.retailPrice}} - - - + + + + + + {{iitem.name}} + ￥{{iitem.retailPrice}} + + + \ No newline at end of file diff --git a/litemall-wx/pages/brandDetail/brandDetail.wxss b/litemall-wx/pages/brandDetail/brandDetail.wxss index cb82b455..3126093f 100644 --- a/litemall-wx/pages/brandDetail/brandDetail.wxss +++ b/litemall-wx/pages/brandDetail/brandDetail.wxss @@ -1,65 +1,66 @@ -page{ - background: #f4f4f4; -} -.brand-info .name{ - width: 100%; - height: 290rpx; - position: relative; +page { + background: #f4f4f4; } -.brand-info .img{ - position: absolute; - top:0; - left:0; - width: 100%; - height: 290rpx; +.brand-info .name { + width: 100%; + height: 290rpx; + position: relative; } -.brand-info .info-box{ - position: absolute; - top:0; - left:0; - width: 100%; - height: 290rpx; - text-align: center; - display: flex; - justify-content: center; - align-items: center; +.brand-info .img { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 290rpx; } -.brand-info .info{ - display: block; +.brand-info .info-box { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 290rpx; + text-align: center; + display: flex; + justify-content: center; + align-items: center; } -.brand-info .txt{ - display: block; - height: 37.5rpx; - font-size: 37.5rpx; - color: #fff; +.brand-info .info { + display: block; } -.brand-info .line{ - margin: 0 auto; - margin-top: 16rpx; - display: block; - height: 2rpx; - width: 145rpx; - background: #fff; +.brand-info .txt { + display: block; + height: 37.5rpx; + font-size: 37.5rpx; + color: #fff; } -.brand-info .desc{ - background: #fff; - width: 100%; - height: auto; - overflow: hidden; - padding: 41.5rpx 31.25rpx; - font-size: 30rpx; - color: #666; - line-height: 41.5rpx; - text-align: center; +.brand-info .line { + margin: 0 auto; + margin-top: 16rpx; + display: block; + height: 2rpx; + width: 145rpx; + background: #fff; } -.cate-item .b{ +.brand-info .desc { + background: #fff; + width: 100%; + height: auto; + overflow: hidden; + padding: 41.5rpx 31.25rpx; + font-size: 30rpx; + color: #666; + line-height: 41.5rpx; + text-align: center; +} + +.cate-item .b { width: 750rpx; height: auto; overflow: hidden; @@ -67,7 +68,7 @@ page{ margin-top: 20rpx; } -.cate-item .b .item{ +.cate-item .b .item { float: left; background: #fff; width: 375rpx; @@ -78,17 +79,17 @@ page{ text-align: center; } -.cate-item .b .item-b{ - border-right: 1rpx solid #f4f4f4; +.cate-item .b .item-b { + border-right: 1rpx solid #f4f4f4; } -.cate-item .item .img{ - margin-top: 10rpx; +.cate-item .item .img { + margin-top: 10rpx; width: 302rpx; height: 302rpx; } -.cate-item .item .name{ +.cate-item .item .name { display: block; width: 365.625rpx; height: 35rpx; @@ -100,11 +101,11 @@ page{ color: #333; } -.cate-item .item .price{ +.cate-item .item .price { display: block; width: 365.625rpx; height: 30rpx; text-align: center; font-size: 30rpx; color: #b4282d; -} \ No newline at end of file +} diff --git a/litemall-wx/pages/cart/cart.js b/litemall-wx/pages/cart/cart.js index a5270688..65552bce 100644 --- a/litemall-wx/pages/cart/cart.js +++ b/litemall-wx/pages/cart/cart.js @@ -5,299 +5,299 @@ var user = require('../../utils/user.js'); var app = getApp(); Page({ - data: { - cartGoods: [], - cartTotal: { - "goodsCount": 0, - "goodsAmount": 0.00, - "checkedGoodsCount": 0, - "checkedGoodsAmount": 0.00 + data: { + cartGoods: [], + cartTotal: { + "goodsCount": 0, + "goodsAmount": 0.00, + "checkedGoodsCount": 0, + "checkedGoodsAmount": 0.00 + }, + isEditCart: false, + checkedAllStatus: true, + editCartList: [], + hasLogin: false }, - isEditCart: false, - checkedAllStatus: true, - editCartList: [], - hasLogin: false - }, - onLoad: function(options) { - // 页面初始化 options为页面跳转所带来的参数 - }, - onReady: function() { - // 页面渲染完成 - }, - onPullDownRefresh() { - wx.showNavigationBarLoading() //在标题栏中显示加载 - this.getCartList(); - wx.hideNavigationBarLoading() //完成停止加载 - wx.stopPullDownRefresh() //停止下拉刷新 - }, - onShow: function() { - // 页面显示 - if (app.globalData.hasLogin) { - this.getCartList(); - } - - this.setData({ - hasLogin: app.globalData.hasLogin - }); - - }, - onHide: function() { - // 页面隐藏 - }, - onUnload: function() { - // 页面关闭 - }, - goLogin() { - wx.navigateTo({ - url: "/pages/auth/login/login" - }); - }, - getCartList: function() { - let that = this; - util.request(api.CartList).then(function(res) { - if (res.errno === 0) { - that.setData({ - cartGoods: res.data.cartList, - cartTotal: res.data.cartTotal - }); - - that.setData({ - checkedAllStatus: that.isCheckedAll() - }); - } - }); - }, - isCheckedAll: function() { - //判断购物车商品已全选 - return this.data.cartGoods.every(function(element, index, array) { - if (element.checked == true) { - return true; - } else { - return false; - } - }); - }, - doCheckedAll: function() { - let checkedAll = this.isCheckedAll() - this.setData({ - checkedAllStatus: this.isCheckedAll() - }); - }, - checkedItem: function(event) { - let itemIndex = event.target.dataset.itemIndex; - let that = this; - - let productIds = []; - productIds.push(that.data.cartGoods[itemIndex].productId); - if (!this.data.isEditCart) { - util.request(api.CartChecked, { - productIds: productIds, - isChecked: that.data.cartGoods[itemIndex].checked ? 0 : 1 - }, 'POST').then(function(res) { - if (res.errno === 0) { - that.setData({ - cartGoods: res.data.cartList, - cartTotal: res.data.cartTotal - }); + onLoad: function(options) { + // 页面初始化 options为页面跳转所带来的参数 + }, + onReady: function() { + // 页面渲染完成 + }, + onPullDownRefresh() { + wx.showNavigationBarLoading() //在标题栏中显示加载 + this.getCartList(); + wx.hideNavigationBarLoading() //完成停止加载 + wx.stopPullDownRefresh() //停止下拉刷新 + }, + onShow: function() { + // 页面显示 + if (app.globalData.hasLogin) { + this.getCartList(); } - that.setData({ - checkedAllStatus: that.isCheckedAll() + this.setData({ + hasLogin: app.globalData.hasLogin }); - }); - } else { - //编辑状态 - let tmpCartData = this.data.cartGoods.map(function(element, index, array) { - if (index == itemIndex) { - element.checked = !element.checked; + + }, + onHide: function() { + // 页面隐藏 + }, + onUnload: function() { + // 页面关闭 + }, + goLogin() { + wx.navigateTo({ + url: "/pages/auth/login/login" + }); + }, + getCartList: function() { + let that = this; + util.request(api.CartList).then(function(res) { + if (res.errno === 0) { + that.setData({ + cartGoods: res.data.cartList, + cartTotal: res.data.cartTotal + }); + + that.setData({ + checkedAllStatus: that.isCheckedAll() + }); + } + }); + }, + isCheckedAll: function() { + //判断购物车商品已全选 + return this.data.cartGoods.every(function(element, index, array) { + if (element.checked == true) { + return true; + } else { + return false; + } + }); + }, + doCheckedAll: function() { + let checkedAll = this.isCheckedAll() + this.setData({ + checkedAllStatus: this.isCheckedAll() + }); + }, + checkedItem: function(event) { + let itemIndex = event.target.dataset.itemIndex; + let that = this; + + let productIds = []; + productIds.push(that.data.cartGoods[itemIndex].productId); + if (!this.data.isEditCart) { + util.request(api.CartChecked, { + productIds: productIds, + isChecked: that.data.cartGoods[itemIndex].checked ? 0 : 1 + }, 'POST').then(function(res) { + if (res.errno === 0) { + that.setData({ + cartGoods: res.data.cartList, + cartTotal: res.data.cartTotal + }); + } + + that.setData({ + checkedAllStatus: that.isCheckedAll() + }); + }); + } else { + //编辑状态 + let tmpCartData = this.data.cartGoods.map(function(element, index, array) { + if (index == itemIndex) { + element.checked = !element.checked; + } + + return element; + }); + + that.setData({ + cartGoods: tmpCartData, + checkedAllStatus: that.isCheckedAll(), + 'cartTotal.checkedGoodsCount': that.getCheckedGoodsCount() + }); + } + }, + getCheckedGoodsCount: function() { + let checkedGoodsCount = 0; + this.data.cartGoods.forEach(function(v) { + if (v.checked === true) { + checkedGoodsCount += v.number; + } + }); + console.log(checkedGoodsCount); + return checkedGoodsCount; + }, + checkedAll: function() { + let that = this; + + if (!this.data.isEditCart) { + var productIds = this.data.cartGoods.map(function(v) { + return v.productId; + }); + util.request(api.CartChecked, { + productIds: productIds, + isChecked: that.isCheckedAll() ? 0 : 1 + }, 'POST').then(function(res) { + if (res.errno === 0) { + console.log(res.data); + that.setData({ + cartGoods: res.data.cartList, + cartTotal: res.data.cartTotal + }); + } + + that.setData({ + checkedAllStatus: that.isCheckedAll() + }); + }); + } else { + //编辑状态 + let checkedAllStatus = that.isCheckedAll(); + let tmpCartData = this.data.cartGoods.map(function(v) { + v.checked = !checkedAllStatus; + return v; + }); + + that.setData({ + cartGoods: tmpCartData, + checkedAllStatus: that.isCheckedAll(), + 'cartTotal.checkedGoodsCount': that.getCheckedGoodsCount() + }); } - return element; - }); - - that.setData({ - cartGoods: tmpCartData, - checkedAllStatus: that.isCheckedAll(), - 'cartTotal.checkedGoodsCount': that.getCheckedGoodsCount() - }); - } - }, - getCheckedGoodsCount: function() { - let checkedGoodsCount = 0; - this.data.cartGoods.forEach(function(v) { - if (v.checked === true) { - checkedGoodsCount += v.number; - } - }); - console.log(checkedGoodsCount); - return checkedGoodsCount; - }, - checkedAll: function() { - let that = this; - - if (!this.data.isEditCart) { - var productIds = this.data.cartGoods.map(function(v) { - return v.productId; - }); - util.request(api.CartChecked, { - productIds: productIds, - isChecked: that.isCheckedAll() ? 0 : 1 - }, 'POST').then(function(res) { - if (res.errno === 0) { - console.log(res.data); - that.setData({ - cartGoods: res.data.cartList, - cartTotal: res.data.cartTotal - }); + }, + editCart: function() { + var that = this; + if (this.data.isEditCart) { + this.getCartList(); + this.setData({ + isEditCart: !this.data.isEditCart + }); + } else { + //编辑状态 + let tmpCartList = this.data.cartGoods.map(function(v) { + v.checked = false; + return v; + }); + this.setData({ + editCartList: this.data.cartGoods, + cartGoods: tmpCartList, + isEditCart: !this.data.isEditCart, + checkedAllStatus: that.isCheckedAll(), + 'cartTotal.checkedGoodsCount': that.getCheckedGoodsCount() + }); } - that.setData({ - checkedAllStatus: that.isCheckedAll() - }); - }); - } else { - //编辑状态 - let checkedAllStatus = that.isCheckedAll(); - let tmpCartData = this.data.cartGoods.map(function(v) { - v.checked = !checkedAllStatus; - return v; - }); + }, + updateCart: function(productId, goodsId, number, id) { + let that = this; - that.setData({ - cartGoods: tmpCartData, - checkedAllStatus: that.isCheckedAll(), - 'cartTotal.checkedGoodsCount': that.getCheckedGoodsCount() - }); - } - - }, - editCart: function() { - var that = this; - if (this.data.isEditCart) { - this.getCartList(); - this.setData({ - isEditCart: !this.data.isEditCart - }); - } else { - //编辑状态 - let tmpCartList = this.data.cartGoods.map(function(v) { - v.checked = false; - return v; - }); - this.setData({ - editCartList: this.data.cartGoods, - cartGoods: tmpCartList, - isEditCart: !this.data.isEditCart, - checkedAllStatus: that.isCheckedAll(), - 'cartTotal.checkedGoodsCount': that.getCheckedGoodsCount() - }); - } - - }, - updateCart: function(productId, goodsId, number, id) { - let that = this; - - util.request(api.CartUpdate, { - productId: productId, - goodsId: goodsId, - number: number, - id: id - }, 'POST').then(function(res) { - that.setData({ - checkedAllStatus: that.isCheckedAll() - }); - }); - - }, - cutNumber: function(event) { - - let itemIndex = event.target.dataset.itemIndex; - let cartItem = this.data.cartGoods[itemIndex]; - let number = (cartItem.number - 1 > 1) ? cartItem.number - 1 : 1; - cartItem.number = number; - this.setData({ - cartGoods: this.data.cartGoods - }); - this.updateCart(cartItem.productId, cartItem.goodsId, number, cartItem.id); - }, - addNumber: function(event) { - let itemIndex = event.target.dataset.itemIndex; - let cartItem = this.data.cartGoods[itemIndex]; - let number = cartItem.number + 1; - cartItem.number = number; - this.setData({ - cartGoods: this.data.cartGoods - }); - this.updateCart(cartItem.productId, cartItem.goodsId, number, cartItem.id); - - }, - checkoutOrder: function() { - //获取已选择的商品 - let that = this; - - var checkedGoods = this.data.cartGoods.filter(function(element, index, array) { - if (element.checked == true) { - return true; - } else { - return false; - } - }); - - if (checkedGoods.length <= 0) { - return false; - } - - // storage中设置了cartId，则是购物车购买 - try { - wx.setStorageSync('cartId', 0); - wx.navigateTo({ - url: '/pages/checkout/checkout' - }) - } catch (e) {} - - }, - deleteCart: function() { - //获取已选择的商品 - let that = this; - - let productIds = this.data.cartGoods.filter(function(element, index, array) { - if (element.checked == true) { - return true; - } else { - return false; - } - }); - - if (productIds.length <= 0) { - return false; - } - - productIds = productIds.map(function(element, index, array) { - if (element.checked == true) { - return element.productId; - } - }); - - - util.request(api.CartDelete, { - productIds: productIds - }, 'POST').then(function(res) { - if (res.errno === 0) { - console.log(res.data); - let cartList = res.data.cartList.map(v => { - v.checked = false; - return v; + util.request(api.CartUpdate, { + productId: productId, + goodsId: goodsId, + number: number, + id: id + }, 'POST').then(function(res) { + that.setData({ + checkedAllStatus: that.isCheckedAll() + }); }); - that.setData({ - cartGoods: cartList, - cartTotal: res.data.cartTotal - }); - } + }, + cutNumber: function(event) { - that.setData({ - checkedAllStatus: that.isCheckedAll() - }); - }); - } + let itemIndex = event.target.dataset.itemIndex; + let cartItem = this.data.cartGoods[itemIndex]; + let number = (cartItem.number - 1 > 1) ? cartItem.number - 1 : 1; + cartItem.number = number; + this.setData({ + cartGoods: this.data.cartGoods + }); + this.updateCart(cartItem.productId, cartItem.goodsId, number, cartItem.id); + }, + addNumber: function(event) { + let itemIndex = event.target.dataset.itemIndex; + let cartItem = this.data.cartGoods[itemIndex]; + let number = cartItem.number + 1; + cartItem.number = number; + this.setData({ + cartGoods: this.data.cartGoods + }); + this.updateCart(cartItem.productId, cartItem.goodsId, number, cartItem.id); + + }, + checkoutOrder: function() { + //获取已选择的商品 + let that = this; + + var checkedGoods = this.data.cartGoods.filter(function(element, index, array) { + if (element.checked == true) { + return true; + } else { + return false; + } + }); + + if (checkedGoods.length <= 0) { + return false; + } + + // storage中设置了cartId，则是购物车购买 + try { + wx.setStorageSync('cartId', 0); + wx.navigateTo({ + url: '/pages/checkout/checkout' + }) + } catch (e) {} + + }, + deleteCart: function() { + //获取已选择的商品 + let that = this; + + let productIds = this.data.cartGoods.filter(function(element, index, array) { + if (element.checked == true) { + return true; + } else { + return false; + } + }); + + if (productIds.length <= 0) { + return false; + } + + productIds = productIds.map(function(element, index, array) { + if (element.checked == true) { + return element.productId; + } + }); + + + util.request(api.CartDelete, { + productIds: productIds + }, 'POST').then(function(res) { + if (res.errno === 0) { + console.log(res.data); + let cartList = res.data.cartList.map(v => { + v.checked = false; + return v; + }); + + that.setData({ + cartGoods: cartList, + cartTotal: res.data.cartTotal + }); + } + + that.setData({ + checkedAllStatus: that.isCheckedAll() + }); + }); + } }) \ No newline at end of file diff --git a/litemall-wx/pages/cart/cart.wxml b/litemall-wx/pages/cart/cart.wxml index ad0c9fa2..3cbaf0a6 100644 --- a/litemall-wx/pages/cart/cart.wxml +++ b/litemall-wx/pages/cart/cart.wxml @@ -3,7 +3,7 @@ 还没有登录 - + - {{item.name}} + {{item.name}} - \ No newline at end of file diff --git a/litemall-wx/pages/catalog/catalog.wxss b/litemall-wx/pages/catalog/catalog.wxss index 887de2b9..0c8a2f1a 100644 --- a/litemall-wx/pages/catalog/catalog.wxss +++ b/litemall-wx/pages/catalog/catalog.wxss @@ -68,9 +68,9 @@ page { } .catalog .nav .item.active { - color: #AB956D; + color: #ab956d; font-size: 36rpx; - border-left: 6rpx solid #AB956D; + border-left: 6rpx solid #ab956d; } .catalog .cate { diff --git a/litemall-wx/pages/category/category.js b/litemall-wx/pages/category/category.js index 2aa3196e..2a157ad5 100644 --- a/litemall-wx/pages/category/category.js +++ b/litemall-wx/pages/category/category.js @@ -13,7 +13,7 @@ Page({ page: 1, size: 100 }, - onLoad: function (options) { + onLoad: function(options) { // 页面初始化 options为页面跳转所带来的参数 var that = this; if (options.id) { @@ -23,7 +23,7 @@ Page({ } wx.getSystemInfo({ - success: function (res) { + success: function(res) { that.setData({ scrollHeight: res.windowHeight }); @@ -34,10 +34,12 @@ Page({ this.getCategoryInfo(); }, - getCategoryInfo: function () { + getCategoryInfo: function() { let that = this; - util.request(api.GoodsCategory, { id: this.data.id }) - .then(function (res) { + util.request(api.GoodsCategory, { + id: this.data.id + }) + .then(function(res) { if (res.errno == 0) { that.setData({ @@ -75,33 +77,37 @@ Page({ } else { //显示错误信息 } - + }); }, - onReady: function () { + onReady: function() { // 页面渲染完成 }, - onShow: function () { + onShow: function() { // 页面显示 console.log(1); }, - onHide: function () { + onHide: function() { // 页面隐藏 }, - getGoodsList: function () { + getGoodsList: function() { var that = this; - util.request(api.GoodsList, {categoryId: that.data.id, page: that.data.page, size: that.data.size}) - .then(function (res) { + util.request(api.GoodsList, { + categoryId: that.data.id, + page: that.data.page, + size: that.data.size + }) + .then(function(res) { that.setData({ goodsList: res.data.goodsList, }); }); }, - onUnload: function () { + onUnload: function() { // 页面关闭 }, - switchCate: function (event) { + switchCate: function(event) { if (this.data.id == event.currentTarget.dataset.id) { return false; } diff --git a/litemall-wx/pages/category/category.wxml b/litemall-wx/pages/category/category.wxml index b0f6d18f..4ee8b88f 100644 --- a/litemall-wx/pages/category/category.wxml +++ b/litemall-wx/pages/category/category.wxml @@ -1,25 +1,25 @@ - - - - {{item.name}} - - - - + + + + {{item.name}} + + + + - - {{currentCategory.name}} - {{currentCategory.frontName}} - - - - - {{iitem.name}} - ￥{{iitem.retailPrice}} - - + + {{currentCategory.name}} + {{currentCategory.frontName}} + + + + + {{iitem.name}} + ￥{{iitem.retailPrice}} + + - + \ No newline at end of file diff --git a/litemall-wx/pages/category/category.wxss b/litemall-wx/pages/category/category.wxss index afa9c2e8..8a31dbda 100644 --- a/litemall-wx/pages/category/category.wxss +++ b/litemall-wx/pages/category/category.wxss @@ -1,81 +1,82 @@ -.container{ - background: #f9f9f9; -} -.cate-nav{ - position: fixed; - left:0; - top:0; - z-index: 1000; +.container { + background: #f9f9f9; } -.cate-nav-body{ - height: 84rpx; - white-space: nowrap; - background: #fff; - border-top: 1px solid rgba(0,0,0,.15); - overflow: hidden; +.cate-nav { + position: fixed; + left: 0; + top: 0; + z-index: 1000; } -.cate-nav .item{ - display: inline-block; - height: 84rpx; - min-width: 130rpx; - padding: 0 15rpx; +.cate-nav-body { + height: 84rpx; + white-space: nowrap; + background: #fff; + border-top: 1px solid rgba(0, 0, 0, 0.15); + overflow: hidden; } -.cate-nav .item .name{ - display: block; - height: 84rpx; - padding: 0 20rpx; - line-height: 84rpx; - color: #333; - font-size: 30rpx; - width: auto; +.cate-nav .item { + display: inline-block; + height: 84rpx; + min-width: 130rpx; + padding: 0 15rpx; } -.cate-nav .item.active .name{ - color: #AB956D; - border-bottom: 2px solid #AB956D; +.cate-nav .item .name { + display: block; + height: 84rpx; + padding: 0 20rpx; + line-height: 84rpx; + color: #333; + font-size: 30rpx; + width: auto; } -.cate-item{ - margin-top: 94rpx; - height: auto; - overflow: hidden; +.cate-nav .item.active .name { + color: #ab956d; + border-bottom: 2px solid #ab956d; } -.cate-item .h{ - height: 145rpx; - width: 750rpx; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; +.cate-item { + margin-top: 94rpx; + height: auto; + overflow: hidden; } -.cate-item .h .name{ - display: block; - height: 35rpx; - margin-bottom: 18rpx; - font-size: 30rpx; - color: #333; +.cate-item .h { + height: 145rpx; + width: 750rpx; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; } -.cate-item .h .desc{ - display: block; - height: 24rpx; - font-size: 24rpx; - color: #999; +.cate-item .h .name { + display: block; + height: 35rpx; + margin-bottom: 18rpx; + font-size: 30rpx; + color: #333; } -.cate-item .b{ +.cate-item .h .desc { + display: block; + height: 24rpx; + font-size: 24rpx; + color: #999; +} + +.cate-item .b { width: 750rpx; padding: 0 6.25rpx; height: auto; overflow: hidden; } -.cate-item .b .item{ +.cate-item .b .item { float: left; background: #fff; width: 365rpx; @@ -86,16 +87,16 @@ text-align: center; } -.cate-item .b .item-b{ +.cate-item .b .item-b { margin-left: 6.25rpx; } -.cate-item .item .img{ +.cate-item .item .img { width: 302rpx; height: 302rpx; } -.cate-item .item .name{ +.cate-item .item .name { display: block; width: 365.625rpx; height: 35rpx; @@ -107,11 +108,11 @@ color: #333; } -.cate-item .item .price{ +.cate-item .item .price { display: block; width: 365.625rpx; height: 30rpx; text-align: center; font-size: 30rpx; - color: #AB956D; -} \ No newline at end of file + color: #ab956d; +} diff --git a/litemall-wx/pages/checkout/checkout.js b/litemall-wx/pages/checkout/checkout.js index 8acab84f..1715cdab 100644 --- a/litemall-wx/pages/checkout/checkout.js +++ b/litemall-wx/pages/checkout/checkout.js @@ -10,174 +10,174 @@ Page({ checkedCoupon: [], couponList: [], goodsTotalPrice: 0.00, //商品总价 - freightPrice: 0.00, //快递费 - couponPrice: 0.00, //优惠券的价格 - grouponPrice: 0.00, //团购优惠价格 - orderTotalPrice: 0.00, //订单总价 - actualPrice: 0.00, //实际需要支付的总价 + freightPrice: 0.00, //快递费 + couponPrice: 0.00, //优惠券的价格 + grouponPrice: 0.00, //团购优惠价格 + orderTotalPrice: 0.00, //订单总价 + actualPrice: 0.00, //实际需要支付的总价 cartId: 0, addressId: 0, - couponId: 0, - message: '', - grouponLinkId: 0, //参与的团购，如果是发起则为0 - grouponRulesId: 0 //团购规则ID - }, - onLoad: function(options) { - // 页面初始化 options为页面跳转所带来的参数 - }, + couponId: 0, + message: '', + grouponLinkId: 0, //参与的团购，如果是发起则为0 + grouponRulesId: 0 //团购规则ID + }, + onLoad: function(options) { + // 页面初始化 options为页面跳转所带来的参数 + }, - //获取checkou信息 - getCheckoutInfo: function() { - let that = this; - util.request(api.CartCheckout, { - cartId: that.data.cartId, - addressId: that.data.addressId, - couponId: that.data.couponId, - grouponRulesId: that.data.grouponRulesId - }).then(function(res) { - if (res.errno === 0) { - that.setData({ - checkedGoodsList: res.data.checkedGoodsList, - checkedAddress: res.data.checkedAddress, - actualPrice: res.data.actualPrice, - checkedCoupon: res.data.checkedCoupon, - couponPrice: res.data.couponPrice, - grouponPrice: res.data.grouponPrice, - freightPrice: res.data.freightPrice, - goodsTotalPrice: res.data.goodsTotalPrice, - orderTotalPrice: res.data.orderTotalPrice, - addressId: res.data.addressId, - couponId: res.data.couponId, - grouponRulesId: res.data.grouponRulesId, - }); - } - wx.hideLoading(); - }); - }, - selectAddress() { - wx.navigateTo({ - url: '/pages/ucenter/address/address', - }) - }, - bindMessageInput: function (e) { - this.setData({ - message: e.detail.value - }); - }, - onReady: function() { - // 页面渲染完成 - - }, - onShow: function() { - // 页面显示 - wx.showLoading({ - title: '加载中...', - }); - try { - var cartId = wx.getStorageSync('cartId'); - if (cartId) { - this.setData({ - 'cartId': cartId - }); - } - - var addressId = wx.getStorageSync('addressId'); - if (addressId) { - this.setData({ - 'addressId': addressId - }); - } - - var couponId = wx.getStorageSync('couponId'); - if (couponId) { - this.setData({ - 'couponId': couponId - }); - } - - var grouponRulesId = wx.getStorageSync('grouponRulesId'); - if (grouponRulesId) { - this.setData({ - 'grouponRulesId': grouponRulesId - }); - } - - var grouponLinkId = wx.getStorageSync('grouponLinkId'); - if (grouponLinkId) { - this.setData({ - 'grouponLinkId': grouponLinkId - }); - } - } catch (e) { - // Do something when catch error - console.log(e); - } - - this.getCheckoutInfo(); - }, - onHide: function() { - // 页面隐藏 - - }, - onUnload: function() { - // 页面关闭 - - }, - submitOrder: function() { - if (this.data.addressId <= 0) { - util.showErrorToast('请选择收货地址'); - return false; - } - util.request(api.OrderSubmit, { - cartId: this.data.cartId, - addressId: this.data.addressId, - couponId: this.data.couponId, - message: this.data.message, - grouponRulesId: this.data.grouponRulesId, - grouponLinkId: this.data.grouponLinkId - }, 'POST').then(res => { - if (res.errno === 0) { - const orderId = res.data.orderId; - util.request(api.OrderPrepay, { - orderId: orderId - }, 'POST').then(function(res) { - if (res.errno === 0) { - const payParam = res.data; - console.log("支付过程开始"); - wx.requestPayment({ - 'timeStamp': payParam.timeStamp, - 'nonceStr': payParam.nonceStr, - 'package': payParam.packageValue, - 'signType': payParam.signType, - 'paySign': payParam.paySign, - 'success': function(res) { - console.log("支付过程成功"); - wx.redirectTo({ - url: '/pages/payResult/payResult?status=1&orderId=' + orderId + //获取checkou信息 + getCheckoutInfo: function() { + let that = this; + util.request(api.CartCheckout, { + cartId: that.data.cartId, + addressId: that.data.addressId, + couponId: that.data.couponId, + grouponRulesId: that.data.grouponRulesId + }).then(function(res) { + if (res.errno === 0) { + that.setData({ + checkedGoodsList: res.data.checkedGoodsList, + checkedAddress: res.data.checkedAddress, + actualPrice: res.data.actualPrice, + checkedCoupon: res.data.checkedCoupon, + couponPrice: res.data.couponPrice, + grouponPrice: res.data.grouponPrice, + freightPrice: res.data.freightPrice, + goodsTotalPrice: res.data.goodsTotalPrice, + orderTotalPrice: res.data.orderTotalPrice, + addressId: res.data.addressId, + couponId: res.data.couponId, + grouponRulesId: res.data.grouponRulesId, }); - }, - 'fail': function(res) { - console.log("支付过程失败"); - wx.redirectTo({ - url: '/pages/payResult/payResult?status=0&orderId=' + orderId - }); - }, - 'complete': function(res) { - console.log("支付过程结束") - } - }); - } else { - wx.redirectTo({ - url: '/pages/payResult/payResult?status=0&orderId=' + orderId - }); - } + } + wx.hideLoading(); }); + }, + selectAddress() { + wx.navigateTo({ + url: '/pages/ucenter/address/address', + }) + }, + bindMessageInput: function(e) { + this.setData({ + message: e.detail.value + }); + }, + onReady: function() { + // 页面渲染完成 - } else { - wx.redirectTo({ - url: '/pages/payResult/payResult?status=0&orderId=' + orderId + }, + onShow: function() { + // 页面显示 + wx.showLoading({ + title: '加载中...', }); - } - }); - } + try { + var cartId = wx.getStorageSync('cartId'); + if (cartId) { + this.setData({ + 'cartId': cartId + }); + } + + var addressId = wx.getStorageSync('addressId'); + if (addressId) { + this.setData({ + 'addressId': addressId + }); + } + + var couponId = wx.getStorageSync('couponId'); + if (couponId) { + this.setData({ + 'couponId': couponId + }); + } + + var grouponRulesId = wx.getStorageSync('grouponRulesId'); + if (grouponRulesId) { + this.setData({ + 'grouponRulesId': grouponRulesId + }); + } + + var grouponLinkId = wx.getStorageSync('grouponLinkId'); + if (grouponLinkId) { + this.setData({ + 'grouponLinkId': grouponLinkId + }); + } + } catch (e) { + // Do something when catch error + console.log(e); + } + + this.getCheckoutInfo(); + }, + onHide: function() { + // 页面隐藏 + + }, + onUnload: function() { + // 页面关闭 + + }, + submitOrder: function() { + if (this.data.addressId <= 0) { + util.showErrorToast('请选择收货地址'); + return false; + } + util.request(api.OrderSubmit, { + cartId: this.data.cartId, + addressId: this.data.addressId, + couponId: this.data.couponId, + message: this.data.message, + grouponRulesId: this.data.grouponRulesId, + grouponLinkId: this.data.grouponLinkId + }, 'POST').then(res => { + if (res.errno === 0) { + const orderId = res.data.orderId; + util.request(api.OrderPrepay, { + orderId: orderId + }, 'POST').then(function(res) { + if (res.errno === 0) { + const payParam = res.data; + console.log("支付过程开始"); + wx.requestPayment({ + 'timeStamp': payParam.timeStamp, + 'nonceStr': payParam.nonceStr, + 'package': payParam.packageValue, + 'signType': payParam.signType, + 'paySign': payParam.paySign, + 'success': function(res) { + console.log("支付过程成功"); + wx.redirectTo({ + url: '/pages/payResult/payResult?status=1&orderId=' + orderId + }); + }, + 'fail': function(res) { + console.log("支付过程失败"); + wx.redirectTo({ + url: '/pages/payResult/payResult?status=0&orderId=' + orderId + }); + }, + 'complete': function(res) { + console.log("支付过程结束") + } + }); + } else { + wx.redirectTo({ + url: '/pages/payResult/payResult?status=0&orderId=' + orderId + }); + } + }); + + } else { + wx.redirectTo({ + url: '/pages/payResult/payResult?status=0&orderId=' + orderId + }); + } + }); + } }); \ No newline at end of file diff --git a/litemall-wx/pages/checkout/checkout.wxml b/litemall-wx/pages/checkout/checkout.wxml index 60fef79b..98dff556 100644 --- a/litemall-wx/pages/checkout/checkout.wxml +++ b/litemall-wx/pages/checkout/checkout.wxml @@ -1,89 +1,89 @@ - - - - {{checkedAddress.name}} - 默认 - - - {{checkedAddress.mobile}} - {{checkedAddress.address}} - - - - - - - - 还没有收货地址，去添加 - - - - - + + + + {{checkedAddress.name}} + 默认 + + + {{checkedAddress.mobile}} + {{checkedAddress.address}} + + + + + + + 还没有收货地址，去添加 + + + + + + - - - - 请选择优惠券 - {{couponList.length}}张 - - - - - + + + + 请选择优惠券 + {{couponList.length}}张 + + + + + - - - + + + - - - - 商品合计 - - - ￥{{goodsTotalPrice}}元 - - - - - 运费 - - - ￥{{freightPrice}}元 - - - - - 优惠券 - - - -￥{{couponPrice}}元 - - + + + + 商品合计 + + + ￥{{goodsTotalPrice}}元 + + + + 运费 + + + ￥{{freightPrice}}元 + + + + + 优惠券 + + + -￥{{couponPrice}}元 + + + - - - - - - - - {{item.goodsName}} - x{{item.number}} - - {{item.specifications}} - ￥{{item.price}} - + + + + + + + + {{item.goodsName}} + x{{item.number}} + {{item.specifications}} + ￥{{item.price}} + + - - 实付：￥{{actualPrice}} - 去付款 - + + 实付：￥{{actualPrice}} + 去付款 + \ No newline at end of file diff --git a/litemall-wx/pages/checkout/checkout.wxss b/litemall-wx/pages/checkout/checkout.wxss index 9687e18b..bc6dc30b 100644 --- a/litemall-wx/pages/checkout/checkout.wxss +++ b/litemall-wx/pages/checkout/checkout.wxss @@ -1,313 +1,311 @@ -page{ - height: 100%; - background: #f4f4f4; +page { + height: 100%; + background: #f4f4f4; } -.address-box{ - width: 100%; - height: 166.55rpx; - background: url('http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/address-bg-bd30f2bfeb.png') 0 0 repeat-x; - background-size: 62.5rpx 10.5rpx; - margin-bottom: 20rpx; - padding-top: 10.5rpx; +.address-box { + width: 100%; + height: 166.55rpx; + background: url('http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/address-bg-bd30f2bfeb.png') 0 0 repeat-x; + background-size: 62.5rpx 10.5rpx; + margin-bottom: 20rpx; + padding-top: 10.5rpx; } -.address-item{ - display: flex; - height: 155.55rpx; - background: #fff; - padding: 41.6rpx 0 41.6rpx 31.25rpx; +.address-item { + display: flex; + height: 155.55rpx; + background: #fff; + padding: 41.6rpx 0 41.6rpx 31.25rpx; } -.address-item.address-empty{ +.address-item.address-empty { line-height: 75rpx; text-align: center; } -.address-box .l{ - width: 125rpx; - height: 100%; +.address-box .l { + width: 125rpx; + height: 100%; } -.address-box .l .name{ - margin-left: 6.25rpx; - margin-top: -7.25rpx; - display: block; - width: 125rpx; - height: 43rpx; - line-height: 43rpx; - font-size: 30rpx; - color: #333; - margin-bottom: 5rpx; - +.address-box .l .name { + margin-left: 6.25rpx; + margin-top: -7.25rpx; + display: block; + width: 125rpx; + height: 43rpx; + line-height: 43rpx; + font-size: 30rpx; + color: #333; + margin-bottom: 5rpx; } -.address-box .l .default{ - margin-left: 6.25rpx; - display: block; - width: 62rpx; - height: 33rpx; - border-radius: 5rpx; - border: 1px solid #b4282d; - font-size: 20.5rpx; - text-align: center; - line-height: 29rpx; - color: #b4282d; +.address-box .l .default { + margin-left: 6.25rpx; + display: block; + width: 62rpx; + height: 33rpx; + border-radius: 5rpx; + border: 1px solid #b4282d; + font-size: 20.5rpx; + text-align: center; + line-height: 29rpx; + color: #b4282d; } -.address-box .m{ - flex: 1; - height: 72.25rpx; - color: #999; +.address-box .m { + flex: 1; + height: 72.25rpx; + color: #999; } -.address-box .mobile{ - display: block; - height: 29rpx; - line-height: 29rpx; - margin-bottom: 6.25rpx; - font-size: 30rpx; - color:#333; +.address-box .mobile { + display: block; + height: 29rpx; + line-height: 29rpx; + margin-bottom: 6.25rpx; + font-size: 30rpx; + color: #333; } -.address-box .address{ - display: block; - height: 37.5rpx; - line-height: 37.5rpx; - font-size: 25rpx; - color:#666; +.address-box .address { + display: block; + height: 37.5rpx; + line-height: 37.5rpx; + font-size: 25rpx; + color: #666; } -.address-box .r{ - width: 77rpx; - height: 77rpx; - display: flex; - justify-content: center; - align-items: center; +.address-box .r { + width: 77rpx; + height: 77rpx; + display: flex; + justify-content: center; + align-items: center; } -.address-box .r image{ - width: 52.078rpx; - height: 52.078rpx; +.address-box .r image { + width: 52.078rpx; + height: 52.078rpx; } -.coupon-box{ - width: 100%; - height: auto; - overflow: hidden; - background: #fff; +.coupon-box { + width: 100%; + height: auto; + overflow: hidden; + background: #fff; } -.coupon-box .coupon-item{ - width: 100%; - height: 108.3rpx; - overflow: hidden; - background: #fff; - display: flex; - padding-left: 31.25rpx; +.coupon-box .coupon-item { + width: 100%; + height: 108.3rpx; + overflow: hidden; + background: #fff; + display: flex; + padding-left: 31.25rpx; } -.coupon-box .l{ - flex: 1; - height: 43rpx; - line-height: 43rpx; - padding-top: 35rpx; +.coupon-box .l { + flex: 1; + height: 43rpx; + line-height: 43rpx; + padding-top: 35rpx; } -.coupon-box .l .name{ - float: left; - font-size: 30rpx; - color: #666; +.coupon-box .l .name { + float: left; + font-size: 30rpx; + color: #666; } -.coupon-box .l .txt{ - float: right; - font-size: 30rpx; - color: #666; +.coupon-box .l .txt { + float: right; + font-size: 30rpx; + color: #666; } -.coupon-box .r{ - margin-top: 15.5rpx; - width: 77rpx; - height: 77rpx; - display: flex; - justify-content: center; - align-items: center; +.coupon-box .r { + margin-top: 15.5rpx; + width: 77rpx; + height: 77rpx; + display: flex; + justify-content: center; + align-items: center; } -.coupon-box .r image{ - width: 52.078rpx; - height: 52.078rpx; +.coupon-box .r image { + width: 52.078rpx; + height: 52.078rpx; } -.message-box{ - margin-top: 20rpx; - width: 100%; - height: auto; - overflow: hidden; - background: #fff; +.message-box { + margin-top: 20rpx; + width: 100%; + height: auto; + overflow: hidden; + background: #fff; } -.message-box .message-item{ - height: 52.078rpx; - overflow: hidden; - background: #fff; - display: flex; - margin-left: 31.25rpx; - padding-right: 31.25rpx; - padding-top: 26rpx; +.message-box .message-item { + height: 52.078rpx; + overflow: hidden; + background: #fff; + display: flex; + margin-left: 31.25rpx; + padding-right: 31.25rpx; + padding-top: 26rpx; } -.order-box{ - margin-top: 20rpx; - width: 100%; - height: auto; - overflow: hidden; - background: #fff; +.order-box { + margin-top: 20rpx; + width: 100%; + height: auto; + overflow: hidden; + background: #fff; } -.order-box .order-item{ - height: 104.3rpx; - overflow: hidden; - background: #fff; - display: flex; - margin-left: 31.25rpx; - padding-right: 31.25rpx; - padding-top: 26rpx; - border-bottom: 1px solid #d9d9d9; +.order-box .order-item { + height: 104.3rpx; + overflow: hidden; + background: #fff; + display: flex; + margin-left: 31.25rpx; + padding-right: 31.25rpx; + padding-top: 26rpx; + border-bottom: 1px solid #d9d9d9; } -.order-box .order-item .l{ - float: left; - height: 52rpx; - width: 50%; - line-height: 52rpx; - overflow: hidden; +.order-box .order-item .l { + float: left; + height: 52rpx; + width: 50%; + line-height: 52rpx; + overflow: hidden; } -.order-box .order-item .r{ - float: right; - text-align: right; - width: 50%; - height: 52rpx; - line-height: 52rpx; - overflow: hidden; +.order-box .order-item .r { + float: right; + text-align: right; + width: 50%; + height: 52rpx; + line-height: 52rpx; + overflow: hidden; } -.order-box .order-item.no-border{ - border-bottom: none; +.order-box .order-item.no-border { + border-bottom: none; } -.goods-items{ - margin-top: 20rpx; - width: 100%; - height: auto; - overflow: hidden; - background: #fff; - padding-left: 31.25rpx; - margin-bottom: 120rpx; +.goods-items { + margin-top: 20rpx; + width: 100%; + height: auto; + overflow: hidden; + background: #fff; + padding-left: 31.25rpx; + margin-bottom: 120rpx; } -.goods-items .item{ - height: 192rpx; - padding-right: 31.25rpx; - display: flex; - align-items: center; - border-bottom: 1px solid rgba(0,0,0,0.15); +.goods-items .item { + height: 192rpx; + padding-right: 31.25rpx; + display: flex; + align-items: center; + border-bottom: 1px solid rgba(0, 0, 0, 0.15); } -.goods-items .item.no-border{ - border-bottom: none; +.goods-items .item.no-border { + border-bottom: none; } - -.goods-items .item:last-child{ - border-bottom: none; +.goods-items .item:last-child { + border-bottom: none; } -.goods-items .img{ - height: 145.83rpx; - width: 145.83rpx; - background-color: #f4f4f4; - margin-right: 20rpx; +.goods-items .img { + height: 145.83rpx; + width: 145.83rpx; + background-color: #f4f4f4; + margin-right: 20rpx; } -.goods-items .img image{ - height: 145.83rpx; - width: 145.83rpx; +.goods-items .img image { + height: 145.83rpx; + width: 145.83rpx; } -.goods-items .info{ - flex: 1; - height: 145.83rpx; - padding-top: 5rpx; +.goods-items .info { + flex: 1; + height: 145.83rpx; + padding-top: 5rpx; } -.goods-items .t{ - height: 33rpx; - line-height: 33rpx; - margin-bottom: 10rpx; - overflow: hidden; - font-size: 30rpx; - color: #333; +.goods-items .t { + height: 33rpx; + line-height: 33rpx; + margin-bottom: 10rpx; + overflow: hidden; + font-size: 30rpx; + color: #333; } -.goods-items .t .name{ - display: block; - float: left; +.goods-items .t .name { + display: block; + float: left; } -.goods-items .t .number{ - display: block; - float: right; - text-align: right; +.goods-items .t .number { + display: block; + float: right; + text-align: right; } .goods-items .m { - height: 29rpx; - overflow: hidden; - line-height: 29rpx; - margin-bottom: 25rpx; - font-size: 25rpx; - color: #666; + height: 29rpx; + overflow: hidden; + line-height: 29rpx; + margin-bottom: 25rpx; + font-size: 25rpx; + color: #666; } .goods-items .b { - height: 41rpx; - overflow: hidden; - line-height: 41rpx; - font-size: 30rpx; - color: #333; + height: 41rpx; + overflow: hidden; + line-height: 41rpx; + font-size: 30rpx; + color: #333; } -.order-total{ - position: fixed; - left:0; - bottom: 0; - height: 100rpx; - width: 100%; - display: flex; +.order-total { + position: fixed; + left: 0; + bottom: 0; + height: 100rpx; + width: 100%; + display: flex; } -.order-total .l{ - flex: 1; - height: 100rpx; - line-height: 100rpx; - color: #b4282d; - background: #fff; - font-size: 33rpx; - padding-left: 31.25rpx; - border-top: 1rpx solid rgba(0,0,0,0.2); - border-bottom: 1rpx solid rgba(0,0,0,0.2); +.order-total .l { + flex: 1; + height: 100rpx; + line-height: 100rpx; + color: #b4282d; + background: #fff; + font-size: 33rpx; + padding-left: 31.25rpx; + border-top: 1rpx solid rgba(0, 0, 0, 0.2); + border-bottom: 1rpx solid rgba(0, 0, 0, 0.2); } -.order-total .r{ - width: 233rpx; - height: 100rpx; - background: #b4282d; - border: 1px solid #b4282d; - line-height: 100rpx; - text-align: center; - color: #fff; - font-size: 30rpx; -} \ No newline at end of file +.order-total .r { + width: 233rpx; + height: 100rpx; + background: #b4282d; + border: 1px solid #b4282d; + line-height: 100rpx; + text-align: center; + color: #fff; + font-size: 30rpx; +} diff --git a/litemall-wx/pages/comment/comment.js b/litemall-wx/pages/comment/comment.js index a0f2d019..688eb4f2 100644 --- a/litemall-wx/pages/comment/comment.js +++ b/litemall-wx/pages/comment/comment.js @@ -16,9 +16,12 @@ Page({ picPage: 1, size: 20 }, - getCommentCount: function () { + getCommentCount: function() { let that = this; - util.request(api.CommentCount, { valueId: that.data.valueId, type: that.data.type}).then(function (res) { + util.request(api.CommentCount, { + valueId: that.data.valueId, + type: that.data.type + }).then(function(res) { if (res.errno === 0) { that.setData({ allCount: res.data.allCount, @@ -27,15 +30,15 @@ Page({ } }); }, - getCommentList: function(){ + getCommentList: function() { let that = this; - util.request(api.CommentList, { - valueId: that.data.valueId, + util.request(api.CommentList, { + valueId: that.data.valueId, type: that.data.type, size: that.data.size, page: (that.data.showType == 0 ? that.data.allPage : that.data.picPage), - showType: that.data.showType - }).then(function (res) { + showType: that.data.showType + }).then(function(res) { if (res.errno === 0) { if (that.data.showType == 0) { @@ -54,7 +57,7 @@ Page({ } }); }, - onLoad: function (options) { + onLoad: function(options) { // 页面初始化 options为页面跳转所带来的参数 this.setData({ type: options.type, @@ -63,23 +66,23 @@ Page({ this.getCommentCount(); this.getCommentList(); }, - onReady: function () { + onReady: function() { // 页面渲染完成 }, - onShow: function () { + onShow: function() { // 页面显示 }, - onHide: function () { + onHide: function() { // 页面隐藏 }, - onUnload: function () { + onUnload: function() { // 页面关闭 }, - switchTab: function () { + switchTab: function() { let that = this; if (that.data.showType == 0) { that.setData({ @@ -98,16 +101,16 @@ Page({ } this.getCommentList(); }, - onReachBottom: function(){ + onReachBottom: function() { console.log('onPullDownRefresh'); - if ( this.data.showType == 0) { + if (this.data.showType == 0) { if (this.data.allCount / this.data.size < this.data.allPage) { return false; } this.setData({ - 'allPage' : this.data.allPage + 1 + 'allPage': this.data.allPage + 1 }); } else { if (this.data.hasPicCount / this.data.size < this.data.picPage) { diff --git a/litemall-wx/pages/comment/comment.wxml b/litemall-wx/pages/comment/comment.wxml index 8e4a8464..dfc28bb9 100644 --- a/litemall-wx/pages/comment/comment.wxml +++ b/litemall-wx/pages/comment/comment.wxml @@ -1,12 +1,12 @@ - - - 全部({{allCount}}) - - - 有图({{hasPicCount}}) - + + + 全部({{allCount}}) + + 有图({{hasPicCount}}) + + diff --git a/litemall-wx/pages/comment/comment.wxss b/litemall-wx/pages/comment/comment.wxss index 682d4e62..700517e7 100644 --- a/litemall-wx/pages/comment/comment.wxss +++ b/litemall-wx/pages/comment/comment.wxss @@ -1,156 +1,155 @@ -.comments{ - width: 100%; - height: auto; - padding-left:30rpx; - background: #fff; - margin: 20rpx 0; +.comments { + width: 100%; + height: auto; + padding-left: 30rpx; + background: #fff; + margin: 20rpx 0; } -.comments .h{ - position: fixed; - left:0; - top:0; - z-index: 1000; - width: 100%; - display: flex; - background: #fff; - height: 84rpx; - border-bottom: 1px solid rgba(0,0,0,.15); +.comments .h { + position: fixed; + left: 0; + top: 0; + z-index: 1000; + width: 100%; + display: flex; + background: #fff; + height: 84rpx; + border-bottom: 1px solid rgba(0, 0, 0, 0.15); } -.comments .h .item{ - display: inline-block; - height: 82rpx; - width: 50%; - padding: 0 15rpx; - text-align: center; +.comments .h .item { + display: inline-block; + height: 82rpx; + width: 50%; + padding: 0 15rpx; + text-align: center; } -.comments .h .item .txt{ - display: inline-block; - height: 82rpx; - padding: 0 20rpx; - line-height: 82rpx; - color: #333; - font-size: 30rpx; - width: 170rpx; +.comments .h .item .txt { + display: inline-block; + height: 82rpx; + padding: 0 20rpx; + line-height: 82rpx; + color: #333; + font-size: 30rpx; + width: 170rpx; } -.comments .h .item.active .txt{ - color: #ab2b2b; - border-bottom: 4rpx solid #ab2b2b; +.comments .h .item.active .txt { + color: #ab2b2b; + border-bottom: 4rpx solid #ab2b2b; } -.comments .b{ - margin-top: 85rpx; - height: auto; - width: 720rpx; +.comments .b { + margin-top: 85rpx; + height: auto; + width: 720rpx; } -.comments .b.no-h{ - margin-top: 0; +.comments .b.no-h { + margin-top: 0; } -.comments .item{ - height: auto; - width: 720rpx; - overflow: hidden; - border-bottom: 1px solid #d9d9d9; - padding-bottom: 25rpx; +.comments .item { + height: auto; + width: 720rpx; + overflow: hidden; + border-bottom: 1px solid #d9d9d9; + padding-bottom: 25rpx; } -.comments .info{ - height: 127rpx; - width: 100%; - padding: 33rpx 0 27rpx 0; +.comments .info { + height: 127rpx; + width: 100%; + padding: 33rpx 0 27rpx 0; } -.comments .user{ - float: left; - width: auto; - height: 67rpx; - line-height: 67rpx; - font-size: 0; +.comments .user { + float: left; + width: auto; + height: 67rpx; + line-height: 67rpx; + font-size: 0; } -.comments .user image{ - float: left; - width: 67rpx; - height: 67rpx; - margin-right: 17rpx; - border-radius: 50%; +.comments .user image { + float: left; + width: 67rpx; + height: 67rpx; + margin-right: 17rpx; + border-radius: 50%; } -.comments .user text{ - display: inline-block; - width: auto; - height: 66rpx; - overflow: hidden; - font-size: 29rpx; - line-height: 66rpx; +.comments .user text { + display: inline-block; + width: auto; + height: 66rpx; + overflow: hidden; + font-size: 29rpx; + line-height: 66rpx; } -.comments .time{ - display: block; - float: right; - width: auto; - height: 67rpx; - line-height: 67rpx; - color: #7f7f7f; - font-size: 25rpx; - margin-right: 30rpx; +.comments .time { + display: block; + float: right; + width: auto; + height: 67rpx; + line-height: 67rpx; + color: #7f7f7f; + font-size: 25rpx; + margin-right: 30rpx; } -.comments .comment{ - width: 720rpx; - padding-right: 30rpx; - line-height: 45.8rpx; - font-size: 29rpx; - margin-bottom: 16rpx; +.comments .comment { + width: 720rpx; + padding-right: 30rpx; + line-height: 45.8rpx; + font-size: 29rpx; + margin-bottom: 16rpx; } -.comments .imgs{ - width: 720rpx; - height: 150rpx; - margin-bottom: 25rpx; +.comments .imgs { + width: 720rpx; + height: 150rpx; + margin-bottom: 25rpx; } -.comments .imgs .img{ - height: 150rpx; - width: 150rpx; - margin-right: 28rpx; +.comments .imgs .img { + height: 150rpx; + width: 150rpx; + margin-right: 28rpx; } -.comments .spec{ - width: 720rpx; - height: 25rpx; - font-size: 24rpx; - color: #999; +.comments .spec { + width: 720rpx; + height: 25rpx; + font-size: 24rpx; + color: #999; } -.comments .spec .item{ - color: #7f7f7f; - font-size: 25rpx; +.comments .spec .item { + color: #7f7f7f; + font-size: 25rpx; } -.comments .customer-service{ - width: 690rpx; - height: auto; - overflow: hidden; - margin-top: 23rpx; - background: rgba(0,0,0,.03); - padding: 21rpx; +.comments .customer-service { + width: 690rpx; + height: auto; + overflow: hidden; + margin-top: 23rpx; + background: rgba(0, 0, 0, 0.03); + padding: 21rpx; } - -.comments .customer-service .u{ - font-size: 24rpx; - color: #333; - line-height: 37.5rpx; +.comments .customer-service .u { + font-size: 24rpx; + color: #333; + line-height: 37.5rpx; } -.comments .customer-service .c{ - font-size: 24rpx; - color: #999; - line-height: 37.5rpx; -} \ No newline at end of file +.comments .customer-service .c { + font-size: 24rpx; + color: #999; + line-height: 37.5rpx; +} diff --git a/litemall-wx/pages/commentPost/commentPost.js b/litemall-wx/pages/commentPost/commentPost.js index 1d84e237..fed429d1 100644 --- a/litemall-wx/pages/commentPost/commentPost.js +++ b/litemall-wx/pages/commentPost/commentPost.js @@ -16,7 +16,7 @@ Page({ picUrls: [], files: [] }, - chooseImage: function (e) { + chooseImage: function(e) { if (this.data.files.length >= 5) { util.showErrorToast('只能上传五张图片') return false; @@ -27,7 +27,7 @@ Page({ count: 1, sizeType: ['original', 'compressed'], sourceType: ['album', 'camera'], - success: function (res) { + success: function(res) { that.setData({ files: that.data.files.concat(res.tempFilePaths) }); @@ -35,13 +35,13 @@ Page({ } }) }, - upload: function (res) { + upload: function(res) { var that = this; const uploadTask = wx.uploadFile({ url: api.StorageUpload, filePath: res.tempFilePaths[0], name: 'file', - success: function (res) { + success: function(res) { var _res = JSON.parse(res.data); if (_res.errno === 0) { var url = _res.data.url @@ -52,7 +52,7 @@ Page({ }) } }, - fail: function (e) { + fail: function(e) { wx.showModal({ title: '错误', content: '上传失败', @@ -68,28 +68,24 @@ Page({ }) }, - previewImage: function (e) { + previewImage: function(e) { wx.previewImage({ current: e.currentTarget.id, // 当前显示图片的http链接 urls: this.data.files // 需要预览的图片http链接列表 }) }, - selectRater: function (e) { + selectRater: function(e) { var star = e.currentTarget.dataset.star + 1; var starText; if (star == 1) { starText = '很差'; - } - else if (star == 2) { + } else if (star == 2) { starText = '不太满意'; - } - else if (star == 3) { + } else if (star == 3) { starText = '满意'; - } - else if (star == 4) { + } else if (star == 4) { starText = '比较满意'; - } - else { + } else { starText = '十分满意' } this.setData({ @@ -98,7 +94,7 @@ Page({ }) }, - onLoad: function (options) { + onLoad: function(options) { var that = this; that.setData({ orderId: options.orderId, @@ -107,11 +103,12 @@ Page({ }); this.getOrderGoods(); }, - getOrderGoods: function () { + getOrderGoods: function() { let that = this; util.request(api.OrderGoods, { - orderId: that.data.orderId, goodsId: that.data.valueId - }).then(function (res) { + orderId: that.data.orderId, + goodsId: that.data.valueId + }).then(function(res) { if (res.errno === 0) { that.setData({ orderGoods: res.data, @@ -119,10 +116,10 @@ Page({ } }); }, - onClose: function () { + onClose: function() { wx.navigateBack(); }, - onPost: function () { + onPost: function() { let that = this; if (!this.data.content) { @@ -136,11 +133,11 @@ Page({ star: that.data.star, hasPicture: that.data.hasPicture, picUrls: that.data.picUrls - }, 'POST').then(function (res) { + }, 'POST').then(function(res) { if (res.errno === 0) { wx.showToast({ title: '评论成功', - complete: function () { + complete: function() { wx.switchTab({ url: '/pages/ucenter/index/index' }) @@ -162,18 +159,18 @@ Page({ content: event.detail.value, }) }, - onReady: function () { + onReady: function() { }, - onShow: function () { + onShow: function() { // 页面显示 }, - onHide: function () { + onHide: function() { // 页面隐藏 }, - onUnload: function () { + onUnload: function() { // 页面关闭 } diff --git a/litemall-wx/pages/goods/goods.wxml b/litemall-wx/pages/goods/goods.wxml index 1db20e80..2a256ded 100644 --- a/litemall-wx/pages/goods/goods.wxml +++ b/litemall-wx/pages/goods/goods.wxml @@ -26,7 +26,7 @@ - + {{goods.goodsBrief}} diff --git a/litemall-wx/pages/goods/goods.wxss b/litemall-wx/pages/goods/goods.wxss index dd473697..9564c7fa 100644 --- a/litemall-wx/pages/goods/goods.wxss +++ b/litemall-wx/pages/goods/goods.wxss @@ -823,7 +823,6 @@ line-height: 65rpx; } - .contact { height: 100rpx; width: 100rpx; @@ -932,6 +931,7 @@ height: 128rpx; margin-top: 0rpx; } + .sharebtn_text { /* border: 1px solid #757575; */ width: 150rpx; @@ -941,8 +941,9 @@ font-size: 20rpx; color: #555; } + .separate { background: #e0e3da; width: 100%; height: 6rpx; -} \ No newline at end of file +} diff --git a/litemall-wx/pages/groupon/grouponDetail/grouponDetail.js b/litemall-wx/pages/groupon/grouponDetail/grouponDetail.js index 5d58e68d..06bb12c4 100644 --- a/litemall-wx/pages/groupon/grouponDetail/grouponDetail.js +++ b/litemall-wx/pages/groupon/grouponDetail/grouponDetail.js @@ -2,289 +2,289 @@ var util = require('../../../utils/util.js'); var api = require('../../../config/api.js'); Page({ - data: { - id: 0, - orderId: 0, - groupon: {}, - linkGrouponId: 0, - joiners: [], - orderInfo: {}, - orderGoods: [], - expressInfo: {}, - flag: false, - handleOption: {} - }, + data: { + id: 0, + orderId: 0, + groupon: {}, + linkGrouponId: 0, + joiners: [], + orderInfo: {}, + orderGoods: [], + expressInfo: {}, + flag: false, + handleOption: {} + }, - onLoad: function(options) { - // 页面初始化 options为页面跳转所带来的参数 - this.setData({ - id: options.id - }); - this.getOrderDetail(); - }, + onLoad: function(options) { + // 页面初始化 options为页面跳转所带来的参数 + this.setData({ + id: options.id + }); + this.getOrderDetail(); + }, - // 页面分享 - onShareAppMessage: function() { - let that = this; - return { - title: '邀请团购', - desc: '唯爱与美食不可辜负', - path: '/pages/index/index?grouponId=' + this.data.linkGrouponId - } - }, - - shareGroupon: function() { - let that = this; - wx.showActionSheet({ - itemList: ['分享给朋友', '分享到朋友圈'], - success: function(res) { - if (res.tapIndex == 0) { - wx.showModal({ - title: '提示', - content: '点击右上角 "..." 转发给朋友', - showCancel: false - }); - } else if (res.tapIndex == 1) { - that.saveShare(); - } else { - console.log(res.tapIndex); + // 页面分享 + onShareAppMessage: function() { + let that = this; + return { + title: '邀请团购', + desc: '唯爱与美食不可辜负', + path: '/pages/index/index?grouponId=' + this.data.linkGrouponId } - }, - fail: function(res) { - console.log(res.errMsg); - } - }) - }, + }, - // 保存分享图 - saveShare: function() { - let that = this; - wx.downloadFile({ - url: that.data.groupon.shareUrl, - success: function(res) { - console.log(res) - wx.saveImageToPhotosAlbum({ - filePath: res.tempFilePath, - success: function(res) { - wx.showModal({ - title: '存图成功', - content: '图片成功保存到相册了，可以分享到朋友圈了', - showCancel: false, - confirmText: '好的', - confirmColor: '#a78845', - success: function(res) { - if (res.confirm) { - console.log('用户点击确定'); + shareGroupon: function() { + let that = this; + wx.showActionSheet({ + itemList: ['分享给朋友', '分享到朋友圈'], + success: function(res) { + if (res.tapIndex == 0) { + wx.showModal({ + title: '提示', + content: '点击右上角 "..." 转发给朋友', + showCancel: false + }); + } else if (res.tapIndex == 1) { + that.saveShare(); + } else { + console.log(res.tapIndex); } - } - }) - }, - fail: function(res) { - console.log('fail') - } + }, + fail: function(res) { + console.log(res.errMsg); + } }) - }, - fail: function() { - console.log('fail') - } - }) - }, + }, - onPullDownRefresh() { - wx.showNavigationBarLoading() //在标题栏中显示加载 - this.getOrderDetail(); - wx.hideNavigationBarLoading() //完成停止加载 - wx.stopPullDownRefresh() //停止下拉刷新 - }, + // 保存分享图 + saveShare: function() { + let that = this; + wx.downloadFile({ + url: that.data.groupon.shareUrl, + success: function(res) { + console.log(res) + wx.saveImageToPhotosAlbum({ + filePath: res.tempFilePath, + success: function(res) { + wx.showModal({ + title: '存图成功', + content: '图片成功保存到相册了，可以分享到朋友圈了', + showCancel: false, + confirmText: '好的', + confirmColor: '#a78845', + success: function(res) { + if (res.confirm) { + console.log('用户点击确定'); + } + } + }) + }, + fail: function(res) { + console.log('fail') + } + }) + }, + fail: function() { + console.log('fail') + } + }) + }, - //获取物流信息 - getOrderExpress: function() { - let that = this; - util.request(api.ExpressQuery, { - expCode: that.data.orderInfo.expCode, - expNo: that.data.orderInfo.expNo - }, 'POST').then(function(res) { - if (res.errno === 0) { - that.setData({ - expressInfo: res.data + onPullDownRefresh() { + wx.showNavigationBarLoading() //在标题栏中显示加载 + this.getOrderDetail(); + wx.hideNavigationBarLoading() //完成停止加载 + wx.stopPullDownRefresh() //停止下拉刷新 + }, + + //获取物流信息 + getOrderExpress: function() { + let that = this; + util.request(api.ExpressQuery, { + expCode: that.data.orderInfo.expCode, + expNo: that.data.orderInfo.expNo + }, 'POST').then(function(res) { + if (res.errno === 0) { + that.setData({ + expressInfo: res.data + }); + } }); - } - }); - }, - expandDetail: function() { - let that = this; - this.setData({ - flag: !that.data.flag - }) - }, - getOrderDetail: function() { - let that = this; - util.request(api.GroupOnDetail, { - grouponId: that.data.id - }).then(function(res) { - if (res.errno === 0) { - that.setData({ - joiners: res.data.joiners, - groupon: res.data.groupon, - linkGrouponId: res.data.linkGrouponId, - orderId: res.data.orderInfo.id, - orderInfo: res.data.orderInfo, - orderGoods: res.data.orderGoods, - handleOption: res.data.orderInfo.handleOption + }, + expandDetail: function() { + let that = this; + this.setData({ + flag: !that.data.flag + }) + }, + getOrderDetail: function() { + let that = this; + util.request(api.GroupOnDetail, { + grouponId: that.data.id + }).then(function(res) { + if (res.errno === 0) { + that.setData({ + joiners: res.data.joiners, + groupon: res.data.groupon, + linkGrouponId: res.data.linkGrouponId, + orderId: res.data.orderInfo.id, + orderInfo: res.data.orderInfo, + orderGoods: res.data.orderGoods, + handleOption: res.data.orderInfo.handleOption + }); + + // 请求物流信息,仅当订单状态为发货时才请求 + if (res.data.orderInfo.handleOption.confirm) { + that.getOrderExpress(); + } + } + }); + }, + // “去付款”按钮点击效果 + payOrder: function() { + let that = this; + util.request(api.OrderPrepay, { + orderId: that.data.orderId + }, 'POST').then(function(res) { + if (res.errno === 0) { + const payParam = res.data; + console.log("支付过程开始"); + wx.requestPayment({ + 'timeStamp': payParam.timeStamp, + 'nonceStr': payParam.nonceStr, + 'package': payParam.packageValue, + 'signType': payParam.signType, + 'paySign': payParam.paySign, + 'success': function(res) { + console.log("支付过程成功"); + util.redirect('/pages/ucenter/order/order'); + }, + 'fail': function(res) { + console.log("支付过程失败"); + util.showErrorToast('支付失败'); + }, + 'complete': function(res) { + console.log("支付过程结束") + } + }); + } }); - // 请求物流信息,仅当订单状态为发货时才请求 - if (res.data.orderInfo.handleOption.confirm) { - that.getOrderExpress(); - } - } - }); - }, - // “去付款”按钮点击效果 - payOrder: function() { - let that = this; - util.request(api.OrderPrepay, { - orderId: that.data.orderId - }, 'POST').then(function(res) { - if (res.errno === 0) { - const payParam = res.data; - console.log("支付过程开始"); - wx.requestPayment({ - 'timeStamp': payParam.timeStamp, - 'nonceStr': payParam.nonceStr, - 'package': payParam.packageValue, - 'signType': payParam.signType, - 'paySign': payParam.paySign, - 'success': function(res) { - console.log("支付过程成功"); - util.redirect('/pages/ucenter/order/order'); - }, - 'fail': function(res) { - console.log("支付过程失败"); - util.showErrorToast('支付失败'); - }, - 'complete': function(res) { - console.log("支付过程结束") - } + }, + // “取消订单”点击效果 + cancelOrder: function() { + let that = this; + let orderInfo = that.data.orderInfo; + + wx.showModal({ + title: '', + content: '确定要取消此订单？', + success: function(res) { + if (res.confirm) { + util.request(api.OrderCancel, { + orderId: orderInfo.id + }, 'POST').then(function(res) { + if (res.errno === 0) { + wx.showToast({ + title: '取消订单成功' + }); + util.redirect('/pages/ucenter/order/order'); + } else { + util.showErrorToast(res.errmsg); + } + }); + } + } }); - } - }); + }, + // “取消订单并退款”点击效果 + refundOrder: function() { + let that = this; + let orderInfo = that.data.orderInfo; - }, - // “取消订单”点击效果 - cancelOrder: function() { - let that = this; - let orderInfo = that.data.orderInfo; - - wx.showModal({ - title: '', - content: '确定要取消此订单？', - success: function(res) { - if (res.confirm) { - util.request(api.OrderCancel, { - orderId: orderInfo.id - }, 'POST').then(function(res) { - if (res.errno === 0) { - wx.showToast({ - title: '取消订单成功' - }); - util.redirect('/pages/ucenter/order/order'); - } else { - util.showErrorToast(res.errmsg); + wx.showModal({ + title: '', + content: '确定要取消此订单？', + success: function(res) { + if (res.confirm) { + util.request(api.OrderRefund, { + orderId: orderInfo.id + }, 'POST').then(function(res) { + if (res.errno === 0) { + wx.showToast({ + title: '取消订单成功' + }); + util.redirect('/pages/ucenter/order/order'); + } else { + util.showErrorToast(res.errmsg); + } + }); + } } - }); - } - } - }); - }, - // “取消订单并退款”点击效果 - refundOrder: function() { - let that = this; - let orderInfo = that.data.orderInfo; + }); + }, + // “删除”点击效果 + deleteOrder: function() { + let that = this; + let orderInfo = that.data.orderInfo; - wx.showModal({ - title: '', - content: '确定要取消此订单？', - success: function(res) { - if (res.confirm) { - util.request(api.OrderRefund, { - orderId: orderInfo.id - }, 'POST').then(function(res) { - if (res.errno === 0) { - wx.showToast({ - title: '取消订单成功' - }); - util.redirect('/pages/ucenter/order/order'); - } else { - util.showErrorToast(res.errmsg); + wx.showModal({ + title: '', + content: '确定要删除此订单？', + success: function(res) { + if (res.confirm) { + util.request(api.OrderDelete, { + orderId: orderInfo.id + }, 'POST').then(function(res) { + if (res.errno === 0) { + wx.showToast({ + title: '删除订单成功' + }); + util.redirect('/pages/ucenter/order/order'); + } else { + util.showErrorToast(res.errmsg); + } + }); + } } - }); - } - } - }); - }, - // “删除”点击效果 - deleteOrder: function() { - let that = this; - let orderInfo = that.data.orderInfo; + }); + }, + // “确认收货”点击效果 + confirmOrder: function() { + let that = this; + let orderInfo = that.data.orderInfo; - wx.showModal({ - title: '', - content: '确定要删除此订单？', - success: function(res) { - if (res.confirm) { - util.request(api.OrderDelete, { - orderId: orderInfo.id - }, 'POST').then(function(res) { - if (res.errno === 0) { - wx.showToast({ - title: '删除订单成功' - }); - util.redirect('/pages/ucenter/order/order'); - } else { - util.showErrorToast(res.errmsg); + wx.showModal({ + title: '', + content: '确认收货？', + success: function(res) { + if (res.confirm) { + util.request(api.OrderConfirm, { + orderId: orderInfo.id + }, 'POST').then(function(res) { + if (res.errno === 0) { + wx.showToast({ + title: '确认收货成功！' + }); + util.redirect('/pages/ucenter/order/order'); + } else { + util.showErrorToast(res.errmsg); + } + }); + } } - }); - } - } - }); - }, - // “确认收货”点击效果 - confirmOrder: function() { - let that = this; - let orderInfo = that.data.orderInfo; - - wx.showModal({ - title: '', - content: '确认收货？', - success: function(res) { - if (res.confirm) { - util.request(api.OrderConfirm, { - orderId: orderInfo.id - }, 'POST').then(function(res) { - if (res.errno === 0) { - wx.showToast({ - title: '确认收货成功！' - }); - util.redirect('/pages/ucenter/order/order'); - } else { - util.showErrorToast(res.errmsg); - } - }); - } - } - }); - }, - onReady: function() { - // 页面渲染完成 - }, - onShow: function() { - // 页面显示 - }, - onHide: function() { - // 页面隐藏 - }, - onUnload: function() { - // 页面关闭 - } + }); + }, + onReady: function() { + // 页面渲染完成 + }, + onShow: function() { + // 页面显示 + }, + onHide: function() { + // 页面隐藏 + }, + onUnload: function() { + // 页面关闭 + } }); \ No newline at end of file diff --git a/litemall-wx/pages/groupon/grouponDetail/grouponDetail.json b/litemall-wx/pages/groupon/grouponDetail/grouponDetail.json index 4755b314..fc91041f 100644 --- a/litemall-wx/pages/groupon/grouponDetail/grouponDetail.json +++ b/litemall-wx/pages/groupon/grouponDetail/grouponDetail.json @@ -1,3 +1,3 @@ { - "navigationBarTitleText": "团购详情" + "navigationBarTitleText": "团购详情" } \ No newline at end of file diff --git a/litemall-wx/pages/groupon/grouponDetail/grouponDetail.wxml b/litemall-wx/pages/groupon/grouponDetail/grouponDetail.wxml index b70ae9db..f2dd8574 100644 --- a/litemall-wx/pages/groupon/grouponDetail/grouponDetail.wxml +++ b/litemall-wx/pages/groupon/grouponDetail/grouponDetail.wxml @@ -1,91 +1,91 @@ - - 下单时间：{{orderInfo.addTime}} - 订单编号：{{orderInfo.orderSn}} - - 实付： - ￥{{orderInfo.actualPrice}} - - - 邀请参团 - - - - - - - 参与团购 ( {{joiners.length}}人) - 查看全部 - - - - {{item.nickname}} - - - - - - 商品信息 - {{orderInfo.orderStatusText}} - - - - - + + 下单时间：{{orderInfo.addTime}} + 订单编号：{{orderInfo.orderSn}} + + 实付： + ￥{{orderInfo.actualPrice}} + + + 邀请参团 + - - - {{item.goodsName}} - x{{item.number}} - - {{item.goodsSpecificationValues}} - ￥{{item.retailPrice}} - - - - - - {{orderInfo.consignee}} - {{orderInfo.mobile}} + + + 参与团购 ( {{joiners.length}}人) + 查看全部 - {{orderInfo.address}} - - - - 商品合计： - ￥{{orderInfo.goodsPrice}} + + + {{item.nickname}} - - 运费： - ￥{{orderInfo.freightPrice}} - - - - 实付： - ￥{{orderInfo.actualPrice}} - - - - - - - - - 快递公司：{{expressInfo.expName}} - 物流单号：{{expressInfo.expCode}} - - - - - - {{iitem.AcceptStation}} - {{iitem.AcceptTime}} - + + + 商品信息 + {{orderInfo.orderStatusText}} + + + + + + + + + {{item.goodsName}} + x{{item.number}} + + {{item.goodsSpecificationValues}} + ￥{{item.retailPrice}} + + + + + + + + {{orderInfo.consignee}} + {{orderInfo.mobile}} + + {{orderInfo.address}} + + + + 商品合计： + ￥{{orderInfo.goodsPrice}} + + + 运费： + ￥{{orderInfo.freightPrice}} + + + + 实付： + ￥{{orderInfo.actualPrice}} + + - - + + + + + + 快递公司：{{expressInfo.expName}} + 物流单号：{{expressInfo.expCode}} + + + + + + + + {{iitem.AcceptStation}} + {{iitem.AcceptTime}} + + + + \ No newline at end of file diff --git a/litemall-wx/pages/groupon/grouponDetail/grouponDetail.wxss b/litemall-wx/pages/groupon/grouponDetail/grouponDetail.wxss index 7edab079..cd23b71e 100644 --- a/litemall-wx/pages/groupon/grouponDetail/grouponDetail.wxss +++ b/litemall-wx/pages/groupon/grouponDetail/grouponDetail.wxss @@ -1,395 +1,395 @@ page { - height: 100%; - width: 100%; - background: #f4f4f4; + height: 100%; + width: 100%; + background: #f4f4f4; } .order-info { - padding-top: 25rpx; - background: #fff; - height: auto; - overflow: hidden; + padding-top: 25rpx; + background: #fff; + height: auto; + overflow: hidden; } .item-a { - padding-left: 31.25rpx; - height: 42.5rpx; - padding-bottom: 12.5rpx; - line-height: 30rpx; - font-size: 30rpx; - color: #666; + padding-left: 31.25rpx; + height: 42.5rpx; + padding-bottom: 12.5rpx; + line-height: 30rpx; + font-size: 30rpx; + color: #666; } .item-b { - padding-left: 31.25rpx; - height: 29rpx; - line-height: 29rpx; - margin-top: 12.5rpx; - margin-bottom: 41.5rpx; - font-size: 30rpx; - color: #666; + padding-left: 31.25rpx; + height: 29rpx; + line-height: 29rpx; + margin-top: 12.5rpx; + margin-bottom: 41.5rpx; + font-size: 30rpx; + color: #666; } .item-c { - margin-left: 31.25rpx; - border-top: 1px solid #f4f4f4; - height: 103rpx; - line-height: 103rpx; + margin-left: 31.25rpx; + border-top: 1px solid #f4f4f4; + height: 103rpx; + line-height: 103rpx; } .item-c .l { - float: left; + float: left; } .item-c .r { - height: 103rpx; - float: right; - display: flex; - align-items: center; - padding-right: 16rpx; + height: 103rpx; + float: right; + display: flex; + align-items: center; + padding-right: 16rpx; } .item-c .r .btn { - float: right; + float: right; } .item-c .cost { - color: #b4282d; + color: #b4282d; } .item-c .btn { - line-height: 66rpx; - border-radius: 5rpx; - text-align: center; - margin: 0 15rpx; - padding: 0 20rpx; - height: 66rpx; + line-height: 66rpx; + border-radius: 5rpx; + text-align: center; + margin: 0 15rpx; + padding: 0 20rpx; + height: 66rpx; } .item-c .btn.active { - background: #a78845; - color: #fff; + background: #a78845; + color: #fff; } .order-goods { - margin-top: 20rpx; - background: #fff; + margin-top: 20rpx; + background: #fff; } .order-goods .h { - height: 93.75rpx; - line-height: 93.75rpx; - margin-left: 31.25rpx; - border-bottom: 1px solid #f4f4f4; - padding-right: 31.25rpx; + height: 93.75rpx; + line-height: 93.75rpx; + margin-left: 31.25rpx; + border-bottom: 1px solid #f4f4f4; + padding-right: 31.25rpx; } .order-goods .h .label { - float: left; - font-size: 30rpx; - color: #333; + float: left; + font-size: 30rpx; + color: #333; } .order-goods .h .status { - float: right; - font-size: 30rpx; - color: #b4282d; + float: right; + font-size: 30rpx; + color: #b4282d; } .order-goods .item { - display: flex; - align-items: center; - height: 192rpx; - margin-left: 31.25rpx; - padding-right: 31.25rpx; - border-bottom: 1px solid #f4f4f4; + display: flex; + align-items: center; + height: 192rpx; + margin-left: 31.25rpx; + padding-right: 31.25rpx; + border-bottom: 1px solid #f4f4f4; } .order-goods .item:last-child { - border-bottom: none; + border-bottom: none; } .order-goods .item .img { - height: 145.83rpx; - width: 145.83rpx; - background: #f4f4f4; + height: 145.83rpx; + width: 145.83rpx; + background: #f4f4f4; } .order-goods .item .img image { - height: 145.83rpx; - width: 145.83rpx; + height: 145.83rpx; + width: 145.83rpx; } .order-goods .item .info { - flex: 1; - height: 145.83rpx; - margin-left: 20rpx; + flex: 1; + height: 145.83rpx; + margin-left: 20rpx; } .order-goods .item .t { - margin-top: 8rpx; - height: 33rpx; - line-height: 33rpx; - margin-bottom: 10.5rpx; + margin-top: 8rpx; + height: 33rpx; + line-height: 33rpx; + margin-bottom: 10.5rpx; } .order-goods .item .t .name { - display: block; - float: left; - height: 33rpx; - line-height: 33rpx; - color: #333; - font-size: 30rpx; + display: block; + float: left; + height: 33rpx; + line-height: 33rpx; + color: #333; + font-size: 30rpx; } .order-goods .item .t .number { - display: block; - float: right; - height: 33rpx; - text-align: right; - line-height: 33rpx; - color: #333; - font-size: 30rpx; + display: block; + float: right; + height: 33rpx; + text-align: right; + line-height: 33rpx; + color: #333; + font-size: 30rpx; } .order-goods .item .attr { - height: 29rpx; - line-height: 29rpx; - color: #666; - margin-bottom: 25rpx; - font-size: 25rpx; + height: 29rpx; + line-height: 29rpx; + color: #666; + margin-bottom: 25rpx; + font-size: 25rpx; } .order-goods .item .price { - display: block; - float: left; - height: 30rpx; - line-height: 30rpx; - color: #333; - font-size: 30rpx; + display: block; + float: left; + height: 30rpx; + line-height: 30rpx; + color: #333; + font-size: 30rpx; } .order-goods .item .btn { - height: 50rpx; - line-height: 50rpx; - border-radius: 5rpx; - text-align: center; - display: block; - float: right; - margin: 0 15rpx; - padding: 0 20rpx; + height: 50rpx; + line-height: 50rpx; + border-radius: 5rpx; + text-align: center; + display: block; + float: right; + margin: 0 15rpx; + padding: 0 20rpx; } .order-goods .item .btn.active { - background: #b4282d; - color: #fff; + background: #b4282d; + color: #fff; } .order-bottom { - margin-top: 20rpx; - padding-left: 31.25rpx; - height: auto; - overflow: hidden; - background: #fff; + margin-top: 20rpx; + padding-left: 31.25rpx; + height: auto; + overflow: hidden; + background: #fff; } .order-bottom .address { - height: 128rpx; - padding-top: 25rpx; - border-bottom: 1px solid #f4f4f4; + height: 128rpx; + padding-top: 25rpx; + border-bottom: 1px solid #f4f4f4; } .order-bottom .address .t { - height: 35rpx; - line-height: 35rpx; - margin-bottom: 7.5rpx; + height: 35rpx; + line-height: 35rpx; + margin-bottom: 7.5rpx; } .order-bottom .address .name { - display: inline-block; - height: 35rpx; - width: 140rpx; - line-height: 35rpx; - font-size: 30rpx; + display: inline-block; + height: 35rpx; + width: 140rpx; + line-height: 35rpx; + font-size: 30rpx; } .order-bottom .address .mobile { - display: inline-block; - height: 35rpx; - line-height: 35rpx; - font-size: 30rpx; + display: inline-block; + height: 35rpx; + line-height: 35rpx; + font-size: 30rpx; } .order-bottom .address .b { - height: 35rpx; - line-height: 35rpx; - font-size: 30rpx; + height: 35rpx; + line-height: 35rpx; + font-size: 30rpx; } .order-bottom .total { - height: 106rpx; - padding-top: 20rpx; - border-bottom: 1px solid #f4f4f4; + height: 106rpx; + padding-top: 20rpx; + border-bottom: 1px solid #f4f4f4; } .order-bottom .total .t { - height: 30rpx; - line-height: 30rpx; - margin-bottom: 7.5rpx; - display: flex; + height: 30rpx; + line-height: 30rpx; + margin-bottom: 7.5rpx; + display: flex; } .order-bottom .total .label { - width: 150rpx; - display: inline-block; - height: 35rpx; - line-height: 35rpx; - font-size: 30rpx; + width: 150rpx; + display: inline-block; + height: 35rpx; + line-height: 35rpx; + font-size: 30rpx; } .order-bottom .total .txt { - flex: 1; - display: inline-block; - height: 35rpx; - line-height: 35rpx; - font-size: 30rpx; + flex: 1; + display: inline-block; + height: 35rpx; + line-height: 35rpx; + font-size: 30rpx; } .order-bottom .pay-fee { - height: 81rpx; - line-height: 81rpx; + height: 81rpx; + line-height: 81rpx; } .order-bottom .pay-fee .label { - display: inline-block; - width: 140rpx; - color: #b4282d; + display: inline-block; + width: 140rpx; + color: #b4282d; } .order-bottom .pay-fee .txt { - display: inline-block; - width: 140rpx; - color: #b4282d; + display: inline-block; + width: 140rpx; + color: #b4282d; } .order-express { - margin-top: 20rpx; - width: 100%; - height: 100rpx; - background: #fff; + margin-top: 20rpx; + width: 100%; + height: 100rpx; + background: #fff; } .order-express .expand { - /* margin-top: 20rpx; */ - width: 100%; - height: 100rpx; - background: #fff; - /* border: 10rpx #a78845; */ + /* margin-top: 20rpx; */ + width: 100%; + height: 100rpx; + background: #fff; + /* border: 10rpx #a78845; */ } .order-express .title { - float: left; - margin-bottom: 20rpx; - padding: 10rpx; + float: left; + margin-bottom: 20rpx; + padding: 10rpx; } .order-express .ti { - float: right; - width: 52rpx; - height: 52rpx; - margin-right: 16rpx; - margin-top: 28rpx; + float: right; + width: 52rpx; + height: 52rpx; + margin-right: 16rpx; + margin-top: 28rpx; } .order-express .t { - font-size: 29rpx; - margin-left: 10.25rpx; - color: #a78845; + font-size: 29rpx; + margin-left: 10.25rpx; + color: #a78845; } .order-express .b { - font-size: 29rpx; - margin-left: 10.25rpx; - color: #a78845; + font-size: 29rpx; + margin-left: 10.25rpx; + color: #a78845; } .order-express .traces { - padding: 17.5rpx; - background: #fff; - border-bottom: 1rpx solid #f1e6cdcc; + padding: 17.5rpx; + background: #fff; + border-bottom: 1rpx solid #f1e6cdcc; } .order-express .trace { - padding-bottom: 17.5rpx; - padding-top: 17.5rpx; - background: #fff; + padding-bottom: 17.5rpx; + padding-top: 17.5rpx; + background: #fff; } .order-express .acceptTime { - margin-top: 20rpx; - margin-right: 40rpx; - text-align: right; - font-size: 26rpx; + margin-top: 20rpx; + margin-right: 40rpx; + text-align: right; + font-size: 26rpx; } .order-express .acceptStation { - font-size: 26rpx; + font-size: 26rpx; } .menu-list-pro { - margin-top: 20rpx; - overflow-x: scroll; - white-space: nowrap; - text-overflow: ellipsis; - height: 260rpx; - width: 100%; - overflow: hidden; - border-bottom: 1rpx #cfc9ca; - background-color: #fff; + margin-top: 20rpx; + overflow-x: scroll; + white-space: nowrap; + text-overflow: ellipsis; + height: 260rpx; + width: 100%; + overflow: hidden; + border-bottom: 1rpx #cfc9ca; + background-color: #fff; } .menu-list-pro .h { - height: 93.75rpx; - line-height: 93.75rpx; - margin-left: 31.25rpx; - border-bottom: 1px solid #f4f4f4; - padding-right: 31.25rpx; + height: 93.75rpx; + line-height: 93.75rpx; + margin-left: 31.25rpx; + border-bottom: 1px solid #f4f4f4; + padding-right: 31.25rpx; } .menu-list-pro .h .label { - float: left; - font-size: 30rpx; - color: #333; + float: left; + font-size: 30rpx; + color: #333; } .menu-list-pro .h .status { - float: right; - font-size: 30rpx; - color: #a78845; + float: right; + font-size: 30rpx; + color: #a78845; } .menu-list-pro .menu-list-item { - display: block; - float: left; - height: 110rpx; - width: 80rpx; - margin-top: 30rpx; - margin-bottom: 30rpx; - margin-left: 40rpx; + display: block; + float: left; + height: 110rpx; + width: 80rpx; + margin-top: 30rpx; + margin-bottom: 30rpx; + margin-left: 40rpx; } .menu-list-pro .icon { - height: 80rpx; - width: 80rpx; - border-radius: 12rpx; - box-shadow: 0px 4rpx 4rpx 0px #cfc9ca; + height: 80rpx; + width: 80rpx; + border-radius: 12rpx; + box-shadow: 0px 4rpx 4rpx 0px #cfc9ca; } .menu-list-pro .txt { - display: block; - float: left; - width: 80rpx; - margin-top: 5rpx; - font-size: 22rpx; - color: #a78845; + display: block; + float: left; + width: 80rpx; + margin-top: 5rpx; + font-size: 22rpx; + color: #a78845; } diff --git a/litemall-wx/pages/groupon/grouponList/grouponList.js b/litemall-wx/pages/groupon/grouponList/grouponList.js index c00d1d51..4cfbee7d 100644 --- a/litemall-wx/pages/groupon/grouponList/grouponList.js +++ b/litemall-wx/pages/groupon/grouponList/grouponList.js @@ -20,59 +20,59 @@ Page({ /** * 生命周期函数--监听页面加载 */ - onLoad: function (options) { + onLoad: function(options) { this.getGrouponList(); }, /** * 生命周期函数--监听页面初次渲染完成 */ - onReady: function () { + onReady: function() { }, /** * 生命周期函数--监听页面显示 */ - onShow: function () { + onShow: function() { }, /** * 生命周期函数--监听页面隐藏 */ - onHide: function () { + onHide: function() { }, /** * 生命周期函数--监听页面卸载 */ - onUnload: function () { + onUnload: function() { }, /** * 页面相关事件处理函数--监听用户下拉动作 */ - onPullDownRefresh: function () { + onPullDownRefresh: function() { }, /** * 页面上拉触底事件的处理函数 */ - onReachBottom: function () { + onReachBottom: function() { }, /** * 用户点击右上角分享 */ - onShareAppMessage: function () { + onShareAppMessage: function() { }, - getGrouponList: function () { + getGrouponList: function() { let that = this; that.setData({ @@ -87,7 +87,10 @@ Page({ duration: 2000 }); - util.request(api.GroupOnList, { page: that.data.page, size: that.data.size }).then(function (res) { + util.request(api.GroupOnList, { + page: that.data.page, + size: that.data.size + }).then(function(res) { if (res.errno === 0) { that.setData({ @@ -101,7 +104,7 @@ Page({ }); }, - nextPage: function (event) { + nextPage: function(event) { var that = this; if (this.data.page > that.data.count / that.data.size) { return true; @@ -115,7 +118,7 @@ Page({ this.getTopic(); }, - prevPage: function (event) { + prevPage: function(event) { if (this.data.page <= 1) { return false; } diff --git a/litemall-wx/pages/groupon/grouponList/grouponList.wxss b/litemall-wx/pages/groupon/grouponList/grouponList.wxss index 8ddb26f1..a265f775 100644 --- a/litemall-wx/pages/groupon/grouponList/grouponList.wxss +++ b/litemall-wx/pages/groupon/grouponList/grouponList.wxss @@ -1,117 +1,118 @@ -page ,.container{ - width: 750rpx; - height: 100%; - overflow: hidden; - background: #f4f4f4; +page, .container { + width: 750rpx; + height: 100%; + overflow: hidden; + background: #f4f4f4; } -.groupon-list{ - width: 750rpx; - height: 100%; - overflow: hidden; - background: #f4f4f4; + +.groupon-list { + width: 750rpx; + height: 100%; + overflow: hidden; + background: #f4f4f4; } .groupon-list .item { - height: 244rpx; - width: 100%; - background: #fff; - margin-bottom: 20rpx; + height: 244rpx; + width: 100%; + background: #fff; + margin-bottom: 20rpx; } .groupon-list .img { - margin-top: 12rpx; - margin-right: 12rpx; - float: left; - width: 220rpx; - height: 220rpx; + margin-top: 12rpx; + margin-right: 12rpx; + float: left; + width: 220rpx; + height: 220rpx; } .groupon-list .right { - float: left; - height: 244rpx; - width: 476rpx; - display: flex; - flex-flow: row nowrap; + float: left; + height: 244rpx; + width: 476rpx; + display: flex; + flex-flow: row nowrap; } .groupon-list .text { - display: flex; - flex-wrap: nowrap; - flex-direction: column; - justify-content: center; - overflow: hidden; - height: 244rpx; - width: 476rpx; + display: flex; + flex-wrap: nowrap; + flex-direction: column; + justify-content: center; + overflow: hidden; + height: 244rpx; + width: 476rpx; } .groupon-list .name { - float: left; - width: 330rpx; - display: block; - color: #333; - line-height: 50rpx; - font-size: 30rpx; + float: left; + width: 330rpx; + display: block; + color: #333; + line-height: 50rpx; + font-size: 30rpx; } .groupon-list .capsule-tag { - float: right; - padding-right: 0rpx; - padding-top: 8rpx; + float: right; + padding-right: 0rpx; + padding-top: 8rpx; } .groupon-list .zan-capsule + .zan-capsule { - margin-left: 10px; + margin-left: 10px; } .groupon-list .desc { - width: 476rpx; - display: block; - color: #999; - line-height: 50rpx; - font-size: 25rpx; + width: 476rpx; + display: block; + color: #999; + line-height: 50rpx; + font-size: 25rpx; } .groupon-list .price { - width: 476rpx; - display: flex; - color: #AB956D; - line-height: 50rpx; - font-size: 33rpx; + width: 476rpx; + display: flex; + color: #ab956d; + line-height: 50rpx; + font-size: 33rpx; } .groupon-list .counterPrice { - text-decoration: line-through; - font-size: 28rpx; - color: #999; + text-decoration: line-through; + font-size: 28rpx; + color: #999; } .groupon-list .retailPrice { - margin-left: 30rpx; - font-size: 28rpx; - color: #a78845; + margin-left: 30rpx; + font-size: 28rpx; + color: #a78845; } -.page{ - width: 750rpx; - height: 108rpx; - background: #fff; - margin-bottom: 20rpx; +.page { + width: 750rpx; + height: 108rpx; + background: #fff; + margin-bottom: 20rpx; } -.page view{ - height: 108rpx; - width: 50%; - float: left; - font-size: 29rpx; - color: #333; - text-align: center; - line-height: 108rpx; +.page view { + height: 108rpx; + width: 50%; + float: left; + font-size: 29rpx; + color: #333; + text-align: center; + line-height: 108rpx; } -.page .prev{ - border-right: 1px solid #D9D9D9; +.page .prev { + border-right: 1px solid #d9d9d9; } -.page .disabled{ - color: #ccc; -} \ No newline at end of file +.page .disabled { + color: #ccc; +} diff --git a/litemall-wx/pages/groupon/myGroupon/myGroupon.js b/litemall-wx/pages/groupon/myGroupon/myGroupon.js index ca7079d5..85f2397b 100644 --- a/litemall-wx/pages/groupon/myGroupon/myGroupon.js +++ b/litemall-wx/pages/groupon/myGroupon/myGroupon.js @@ -2,51 +2,51 @@ var util = require('../../../utils/util.js'); var api = require('../../../config/api.js'); Page({ - data: { - orderList: [], - showType: 0 - }, - onLoad: function(options) { - // 页面初始化 options为页面跳转所带来的参数 - }, + data: { + orderList: [], + showType: 0 + }, + onLoad: function(options) { + // 页面初始化 options为页面跳转所带来的参数 + }, - onPullDownRefresh() { - wx.showNavigationBarLoading() //在标题栏中显示加载 - this.getOrderList(); - wx.hideNavigationBarLoading() //完成停止加载 - wx.stopPullDownRefresh() //停止下拉刷新 - }, + onPullDownRefresh() { + wx.showNavigationBarLoading() //在标题栏中显示加载 + this.getOrderList(); + wx.hideNavigationBarLoading() //完成停止加载 + wx.stopPullDownRefresh() //停止下拉刷新 + }, - getOrderList() { - let that = this; - util.request(api.GroupOnMy, { - showType: that.data.showType - }).then(function(res) { - if (res.errno === 0) { - that.setData({ - orderList: res.data.data + getOrderList() { + let that = this; + util.request(api.GroupOnMy, { + showType: that.data.showType + }).then(function(res) { + if (res.errno === 0) { + that.setData({ + orderList: res.data.data + }); + } }); - } - }); - }, - switchTab: function(event) { - let showType = event.currentTarget.dataset.index; - this.setData({ - showType: showType - }); - this.getOrderList(); - }, - onReady: function() { - // 页面渲染完成 - }, - onShow: function() { - // 页面显示 - this.getOrderList(); - }, - onHide: function() { - // 页面隐藏 - }, - onUnload: function() { - // 页面关闭 - } + }, + switchTab: function(event) { + let showType = event.currentTarget.dataset.index; + this.setData({ + showType: showType + }); + this.getOrderList(); + }, + onReady: function() { + // 页面渲染完成 + }, + onShow: function() { + // 页面显示 + this.getOrderList(); + }, + onHide: function() { + // 页面隐藏 + }, + onUnload: function() { + // 页面关闭 + } }) \ No newline at end of file diff --git a/litemall-wx/pages/groupon/myGroupon/myGroupon.json b/litemall-wx/pages/groupon/myGroupon/myGroupon.json index 98c420b5..67a44db6 100644 --- a/litemall-wx/pages/groupon/myGroupon/myGroupon.json +++ b/litemall-wx/pages/groupon/myGroupon/myGroupon.json @@ -1,6 +1,6 @@ { - "navigationBarTitleText": "我的团购", - "usingComponents": { - "zan-capsule": "../../../lib/zanui-weapp/capsule/index" - } + "navigationBarTitleText": "我的团购", + "usingComponents": { + "zan-capsule": "../../../lib/zanui-weapp/capsule/index" + } } \ No newline at end of file diff --git a/litemall-wx/pages/groupon/myGroupon/myGroupon.wxml b/litemall-wx/pages/groupon/myGroupon/myGroupon.wxml index 66672810..667f5d66 100644 --- a/litemall-wx/pages/groupon/myGroupon/myGroupon.wxml +++ b/litemall-wx/pages/groupon/myGroupon/myGroupon.wxml @@ -1,52 +1,52 @@ - - - 发起的团购 + + + 发起的团购 + + + 参加的团购 + - - 参加的团购 + + + + 尚未参加任何团购 + - - - - - 尚未参加任何团购 - - - - - - 订单编号：{{item.orderSn}} - {{item.orderStatusText}} - - - 团购立减：￥{{item.rules.discount}} - 参与时间：{{item.groupon.addTime}} - - - 团购要求：{{item.rules.discountMember}}人 - 当前参与：{{item.joinerCount}} - - - - - - - {{gitem.goodsName}} - 共{{gitem.number}}件商品 - - - - - 实付：￥{{item.actualPrice}} - - - - - - - - - + + + + 订单编号：{{item.orderSn}} + {{item.orderStatusText}} + + + 团购立减：￥{{item.rules.discount}} + 参与时间：{{item.groupon.addTime}} + + + 团购要求：{{item.rules.discountMember}}人 + 当前参与：{{item.joinerCount}} + + + + + + + {{gitem.goodsName}} + 共{{gitem.number}}件商品 + + + + + 实付：￥{{item.actualPrice}} + + + + + + + + + \ No newline at end of file diff --git a/litemall-wx/pages/groupon/myGroupon/myGroupon.wxss b/litemall-wx/pages/groupon/myGroupon/myGroupon.wxss index d16664f0..91c436df 100644 --- a/litemall-wx/pages/groupon/myGroupon/myGroupon.wxss +++ b/litemall-wx/pages/groupon/myGroupon/myGroupon.wxss @@ -1,222 +1,222 @@ page { - height: 100%; - width: 100%; - background: #f4f4f4; + height: 100%; + width: 100%; + background: #f4f4f4; } .capsule-tag { - float: right; - /* padding-right: 10rpx; */ + float: right; + /* padding-right: 10rpx; */ } .zan-capsule + .zan-capsule { - margin-left: 5px; + margin-left: 5px; } .orders-switch { - width: 100%; - background: #fff; - height: 84rpx; - border-bottom: 1px solid #a78845; + width: 100%; + background: #fff; + height: 84rpx; + border-bottom: 1px solid #a78845; } .orders-switch .item { - display: inline-block; - height: 82rpx; - width: 50%; - padding: 0 15rpx; - text-align: center; + display: inline-block; + height: 82rpx; + width: 50%; + padding: 0 15rpx; + text-align: center; } .orders-switch .item .txt { - display: inline-block; - height: 82rpx; - padding: 0 20rpx; - line-height: 82rpx; - color: #333; - font-size: 30rpx; - width: 100%; + display: inline-block; + height: 82rpx; + padding: 0 20rpx; + line-height: 82rpx; + color: #333; + font-size: 30rpx; + width: 100%; } .orders-switch .item.active .txt { - color: #a78845; - border-bottom: 4rpx solid #a78845; + color: #a78845; + border-bottom: 4rpx solid #a78845; } .no-order { - width: 100%; - height: auto; - margin: 0 auto; + width: 100%; + height: auto; + margin: 0 auto; } .no-order .c { - width: 100%; - height: auto; - margin-top: 200rpx; + width: 100%; + height: auto; + margin-top: 200rpx; } .no-order .c image { - margin: 0 auto; - display: block; - text-align: center; - width: 258rpx; - height: 258rpx; + margin: 0 auto; + display: block; + text-align: center; + width: 258rpx; + height: 258rpx; } .no-order .c text { - margin: 0 auto; - display: block; - width: 258rpx; - height: 29rpx; - line-height: 29rpx; - text-align: center; - font-size: 29rpx; - color: #999; + margin: 0 auto; + display: block; + width: 258rpx; + height: 29rpx; + line-height: 29rpx; + text-align: center; + font-size: 29rpx; + color: #999; } .orders { - height: auto; - width: 100%; - overflow: hidden; + height: auto; + width: 100%; + overflow: hidden; } .order { - margin-top: 20rpx; - background: #fff; + margin-top: 20rpx; + background: #fff; } .order .h { - height: 83.3rpx; - line-height: 83.3rpx; - margin-left: 31.25rpx; - padding-right: 31.25rpx; - border-bottom: 1px solid #f4f4f4; + height: 83.3rpx; + line-height: 83.3rpx; + margin-left: 31.25rpx; + padding-right: 31.25rpx; + border-bottom: 1px solid #f4f4f4; } .order .h .l { - float: left; - color: #a78845; - font-size: 26rpx; + float: left; + color: #a78845; + font-size: 26rpx; } .order .h .r { - float: right; - color: #a78845; - font-size: 26rpx; + float: right; + color: #a78845; + font-size: 26rpx; } .order .i { - height: 56rpx; - line-height: 56rpx; - margin-left: 31.25rpx; - padding-right: 31.25rpx; - border-bottom: 1px solid #f4f4f4; + height: 56rpx; + line-height: 56rpx; + margin-left: 31.25rpx; + padding-right: 31.25rpx; + border-bottom: 1px solid #f4f4f4; } .order .i .l { - float: left; - color: #a78845; - font-size: 26rpx; + float: left; + color: #a78845; + font-size: 26rpx; } .order .i .r { - float: right; - color: #a78845; - font-size: 26rpx; + float: right; + color: #a78845; + font-size: 26rpx; } .order .j { - height: 56rpx; - line-height: 56rpx; - margin-left: 31.25rpx; - padding-right: 31.25rpx; + height: 56rpx; + line-height: 56rpx; + margin-left: 31.25rpx; + padding-right: 31.25rpx; } .order .j .l { - float: left; - font-size: 26rpx; - color: #a78845; + float: left; + font-size: 26rpx; + color: #a78845; } .order .j .r { - float: right; - color: #a78845; - font-size: 26rpx; + float: right; + color: #a78845; + font-size: 26rpx; } .order .goods { - display: flex; - align-items: center; - height: 199rpx; - margin-left: 31.25rpx; + display: flex; + align-items: center; + height: 199rpx; + margin-left: 31.25rpx; } .order .goods .img { - height: 145.83rpx; - width: 145.83rpx; - background: #f4f4f4; + height: 145.83rpx; + width: 145.83rpx; + background: #f4f4f4; } .order .goods .img image { - height: 145.83rpx; - width: 145.83rpx; + height: 145.83rpx; + width: 145.83rpx; } .order .goods .info { - height: 145.83rpx; - flex: 1; - padding-left: 20rpx; + height: 145.83rpx; + flex: 1; + padding-left: 20rpx; } .order .goods .name { - margin-top: 30rpx; - display: block; - height: 44rpx; - line-height: 44rpx; - color: #333; - font-size: 30rpx; + margin-top: 30rpx; + display: block; + height: 44rpx; + line-height: 44rpx; + color: #333; + font-size: 30rpx; } .order .goods .number { - display: block; - height: 37rpx; - line-height: 37rpx; - color: #666; - font-size: 25rpx; + display: block; + height: 37rpx; + line-height: 37rpx; + color: #666; + font-size: 25rpx; } .order .goods .status { - width: 105rpx; - color: #a78845; - font-size: 25rpx; + width: 105rpx; + color: #a78845; + font-size: 25rpx; } .order .b { - height: 103rpx; - line-height: 103rpx; - margin-left: 31.25rpx; - padding-right: 31.25rpx; - border-top: 1px solid #f4f4f4; - font-size: 30rpx; - color: #333; + height: 103rpx; + line-height: 103rpx; + margin-left: 31.25rpx; + padding-right: 31.25rpx; + border-top: 1px solid #f4f4f4; + font-size: 30rpx; + color: #333; } .order .b .l { - float: left; + float: left; } .order .b .r { - float: right; + float: right; } .order .b .btn { - margin-top: 19rpx; - height: 64.5rpx; - line-height: 64.5rpx; - text-align: center; - padding: 0 20rpx; - border-radius: 5rpx; - font-size: 28rpx; - color: #fff; - background: #a78845; + margin-top: 19rpx; + height: 64.5rpx; + line-height: 64.5rpx; + text-align: center; + padding: 0 20rpx; + border-radius: 5rpx; + font-size: 28rpx; + color: #fff; + background: #a78845; } diff --git a/litemall-wx/pages/hotGoods/hotGoods.js b/litemall-wx/pages/hotGoods/hotGoods.js index b3a8b542..40382a18 100644 --- a/litemall-wx/pages/hotGoods/hotGoods.js +++ b/litemall-wx/pages/hotGoods/hotGoods.js @@ -18,9 +18,9 @@ Page({ page: 1, size: 100 }, - getBanner: function () { + getBanner: function() { let that = this; - util.request(api.GoodsHot).then(function (res) { + util.request(api.GoodsHot).then(function(res) { if (res.errno === 0) { that.setData({ bannerInfo: res.data.bannerInfo, @@ -28,23 +28,32 @@ Page({ } }); }, - getCategoryList: function(){ + getCategoryList: function() { var that = this; - util.request(api.GoodsFilter, { isHot: 1 }) - .then(function (res) { + util.request(api.GoodsFilter, { + isHot: 1 + }) + .then(function(res) { if (res.errno === 0) { that.setData({ filterCategory: res.data.filterCategoryList, }); } - }); + }); }, - getGoodsList: function (){ + getGoodsList: function() { var that = this; - util.request(api.GoodsList, { isHot: true, page: that.data.page, size: that.data.size, order: that.data.currentSortOrder, sort: that.data.currentSort, categoryId: that.data.categoryId}) - .then(function (res) { + util.request(api.GoodsList, { + isHot: true, + page: that.data.page, + size: that.data.size, + order: that.data.currentSortOrder, + sort: that.data.currentSort, + categoryId: that.data.categoryId + }) + .then(function(res) { if (res.errno === 0) { that.setData({ goodsList: res.data.goodsList, @@ -52,29 +61,29 @@ Page({ }); } }); - + }, - onLoad: function (options) { + onLoad: function(options) { // 页面初始化 options为页面跳转所带来的参数 this.getBanner(); this.getGoodsList(); }, - onReady: function () { + onReady: function() { // 页面渲染完成 }, - onShow: function () { + onShow: function() { // 页面显示 }, - onHide: function () { + onHide: function() { // 页面隐藏 }, - onUnload: function () { + onUnload: function() { // 页面关闭 }, - openSortFilter: function (event) { + openSortFilter: function(event) { let currentId = event.currentTarget.id; switch (currentId) { case 'categoryFilter': @@ -111,7 +120,7 @@ Page({ this.getGoodsList(); } }, - selectCategory: function(event){ + selectCategory: function(event) { let currentIndex = event.target.dataset.categoryIndex; this.setData({ 'categoryFilter': false, diff --git a/litemall-wx/pages/hotGoods/hotGoods.wxml b/litemall-wx/pages/hotGoods/hotGoods.wxml index f54f5bcf..14698e18 100644 --- a/litemall-wx/pages/hotGoods/hotGoods.wxml +++ b/litemall-wx/pages/hotGoods/hotGoods.wxml @@ -12,7 +12,7 @@ - + 综合 diff --git a/litemall-wx/pages/hotGoods/hotGoods.wxss b/litemall-wx/pages/hotGoods/hotGoods.wxss index e4a8b891..d0b1d349 100644 --- a/litemall-wx/pages/hotGoods/hotGoods.wxss +++ b/litemall-wx/pages/hotGoods/hotGoods.wxss @@ -1,132 +1,132 @@ -page{ - background: #f4f4f4; +page { + background: #f4f4f4; } -.brand-info .name{ - width: 100%; - height: 278rpx; - position: relative; +.brand-info .name { + width: 100%; + height: 278rpx; + position: relative; } -.brand-info .img{ - position: absolute; - top:0; - left:0; - width: 100%; - height: 278rpx; +.brand-info .img { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 278rpx; } -.brand-info .info-box{ - position: absolute; - top:0; - left:0; - width: 100%; - height: 278rpx; - text-align: center; - display: flex; - justify-content: center; - align-items: center; +.brand-info .info-box { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 278rpx; + text-align: center; + display: flex; + justify-content: center; + align-items: center; } -.brand-info .info{ - display: block; +.brand-info .info { + display: block; } -.brand-info .txt{ - display: block; - height: 40rpx; - font-size: 37.5rpx; - color: #fff; +.brand-info .txt { + display: block; + height: 40rpx; + font-size: 37.5rpx; + color: #fff; } -.brand-info .line{ - margin: 0 auto; - margin-top: 16rpx; - display: block; - height: 2rpx; - width: 145rpx; - background: #fff; +.brand-info .line { + margin: 0 auto; + margin-top: 16rpx; + display: block; + height: 2rpx; + width: 145rpx; + background: #fff; } -.sort{ - position: relative; - background: #fff; - width: 100%; - height: 78rpx; +.sort { + position: relative; + background: #fff; + width: 100%; + height: 78rpx; } -.sort-box{ - background: #fff; - width: 100%; - height: 78rpx; - overflow: hidden; - padding: 0 30rpx; - display: flex; - border-bottom: 1px solid #d9d9d9; +.sort-box { + background: #fff; + width: 100%; + height: 78rpx; + overflow: hidden; + padding: 0 30rpx; + display: flex; + border-bottom: 1px solid #d9d9d9; } -.sort-box .item{ - height: 78rpx; - line-height: 78rpx; - text-align: center; - flex:1; - color: #333; - font-size: 30rpx; +.sort-box .item { + height: 78rpx; + line-height: 78rpx; + text-align: center; + flex: 1; + color: #333; + font-size: 30rpx; } -.sort-box .item .txt{ - display: block; - width: 100%; - height: 100%; - color: #333; +.sort-box .item .txt { + display: block; + width: 100%; + height: 100%; + color: #333; } -.sort-box .item.active .txt{ - color: #b4282d; +.sort-box .item.active .txt { + color: #b4282d; } -.sort-box .item.by-price{ - background: url(//yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/no-3127092a69.png) 155rpx center no-repeat; - background-size: 15rpx 21rpx; +.sort-box .item.by-price { + background: url(//yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/no-3127092a69.png) 155rpx center no-repeat; + background-size: 15rpx 21rpx; } -.sort-box .item.by-price.active.asc{ - background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/up-636b92c0a5.png) 155rpx center no-repeat; - background-size: 15rpx 21rpx; +.sort-box .item.by-price.active.asc { + background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/up-636b92c0a5.png) 155rpx center no-repeat; + background-size: 15rpx 21rpx; } -.sort-box .item.by-price.active.desc{ - background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/down-95e035f3e5.png) 155rpx center no-repeat; - background-size: 15rpx 21rpx; +.sort-box .item.by-price.active.desc { + background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/down-95e035f3e5.png) 155rpx center no-repeat; + background-size: 15rpx 21rpx; } -.sort-box-category{ - background: #fff; - width: 100%; - height: auto; - overflow: hidden; - padding: 40rpx 40rpx 0 0; - border-bottom: 1px solid #d9d9d9; +.sort-box-category { + background: #fff; + width: 100%; + height: auto; + overflow: hidden; + padding: 40rpx 40rpx 0 0; + border-bottom: 1px solid #d9d9d9; } -.sort-box-category .item{ - height: 54rpx; - line-height: 54rpx; - text-align: center; - float: left; - padding: 0 16rpx; - margin: 0 0 40rpx 40rpx; - border: 1px solid #666; - color: #333; - font-size: 24rpx; +.sort-box-category .item { + height: 54rpx; + line-height: 54rpx; + text-align: center; + float: left; + padding: 0 16rpx; + margin: 0 0 40rpx 40rpx; + border: 1px solid #666; + color: #333; + font-size: 24rpx; } -.sort-box-category .item.active{ - color: #b4282d; - border: 1px solid #b4282d; +.sort-box-category .item.active { + color: #b4282d; + border: 1px solid #b4282d; } -.cate-item .b{ +.cate-item .b { width: 750rpx; height: auto; overflow: hidden; @@ -134,7 +134,7 @@ page{ margin-top: 20rpx; } -.cate-item .b .item{ +.cate-item .b .item { float: left; background: #fff; width: 375rpx; @@ -145,17 +145,17 @@ page{ text-align: center; } -.cate-item .b .item-b{ - border-right: 1rpx solid #f4f4f4; +.cate-item .b .item-b { + border-right: 1rpx solid #f4f4f4; } -.cate-item .item .img{ - margin-top: 10rpx; +.cate-item .item .img { + margin-top: 10rpx; width: 302rpx; height: 302rpx; } -.cate-item .item .name{ +.cate-item .item .name { display: block; width: 365.625rpx; height: 35rpx; @@ -167,11 +167,11 @@ page{ color: #333; } -.cate-item .item .price{ +.cate-item .item .price { display: block; width: 365.625rpx; height: 30rpx; text-align: center; font-size: 30rpx; color: #b4282d; -} \ No newline at end of file +} diff --git a/litemall-wx/pages/index/index.js b/litemall-wx/pages/index/index.js index 882dd786..1dfb0de3 100644 --- a/litemall-wx/pages/index/index.js +++ b/litemall-wx/pages/index/index.js @@ -6,113 +6,113 @@ const user = require('../../utils/user.js'); const app = getApp(); Page({ - data: { - newGoods: [], - hotGoods: [], - topics: [], - brands: [], - groupons: [], - floorGoods: [], - banner: [], - channel: [] - }, + data: { + newGoods: [], + hotGoods: [], + topics: [], + brands: [], + groupons: [], + floorGoods: [], + banner: [], + channel: [] + }, - onShareAppMessage: function() { - return { - title: 'litemall小程序商场', - desc: '开源微信小程序商城', - path: '/pages/index/index' - } - }, + onShareAppMessage: function() { + return { + title: 'litemall小程序商场', + desc: '开源微信小程序商城', + path: '/pages/index/index' + } + }, - onPullDownRefresh() { - wx.showNavigationBarLoading() //在标题栏中显示加载 - this.getIndexData(); - wx.hideNavigationBarLoading() //完成停止加载 - wx.stopPullDownRefresh() //停止下拉刷新 - }, + onPullDownRefresh() { + wx.showNavigationBarLoading() //在标题栏中显示加载 + this.getIndexData(); + wx.hideNavigationBarLoading() //完成停止加载 + wx.stopPullDownRefresh() //停止下拉刷新 + }, - getIndexData: function() { - let that = this; - util.request(api.IndexUrl).then(function(res) { - if (res.errno === 0) { - that.setData({ - newGoods: res.data.newGoodsList, - hotGoods: res.data.hotGoodsList, - topics: res.data.topicList, - brands: res.data.brandList, - floorGoods: res.data.floorGoodsList, - banner: res.data.banner, - groupons: res.data.grouponList, - channel: res.data.channel + getIndexData: function() { + let that = this; + util.request(api.IndexUrl).then(function(res) { + if (res.errno === 0) { + that.setData({ + newGoods: res.data.newGoodsList, + hotGoods: res.data.hotGoodsList, + topics: res.data.topicList, + brands: res.data.brandList, + floorGoods: res.data.floorGoodsList, + banner: res.data.banner, + groupons: res.data.grouponList, + channel: res.data.channel + }); + } }); - } - }); - }, - onLoad: function(options) { + }, + onLoad: function(options) { - // 页面初始化 options为页面跳转所带来的参数 - if (options.scene) { - //这个scene的值存在则证明首页的开启来源于朋友圈分享的图,同时可以通过获取到的goodId的值跳转导航到对应的详情页 - var scene = decodeURIComponent(options.scene); - console.log("scene:" + scene); + // 页面初始化 options为页面跳转所带来的参数 + if (options.scene) { + //这个scene的值存在则证明首页的开启来源于朋友圈分享的图,同时可以通过获取到的goodId的值跳转导航到对应的详情页 + var scene = decodeURIComponent(options.scene); + console.log("scene:" + scene); - let info_arr = []; - info_arr = scene.split(','); - let _type = info_arr[0]; - let id = info_arr[1]; + let info_arr = []; + info_arr = scene.split(','); + let _type = info_arr[0]; + let id = info_arr[1]; - if (_type == 'goods') { - wx.navigateTo({ - url: '../goods/goods?id=' + id - }); - } else if (_type == 'groupon') { - wx.navigateTo({ - url: '../goods/goods?grouponId=' + id - }); - } else { - wx.navigateTo({ - url: '../index/index' - }); - } - } + if (_type == 'goods') { + wx.navigateTo({ + url: '../goods/goods?id=' + id + }); + } else if (_type == 'groupon') { + wx.navigateTo({ + url: '../goods/goods?grouponId=' + id + }); + } else { + wx.navigateTo({ + url: '../index/index' + }); + } + } - // 页面初始化 options为页面跳转所带来的参数 - if (options.grouponId) { - //这个pageId的值存在则证明首页的开启来源于用户点击来首页,同时可以通过获取到的pageId的值跳转导航到对应的详情页 - wx.navigateTo({ - url: '../goods/goods?grouponId=' + options.grouponId - }); - } + // 页面初始化 options为页面跳转所带来的参数 + if (options.grouponId) { + //这个pageId的值存在则证明首页的开启来源于用户点击来首页,同时可以通过获取到的pageId的值跳转导航到对应的详情页 + wx.navigateTo({ + url: '../goods/goods?grouponId=' + options.grouponId + }); + } - // 页面初始化 options为页面跳转所带来的参数 - if (options.goodId) { - //这个goodId的值存在则证明首页的开启来源于分享,同时可以通过获取到的goodId的值跳转导航到对应的详情页 - wx.navigateTo({ - url: '../goods/goods?id=' + options.goodId - }); - } + // 页面初始化 options为页面跳转所带来的参数 + if (options.goodId) { + //这个goodId的值存在则证明首页的开启来源于分享,同时可以通过获取到的goodId的值跳转导航到对应的详情页 + wx.navigateTo({ + url: '../goods/goods?id=' + options.goodId + }); + } - // 页面初始化 options为页面跳转所带来的参数 - if (options.orderId) { - //这个orderId的值存在则证明首页的开启来源于订单模版通知,同时可以通过获取到的pageId的值跳转导航到对应的详情页 - wx.navigateTo({ - url: '../ucenter/orderDetail/orderDetail?id=' + options.orderId - }); - } + // 页面初始化 options为页面跳转所带来的参数 + if (options.orderId) { + //这个orderId的值存在则证明首页的开启来源于订单模版通知,同时可以通过获取到的pageId的值跳转导航到对应的详情页 + wx.navigateTo({ + url: '../ucenter/orderDetail/orderDetail?id=' + options.orderId + }); + } - this.getIndexData(); - }, - onReady: function() { - // 页面渲染完成 - }, - onShow: function() { - // 页面显示 - }, - onHide: function() { - // 页面隐藏 - }, - onUnload: function() { - // 页面关闭 - }, + this.getIndexData(); + }, + onReady: function() { + // 页面渲染完成 + }, + onShow: function() { + // 页面显示 + }, + onHide: function() { + // 页面隐藏 + }, + onUnload: function() { + // 页面关闭 + }, }) \ No newline at end of file diff --git a/litemall-wx/pages/index/index.json b/litemall-wx/pages/index/index.json index a0d6cacf..51a4f9e0 100644 --- a/litemall-wx/pages/index/index.json +++ b/litemall-wx/pages/index/index.json @@ -1,6 +1,6 @@ { - "navigationBarTitleText": "首页", - "usingComponents": { - "zan-capsule": "../../lib/zanui-weapp/capsule/index" - } + "navigationBarTitleText": "首页", + "usingComponents": { + "zan-capsule": "../../lib/zanui-weapp/capsule/index" + } } \ No newline at end of file diff --git a/litemall-wx/pages/index/index.wxml b/litemall-wx/pages/index/index.wxml index 58bb08bd..793df7cd 100644 --- a/litemall-wx/pages/index/index.wxml +++ b/litemall-wx/pages/index/index.wxml @@ -1,157 +1,157 @@ - - - - - {{item.name}} - - + + + + + {{item.name}} + + - - - - - - 团购专区 + + + + + + 团购专区 + + + + + + + + + + + + {{item.goods.name}} + + + + + {{item.goods.brief}} + + 原价：￥{{item.goods.counterPrice}} + 现价：￥{{item.groupon_price}} + + + + + + + + + + + + 品牌制造商直供 - + + + + + + + {{item.name}} + {{item.floorPrice}} + 元起 + + + + + - - - - - - - - {{item.goods.name}} - - + + + + + 周一周四 · 新品首发 + + + + + + + + {{item.name}} + ￥{{item.retailPrice}} + + + + + + + + + + 人气推荐 + + + + + + + + + + {{item.name}} + {{item.brief}} + ￥{{item.retailPrice}} + + + + + + + + + + + + 专题精选 + + + + + + + + + + {{item.title}} + ￥{{item.price}}元起 + + {{item.subtitle}} + - - {{item.goods.brief}} - - 原价：￥{{item.goods.counterPrice}} - 现价：￥{{item.groupon_price}} - - - - - - - - - - - - 品牌制造商直供 - - - - - - - - - {{item.name}} - {{item.floorPrice}} - 元起 - - - - - - - - - - - 周一周四 · 新品首发 - - - - - - - - {{item.name}} - ￥{{item.retailPrice}} - - - - - - - - - - 人气推荐 - - - - - - - - - - {{item.name}} - {{item.brief}} - ￥{{item.retailPrice}} - - - - - - - - - - - - 专题精选 - - - - - - - - - - {{item.title}} - ￥{{item.price}}元起 - - {{item.subtitle}} - + - - - - + + {{item.name}} - - - - - - - {{iitem.name}} - ￥{{iitem.retailPrice}} - - + + + + + + {{iitem.name}} + ￥{{iitem.retailPrice}} + + + + + + {{'更多'+item.name+'好物 >'}} + - - {{'更多'+item.name+'好物 >'}} - - \ No newline at end of file diff --git a/litemall-wx/pages/index/index.wxss b/litemall-wx/pages/index/index.wxss index ba2b353e..2d05dd3a 100644 --- a/litemall-wx/pages/index/index.wxss +++ b/litemall-wx/pages/index/index.wxss @@ -9,20 +9,15 @@ } .m-menu { - /* border: 1px solid black; */ - /* height: 280rpx; */ background: #fff; - /* padding: 0 25rpx; */ display: flex; - /* justify-content: center; */ align-items: center; flex-wrap: wrap; padding-bottom: 0rpx; - padding-top: 25rpx + padding-top: 25rpx; } .m-menu .item { - /* border: 1px solid black; */ width: 150rpx; height: 126rpx; } @@ -116,7 +111,7 @@ margin-left: 1rpx; } -.a-brand .item-1:nth-child(2n+1){ +.a-brand .item-1:nth-child(2n+1) { margin-left: 0; width: 374rpx; } @@ -127,89 +122,89 @@ } .a-groupon { - width: 750rpx; - height: auto; - overflow: hidden; + width: 750rpx; + height: auto; + overflow: hidden; } .a-groupon .b .item { - border-top: 1px solid #d9d9d9; - margin: 0 20rpx; - height: 244rpx; - width: 710rpx; + border-top: 1px solid #d9d9d9; + margin: 0 20rpx; + height: 244rpx; + width: 710rpx; } .a-groupon .b .img { - margin-top: 12rpx; - margin-right: 12rpx; - float: left; - width: 220rpx; - height: 220rpx; + margin-top: 12rpx; + margin-right: 12rpx; + float: left; + width: 220rpx; + height: 220rpx; } .a-groupon .b .right { - float: left; - height: 244rpx; - width: 476rpx; - display: flex; - flex-flow: row nowrap; + float: left; + height: 244rpx; + width: 476rpx; + display: flex; + flex-flow: row nowrap; } .a-groupon .b .text { - display: flex; - flex-wrap: nowrap; - flex-direction: column; - justify-content: center; - overflow: hidden; - height: 244rpx; - width: 476rpx; + display: flex; + flex-wrap: nowrap; + flex-direction: column; + justify-content: center; + overflow: hidden; + height: 244rpx; + width: 476rpx; } .a-groupon .b .name { - float: left; - width: 330rpx; - display: block; - color: #333; - line-height: 50rpx; - font-size: 30rpx; + float: left; + width: 330rpx; + display: block; + color: #333; + line-height: 50rpx; + font-size: 30rpx; } .a-groupon .capsule-tag { - float: right; - padding-right: 0rpx; - padding-top: 8rpx; + float: right; + padding-right: 0rpx; + padding-top: 8rpx; } .a-groupon .zan-capsule + .zan-capsule { - margin-left: 10px; + margin-left: 10px; } .a-groupon .b .desc { - width: 476rpx; - display: block; - color: #999; - line-height: 50rpx; - font-size: 25rpx; + width: 476rpx; + display: block; + color: #999; + line-height: 50rpx; + font-size: 25rpx; } .a-groupon .b .price { - width: 476rpx; - display: flex; - color: #AB956D; - line-height: 50rpx; - font-size: 33rpx; + width: 476rpx; + display: flex; + color: #ab956d; + line-height: 50rpx; + font-size: 33rpx; } .a-groupon .b .counterPrice { - text-decoration: line-through; - font-size: 28rpx; - color: #999; + text-decoration: line-through; + font-size: 28rpx; + color: #999; } .a-groupon .b .retailPrice { - margin-left: 30rpx; - font-size: 28rpx; - color: #a78845; + margin-left: 30rpx; + font-size: 28rpx; + color: #a78845; } .a-new .b { @@ -252,7 +247,7 @@ text-align: center; line-height: 30rpx; font-size: 30rpx; - color: #AB956D; + color: #ab956d; } .a-popular { @@ -313,7 +308,7 @@ .a-popular .b .price { width: 456rpx; display: block; - color: #AB956D; + color: #ab956d; line-height: 50rpx; font-size: 33rpx; } @@ -357,7 +352,7 @@ .a-topic .b .np .price { margin-left: 20.8rpx; - color: #AB956D; + color: #ab956d; } .a-topic .b .desc { @@ -367,7 +362,7 @@ font-size: 24rpx; white-space: nowrap; overflow: hidden; - text-overflow:ellipsis; + text-overflow: ellipsis; } .good-grid { @@ -403,7 +398,7 @@ text-align: center; } -.good-grid .b .item .a{ +.good-grid .b .item .a { height: 452rpx; width: 100%; } @@ -436,7 +431,7 @@ height: 30rpx; text-align: center; font-size: 30rpx; - color: #AB956D; + color: #ab956d; } .good-grid .t { diff --git a/litemall-wx/pages/newGoods/newGoods.js b/litemall-wx/pages/newGoods/newGoods.js index c4c96204..5b001ea9 100644 --- a/litemall-wx/pages/newGoods/newGoods.js +++ b/litemall-wx/pages/newGoods/newGoods.js @@ -18,9 +18,9 @@ Page({ page: 1, size: 100 }, - getBanner: function () { + getBanner: function() { let that = this; - util.request(api.GoodsNew).then(function (res) { + util.request(api.GoodsNew).then(function(res) { if (res.errno === 0) { that.setData({ bannerInfo: res.data.bannerInfo, @@ -31,8 +31,15 @@ Page({ getGoodsList: function() { var that = this; - util.request(api.GoodsList, { isNew: true, page: that.data.page, size: that.data.size, order: that.data.currentSortOrder, sort: that.data.currentSort, categoryId: that.data.categoryId }) - .then(function (res) { + util.request(api.GoodsList, { + isNew: true, + page: that.data.page, + size: that.data.size, + order: that.data.currentSortOrder, + sort: that.data.currentSort, + categoryId: that.data.categoryId + }) + .then(function(res) { if (res.errno === 0) { that.setData({ goodsList: res.data.goodsList, @@ -41,27 +48,27 @@ Page({ } }); }, - onLoad: function (options) { + onLoad: function(options) { // 页面初始化 options为页面跳转所带来的参数 this.getBanner(); this.getGoodsList(); }, - onReady: function () { + onReady: function() { // 页面渲染完成 }, - onShow: function () { + onShow: function() { // 页面显示 }, - onHide: function () { + onHide: function() { // 页面隐藏 }, - onUnload: function () { + onUnload: function() { // 页面关闭 }, - openSortFilter: function (event) { + openSortFilter: function(event) { let currentId = event.currentTarget.id; switch (currentId) { case 'categoryFilter': @@ -98,7 +105,7 @@ Page({ this.getGoodsList(); } }, - selectCategory: function (event) { + selectCategory: function(event) { let currentIndex = event.target.dataset.categoryIndex; this.setData({ 'categoryFilter': false, diff --git a/litemall-wx/pages/newGoods/newGoods.wxml b/litemall-wx/pages/newGoods/newGoods.wxml index f54f5bcf..14698e18 100644 --- a/litemall-wx/pages/newGoods/newGoods.wxml +++ b/litemall-wx/pages/newGoods/newGoods.wxml @@ -12,7 +12,7 @@ - + 综合 diff --git a/litemall-wx/pages/newGoods/newGoods.wxss b/litemall-wx/pages/newGoods/newGoods.wxss index e4a8b891..d0b1d349 100644 --- a/litemall-wx/pages/newGoods/newGoods.wxss +++ b/litemall-wx/pages/newGoods/newGoods.wxss @@ -1,132 +1,132 @@ -page{ - background: #f4f4f4; +page { + background: #f4f4f4; } -.brand-info .name{ - width: 100%; - height: 278rpx; - position: relative; +.brand-info .name { + width: 100%; + height: 278rpx; + position: relative; } -.brand-info .img{ - position: absolute; - top:0; - left:0; - width: 100%; - height: 278rpx; +.brand-info .img { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 278rpx; } -.brand-info .info-box{ - position: absolute; - top:0; - left:0; - width: 100%; - height: 278rpx; - text-align: center; - display: flex; - justify-content: center; - align-items: center; +.brand-info .info-box { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 278rpx; + text-align: center; + display: flex; + justify-content: center; + align-items: center; } -.brand-info .info{ - display: block; +.brand-info .info { + display: block; } -.brand-info .txt{ - display: block; - height: 40rpx; - font-size: 37.5rpx; - color: #fff; +.brand-info .txt { + display: block; + height: 40rpx; + font-size: 37.5rpx; + color: #fff; } -.brand-info .line{ - margin: 0 auto; - margin-top: 16rpx; - display: block; - height: 2rpx; - width: 145rpx; - background: #fff; +.brand-info .line { + margin: 0 auto; + margin-top: 16rpx; + display: block; + height: 2rpx; + width: 145rpx; + background: #fff; } -.sort{ - position: relative; - background: #fff; - width: 100%; - height: 78rpx; +.sort { + position: relative; + background: #fff; + width: 100%; + height: 78rpx; } -.sort-box{ - background: #fff; - width: 100%; - height: 78rpx; - overflow: hidden; - padding: 0 30rpx; - display: flex; - border-bottom: 1px solid #d9d9d9; +.sort-box { + background: #fff; + width: 100%; + height: 78rpx; + overflow: hidden; + padding: 0 30rpx; + display: flex; + border-bottom: 1px solid #d9d9d9; } -.sort-box .item{ - height: 78rpx; - line-height: 78rpx; - text-align: center; - flex:1; - color: #333; - font-size: 30rpx; +.sort-box .item { + height: 78rpx; + line-height: 78rpx; + text-align: center; + flex: 1; + color: #333; + font-size: 30rpx; } -.sort-box .item .txt{ - display: block; - width: 100%; - height: 100%; - color: #333; +.sort-box .item .txt { + display: block; + width: 100%; + height: 100%; + color: #333; } -.sort-box .item.active .txt{ - color: #b4282d; +.sort-box .item.active .txt { + color: #b4282d; } -.sort-box .item.by-price{ - background: url(//yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/no-3127092a69.png) 155rpx center no-repeat; - background-size: 15rpx 21rpx; +.sort-box .item.by-price { + background: url(//yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/no-3127092a69.png) 155rpx center no-repeat; + background-size: 15rpx 21rpx; } -.sort-box .item.by-price.active.asc{ - background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/up-636b92c0a5.png) 155rpx center no-repeat; - background-size: 15rpx 21rpx; +.sort-box .item.by-price.active.asc { + background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/up-636b92c0a5.png) 155rpx center no-repeat; + background-size: 15rpx 21rpx; } -.sort-box .item.by-price.active.desc{ - background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/down-95e035f3e5.png) 155rpx center no-repeat; - background-size: 15rpx 21rpx; +.sort-box .item.by-price.active.desc { + background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/down-95e035f3e5.png) 155rpx center no-repeat; + background-size: 15rpx 21rpx; } -.sort-box-category{ - background: #fff; - width: 100%; - height: auto; - overflow: hidden; - padding: 40rpx 40rpx 0 0; - border-bottom: 1px solid #d9d9d9; +.sort-box-category { + background: #fff; + width: 100%; + height: auto; + overflow: hidden; + padding: 40rpx 40rpx 0 0; + border-bottom: 1px solid #d9d9d9; } -.sort-box-category .item{ - height: 54rpx; - line-height: 54rpx; - text-align: center; - float: left; - padding: 0 16rpx; - margin: 0 0 40rpx 40rpx; - border: 1px solid #666; - color: #333; - font-size: 24rpx; +.sort-box-category .item { + height: 54rpx; + line-height: 54rpx; + text-align: center; + float: left; + padding: 0 16rpx; + margin: 0 0 40rpx 40rpx; + border: 1px solid #666; + color: #333; + font-size: 24rpx; } -.sort-box-category .item.active{ - color: #b4282d; - border: 1px solid #b4282d; +.sort-box-category .item.active { + color: #b4282d; + border: 1px solid #b4282d; } -.cate-item .b{ +.cate-item .b { width: 750rpx; height: auto; overflow: hidden; @@ -134,7 +134,7 @@ page{ margin-top: 20rpx; } -.cate-item .b .item{ +.cate-item .b .item { float: left; background: #fff; width: 375rpx; @@ -145,17 +145,17 @@ page{ text-align: center; } -.cate-item .b .item-b{ - border-right: 1rpx solid #f4f4f4; +.cate-item .b .item-b { + border-right: 1rpx solid #f4f4f4; } -.cate-item .item .img{ - margin-top: 10rpx; +.cate-item .item .img { + margin-top: 10rpx; width: 302rpx; height: 302rpx; } -.cate-item .item .name{ +.cate-item .item .name { display: block; width: 365.625rpx; height: 35rpx; @@ -167,11 +167,11 @@ page{ color: #333; } -.cate-item .item .price{ +.cate-item .item .price { display: block; width: 365.625rpx; height: 30rpx; text-align: center; font-size: 30rpx; color: #b4282d; -} \ No newline at end of file +} diff --git a/litemall-wx/pages/payResult/payResult.js b/litemall-wx/pages/payResult/payResult.js index 7906d9c0..64ea8f5e 100644 --- a/litemall-wx/pages/payResult/payResult.js +++ b/litemall-wx/pages/payResult/payResult.js @@ -7,25 +7,25 @@ Page({ status: false, orderId: 0 }, - onLoad: function (options) { + onLoad: function(options) { // 页面初始化 options为页面跳转所带来的参数 this.setData({ orderId: options.orderId, status: options.status === '1' ? true : false }) }, - onReady: function () { + onReady: function() { }, - onShow: function () { + onShow: function() { // 页面显示 }, - onHide: function () { + onHide: function() { // 页面隐藏 }, - onUnload: function () { + onUnload: function() { // 页面关闭 }, @@ -57,7 +57,7 @@ Page({ util.request(api.OrderPrepay, { orderId: that.data.orderId - }, 'POST').then(function (res) { + }, 'POST').then(function(res) { if (res.errno === 0) { const payParam = res.data; console.log("支付过程开始") @@ -67,17 +67,17 @@ Page({ 'package': payParam.packageValue, 'signType': payParam.signType, 'paySign': payParam.paySign, - 'success': function (res) { + 'success': function(res) { console.log("支付过程成功") that.setData({ status: true }); }, - 'fail': function (res) { + 'fail': function(res) { console.log("支付过程失败") util.showErrorToast('支付失败'); }, - 'complete': function (res) { + 'complete': function(res) { console.log("支付过程结束") } }); diff --git a/litemall-wx/pages/payResult/payResult.wxml b/litemall-wx/pages/payResult/payResult.wxml index 9cd2eca3..ab27c180 100644 --- a/litemall-wx/pages/payResult/payResult.wxml +++ b/litemall-wx/pages/payResult/payResult.wxml @@ -10,7 +10,8 @@ 付款失败 - 请在 半小时 内完成付款 + 请在 + 半小时 内完成付款 否则订单将会被系统取消 diff --git a/litemall-wx/pages/payResult/payResult.wxss b/litemall-wx/pages/payResult/payResult.wxss index 9a46c1f4..3811ad40 100644 --- a/litemall-wx/pages/payResult/payResult.wxss +++ b/litemall-wx/pages/payResult/payResult.wxss @@ -33,7 +33,7 @@ page { width: 200rpx; line-height: 78rpx; border: 1px solid #868686; - color: #000000; + color: #000; border-radius: 5rpx; } @@ -56,4 +56,4 @@ page { .pay-result .error .tips .p { line-height: 42rpx; text-align: center; -} \ No newline at end of file +} diff --git a/litemall-wx/pages/search/search.js b/litemall-wx/pages/search/search.js index 86154e4f..88a4c61a 100644 --- a/litemall-wx/pages/search/search.js +++ b/litemall-wx/pages/search/search.js @@ -21,23 +21,23 @@ Page({ categoryId: 0 }, //事件处理函数 - closeSearch: function () { + closeSearch: function() { wx.navigateBack() }, - clearKeyword: function () { + clearKeyword: function() { this.setData({ keyword: '', searchStatus: false }); }, - onLoad: function () { + onLoad: function() { this.getSearchKeyword(); }, getSearchKeyword() { let that = this; - util.request(api.SearchIndex).then(function (res) { + util.request(api.SearchIndex).then(function(res) { if (res.errno === 0) { that.setData({ historyKeyword: res.data.historyKeywordList, @@ -48,7 +48,7 @@ Page({ }); }, - inputChange: function (e) { + inputChange: function(e) { this.setData({ keyword: e.detail.value, searchStatus: false @@ -58,7 +58,7 @@ Page({ this.getHelpKeyword(); } }, - getHelpKeyword: function () { + getHelpKeyword: function() { let that = this; util.request(api.SearchHelper, { keyword: that.data.keyword @@ -70,7 +70,7 @@ Page({ } }); }, - inputFocus: function () { + inputFocus: function() { this.setData({ searchStatus: false, goodsList: [] @@ -80,17 +80,17 @@ Page({ this.getHelpKeyword(); } }, - clearHistory: function () { + clearHistory: function() { this.setData({ historyKeyword: [] }) util.request(api.SearchClearHistory, {}, 'POST') - .then(function (res) { + .then(function(res) { console.log('清除成功'); }); }, - getGoodsList: function () { + getGoodsList: function() { let that = this; util.request(api.GoodsList, { keyword: that.data.keyword, @@ -113,7 +113,7 @@ Page({ that.getSearchKeyword(); }); }, - onKeywordTap: function (event) { + onKeywordTap: function(event) { this.getSearchResult(event.target.dataset.keyword); diff --git a/litemall-wx/pages/search/search.wxml b/litemall-wx/pages/search/search.wxml index 818296d5..e146bf56 100644 --- a/litemall-wx/pages/search/search.wxml +++ b/litemall-wx/pages/search/search.wxml @@ -8,55 +8,55 @@ 取消 - - - 历史记录 - + + + 历史记录 + + + + {{item.keyword}} + - - {{item.keyword}} + + + 热门搜索 + + + {{item.keyword}} + - - - - 热门搜索 + + {{item}} - - {{item.keyword}} - - - - {{item}} - - - - 综合 + + + 综合 + + + 价格 + + + 分类 + - - 价格 - - - 分类 + + {{item.name}} - - {{item.name}} + + + + + {{iitem.name}} + ￥{{iitem.retailPrice}} + + - - - - - {{iitem.name}} - ￥{{iitem.retailPrice}} - - - - diff --git a/litemall-wx/pages/search/search.wxss b/litemall-wx/pages/search/search.wxss index 39d24d95..47c50c07 100644 --- a/litemall-wx/pages/search/search.wxss +++ b/litemall-wx/pages/search/search.wxss @@ -1,278 +1,277 @@ -page{ +page { min-height: 100%; background-color: #f4f4f4; } -.container{ +.container { min-height: 100%; background-color: #f4f4f4; } -.search-header{ - position: fixed; - top: 0; - width: 750rpx; - height: 91rpx; - display: flex; - background: #fff; - border-bottom: 1px solid rgba(0,0,0,.15); - padding: 0 31.25rpx; - font-size: 29rpx; - color: #333; +.search-header { + position: fixed; + top: 0; + width: 750rpx; + height: 91rpx; + display: flex; + background: #fff; + border-bottom: 1px solid rgba(0, 0, 0, 0.15); + padding: 0 31.25rpx; + font-size: 29rpx; + color: #333; } -.search-header .input-box{ - position: relative; - margin-top: 16rpx; - float: left; - width: 0; - flex: 1; - height: 59rpx; - line-height: 59rpx; - padding: 0 20rpx; - background: #f4f4f4; +.search-header .input-box { + position: relative; + margin-top: 16rpx; + float: left; + width: 0; + flex: 1; + height: 59rpx; + line-height: 59rpx; + padding: 0 20rpx; + background: #f4f4f4; } -.search-header .icon{ - position: absolute; - top: 14rpx; - left: 20rpx; - width: 31rpx; - height: 31rpx; +.search-header .icon { + position: absolute; + top: 14rpx; + left: 20rpx; + width: 31rpx; + height: 31rpx; } -.search-header .del{ - position: absolute; - top: 3rpx; - right: 10rpx; - width: 53rpx; - height: 53rpx; - z-index: 10; +.search-header .del { + position: absolute; + top: 3rpx; + right: 10rpx; + width: 53rpx; + height: 53rpx; + z-index: 10; } -.search-header .keywrod{ - position: absolute; - top: 0; - left: 40rpx; - width: 506rpx; - height: 59rpx; - padding-left: 30rpx; +.search-header .keywrod { + position: absolute; + top: 0; + left: 40rpx; + width: 506rpx; + height: 59rpx; + padding-left: 30rpx; } -.search-header .right{ - margin-top: 24rpx; - margin-left: 31rpx; - margin-right: 6rpx; - width: 58rpx; - height: 43rpx; - line-height: 43rpx; - float: right; +.search-header .right { + margin-top: 24rpx; + margin-left: 31rpx; + margin-right: 6rpx; + width: 58rpx; + height: 43rpx; + line-height: 43rpx; + float: right; } -.no-search{ - height: auto; - overflow: hidden; - margin-top: 91rpx; +.no-search { + height: auto; + overflow: hidden; + margin-top: 91rpx; } -.search-keywords{ - background: #fff; - width: 750rpx; - height: auto; - overflow: hidden; - margin-bottom: 20rpx; +.search-keywords { + background: #fff; + width: 750rpx; + height: auto; + overflow: hidden; + margin-bottom: 20rpx; } -.search-keywords .h{ - padding: 0 31.25rpx; - height: 93rpx; - line-height: 93rpx; - width: 100%; - color: #999; - font-size: 29rpx; +.search-keywords .h { + padding: 0 31.25rpx; + height: 93rpx; + line-height: 93rpx; + width: 100%; + color: #999; + font-size: 29rpx; } -.search-keywords .title{ - display: block; - width: 120rpx; - float: left; +.search-keywords .title { + display: block; + width: 120rpx; + float: left; } -.search-keywords .icon{ - margin-top: 19rpx; - float: right; - display: block; - margin-left: 511rpx; - height: 55rpx; - width: 55rpx; +.search-keywords .icon { + margin-top: 19rpx; + float: right; + display: block; + margin-left: 511rpx; + height: 55rpx; + width: 55rpx; } -.search-keywords .b{ - width: 750rpx; - height: auto; - overflow: hidden; - padding-left: 31.25rpx; +.search-keywords .b { + width: 750rpx; + height: auto; + overflow: hidden; + padding-left: 31.25rpx; } -.search-keywords .item{ - display: inline-block; - width: auto; - height: 48rpx; - line-height: 48rpx; - padding:0 15rpx; - border: 1px solid #999; - margin: 0 31.25rpx 31.25rpx 0; - font-size: 24rpx; - color: #333; +.search-keywords .item { + display: inline-block; + width: auto; + height: 48rpx; + line-height: 48rpx; + padding: 0 15rpx; + border: 1px solid #999; + margin: 0 31.25rpx 31.25rpx 0; + font-size: 24rpx; + color: #333; } -.search-keywords .item.active{ - color: #b4282d; - border: 1px solid #b4282d; +.search-keywords .item.active { + color: #b4282d; + border: 1px solid #b4282d; } -.shelper-list{ - width: 750rpx; - height: auto; - overflow: hidden; - background: #fff; - padding: 0 31.25rpx; +.shelper-list { + width: 750rpx; + height: auto; + overflow: hidden; + background: #fff; + padding: 0 31.25rpx; } -.shelper-list .item{ - height: 93rpx; - width: 687.5rpx; - line-height: 93rpx; - font-size: 24rpx; - color: #333; - border-bottom: 1px solid #f4f4f4; +.shelper-list .item { + height: 93rpx; + width: 687.5rpx; + line-height: 93rpx; + font-size: 24rpx; + color: #333; + border-bottom: 1px solid #f4f4f4; } - -.sort{ - position: fixed; - top: 91rpx; - background: #fff; - width: 100%; - height: 78rpx; +.sort { + position: fixed; + top: 91rpx; + background: #fff; + width: 100%; + height: 78rpx; } -.sort-box{ - background: #fff; - width: 100%; - height: 78rpx; - overflow: hidden; - padding: 0 30rpx; - display: flex; - border-bottom: 1px solid #d9d9d9; +.sort-box { + background: #fff; + width: 100%; + height: 78rpx; + overflow: hidden; + padding: 0 30rpx; + display: flex; + border-bottom: 1px solid #d9d9d9; } -.sort-box .item{ - height: 78rpx; - line-height: 78rpx; - text-align: center; - flex:1; - color: #333; - font-size: 30rpx; +.sort-box .item { + height: 78rpx; + line-height: 78rpx; + text-align: center; + flex: 1; + color: #333; + font-size: 30rpx; } -.sort-box .item .txt{ - display: block; - width: 100%; - height: 100%; - color: #333; +.sort-box .item .txt { + display: block; + width: 100%; + height: 100%; + color: #333; } -.sort-box .item.active .txt{ - color: #b4282d; +.sort-box .item.active .txt { + color: #b4282d; } -.sort-box .item.by-price{ - background: url(//yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/no-3127092a69.png) 155rpx center no-repeat; - background-size: 15rpx 21rpx; +.sort-box .item.by-price { + background: url(//yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/no-3127092a69.png) 155rpx center no-repeat; + background-size: 15rpx 21rpx; } -.sort-box .item.by-price.active.asc{ - background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/up-636b92c0a5.png) 155rpx center no-repeat; - background-size: 15rpx 21rpx; +.sort-box .item.by-price.active.asc { + background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/up-636b92c0a5.png) 155rpx center no-repeat; + background-size: 15rpx 21rpx; } -.sort-box .item.by-price.active.desc{ - background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/down-95e035f3e5.png) 155rpx center no-repeat; - background-size: 15rpx 21rpx; +.sort-box .item.by-price.active.desc { + background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/down-95e035f3e5.png) 155rpx center no-repeat; + background-size: 15rpx 21rpx; } -.sort-box-category{ - background: #fff; - width: 100%; - height: auto; - overflow: hidden; - padding: 40rpx 40rpx 0 0; - border-bottom: 1px solid #d9d9d9; +.sort-box-category { + background: #fff; + width: 100%; + height: auto; + overflow: hidden; + padding: 40rpx 40rpx 0 0; + border-bottom: 1px solid #d9d9d9; } -.sort-box-category .item{ - height: 54rpx; - line-height: 54rpx; - text-align: center; - float: left; - padding: 0 16rpx; - margin: 0 0 40rpx 40rpx; - border: 1px solid #666; - color: #333; - font-size: 24rpx; +.sort-box-category .item { + height: 54rpx; + line-height: 54rpx; + text-align: center; + float: left; + padding: 0 16rpx; + margin: 0 0 40rpx 40rpx; + border: 1px solid #666; + color: #333; + font-size: 24rpx; } -.sort-box-category .item.active{ - color: #b4282d; - border: 1px solid #b4282d; +.sort-box-category .item.active { + color: #b4282d; + border: 1px solid #b4282d; } -.cate-item{ - margin-top: 175rpx; - height: auto; - overflow: hidden; +.cate-item { + margin-top: 175rpx; + height: auto; + overflow: hidden; } -.cate-item .h{ - height: 145rpx; - width: 750rpx; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; +.cate-item .h { + height: 145rpx; + width: 750rpx; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; } -.cate-item .h .name{ - display: block; - height: 35rpx; - margin-bottom: 18rpx; - font-size: 30rpx; - color: #333; +.cate-item .h .name { + display: block; + height: 35rpx; + margin-bottom: 18rpx; + font-size: 30rpx; + color: #333; } -.cate-item .h .desc{ - display: block; - height: 24rpx; - font-size: 24rpx; - color: #999; +.cate-item .h .desc { + display: block; + height: 24rpx; + font-size: 24rpx; + color: #999; } -.cate-item .b{ +.cate-item .b { width: 750rpx; padding: 0 6.25rpx; height: auto; overflow: hidden; } -.cate-item .list-filter{ - height: 80rpx; - width: 100%; - background: #fff; - margin-bottom: 6.25rpx; +.cate-item .list-filter { + height: 80rpx; + width: 100%; + background: #fff; + margin-bottom: 6.25rpx; } -.cate-item .b .item{ +.cate-item .b .item { float: left; background: #fff; width: 365rpx; @@ -283,16 +282,16 @@ page{ text-align: center; } -.cate-item .b .item-b{ +.cate-item .b .item-b { margin-left: 6.25rpx; } -.cate-item .item .img{ +.cate-item .item .img { width: 302rpx; height: 302rpx; } -.cate-item .item .name{ +.cate-item .item .name { display: block; width: 365.625rpx; height: 35rpx; @@ -304,7 +303,7 @@ page{ color: #333; } -.cate-item .item .price{ +.cate-item .item .price { display: block; width: 365.625rpx; height: 30rpx; @@ -313,24 +312,24 @@ page{ color: #b4282d; } -.search-result-empty{ - width: 100%; - height: 100%; - padding-top: 300rpx; +.search-result-empty { + width: 100%; + height: 100%; + padding-top: 300rpx; } -.search-result-empty .icon{ - margin: 0 auto; - display: block; - width: 240rpx; - height: 240rpx; +.search-result-empty .icon { + margin: 0 auto; + display: block; + width: 240rpx; + height: 240rpx; } -.search-result-empty .text{ - display: block; - width: 100%; - height: 40rpx; - font-size: 28rpx; - text-align: center; - color: #999; -} \ No newline at end of file +.search-result-empty .text { + display: block; + width: 100%; + height: 40rpx; + font-size: 28rpx; + text-align: center; + color: #999; +} diff --git a/litemall-wx/pages/topic/topic.js b/litemall-wx/pages/topic/topic.js index 0237c73c..d4797017 100644 --- a/litemall-wx/pages/topic/topic.js +++ b/litemall-wx/pages/topic/topic.js @@ -2,82 +2,85 @@ var util = require('../../utils/util.js'); var api = require('../../config/api.js'); var app = getApp() Page({ - data: { - topicList: [], - page: 1, - size: 10, - count: 0, - scrollTop: 0, - showPage: false - }, - onLoad: function (options) { - // 页面初始化 options为页面跳转所带来的参数 - this.getTopic(); - }, - onReady: function () { - // 页面渲染完成 - }, - onShow: function () { - // 页面显示 - }, - onHide: function () { - // 页面隐藏 - }, - onUnload: function () { - // 页面关闭 - }, - nextPage: function (event) { - var that = this; - if (this.data.page > that.data.count / that.data.size) { - return true; - } - - - that.setData({ - page: that.data.page + 1 - }); - - this.getTopic(); - - }, - getTopic: function(){ - - let that = this; - that.setData({ - scrollTop: 0, - showPage: false, - topicList: [] - }); - // 页面渲染完成 - wx.showToast({ - title: '加载中...', - icon: 'loading', - duration: 2000 - }); - - util.request(api.TopicList, { page: that.data.page, size: that.data.size }).then(function (res) { - if (res.errno === 0) { - - that.setData({ - scrollTop: 0, - topicList: res.data.data, - showPage: true, - count: res.data.count - }); - } - wx.hideToast(); - }); - - }, - prevPage: function (event) { - if (this.data.page <= 1) { - return false; - } - - var that = this; - that.setData({ - page: that.data.page - 1 - }); - this.getTopic(); + data: { + topicList: [], + page: 1, + size: 10, + count: 0, + scrollTop: 0, + showPage: false + }, + onLoad: function(options) { + // 页面初始化 options为页面跳转所带来的参数 + this.getTopic(); + }, + onReady: function() { + // 页面渲染完成 + }, + onShow: function() { + // 页面显示 + }, + onHide: function() { + // 页面隐藏 + }, + onUnload: function() { + // 页面关闭 + }, + nextPage: function(event) { + var that = this; + if (this.data.page > that.data.count / that.data.size) { + return true; } + + + that.setData({ + page: that.data.page + 1 + }); + + this.getTopic(); + + }, + getTopic: function() { + + let that = this; + that.setData({ + scrollTop: 0, + showPage: false, + topicList: [] + }); + // 页面渲染完成 + wx.showToast({ + title: '加载中...', + icon: 'loading', + duration: 2000 + }); + + util.request(api.TopicList, { + page: that.data.page, + size: that.data.size + }).then(function(res) { + if (res.errno === 0) { + + that.setData({ + scrollTop: 0, + topicList: res.data.data, + showPage: true, + count: res.data.count + }); + } + wx.hideToast(); + }); + + }, + prevPage: function(event) { + if (this.data.page <= 1) { + return false; + } + + var that = this; + that.setData({ + page: that.data.page - 1 + }); + this.getTopic(); + } }) \ No newline at end of file diff --git a/litemall-wx/pages/topic/topic.wxml b/litemall-wx/pages/topic/topic.wxml index d9da3fd6..b0eb6cd0 100644 --- a/litemall-wx/pages/topic/topic.wxml +++ b/litemall-wx/pages/topic/topic.wxml @@ -1,16 +1,16 @@ - - - - - {{item.title}} - {{item.subtitle}} - {{item.price}}元起 - - - - 上一页 - 下一页 - - + + + + + {{item.title}} + {{item.subtitle}} + {{item.price}}元起 + + + + 上一页 + 下一页 + + \ No newline at end of file diff --git a/litemall-wx/pages/topicComment/topicComment.js b/litemall-wx/pages/topicComment/topicComment.js index d03cf5c8..4602af4a 100644 --- a/litemall-wx/pages/topicComment/topicComment.js +++ b/litemall-wx/pages/topicComment/topicComment.js @@ -17,9 +17,12 @@ Page({ picPage: 1, size: 20 }, - getCommentCount: function () { + getCommentCount: function() { let that = this; - util.request(api.CommentCount, { valueId: that.data.valueId, type: that.data.type}).then(function (res) { + util.request(api.CommentCount, { + valueId: that.data.valueId, + type: that.data.type + }).then(function(res) { if (res.errno === 0) { that.setData({ @@ -29,15 +32,15 @@ Page({ } }); }, - getCommentList: function(){ + getCommentList: function() { let that = this; - util.request(api.CommentList, { - valueId: that.data.valueId, + util.request(api.CommentList, { + valueId: that.data.valueId, type: that.data.type, size: that.data.size, page: (that.data.showType == 0 ? that.data.allPage : that.data.picPage), - showType: that.data.showType - }).then(function (res) { + showType: that.data.showType + }).then(function(res) { if (res.errno === 0) { if (that.data.showType == 0) { @@ -56,7 +59,7 @@ Page({ } }); }, - onLoad: function (options) { + onLoad: function(options) { // 页面初始化 options为页面跳转所带来的参数 this.setData({ type: options.type, @@ -65,39 +68,39 @@ Page({ this.getCommentCount(); this.getCommentList(); }, - onReady: function () { + onReady: function() { // 页面渲染完成 }, - onShow: function () { + onShow: function() { // 页面显示 }, - onHide: function () { + onHide: function() { // 页面隐藏 }, - onUnload: function () { + onUnload: function() { // 页面关闭 }, - switchTab: function () { + switchTab: function() { this.setData({ - showType: this.data.showType == 1 ? 0 :1 + showType: this.data.showType == 1 ? 0 : 1 }); this.getCommentList(); }, - onReachBottom: function(){ + onReachBottom: function() { console.log('onPullDownRefresh'); - if ( this.data.showType == 0) { + if (this.data.showType == 0) { if (this.data.allCount / this.data.size < this.data.allPage) { return false; } this.setData({ - 'allPage' : this.data.allPage + 1 + 'allPage': this.data.allPage + 1 }); } else { if (this.data.hasPicCount / this.data.size < this.data.picPage) { diff --git a/litemall-wx/pages/topicComment/topicComment.wxml b/litemall-wx/pages/topicComment/topicComment.wxml index 89d3cf9b..dc395fa7 100644 --- a/litemall-wx/pages/topicComment/topicComment.wxml +++ b/litemall-wx/pages/topicComment/topicComment.wxml @@ -12,10 +12,6 @@ - diff --git a/litemall-wx/pages/topicComment/topicComment.wxss b/litemall-wx/pages/topicComment/topicComment.wxss index 76f2a1d0..94273c17 100644 --- a/litemall-wx/pages/topicComment/topicComment.wxss +++ b/litemall-wx/pages/topicComment/topicComment.wxss @@ -1,108 +1,107 @@ -.comments{ - width: 100%; - height: auto; - padding-left:30rpx; - background: #fff; - margin: 20rpx 0; +.comments { + width: 100%; + height: auto; + padding-left: 30rpx; + background: #fff; + margin: 20rpx 0; } -.comments .b{ - height: auto; - width: 720rpx; +.comments .b { + height: auto; + width: 720rpx; } -.comments .b.no-h{ - margin-top: 0; +.comments .b.no-h { + margin-top: 0; } -.comments .item{ - height: auto; - width: 720rpx; - overflow: hidden; - border-bottom: 1px solid #d9d9d9; - padding-bottom: 25rpx; +.comments .item { + height: auto; + width: 720rpx; + overflow: hidden; + border-bottom: 1px solid #d9d9d9; + padding-bottom: 25rpx; } -.comments .info{ - height: 127rpx; - width: 100%; - padding: 33rpx 0 27rpx 0; +.comments .info { + height: 127rpx; + width: 100%; + padding: 33rpx 0 27rpx 0; } -.comments .user{ - float: left; - width: auto; - height: 67rpx; - line-height: 67rpx; - font-size: 0; +.comments .user { + float: left; + width: auto; + height: 67rpx; + line-height: 67rpx; + font-size: 0; } -.comments .user image{ - float: left; - width: 67rpx; - height: 67rpx; - margin-right: 17rpx; - border-radius: 50%; +.comments .user image { + float: left; + width: 67rpx; + height: 67rpx; + margin-right: 17rpx; + border-radius: 50%; } -.comments .user text{ - display: inline-block; - width: auto; - height: 66rpx; - overflow: hidden; - font-size: 29rpx; - line-height: 66rpx; +.comments .user text { + display: inline-block; + width: auto; + height: 66rpx; + overflow: hidden; + font-size: 29rpx; + line-height: 66rpx; } -.comments .time{ - display: block; - float: right; - width: auto; - height: 67rpx; - line-height: 67rpx; - color: #7f7f7f; - font-size: 25rpx; - margin-right: 30rpx; +.comments .time { + display: block; + float: right; + width: auto; + height: 67rpx; + line-height: 67rpx; + color: #7f7f7f; + font-size: 25rpx; + margin-right: 30rpx; } -.comments .comment{ - width: 720rpx; - padding-right: 30rpx; - line-height: 45.8rpx; - font-size: 29rpx; - margin-bottom: 16rpx; +.comments .comment { + width: 720rpx; + padding-right: 30rpx; + line-height: 45.8rpx; + font-size: 29rpx; + margin-bottom: 16rpx; } -.comments .imgs{ - width: 720rpx; - height: 150rpx; - margin-bottom: 25rpx; +.comments .imgs { + width: 720rpx; + height: 150rpx; + margin-bottom: 25rpx; } -.comments .imgs .img{ - height: 150rpx; - width: 150rpx; - margin-right: 28rpx; +.comments .imgs .img { + height: 150rpx; + width: 150rpx; + margin-right: 28rpx; } -.comments .customer-service{ - width: 690rpx; - height: auto; - overflow: hidden; - margin-top: 23rpx; - background: rgba(0,0,0,.03); - padding: 21rpx; +.comments .customer-service { + width: 690rpx; + height: auto; + overflow: hidden; + margin-top: 23rpx; + background: rgba(0, 0, 0, 0.03); + padding: 21rpx; } - -.comments .customer-service .u{ - font-size: 24rpx; - color: #333; - line-height: 37.5rpx; +.comments .customer-service .u { + font-size: 24rpx; + color: #333; + line-height: 37.5rpx; } -.comments .customer-service .c{ - font-size: 24rpx; - color: #999; - line-height: 37.5rpx; -} \ No newline at end of file +.comments .customer-service .c { + font-size: 24rpx; + color: #999; + line-height: 37.5rpx; +} diff --git a/litemall-wx/pages/topicCommentPost/topicCommentPost.js b/litemall-wx/pages/topicCommentPost/topicCommentPost.js index 2c931f7a..78ad3ae4 100644 --- a/litemall-wx/pages/topicCommentPost/topicCommentPost.js +++ b/litemall-wx/pages/topicCommentPost/topicCommentPost.js @@ -14,7 +14,7 @@ Page({ picUrls: [], files: [] }, - chooseImage: function (e) { + chooseImage: function(e) { if (this.data.files.length >= 5) { util.showErrorToast('只能上传五张图片') return false; @@ -25,7 +25,7 @@ Page({ count: 1, sizeType: ['original', 'compressed'], sourceType: ['album', 'camera'], - success: function (res) { + success: function(res) { that.setData({ files: that.data.files.concat(res.tempFilePaths) }); @@ -33,13 +33,13 @@ Page({ } }) }, - upload: function (res) { + upload: function(res) { var that = this; const uploadTask = wx.uploadFile({ url: api.StorageUpload, filePath: res.tempFilePaths[0], name: 'file', - success: function (res) { + success: function(res) { var _res = JSON.parse(res.data); if (_res.errno === 0) { var url = _res.data.url @@ -50,7 +50,7 @@ Page({ }) } }, - fail: function (e) { + fail: function(e) { wx.showModal({ title: '错误', content: '上传失败', @@ -66,28 +66,24 @@ Page({ }) }, - previewImage: function (e) { + previewImage: function(e) { wx.previewImage({ current: e.currentTarget.id, // 当前显示图片的http链接 urls: this.data.files // 需要预览的图片http链接列表 }) }, - selectRater: function (e) { + selectRater: function(e) { var star = e.currentTarget.dataset.star + 1; var starText; if (star == 1) { starText = '很差'; - } - else if (star == 2) { + } else if (star == 2) { starText = '不太满意'; - } - else if (star == 3) { + } else if (star == 3) { starText = '满意'; - } - else if (star == 4) { + } else if (star == 4) { starText = '比较满意'; - } - else { + } else { starText = '十分满意' } this.setData({ @@ -96,8 +92,8 @@ Page({ }) }, - onLoad: function (options) { - if (parseInt(options.type) !== 1){ + onLoad: function(options) { + if (parseInt(options.type) !== 1) { return; } @@ -107,9 +103,11 @@ Page({ }); this.getTopic(); }, - getTopic: function () { + getTopic: function() { let that = this; - util.request(api.TopicDetail, { id: that.data.valueId }).then(function (res) { + util.request(api.TopicDetail, { + id: that.data.valueId + }).then(function(res) { if (res.errno === 0) { that.setData({ @@ -117,12 +115,12 @@ Page({ }); } - }); + }); }, - onClose: function () { + onClose: function() { wx.navigateBack(); }, - onPost: function () { + onPost: function() { let that = this; if (!this.data.content) { @@ -137,11 +135,11 @@ Page({ star: that.data.star, hasPicture: that.data.hasPicture, picUrls: that.data.picUrls - }, 'POST').then(function (res) { + }, 'POST').then(function(res) { if (res.errno === 0) { wx.showToast({ title: '评论成功', - complete: function () { + complete: function() { wx.navigateBack(); } }) @@ -161,18 +159,18 @@ Page({ content: event.detail.value, }) }, - onReady: function () { + onReady: function() { }, - onShow: function () { + onShow: function() { // 页面显示 }, - onHide: function () { + onHide: function() { // 页面隐藏 }, - onUnload: function () { + onUnload: function() { // 页面关闭 } diff --git a/litemall-wx/pages/topicCommentPost/topicCommentPost.wxml b/litemall-wx/pages/topicCommentPost/topicCommentPost.wxml index db6f2acb..7bd56495 100644 --- a/litemall-wx/pages/topicCommentPost/topicCommentPost.wxml +++ b/litemall-wx/pages/topicCommentPost/topicCommentPost.wxml @@ -35,10 +35,6 @@ - diff --git a/litemall-wx/pages/topicDetail/topicDetail.js b/litemall-wx/pages/topicDetail/topicDetail.js index 28438a6d..41c4541c 100644 --- a/litemall-wx/pages/topicDetail/topicDetail.js +++ b/litemall-wx/pages/topicDetail/topicDetail.js @@ -12,14 +12,16 @@ Page({ commentList: [], topicGoods: [] }, - onLoad: function (options) { + onLoad: function(options) { // 页面初始化 options为页面跳转所带来的参数 var that = this; that.setData({ id: options.id }); - util.request(api.TopicDetail, { id: that.data.id }).then(function (res) { + util.request(api.TopicDetail, { + id: that.data.id + }).then(function(res) { if (res.errno === 0) { that.setData({ topic: res.data.topic, @@ -30,7 +32,9 @@ Page({ } }); - util.request(api.TopicRelated, { id: that.data.id }).then(function (res) { + util.request(api.TopicRelated, { + id: that.data.id + }).then(function(res) { if (res.errno === 0) { that.setData({ topicList: res.data @@ -40,7 +44,13 @@ Page({ }, getCommentList() { let that = this; - util.request(api.CommentList, { valueId: that.data.id, type: 1, showType: 0, page: 1, size: 5 }).then(function (res) { + util.request(api.CommentList, { + valueId: that.data.id, + type: 1, + showType: 0, + page: 1, + size: 5 + }).then(function(res) { if (res.errno === 0) { that.setData({ commentList: res.data.data, @@ -51,26 +61,27 @@ Page({ }, postComment() { if (!app.globalData.hasLogin) { - wx.navigateTo({ url: "/pages/auth/login/login" }); - } - else { + wx.navigateTo({ + url: "/pages/auth/login/login" + }); + } else { wx.navigateTo({ url: '/pages/topicCommentPost/topicCommentPost?valueId=' + this.data.id + '&type=1', }) } }, - onReady: function () { + onReady: function() { }, - onShow: function () { + onShow: function() { // 页面显示 this.getCommentList(); }, - onHide: function () { + onHide: function() { // 页面隐藏 }, - onUnload: function () { + onUnload: function() { // 页面关闭 } diff --git a/litemall-wx/pages/topicDetail/topicDetail.wxml b/litemall-wx/pages/topicDetail/topicDetail.wxml index 12dfab29..c58bf95f 100644 --- a/litemall-wx/pages/topicDetail/topicDetail.wxml +++ b/litemall-wx/pages/topicDetail/topicDetail.wxml @@ -1,36 +1,36 @@ - -