diff --git a/commons/js/config.js b/commons/js/config.js index c1cc631..9be6f18 100644 --- a/commons/js/config.js +++ b/commons/js/config.js @@ -1,4 +1,4 @@ -const env = "p"; +const env = "d"; const version = 1, diff --git a/pages/index/index.js b/pages/index/index.js index 01a1228..0e981b5 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -41,6 +41,44 @@ Page({ stopNotice:false,//是否不再显示通知 isShowReport:false, isShowProfile:true,//是否显示授权用户信息按钮 + banneractive: 0, + banneractive2: 0, + remind:[ + { + title:'调拨提醒', + content:'您有新的车辆调拨,需要您进行确认操作。', + img:'https://qs.haodian.cn/wechat_app/lichebao/allot/car.gif?v=220224', + btn:{ + title:'前往操作', + url:'/pages/allot/list/index', + }, + }, + { + title:'盘点提醒', + content:'您有新的车辆盘点,需要您进行确认操作。', + img:'https://qs.haodian.cn/wechat_app/lichebao/inventory/animation.gif', + btn:{ + title:'前往操作', + url:'/pages/inventory/list/index', + }, + }, + ], + remind2:[ + { + title:'车辆调拨', + content:'您有新的车辆调拨,需要您进行确认操作。', + img:'https://qs.haodian.cn/wechat_app/lichebao/allot/car.gif?v=220224', + url:'/pages/allot/list/index', + allotNum:'1', + }, + { + title:'车辆盘点', + content:'您有新的车辆调拨,需要您进行确认操作。', + img:'https://qs.haodian.cn/wechat_app/lichebao/inventory/icon.png', + url:'/pages/inventory/list/index', + allotNum:'2', + }, + ], }, onLoad(options) { @@ -293,6 +331,19 @@ Page({ }) }, + //banner轮播点 + bannerChange: function (e) { + this.setData({ + banneractive:e.detail.current, + }); + }, + //banner轮播点 + bannerChange2: function (e) { + this.setData({ + banneractive2:e.detail.current, + }); + }, + //页面相关事件处理函数--监听用户下拉动作 onPullDownRefresh: function () { this.getAppUserCal() diff --git a/pages/index/index.wxml b/pages/index/index.wxml index ca698f0..2cc58aa 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -35,18 +35,25 @@ - - - - - - 车辆调拨 - 您有新的车辆调拨,需要您进行确认操作 - - - {{allotNum}} - - + + + + + + + {{item.title}} + {{item.content}} + + + {{item.allotNum}} + + + + + + + + @@ -169,16 +176,25 @@ - - 调拨提醒 - 您有新的车辆调拨,需要您进行确认操作。 - - - - - - - + + + + {{item.title}} + {{item.content}} + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 4f0c011..8915afa 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -1,4 +1,10 @@ .bg-1c89fd-8058fe{background-image:linear-gradient(45deg, #1c89fd, #8058fe);} .bg-fe606c-ff9026{background-image:linear-gradient(45deg, #fe606c, #ff9026); text-align: center;} .bg-ffedeb{background-color:#ffedeb;} -.color-ff4a3a{color:#ff4a3a;} \ No newline at end of file +.color-ff4a3a{color:#ff4a3a;} + +.indicator-pin{width:20rpx;height:6rpx;display:inline-block;background-color:#ddd;cursor:pointer;transition:all .3s ease-in-out;-ms-transition:all .3s ease-in-out;-moz-transition:all .3s ease-in-out;-webkit-transition:all .3s ease-in-out;-o-transition:all .3s ease-in-out;margin:0 6rpx;vertical-align:top} +.indicator-pin.active{background-color:#36afa2;} + +.indicator-pin2{width:20rpx;height:6rpx;display:inline-block;background-color:#fad6c9;cursor:pointer;transition:all .3s ease-in-out;-ms-transition:all .3s ease-in-out;-moz-transition:all .3s ease-in-out;-webkit-transition:all .3s ease-in-out;-o-transition:all .3s ease-in-out;margin:0 6rpx;vertical-align:top} +.indicator-pin2.active{background-color:#f9394d;} \ No newline at end of file