diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java index 70676b3a..b1a09496 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java @@ -175,4 +175,20 @@ public class WxHomeController { } return categoryList; } + + /** + * 商城介绍信息 + * @return 商城介绍信息 + */ + @GetMapping("/about") + public Object about() { + Map about = new HashMap<>(); + about.put("name", SystemConfig.getMallName()); + about.put("address", SystemConfig.getMallAddress()); + about.put("phone", SystemConfig.getMallPhone()); + about.put("qq", SystemConfig.getMallQQ()); + about.put("longitude", SystemConfig.getMallLongitude()); + about.put("latitude", SystemConfig.getMallLatitude()); + return ResponseUtil.ok(about); + } } \ No newline at end of file diff --git a/litemall-wx/config/api.js b/litemall-wx/config/api.js index e7a17f61..64304524 100644 --- a/litemall-wx/config/api.js +++ b/litemall-wx/config/api.js @@ -10,6 +10,8 @@ var WxApiRoot = 'http://localhost:8080/wx/'; module.exports = { IndexUrl: WxApiRoot + 'home/index', //首页数据接口 + AboutUrl: WxApiRoot + 'home/about', //介绍信息 + CatalogList: WxApiRoot + 'catalog/index', //分类目录全部分类数据接口 CatalogCurrent: WxApiRoot + 'catalog/current', //分类目录当前分类数据接口 @@ -96,5 +98,4 @@ module.exports = { UserIndex: WxApiRoot + 'user/index', //个人页面用户相关信息 IssueList: WxApiRoot + 'issue/list', //帮助信息 - }; \ No newline at end of file diff --git a/litemall-wx/pages/about/about.js b/litemall-wx/pages/about/about.js index 328ca13c..d46afe44 100644 --- a/litemall-wx/pages/about/about.js +++ b/litemall-wx/pages/about/about.js @@ -1,49 +1,57 @@ -// about.js -var app = getApp() -var util = require("../../utils/util.js"); +const util = require('../../utils/util.js'); +const api = require('../../config/api.js'); +//获取应用实例 +const app = getApp(); -var api = require("../../config/api.js"); Page({ /** * 页面的初始数据 */ data: { - load_statue: true, - shopInfo: { - name: 'litemall', - address: 'https://github.com/linlinjava/litemall', - latitude: 31.201900, - longitude: 121.587839, - linkPhone: '021-xxxx-xxxx', - qqNumber: '738696120' - }, + name: 'litemall', + address: 'https://github.com/linlinjava/litemall', + latitude: '31.201900', + longitude: '121.587839', + phone: '021-xxxx-xxxx', + qq: '705144434' }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - + this.getAbout() + }, + getAbout: function () { + let that = this; + util.request(api.AboutUrl).then(function (res) { + if (res.errno === 0) { + that.setData({ + name: res.data.name, + address: res.data.address, + phone: res.data.phone, + qq: res.data.qq, + latitude: res.data.latitude, + longitude: res.data.longitude + }); + } + }); }, - showLocation: function (e) { var that = this wx.openLocation({ - latitude: that.data.shopInfo.latitude, - longitude: that.data.shopInfo.longitude, - name: that.data.shopInfo.name, - address: that.data.shopInfo.address, + latitude: parseFloat(that.data.latitude), + longitude: parseFloat(that.data.longitude), + name: that.data.name, + address: that.data.address, }) }, callPhone: function (e) { var that = this wx.makePhoneCall({ - phoneNumber: that.data.shopInfo.linkPhone, + phoneNumber: that.data.phone, }) - }, - reLoad: function (e) { - this.loadShopInfo(); } }) \ No newline at end of file diff --git a/litemall-wx/pages/about/about.wxml b/litemall-wx/pages/about/about.wxml index ac1983d5..6ba35a9e 100644 --- a/litemall-wx/pages/about/about.wxml +++ b/litemall-wx/pages/about/about.wxml @@ -1,57 +1,40 @@ + 项目名称: - - - {{shopInfo.name}} + {{name}} - + 项目地址: - - {{shopInfo.address}} + {{address}} - + 电话号码: - - {{shopInfo.linkPhone}} + {{phone}} + QQ交流群: - - {{shopInfo.qqNumber}} + {{qq}} - - - - 1.0.0 - - - - - - - MIT - - - \ No newline at end of file diff --git a/litemall-wx/pages/about/about.wxss b/litemall-wx/pages/about/about.wxss index 9a671e65..8ac56f86 100644 --- a/litemall-wx/pages/about/about.wxss +++ b/litemall-wx/pages/about/about.wxss @@ -1,19 +1,11 @@ /* about.wxss */ -page{ - height: 100%; - background-color: #F2f2f2; -} -.page-view{ - height: 100%; -} -.banner-image{ - width: 100%; - height: 350rpx; - background: #ee1; - margin-bottom: 30rpx; - border-bottom: solid #f2f2f2 0.5dp; -} +.label { + font-size: 26rpx; + margin-left: 20rpx; + padding: 10rpx 0; +} + .about-item{ background: white; @@ -27,18 +19,18 @@ page{ } .item-left{ - font-size: 32rpx; - margin-left: 15rpx; + font-size: 38rpx; + margin-left: 40rpx; margin-top: auto; margin-bottom: auto; } + .item-right{ - margin-right: 15rpx; margin-top: auto; margin-bottom: auto; } .right-icon{ width: 40rpx; - height: 40rpx; + height: 40rpx; } \ No newline at end of file