diff --git a/contrastPackages/brandRatio/index.js b/contrastPackages/brandRatio/index.js
index 60b7d87..0bcd574 100644
--- a/contrastPackages/brandRatio/index.js
+++ b/contrastPackages/brandRatio/index.js
@@ -12,6 +12,7 @@ Page({
sonCom: true,
popupShow: false,
mockData:[],
+ tempLate:['一','二','三','四','五','六',]
},
/**
@@ -70,6 +71,16 @@ Page({
this.reLoad()
},
del(e) {
+ let filter = this.data.result.filter(ele=>{
+ return ele!= null
+ })
+ if(filter.length==2){
+ Dialog.alert({
+ message: '至少需要两个品牌才可以对比哦！',
+ context:this
+ })
+ return
+ }
let index = e.currentTarget.dataset.index
let result = [...this.data.result]
let boxArr = []
diff --git a/contrastPackages/brandRatio/index.wxml b/contrastPackages/brandRatio/index.wxml
index 2e275a1..1298e76 100644
--- a/contrastPackages/brandRatio/index.wxml
+++ b/contrastPackages/brandRatio/index.wxml
@@ -9,7 +9,7 @@
- 添加品牌一
+ 添加品牌{{ tempLate[index]}}
diff --git a/contrastPackages/carModelsRatio/index.js b/contrastPackages/carModelsRatio/index.js
index 4fbaf81..1f08031 100644
--- a/contrastPackages/carModelsRatio/index.js
+++ b/contrastPackages/carModelsRatio/index.js
@@ -14,7 +14,8 @@ Page({
popupShow2: false,
result: [],
mockData: [],
- sBrand:[]
+ sBrand:[],
+ tempLate:['一','二','三','四','五','六',]
},
/**
@@ -105,6 +106,17 @@ Page({
})
},
del(e) {
+ let filter = this.data.result.filter(ele=>{
+ return ele!= "null"
+ })
+ console.log(filter);
+ if(filter.length==2){
+ Dialog.alert({
+ message: '至少需要两个车型才可以对比哦！',
+ context:this
+ })
+ return
+ }
let index = e.currentTarget.dataset.index
let result = [...this.data.result]
let boxArr = []
diff --git a/contrastPackages/carModelsRatio/index.wxml b/contrastPackages/carModelsRatio/index.wxml
index b2328a5..7d9d873 100644
--- a/contrastPackages/carModelsRatio/index.wxml
+++ b/contrastPackages/carModelsRatio/index.wxml
@@ -9,7 +9,7 @@
- 添加品牌一
+ 添加车型{{tempLate[index]}}
diff --git a/contrastPackages/themeRatio/index.js b/contrastPackages/themeRatio/index.js
index 6c4bd37..98b549c 100644
--- a/contrastPackages/themeRatio/index.js
+++ b/contrastPackages/themeRatio/index.js
@@ -1,4 +1,5 @@
// pages/varComm/pages/brandRatio/index.js
+import Dialog from '../../miniprogram_npm/@vant/weapp/dialog/dialog';
Page({
/**
@@ -7,7 +8,8 @@ Page({
data: {
boxArr: new Array(6),
tabActive: 0,
- sonCom: true
+ sonCom: true,
+ tempLate:['一','二','三','四','五','六',]
},
/**
@@ -21,6 +23,14 @@ Page({
this.reLoad()
},
del(e) {
+ let filter = this.data.boxArr.filter(ele=>ele!=null)
+ if(filter.length==2){
+ Dialog.alert({
+ message: '至少需要两个',
+ context:this
+ })
+ return
+ }
let index = e.currentTarget.dataset.index
let boxArr = this.data.boxArr
boxArr.splice(index, 1)
diff --git a/contrastPackages/themeRatio/index.wxml b/contrastPackages/themeRatio/index.wxml
index 4d6b2ee..10d1770 100644
--- a/contrastPackages/themeRatio/index.wxml
+++ b/contrastPackages/themeRatio/index.wxml
@@ -4,7 +4,7 @@
- 添加主题一
+ 添加主题{{tempLate[index]}}
@@ -45,4 +45,6 @@
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/pages/varComm/pages/brand/index.js b/pages/varComm/pages/brand/index.js
index 1132b33..f4e8f1f 100644
--- a/pages/varComm/pages/brand/index.js
+++ b/pages/varComm/pages/brand/index.js
@@ -5,11 +5,19 @@ Component({
data: {
result: [],
boxArr: new Array(6),
+ tempLate:['一','二','三','四','五','六',]
},
methods: {
startCp() {
+ if(this.data.result.length<2){
+ Dialog.alert({
+ message: '至少需要两个品牌才可以对比哦！',
+ context:this
+ })
+ return
+ }
wx.setStorageSync('brandData', this.data.boxArr)
wx.navigateTo({
// url: `/pages/varComm/pages/brandRatio/index`,
diff --git a/pages/varComm/pages/brand/index.wxml b/pages/varComm/pages/brand/index.wxml
index 3212c5e..4a31aca 100644
--- a/pages/varComm/pages/brand/index.wxml
+++ b/pages/varComm/pages/brand/index.wxml
@@ -7,7 +7,7 @@
- 添加品牌一
+ 添加品牌{{ tempLate[index]}}
diff --git a/pages/varComm/pages/carModels/index.js b/pages/varComm/pages/carModels/index.js
index f95c5f8..3817a24 100644
--- a/pages/varComm/pages/carModels/index.js
+++ b/pages/varComm/pages/carModels/index.js
@@ -8,6 +8,7 @@ Component({
boxArr: new Array(6),
currentBrand:'',
sBrand:[],
+ tempLate:['一','二','三','四','五','六',]
},
@@ -35,6 +36,16 @@ Component({
});
},
startCp() {
+ let filter = this.data.result.filter(ele=>{
+ return ele!= null
+ })
+ if(filter.length<2){
+ Dialog.alert({
+ message: '至少需要两个车型才可以对比哦！',
+ context:this
+ })
+ return
+ }
wx.setStorageSync('modelsData', this.data.boxArr)
wx.setStorageSync('sBrand', this.data.sBrand)
wx.navigateTo({
@@ -46,8 +57,11 @@ Component({
const {detail} = event
const result = []
if(detail.length>6){
- console.log('至多六个');
- return
+ Dialog.alert({
+ message: '至多六个',
+ context:this
+ })
+ return
}
for(let i of detail){
let x = JSON.parse(i)
diff --git a/pages/varComm/pages/carModels/index.wxml b/pages/varComm/pages/carModels/index.wxml
index 0441863..3536ea6 100644
--- a/pages/varComm/pages/carModels/index.wxml
+++ b/pages/varComm/pages/carModels/index.wxml
@@ -6,7 +6,7 @@
- 添加车型一
+ 添加车型{{tempLate[index]}}
diff --git a/pages/varComm/pages/event/index.js b/pages/varComm/pages/event/index.js
index 020ebc9..9c9503f 100644
--- a/pages/varComm/pages/event/index.js
+++ b/pages/varComm/pages/event/index.js
@@ -4,73 +4,83 @@ Component({
data: {
eventList: [],
result: [],
- boxArr:new Array(2).fill(undefined),
- show:false,
+ boxArr: new Array(2).fill(undefined),
+ show: false,
+ tempLate: ['一', '二', '三', '四', '五', '六', ]
},
methods: {
- startCp(){
+
+ startCp() {
+ if (this.data.result.length < 2) {
+ Dialog.alert({
+ message: '必须选择两个',
+ context: this
+ })
+ return
+ }
wx.setStorageSync('eventData', this.data.boxArr)
wx.navigateTo({
url: `/contrastPackages/eventRatio/index`,
})
},
- onClose(){
+ onClose() {
this.setData({
- show:false
+ show: false
})
},
- add(){
+ add() {
wx.setStorageSync('eventData', this.data.boxArr)
wx.navigateTo({
- url: '/contrastPackages/addEvent/index',
+ url: '/contrastPackages/addEvent/index',
})
},
- switchEvent(e){
+ switchEvent(e) {
let index = e.currentTarget.dataset.index
- this.data.boxArr.splice(index,1)
+ this.data.boxArr.splice(index, 1)
this.add()
},
- del(e){
+ del(e) {
let index = e.currentTarget.dataset.index
let result = [...this.data.result]
- let boxArr = []
- result.splice(index,1)
- for(let i of result){
+ let boxArr = []
+ result.splice(index, 1)
+ for (let i of result) {
boxArr.push(JSON.parse(i))
}
boxArr.length = 2
this.setData({
- result:result,
- boxArr:boxArr
+ result: result,
+ boxArr: boxArr
})
+ wx.setStorageSync('eventData', this.data.boxArr)
},
-
+
onChange(event) {
const {
detail
} = event
- if(detail.length>2){
+ if (detail.length > 2) {
Dialog.alert({
message: '至多二个',
- context:this
- })
- return
+ context: this
+ })
+ return
}
let boxArr = []
- for(let i of detail){
+ for (let i of detail) {
let obj = JSON.parse(i)
boxArr.push(obj)
}
boxArr.length = 2
this.setData({
result: detail,
- boxArr:boxArr
+ boxArr: boxArr
})
},
},
lifetimes: {
attached() {
-
+
app.globalData.request({
action: 'getEventList',
token: wx.getStorageSync('token'),
@@ -78,18 +88,19 @@ 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=>{
+ let x = wx.getStorageSync('eventData')
+ let result = x.map(ele => {
return JSON.stringify(ele)
})
- if(wx.getStorageSync('eventData')){
- x.length=2
+ result = result.filter(ele=>ele!='null')
+ if (wx.getStorageSync('eventData')) {
+ x.length = 2
this.setData({
- boxArr:x,
+ boxArr: x,
result
})
}
diff --git a/pages/varComm/pages/event/index.wxml b/pages/varComm/pages/event/index.wxml
index fde1f48..aaf1b3e 100644
--- a/pages/varComm/pages/event/index.wxml
+++ b/pages/varComm/pages/event/index.wxml
@@ -6,7 +6,7 @@
- 添加事件一
+ 添加事件{{tempLate[index]}}
diff --git a/pages/varComm/pages/theme/index.js b/pages/varComm/pages/theme/index.js
index ba07636..20ddfc7 100644
--- a/pages/varComm/pages/theme/index.js
+++ b/pages/varComm/pages/theme/index.js
@@ -6,9 +6,17 @@ Component({
result: [],
boxArr:new Array(6).fill(undefined),
show:false,
+ tempLate: ['一', '二', '三', '四', '五', '六']
},
methods: {
startCp(){
+ if (this.data.result.length < 2) {
+ Dialog.alert({
+ message: '至少选择2个',
+ context: this
+ })
+ return
+ }
wx.setStorageSync('themeData', this.data.boxArr)
wx.navigateTo({
url: `/contrastPackages/themeRatio/index`,
@@ -43,15 +51,19 @@ Component({
result:result,
boxArr:boxArr
})
+ wx.setStorageSync('themeData', this.data.boxArr)
},
onChange(event) {
const {
detail
} = event
- console.log(detail);
- if(detail.length>6){
- console.log("至多六个");
+ let x = detail.filter(ele=>ele!='null')
+ if(x.length>6){
+ Dialog.alert({
+ message: '至多六个',
+ context: this
+ })
return
}
let boxArr = []
@@ -69,11 +81,11 @@ Component({
lifetimes: {
attached() {
let x=wx.getStorageSync('themeData')
-
if(wx.getStorageSync('themeData')){
let result = x.map(ele=>{
return JSON.stringify(ele)
})
+ result=result.filter(ele=>ele!='null')
x.length=6
this.setData({
boxArr:x,
diff --git a/pages/varComm/pages/theme/index.wxml b/pages/varComm/pages/theme/index.wxml
index 40781a6..6f514f2 100644
--- a/pages/varComm/pages/theme/index.wxml
+++ b/pages/varComm/pages/theme/index.wxml
@@ -1,4 +1,5 @@
+
@@ -6,7 +7,7 @@
- 添加主题一
+ 添加主题{{tempLate[index]}}