diff --git a/common/common.js b/common/common.js
index ccf0d51..2272971 100644
--- a/common/common.js
+++ b/common/common.js
@@ -67,16 +67,27 @@ export default {
},
navTo(item) {
- /* 领券中心 */
- if (item.ttype == 1) {
- this.to({
- url: '/package/index/coupon-center',
- query: {
- coupon_id: item.coupon_id
- }
- })
+
+
+ switch (item.ttype) {
+ case 1:
+ /* 领券中心 */
+ this.to({
+ url: '/package/index/coupon-center',
+ query: {
+ coupon_id: item.coupon_id
+ }
+ })
+ break;
+
+ case 5: //达达券排行榜
+ this.to({
+ url: '/pages/shouye/dada_ranking',
+ })
+ break;
}
+
if (item.goods_id > 0) {
if (item.ttype == 2) {
/* 一番赏 */
@@ -125,7 +136,7 @@ export default {
return new Promise((resolve, reject) => {
WeixinJSBridge.invoke(
'getBrandWCPayRequest', data,
- function (res) {
+ function(res) {
console.log('支付回调', res);
if (res.errMsg == 'requestPayment:fail cancel') {
uni.showToast({
@@ -283,7 +294,10 @@ export default {
//TODO handle the exception
}
var that = this;
- setTimeout(() => { that.data.loading = false; console.log("方法执行结束", this.data.loading, this.data.loading); }, 1000)
+ setTimeout(() => {
+ that.data.loading = false;
+ console.log("方法执行结束", this.data.loading, this.data.loading);
+ }, 1000)
},
@@ -521,13 +535,13 @@ export default {
'onMenuShareTimeline',
]
});
- wx.ready(function () {
+ wx.ready(function() {
wx.checkJsApi({
jsApiList: [
'openAddress',
'onMenuShareTimeline',
],
- success: function (res) {
+ success: function(res) {
if (link.indexOf('http:') < 0 &&
link.indexOf('https:') < 0) {
link = location.href.split('#')[0] + "#" + link;
@@ -538,7 +552,7 @@ export default {
desc: desc, // 分享描述
link: link, // 分享链接,该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
imgUrl: image, // 分享图标
- success: function () {
+ success: function() {
// 设置成功
}
})
@@ -568,7 +582,7 @@ export default {
});
- wx.error(function (res) {
+ wx.error(function(res) {
// config信息验证失败会执行error函数,如签名过期导致验证失败,具体错误信息可以打开config的debug模式查看,也可以在返回的res参数中查看,对于SPA可以在这里更新签名。
console.log("出现错误", res);
});
diff --git a/package/mine/equity.vue b/package/mine/equity.vue
index 7aa578b..26528d5 100644
--- a/package/mine/equity.vue
+++ b/package/mine/equity.vue
@@ -338,7 +338,7 @@
.content {
padding: 30rpx;
background-color: #F7F7F7;
- height: 100%;
+ min-height: 100vh;
.user-card {
margin: 40rpx auto 0;
diff --git a/pages.json b/pages.json
index 1b8915d..8b328a1 100644
--- a/pages.json
+++ b/pages.json
@@ -438,30 +438,25 @@
}
},
{
- "path" : "pages/infinite/daily_check_in",
- "style" :
- {
+ "path": "pages/infinite/daily_check_in",
+ "style": {
"navigationStyle": "custom"
}
},
{
- "path" : "pages/infinite/bonus_house",
- "style" :
- {
+ "path": "pages/infinite/bonus_house",
+ "style": {
"navigationStyle": "custom"
}
},
{
- "path" : "pages/infinite/bonus_house_details",
- "style" :
- {
+ "path": "pages/infinite/bonus_house_details",
+ "style": {
"navigationStyle": "custom"
}
- },
- {
- "path" : "pages/infinite/VIP_perks",
- "style" :
- {
+ }, {
+ "path": "pages/shouye/dada_ranking",
+ "style": {
"navigationStyle": "custom"
}
}
diff --git a/pages/infinite/VIP_perks.vue b/pages/infinite/VIP_perks.vue
deleted file mode 100644
index ded3294..0000000
--- a/pages/infinite/VIP_perks.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
- VIP福利
-
-
-
-
-
-
-
diff --git a/pages/infinite/index.vue b/pages/infinite/index.vue
index 6fb4d7b..762dd07 100644
--- a/pages/infinite/index.vue
+++ b/pages/infinite/index.vue
@@ -1,9 +1,8 @@
-
+
-
+
福利
@@ -20,114 +19,121 @@
\ No newline at end of file
diff --git a/pages/shouye/dada_ranking.vue b/pages/shouye/dada_ranking.vue
new file mode 100644
index 0000000..535a1d3
--- /dev/null
+++ b/pages/shouye/dada_ranking.vue
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+ 达达券排行榜
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{index+1}}
+
+
+
+
+
+
+ {{item.nickname}}
+
+
+ {{item.invitenumber}}张
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file