diff --git a/app.json b/app.json
index ac57f7a..11cfc49 100644
--- a/app.json
+++ b/app.json
@@ -29,7 +29,11 @@
"pages/passCar/couponDetail/couponDetail",
"pages/managelicenseplate/managelicenseplate",
"pages/payrule/payrule",
+<<<<<<< HEAD
"pages/game/index"
+=======
+ "pages/grade/grade"
+>>>>>>> [成长值][增加]:成长值增加
],
"tabBar": {
"color": "#9F9F9F",
diff --git a/assets/img/grade.png b/assets/img/grade.png
new file mode 100644
index 0000000..a170886
Binary files /dev/null and b/assets/img/grade.png differ
diff --git a/assets/img/grade1.png b/assets/img/grade1.png
new file mode 100644
index 0000000..fb46d54
Binary files /dev/null and b/assets/img/grade1.png differ
diff --git a/assets/img/grade2.png b/assets/img/grade2.png
new file mode 100644
index 0000000..82fa38d
Binary files /dev/null and b/assets/img/grade2.png differ
diff --git a/assets/img/grade3.png b/assets/img/grade3.png
new file mode 100644
index 0000000..e79e36a
Binary files /dev/null and b/assets/img/grade3.png differ
diff --git a/assets/img/shang.png b/assets/img/shang.png
index 0c4c2e9..3619914 100644
Binary files a/assets/img/shang.png and b/assets/img/shang.png differ
diff --git a/config/config.js b/config/config.js
index 0e92883..cdbd5d0 100755
--- a/config/config.js
+++ b/config/config.js
@@ -141,7 +141,8 @@ var config = {
* title
* 描述
*/
- getWeapNote:'/mall/getWeapNote'
+ getWeapNote:'/mall/getWeapNote',
+ scoreLevelInfo:'/mall/scoreLevelInfo'
},
weapp: {
diff --git a/pages/grade/grade.js b/pages/grade/grade.js
new file mode 100644
index 0000000..731d316
--- /dev/null
+++ b/pages/grade/grade.js
@@ -0,0 +1,94 @@
+const Http = require("../../utils/HttpBasics");
+const config = require("../../config/config");
+let app = getApp();
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ src:'./../../../assets/img/grade.png'
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function(options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function() {
+ let that = this;
+ Http.get({
+ url: config.api.scoreLevelInfo,
+ data: {
+ appId: config.weapp.AppId,
+ }
+ })
+ .then(res=>{
+ console.log(res);
+
+ that.setData({
+ flags: 'have',
+ logincount: res.data.score.loginCount,
+ loginscoreNumber: res.data.score.loginScoreNumber,
+ personscoreNumber: res.data.score.personScoreNumber,
+ phonescoreNumber: res.data.score.phoneScoreNumber,
+ wifiscoreNumber: res.data.score.wifiScoreNumber,
+ wifinumber: res.data.score.wifiNumber,
+ levelList: res.data.levelList
+ })
+ })
+ .catch(res=>{
+ that.setData({
+ flags: 'nothave'
+ })
+ })
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/grade/grade.json b/pages/grade/grade.json
new file mode 100644
index 0000000..5e86e17
--- /dev/null
+++ b/pages/grade/grade.json
@@ -0,0 +1,3 @@
+{
+ "navigationBarTitleText": "我的成长值"
+}
\ No newline at end of file
diff --git a/pages/grade/grade.wxml b/pages/grade/grade.wxml
new file mode 100644
index 0000000..e9b0ab5
--- /dev/null
+++ b/pages/grade/grade.wxml
@@ -0,0 +1,81 @@
+
+ 生成规则
+
+
+
+ 成长值权益
+
+
+
+
+
+
+
+
+
+ {{item.level}}
+
+ 无
+ {{item.description}}
+
+
+
+
+
+ 暂无配置信息
+
\ No newline at end of file
diff --git a/pages/grade/grade.wxss b/pages/grade/grade.wxss
new file mode 100644
index 0000000..52e67af
--- /dev/null
+++ b/pages/grade/grade.wxss
@@ -0,0 +1,171 @@
+.scroll-header {
+ display: flex;
+ white-space: nowrap;
+}
+
+.thin_circle {
+ position: relative;
+ height: 132rpx;
+ width: 132rpx;
+ border: 1px solid #f69948;
+ display: inline-block;
+ border-radius: 50%;
+ margin-right: 46rpx;
+}
+
+.page {
+ height: 100%;
+ font-weight: 400;
+}
+
+.scroll {
+ padding: 0 56rpx 20rpx;
+ margin-top: 22rpx;
+}
+
+.title {
+ border-top: 20rpx solid #fafafa;
+ font-size: 34rpx;
+ font-weight: bold;
+ color: rgba(85, 85, 85, 1);
+ padding: 30rpx 0 10rpx;
+ line-height: 34rpx;
+ text-indent: 1em;
+}
+
+.img {
+ width: 320rpx;
+ display: block;
+ margin: 160rpx auto 0;
+}
+
+.txt {
+ display: block;
+ text-align: center;
+ font-size: 30rpx;
+ color: #ccc;
+}
+
+.scroll-view-item {
+ position: relative;
+ text-align: center;
+ display: inline-block;
+ padding-left: 3rpx;
+}
+
+.view text {
+ font-size: 23rpx;
+ display: block;
+ text-align: center;
+ color: #fd9643;
+ line-height: 32rpx;
+}
+
+.scroll-view-item > text {
+ display: block;
+ width: 132rpx;
+ font-size: 21rpx;
+ font-weight: 400;
+ color: rgba(253, 150, 67, 1);
+ line-height: 29rpx;
+}
+
+.view {
+ position: absolute;
+ display: flex;
+ justify-content: center;
+ flex-direction: column;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ margin: auto;
+ width: 108rpx !important;
+ height: 108rpx !important;
+ border: 3px solid #f69948;
+ border-radius: 50%;
+}
+
+.last {
+ margin-right: 0;
+}
+.quanyi{
+ margin-top:20rpx;
+}
+.fl{
+ float: left;
+}
+.fr{
+ float: right;
+}
+.clearfix:after {
+content: ".";
+display: block;
+height: 0;
+clear: both;
+visibility: hidden;
+}
+.grade {
+ width: 30rpx!important;
+}
+
+.quanyi > view .titles {
+ display: inline-block;
+ font-size: 30rpx;
+ font-family: PingFang-SC-Bold;
+ font-weight: bold;
+ line-height: 30rpx;
+ padding: 0 0 0 10rpx;
+}
+
+.quanyi > view:nth-of-type(1) .titles {
+ color: #fd9643;
+}
+
+.quanyi > view:nth-of-type(2) .titles {
+ color: #ffba00;
+}
+
+.quanyi > view:nth-of-type(3) .titles {
+ color: #6cb043;
+}
+
+.quanyi > view:nth-of-type(4) .titles {
+ color: #2ac19c;
+}
+
+.quanyi > view:nth-of-type(5) .titles {
+ color: #fd9643;
+}
+
+.part {
+ padding: 0 34rpx;
+ margin-top: 20rpx;
+}
+
+.des {
+ padding-left: 25rpx;
+ font-size: 26rpx;
+ font-weight: 400;
+ color: rgba(153, 153, 153, 1);
+ line-height: 40rpx;
+ margin-left: 12rpx;
+ padding-top: 10rpx;
+ padding-bottom: 10rpx;
+ margin-top: 10rpx;
+}
+.quanyi > view:nth-of-type(1) .des{
+ border-left:6rpx dotted #fd9643;
+}
+.quanyi > view:nth-of-type(2) .des{
+ border-left:6rpx dotted #ffba00;
+}
+.quanyi > view:nth-of-type(3) .des{
+ border-left:6rpx dotted #6cb043;
+}
+.quanyi > view:nth-of-type(4) .des{
+ border-left:6rpx dotted #2ac19c;
+}
+.quanyi > view:nth-of-type(5) .des{
+ border-left:6rpx dotted #fd9643;
+}
diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js
index dc27566..21e8cd4 100644
--- a/pages/passCar/passCar.js
+++ b/pages/passCar/passCar.js
@@ -19,6 +19,7 @@ Page({
duration: 1000,
current: 0,
stopFees: {},
+ canIUse: wx.canIUse("navigator")
},
/**
* 车牌轮播滑动
@@ -43,6 +44,13 @@ Page({
url: '/pages/managelicenseplate/managelicenseplate',
})
},
+ gotoetcp:function(){
+ wx.navigateToMiniProgram({
+ appId:'wx192b7d2e8dcbefd0',
+ extraData: this.data.extraData,
+ envVersion:'release'
+ })
+ },
showquan: function() {
wx.navigateTo({
url: '/pages/passCar/couponList/couponList',
@@ -53,8 +61,10 @@ Page({
*/
gotodetail: function(e) {
console.log(e.target.dataset.rule);
- wx.navigateTo({
- url: `/pages/payrule/payrule?rule=${e.target.dataset.rule}`,
+ wx.showModal({
+ title: '缴费规则',
+ content: e.target.dataset.rule,
+ showCancel: false,
})
},
onShow: function(options) {
diff --git a/pages/passCar/passCar.wxml b/pages/passCar/passCar.wxml
index f5549d9..ca96566 100644
--- a/pages/passCar/passCar.wxml
+++ b/pages/passCar/passCar.wxml
@@ -61,9 +61,10 @@
-
+
立即支付
+ 立即支付
diff --git a/pages/passCar/passCar.wxss b/pages/passCar/passCar.wxss
index 2eb5ecf..feeb69f 100644
--- a/pages/passCar/passCar.wxss
+++ b/pages/passCar/passCar.wxss
@@ -173,6 +173,9 @@ page {
margin-bottom: 80rpx;
border-top: 16rpx #f8f8f8 solid;
}
+.bottonBox view:nth-of-type(1) image{
+ height: 45rpx;
+}
.textStyle {
background-color: white;
@@ -189,7 +192,7 @@ page {
.textStyle image {
width: 40rpx;
height: 40rpx;
- top: 27rpx;
+ top: 24rpx;
left: 27rpx;
position: absolute;
}
diff --git a/pages/user/index.js b/pages/user/index.js
index 99426b8..7500564 100644
--- a/pages/user/index.js
+++ b/pages/user/index.js
@@ -10,6 +10,14 @@ Page({
flag: 'hidden',
score:'0'
},
+ /**
+ * 跳转到成长值的页面
+ */
+ gotograde:function(){
+ wx.navigateTo({
+ url: '/pages/grade/grade',
+ })
+ },
navigateTo() {
wx.navigateTo({
url: `/pages/login/index`
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index 3aa4ff2..805d751 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -10,7 +10,7 @@
等级:{{levelName}}
-
+
{{score}}
@@ -67,7 +67,7 @@
- 版本号:2.1.2
+ 版本号:2.1.4
diff --git a/pages/user/index.wxss b/pages/user/index.wxss
index db12ac1..7f1a750 100644
--- a/pages/user/index.wxss
+++ b/pages/user/index.wxss
@@ -104,10 +104,9 @@
}
.chengzhang1 image {
- width: 24rpx;
- height: 24rpx;
+ width: 30rpx;
+ height: 30rpx;
vertical-align: top;
- margin-top: 10rpx;
}
.chengzhang1 .view {