| @@ -64,7 +64,9 @@ | |||||
| "pages/integralmall/index", | "pages/integralmall/index", | ||||
| "pages/mallInfo/mallInfo", | "pages/mallInfo/mallInfo", | ||||
| "pages/location/location", | "pages/location/location", | ||||
| "pages/tcExplain/tcExplain" | |||||
| "pages/tcExplain/tcExplain", | |||||
| "pages/marketAtlas/marketAtlas", | |||||
| "pages/shareFriend/shareFriend" | |||||
| ], | ], | ||||
| "subpackages": [ | "subpackages": [ | ||||
| { | { | ||||
| @@ -3,7 +3,8 @@ | |||||
| bottom: 0; | bottom: 0; | ||||
| left: 0; | left: 0; | ||||
| right: 0; | right: 0; | ||||
| height: 48px; | |||||
| height: 70rpx; | |||||
| /* padding: 10rpx; */ | |||||
| background: white; | background: white; | ||||
| display: flex; | display: flex; | ||||
| padding-bottom: env(safe-area-inset-bottom); | padding-bottom: env(safe-area-inset-bottom); | ||||
| @@ -29,10 +30,10 @@ | |||||
| } | } | ||||
| .tab-bar-item cover-image { | .tab-bar-item cover-image { | ||||
| width: 27px; | |||||
| height: 27px; | |||||
| width: 44rpx; | |||||
| height: 44rpx; | |||||
| } | } | ||||
| .tab-bar-item cover-view { | .tab-bar-item cover-view { | ||||
| font-size: 10px; | |||||
| font-size: 20rpx; | |||||
| } | } | ||||
| @@ -69,7 +69,7 @@ | |||||
| }, | }, | ||||
| "plugins": { | "plugins": { | ||||
| "live-player-plugin": { | "live-player-plugin": { | ||||
| "version": "1.0.11", | |||||
| "version": "1.2.5", | |||||
| "provider": "wx2b03c6e691cd7370" | "provider": "wx2b03c6e691cd7370" | ||||
| } | } | ||||
| }, | }, | ||||
| @@ -252,6 +252,7 @@ Page({ | |||||
| this.getLocation(); | this.getLocation(); | ||||
| let that = this; | let that = this; | ||||
| let optionss; | let optionss; | ||||
| let openId = wx.getStorageSync('openId') | let openId = wx.getStorageSync('openId') | ||||
| if (openId) { | if (openId) { | ||||
| that.setData({ | that.setData({ | ||||
| @@ -68,7 +68,7 @@ Page({ | |||||
| wx.getSystemInfo({ | wx.getSystemInfo({ | ||||
| success: function (res) { | success: function (res) { | ||||
| that.setData({ | that.setData({ | ||||
| windowHeight: res.windowHeight + navigationBarHeight | |||||
| windowHeight: res.windowHeight | |||||
| }) | }) | ||||
| }, | }, | ||||
| }) | }) | ||||
| @@ -5,8 +5,8 @@ | |||||
| <span class="iconfont icon-sousuo searchicon"></span>搜索门店</view> | <span class="iconfont icon-sousuo searchicon"></span>搜索门店</view> | ||||
| <view> | <view> | ||||
| <view class='under_line'></view> | <view class='under_line'></view> | ||||
| <view style='float: left' class='left'> | |||||
| <scroll-view scroll-y scroll-with-animation scroll-left="{{scrollLength}}" class='scrollY' style='height: {{windowHeight-navigationBarHeight-160}}px;'> | |||||
| <view style='float: left;' class='left'> | |||||
| <scroll-view scroll-y scroll-with-animation scroll-left="{{scrollLength}}" class='scrollY' style='height: {{windowHeight-160}}px;'> | |||||
| <view class='all clear'> | <view class='all clear'> | ||||
| <block wx:for="{{lists}}" wx:key="{{index}}"> | <block wx:for="{{lists}}" wx:key="{{index}}"> | ||||
| <view bindtap='jumpIndex' data-menuindex='{{item.id}}'> | <view bindtap='jumpIndex' data-menuindex='{{item.id}}'> | ||||
| @@ -27,6 +27,7 @@ | |||||
| background:#F4F5F9; | background:#F4F5F9; | ||||
| /* top:240rpx; */ | /* top:240rpx; */ | ||||
| margin-top: 40rpx; | margin-top: 40rpx; | ||||
| overflow: scroll; | |||||
| } | } | ||||
| @@ -19,11 +19,13 @@ Page({ | |||||
| banneColor: bgColor.colorFirst.user.banneColor, | banneColor: bgColor.colorFirst.user.banneColor, | ||||
| levelBg: bgColor.colorFirst.user.levelBg, | levelBg: bgColor.colorFirst.user.levelBg, | ||||
| view: bgColor.colorFirst.user.view, | view: bgColor.colorFirst.user.view, | ||||
| fenxiang: imgurl.fenxiang1.url, | |||||
| redirectUrl: imgurl.redirect.url, | redirectUrl: imgurl.redirect.url, | ||||
| editUrl: imgurl.edit.url, | editUrl: imgurl.edit.url, | ||||
| activeUrl: imgurl.active.url, | activeUrl: imgurl.active.url, | ||||
| dingUrl: imgurl.ding.url, | dingUrl: imgurl.ding.url, | ||||
| duihuan: imgurl.duihuan.url, | duihuan: imgurl.duihuan.url, | ||||
| shoppingAtlas: imgurl.shoppingAtlas.url, | |||||
| quansUrl: imgurl.quans.url, | quansUrl: imgurl.quans.url, | ||||
| wmintegral: imgurl.wmintegral.url, | wmintegral: imgurl.wmintegral.url, | ||||
| cardiconUrl: imgurl.cardicon.url, | cardiconUrl: imgurl.cardicon.url, | ||||
| @@ -112,6 +112,20 @@ | |||||
| <image class='icons' src="{{duihuan}}" mode='widthFix'></image>兑换</view> | <image class='icons' src="{{duihuan}}" mode='widthFix'></image>兑换</view> | ||||
| </view> | </view> | ||||
| </navigator> | </navigator> | ||||
| <!-- 地图 --> | |||||
| <navigator url="/pages/marketAtlas/marketAtlas" open-type="navigate"> | |||||
| <view class="user-btn app-border-bottom"> | |||||
| <view> | |||||
| <image class='icons' src="{{shoppingAtlas}}" mode='widthFix'></image>商场地图</view> | |||||
| </view> | |||||
| </navigator> | |||||
| <!-- 分享好友 --> | |||||
| <navigator url="/pages/shareFriend/shareFriend" open-type="navigate"> | |||||
| <view class="user-btn app-border-bottom"> | |||||
| <view> | |||||
| <image class='icons' src="{{fenxiang}}" mode='widthFix'></image>分享好友</view> | |||||
| </view> | |||||
| </navigator> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <!-- 小马快店样式 --> | <!-- 小马快店样式 --> | ||||
| @@ -18,7 +18,7 @@ | |||||
| </view> | </view> | ||||
| <view class='newsource'>新能源</view> | <view class='newsource'>新能源</view> | ||||
| </view> | </view> | ||||
| <view class='addpark-choose' wx:if="{{titleShow}}" capture-bind:touchstart="chooseNum"> | |||||
| <view class='addpark-choose' wx:if="{{titleShow}}" bindtap="chooseNum"> | |||||
| <view class="addpark-choose-line" wx:for="{{chooseTitle}}" wx:for-item="items" wx:key="chooseNum"> | <view class="addpark-choose-line" wx:for="{{chooseTitle}}" wx:for-item="items" wx:key="chooseNum"> | ||||
| <view style="display:flex;"> | <view style="display:flex;"> | ||||
| <view class="addpark-choose-font{{chooseClass==item? ' choose' : ''}}" wx:for="{{items}}" wx:key="chooseNumFist" wx:for-item="item" > | <view class="addpark-choose-font{{chooseClass==item? ' choose' : ''}}" wx:for="{{items}}" wx:key="chooseNumFist" wx:for-item="item" > | ||||
| @@ -28,7 +28,7 @@ | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class='addpark-choose' wx:if="{{englishShow}}" capture-bind:touchstart="chooseNum"> | |||||
| <view class='addpark-choose' wx:if="{{englishShow}}" bindtap="chooseNum"> | |||||
| <view class="addpark-choose-line" wx:for="{{chooseNumFir}}" wx:for-item="items" wx:key="chooseNum"> | <view class="addpark-choose-line" wx:for="{{chooseNumFir}}" wx:for-item="items" wx:key="chooseNum"> | ||||
| <view style="display:flex;"> | <view style="display:flex;"> | ||||
| <view class="addpark-choose-font{{chooseClass==item? ' choose' : ''}}" wx:for="{{items}}" wx:key="chooseNumFist" wx:for-item="item"> | <view class="addpark-choose-font{{chooseClass==item? ' choose' : ''}}" wx:for="{{items}}" wx:key="chooseNumFist" wx:for-item="item"> | ||||
| @@ -39,7 +39,7 @@ | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class='addpark-choose-num' wx:if="{{numShow}}" capture-bind:touchstart="chooseNum"> | |||||
| <view class='addpark-choose-num' wx:if="{{numShow}}" bindtap="chooseNum"> | |||||
| <view class="addpark-choose-line" wx:for="{{chooseNumSco}}" wx:for-item="items" wx:key="chooseNum"> | <view class="addpark-choose-line" wx:for="{{chooseNumSco}}" wx:for-item="items" wx:key="chooseNum"> | ||||
| <view style="display:flex;"> | <view style="display:flex;"> | ||||
| <view class="addpark-choose-font{{chooseClass==item? ' choose' : ''}}" wx:for="{{items}}" wx:key="chooseNumFist" wx:for-item="item"> | <view class="addpark-choose-font{{chooseClass==item? ' choose' : ''}}" wx:for="{{items}}" wx:key="chooseNumFist" wx:for-item="item"> | ||||
| @@ -50,7 +50,7 @@ | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class='addpark-choose-num' wx:if="{{specShow}}" capture-bind:touchstart="chooseNum"> | |||||
| <view class='addpark-choose-num' wx:if="{{specShow}}" bindtap="chooseNum"> | |||||
| <view class="addpark-choose-line" wx:for="{{chooseSpec}}" wx:for-item="items" wx:key="chooseNum"> | <view class="addpark-choose-line" wx:for="{{chooseSpec}}" wx:for-item="items" wx:key="chooseNum"> | ||||
| <view style="display:flex;"> | <view style="display:flex;"> | ||||
| @@ -9,6 +9,7 @@ Page({ | |||||
| * 页面的初始数据 | * 页面的初始数据 | ||||
| */ | */ | ||||
| data: { | data: { | ||||
| childArr:[], | |||||
| navigationBarHeight, | navigationBarHeight, | ||||
| chevronUrl: imgurl.chevron.url, | chevronUrl: imgurl.chevron.url, | ||||
| date: '1988-03-12', | date: '1988-03-12', | ||||
| @@ -68,6 +69,7 @@ Page({ | |||||
| }, | }, | ||||
| formSubmit: function (e) { | formSubmit: function (e) { | ||||
| let that = this; | let that = this; | ||||
| // console.log(that.data.childArr) | |||||
| /** | /** | ||||
| * sex | * sex | ||||
| * 0 保密 | * 0 保密 | ||||
| @@ -105,6 +107,13 @@ Page({ | |||||
| icon:"none" | icon:"none" | ||||
| }) | }) | ||||
| } else { | } 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({ | Http.post({ | ||||
| url: config.api.updateInfo, | url: config.api.updateInfo, | ||||
| data: { | data: { | ||||
| @@ -112,6 +121,7 @@ Page({ | |||||
| address: address, | address: address, | ||||
| name: username, | name: username, | ||||
| birthdate: birthdate, | birthdate: birthdate, | ||||
| childrenList: tmeparr | |||||
| } | } | ||||
| }) | }) | ||||
| .then(res => { | .then(res => { | ||||
| @@ -138,6 +148,46 @@ Page({ | |||||
| flagsex: 1 | 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, | url: config.api.getScore, | ||||
| data: {} | data: {} | ||||
| }) | }) | ||||
| .then(res => { | |||||
| .then(res => {res.data | |||||
| console.log(res); | console.log(res); | ||||
| if(res.code == 200){ | if(res.code == 200){ | ||||
| let tmpeArr = res.data.childrenList | |||||
| tmpeArr.map(item=>{ | |||||
| item.birthdate = util.fmtDate(parseInt(item.birthdate)) | |||||
| }) | |||||
| that.setData({ | that.setData({ | ||||
| showPage:true | |||||
| showPage:true, | |||||
| childArr: tmpeArr | |||||
| }) | }) | ||||
| } | } | ||||
| var reg = RegExp(/address/); | var reg = RegExp(/address/); | ||||
| @@ -1,7 +1,7 @@ | |||||
| <navbar back home text="编辑信息"></navbar> | <navbar back home text="编辑信息"></navbar> | ||||
| <view style="height:{{navigationBarHeight}} "></view> | <view style="height:{{navigationBarHeight}} "></view> | ||||
| <form bindsubmit="formSubmit" wx:if="{{showPage}}"> | |||||
| <view class='section' > | |||||
| <form bindsubmit="formSubmit" wx:if="{{showPage}}"> | |||||
| <view class='section'> | |||||
| <text>姓名</text> | <text>姓名</text> | ||||
| <input wx:if="{{username}}" name="username" type="text" placeholder='{{username}}' /> | <input wx:if="{{username}}" name="username" type="text" placeholder='{{username}}' /> | ||||
| <input wx:if="{{!username}}" name="username" type="text" placeholder='请填写名字' /> | <input wx:if="{{!username}}" name="username" type="text" placeholder='请填写名字' /> | ||||
| @@ -28,6 +28,41 @@ | |||||
| <view class='names' wx:if="{{!address}}">请选择地址</view> | <view class='names' wx:if="{{!address}}">请选择地址</view> | ||||
| <image class="rArrow" src="{{chevronUrl}}" mode='widthFix'></image> | <image class="rArrow" src="{{chevronUrl}}" mode='widthFix'></image> | ||||
| </view> | </view> | ||||
| <button class='btn' wx:if="{{!username}}" formType="submit" hover-class='active' style='background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%)' >完成</button> | |||||
| <view class="child_add" bindtap="childAdd">+ 添加子女信息</view> | |||||
| <view class="child_box" wx:for="{{childArr}}" wx:kye="index"> | |||||
| <view class="contBox"> | |||||
| <view class='contBox_section'> | |||||
| <text>姓名</text> | |||||
| <input wx:if="{{item.name}}" type="text" placeholder='{{item.name}}' bindinput="chidName" data-index="{{index}}" /> | |||||
| <input wx:if="{{!item.name}}" type="text" placeholder='请填写名字' bindinput="chidName" data-index="{{index}}" /> | |||||
| </view> | |||||
| <view class="contBox_section sec"> | |||||
| <text>生日</text> | |||||
| <picker class="contBox_picker" mode="date" value="{{date}}" start="1930-09-01" end="2017-09-01" bindchange="chidBirthday" data-index="{{index}}"> | |||||
| <input wx:if="{{!item.birthdate}}" class='contBox_picker' placeholder='请输入生日' disabled/> | |||||
| <view wx:if="{{item.birthdate}}" class="contBox_picker"> {{item.birthdate}}</view> | |||||
| </picker> | |||||
| <image class="rArrow" src="{{chevronUrl}}" mode='widthFix'></image> | |||||
| </view> | |||||
| <view class="contBox_section section_gap"> | |||||
| <text>性别</text> | |||||
| <radio-group class="radio-group" bindchange="childSex" data-index="{{index}}"> | |||||
| <radio class="radio" value="1" checked="{{item.sex==1?true:false}}"> | |||||
| <text>男</text> | |||||
| </radio> | |||||
| <radio class="radio" value="2" checked="{{item.sex==2?true:false}}"> | |||||
| <text>女</text> | |||||
| </radio> | |||||
| </radio-group> | |||||
| </view> | |||||
| </view> | |||||
| <view class="det_child_box" bindtap="childDel" data-index="{{index}}"> 删除</view> | |||||
| </view> | |||||
| <button class='btn' wx:if="{{!username}}" formType="submit" hover-class='active' style='background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%)'>完成</button> | |||||
| <button class='btn' wx:if="{{username}}" formType="submit" hover-class='active' style='background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);'>完成</button> | <button class='btn' wx:if="{{username}}" formType="submit" hover-class='active' style='background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);'>完成</button> | ||||
| </form> | </form> | ||||
| @@ -1,14 +1,14 @@ | |||||
| .rArrow{ | |||||
| .rArrow { | |||||
| position: absolute; | position: absolute; | ||||
| right: 26rpx; | right: 26rpx; | ||||
| height:20rpx; | |||||
| height: 20rpx; | |||||
| width: 20rpx; | width: 20rpx; | ||||
| margin: auto; | margin: auto; | ||||
| bottom: 30rpx; | bottom: 30rpx; | ||||
| } | } | ||||
| input { | input { | ||||
| width:600rpx; | |||||
| /* width:500rpx; */ | |||||
| display: inline-block; | display: inline-block; | ||||
| font-size: 32rpx; | font-size: 32rpx; | ||||
| vertical-align: middle; | vertical-align: middle; | ||||
| @@ -26,13 +26,15 @@ input { | |||||
| margin: 0 auto; | margin: 0 auto; | ||||
| border-bottom: 1px solid #eee; | border-bottom: 1px solid #eee; | ||||
| } | } | ||||
| .address{ | |||||
| .address { | |||||
| width: 710rpx; | width: 710rpx; | ||||
| margin: 0 auto; | margin: 0 auto; | ||||
| border-bottom: 1px solid #eee; | border-bottom: 1px solid #eee; | ||||
| padding-bottom: 10rpx; | padding-bottom: 10rpx; | ||||
| } | } | ||||
| .radio{ | |||||
| .radio { | |||||
| margin-right: 30rpx; | margin-right: 30rpx; | ||||
| } | } | ||||
| @@ -40,12 +42,13 @@ input { | |||||
| display: inline-block; | display: inline-block; | ||||
| font-size: 32rpx; | font-size: 32rpx; | ||||
| color: #999; | color: #999; | ||||
| width: 620rpx; | |||||
| width: 500rpx; | |||||
| } | } | ||||
| radio { | radio { | ||||
| transform:scale(0.8); | |||||
| transform: scale(0.8); | |||||
| } | } | ||||
| .section__title { | .section__title { | ||||
| color: #999; | color: #999; | ||||
| } | } | ||||
| @@ -53,30 +56,36 @@ radio { | |||||
| .section > text:nth-of-type(1) { | .section > text:nth-of-type(1) { | ||||
| font-size: 32rpx; | font-size: 32rpx; | ||||
| display: inline-block; | display: inline-block; | ||||
| margin-right: 20rpx; | |||||
| padding: 0 20rpx; | |||||
| } | } | ||||
| .address > text:nth-of-type(1) { | .address > text:nth-of-type(1) { | ||||
| font-size: 32rpx; | font-size: 32rpx; | ||||
| display: inline-block; | display: inline-block; | ||||
| margin-right: 20rpx; | |||||
| /* margin-right: 20rpx; */ | |||||
| padding: 0 20rpx; | |||||
| } | } | ||||
| .btn{ | |||||
| .btn { | |||||
| width: 456rpx; | width: 456rpx; | ||||
| color: #fff; | color: #fff; | ||||
| margin-top: 466rpx; | |||||
| margin-top: 200rpx; | |||||
| height: 92rpx; | height: 92rpx; | ||||
| line-height: 92rpx; | line-height: 92rpx; | ||||
| text-align: center; | text-align: center; | ||||
| border-radius:32rpx; | |||||
| border-radius: 32rpx; | |||||
| font-size: 32rpx; | font-size: 32rpx; | ||||
| } | } | ||||
| .active{ | |||||
| opacity: .6; | |||||
| .active { | |||||
| opacity: 0.6; | |||||
| } | } | ||||
| .sec{ | |||||
| .sec { | |||||
| position: relative; | position: relative; | ||||
| } | } | ||||
| .input{ | |||||
| .input { | |||||
| position: absolute; | position: absolute; | ||||
| left: 84rpx; | left: 84rpx; | ||||
| z-index: 1000; | z-index: 1000; | ||||
| @@ -85,8 +94,62 @@ radio { | |||||
| margin: auto; | margin: auto; | ||||
| background: #fff; | background: #fff; | ||||
| } | } | ||||
| .names{ | |||||
| .names { | |||||
| font-size: 26rpx; | font-size: 26rpx; | ||||
| line-height: 46rpx; | line-height: 46rpx; | ||||
| color: #999; | color: #999; | ||||
| } | |||||
| 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%; | |||||
| } | |||||
| @@ -25,6 +25,7 @@ Page({ | |||||
| onLoad(options) { | onLoad(options) { | ||||
| if (options.share){ | if (options.share){ | ||||
| }else{ | }else{ | ||||
| console.log(options.url + "?token=" + app.globalData.token + "&gameId=" + options.gameId + "&id=" + options.id) | |||||
| this.setData({ | this.setData({ | ||||
| url: options.url + "?token=" + app.globalData.token + "&gameId=" + options.gameId + "&id=" + options.id | 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 | // url: 'http://10.100.10.74:8080/guaguale/' + "?token=" + app.globalData.token + "&gameId=" + options.gameId + "&id=" + options.id | ||||
| @@ -1,4 +1,5 @@ | |||||
| <navbar home back text="成长值规则"></navbar> | <navbar home back text="成长值规则"></navbar> | ||||
| <view style="height:{{navigationBarHeight}} "></view> | |||||
| <view class='page' wx:if="{{flags=='have'}}"> | <view class='page' wx:if="{{flags=='have'}}"> | ||||
| <view class='title'>成长值增长规则</view> | <view class='title'>成长值增长规则</view> | ||||
| <view class='scroll'> | <view class='scroll'> | ||||
| @@ -10,6 +10,7 @@ page{ | |||||
| overflow: hidden; | overflow: hidden; | ||||
| position: relative; | position: relative; | ||||
| height: 450rpx; | height: 450rpx; | ||||
| } | } | ||||
| .index-slide-view .dots { | .index-slide-view .dots { | ||||
| @@ -11,7 +11,7 @@ | |||||
| <view wx:if="{{list.length>0}}"> | <view wx:if="{{list.length>0}}"> | ||||
| <view class='content clearfix' wx:for="{{list}}" wx:key="{{index}}"> | <view class='content clearfix' wx:for="{{list}}" wx:key="{{index}}"> | ||||
| <view class='le'> | <view class='le'> | ||||
| <text>{{item.creditTypeName}}</text> | |||||
| <text>{{item.changePurpose?item.changePurpose:item.creditTypeName}}</text> | |||||
| <text>{{item.createDate}}</text> | <text>{{item.createDate}}</text> | ||||
| </view> | </view> | ||||
| <view class='fr'> | <view class='fr'> | ||||
| @@ -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 () { | |||||
| } | |||||
| }) | |||||
| @@ -0,0 +1,5 @@ | |||||
| { | |||||
| "usingComponents": { | |||||
| "navbar": "../../../components/navbar/navbar" | |||||
| } | |||||
| } | |||||
| @@ -0,0 +1,40 @@ | |||||
| <!-- <image class="" mode="widthFix" src="http://wayn.xin:9092/upload/2020/12/28/9aada16278ecbb200bb69de0e5ce25df.png" bindtap="lookimg"></image> --> | |||||
| <navbar home back text="商场地图"></navbar> | |||||
| <view style="height:{{navigationBarHeight}} "></view> | |||||
| <view class="Box"> | |||||
| <!-- <image mode="widthFix" class="dt_1_img" src="https://formall.oss-accelerate.aliyuncs.com/789/a7524bda-3b36-41c2-89e3-490ef1a3da49.png"></image> --> | |||||
| <view class="dt_box"> | |||||
| <view class="le_box"> | |||||
| <view class="floor_a"> | |||||
| <text class="text">第一层</text> | |||||
| <text class="active"></text> | |||||
| </view> | |||||
| <view class="floor"> | |||||
| <text class="text">第一层</text> | |||||
| <!-- <text class="active"></text> --> | |||||
| </view> | |||||
| <view class="floor"> | |||||
| <text class="text">第一层</text> | |||||
| <!-- <text class="active"></text> --> | |||||
| </view> | |||||
| <view class="floor"> | |||||
| <text class="text">第一层</text> | |||||
| <!-- <text class="active"></text> --> | |||||
| </view> | |||||
| <view class="floor"> | |||||
| <text class="text">第一层</text> | |||||
| <!-- <text class="active"></text> --> | |||||
| </view> | |||||
| <view class="floor"> | |||||
| <text class="text">第一层</text> | |||||
| <!-- <text class="active"></text> --> | |||||
| </view> | |||||
| </view> | |||||
| <view class="ri_box"> | |||||
| <image mode="widthFix" class="dt_2_img" src="https://formall.oss-accelerate.aliyuncs.com/789/a7524bda-3b36-41c2-89e3-490ef1a3da49.png"></image> | |||||
| </view> | |||||
| </view> | |||||
| </view> | |||||
| @@ -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; | |||||
| } | |||||
| @@ -1,4 +1,4 @@ | |||||
| const navigationBarHeight = (getApp().statusBarHeight + 44) * 2; | |||||
| const navigationBarHeight = (getApp().statusBarHeight + 44) +'px'; | |||||
| const config = require("../../config/config"); | const config = require("../../config/config"); | ||||
| const Http = require("../../utils/HttpBasics"); | const Http = require("../../utils/HttpBasics"); | ||||
| const imgurl = require("../../utils/imgurl"); | const imgurl = require("../../utils/imgurl"); | ||||
| @@ -1,4 +1,4 @@ | |||||
| <navbar home back text="门店搜素"></navbar> | |||||
| <navbar home back text="门店搜索"></navbar> | |||||
| <view style="height:{{navigationBarHeight}} "></view> | <view style="height:{{navigationBarHeight}} "></view> | ||||
| <view class="weui-search-bar {{extClass}}" > | <view class="weui-search-bar {{extClass}}" > | ||||
| <view class="weui-search-bar__form"> | <view class="weui-search-bar__form"> | ||||
| @@ -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 () { | |||||
| } | |||||
| }) | |||||
| @@ -0,0 +1,5 @@ | |||||
| { | |||||
| "usingComponents": { | |||||
| "navbar": "../../../../components/navbar/navbar" | |||||
| } | |||||
| } | |||||
| @@ -0,0 +1,2 @@ | |||||
| <navbar back home text="分享好友" background='#fff'></navbar> | |||||
| <view style="height:{{navigationBarHeight}} "></view> | |||||
| @@ -0,0 +1 @@ | |||||
| /* pages/shareFriend/shareFriend.wxss */ | |||||
| @@ -63,8 +63,8 @@ | |||||
| "list": [ | "list": [ | ||||
| { | { | ||||
| "id": 0, | "id": 0, | ||||
| "name": "pages/tcExplain/tcExplain", | |||||
| "pathName": "pages/tcExplain/tcExplain", | |||||
| "name": "pages/", | |||||
| "pathName": "pages/edit/edit", | |||||
| "query": "", | "query": "", | ||||
| "scene": null | "scene": null | ||||
| }, | }, | ||||
| @@ -4,6 +4,10 @@ module.exports = { | |||||
| 'url': baseUrl + 'act.png', | 'url': baseUrl + 'act.png', | ||||
| 'name': '' | 'name': '' | ||||
| }, | }, | ||||
| 'shoppingAtlas':{ | |||||
| 'url': baseUrl + 'shoppingAtlas.png', | |||||
| 'name': '' | |||||
| }, | |||||
| 'active': { | 'active': { | ||||
| 'url': baseUrl + 'active.gif', | 'url': baseUrl + 'active.gif', | ||||
| 'name': '' | 'name': '' | ||||