From 169f5068c69d4838d2d714907ed1f7dcd42b3e3c Mon Sep 17 00:00:00 2001
From: GL <954534408@qq.com>
Date: Thu, 7 Jan 2021 18:17:00 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B7=BB=E5=8A=A0=E5=AD=90=E5=A5=B3?=
=?UTF-8?q?=E6=A0=87=E7=AD=BE=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app.json | 4 +-
custom-tab-bar/index.wxss | 9 +-
ext.json | 2 +-
index/index.js | 1 +
index/searchbar.js | 2 +-
index/searchbar.wxml | 4 +-
index/searchbar.wxss | 1 +
index/user.js | 2 +
index/user.wxml | 14 +++
pages/addPark/addPark.wxml | 8 +-
pages/edit/edit.js | 59 +++++++++++-
pages/edit/edit.wxml | 41 +++++++-
pages/edit/edit.wxss | 99 ++++++++++++++++----
pages/game/index.js | 1 +
pages/grade/grade.wxml | 1 +
pages/index/searchbar/detail/index.wxss | 1 +
pages/integralmall/integraHistory/index.wxml | 2 +-
pages/marketAtlas/marketAtlas.js | 76 +++++++++++++++
pages/marketAtlas/marketAtlas.json | 5 +
pages/marketAtlas/marketAtlas.wxml | 40 ++++++++
pages/marketAtlas/marketAtlas.wxss | 72 ++++++++++++++
pages/searchbar/searchbar.js | 2 +-
pages/searchbar/searchbar.wxml | 2 +-
pages/shareFriend/shareFriend.js | 71 ++++++++++++++
pages/shareFriend/shareFriend.json | 5 +
pages/shareFriend/shareFriend.wxml | 2 +
pages/shareFriend/shareFriend.wxss | 1 +
project.config.json | 4 +-
utils/imgurl.js | 4 +
29 files changed, 494 insertions(+), 41 deletions(-)
create mode 100644 pages/marketAtlas/marketAtlas.js
create mode 100644 pages/marketAtlas/marketAtlas.json
create mode 100644 pages/marketAtlas/marketAtlas.wxml
create mode 100644 pages/marketAtlas/marketAtlas.wxss
create mode 100644 pages/shareFriend/shareFriend.js
create mode 100644 pages/shareFriend/shareFriend.json
create mode 100644 pages/shareFriend/shareFriend.wxml
create mode 100644 pages/shareFriend/shareFriend.wxss
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 @@
-