commit 438b95a78e5453caebc583c6cbf04c3e70c94680 Author: Kiyan Date: Mon Apr 24 17:08:21 2017 +0800 ipaotui mall diff --git a/README.md b/README.md new file mode 100644 index 0000000..e24c0fa --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +#ipaotui-mall diff --git a/app/app.js b/app/app.js new file mode 100644 index 0000000..ad18266 --- /dev/null +++ b/app/app.js @@ -0,0 +1,30 @@ +//app.js +App({ + onLaunch: function () { + //调用API从本地缓存中获取数据 + var logs = wx.getStorageSync('logs') || [] + logs.unshift(Date.now()) + wx.setStorageSync('logs', logs) + }, + getUserInfo:function(cb){ + var that = this + if(this.globalData.userInfo){ + typeof cb == "function" && cb(this.globalData.userInfo) + }else{ + //调用登录接口 + wx.login({ + success: function () { + wx.getUserInfo({ + success: function (res) { + that.globalData.userInfo = res.userInfo + typeof cb == "function" && cb(that.globalData.userInfo) + } + }) + } + }) + } + }, + globalData:{ + userInfo:null + } +}) \ No newline at end of file diff --git a/app/app.json b/app/app.json new file mode 100644 index 0000000..4d42ab5 --- /dev/null +++ b/app/app.json @@ -0,0 +1,46 @@ +{ + "pages": [ + "pages/shop/show", + "pages/index/index", + "pages/order/list", + "pages/mine/mine", + "pages/index/address", + "pages/order/show", + "pages/order/quasi", + "pages/shop/category", + "pages/shop/search", + "pages/address/list", + "pages/address/add", + "pages/address/select" + ], + "window": { + "backgroundColor": "#f8f8f8", + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#ff5801", + "navigationBarTitleText": "爱跑腿外卖", + "navigationBarTextStyle": "light" + }, + "tabBar": { + "selectedColor": "#ff5801", + "list": [ + { + "pagePath": "pages/index/index", + "iconPath": "images/Shop_Tabbar_TakeOut_Empty@2x.png", + "selectedIconPath": "images/Shop_Tabbar_TakeOut_Full@2x.png", + "text": "首页" + }, + { + "pagePath": "pages/order/list", + "iconPath": "images/Shop_Tabbar_Order_Empty@2x.png", + "selectedIconPath": "images/Shop_Tabbar_Order_Full@2x.png", + "text": "订单" + }, + { + "pagePath": "pages/mine/mine", + "iconPath": "images/Shop_Tabbar_My_Empty@2x.png", + "selectedIconPath": "images/Shop_Tabbar_My_Full@2x.png", + "text": "我的" + } + ] + } +} \ No newline at end of file diff --git a/app/app.wxss b/app/app.wxss new file mode 100644 index 0000000..ffd9181 --- /dev/null +++ b/app/app.wxss @@ -0,0 +1,74 @@ +/**app.wxss**/ +@import './weui.wxss'; + +page { + font-size: 16px; + background-color: #f8f8f8; +} + +.primary-color { + color: #ff5801 !important; +} + +.grey-color { + color: #999 !important; +} + +.trangle::after { + content: ""; + margin-top: -4px; + position: absolute; + top: 50%; + right: 5px; + height: 6px; + width: 6px; + border-width: 2rpx 2rpx 0 0; + border-style: solid; + transform: rotate(45deg); +} + +button[type=primary], .weui-btn_primary { + position: relative; + display: block; + margin-left: auto; + margin-right: auto; + padding-left: 14px; + padding-right: 14px; + box-sizing: border-box; + font-size: 18px; + text-align: center; + text-decoration: none; + line-height: 2.55555556; + border-radius: 5px; + -webkit-tap-highlight-color: transparent; + color: #fff; + background-color: #ff5801; +} + +.weui-btn_mini { + display: inline-block; + line-height: 2.3; + font-size: 13px; + padding: 0 1.34em; + border-radius: 0; +} + +button[type="primary"][plain] { + color: #ff5801; + border-color: #ff5801; +} + +.button-hover[type=primary], .button-hover.weui-btn_primary { + color: rgba(255, 255, 255, 0.8); + background-color: #ee5200; +} + +.button-hover[type=primary][plain] { + color: #ee5200; + border-color: #ee5200; +} + +.button-sp-area { + margin-top: 15px; + padding: 0 15px; +} diff --git a/app/images/Shop_Tabbar_My_Empty@2x.png b/app/images/Shop_Tabbar_My_Empty@2x.png new file mode 100644 index 0000000..6933ff1 Binary files /dev/null and b/app/images/Shop_Tabbar_My_Empty@2x.png differ diff --git a/app/images/Shop_Tabbar_My_Full@2x.png b/app/images/Shop_Tabbar_My_Full@2x.png new file mode 100644 index 0000000..5dc009f Binary files /dev/null and b/app/images/Shop_Tabbar_My_Full@2x.png differ diff --git a/app/images/Shop_Tabbar_Order_Empty@2x.png b/app/images/Shop_Tabbar_Order_Empty@2x.png new file mode 100644 index 0000000..8452705 Binary files /dev/null and b/app/images/Shop_Tabbar_Order_Empty@2x.png differ diff --git a/app/images/Shop_Tabbar_Order_Full@2x.png b/app/images/Shop_Tabbar_Order_Full@2x.png new file mode 100644 index 0000000..ffb60bf Binary files /dev/null and b/app/images/Shop_Tabbar_Order_Full@2x.png differ diff --git a/app/images/Shop_Tabbar_TakeOut_Empty@2x.png b/app/images/Shop_Tabbar_TakeOut_Empty@2x.png new file mode 100644 index 0000000..f141ce1 Binary files /dev/null and b/app/images/Shop_Tabbar_TakeOut_Empty@2x.png differ diff --git a/app/images/Shop_Tabbar_TakeOut_Full@2x.png b/app/images/Shop_Tabbar_TakeOut_Full@2x.png new file mode 100644 index 0000000..2e7b01c Binary files /dev/null and b/app/images/Shop_Tabbar_TakeOut_Full@2x.png differ diff --git a/app/images/category/1.png b/app/images/category/1.png new file mode 100644 index 0000000..3bc2231 Binary files /dev/null and b/app/images/category/1.png differ diff --git a/app/images/category/2.png b/app/images/category/2.png new file mode 100644 index 0000000..145e584 Binary files /dev/null and b/app/images/category/2.png differ diff --git a/app/images/category/3.png b/app/images/category/3.png new file mode 100644 index 0000000..141dd87 Binary files /dev/null and b/app/images/category/3.png differ diff --git a/app/images/category/4.png b/app/images/category/4.png new file mode 100644 index 0000000..1149c8b Binary files /dev/null and b/app/images/category/4.png differ diff --git a/app/images/category/5.png b/app/images/category/5.png new file mode 100644 index 0000000..6207b21 Binary files /dev/null and b/app/images/category/5.png differ diff --git a/app/images/category/6.png b/app/images/category/6.png new file mode 100644 index 0000000..843253d Binary files /dev/null and b/app/images/category/6.png differ diff --git a/app/images/category/7.png b/app/images/category/7.png new file mode 100644 index 0000000..a5d818c Binary files /dev/null and b/app/images/category/7.png differ diff --git a/app/images/category/8.png b/app/images/category/8.png new file mode 100644 index 0000000..b987662 Binary files /dev/null and b/app/images/category/8.png differ diff --git a/app/images/default.jpg b/app/images/default.jpg new file mode 100644 index 0000000..e643e05 Binary files /dev/null and b/app/images/default.jpg differ diff --git a/app/images/logo.png b/app/images/logo.png new file mode 100644 index 0000000..5d8586a Binary files /dev/null and b/app/images/logo.png differ diff --git a/app/images/map-marker.png b/app/images/map-marker.png new file mode 100644 index 0000000..778231e Binary files /dev/null and b/app/images/map-marker.png differ diff --git a/app/images/order-logout@2x.png b/app/images/order-logout@2x.png new file mode 100644 index 0000000..020973b Binary files /dev/null and b/app/images/order-logout@2x.png differ diff --git a/app/pages/address/add.js b/app/pages/address/add.js new file mode 100644 index 0000000..7796ae2 --- /dev/null +++ b/app/pages/address/add.js @@ -0,0 +1,19 @@ +// pages/address/add.js +Page({ + data:{}, + onLoad:function(options){ + // 页面初始化 options为页面跳转所带来的参数 + }, + onReady:function(){ + // 页面渲染完成 + }, + onShow:function(){ + // 页面显示 + }, + onHide:function(){ + // 页面隐藏 + }, + onUnload:function(){ + // 页面关闭 + } +}) \ No newline at end of file diff --git a/app/pages/address/add.json b/app/pages/address/add.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/app/pages/address/add.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/app/pages/address/add.wxml b/app/pages/address/add.wxml new file mode 100644 index 0000000..928a1d4 --- /dev/null +++ b/app/pages/address/add.wxml @@ -0,0 +1,2 @@ + +pages/address/add.wxml diff --git a/app/pages/address/add.wxss b/app/pages/address/add.wxss new file mode 100644 index 0000000..ec17b87 --- /dev/null +++ b/app/pages/address/add.wxss @@ -0,0 +1 @@ +/* pages/address/add.wxss */ \ No newline at end of file diff --git a/app/pages/address/list.js b/app/pages/address/list.js new file mode 100644 index 0000000..6b2de16 --- /dev/null +++ b/app/pages/address/list.js @@ -0,0 +1,19 @@ +// pages/address/list.js +Page({ + data:{}, + onLoad:function(options){ + // 页面初始化 options为页面跳转所带来的参数 + }, + onReady:function(){ + // 页面渲染完成 + }, + onShow:function(){ + // 页面显示 + }, + onHide:function(){ + // 页面隐藏 + }, + onUnload:function(){ + // 页面关闭 + } +}) \ No newline at end of file diff --git a/app/pages/address/list.json b/app/pages/address/list.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/app/pages/address/list.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/app/pages/address/list.wxml b/app/pages/address/list.wxml new file mode 100644 index 0000000..b41ec72 --- /dev/null +++ b/app/pages/address/list.wxml @@ -0,0 +1,2 @@ + +pages/address/list.wxml diff --git a/app/pages/address/list.wxss b/app/pages/address/list.wxss new file mode 100644 index 0000000..e935e1d --- /dev/null +++ b/app/pages/address/list.wxss @@ -0,0 +1 @@ +/* pages/address/list.wxss */ \ No newline at end of file diff --git a/app/pages/address/select.js b/app/pages/address/select.js new file mode 100644 index 0000000..a1f18fa --- /dev/null +++ b/app/pages/address/select.js @@ -0,0 +1,19 @@ +// pages/address/select.js +Page({ + data:{}, + onLoad:function(options){ + // 页面初始化 options为页面跳转所带来的参数 + }, + onReady:function(){ + // 页面渲染完成 + }, + onShow:function(){ + // 页面显示 + }, + onHide:function(){ + // 页面隐藏 + }, + onUnload:function(){ + // 页面关闭 + } +}) \ No newline at end of file diff --git a/app/pages/address/select.json b/app/pages/address/select.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/app/pages/address/select.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/app/pages/address/select.wxml b/app/pages/address/select.wxml new file mode 100644 index 0000000..72ccd9e --- /dev/null +++ b/app/pages/address/select.wxml @@ -0,0 +1,2 @@ + +pages/address/select.wxml diff --git a/app/pages/address/select.wxss b/app/pages/address/select.wxss new file mode 100644 index 0000000..e80ce5a --- /dev/null +++ b/app/pages/address/select.wxss @@ -0,0 +1 @@ +/* pages/address/select.wxss */ \ No newline at end of file diff --git a/app/pages/index/address.js b/app/pages/index/address.js new file mode 100644 index 0000000..dadce45 --- /dev/null +++ b/app/pages/index/address.js @@ -0,0 +1,19 @@ +// pages/index/address.js +Page({ + data:{}, + onLoad:function(options){ + // 页面初始化 options为页面跳转所带来的参数 + }, + onReady:function(){ + // 页面渲染完成 + }, + onShow:function(){ + // 页面显示 + }, + onHide:function(){ + // 页面隐藏 + }, + onUnload:function(){ + // 页面关闭 + } +}) \ No newline at end of file diff --git a/app/pages/index/address.json b/app/pages/index/address.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/app/pages/index/address.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/app/pages/index/address.wxml b/app/pages/index/address.wxml new file mode 100644 index 0000000..0c08448 --- /dev/null +++ b/app/pages/index/address.wxml @@ -0,0 +1,2 @@ + +pages/index/address.wxml diff --git a/app/pages/index/address.wxss b/app/pages/index/address.wxss new file mode 100644 index 0000000..47a5f2c --- /dev/null +++ b/app/pages/index/address.wxss @@ -0,0 +1 @@ +/* pages/index/address.wxss */ \ No newline at end of file diff --git a/app/pages/index/index.js b/app/pages/index/index.js new file mode 100644 index 0000000..fb33cb1 --- /dev/null +++ b/app/pages/index/index.js @@ -0,0 +1,139 @@ +//index.js +//获取应用实例 + +function countdown(that) { + var second = that.data.second + if (second <= 0) { + return + } + var time = setTimeout(function () { + console.log(second) + that.setData({ + second: second - 1 + }); + countdown(that); + }, 1000) +} +var app = getApp() +Page({ + data: { + category: [ + { + "category_id": "1", + "title": "本地特产", + "icon": "/images/category/1.png" + }, + { + "category_id": "2", + "title": "美食外卖", + "icon": "/images/category/2.png" + }, + { + "category_id": "3", + "title": "甜品蛋糕", + "icon": "/images/category/3.png" + }, + { + "category_id": "4", + "title": "果蔬生鲜", + "icon": "/images/category/4.png" + }, + { + "category_id": "5", + "title": "超市便利", + "icon": "/images/category/5.png" + }, + { + "category_id": "6", + "title": "进口产品", + "icon": "/images/category/6.png" + }, + { + "category_id": "7", + "title": "优惠活动", + "icon": "/images/category/7.png" + }, + { + "category_id": "8", + "title": "全部分类", + "icon": "/images/category/8.png" + } + ], + shop: [ + { + "seller_id": "2", + "seller_name": "鲜极道", + "state": "1", + "city_id": "330300", + "address": "温州龙湾区衢江路2011号", + "pic_url": "http://mtest.ipaotui.com/Uploadfile/Img/seller/20170314/1489479032148947903230424.png", + "pic_hd": "http://mtest.ipaotui.com/Uploadfile/Img/seller/20170314/hd_1489479032148947903230424.png", + "longitude": "120.748973", + "latitude": "27.984401", + "phone": "88888888", + "start_sell_time": "08:00:00", + "end_sell_time": "09:00:00", + "sell_time": "08:00-20:00,08:00-20:00", + "is_rest": "0", + "notice": "东池便当，好吃西", + "reach_time": "30", + "reserve_day": "0", + "min_price": "5", + "sales": "73", + "service": "0.0", + "quality": "0.0", + "overall": "0.0", + "distance": "11", + "favorite": "0", + "promotion": [ + { + "pic_url": "http://mtest.ipaotui.com/Uploadfile/Img/seller_promotion/first_cut.png", + "info": "新用户在线支付满15元减10元,满20元减13元" + }, + { + "pic_url": "http://mtest.ipaotui.com/Uploadfile/Img/seller_promotion/cut.png", + "info": "在线支付满15元减5元,满20元减8元" + } + ] + }, + { + "seller_id": "24", + "seller_name": "测试", + "state": "1", + "city_id": "330300", + "address": "skldfjhkls", + "pic_url": "http://mtest.ipaotui.com/Uploadfile/Img/seller/1468462647146846264750782.jpg", + "pic_hd": "http://mtest.ipaotui.com/Uploadfile/Img/seller/hd_1468462647146846264750782.jpg", + "longitude": "120.70507", + "latitude": "28.003041", + "phone": "13900000000", + "start_sell_time": "08:00:00", + "end_sell_time": "22:00:00", + "sell_time": "08:00-22:00", + "is_rest": "0", + "notice": null, + "reach_time": "30", + "reserve_day": "0", + "min_price": "5", + "sales": "0", + "service": "0.0", + "quality": "0.0", + "overall": "0.0", + "distance": "4784", + "favorite": "0", + "promotion": [] + }, + ] + }, + onLoad: function () { + console.log('onLoad') + var that = this + //调用应用实例的方法获取全局数据 + app.getUserInfo(function (userInfo) { + //更新数据 + that.setData({ + userInfo: userInfo + }) + }) + } +}) diff --git a/app/pages/index/index.json b/app/pages/index/index.json new file mode 100644 index 0000000..a514dfe --- /dev/null +++ b/app/pages/index/index.json @@ -0,0 +1,3 @@ +{ + +} \ No newline at end of file diff --git a/app/pages/index/index.wxml b/app/pages/index/index.wxml new file mode 100644 index 0000000..f7cf058 --- /dev/null +++ b/app/pages/index/index.wxml @@ -0,0 +1,55 @@ + + + + + + + 电商大厦电商大厦(兴区路) + + + 搜索 + + + + + + + + {{item.title}} + + + + 推荐商家 + + + + + + + {{item.seller_name}} + + + +