Commit 4b9eaafa authored by lvtz's avatar lvtz

fix

parents 9f041fad 90e1caa4
...@@ -65,11 +65,13 @@ Page({ ...@@ -65,11 +65,13 @@ Page({
const visitor = LocalStorage.getItem("visitor"); const visitor = LocalStorage.getItem("visitor");
const { sid, from, school_id } = options; const { sid, from, school_id } = options;
let dakarole = LocalStorage.getItem("dakarole"); let dakarole = LocalStorage.getItem("dakarole");
const user = LocalStorage.getItem('user');
this.setData({ this.setData({
sid: sid || 0, sid: sid || 0,
school_id: school_id || 0, school_id: school_id || 0,
dakarole: dakarole, dakarole: dakarole,
from: from || 0 from: from || 0,
mobileArr: [user.mobile]
}); });
this.getCategory(); this.getCategory();
...@@ -109,8 +111,6 @@ Page({ ...@@ -109,8 +111,6 @@ Page({
"params.city": city || '', "params.city": city || '',
"params.area": area || '' "params.area": area || ''
}) })
console.log(this.data.mobileArr,'手机号')
} else { // 是新建状态 } else { // 是新建状态
} }
...@@ -456,10 +456,8 @@ Page({ ...@@ -456,10 +456,8 @@ Page({
}, },
save(e) { save(e) {
console.log(this.data.mobileArr[0],'手机 ')
let saveParams = this.objValueTrim(this.data.params); let saveParams = this.objValueTrim(this.data.params);
saveParams.category = this.data.selectedSubject.join(","); saveParams.category = this.data.selectedSubject.join(",");
if (!saveParams.title) { if (!saveParams.title) {
wx.showModal({ wx.showModal({
title: "提示", title: "提示",
...@@ -519,7 +517,6 @@ Page({ ...@@ -519,7 +517,6 @@ Page({
saveParams.id = this.data.sid; saveParams.id = this.data.sid;
saveParams.school_id = this.data.sid != 0 ? this.data.sid : this.data.school_id; saveParams.school_id = this.data.sid != 0 ? this.data.sid : this.data.school_id;
saveParams.tel_phone = JSON.stringify(this.data.mobileArr); saveParams.tel_phone = JSON.stringify(this.data.mobileArr);
console.log(saveParams, "提交参数");
setSchoolInfo(saveParams) setSchoolInfo(saveParams)
.then(res => { .then(res => {
this.setData({ this.setData({
...@@ -529,7 +526,8 @@ Page({ ...@@ -529,7 +526,8 @@ Page({
if (res.code == 200) { // 成功的操作 if (res.code == 200) { // 成功的操作
if (this.data.sid == 0) { // 新增的操作 if (this.data.sid == 0) { // 新增的操作
wx.redirectTo({ wx.redirectTo({
url: `/business/pages/organizationalmgt/qxknow?sid=${res.data.id}` url: `/business/pages/deskcenter/themetemplate?sid=${this.data.sid}`
// url: `/business/pages/organizationalmgt/qxknow?sid=${res.data.id}`
}); });
} else { } else {
wx.showToast({ wx.showToast({
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</view> </view>
</view> </view>
<view class="line-item"> <view class="line-item">
<view class="item-label">地址</view> <view class="item-label">所在地区</view>
<view class="right" bindtap="addressSelect"> <view class="right" bindtap="addressSelect">
<image class="icon-address" src="{{imageRoot}}2b/organizationalmgt/icon_address.png?{{imageVersion}}"></image> <image class="icon-address" src="{{imageRoot}}2b/organizationalmgt/icon_address.png?{{imageVersion}}"></image>
<view class="iteminput">{{params.province ? params.province+params.city+params.area : '请选择地址'}}</view> <view class="iteminput">{{params.province ? params.province+params.city+params.area : '请选择地址'}}</view>
......
...@@ -34,7 +34,7 @@ page { ...@@ -34,7 +34,7 @@ page {
} }
.line-item .item-label { .line-item .item-label {
font-size: 26rpx; font-size: 26rpx;
color: #222; color: #222222;
min-width: 180rpx; min-width: 180rpx;
word-break: break-all; word-break: break-all;
} }
......
...@@ -92,7 +92,7 @@ Page({ ...@@ -92,7 +92,7 @@ Page({
startDate: formatDate(new Date().getTime()/1000).split(' ')[0], startDate: formatDate(new Date().getTime()/1000).split(' ')[0],
startTime: formatDate(new Date().getTime()/1000).split(' ')[1], startTime: formatDate(new Date().getTime()/1000).split(' ')[1],
endDate: formatDate((new Date().getTime()+86400*1000*7)/1000).split(' ')[0], endDate: formatDate((new Date().getTime()+86400*1000*7)/1000).split(' ')[0],
endTime: formatDate((new Date().getTime()+86400*1000*7)/1000).split(' ')[1], endTime: '23:59',
clock_start_time: '00:00', clock_start_time: '00:00',
clock_end_time: '23:59', clock_end_time: '23:59',
push_status: 2, push_status: 2,
...@@ -123,8 +123,8 @@ Page({ ...@@ -123,8 +123,8 @@ Page({
audio_require_num:0, audio_require_num:0,
startDate: formatDate(new Date().getTime()/1000).split(' ')[0], startDate: formatDate(new Date().getTime()/1000).split(' ')[0],
startTime: formatDate(new Date().getTime()/1000).split(' ')[1], startTime: formatDate(new Date().getTime()/1000).split(' ')[1],
endDate: formatDate((new Date().getTime()+86400*1000*7)/1000).split(' ')[0], endDate: formatDate((new Date().getTime()+86400*1000*1)/1000).split(' ')[0],
endTime: formatDate((new Date().getTime()+86400*1000*7)/1000).split(' ')[1], endTime: '23:59',
// clock_start_time: '00:00', // clock_start_time: '00:00',
// clock_end_time: '23:59', // clock_end_time: '23:59',
push_time:'09:00', push_time:'09:00',
...@@ -266,8 +266,6 @@ Page({ ...@@ -266,8 +266,6 @@ Page({
}); });
if (tid == 0) { if (tid == 0) {
const currentclasses = classes ? JSON.parse(decodeURIComponent(classes)) : []; const currentclasses = classes ? JSON.parse(decodeURIComponent(classes)) : [];
console.log(currentclasses, ';currentclasses');
if (editType == 1) { if (editType == 1) {
wx.setNavigationBarTitle({ wx.setNavigationBarTitle({
title: '新建作业打卡' title: '新建作业打卡'
......
...@@ -261,6 +261,18 @@ ...@@ -261,6 +261,18 @@
</view> </view>
</view> </view>
</view> </view>
<view class="section-wrap">
<view class="section-item" bindtap="goyinxiaoPage">
<view class="form-item">
<view class="item-l">打卡营销页</view>
<view class="item-r">
<view class="label">{{lockThemeAdInfo.id != 0 ? lockThemeAdInfo.title : '请选择营销页'}}</view>
<image class="icon-arr" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"/>
</view>
</view>
</view>
<view class="section-tip" style="color: #999999;">可在学生加入打卡前展示, 此功能可收集有意向学生的联系方式 <text data-type="4" bindtap="getHelp" style="color: #16B0FD;">了解详情</text></view>
</view>
<view class="new-setting-box"> <view class="new-setting-box">
<view class="title-wrapper"> <view class="title-wrapper">
<view class="title-box"> <view class="title-box">
...@@ -289,30 +301,7 @@ ...@@ -289,30 +301,7 @@
<view class="addRadio" wx:if="{{radioList.length==0}}" bindtap="addRadio">添加自定义单选项</view> <view class="addRadio" wx:if="{{radioList.length==0}}" bindtap="addRadio">添加自定义单选项</view>
</view> </view>
</view> </view>
<view class="section-wrap"> <view class="locksubjectbox" style="margin-bottom: 24rpx">
<view class="section-item" bindtap="goyinxiaoPage">
<view class="form-item">
<view class="item-l">打卡营销页</view>
<view class="item-r">
<view class="label">{{lockThemeAdInfo.id != 0 ? lockThemeAdInfo.title : '请选择营销页'}}</view>
<image class="icon-arr" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"/>
</view>
</view>
</view>
<view class="section-tip" style="color: #999999;">可在学生加入打卡前展示, 此功能可收集有意向学生的联系方式 <text data-type="4" bindtap="getHelp" style="color: #16B0FD;">了解详情</text></view>
</view>
<view class="section-wrap" bindtap="bindMoreSetting">
<view class="section-item">
<view class="form-item">
<view class="item-l">高级设置</view>
<view class="item-r">
<image class="icon-arr" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"/>
</view>
</view>
</view>
<view class="section-tip" style="color: #999999;">设置学生打卡参与方式、作业要求、打卡模式等</view>
</view>
<view class="locksubjectbox" >
<view class="locksubjectbigtitle" wx:if="{{subjecSort.length > 1}}"> <view class="locksubjectbigtitle" wx:if="{{subjecSort.length > 1}}">
<view class="bigtitle" wx:for="{{subjecSort}}" wx:key="index" data-index="{{index}}" data-item="{{item}}" bindtap="selectSubjectSort"> <view class="bigtitle" wx:for="{{subjecSort}}" wx:key="index" data-index="{{index}}" data-item="{{item}}" bindtap="selectSubjectSort">
<view class="bigtitletext" wx:if="{{item.length > 1}}">第{{item[0]}}-{{item[item.length - 1]}}关</view> <view class="bigtitletext" wx:if="{{item.length > 1}}">第{{item[0]}}-{{item[item.length - 1]}}关</view>
...@@ -330,6 +319,17 @@ ...@@ -330,6 +319,17 @@
</view> </view>
</view> </view>
</view> </view>
<view class="section-wrap" bindtap="bindMoreSetting">
<view class="section-item">
<view class="form-item">
<view class="item-l">高级设置</view>
<view class="item-r">
<image class="icon-arr" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"/>
</view>
</view>
</view>
<view class="section-tip" style="color: #999999;">设置学生打卡参与方式、作业要求、打卡模式等</view>
</view>
</block> </block>
<sound-recording sid="{{sid}}" show="{{audioStatus.show}}" bind:addVoice="addVoice" bind:pushVoice="pushVoice"> <sound-recording sid="{{sid}}" show="{{audioStatus.show}}" bind:addVoice="addVoice" bind:pushVoice="pushVoice">
</sound-recording> </sound-recording>
......
...@@ -38,6 +38,12 @@ page{ ...@@ -38,6 +38,12 @@ page{
right: 0; right: 0;
top: 0; top: 0;
} }
.themetab .themetypeitem:nth-child(1) {
border-right: none;
}
.themetab .themetypeitem:nth-child(2) {
border-right: none;
}
.themetab .themetypeitem.active { .themetab .themetypeitem.active {
background-color: #16B0FD; background-color: #16B0FD;
color: #FFFFFF; color: #FFFFFF;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment