From 4470472a31c0fd1ab055629e974dd82e7f4d777b Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Sat, 20 Apr 2019 16:08:14 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=AF=E5=88=86][=E5=88=A0=E9=99=A4]:[?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=A7=AF=E5=88=86=E6=97=A0=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E4=BB=A3=E7=A0=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/czdetail/czdetail.wxss | 2 +- pages/integralmall/index.js | 26 +++++----------------- pages/integralmall/index.wxml | 2 +- pages/integralmall/integraHistory/index.js | 16 ------------- pages/main/index.js | 3 ++- 5 files changed, 10 insertions(+), 39 deletions(-) diff --git a/pages/czdetail/czdetail.wxss b/pages/czdetail/czdetail.wxss index 3fe7fc7..6c9fd59 100644 --- a/pages/czdetail/czdetail.wxss +++ b/pages/czdetail/czdetail.wxss @@ -19,7 +19,7 @@ background: #fff; font-size: 28rpx; font-weight: 400; - color: rgba(2, 192, 255, 1); + color: #fc5b24; border-bottom-left-radius: 50rpx; border-top-left-radius: 50rpx; } diff --git a/pages/integralmall/index.js b/pages/integralmall/index.js index 7fc15f4..399d40a 100644 --- a/pages/integralmall/index.js +++ b/pages/integralmall/index.js @@ -1,7 +1,6 @@ var config = require("../../config/config.js"); const Http = require("../../utils/HttpBasics"); const imgurl = require("../../utils/imgurl"); -const { spellStatus, spellStatus02 } = require("../../utils/spell"); Page({ /** * 页面的初始数据 @@ -26,7 +25,12 @@ Page({ }, onLoad: function (options) { let that = this; - that.getBannerlist(); + console.log(options) + if (options &&options.credit){ + that.setData({ + credit: options.credit + }) + } var todayDate = new Date().getTime(); that.setData({ optionsData: options, @@ -59,23 +63,6 @@ Page({ url: '/pages/integralmall/integraHistory/index', }) }, - /** - * banner - */ - getBannerlist: function () { - let that = this; - Http.get({ - url: config.api.bannerlist, - data: { - pageNum: 1, - pageSize: 7 - } - }).then(res => { - that.setData({ - list: res.data.list - }); - }); - }, getList(pageNum) { var that = this; console.log(pageNum) @@ -180,7 +167,6 @@ Page({ */ onPullDownRefresh: function (e) { let that = this; - that.getBannerlist(); that.getList(1); } }) \ No newline at end of file diff --git a/pages/integralmall/index.wxml b/pages/integralmall/index.wxml index 97c4f53..349802b 100644 --- a/pages/integralmall/index.wxml +++ b/pages/integralmall/index.wxml @@ -2,7 +2,7 @@ 我的积分 - 200 + {{credit}} diff --git a/pages/integralmall/integraHistory/index.js b/pages/integralmall/integraHistory/index.js index a9dcd3d..69ee154 100644 --- a/pages/integralmall/integraHistory/index.js +++ b/pages/integralmall/integraHistory/index.js @@ -36,7 +36,6 @@ Page({ */ onShow: function () { let that = this; - that.getScore(); that.record(1, 15); }, record(pageNum) { @@ -67,7 +66,6 @@ Page({ }); } that.data.list = that.data.list.concat(res.data.list); - console.log(that.data.list,22222222222) that.setData({ list: that.data.list, creditAmount: that.data.list[0].creditAmount @@ -84,20 +82,6 @@ Page({ }) } }, - getScore: function () { - let that = this; - Http.get({ - url: config.api.getScore, - data: {} - }) - .then(res => { - console.log(res) - that.setData({ - score: res.data.score, - levelName: res.data.levelName, - }) - }) - }, /** * 刷新 */ diff --git a/pages/main/index.js b/pages/main/index.js index 5b082ce..d255100 100644 --- a/pages/main/index.js +++ b/pages/main/index.js @@ -110,8 +110,9 @@ Page({ }, //跳往积分商城 gotouser:function(){ + let credit = this.data.credit; wx.navigateTo({ - url: '/pages/integralmall/index', + url: `/pages/integralmall/index?credit=${credit}` }) }, //跳往砍价专场