|
@@ -1,58 +1,37 @@
|
|
|
let app = getApp();
|
|
|
+import recordSource from '../../utils/recordSource'
|
|
|
const getReq = require('./../../config.js').getReq;
|
|
|
|
|
|
Page({
|
|
|
data: {
|
|
|
tabs: [],
|
|
|
- prop_special:[],
|
|
|
- surplus_special:[],
|
|
|
+ prop_special: [],
|
|
|
+ surplus_special: [],
|
|
|
special_datas: {},
|
|
|
summery: [],
|
|
|
- isScroll:false,
|
|
|
- isSendProp:false
|
|
|
+ isScroll: false,
|
|
|
+ isSendProp: false,
|
|
|
+ firstLoad: true
|
|
|
},
|
|
|
|
|
|
- onShow: function() {
|
|
|
- if (app.globalData.backLogin) {
|
|
|
+ onShow: function () {
|
|
|
+ if (app.globalData.backLogin && !this.data.firstLoad) {
|
|
|
app.globalData.backLogin = false;
|
|
|
- wx.reLaunch({
|
|
|
- url: "/pages/index/index"
|
|
|
- });
|
|
|
+ this.getDatas(0)
|
|
|
}
|
|
|
},
|
|
|
|
|
|
onLoad: function () {
|
|
|
- // this.req_tabs();
|
|
|
this.getDatas(0)
|
|
|
},
|
|
|
+ getDatas(special_id) {
|
|
|
|
|
|
- req_tabs(){
|
|
|
- let self = this
|
|
|
- getReq({
|
|
|
- act: 'index',
|
|
|
- op: 'tabs'
|
|
|
- }, function (res) {
|
|
|
- if (res.code == 200) {
|
|
|
- self.getDatas(res.datas.tabs[0].special_id);
|
|
|
- // console.log(res.datas.tabs[0].special_id);
|
|
|
- // self.getDatas(1364);
|
|
|
- self.setData({
|
|
|
- tabs: res.datas.tabs
|
|
|
- });
|
|
|
- }
|
|
|
- })
|
|
|
- },
|
|
|
- onMyEvent: function (e) {
|
|
|
- this.setData({
|
|
|
- prop_special:[],
|
|
|
- surplus_special:[],
|
|
|
- special_datas: {},
|
|
|
- summery: []
|
|
|
- });
|
|
|
- this.getDatas(e.detail.item.special_id)
|
|
|
- },
|
|
|
+ let fromSource = recordSource(app, 'act=special&op=index&special_id=0&page=10&curpage=1&client_type=mini')
|
|
|
+
|
|
|
+ // let fromSource = app.globalData.fromSource
|
|
|
+ // let currentSource = new RecordSource('act=special&op=index&special_id=0&page=10&curpage=1&client_type=mini').encode()
|
|
|
+ // app.setFromSource(currentSource)
|
|
|
|
|
|
- getDatas(special_id) {
|
|
|
wx.showLoading({
|
|
|
title: '加载中'
|
|
|
});
|
|
@@ -62,7 +41,8 @@ Page({
|
|
|
op: 'index',
|
|
|
special_id,
|
|
|
page: 10,
|
|
|
- curpage: 1
|
|
|
+ curpage: 1,
|
|
|
+ from: fromSource
|
|
|
}, function (res) {
|
|
|
if (res.code == 200) {
|
|
|
let prop_special = res.datas.special_list;
|
|
@@ -71,7 +51,8 @@ Page({
|
|
|
surplus_special: prop_special,
|
|
|
prop_special: sent_down_special,
|
|
|
special_datas: res.datas,
|
|
|
- summery: res.datas.summary
|
|
|
+ summery: res.datas.summary,
|
|
|
+ firstLoad: false
|
|
|
});
|
|
|
}
|
|
|
setTimeout(function () {
|
|
@@ -79,9 +60,34 @@ Page({
|
|
|
}, 1000)
|
|
|
})
|
|
|
},
|
|
|
- onPageScroll(e){
|
|
|
+ req_tabs() {
|
|
|
+ let self = this
|
|
|
+ getReq({
|
|
|
+ act: 'index',
|
|
|
+ op: 'tabs'
|
|
|
+ }, function (res) {
|
|
|
+ if (res.code == 200) {
|
|
|
+ self.getDatas(res.datas.tabs[0].special_id);
|
|
|
+ // console.log(res.datas.tabs[0].special_id);
|
|
|
+ // self.getDatas(1364);
|
|
|
+ self.setData({
|
|
|
+ tabs: res.datas.tabs
|
|
|
+ });
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ onMyEvent: function (e) {
|
|
|
+ this.setData({
|
|
|
+ prop_special: [],
|
|
|
+ surplus_special: [],
|
|
|
+ special_datas: {},
|
|
|
+ summery: []
|
|
|
+ });
|
|
|
+ this.getDatas(e.detail.item.special_id)
|
|
|
+ },
|
|
|
+ onPageScroll(e) {
|
|
|
clearTimeout(this.showTop);
|
|
|
- this.showTop = setTimeout(()=>{
|
|
|
+ this.showTop = setTimeout(() => {
|
|
|
let scrollTop = e.scrollTop;
|
|
|
if (scrollTop >= 300) {
|
|
|
this.setData({
|
|
@@ -93,9 +99,9 @@ Page({
|
|
|
isScroll: false
|
|
|
})
|
|
|
}
|
|
|
- },100);
|
|
|
+ }, 100);
|
|
|
},
|
|
|
- backTop(){
|
|
|
+ backTop() {
|
|
|
wx.pageScrollTo({
|
|
|
scrollTop: 0,
|
|
|
duration: 300
|
|
@@ -103,22 +109,22 @@ Page({
|
|
|
},
|
|
|
onShareAppMessage: function () {
|
|
|
return {
|
|
|
- title:"熊猫美妆小程序",
|
|
|
- path:"/pages/index/index"
|
|
|
+ title: "熊猫美妆小程序",
|
|
|
+ path: "/pages/index/index"
|
|
|
}
|
|
|
},
|
|
|
- onReachBottom: function(){
|
|
|
- if (this.data.isSendProp){
|
|
|
+ onReachBottom: function () {
|
|
|
+ if (this.data.isSendProp) {
|
|
|
return;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
let surplus_special_num = this.data.surplus_special.length;
|
|
|
- if (surplus_special_num > 0){
|
|
|
+ if (surplus_special_num > 0) {
|
|
|
// wx.showLoading({
|
|
|
// title: '加载中'
|
|
|
// });
|
|
|
this.setData({
|
|
|
- isSendProp:true
|
|
|
+ isSendProp: true
|
|
|
});
|
|
|
this.data.isSendProp = true;
|
|
|
let prop_special = this.data.surplus_special;
|