diff --git a/app.json b/app.json
index 78f2964..a5cc1c7 100644
--- a/app.json
+++ b/app.json
@@ -47,7 +47,8 @@
"carModelsRatio/index",
"eventRatio/index",
"themeRatio/index",
- "addEvent/index"
+ "addEvent/index",
+ "addTheme/index"
]
}
],
diff --git a/contrastPackages/eventRatio/index.js b/contrastPackages/eventRatio/index.js
index 955d1dc..737d530 100644
--- a/contrastPackages/eventRatio/index.js
+++ b/contrastPackages/eventRatio/index.js
@@ -5,19 +5,28 @@ Page({
* 页面的初始数据
*/
data: {
- boxArr:new Array(2),
- tabActive:0,
- sonCom:true
+ boxArr: new Array(2),
+ tabActive: 0,
+ sonCom: true
},
/**
* 生命周期函数--监听页面加载
*/
+ getEvent() {
+ this.setData({
+ boxArr: wx.getStorageSync('eventData')
+ })
+ wx.setStorageSync('brandRatioTime', {
+ sTimeType: '34'
+ })
+ },
onLoad(options) {
- this.setData({
- boxArr:wx.getStorageSync('eventData')
- })
- wx.setStorageSync('brandRatioTime', {sTimeType:'34'})
+ this.getEvent()
+ },
+ onShow() {
+ this.getEvent()
+ this.reLoad()
},
changeTab(val) {
let n = val.detail.index;
@@ -25,14 +34,27 @@ Page({
tabActive: n
})
},
- changeTime(event){
- let {detail} = event
- wx.setStorageSync('brandRatioTime', detail)
+ switchEvent(e) {
+ let index = e.currentTarget.dataset.index
+ this.data.boxArr.splice(index, 1)
+ wx.setStorageSync('eventData', this.data.boxArr)
+ wx.navigateTo({
+ url: '/contrastPackages/addEvent/index',
+ })
+ },
+ changeTime(event) {
+ let {
+ detail
+ } = event
+ wx.setStorageSync('brandRatioTime', detail)
+ this.reLoad()
+ },
+ reLoad() {
this.setData({
- sonCom:false
+ sonCom: false
})
this.setData({
- sonCom:true
+ sonCom: true
})
}
})
\ No newline at end of file
diff --git a/contrastPackages/eventRatio/index.wxml b/contrastPackages/eventRatio/index.wxml
index 10586cb..85fb13f 100644
--- a/contrastPackages/eventRatio/index.wxml
+++ b/contrastPackages/eventRatio/index.wxml
@@ -7,17 +7,11 @@
添加事件一
-
-
+
+
切换
- |
-
-
-
- 删除
-
{{item.events_title}}
diff --git a/contrastPackages/themeRatio/index.js b/contrastPackages/themeRatio/index.js
index feba8c1..6c4bd37 100644
--- a/contrastPackages/themeRatio/index.js
+++ b/contrastPackages/themeRatio/index.js
@@ -5,20 +5,42 @@ Page({
* 页面的初始数据
*/
data: {
- boxArr:new Array(6),
- tabActive:0,
- sonCom:true
+ boxArr: new Array(6),
+ tabActive: 0,
+ sonCom: true
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
-
- this.setData({
- boxArr:wx.getStorageSync('themeData')
- })
- wx.setStorageSync('brandRatioTime', {sTimeType:'34'})
+ this.getData()
+ },
+ onShow() {
+ this.getData()
+ this.reLoad()
+ },
+ del(e) {
+ let index = e.currentTarget.dataset.index
+ let boxArr = this.data.boxArr
+ boxArr.splice(index, 1)
+ boxArr.length = 6
+ this.setData({
+ boxArr
+ })
+ wx.setStorageSync('themeData', boxArr)
+ this.reLoad()
+ },
+ switchTheme(e) {
+ let index = e.currentTarget.dataset.index
+ this.data.boxArr.splice(index, 1)
+ this.add()
+ },
+ add() {
+ wx.setStorageSync('themeData', this.data.boxArr)
+ wx.navigateTo({
+ url: '/contrastPackages/addTheme/index',
+ })
},
changeTab(val) {
let n = val.detail.index;
@@ -26,14 +48,30 @@ Page({
tabActive: n
})
},
- changeTime(event){
- let {detail} = event
- wx.setStorageSync('brandRatioTime', detail)
+ changeTime(event) {
+ let {
+ detail
+ } = event
+ wx.setStorageSync('brandRatioTime', detail)
+ this.reLoad()
+ },
+ reLoad() {
this.setData({
- sonCom:false
+ sonCom: false
})
this.setData({
- sonCom:true
+ sonCom: true
+ })
+ },
+ getData() {
+ let boxArr = wx.getStorageSync('themeData')
+
+ boxArr.length = 6
+ this.setData({
+ boxArr: boxArr
+ })
+ wx.setStorageSync('brandRatioTime', {
+ sTimeType: '34'
})
}
})
\ No newline at end of file
diff --git a/contrastPackages/themeRatio/index.wxml b/contrastPackages/themeRatio/index.wxml
index 721034b..4d6b2ee 100644
--- a/contrastPackages/themeRatio/index.wxml
+++ b/contrastPackages/themeRatio/index.wxml
@@ -9,14 +9,14 @@
-
+
切换
|
-
+
删除
diff --git a/pages/varComm/index.js b/pages/varComm/index.js
index b36159e..8534f37 100644
--- a/pages/varComm/index.js
+++ b/pages/varComm/index.js
@@ -9,7 +9,7 @@ Page({
onShow() {
this.getTabBar().init();
console.log(this.data.active)
- if(this.data.active==2){
+ if(this.data.active==2 || this.data.active==3){
this.reLoad()
}
},
diff --git a/pages/varComm/index.wxml b/pages/varComm/index.wxml
index a7baf70..154b329 100644
--- a/pages/varComm/index.wxml
+++ b/pages/varComm/index.wxml
@@ -4,6 +4,6 @@
-
+
\ No newline at end of file
diff --git a/pages/varComm/pages/event/index.js b/pages/varComm/pages/event/index.js
index a94c72b..020ebc9 100644
--- a/pages/varComm/pages/event/index.js
+++ b/pages/varComm/pages/event/index.js
@@ -25,6 +25,11 @@ Component({
url: '/contrastPackages/addEvent/index',
})
},
+ switchEvent(e){
+ let index = e.currentTarget.dataset.index
+ this.data.boxArr.splice(index,1)
+ this.add()
+ },
del(e){
let index = e.currentTarget.dataset.index
let result = [...this.data.result]
@@ -44,11 +49,6 @@ Component({
const {
detail
} = event
- console.log(detail);
- // if(detail.length>2){
- // console.log("至多两个");
- // return
- // }
if(detail.length>2){
Dialog.alert({
message: '至多二个',
@@ -70,13 +70,7 @@ Component({
},
lifetimes: {
attached() {
- let x=wx.getStorageSync('eventData')
- if(wx.getStorageSync('eventData')){
- x.length=2
- this.setData({
- boxArr:x
- })
- }
+
app.globalData.request({
action: 'getEventList',
token: wx.getStorageSync('token'),
@@ -84,10 +78,21 @@ Component({
iPageIndex: 1,
iPageSize: 4,
sTimeType: 20
- }).then(res => {
+ }).then(res => {
this.setData({
eventList: res
})
+ let x=wx.getStorageSync('eventData')
+ let result = x.map(ele=>{
+ return JSON.stringify(ele)
+ })
+ if(wx.getStorageSync('eventData')){
+ x.length=2
+ this.setData({
+ boxArr:x,
+ result
+ })
+ }
})
},
},
diff --git a/pages/varComm/pages/event/index.wxml b/pages/varComm/pages/event/index.wxml
index bbe904f..fde1f48 100644
--- a/pages/varComm/pages/event/index.wxml
+++ b/pages/varComm/pages/event/index.wxml
@@ -10,7 +10,7 @@
-
+
切换
diff --git a/pages/varComm/pages/theme/index.js b/pages/varComm/pages/theme/index.js
index d0817d3..ba07636 100644
--- a/pages/varComm/pages/theme/index.js
+++ b/pages/varComm/pages/theme/index.js
@@ -19,10 +19,16 @@ Component({
show:false
})
},
+ switchTheme(e){
+ let index = e.currentTarget.dataset.index
+ this.data.boxArr.splice(index,1)
+ this.add()
+ },
add(){
- // wx.navigateTo({
- // url: 'pages/addEvent/index',
- // })
+ wx.setStorageSync('themeData', this.data.boxArr)
+ wx.navigateTo({
+ url: '/contrastPackages/addTheme/index',
+ })
},
del(e){
let index = e.currentTarget.dataset.index
@@ -62,10 +68,22 @@ Component({
},
lifetimes: {
attached() {
+ let x=wx.getStorageSync('themeData')
+
+ if(wx.getStorageSync('themeData')){
+ let result = x.map(ele=>{
+ return JSON.stringify(ele)
+ })
+ x.length=6
+ this.setData({
+ boxArr:x,
+ result
+ })
+ }
app.globalData.request({
action: 'getSchemeDataToTheme',
token: wx.getStorageSync('token'),
- sType: 'contrast',
+ sType:'former '
}).then(res => {
this.setData({
themeList: res
diff --git a/pages/varComm/pages/theme/index.wxml b/pages/varComm/pages/theme/index.wxml
index b4c7f5b..40781a6 100644
--- a/pages/varComm/pages/theme/index.wxml
+++ b/pages/varComm/pages/theme/index.wxml
@@ -11,7 +11,7 @@
-
+
切换