sws
/
carInsightSystem_wxapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zx

Browse Source
dev
zx 3 years ago
parent d37d179993
commit 115047b300
13 changed files with 0 additions and 291 deletions
Show Stats Download Patch File Download Diff File

68
contrastPackages/addEvent/index.js
Unescape View File

@ -1,70 +1,3 @@
<<<<<<< HEAD
// contrastPackages/addEvent/index.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
=======
// pages/varComm/pages/addEvent/index.js // pages/varComm/pages/addEvent/index.js
const app = getApp() const app = getApp()
Page({ Page({
@ -223,5 +156,4 @@ Page({
}) })
}) })
}, },
>>>>>>> 09cfba1debc306a62e6602a6fe21d80489bf7103
}) })

4
contrastPackages/addEvent/index.json
Unescape View File

@ -1,10 +1,6 @@
{ {
<<<<<<< HEAD
"usingComponents": {}
=======
"usingComponents": {}, "usingComponents": {},
"navigationBarTitleText": "添加事件", "navigationBarTitleText": "添加事件",
"navigationBarTextStyle":"black", "navigationBarTextStyle":"black",
"navigationBarBackgroundColor": "#ffffff" "navigationBarBackgroundColor": "#ffffff"
>>>>>>> 09cfba1debc306a62e6602a6fe21d80489bf7103
} }

4
contrastPackages/addEvent/index.wxss
Unescape View File

