diff --git a/app.json b/app.json index 7b8fdf1..d3f0bec 100644 --- a/app.json +++ b/app.json @@ -64,7 +64,9 @@ "pages/integralmall/index", "pages/mallInfo/mallInfo", "pages/location/location", - "pages/tcExplain/tcExplain" + "pages/tcExplain/tcExplain", + "pages/marketAtlas/marketAtlas", + "pages/shareFriend/shareFriend" ], "subpackages": [ { diff --git a/custom-tab-bar/index.wxss b/custom-tab-bar/index.wxss index 0cd91e7..f3f66cc 100644 --- a/custom-tab-bar/index.wxss +++ b/custom-tab-bar/index.wxss @@ -3,7 +3,8 @@ bottom: 0; left: 0; right: 0; - height: 48px; + height: 70rpx; + /* padding: 10rpx; */ background: white; display: flex; padding-bottom: env(safe-area-inset-bottom); @@ -29,10 +30,10 @@ } .tab-bar-item cover-image { - width: 27px; - height: 27px; + width: 44rpx; + height: 44rpx; } .tab-bar-item cover-view { - font-size: 10px; + font-size: 20rpx; } diff --git a/ext.json b/ext.json index 2c3a4e6..5a139c3 100644 --- a/ext.json +++ b/ext.json @@ -69,7 +69,7 @@ }, "plugins": { "live-player-plugin": { - "version": "1.0.11", + "version": "1.2.5", "provider": "wx2b03c6e691cd7370" } }, diff --git a/index/index.js b/index/index.js index dc30992..463f534 100644 --- a/index/index.js +++ b/index/index.js @@ -252,6 +252,7 @@ Page({ this.getLocation(); let that = this; let optionss; + let openId = wx.getStorageSync('openId') if (openId) { that.setData({ diff --git a/index/searchbar.js b/index/searchbar.js index 9b69b26..87f6e33 100644 --- a/index/searchbar.js +++ b/index/searchbar.js @@ -68,7 +68,7 @@ Page({ wx.getSystemInfo({ success: function (res) { that.setData({ - windowHeight: res.windowHeight + navigationBarHeight + windowHeight: res.windowHeight }) }, }) diff --git a/index/searchbar.wxml b/index/searchbar.wxml index 9061b08..3f6c61e 100644 --- a/index/searchbar.wxml +++ b/index/searchbar.wxml @@ -5,8 +5,8 @@ 搜索门店 - - + + diff --git a/index/searchbar.wxss b/index/searchbar.wxss index 8e5aa0b..8530e8e 100644 --- a/index/searchbar.wxss +++ b/index/searchbar.wxss @@ -27,6 +27,7 @@ background:#F4F5F9; /* top:240rpx; */ margin-top: 40rpx; + overflow: scroll; } diff --git a/index/user.js b/index/user.js index a61a0a1..e1ea4bb 100644 --- a/index/user.js +++ b/index/user.js @@ -19,11 +19,13 @@ Page({ banneColor: bgColor.colorFirst.user.banneColor, levelBg: bgColor.colorFirst.user.levelBg, view: bgColor.colorFirst.user.view, + fenxiang: imgurl.fenxiang1.url, redirectUrl: imgurl.redirect.url, editUrl: imgurl.edit.url, activeUrl: imgurl.active.url, dingUrl: imgurl.ding.url, duihuan: imgurl.duihuan.url, + shoppingAtlas: imgurl.shoppingAtlas.url, quansUrl: imgurl.quans.url, wmintegral: imgurl.wmintegral.url, cardiconUrl: imgurl.cardicon.url, diff --git a/index/user.wxml b/index/user.wxml index 762e7b0..7c86233 100644 --- a/index/user.wxml +++ b/index/user.wxml @@ -112,6 +112,20 @@ 兑换 + + + + + 商场地图 + + + + + + + 分享好友 + + diff --git a/pages/addPark/addPark.wxml b/pages/addPark/addPark.wxml index 0b63351..fa7434f 100644 --- a/pages/addPark/addPark.wxml +++ b/pages/addPark/addPark.wxml @@ -18,7 +18,7 @@ 新能源 - + @@ -28,7 +28,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/pages/edit/edit.js b/pages/edit/edit.js index c6789f0..58a3793 100644 --- a/pages/edit/edit.js +++ b/pages/edit/edit.js @@ -9,6 +9,7 @@ Page({ * 页面的初始数据 */ data: { + childArr:[], navigationBarHeight, chevronUrl: imgurl.chevron.url, date: '1988-03-12', @@ -68,6 +69,7 @@ Page({ }, formSubmit: function (e) { let that = this; + // console.log(that.data.childArr) /** * sex * 0 保密 @@ -105,6 +107,13 @@ Page({ icon:"none" }) } else { + let tmeparr = [] + tmeparr = JSON.parse(JSON.stringify(that.data.childArr)) + console.log(that.data.childArr) + tmeparr.map(item=>{ + item.birthdate = new Date(item.birthdate).getTime() + }) + console.log(that.data.childArr) Http.post({ url: config.api.updateInfo, data: { @@ -112,6 +121,7 @@ Page({ address: address, name: username, birthdate: birthdate, + childrenList: tmeparr } }) .then(res => { @@ -138,6 +148,46 @@ Page({ flagsex: 1 }) }, + childSex(e){ + let index = e.currentTarget.dataset.index + let tmpeObj = this.data.childArr + tmpeObj[index].sex = e.detail.value + this.setData({ + childArr: tmpeObj + }) + console.log(tmpeObj) + }, + chidBirthday(e){ + let index = e.currentTarget.dataset.index + let tmpeObj = this.data.childArr + tmpeObj[index].birthdate = e.detail.value + this.setData({ + childArr: tmpeObj + }) + }, + chidName(e){ + let index = e.currentTarget.dataset.index + let tmpeObj = this.data.childArr + tmpeObj[index].name = e.detail.value + this.setData({ + childArr: tmpeObj + }) + }, + childDel(e){ + let index = e.currentTarget.dataset.index + let tmpeObj = this.data.childArr + tmpeObj.splice(index,1) + this.setData({ + childArr: tmpeObj + }) + }, + childAdd(){ + let tmpeObj = this.data.childArr + tmpeObj.unshift({ sex:1}) + this.setData({ + childArr: tmpeObj + }) + }, /** * 生命周期函数--监听页面加载 */ @@ -147,11 +197,16 @@ Page({ url: config.api.getScore, data: {} }) - .then(res => { + .then(res => {res.data console.log(res); if(res.code == 200){ + let tmpeArr = res.data.childrenList + tmpeArr.map(item=>{ + item.birthdate = util.fmtDate(parseInt(item.birthdate)) + }) that.setData({ - showPage:true + showPage:true, + childArr: tmpeArr }) } var reg = RegExp(/address/); diff --git a/pages/edit/edit.wxml b/pages/edit/edit.wxml index d862e60..f81470b 100644 --- a/pages/edit/edit.wxml +++ b/pages/edit/edit.wxml @@ -1,7 +1,7 @@ -
- + + 姓名 @@ -28,6 +28,41 @@ 请选择地址 - + + 添加子女信息 + + + + + 姓名 + + + + + + 生日 + + + {{item.birthdate}} + + + + + + 性别 + + + + + + + + + + + + 删除 + + + \ No newline at end of file diff --git a/pages/edit/edit.wxss b/pages/edit/edit.wxss index 063d81e..4b9dec9 100644 --- a/pages/edit/edit.wxss +++ b/pages/edit/edit.wxss @@ -1,14 +1,14 @@ -.rArrow{ +.rArrow { position: absolute; right: 26rpx; - height:20rpx; + height: 20rpx; width: 20rpx; margin: auto; bottom: 30rpx; } input { - width:600rpx; + /* width:500rpx; */ display: inline-block; font-size: 32rpx; vertical-align: middle; @@ -26,13 +26,15 @@ input { margin: 0 auto; border-bottom: 1px solid #eee; } -.address{ + +.address { width: 710rpx; margin: 0 auto; border-bottom: 1px solid #eee; padding-bottom: 10rpx; } -.radio{ + +.radio { margin-right: 30rpx; } @@ -40,12 +42,13 @@ input { display: inline-block; font-size: 32rpx; color: #999; - width: 620rpx; + width: 500rpx; } radio { - transform:scale(0.8); + transform: scale(0.8); } + .section__title { color: #999; } @@ -53,30 +56,36 @@ radio { .section > text:nth-of-type(1) { font-size: 32rpx; display: inline-block; - margin-right: 20rpx; + padding: 0 20rpx; } + .address > text:nth-of-type(1) { font-size: 32rpx; display: inline-block; - margin-right: 20rpx; + /* margin-right: 20rpx; */ + padding: 0 20rpx; } -.btn{ + +.btn { width: 456rpx; color: #fff; - margin-top: 466rpx; + margin-top: 200rpx; height: 92rpx; line-height: 92rpx; text-align: center; - border-radius:32rpx; + border-radius: 32rpx; font-size: 32rpx; } -.active{ - opacity: .6; + +.active { + opacity: 0.6; } -.sec{ + +.sec { position: relative; } -.input{ + +.input { position: absolute; left: 84rpx; z-index: 1000; @@ -85,8 +94,62 @@ radio { margin: auto; background: #fff; } -.names{ + +.names { font-size: 26rpx; line-height: 46rpx; color: #999; -} \ No newline at end of file + margin-left: 20rpx; +} + +.child_add { + width: 300rpx; + line-height: 100rpx; + height: 100rpx; + border-radius: 10rpx; + text-align: center; + margin: 20rpx; + background-color: #fff; +} + +.child_box { + margin: 20rpx; + overflow: hidden; +} + +.contBox { + float: left; + width: 80%; + background-color: #fff; +} + +.contBox_section { + height: 100rpx; + line-height: 100rpx; + /* width: 710rpx; */ + margin: 0 auto; + border-bottom: 1px solid #eee; +} + +.contBox_section text { + margin: 0 20rpx; +} + +.contBox_picker { + display: inline-block; + font-size: 32rpx; + color: #999; + width: 400rpx; +} + +.det_child_box { + float: left; + width: 16%; + height: 100rpx; + border-radius: 10rpx; + line-height: 100rpx; + background-color: #fff; + text-align: center; + margin-top: 100rpx; + margin-left: 2%; +} diff --git a/pages/game/index.js b/pages/game/index.js index c4f3a53..c80d614 100644 --- a/pages/game/index.js +++ b/pages/game/index.js @@ -25,6 +25,7 @@ Page({ onLoad(options) { if (options.share){ }else{ + console.log(options.url + "?token=" + app.globalData.token + "&gameId=" + options.gameId + "&id=" + options.id) this.setData({ url: options.url + "?token=" + app.globalData.token + "&gameId=" + options.gameId + "&id=" + options.id // url: 'http://10.100.10.74:8080/guaguale/' + "?token=" + app.globalData.token + "&gameId=" + options.gameId + "&id=" + options.id diff --git a/pages/grade/grade.wxml b/pages/grade/grade.wxml index b5f6b48..74233ae 100644 --- a/pages/grade/grade.wxml +++ b/pages/grade/grade.wxml @@ -1,4 +1,5 @@ + 成长值增长规则 diff --git a/pages/index/searchbar/detail/index.wxss b/pages/index/searchbar/detail/index.wxss index bf84407..9d95dfd 100644 --- a/pages/index/searchbar/detail/index.wxss +++ b/pages/index/searchbar/detail/index.wxss @@ -10,6 +10,7 @@ page{ overflow: hidden; position: relative; height: 450rpx; + } .index-slide-view .dots { diff --git a/pages/integralmall/integraHistory/index.wxml b/pages/integralmall/integraHistory/index.wxml index d2517ec..d048678 100644 --- a/pages/integralmall/integraHistory/index.wxml +++ b/pages/integralmall/integraHistory/index.wxml @@ -11,7 +11,7 @@ - {{item.creditTypeName}} + {{item.changePurpose?item.changePurpose:item.creditTypeName}} {{item.createDate}} diff --git a/pages/marketAtlas/marketAtlas.js b/pages/marketAtlas/marketAtlas.js new file mode 100644 index 0000000..606684f --- /dev/null +++ b/pages/marketAtlas/marketAtlas.js @@ -0,0 +1,76 @@ +// pages/marketAtlas/marketAtlas.js +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' +const Http = require("../../utils/HttpBasics"); +const config = require("../../config/config"); +let app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + navigationBarHeight, + }, + lookimg(){ + wx.previewImage({ + current: 'http://wayn.xin:9092/upload/2020/12/28/9aada16278ecbb200bb69de0e5ce25df.png', // 当前显示图片的http链接 + urls: ['http://wayn.xin:9092/upload/2020/12/28/9aada16278ecbb200bb69de0e5ce25df.png'] // 需要预览的图片http链接列表 + }) + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/marketAtlas/marketAtlas.json b/pages/marketAtlas/marketAtlas.json new file mode 100644 index 0000000..d82a6ce --- /dev/null +++ b/pages/marketAtlas/marketAtlas.json @@ -0,0 +1,5 @@ +{ + "usingComponents": { + "navbar": "../../../components/navbar/navbar" + } +} \ No newline at end of file diff --git a/pages/marketAtlas/marketAtlas.wxml b/pages/marketAtlas/marketAtlas.wxml new file mode 100644 index 0000000..ac9685e --- /dev/null +++ b/pages/marketAtlas/marketAtlas.wxml @@ -0,0 +1,40 @@ + + + + + + + + + + 第一层 + + + + 第一层 + + + + 第一层 + + + + 第一层 + + + + 第一层 + + + + 第一层 + + + + + + + + + + \ No newline at end of file diff --git a/pages/marketAtlas/marketAtlas.wxss b/pages/marketAtlas/marketAtlas.wxss new file mode 100644 index 0000000..bfb9ce6 --- /dev/null +++ b/pages/marketAtlas/marketAtlas.wxss @@ -0,0 +1,72 @@ +/* pages/marketAtlas/marketAtlas.wxss */ + +.Box { + width: 90%; + margin: 30rpx auto; +} + +.dt_1_img { + width: 100%; +} + +.dt_2_img { + width: 96%; + margin: 0 2%; +} + +.dt_box { + overflow: hidden; +} + +.le_box { + float: left; + width: 20%; +} + +.ri_box { + float: right; + width: 80%; +} + +.floor_a { + position: relative; + width: 139rpx; + height: 100rpx; + line-height: 100rpx; + text-align: center; + font-size: 30rpx; + font-family: PingFangSC-Semibold; + color: #3c3c3c; + background: #fff; + font-weight: 500; +} + +.floor { + position: relative; + width: 139rpx; + height: 100rpx; + line-height: 100rpx; + text-align: center; + font-size: 26rpx; + font-family: PingFangSC-Semibold; + color: #a6a6a6; +} + +.text { + width: 100%; + height: 100rpx; + text-align: center; + line-height: 100rpx; +} + +.active { + position: absolute; + left: 4rpx; + bottom: 0rpx; + top: 0; + margin: auto; + width: 12rpx; + height: 24rpx; + background: linear-gradient(127deg, rgba(252, 177, 74, 1) 0%, rgba(254, 70, 20, 1) 100%); + border-radius: 7rpx; +} diff --git a/pages/searchbar/searchbar.js b/pages/searchbar/searchbar.js index 4ff7ad9..bec2c51 100644 --- a/pages/searchbar/searchbar.js +++ b/pages/searchbar/searchbar.js @@ -1,4 +1,4 @@ -const navigationBarHeight = (getApp().statusBarHeight + 44) * 2; +const navigationBarHeight = (getApp().statusBarHeight + 44) +'px'; const config = require("../../config/config"); const Http = require("../../utils/HttpBasics"); const imgurl = require("../../utils/imgurl"); diff --git a/pages/searchbar/searchbar.wxml b/pages/searchbar/searchbar.wxml index 8eb5051..b85fbff 100644 --- a/pages/searchbar/searchbar.wxml +++ b/pages/searchbar/searchbar.wxml @@ -1,4 +1,4 @@ - + diff --git a/pages/shareFriend/shareFriend.js b/pages/shareFriend/shareFriend.js new file mode 100644 index 0000000..be9ba88 --- /dev/null +++ b/pages/shareFriend/shareFriend.js @@ -0,0 +1,71 @@ +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' +var config = require("../../config/config.js"); +var app = getApp(); +const Http = require("../../utils/HttpBasics"); +const util = require("../../utils/util"); +const imgurl = require("../../utils/imgurl"); +Page({ + + /** + * 页面的初始数据 + */ + data: { + navigationBarHeight, + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/shareFriend/shareFriend.json b/pages/shareFriend/shareFriend.json new file mode 100644 index 0000000..da7b5c8 --- /dev/null +++ b/pages/shareFriend/shareFriend.json @@ -0,0 +1,5 @@ +{ + "usingComponents": { + "navbar": "../../../../components/navbar/navbar" + } +} \ No newline at end of file diff --git a/pages/shareFriend/shareFriend.wxml b/pages/shareFriend/shareFriend.wxml new file mode 100644 index 0000000..fdd3f84 --- /dev/null +++ b/pages/shareFriend/shareFriend.wxml @@ -0,0 +1,2 @@ + + diff --git a/pages/shareFriend/shareFriend.wxss b/pages/shareFriend/shareFriend.wxss new file mode 100644 index 0000000..6473bc0 --- /dev/null +++ b/pages/shareFriend/shareFriend.wxss @@ -0,0 +1 @@ +/* pages/shareFriend/shareFriend.wxss */ \ No newline at end of file diff --git a/project.config.json b/project.config.json index c598dda..e754bfc 100644 --- a/project.config.json +++ b/project.config.json @@ -63,8 +63,8 @@ "list": [ { "id": 0, - "name": "pages/tcExplain/tcExplain", - "pathName": "pages/tcExplain/tcExplain", + "name": "pages/", + "pathName": "pages/edit/edit", "query": "", "scene": null }, diff --git a/utils/imgurl.js b/utils/imgurl.js index 12d5aab..113454b 100644 --- a/utils/imgurl.js +++ b/utils/imgurl.js @@ -4,6 +4,10 @@ module.exports = { 'url': baseUrl + 'act.png', 'name': '' }, + 'shoppingAtlas':{ + 'url': baseUrl + 'shoppingAtlas.png', + 'name': '' + }, 'active': { 'url': baseUrl + 'active.gif', 'name': ''