diff --git a/app.js b/app.js index 69b394f..ed3bddb 100644 --- a/app.js +++ b/app.js @@ -1,60 +1,47 @@ var util = require('utils/util.js'); var api = require('config/api.js'); App({ - data: { - deviceInfo: {} - }, - onLaunch: function() { - this.data.deviceInfo = wx.getSystemInfoSync(); - console.log(this.data.deviceInfo); - // 展示本地存储能力 - var logs = wx.getStorageSync('logs') || [] - logs.unshift(Date.now()) - wx.setStorageSync('logs', logs) - // 登录 - wx.login({ - success: res => { - // 发送 res.code 到后台换取 openId, sessionKey, unionId - } - }) - // 获取用户信息 - wx.getSetting({ - success: res => { - if (res.authSetting['scope.userInfo']) { - // 已经授权，可以直接调用 getUserInfo 获取头像昵称，不会弹框 - wx.getUserInfo({ - success: res => { - // 可以将 res 发送给后台解码出 unionId - this.globalData.userInfo = res.userInfo - // 由于 getUserInfo 是网络请求，可能会在 Page.onLoad 之后才返回 - // 所以此处加入 callback 以防止这种情况 - if (this.userInfoReadyCallback) { - this.userInfoReadyCallback(res) - } - } - }) - } - } - }) - let that = this; - wx.getSystemInfo({ // 获取页面的有关信息 - success: function(res) { - wx.setStorageSync('systemInfo', res) - var ww = res.windowWidth; - var hh = res.windowHeight; - that.globalData.ww = ww; - that.globalData.hh = hh; - } + data: { + deviceInfo: {} + }, + onLaunch: function () { + this.data.deviceInfo = wx.getSystemInfoSync(); + console.log(this.data.deviceInfo); + // 展示本地存储能力 + var logs = wx.getStorageSync('logs') || [] + logs.unshift(Date.now()) + wx.setStorageSync('logs', logs) + // 登录 + wx.login({ + success: (res) => { + util.request(api.AuthLoginByWeixin, { + code: res.code + }, 'POST').then(function (res) { + if (res.errno === 0) { + let userInfo = res.data.userInfo; + wx.setStorageSync('token', res.data.token); + wx.setStorageSync('userInfo', userInfo); + } }); - + }, + }); + let that = this; + wx.getSystemInfo({ // 获取页面的有关信息 + success: function (res) { + wx.setStorageSync('systemInfo', res) + var ww = res.windowWidth; + var hh = res.windowHeight; + that.globalData.ww = ww; + that.globalData.hh = hh; + } + }); + }, + globalData: { + userInfo: { + nickname: '点我登录', + username: '点击登录', + avatar: 'http://lucky-icon.meiweiyuxian.com/hio/default_avatar_big.png' }, - globalData: { - userInfo: { - nickname: '点我登录', - username: '点击登录', - avatar: 'http://lucky-icon.meiweiyuxian.com/hio/default_avatar_big.png' - }, - token: '', - } - + token: '', + } }) \ No newline at end of file diff --git a/config/api.js b/config/api.js index 5a2f238..aea1fae 100755 --- a/config/api.js +++ b/config/api.js @@ -1,57 +1,60 @@ -// const ApiRootUrl = 'http://localhost:8360/api/'; -// const ApiRootUrl = 'http://192.168.0.108:8360/api/'; -const ApiRootUrl = 'https://www.guxiaoling.com:8466/api/'; +const ApiRoot = 'http://localhost:8361'; +// const ApiRoot = 'http://192.168.0.113:8361'; +// const ApiRoot = 'https://www.qile.club:8688'; +const ApiRootUrl = ApiRoot + '/api/' module.exports = { - // 登录 - AuthLoginByWeixin: ApiRootUrl + 'auth/loginByWeixin', //微信登录 - // 首页 - IndexUrl: ApiRootUrl + 'index/appInfo', //首页数据接口 - // 分类 - CatalogList: ApiRootUrl + 'catalog/index', //分类目录全部分类数据接口 - CatalogCurrent: ApiRootUrl + 'catalog/current', //分类目录当前分类数据接口 - GetCurrentList: ApiRootUrl + 'catalog/currentlist', - // 购物车 - CartAdd: ApiRootUrl + 'cart/add', // 添加商品到购物车 - CartList: ApiRootUrl + 'cart/index', //获取购物车的数据 - CartUpdate: ApiRootUrl + 'cart/update', // 更新购物车的商品 - CartDelete: ApiRootUrl + 'cart/delete', // 删除购物车的商品 - CartChecked: ApiRootUrl + 'cart/checked', // 选择或取消选择商品 - CartGoodsCount: ApiRootUrl + 'cart/goodsCount', // 获取购物车商品件数 - CartCheckout: ApiRootUrl + 'cart/checkout', // 下单前信息确认 - // 商品 - GoodsCount: ApiRootUrl + 'goods/count', //统计商品总数 - GoodsDetail: ApiRootUrl + 'goods/detail', //获得商品的详情 - GoodsList: ApiRootUrl + 'goods/list', //获得商品列表 - GoodsShare: ApiRootUrl + 'goods/goodsShare', //获得商品的详情 - SaveUserId: ApiRootUrl + 'goods/saveUserId', - // 收货地址 - AddressDetail: ApiRootUrl + 'address/addressDetail', //收货地址详情 - DeleteAddress: ApiRootUrl + 'address/deleteAddress', //保存收货地址 - SaveAddress: ApiRootUrl + 'address/saveAddress', //保存收货地址 - GetAddresses: ApiRootUrl + 'address/getAddresses', - RegionList: ApiRootUrl + 'region/list', //获取区域列表 - PayPrepayId: ApiRootUrl + 'pay/preWeixinPay', //获取微信统一下单prepay_id - OrderSubmit: ApiRootUrl + 'order/submit', // 提交订单 - OrderList: ApiRootUrl + 'order/list', //订单列表 - OrderDetail: ApiRootUrl + 'order/detail', //订单详情 - OrderDelete: ApiRootUrl + 'order/delete', //订单删除 - OrderCancel: ApiRootUrl + 'order/cancel', //取消订单 - OrderConfirm: ApiRootUrl + 'order/confirm', //物流详情 - OrderCount: ApiRootUrl + 'order/count', // 获取订单数 - OrderCountInfo: ApiRootUrl + 'order/orderCount', // 我的页面获取订单数状态 - OrderExpressInfo: ApiRootUrl + 'order/express', //物流信息 - OrderGoods: ApiRootUrl + 'order/orderGoods', // 获取checkout页面的商品列表 - // 足迹 - FootprintList: ApiRootUrl + 'footprint/list', //足迹列表 - FootprintDelete: ApiRootUrl + 'footprint/delete', //删除足迹 - // 搜索 - SearchIndex: ApiRootUrl + 'search/index', //搜索页面数据 - SearchHelper: ApiRootUrl + 'search/helper', //搜索帮助 - SearchClearHistory: ApiRootUrl + 'search/clearHistory', //搜索帮助 - ShowSettings: ApiRootUrl + 'settings/showSettings', - SaveSettings: ApiRootUrl + 'settings/save', - SettingsDetail: ApiRootUrl + 'settings/userDetail', - GetBase64: ApiRootUrl + 'qrcode/getBase64', //获取商品详情二维码 + ApiRoot: ApiRoot, + // 登录 + AuthLoginByWeixin: ApiRootUrl + 'auth/loginByWeixin', //微信登录 + // 首页 + IndexUrl: ApiRootUrl + 'index/appInfo', //首页数据接口 + // 分类 + CatalogList: ApiRootUrl + 'catalog/index', //分类目录全部分类数据接口 + CatalogCurrent: ApiRootUrl + 'catalog/current', //分类目录当前分类数据接口 + GetCurrentList: ApiRootUrl + 'catalog/currentlist', + // 购物车 + CartAdd: ApiRootUrl + 'cart/add', // 添加商品到购物车 + CartList: ApiRootUrl + 'cart/index', //获取购物车的数据 + CartUpdate: ApiRootUrl + 'cart/update', // 更新购物车的商品 + CartDelete: ApiRootUrl + 'cart/delete', // 删除购物车的商品 + CartChecked: ApiRootUrl + 'cart/checked', // 选择或取消选择商品 + CartGoodsCount: ApiRootUrl + 'cart/goodsCount', // 获取购物车商品件数 + CartCheckout: ApiRootUrl + 'cart/checkout', // 下单前信息确认 + // 商品 + GoodsCount: ApiRootUrl + 'goods/count', //统计商品总数 + GoodsDetail: ApiRootUrl + 'goods/detail', //获得商品的详情 + GoodsList: ApiRootUrl + 'goods/list', //获得商品列表 + GoodsShare: ApiRootUrl + 'goods/goodsShare', //获得商品的详情 + SaveUserId: ApiRootUrl + 'goods/saveUserId', + // 收货地址 + AddressDetail: ApiRootUrl + 'address/addressDetail', //收货地址详情 + DeleteAddress: ApiRootUrl + 'address/deleteAddress', //保存收货地址 + SaveAddress: ApiRootUrl + 'address/saveAddress', //保存收货地址 + GetAddresses: ApiRootUrl + 'address/getAddresses', + RegionList: ApiRootUrl + 'region/list', //获取区域列表 + PayPrepayId: ApiRootUrl + 'pay/preWeixinPay', //获取微信统一下单prepay_id + OrderSubmit: ApiRootUrl + 'order/submit', // 提交订单 + OrderList: ApiRootUrl + 'order/list', //订单列表 + OrderDetail: ApiRootUrl + 'order/detail', //订单详情 + OrderDelete: ApiRootUrl + 'order/delete', //订单删除 + OrderCancel: ApiRootUrl + 'order/cancel', //取消订单 + OrderConfirm: ApiRootUrl + 'order/confirm', //物流详情 + OrderCount: ApiRootUrl + 'order/count', // 获取订单数 + OrderCountInfo: ApiRootUrl + 'order/orderCount', // 我的页面获取订单数状态 + OrderExpressInfo: ApiRootUrl + 'order/express', //物流信息 + OrderGoods: ApiRootUrl + 'order/orderGoods', // 获取checkout页面的商品列表 + // 足迹 + FootprintList: ApiRootUrl + 'footprint/list', //足迹列表 + FootprintDelete: ApiRootUrl + 'footprint/delete', //删除足迹 + // 搜索 + SearchIndex: ApiRootUrl + 'search/index', //搜索页面数据 + SearchHelper: ApiRootUrl + 'search/helper', //搜索帮助 + SearchClearHistory: ApiRootUrl + 'search/clearHistory', //搜索帮助 + ShowSettings: ApiRootUrl + 'settings/showSettings', + SaveSettings: ApiRootUrl + 'settings/save', + SettingsDetail: ApiRootUrl + 'settings/userDetail', + UploadAvatar: ApiRootUrl + 'upload/uploadAvatar', + GetBase64: ApiRootUrl + 'qrcode/getBase64', //获取商品详情二维码 }; \ No newline at end of file diff --git a/images/icon/nick.png b/images/icon/nick.png new file mode 100644 index 0000000..73f1e54 Binary files /dev/null and b/images/icon/nick.png differ diff --git a/pages/app-auth/index.js b/pages/app-auth/index.js index 0eccc28..bd9066b 100644 --- a/pages/app-auth/index.js +++ b/pages/app-auth/index.js @@ -5,90 +5,92 @@ const user = require('../../services/user.js'); const app = getApp() Page({ - data: { + data: { - }, - onLoad: function (options) { + }, + onLoad: function (options) { - }, - onShow: function () { - let userInfo = wx.getStorageSync('userInfo'); - if (userInfo != '') { - wx.navigateBack(); + }, + onShow: function () { + let userInfo = wx.getStorageSync('userInfo'); + if (userInfo != '') { + wx.navigateBack(); + }; + }, + // getUserInfo: function (e) { + // app.globalData.userInfo = e.detail.userInfo + // user.loginByWeixin().then(res => { + // app.globalData.userInfo = res.data.userInfo; + // app.globalData.token = res.data.token; + // let is_new = res.data.is_new;//服务器返回的数据； + // if (is_new == 0) { + // util.showErrorToast('您已经是老用户啦！'); + // wx.navigateBack(); + // } + // else if (is_new == 1) { + // wx.navigateBack(); + // } + + // }).catch((err) => { }); + // }, + + getUserProfile: function () { + // wx.navigateTo({ + // url: '/pages/app-auth/index', + // }); + let that = this; + let code = ''; + wx.login({ + success: (res) => { + console.log(res) + code = res.code; + }, + }); + // 获取用户信息 + wx.getUserProfile({ + lang: 'zh_CN', + desc: '用户登录', + success: (res) => { + let loginParams = { + code: code, + app: 3, + encryptedData: res.encryptedData, + iv: res.iv, + rawData: res.rawData, + signature: res.signature }; - }, - // getUserInfo: function (e) { - // app.globalData.userInfo = e.detail.userInfo - // user.loginByWeixin().then(res => { - // app.globalData.userInfo = res.data.userInfo; - // app.globalData.token = res.data.token; - // let is_new = res.data.is_new;//服务器返回的数据； - // if (is_new == 0) { - // util.showErrorToast('您已经是老用户啦！'); - // wx.navigateBack(); - // } - // else if (is_new == 1) { - // wx.navigateBack(); - // } - - // }).catch((err) => { }); - // }, - - getUserProfile: function () { - // wx.navigateTo({ - // url: '/pages/app-auth/index', - // }); - let that = this; - let code = ''; - wx.login({ - success: (res) => { - code = res.code; - }, - }); - // 获取用户信息 - wx.getUserProfile({ - lang: 'zh_CN', - desc: '用户登录', - success: (res) => { - let loginParams = { - code: code, - encryptedData: res.encryptedData, - iv: res.iv, - rawData: res.rawData, - signature: res.signature - }; - console.log(loginParams); - that.postLogin(loginParams); - }, - // 失败回调 - fail: () => { - // 弹出错误 - App.showError('已拒绝小程序获取信息'); - } - }); - }, - postLogin(info) { - util.request(api.AuthLoginByWeixin, { - info: info - }, 'POST').then(function (res) { - console.log(res); - if (res.errno === 0) { - wx.setStorageSync('userInfo', res.data.userInfo); - wx.setStorageSync('token', res.data.token); - app.globalData.userInfo = res.data.userInfo; - app.globalData.token = res.data.token; - let is_new = res.data.is_new; //服务器返回的数据； - console.log(is_new); - if (is_new == 0) { - util.showErrorToast('您已经是老用户啦！'); - wx.navigateBack(); - } else if (is_new == 1) { - wx.navigateBack(); - } - } - }); - }, - goBack: function () { - wx.navigateBack(); - } + console.log(loginParams); + that.postLogin(loginParams); + }, + // 失败回调 + fail: () => { + // 弹出错误 + App.showError('已拒绝小程序获取信息'); + } + }); + }, + postLogin(info) { + util.request(api.AuthLoginByWeixin, { + info: info + }, 'POST').then(function (res) { + console.log(res); + if (res.errno === 0) { + wx.setStorageSync('userInfo', res.data.userInfo); + wx.setStorageSync('token', res.data.token); + app.globalData.userInfo = res.data.userInfo; + app.globalData.token = res.data.token; + let is_new = res.data.is_new; //服务器返回的数据； + console.log(is_new); + if (is_new == 0) { + util.showErrorToast('您已经是老用户啦！'); + wx.navigateBack(); + } else if (is_new == 1) { + wx.navigateBack(); + } + } + }); + }, + goBack: function () { + wx.navigateBack(); + } }) \ No newline at end of file diff --git a/pages/ucenter/about/index.wxml b/pages/ucenter/about/index.wxml index 1f14895..3a1f1c7 100644 --- a/pages/ucenter/about/index.wxml +++ b/pages/ucenter/about/index.wxml @@ -1,16 +1,15 @@ - - 海风小店 - - 开源微信小程序商城 - - - 开发者：盛良 - 微信：lookgxl - - - 更多信息访问：hiolabs.com - + + 海风小店 + + 开源微信小程序商城 - + + + + + 更多信息访问：qile.club + + + \ No newline at end of file diff --git a/pages/ucenter/about/index.wxss b/pages/ucenter/about/index.wxss index 46a2adb..096bdec 100644 --- a/pages/ucenter/about/index.wxss +++ b/pages/ucenter/about/index.wxss @@ -14,7 +14,7 @@ page { .about-wrap { background: #fff; - padding: 50rpx 40rpx; + padding: 0 40rpx; } .title { @@ -32,8 +32,19 @@ page { text-indent: 56rpx; line-height: 50rpx; box-sizing: border-box; + margin-bottom: 20rpx; } +.img-wrap{ + display: flex; + width: 100%; + justify-content: center; +} + +.code-img{ + width: 550rpx; + height: 750rpx; +} .line { height: 1rpx; border-top: 1rpx solid #f1f1f1; diff --git a/pages/ucenter/index/index.js b/pages/ucenter/index/index.js index 5b1aab3..3a448f4 100644 --- a/pages/ucenter/index/index.js +++ b/pages/ucenter/index/index.js @@ -7,92 +7,125 @@ var user = require('../../../services/user.js'); const app = getApp() Page({ - data: { - userInfo: {}, - hasUserInfo: false, - canIUse: wx.canIUse('button.open-type.getUserInfo'), - status: {}, - }, - goProfile: function (e) { - let res = util.loginNow(); - if (res == true) { - wx.navigateTo({ - url: '/pages/ucenter/settings/index', - }); - } - }, - toOrderListTap: function(event) { - let res = util.loginNow(); - if (res == true) { - let showType = event.currentTarget.dataset.index; - wx.setStorageSync('showType', showType); - wx.navigateTo({ - url: '/pages/ucenter/order-list/index?showType=' + showType, - }); - } - }, - toAddressList: function(e) { - let res = util.loginNow(); - if (res == true) { - wx.navigateTo({ - url: '/pages/ucenter/address/index?type=0', - }); - } - }, - toAbout: function () { - wx.navigateTo({ - url: '/pages/ucenter/about/index', + data: { + userInfo: {}, + hasUserInfo: false, + status: {}, + root: api.ApiRoot, + is_new: 0, + root: api.ApiRoot + }, + goProfile: function (e) { + let res = util.loginNow(); + if (res == true) { + wx.navigateTo({ + url: '/pages/ucenter/settings/index', + }); + } + }, + toOrderListTap: function (event) { + let res = util.loginNow(); + if (res == true) { + let showType = event.currentTarget.dataset.index; + wx.setStorageSync('showType', showType); + wx.navigateTo({ + url: '/pages/ucenter/order-list/index?showType=' + showType, + }); + } + }, + toAddressList: function (e) { + let res = util.loginNow(); + if (res == true) { + wx.navigateTo({ + url: '/pages/ucenter/address/index?type=0', + }); + } + }, + toAbout: function () { + wx.navigateTo({ + url: '/pages/ucenter/about/index', + }); + }, + toFootprint: function (e) { + let res = util.loginNow(); + if (res == true) { + wx.navigateTo({ + url: '/pages/ucenter/footprint/index', + }); + } + }, + // goAuth: function (e) { + // wx.navigateTo({ + // url: '/pages/app-auth/index', + // }); + // }, + goAuth() { + let code = ''; + let that = this; + wx.login({ + success: (res) => { + code = res.code; + that.postLogin(code) + }, + }); + }, + postLogin(code) { + let that = this; + util.request(api.AuthLoginByWeixin, { + code: code + }, 'POST').then(function (res) { + if (res.errno === 0) { + let userInfo = res.data.userInfo; + that.setData({ + is_new: res.data.is_new, + userInfo: userInfo, + hasUserInfo: true + }) + wx.setStorageSync('token', res.data.token); + wx.setStorageSync('userInfo', userInfo); + app.globalData.token = res.data.token; + } + }); + }, + onLoad: function (options) { + this.goAuth(); + }, + onShow: function () { + this.getOrderInfo(); + this.getSettingsDetail(); + wx.removeStorageSync('categoryId'); + }, + getSettingsDetail() { + let that = this; + util.request(api.SettingsDetail).then(function (res) { + console.log(res) + if (res.errno === 0) { + let userInfo = res.data; + console.log('userInfo') + console.log(userInfo) + // wx.setStorageSync('userInfo', userInfo); + that.setData({ + userInfo: userInfo, + hasUserInfo: true }); - }, - toFootprint: function(e) { - let res = util.loginNow(); - if (res == true) { - wx.navigateTo({ - url: '/pages/ucenter/footprint/index', - }); - } - }, - goAuth: function(e) { - wx.navigateTo({ - url: '/pages/app-auth/index', + } + }); + }, + onPullDownRefresh: function () { + wx.showNavigationBarLoading() + this.getOrderInfo(); + wx.hideNavigationBarLoading() //完成停止加载 + wx.stopPullDownRefresh() //停止下拉刷新 + }, + getOrderInfo: function (e) { + let that = this; + util.request(api.OrderCountInfo).then(function (res) { + if (res.errno === 0) { + let status = res.data; + that.setData({ + status: status }); - }, - onLoad: function(options) { - }, - onShow: function() { - let userInfo = wx.getStorageSync('userInfo'); - if(userInfo == ''){ - this.setData({ - hasUserInfo: 0, - }); - } - else{ - this.setData({ - hasUserInfo: 1, - }); - } - this.setData({ - userInfo: userInfo, - }); - this.getOrderInfo(); - wx.removeStorageSync('categoryId'); - }, - - onPullDownRefresh: function() { - wx.showNavigationBarLoading() - this.getOrderInfo(); - wx.hideNavigationBarLoading() //完成停止加载 - wx.stopPullDownRefresh() //停止下拉刷新 - }, - getOrderInfo: function(e) { - let that = this; - util.request(api.OrderCountInfo).then(function(res) { - if (res.errno === 0) { - let status = res.data; - that.setData({ - status: status - }); - } - }); - }, + } + }); + }, }) \ No newline at end of file diff --git a/pages/ucenter/index/index.wxml b/pages/ucenter/index/index.wxml index ba1489c..e8cde3b 100644 --- a/pages/ucenter/index/index.wxml +++ b/pages/ucenter/index/index.wxml @@ -1,6 +1,6 @@ - +