Commit 7bad6ec496d711c55949cf1dcf8ac5895ee81e3d

Authored by wangfan
1 parent efd73b53

v2 book sendsms

@@ -2,14 +2,14 @@ var uri_dc = require('utils/uri.js') @@ -2,14 +2,14 @@ var uri_dc = require('utils/uri.js')
2 global.regeneratorRuntime = require('lib/regenerator/runtime-module') 2 global.regeneratorRuntime = require('lib/regenerator/runtime-module')
3 3
4 const { regeneratorRuntime } = global 4 const { regeneratorRuntime } = global
5 -Array.prototype.indexOf = function(val) { 5 +Array.prototype._indexOf = function (val) {
6 for (var i = 0; i < this.length; i++) { 6 for (var i = 0; i < this.length; i++) {
7 if (this[i] == val) return i; 7 if (this[i] == val) return i;
8 } 8 }
9 return -1; 9 return -1;
10 }; 10 };
11 Array.prototype.remove = function(val) { 11 Array.prototype.remove = function(val) {
12 - var index = this.indexOf(val); 12 + var index = this._indexOf(val);
13 if (index > -1) { 13 if (index > -1) {
14 this.splice(index, 1); 14 this.splice(index, 1);
15 } 15 }
@@ -55,5 +55,11 @@ @@ -55,5 +55,11 @@
55 } 55 }
56 ] 56 ]
57 }, 57 },
  58 + "plugins": {
  59 + "calendar": {
  60 + "version": "1.1.3",
  61 + "provider": "wx92c68dae5a8bb046"
  62 + }
  63 + },
58 "debug": true 64 "debug": true
59 } 65 }
@@ -39,6 +39,13 @@ Page({ @@ -39,6 +39,13 @@ Page({
39 } 39 }
40 ], 40 ],
41 buttonhide:true, 41 buttonhide:true,
  42 +
  43 + calendarMaskLoad:false,
  44 + calendarMask:false,
  45 + dayStyle:[
  46 + { month: 'current', day: new Date().getDate(), color: 'white', background: '#AAD4F5' },
  47 + { month: 'current', day: new Date().getDate(), color: 'white', background: '#AAD4F5' }
  48 + ],
42 }, 49 },
43 tablesAll:[], 50 tablesAll:[],
44 /** 51 /**
@@ -68,6 +75,11 @@ Page({ @@ -68,6 +75,11 @@ Page({
68 * 生命周期函数--监听页面显示 75 * 生命周期函数--监听页面显示
69 */ 76 */
70 onShow: function () { 77 onShow: function () {
  78 + setTimeout(()=>{
  79 + this.setData({
  80 + calendarMaskLoad:true,
  81 + })
  82 + },1000);
71 83
72 }, 84 },
73 85
@@ -195,4 +207,24 @@ Page({ @@ -195,4 +207,24 @@ Page({
195 }) 207 })
196 }catch (e){} 208 }catch (e){}
197 }, 209 },
  210 + calendarShow(){
  211 + this.setData({
  212 + calendarMask:true
  213 + })
  214 + },
  215 + dateChange(event){
  216 + console.log(event);
  217 + let clickDay = event.detail.day;
  218 + let changeDay = `dayStyle[1].day`;
  219 + let changeBg = `dayStyle[1].background`;
  220 + this.setData({
  221 + [changeDay]: clickDay,
  222 + [changeBg]: "#84e7d0"
  223 + })
  224 + },
  225 + calendarClose(){
  226 + this.setData({
  227 + calendarMask:false
  228 + })
  229 + },
198 }) 230 })
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
6 "nothingBook":"/components/book/nothing/nothing", 6 "nothingBook":"/components/book/nothing/nothing",
7 "bookList":"/components/book/list/list", 7 "bookList":"/components/book/list/list",
8 "nav":"/components/nav/nav", 8 "nav":"/components/nav/nav",
9 - "tabBar":"/components/book/tabBar/tabBar" 9 + "tabBar":"/components/book/tabBar/tabBar",
  10 + "calendar": "plugin://calendar/calendar"
10 } 11 }
11 } 12 }
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 <view class="date-item-text">{{dateStr[1]}} 明天</view> 13 <view class="date-item-text">{{dateStr[1]}} 明天</view>
14 </item> 14 </item>
15 </view> 15 </view>
16 - <view class="more flex-ll"> 16 + <view class="more flex-ll" bindtap="calendarShow">
17 <view></view> 17 <view></view>
18 <view></view> 18 <view></view>
19 <view></view> 19 <view></view>
@@ -143,3 +143,18 @@ @@ -143,3 +143,18 @@
143 </view> 143 </view>
144 </view> 144 </view>
145 <tabBar></tabBar> 145 <tabBar></tabBar>
  146 +<view class="calendar-mask"
  147 + bindtap="calendarClose"
  148 + style="left:{{calendarMask?0:-5000}}px;" wx:if="{{calendarMaskLoad}}">
  149 +<calendar weeks-type="cn"
  150 + year="2018"
  151 + month="9"
  152 + day="27"
  153 + start-date="2018-09"
  154 + days-color="{{dayStyle}}"
  155 + binddayClick="dateChange"
  156 + active-type="rounded"
  157 + calendar-style="calendar"
  158 + header-style="calendar-header"
  159 + board-style="calendar-board"></calendar>
  160 +</view>
@@ -40,6 +40,7 @@ @@ -40,6 +40,7 @@
40 .date .more{ 40 .date .more{
41 width: 65rpx; 41 width: 65rpx;
42 min-width: 65rpx; 42 min-width: 65rpx;
  43 + height: 60rpx;
43 } 44 }
44 .date .more view{ 45 .date .more view{
45 width: 12rpx; 46 width: 12rpx;
@@ -187,4 +188,31 @@ @@ -187,4 +188,31 @@
187 } 188 }
188 .confirm-button-active{ 189 .confirm-button-active{
189 opacity:1; 190 opacity:1;
  191 +}
  192 +
  193 +/**
  194 + */
  195 +.calendar-mask{
  196 + position: fixed;
  197 + z-index: 99;
  198 + width: 100%;
  199 + height: 100%;
  200 + left:0;
  201 + top:0;
  202 + background-color: rgba(0,0,0,.5);
  203 +}
  204 +.calendar {
  205 + background-color: #eeedff;
  206 + padding-top: 10px;
  207 + position: fixed;
  208 + bottom: 0;
  209 + width: 100%;
  210 +}
  211 +.calendar-header{
  212 + font-size: large; /*修改了标题文字和按钮的大小*/
  213 + color: #605eac; /*修改了标题文字和按钮的颜色*/
  214 +}
  215 +.calendar-board {
  216 + background-color: #dddcff;
  217 + color: white;
190 } 218 }