''

app.json

@@ -445,12 +445,26 @@
         "index"
       ]
     },
+    {
+      "root": "business/pages/calendarthemeeditor",
+      "name": "businessecalendarthemeeditor",
+      "pages": [
+        "index"
+      ]
+    },
     {
       "root": "business/pages/themeranklist",
       "name": "businessthemeranklist",
       "pages": [
         "index"
       ]
+    },
+    {
+      "root": "business/pages/calendarthemeindex",
+      "name": "businessecalendarthemeindex",
+      "pages": [
+        "index"
+      ]
     }
   ],
   "preloadRule": {

business/pages/calendarthemeeditor/index.json

+{
+  "navigationBarTitleText": "新建日历打卡",
+  "usingComponents": {
+    "sjd-media-editor": "../../../components/sjdmediaeditor",
+    "sound-recording": "../../../components/soundrecording",
+    "calender":"../../../components/calendar",
+    "w-switch": "/dist/w-switch/index",
+    "w-button": "/dist/w-button/index",
+    "w-cell": "/dist/w-cell/index",
+    "w-cell-group": "/dist/w-cell-group/index",
+    "w-pane": "/dist/w-pane/index"
+  }
+}
\ No newline at end of file

business/pages/calendarthemeeditor/index.wxss

+@import '../../../style/editor.wxss';
+
+.theme-editor-container {
+  min-height: 100vh;
+  background-color: rgba(247, 247, 249, 1);
+  padding-bottom: 52rpx;
+}
+
+.theme-editor-container.opacitybody {
+  display: none;
+}
+
+.question-box {
+  width: 42rpx;
+  height: 42rpx;
+  border-radius: 50%;
+  background-color: #fff;
+  box-shadow: 0px -2rpx 18rpx 2rpx rgba(0, 0, 0, 0.08);
+  color: #65b8f4;
+  font-size: 30rpx;
+  text-align: center;
+  line-height: 42rpx;
+  margin-left: 20rpx;
+}
+
+.theme-editor-container .circle-name-box {
+  position: relative;
+}
+
+.theme-editor-container .broadcast-box {
+  padding: 22rpx 0 22rpx 24rpx;
+  background-color: #fff;
+}
+
+.theme-editor-container .broadcast-box .broadcast-img {
+  width: 24rpx;
+  height: 18rpx;
+  display: block;
+  float: left;
+  margin-top: 10rpx;
+}
+
+.theme-editor-container .broadcast-box .broadcast-text {
+  font-size: 24rpx;
+  color: #ef9c52;
+  padding-left: 21rpx;
+  float: left;
+  width: 647rpx;
+}
+
+.theme-editor-container .circle-name-box .circle-name {
+  background-color: rgba(248, 248, 248, 1);
+  border-radius: 8rpx;
+  width: 100%;
+  padding: 16rpx 6rpx 19rpx 15rpx;
+  height: 110rpx;
+  font-size: 28rpx;
+  margin-top: 20rpx;
+  line-height: 39rpx;
+  font-size: 26rpx;
+}
+
+.theme-editor-container .circle-name-box .length-rate {
+  position: absolute;
+  right: 6rpx;
+  bottom: 13rpx;
+  color: rgba(0, 0, 0, 0.3);
+  font-size: 26rpx;
+}
+
+.theme-editor-container .circle-name-box .circle-name-placeholder {
+  color: rgba(0, 0, 0, 0.3);
+  /* color:red; */
+  line-height: 39rpx;
+  font-size: 26rpx;
+}
+
+.theme-editor-container .submitbtn {
+  display: block;
+  margin: 0 auto;
+  width: 256rpx;
+  height: 80rpx;
+  line-height: 80rpx;
+  background: rgba(101, 184, 244, 1);
+  border-radius: 40rpx;
+  font-size: 38rpx;
+  color: #fff;
+  letter-spacing: 4rpx;
+  margin-top: 82rpx;
+  /* position: fixed;
+    bottom: 53rpx;
+    left: 50%;
+    margin-left: -128rpx; */
+}
+
+.theme-editor-container .pd0 {
+  padding-bottom: 0;
+}
+
+.warn-text-red {
+  color: #7d7d7d;
+  font-size: 26rpx;
+  margin-top: 44rpx;
+  text-align: center;
+}
+
+.theme-editor-container .self-editor-box .box-title .main-title {
+  float: left;
+}
+
+.main-title-box {
+  display: flex;
+  display: -webkit-flex;
+  align-items: center;
+  justify-content: flex-start;
+  float: left;
+}
+
+.theme-editor-container .self-editor-box .box-title {
+  margin-bottom: 0;
+}
+
+.theme-editor-container .self-editor-box .box-title.box-title-mode .main-title-box .main-title {
+  font-size: 28rpx;
+  font-weight: 500;
+}
+
+.theme-editor-container .self-editor-box .box-title.box-title-mode {
+}
+
+.tranparent {
+  opacity: 0;
+}
+
+.theme-editor-container .self-editor-box .box-title .main-title-right {
+  float: right;
+  color: #65b8f4;
+  font-size: 26rpx;
+  padding-right: 36rpx;
+}
+
+.theme-editor-container .self-editor-box .box-title .arrowright {
+  display: block;
+  width: 14rpx;
+  height: 21rpx;
+  position: absolute;
+  right: 0;
+  top: 27rpx;
+  display: block;
+}
+
+.switchimgbox {
+  display: flex;
+  align-items: center;
+  float: right;
+}
+
+.switchimg {
+  width: 74rpx;
+  height: 36rpx;
+  float: right;
+  /* line-height: 73rpx; */
+  margin-top: 18rpx;
+}
+
+.sjd-dialog {
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  left: 0;
+  top: 0;
+  z-index: 100;
+  display: flex;
+  display: -webkit-flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.sjd-dialog .sjd-input-dialog-mask {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  left: 0;
+  top: 0;
+  background-color: rgba(0, 0, 0, 0.7);
+  /* filter: blur(10px); */
+  z-index: 1;
+}
+
+.sjd-dialog .sjd-input-dialog-content {
+  background-color: #fff;
+  border-radius: 6rpx;
+  position: relative;
+  z-index: 2;
+  width: 560rpx;
+}
+
+.sjd-dialog .sjd-input-dialog-content .sjd-dialog-box {
+  padding: 30rpx;
+}
+
+.sjd-dialog .sjd-input-dialog-content .sjd-dialog-box  .linetext {
+  font-size: 36rpx;
+  color: #000;
+  text-align: center;
+  line-height: 1;
+  margin-bottom: 24rpx;
+}
+
+.sjd-dialog .sjd-input-dialog-content .sjd-dialog-box .smalllineitem {
+  color: #999;
+  font-size: 24rpx;
+  margin-top: 45rpx;
+  text-align: center;
+}
+
+.sjd-dialog .sjd-input-dialog-content .sjd-dialog-box  .input-item {
+  border: 1px solid rgba(0, 0, 0, 0.1);
+  border-radius: 5rpx;
+  padding: 0 10rpx;
+  width: 443rpx;
+  line-height: 60rpx;
+  height: 60rpx;
+  /* margin-bottom: 45rpx; */
+  display: block;
+  margin: 20rpx auto 45rpx;
+}
+
+.sjd-dialog .sjd-input-dialog-content .sjd-dialog-box  .line {
+  margin-bottom: 10rpx;
+  line-height: 1.2;
+}
+
+.sjd-dialog .sjd-input-dialog-content .sjd-input-footer {
+  display: flex;
+  display: -webkit-flex;
+  justify-content: center;
+  border-top: 1px solid rgba(0, 0, 0, 0.05);
+}
+
+.sjd-dialog .sjd-input-dialog-content .sjd-input-footer .btn-item {
+  flex-grow: 1;
+  line-height: 101rpx;
+  text-align: center;
+  font-size: 36rpx;
+}
+
+.sjd-dialog .sjd-input-dialog-content .sjd-input-footer .btn-item.cancel {
+  border-right: 1px solid rgba(0, 0, 0, 0.05);
+}
+
+.sjd-dialog .sjd-input-dialog-content .sjd-input-footer .btn-item.sure {
+  color: #00c200;
+}
+
+/* .media-text-item textarea {
+    height: 600rpx;
+} */
+
+.time-ipt-box {
+  display: flex;
+  font-size: 26rpx;
+  font-family: PingFang-SC-Regular;
+  font-weight: 400;
+  color: rgba(125, 125, 125, 1);
+  padding: 28rpx 0 44rpx 26rpx;
+}
+
+.iteminput {
+  width: 74rpx;
+  border-bottom: 1px solid rgba(130, 142, 156, 0.4);
+  text-align: center;
+  font-size: 26rpx;
+  font-family: PingFang-SC-Regular;
+  font-weight: 400;
+  color: rgba(101, 184, 244, 1);
+}
+
+.timeset-title-box .main-title {
+  font-size: 28rpx;
+  font-weight: 500;
+}
+
+.timeset-box {
+  /* display: flex;
+  justify-content: space-between; */
+  line-height: 1 !important;
+}
+
+.timeset-box .timeset-title-box {
+  float: left;
+}
+
+.timeset-box .content-box {
+  width: 340rpx;
+  font-size: 26rpx;
+  line-height: 1;
+  font-family: PingFang-SC-Regular;
+  font-weight: 400;
+  color: rgba(101, 184, 244, 1);
+  padding-bottom: 20rpx;
+  overflow: hidden;
+  display: flex;
+  float: right;
+  justify-content: space-between;
+  border-bottom: 1px solid rgba(130, 142, 156, 0.4);
+}
+
+.timeset-box .content-box .time {
+}
+
+.timeset-box .content-box .date {
+}
+
+.timeset-box .content-time-box {
+  float: right;
+  display: flex;
+  line-height: 1;
+  font-size: 22rpx;
+  font-family: PingFang-SC-Regular;
+  font-weight: 400;
+  color: rgba(0, 0, 0, 1);
+}
+
+.timeset-box .content-time-box .time {
+  font-size: 26rpx;
+  width: 190rpx;
+  text-align: center;
+  border-bottom: 1px solid rgba(130, 142, 156, 0.4);
+  padding-bottom: 20rpx;
+  color: rgba(101, 184, 244, 1);
+}
+
+.timeset-box .content-time-box .date {
+  width: 190rpx;
+  font-size: 26rpx;
+  text-align: center;
+  border-bottom: 1px solid rgba(130, 142, 156, 0.4);
+  padding-bottom: 20rpx;
+  color: rgba(101, 184, 244, 1);
+}
+
+.timeset-title-box .title-tips {
+  font-size: 24rpx;
+  font-family: PingFang-SC-Regular;
+  font-weight: 400;
+  color: rgba(173, 173, 173, 1);
+}
+
+.time-editor-box {
+  padding: 0 24rpx;
+}
+
+.time-editor-box .time-ipt-box {
+  padding: 0rpx 0 40rpx 26rpx;
+  color: rgba(125, 125, 125, 1);
+}
+
+.time-editor-box .time-ipt-box .time {
+  width: 190rpx;
+  line-height: 1;
+  padding-bottom: 20rpx;
+  text-align: center;
+  font-size: 26rpx;
+  font-family: PingFang-SC-Regular;
+  font-weight: 400;
+  color: rgba(101, 184, 244, 1);
+  border-bottom: 1px solid rgba(130, 142, 156, 0.4);
+}
+.nowork-day{
+
+}
+.nowork-day .box-title{
+  display: flex;
+  align-items: center;
+}
+.nowork-day .box-title .main-title{
+  padding-right: 75rpx;
+}
+.nowork-day .box-title .select-days{
+  width: 434rpx;
+  font-size:26rpx;
+  font-family:PingFang-SC-Regular;
+  font-weight:400;
+  color:rgba(170,170,170,1);
+  overflow: hidden;
+  text-overflow:ellipsis;
+  white-space:nowrap;
+  display: flex;
+}
+.nowork-day .box-title .select-days .day-item{
+
+}
+.nowork-day .arrowsmall{
+  width:12rpx;
+  height:20rpx;
+  padding-left: 20rpx;
+}
+.nowork-day .week-select{
+  display: flex;
+}
+.nowork-day .week-select .week-item{
+  width:78rpx;
+  height:78rpx;
+  background:rgba(255,255,255,1);
+  border:1px solid rgba(203,203,203,1);
+  border-radius:50%;
+  font-size:22rpx;
+  font-family:PingFang-SC-Regular;
+  font-weight:400;
+  color:rgba(0,0,0,1);
+  text-align: center;
+  line-height: 78rpx;
+  margin-right: 26rpx;
+}
+.nowork-day .week-select .selected-item{
+  background:rgba(101,184,244,1);
+  border: none;
+  color:rgba(255,255,255,1);
+}
+.calender-box{
+  background: rgba(0,0,0,.5);
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  z-index: 20;
+  left: 0;
+  bottom: 0;
+}
+.calender-box .content-box{
+  background: #fff;
+  position: absolute;
+  width: 100%;
+  left: 0;
+  bottom: 0;
+  border-radius:20rpx 20rpx 0px 0px;
+}
+.calender-box .footer{
+  display: flex;
+  padding: 85rpx 0 48rpx 0;
+}
+.calender-box .footer .sure{
+  flex: 1;
+  text-align: center;
+  line-height: 1;
+  font-size:26rpx;
+  font-family:PingFang-SC-Bold;
+  font-weight:bold;
+  color:rgba(101,184,244,1);
+  
+}
+.calender-box .footer .cancle{
+  flex: 1;
+  text-align: center;
+  line-height: 1;
+  font-size:26rpx;
+  font-family:PingFang-SC-Bold;
+  font-weight:bold;
+  color:rgba(101,184,244,1);
+  border-right: 1rpx solid rgba(0,0,0,.1);
+}
\ No newline at end of file

business/pages/calendarthemeindex/index.json

+{
+  "navigationBarTitleText": "日历打卡",
+  "enablePullDownRefresh": true,
+  "usingComponents": {
+    "sjd-media-show": "../../../components/sjdmediashow",
+    "clock-item": "../../components/clockitem",
+    "empty-content": "../../../components/emptycontent",
+    "poster-box": "../../../components/posterbox",
+    "go-top": "../../components/goTop",
+    "list-loading": "../../../components/listloading",
+    "comment-editor": "../../../components/commenteditor",
+    "calender":"../../../components/calendar"
+  }
+}
\ No newline at end of file

business/pages/themeeditor/index.json

 {
-  "navigationBarTitleText": "打卡主题",
+  "navigationBarTitleText": "新建作业打卡",
   "usingComponents": {
     "sjd-media-editor": "../../../components/sjdmediaeditor",
-    "sound-recording": "../../../components/soundrecording"
+    "sound-recording": "../../../components/soundrecording",
+    "w-switch": "/dist/w-switch/index",
+    "w-button": "/dist/w-button/index",
+    "w-cell": "/dist/w-cell/index",
+    "w-cell-group": "/dist/w-cell-group/index",
+    "w-pane": "/dist/w-pane/index"
   }
 }
\ No newline at end of file

business/pages/themeindex/index.js

@@ -47,10 +47,12 @@ Page({
   data: {
     imageRoot: app.globalData.imageRoot,
     imageVersion: app.globalData.imageVersion,
+    localImageRoot:'../../../images/',
     id: 0,
     tid: 0,
     sid:'',
     params: {
+      searchName:''
     },
     // detailExpand: false,
     bigSort: 1, // 1 打卡点评 2 打卡统计
@@ -1133,4 +1135,10 @@ Page({
       clockList: _clockList
     })
   },
+  searchinput(e) {
+    const { value } = e.detail;
+    this.setData({
+      'params.searchName': value,
+    })
+  },
 })
\ No newline at end of file

business/pages/themeindex/index.json

 {
-  "navigationBarTitleText": "打卡主题",
+  "navigationBarTitleText": "作业打卡",
   "enablePullDownRefresh": true,
   "usingComponents": {
     "sjd-media-show": "../../../components/sjdmediashow",

components/calendar/iconfont/iconfont.wxss

+@font-face {
+  font-family: 'iconfont';
+  src: url(data:font/truetype;charset=utf-8;base64,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) format('truetype');
+  font-weight: normal;
+  font-style: normal;
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+}
+
+.icon-right::before {
+  content: "\e7eb";
+}
+
+.icon-left::before {
+  content: "\e7ec";
+}
+
+.icon-doubleleft::before {
+  content: "\e7ed";
+}
+
+.icon-doubleright::before {
+  content: "\e7ee";
+}
+

components/calendar/index.json

+{
+  "component": true
+}
\ No newline at end of file

components/calendar/index.wxml

+<view class="flex b tb ac" wx:if="{{calendar}}">
+  <view class="calendar pink-color b tb">
+    <view class="top-handle fs28 b lr ac pc">
+      <view class="prev fs36">
+        <text class="prev-handle iconfont icon-doubleleft" bindtap="chooseDate" data-type="prev_year"></text>
+        <text class="prev-handle iconfont icon-left" bindtap="chooseDate" data-type="prev_month"></text>
+      </view>
+      <view class="date-area b lr cc" bindtap="doubleClickToToday">{{calendar.curYear || "--"}} 年 {{calendar.curMonth || "--"}} 月</view>
+      <view class="next fs36">
+        <text class="next-handle iconfont icon-right" bindtap="chooseDate" data-type="next_month"></text>
+        <text class="next-handle iconfont icon-doubleright" bindtap="chooseDate" data-type="next_year"></text>
+      </view>
+    </view>
+    <view class="weeks b lr ac">
+      <view class="week fs28" wx:for="{{calendar.weeksCh}}" wx:key="{{index}}" data-idx="{{index}}">{{item}}</view>
+    </view>
+    <view class="perspective">
+      <view class="days b lr box-wrap {{calendar.leftSwipe ? 'leftRoate' : ''}}  {{calendar.rightSwipe ? 'rightRoate' : ''}}" bindtouchstart="calendarTouchstart" bindtouchmove="calendarTouchmove" bindtouchend="calendarTouchend">
+        <view wx:if="{{calendar.empytGrids}}" class="grid disable-day-color b ac pc" wx:for="{{calendar.empytGrids}}" wx:key="{{index}}" data-idx="{{index}}">
+          <view class="day b ac pc">{{item}}</view>
+        </view>
+        <view class="grid normal-day-color b ac pc" wx:for="{{calendar.days}}" wx:key="{{index}}" data-disable="{{item.disable}}" data-idx="{{index}}" bindtap="tapDayItem">
+          <view wx:if="{{!calendar.todoLabelCircle}}" class="dot-day-height b tb ac pc">
+            <view class="day border-radius {{(item.week === 0 || item.week === 6) ? 'pink-color' : ''}} {{item.choosed ? 'day-choosed-color day-choosed-bg' : ''}} {{ item.disable ? 'disable-day-color disable-day-bg' : '' }} b ac pc" wx:if="{{!item.todoText}}">{{item.day}}</view>
+            <view wx:if="{{item.showTodoLabel}}" class="{{item.todoText ? 'todo-text' : 'todo-dot'}} {{calendar.todoLabelPos === 'bottom' ? 'todo-text-bottom' : 'todo-text-top'}}" style="background-color: {{calendar.todoLabelColor}};">{{item.todoText}}</view>
+          </view>
+          <view wx:else class="dot-day-height b tb ac pc">
+            <view class="day border-radius {{(item.week === 0 || item.week === 6) ? 'pink-color' : ''}} {{item.showTodoLabel ? 'day-circle' : '' }} {{item.choosed ? 'day-choosed-color day-choosed-bg' : ''}} {{ item.disable ? 'disable-day-color disable-day-bg' : '' }} b ac pc">{{item.day}}</view>
+          </view>
+        </view>
+        <view class="grid disable-day-color b ac pc" wx:for="{{calendar.lastEmptyGrids}}" wx:key="{{index}}" data-idx="{{index}}">
+          <view class="day b ac pc">{{item}}</view>
+        </view>
+      </view>
+    </view>
+  </view>
+</view>
\ No newline at end of file

components/sjdmediashow/index.wxss

@@ -94,7 +94,7 @@
     display: -webkit-flex;
     align-items: center;
     justify-content: center;
-    padding: 32rpx 0;
+    padding: 32rpx 0 0 0;
 }
 .expand-box-withtext.down, .expand-box-withouttext.down {
     

constants/api.js

 import constants from './constants.js';
-const api = constants.host + '/v2/'; // 打卡通用接口
+const api = constants.host + '/v3/'; // 打卡通用接口
 const apiv2 = constants.host2 + '/shop/api/'; // 打卡登录注册忘记密码接口
 
-
 const apis = {
 	formIdCreate: `${api}common/form_id`,
 	customer: {

dist/common/behavior/cell.js

+/*
+ * @Author: cnyballk[https://github.com/cnyballk] 
+ * @Date: 2018-09-15 14:58:34 
+ * @Last Modified by: cnyballk[https://github.com/cnyballk]
+ * @Last Modified time: 2018-09-15 15:28:57
+ */
+module.exports = Behavior({});

dist/common/theme/global.wxss

+/* 
+  This file is a skin file for the Wuss-weapp custom component theme.
+ */
\ No newline at end of file