@ -1,6 +1,3 @@
<<<<<<< HEAD
/* contrastPackages/addEvent/index.wxss */
=======
/* pages/varComm/pages/addEvent/index.wxss */ /* pages/varComm/pages/addEvent/index.wxss */
.menu{ .menu{
box-shadow: none !important; box-shadow: none !important;
@ -76,4 +73,3 @@ checkbox .wx-checkbox-input {
/* margin-left: 32rpx ; */ /* margin-left: 32rpx ; */
font-size: 32rpx !important; font-size: 32rpx !important;
} }
>>>>>>> 09cfba1debc306a62e6602a6fe21d80489bf7103

61
contrastPackages/brandRatio/index.js
Unescape View File

@ -1,18 +1,11 @@
<<<<<<< HEAD
// contrastPackages/brandRatio/index.js
=======
import Dialog from '../../miniprogram_npm/@vant/weapp/dialog/dialog'; import Dialog from '../../miniprogram_npm/@vant/weapp/dialog/dialog';
const app = getApp() const app = getApp()
>>>>>>> 09cfba1debc306a62e6602a6fe21d80489bf7103
Page({ Page({
/** /**
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
<<<<<<< HEAD
=======
boxArr: new Array(6), boxArr: new Array(6),
tabActive: 0, tabActive: 0,
result: [], result: [],
@ -20,65 +13,12 @@ Page({
popupShow: false, popupShow: false,
mockData:[], mockData:[],
tempLate:['一','二','三','四','五','六',] tempLate:['一','二','三','四','五','六',]
>>>>>>> 09cfba1debc306a62e6602a6fe21d80489bf7103
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad(options) { onLoad(options) {
<<<<<<< HEAD
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
=======
this.setData({ this.setData({
boxArr: wx.getStorageSync('brandData'), boxArr: wx.getStorageSync('brandData'),
result:wx.getStorageSync('brandData').map(ele=>{ result:wx.getStorageSync('brandData').map(ele=>{
@ -197,6 +137,5 @@ Page({
this.setData({ this.setData({
sonCom: true sonCom: true
}) })
>>>>>>> 09cfba1debc306a62e6602a6fe21d80489bf7103
} }
}) })

5
contrastPackages/brandRatio/index.json
Unescape View File

@ -1,8 +1,4 @@
{ {
<<<<<<< HEAD
"usingComponents": {}
}
=======
"usingComponents": { "usingComponents": {
"time-component":"/components/timecomponent/index", "time-component":"/components/timecomponent/index",
"time-custom": "../../components/timeCustom/index", "time-custom": "../../components/timeCustom/index",
@ -13,4 +9,3 @@
}, },
"navigationBarTitleText": "品牌对比" "navigationBarTitleText": "品牌对比"
} }
>>>>>>> 09cfba1debc306a62e6602a6fe21d80489bf7103

4
contrastPackages/brandRatio/index.wxss
Unescape View File

@ -1,6 +1,3 @@
<<<<<<< HEAD
/* contrastPackages/brandRatio/index.wxss */
=======
/* pages/varComm/pages/event/index.wxss */ /* pages/varComm/pages/event/index.wxss */
page { page {
background-color: #f9f9f9; background-color: #f9f9f9;
@ -222,4 +219,3 @@ page {
font-size: 28rpx; font-size: 28rpx;
margin-left: 24rpx; margin-left: 24rpx;
} }
>>>>>>> 09cfba1debc306a62e6602a6fe21d80489bf7103

61
contrastPackages/carModelsRatio/index.js
Unescape View File

@ -1,19 +1,12 @@
<<<<<<< HEAD
// contrastPackages/carModelsRatio/index.js
=======
// pages/varComm/pages/brandRatio/index.js // pages/varComm/pages/brandRatio/index.js
import Dialog from '../../miniprogram_npm/@vant/weapp/dialog/dialog'; import Dialog from '../../miniprogram_npm/@vant/weapp/dialog/dialog';
const app = getApp() const app = getApp()
>>>>>>> 09cfba1debc306a62e6602a6fe21d80489bf7103
Page({ Page({
/** /**
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
<<<<<<< HEAD
=======
boxArr: new Array(6), boxArr: new Array(6),
tabActive: 0, tabActive: 0,
sonCom: true, sonCom: true,
@ -23,65 +16,12 @@ Page({
mockData: [], mockData: [],
sBrand:[], sBrand:[],
tempLate:['一','二','三','四','五','六',] tempLate:['一','二','三','四','五','六',]
>>>>>>> 09cfba1debc306a62e6602a6fe21d80489bf7103
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad(options) { onLoad(options) {
<<<<<<< HEAD
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
=======
app.globalData.request({ app.globalData.request({
action: 'getUserBrand', action: 'getUserBrand',
token: 't%2BrswgjvzGM=', token: 't%2BrswgjvzGM=',
@ -223,6 +163,5 @@ Page({
this.setData({ this.setData({
sonCom: true sonCom: true
}) })
>>>>>>> 09cfba1debc306a62e6602a6fe21d80489bf7103
} }
}) })

5
contrastPackages/carModelsRatio/index.json
Unescape View File

@ -1,8 +1,4 @@
{ {
<<<<<<< HEAD
"usingComponents": {}
}
=======
"usingComponents": { "usingComponents": {
"time-component":"/components/timecomponent/index", "time-component":"/components/timecomponent/index",
"time-custom": "../../components/timeCustom/index", "time-custom": "../../components/timeCustom/index",
@ -13,4 +9,3 @@
}, },
"navigationBarTitleText": "车型对比" "navigationBarTitleText": "车型对比"
} }
>>>>>>> 09cfba1debc306a62e6602a6fe21d80489bf7103

4
contrastPackages/carModelsRatio/index.wxss
Unescape View File

@ -1,6 +1,3 @@
<<<<<<< HEAD
/* contrastPackages/carModelsRatio/index.wxss */
=======
/* pages/varComm/pages/event/index.wxss */ /* pages/varComm/pages/event/index.wxss */
page { page {
background-color: #f9f9f9; background-color: #f9f9f9;
@ -200,4 +197,3 @@ page {
font-size: 28rpx; font-size: 28rpx;
margin-left: 24rpx; margin-left: 24rpx;
} }
>>>>>>> 09cfba1debc306a62e6602a6fe21d80489bf7103

61
contrastPackages/themeRatio/index.js
Unescape View File

@ -1,81 +1,21 @@
<<<<<<< HEAD
// contrastPackages/themeRatio/index.js
=======
// pages/varComm/pages/brandRatio/index.js // pages/varComm/pages/brandRatio/index.js
import Dialog from '../../miniprogram_npm/@vant/weapp/dialog/dialog'; import Dialog from '../../miniprogram_npm/@vant/weapp/dialog/dialog';
>>>>>>> 09cfba1debc306a62e6602a6fe21d80489bf7103
Page({ Page({
/** /**
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
<<<<<<< HEAD
=======
boxArr: new Array(6), boxArr: new Array(6),
tabActive: 0, tabActive: 0,
sonCom: true, sonCom: true,
tempLate:['一','二','三','四','五','六',] tempLate:['一','二','三','四','五','六',]
>>>>>>> 09cfba1debc306a62e6602a6fe21d80489bf7103
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad(options) { onLoad(options) {
<<<<<<< HEAD
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
=======
this.getData() this.getData()
}, },
onShow() { onShow() {
@ -143,6 +83,5 @@ Page({
wx.setStorageSync('brandRatioTime', { wx.setStorageSync('brandRatioTime', {
sTimeType: '34' sTimeType: '34'
}) })
>>>>>>> 09cfba1debc306a62e6602a6fe21d80489bf7103
} }
}) })

5
contrastPackages/themeRatio/index.json
Unescape View File

@ -1,8 +1,4 @@
{ {
<<<<<<< HEAD
"usingComponents": {}
}
=======
"usingComponents": { "usingComponents": {
"time-component":"/components/timecomponent/index", "time-component":"/components/timecomponent/index",
"time-custom": "../../../../components/timeCustom/index", "time-custom": "../../../../components/timeCustom/index",
@ -13,4 +9,3 @@
}, },
"navigationBarTitleText": "品牌对比" "navigationBarTitleText": "品牌对比"
} }
>>>>>>> 09cfba1debc306a62e6602a6fe21d80489bf7103

5
contrastPackages/themeRatio/index.wxml
Unescape View File

@ -1,7 +1,3 @@
<<<<<<< HEAD
<!--contrastPackages/themeRatio/index.wxml-->
<text>contrastPackages/themeRatio/index.wxml</text>
=======
<view class="box"> <view class="box">
<view class="add"> <view class="add">
<view wx:for="{{boxArr}}" wx:key="{{item.events_id}}" style="margin-left: 32rpx;width: 280rpx;"> <view wx:for="{{boxArr}}" wx:key="{{item.events_id}}" style="margin-left: 32rpx;width: 280rpx;">
@ -52,4 +48,3 @@
</view> </view>
<van-dialog id="van-dialog" /> <van-dialog id="van-dialog" />
>>>>>>> 09cfba1debc306a62e6602a6fe21d80489bf7103

4
contrastPackages/themeRatio/index.wxss
Unescape View File

@ -1,6 +1,3 @@
<<<<<<< HEAD
/* contrastPackages/themeRatio/index.wxss */
=======
/* pages/varComm/pages/event/index.wxss */ /* pages/varComm/pages/event/index.wxss */
page { page {
background-color: #f9f9f9; background-color: #f9f9f9;
@ -211,4 +208,3 @@ page {
color: #909497; color: #909497;
text-align: center; text-align: center;
} }
>>>>>>> 09cfba1debc306a62e6602a6fe21d80489bf7103

Write Preview
Loading…
Cancel
Save