@@ -60,7 +60,6 @@ | |||||
"pages/discountCardList/discountCardList", | "pages/discountCardList/discountCardList", | ||||
"pages/cardListDetail/cardListDetail", | "pages/cardListDetail/cardListDetail", | ||||
"pages/freeBannerDetail/index", | "pages/freeBannerDetail/index", | ||||
"pages/user/scoreHistory/index", | |||||
"pages/paySuccess/paySuccess", | "pages/paySuccess/paySuccess", | ||||
"pages/ConsumeDetail/ConsumeDetail", | "pages/ConsumeDetail/ConsumeDetail", | ||||
"pages/externallinks/index", | "pages/externallinks/index", | ||||
@@ -159,7 +159,7 @@ page{ | |||||
.addpark-back { | .addpark-back { | ||||
font-size: 30rpx; | font-size: 30rpx; | ||||
color: #5aadfb; | |||||
color: #FD832D; | |||||
float: right; | float: right; | ||||
margin: 25rpx 25rpx; | margin: 25rpx 25rpx; | ||||
} | } | ||||
@@ -455,10 +455,10 @@ button::after { | |||||
.b1 { | .b1 { | ||||
position: fixed; | position: fixed; | ||||
top: 0px; | |||||
bottom: 0px; | bottom: 0px; | ||||
left: 0px; | left: 0px; | ||||
right: 0px; | right: 0px; | ||||
top:170rpx; | |||||
background: rgba(0, 0, 0, 0.8); | background: rgba(0, 0, 0, 0.8); | ||||
overflow: hidden; | overflow: hidden; | ||||
z-index: 10; | z-index: 10; | ||||
@@ -1,3 +1,4 @@ | |||||
const navigationBarHeight = (getApp().statusBarHeight + 60) + 'px' | |||||
const util = require("../../utils/util.js"); | const util = require("../../utils/util.js"); | ||||
const Http = require("../../utils/HttpBasics"); | const Http = require("../../utils/HttpBasics"); | ||||
const config = require("../../config/config"); | const config = require("../../config/config"); | ||||
@@ -8,6 +9,7 @@ Page({ | |||||
* 页面的初始数据 | * 页面的初始数据 | ||||
*/ | */ | ||||
data: { | data: { | ||||
navigationBarHeight, | |||||
chevronUrl: imgurl.chevron.url, | chevronUrl: imgurl.chevron.url, | ||||
date: '1988-03-12', | date: '1988-03-12', | ||||
flag: 1, | flag: 1, | ||||
@@ -1,3 +1,5 @@ | |||||
{ | { | ||||
"navigationBarTitleText": "我的资料" | |||||
"usingComponents": { | |||||
"navbar": "../../components/navbar/navbar" | |||||
} | |||||
} | } |
@@ -1,5 +1,6 @@ | |||||
<form bindsubmit="formSubmit" wx:if="{{showPage}}"> | |||||
<view class='section'> | |||||
<navbar back home text="编辑信息"></navbar> | |||||
<form bindsubmit="formSubmit" wx:if="{{showPage}}"> | |||||
<view class='section' style="padding-top:{{navigationBarHeight}};"> | |||||
<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='请填写名字' /> | ||||
@@ -72,7 +72,7 @@ | |||||
<!-- 专题 --> | <!-- 专题 --> | ||||
<view class='product' wx:if="{{showTopic}}" bindtap='gotoTopic'> | <view class='product' wx:if="{{showTopic}}" bindtap='gotoTopic'> | ||||
<!-- <view class='ztTitle'>点击进入{{Ttitle}}</view> --> | <!-- <view class='ztTitle'>点击进入{{Ttitle}}</view> --> | ||||
<view class='gift' > | |||||
<!-- <view class='gift' > | |||||
<image src='{{giftHr}}' mode='aspectFill' ></image> | <image src='{{giftHr}}' mode='aspectFill' ></image> | ||||
</view> | </view> | ||||
<view class='textBox'> | <view class='textBox'> | ||||
@@ -81,8 +81,8 @@ | |||||
</view> | </view> | ||||
<view class='next'> | <view class='next'> | ||||
<image src='{{next}}' mode='aspectFill' ></image> | <image src='{{next}}' mode='aspectFill' ></image> | ||||
</view> | |||||
<!-- <image src='{{cover}}' bindtap='gotoTopic' mode='aspectFill'></image> --> | |||||
</view> --> | |||||
<image src='{{cover}}' style="width:100%;" mode='widthFix'></image> | |||||
</view> | </view> | ||||
<!-- 爆款专区 --> | <!-- 爆款专区 --> | ||||
<c-hot id="hot"/> | <c-hot id="hot"/> | ||||
@@ -36,7 +36,7 @@ Page({ | |||||
allow_load: true | allow_load: true | ||||
}, | }, | ||||
onLoad() { | onLoad() { | ||||
this.getList(0, 0); | |||||
this.getList(0, 1); | |||||
}, | }, | ||||
//点击跳转到券详情页面 | //点击跳转到券详情页面 | ||||
@@ -1134,7 +1134,6 @@ scroll-view { | |||||
line-height: 40rpx; | line-height: 40rpx; | ||||
margin-bottom: 20rpx; | margin-bottom: 20rpx; | ||||
color: #666; | color: #666; | ||||
padding-left: 2%; | |||||
} | } | ||||
@@ -1,28 +0,0 @@ | |||||
var config = require("../../../config/config.js"); | |||||
var app = getApp(); | |||||
const Http = require("../../../utils/HttpBasics"); | |||||
Page({ | |||||
/** | |||||
* 页面的初始数据 | |||||
*/ | |||||
data: { | |||||
}, | |||||
onShow(options){ | |||||
this.record(); | |||||
}, | |||||
record:function(){ | |||||
Http.get({ | |||||
url: config.api.scoreHistory, | |||||
data: { | |||||
token:"d012a284-5e83-4062-be18-9bb01eaf868d", | |||||
pageNum:1, | |||||
pageSize:100 | |||||
} | |||||
}) | |||||
.then(res => { | |||||
console.log(res) | |||||
}) | |||||
.catch(err => { | |||||
}) | |||||
} | |||||
}); |
@@ -1,3 +0,0 @@ | |||||
{ | |||||
"navigationBarTitleText": "成长值" | |||||
} |
@@ -1,4 +0,0 @@ | |||||
<view class='content'> | |||||
<view></view> | |||||
<view></view> | |||||
</view> |
@@ -1,14 +0,0 @@ | |||||
.content .title{ | |||||
display: block; | |||||
text-align: center; | |||||
font-size: 30rpx; | |||||
color: #333; | |||||
height: 80rpx; | |||||
line-height: 80rpx; | |||||
} | |||||
.list{ | |||||
width: 690rpx; | |||||
margin: 0 auto; | |||||
color:#666; | |||||
font-size: 28rpx; | |||||
} |