Skip to content

W
wechatapp.shangjiadao.com
Commit e1eed70e authored by wangxuelai's avatar wangxuelai
Browse files
Options

'ss'

parents 59f041af 029e9110
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 975 additions and 4717 deletions
app.json
View file @ e1eed70e
......@@ -410,7 +410,6 @@
"name": "businessorganizationalmgt",
"pages": [
"index",
"info",
"accountsecurity",
"setting",
"pcwebsiteintroduction",
......@@ -455,13 +454,6 @@
"index"
]
},
{
"root": "business/pages/orgadsetting",
"name": "businessorgadsetting",
"pages": [
"index"
]
},
{
"root": "business/pages/orgpotentialcustomer",
"name": "businessorgpotentialcustomer",
......@@ -657,13 +649,6 @@
"studentact"
]
},
{
"root": "business/pages/morethemeindexclockm",
"name": "businessmorethemeindexclockm",
"pages": [
"index"
]
},
{
"root": "business/pages/pointsexchangerecord",
"name": "businesspointsexchangerecord",
......@@ -792,6 +777,7 @@
"setting",
"myachievement",
"mylikes",
"mytask",
"growthrecord",
"mall",
"integralfile",
......@@ -854,7 +840,6 @@
"network": "all",
"packages": [
"businessloginregistermgt",
"businessdatacenter",
"businessdeskcenter",
"businessclassservice"
]
......@@ -868,8 +853,6 @@
"businessteachermgt",
"businessscoremgt",
"websiteindex",
"businessorgpotentialcustomer",
"businessdatacenter",
"businessorganizationalmgt",
"businessclassservice"
]
......@@ -878,7 +861,6 @@
"network": "all",
"packages": [
"businessloginregistermgt",
"businessdatacenter",
"businessdeskcenter"
]
},
......@@ -889,9 +871,6 @@
"businessthemeindex",
"businessecalendarthemeindex",
"businessmorethemeindex",
"businessecalendarthemeeditor",
"businessmorethemeindexclockm",
"businessecalendarthemeeditor",
"businessclockdetail"
]
},
......
business/pages/deskcenter/index.js
View file @ e1eed70e
// business/pages/deskcenter/index.js
import {
loginTime
} from "../../../service/business/ucenter.js";
import { loginTime } from "../../../service/business/ucenter.js";
import { LocalStorage, formatDay } from "../../../utilities/index.js";
import {
commonwaitjobGet,
......@@ -11,14 +9,14 @@ import {
schoolDetailGet,
} from "../../../service/business/common.js";
import {
import {
getAccountList,
getMemberMe,
helpAds
helpAds,
} from "../../../service/common.js";
import apis from "../../../constants/api.js";
import { todocallGet } from "../../../service/business/classservice.js";
import permissionUtils from '../../../utilities/permission.js';
import permissionUtils from "../../../utilities/permission.js";
var wxCharts = require("../../../utilities/wxcharts-min.js");
var columnChart = null;
......@@ -31,9 +29,9 @@ Page({
imageRoot: app.globalData.imageRoot,
imageVersion: app.globalData.imageVersion,
schoolShow: false,
schoolList:[],
schoolTotal:0,
selectSchoolData:{},
schoolList: [],
schoolTotal: 0,
selectSchoolData: {},
schoolTitile: "",
sid: 0,
......@@ -65,42 +63,10 @@ Page({
analyzeDashStatic: {}, //面板数据
guideDailogShow: false,
guideIndex: 1,
adsList: [],
curbanner: 0,
// 待办事项
waitJobList: [
{
type: 1,
title: "创建一个班级",
count: 0,
},
{
type: 2,
title: "创建一个作业打卡活动",
count: 0,
},
{
type: 3,
title: "添加老师至学校",
count: 0,
},
{
type: 4,
title: "配置一个精美的微官网",
count: 0,
},
{
type: 5,
title: "给学生一次课堂点评",
count: 0,
},
{
type: 6,
title: "给学生配置积分奖励",
count: 0,
},
],
waitJobList: [],//新校区待办事项
},
onLoad: function (options) {
......@@ -115,7 +81,7 @@ Page({
// this.analyzeclasscourseGet();
// this.schoolDetailGet();
this.getschoolList();
this.getAds()
this.getAds();
},
onShow: function () {
this.getMemberMeInfo();
......@@ -175,78 +141,82 @@ Page({
}
});
},
getAds () {
getAds() {
helpAds({
type: 1,
page: 1,
perPage: 10
perPage: 10,
}).then((res) => {
const { code, data } = res;
if (code == 200) {
// this.adsList = data.list;
this.setData({
adsList: data.list
})
adsList: data.list,
});
} else {
wx.showToast({
title: res.msg,
icon: 'none'
})
icon: "none",
});
}
})
});
},
getschoolList(){
getschoolList() {
getAccountList({
page: 1,
perPage: 100,
school_id: this.data.sid
}).then((res) => {
const {code, data} = res;
if (code == 200) {
this.data.schoolTotal = data.total;
this.setData({
schoolList: data.list,
selectSchoolData: this.data.sid?data.list.find((item)=>item.id == this.data.sid):data.list[0]
})
}
}).catch(() => {
school_id: this.data.sid,
})
.then((res) => {
const { code, data } = res;
if (code == 200) {
this.data.schoolTotal = data.total;
this.setData({
schoolList: data.list,
selectSchoolData: this.data.sid
? data.list.find((item) => item.id == this.data.sid)
: data.list[0],
});
}
})
.catch(() => {});
},
selectSchool () {
if(this.data.schoolList.length==1){
return
selectSchool() {
if (this.data.schoolList.length == 1) {
return;
}
this.setData({
schoolShow: !this.data.schoolShow
})
schoolShow: !this.data.schoolShow,
});
},
sureSelect (e) {
const {item} = e.currentTarget.dataset;
sureSelect(e) {
const { item } = e.currentTarget.dataset;
if (item.id == this.data.id) {
this.setData({
schoolShow: false,
})
});
return;
}
// app.globalData.accountExpired = false;
loginTime({
id: item.id,
type: 1
})
if(item.school_teacher.type==2){ //管理员
type: 1,
});
if (item.school_teacher.type == 2) {
//管理员
// this.getMemberMeInfo(item.id)
LocalStorage.setItem('dakarole', 1);
LocalStorage.setItem("dakarole", 1);
wx.reLaunch({
url: `/business/pages/deskcenter/index?sid=${item.id}`,
})
}else {
LocalStorage.setItem('dakarole', 2);
permissionUtils.myMenulistGet(item.id)
});
} else {
LocalStorage.setItem("dakarole", 2);
permissionUtils.myMenulistGet(item.id);
wx.reLaunch({
url: `/business/pages/classservice/teacherindex?sid=${item.id}`,
})
});
}
// this.setData({
// sid: item.id,
// schoolShow: false,
......@@ -259,7 +229,7 @@ Page({
// this.getCommonwaitJob();
// this.getMemberMeInfo();
// })
},
},
// 超时
// todocallGet() {
......@@ -300,12 +270,12 @@ Page({
// }, 200);
// },
// 轮播图手动
bindSwiperchange (e){
console.log(33)
bindSwiperchange(e) {
console.log(33);
let that = this;
that.setData({
curbanner: e.detail.current
})
curbanner: e.detail.current,
});
},
// 打卡
goClocklist() {
......@@ -368,10 +338,10 @@ Page({
});
},
// 待处理更多
toMoreDeal () {
toMoreDeal() {
wx.navigateTo({
url: `/business/pages/todotasks/globaldeal?sid=${this.data.sid}`,
})
});
},
// 待处理具体跳转
jumpTodo(e) {
......@@ -394,7 +364,7 @@ Page({
url = `/business/pages/classservice/classreviewindex?sid=${this.data.sid}`;
break;
case 6:
url = `/business/pages/scorerulesetting/index?sid=${this.data.sid}`;
url = `/business/pages/scoremgt/index?sid=${this.data.sid}`;
break;
default:
url = "";
......@@ -417,11 +387,11 @@ Page({
// url: `${url}`,
// });
// },
// goClassreviewindex() {
// wx.navigateTo({
// url: `/business/pages/classservice/classreviewindex?sid=${this.data.sid}`,
// });
// },
goClassreviewindex() {
wx.navigateTo({
url: `/business/pages/classservice/classreviewindex?sid=${this.data.sid}`,
});
},
// 发布课堂瞬间
// toReleaseMoment() {
// wx.navigateTo({
......@@ -438,16 +408,67 @@ Page({
commonwaitjobGet({
school_id: this.data.sid,
}).then((res) => {
if (res.code == 200) {
const { code, data } = res;
if (code == 200) {
let waitJobList = [];
for (let i in data.statistic) {
if (data.statistic[i] == 0) {
waitJobList.push({
title: this.transformTitle(i, 2),
type: this.transformTitle(i, 1),
count: data.statistic[i],
});
}
}
this.setData({
waitJob:
(res.data.apply_number || 0) +
(res.data.customer_number || 0) +
(res.data.noReviews || 0),
(data.apply_number || 0) +
(data.customer_number || 0) +
(data.noReviews || 0),
waitJobList: waitJobList,
});
}
});
},
// 待办事项处理，kind 1为类型 2为标题
transformTitle(key, kind) {
let title = "";
let type = "";
switch (key) {
case "class_count":
title = "创建一个班级";
type = 1;
break;
case "subject_mixed_count":
title = "创建一个作业打卡活动";
type = 2;
break;
case "teacher_count":
title = "添加老师至学校";
type = 3;
break;
case "website_count":
title = "配置一个精美的微官网";
type = 4;
break;
case "class_review_count":
title = "给学生一次课堂点评";
type = 5;
break;
case "integral_good_count":
title = "给学生配置积分奖励";
type = 6;
break;
default:
break;
}
if (kind == 1) {
return type;
}
if (kind == 2) {
return title;
}
},
watchBack(name, that) {
that.setData({
accountExpired: name,
......
business/pages/deskcenter/index.wxml
View file @ e1eed70e
......@@ -10,7 +10,7 @@
</view>
</view>
<view class="schoolselectedmodal" hidden="{{!schoolShow}}">
<view class="modalmask" bindtap="selectSchool"></view>
<view class="modalmask" bindtap="selectSchool" style="background: linear-gradient(to bottom, transparent 0, transparent {{statusBarHeight+titleBarHeight}}px, rgba(0, 0, 0, 0.5) {{statusBarHeight+titleBarHeight}}px, rgba(0, 0, 0, 0.5) 100%); "></view>
<view class="list-box" style="top:{{statusBarHeight+titleBarHeight}}px">
<view class="list-item" bindtap="sureSelect" data-item="{{item}}" wx:for="{{schoolList}}" wx:key="index">
<view class="title">{{item.title}}</view>
......@@ -115,14 +115,14 @@
</view>
</view>
</view>
<view class="section-wrap">
<view class="section-wrap" wx:if="{{waitJobList.length>0}}">
<view class="section section-waitdeal">
<view class="section-title">
<view class="title-text">待处理</view>
<view class="btn-more" bindtap="toMoreDeal">更多<image class="icon-arr" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"/></view>
</view>
<view class="waitdeal-box">
<view class="item" wx:for="{{waitJobList}}" wx:key="index" data-type="{{item.type}}" bindtap="jumpTodo">
<view class="item" wx:for="{{waitJobList}}" wx:key="index" data-type="{{item.type}}" bindtap="jumpTodo" wx:if="{{item.count==0 && index<3}}">
<view class="l">
<image class="item-icon" src="{{imageRoot}}2b/deskcenternew/waitdeal/icon_0{{item.type}}.png?{{imageVersion}}"/>
<view class="item-title">{{item.title}}</view>
......
business/pages/deskcenter/index.wxss
View file @ e1eed70e
......@@ -58,13 +58,6 @@ page {
height: 100%;
left: 0;
top: 0;
background: linear-gradient(
to bottom,
transparent 0,
transparent 130rpx,
rgba(0, 0, 0, 0.5) 130rpx,
rgba(0, 0, 0, 0.5) 100%
);
}
.schoolselectedmodal .list-box {
width: 580rpx;
......
business/pages/morethemeindexclockm/index.js deleted 100644 → 0
View file @ 59f041af
This diff is collapsed.
business/pages/morethemeindexclockm/index.json deleted 100644 → 0
View file @ 59f041af
{
"navigationBarTitleText": "参与概况",
"enablePullDownRefresh": true,
"usingComponents": {
"sjd-media-show": "../../../components/sjdmediashow",
"empty-content": "../../../components/emptycontent",
"poster-box": "../../../components/posterbox",
"go-top": "../../components/goTop",
"list-loading": "../../../components/listloading",
"comment-editor": "../../../components/commenteditor",
"calender":"../../../components/calendar",
"expiredTip": "../../components/expiredTip"
}
}
\ No newline at end of file
business/pages/morethemeindexclockm/index.wxml deleted 100644 → 0
View file @ 59f041af
This diff is collapsed.
business/pages/morethemeindexclockm/index.wxss deleted 100644 → 0
View file @ 59f041af
This diff is collapsed.
business/pages/orgadsetting/index.js deleted 100644 → 0
View file @ 59f041af
This diff is collapsed.
business/pages/orgadsetting/index.json deleted 100644 → 0
View file @ 59f041af
{
"navigationBarTitleText": "获客广告"
}
\ No newline at end of file
business/pages/orgadsetting/index.wxml deleted 100644 → 0
View file @ 59f041af
<view class="container">
<view class="add-setting-container clearfix">
<!-- <view class="" wx:if="{{id != 0}}"> -->
<!-- <view class="classInfo" >
<view class="classname" >{{classInfo.title}}</view>
<view class="classshift" bindtap="goClassList">切换班级</view>
</view> -->
<!-- <view class="emptydivide" >
</view> -->
<!-- <view class="add-setting-box mb24" >
<view class="add-setting-title" >
<view class="title" >
植入获客广告
</view>
<view class="switch" >
<image class="switchimg" bindtap="statusChoose" src="{{imageRoot}}2b/common/{{addInfo.status == 0 ? 'switchoff.png' : 'switchon.png'}}?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
</view>
</view>
<view class="add-text mb24" hidden="{{addInfo.status == 0}}">
<textarea class="add-text-input" maxlength="20" bindinput="contentinput" value="{{addInfo.content || ''}}" placeholder-class="add-text-placeholder" name="" id="" placeholder="你可以设置：免费领取价值288元试听体验课"></textarea>
<text class="length-rate" selectable="false" space="false" decode="false">{{addInfo.content && addInfo.content.length || 0}}/20</text>
</view>
<view class="ad-setting-desc" selectable="false" space="false" decode="false" hidden="{{addInfo.status == 0}}">设置获客广告后圈子主页显示收集新客手机的悬浮广告，可增加新客的到店量哦~</view>
</view> -->
<!-- <view class="info-setting" hidden="{{addInfo.status == 0}}">
<view class="line-item mb24" wx:if="{{customizeInfo.length > 0}}">
<view class="" wx:for="{{customizeInfo}}" wx:for-item="info" wx:for-index="infoindex" wx:key="{{infoindex}}">
<view class="info-input-item mb24" wx:if="{{info.type == 'text'}}">
<input type="text" class="info-input" placeholder="输入想收集的信息 (例：年龄/性别 等)" value="{{info.value}}" data-index="{{infoindex}}" bindinput="infoinputChange" />
<image class="reddelicon" src="{{imageRoot}}2b/common/reddelicon.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" data-index="{{infoindex}}" bindtap="delInfo"></image>
</view>
<view class="info-select-item mb24" wx:if="{{info.type == 'select'}}">
<view class="info-select-item-box" >
<view class="question-title" >
<input type="text" class="question-input" placeholder="输入单选项问题" value="{{info.value}}" data-index="{{infoindex}}" bindinput="questionChange"/>
</view>
<view class="select-box" >
<view class="answer-box" wx:for="{{info.sub}}" wx:for-item="sub" wx:for-index="subindex" wx:key="{{subindex}}">
<text class="select-title" selectable="false" space="false" decode="false">选项{{subindex + 1}}：</text>
<input type="text" class="answer-input" placeholder="请输入内容" value="{{sub}}" data-infoindex="{{infoindex}}" data-index="{{subindex}}" bindinput="subChange"/>
<view class="del-box" wx:if="{{info.sub.length > 2}}" data-infoindex="{{infoindex}}" data-index="{{subindex}}" bindtap="delSub">
<image class="del" src="{{imageRoot}}2b/adsetting/del.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
</view>
</view>
<view class="add-answer" wx:if="{{info.sub.length < subMaxLength}}" data-index="{{infoindex}}" bindtap="addSub">
<text class="add-answer-text" selectable="false" space="false" decode="false">添加选项</text>
<text class="add-answer-count" selectable="false" space="false" decode="false">（{{info.sub.length}}/{{subMaxLength}}）</text>
</view>
</view>
</view>
<image class="reddelicon" src="{{imageRoot}}2b/common/reddelicon.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" data-index="{{infoindex}}" bindtap="delInfo"></image>
</view>
</view>
</view>
<view class="add-box" wx:if="{{customizeInfo.length < infoMaxLength}}">
<view class="add-btn" bindtap="addInfoItem">
<view class="add-icon" selectable="false" space="false" decode="false"></view>
<text class="add-text" selectable="false" space="false" decode="false">添加信息收集项</text>
</view>
<view class="add-btn-text" >最多{{infoMaxLength}}项</view>
</view>
</view> -->
<!-- </view> -->
<view class="bannerselect clearfix" >
<view class="banner-box" wx:for="{{banner}}" wx:key="index" data-index="{{index}}" bindtap="bannerSelect">
<view class="banner-wrapper" hidden="{{!item.selected}}" ></view>
<image class="banner-image" src="{{item.src}}" mode="aspectFill" lazy-load="false" binderror="" bindload="" ></image>
<image class="bannerselected" src="{{imageRoot}}2b/campusmgt/bannerselected.png?{{imageVersion}}" mode="aspectFill" hidden="{{!item.selected}}" lazy-load="false" binderror="" bindload=""></image>
</view>
</view>
<view class="banner-select" >
请选择首页广告图
</view>
<form bindsubmit="saveadd" report-submit="true">
<button class="submitbtn" form-type="submit">保存</button>
</form>
<view class="example-img-box" >
<view class="example-img-title" >图示</view>
<image class="example-img" src="{{imageRoot}}2b/adsetting/example.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" bindtap="prevImg" data-imgsrc="{{imageRoot}}adsetting/example.png"></image>
</view>
<view class="bottom-fix-box">
<view class="viewCustomer" bindtap="goOrgCustomer">
查看获客广告
</view>
<view class="viewCustomer" bindtap="goOrgActivityCustomer" wx:if="{{sid == activtySchoolInfo.sid}}">
查看领奖客户信息
</view>
</view>
</view>
<view class="info-sort-dia" wx:if="{{sortSelectShow}}">
<view class="info-sort-mask" bindtap="hideInfoAddDia"></view>
<view class="info-sort-contnet" >
<view class="diaheader" >请选择想要添加的收集内容</view>
<view class="diacontent" >
<view class="sort text" data-type="text" bindtap="sureAddInfo">
<image class="sort-icon" src="{{imageRoot}}2b/adsetting/text.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<view class="sort-name" >文本项</view>
</view>
<view class="sort select" data-type="select" bindtap="sureAddInfo">
<image class="sort-icon" src="{{imageRoot}}2b/adsetting/select.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<view class="sort-name" >单选项</view>
</view>
</view>
</view>
</view>
</view>
\ No newline at end of file
business/pages/orgadsetting/index.wxss deleted 100644 → 0
View file @ 59f041af
.add-setting-container {
min-height: 100vh;
background-color: rgba(247,247,249,1);
border-top: 1px solid transparent;
padding-bottom: 120rpx;
}
.add-setting-box {
background-color: #fff;
padding: 0 25rpx 0 24rpx;
}
.classInfo {
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 25rpx;
height: 100rpx;
background-color: #fff;
position: relative;
z-index: 3;
}
.classInfo .classname {
font-size: 32rpx;
max-width: 500rpx;
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
}
.classInfo .classshift {
font-size: 24rpx;
color: #ACACAC;
width: 120rpx;
height: 40rpx;
text-align: center;
border: 2rpx solid #CACACA;
line-height: 36rpx;
border-radius: 20rpx;
}
.emptydivide {
position: absolute;
top: 80rpx;
left: 0;
width: 100%;
/* background:rgba(247,247,249,1); */
box-shadow: 0rpx 15rpx 10rpx 0rpx rgba(0,0,0,0.05);
height: 18rpx;
z-index: 0;
}
.pb24 {
padding-bottom: 24px;
}
.add-setting-box .add-setting-title {
color: #000000;
font-size: 30rpx;
letter-spacing: 2rpx;
font-weight: 700;
/* margin-bottom: 37rpx; */
height: 140rpx;
display: flex;
align-items: center;
justify-content: space-between;
}
.add-setting-title .title {
}
.add-setting-title .switch .switchimg {
width: 74rpx;
height: 36rpx;
}
.add-setting-box .self-radio-box {
display: flex;
display: -webkit-flex;
justify-content: flex-start;
align-items: center;
/* border-bottom: 1rpx solid rgba(0,0,0,0.05); */
/* padding-bottom: 26rpx; */
}
.add-setting-box .self-radio-box .radio-two {
margin-left: 127rpx;
}
.add-setting-box .self-radio-box .radio-name {
padding-left: 14rpx;
}
.add-setting-box .add-text {
position: relative;
}
.add-setting-box .add-text .length-rate {
color:rgba(0,0,0,0.3);
position: absolute;
right: 15rpx;
bottom: 13rpx;
}
.add-setting-box .add-text .add-text-input {
background-color:rgba(248,248,248,1);
border-radius: 8rpx;
width: 100%;
padding: 10rpx 15rpx;
height: 110rpx;
font-size: 28rpx;
color: #959595;
}
.add-setting-box .add-text .add-text-placeholder {
font-size: 28rpx;
color: #CCCCCC;
}
.add-setting-box .ad-setting-desc {
color: #C6CBD1;
font-size: 26rpx;
letter-spacing: 2rpx;
padding-bottom: 30rpx;
}
.add-setting-container .submitbtn {
display: block;
margin: 70rpx auto 100rpx;
width: 256rpx;
height: 80rpx;
line-height: 80rpx;
background:rgba(101,184,244,1);
border-radius: 40rpx;
font-size: 38rpx;
color: #fff;
letter-spacing: 4rpx;
}
.example-img-box {
padding: 0 50rpx 50rpx 50rpx;
}
.example-img-box .example-img-title {
color: rgba(0,0,0,0.4);
font-size: 30rpx;
margin-bottom: 36rpx;
}
.example-img-box .example-img {
display: block;
width: 648rpx;
height: 452rpx;
}
.info-setting {
background-color: #fff;
padding: 24rpx 26rpx 29rpx 24rpx;
}
.info-setting .add-box{
display: flex;
align-content: center;
}
.info-setting .add-box .add-btn {
width: 246rpx;
height: 48rpx;
text-align: center;
border: 2rpx solid rgba(101,184,244,1);
border-radius: 22rpx;
display: flex;
align-items: center;
justify-content: center;
}
.info-setting .add-box .add-btn .add-icon {
width: 18rpx;
height: 18rpx;
position: relative;
/* color: rgba(106, 186, 244, 1);
font-size: 26rpx;
line-height: 1;
font-weight: 700;
*/
margin-right: 6rpx;
}
.info-setting .add-box .add-btn .add-icon::after{
content: '';
display: block;
width: 18rpx;
height: 2rpx;
background-color: rgba(106, 186, 244, 1);
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
-webkit-transform: translate(-50%, -50%);
}
.info-setting .add-box .add-btn .add-icon::before{
content: '';
display: block;
width: 2rpx;
height: 18rpx;
background-color: rgba(106, 186, 244, 1);
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
-webkit-transform: translate(-50%, -50%);
}
.info-setting .add-box .add-btn .add-text {
color: rgba(106, 186, 244, 1);
font-size: 26rpx;
line-height: 1;
}
.info-setting .add-box .add-btn-text {
color: rgba(177, 177, 177, 1);
font-size: 24rpx;
padding-left: 15rpx;
display: flex;
align-items: center;
}
.info-sort-dia {
position: fixed;
width: 100%;
height: 100%;
left: 0;
top: 0;
display: flex;
align-items: center;
justify-content: center;
z-index: 100;
}
.info-sort-mask {
position: fixed;
width: 100%;
height: 100%;
left: 0;
top: 0;
z-index: 1;
background-color: rgba(0,0,0,0.6);
}
.info-sort-dia .info-sort-contnet {
background-color: #fff;
position: relative;
z-index: 2;
width: 574rpx;
height: 366rpx;
border-radius: 20rpx;
}
.info-sort-dia .info-sort-contnet .diaheader {
text-align: center;
font-size: 32rpx;
color: rgba(0,0,0,1);
font-weight: 500;
line-height: 116rpx;
border-bottom: 2rpx solid rgba(0,0,0,0.05);
}
.info-sort-dia .info-sort-contnet .diacontent {
display: flex;
align-items: center;
justify-content: space-around;
padding-top: 42rpx;
}
.info-sort-dia .info-sort-contnet .diacontent .sort{
width: 150rpx;
height: 150rpx;
background-color: rgba(248,248,248,1);
border-radius: 4rpx;
padding: 24rpx 0 22rpx;
/* text-align: center; */
display: flex;
flex-direction: column;
justify-content: space-between;
align-items: center;
}
.info-sort-dia .info-sort-contnet .diacontent .sort.text .sort-icon {
width: 55rpx;
height: 50rpx;
}
.info-sort-dia .info-sort-contnet .diacontent .sort.select .sort-icon {
width: 69rpx;
height: 47rpx;
}
.info-sort-dia .info-sort-contnet .diacontent .sort .sort-name {
color: rgba(104, 104, 104, 1);
font-size: 24rpx;
}
.info-setting .line-item{
border-bottom: 1rpx solid transparent;
}
.info-setting .line-item .info-input-item {
display: flex;
/* align-items: center; */
}
.info-setting .line-item .info-input-item .info-input {
width: 632rpx;
height: 80rpx;
line-height: 80rpx;
background-color: rgba(248,248,248,1);
border-radius: 8rpx;
padding: 0 15rpx;
}
.info-setting .line-item .info-input-item .reddelicon {
width: 40rpx;
margin-left: 28rpx;
height: 40rpx;
margin-top: 20rpx;
}
.info-setting .line-item .info-select-item {
display: flex;
}
.info-setting .line-item .info-select-item .info-select-item-box {
width: 632rpx;
background-color: rgba(248,248,248,1);
/* padding: 0 15rpx; */
border-radius: 8rpx;
}
.info-select-item .info-select-item-box .question-title {
border-bottom: 1px solid rgba(0,0,0,0.05);
padding: 0 15rpx;
margin: 0 0 16rpx 0;
}
.info-select-item .info-select-item-box .question-title .question-input {
line-height: 70rpx;
height: 70rpx;
}
.info-setting .line-item .info-select-item .reddelicon {
width: 40rpx;
margin-left: 28rpx;
height: 40rpx;
margin-top: 20rpx;
}
.select-box {
padding: 0 15rpx;
}
.select-box .answer-box {
display: flex;
/* justify-content: center; */
align-items: center;
padding: 0 0 16rpx 0;
position: relative;
}
.select-box .answer-box .select-title {
color: rgba(0, 0, 0, 1);
font-size: 24rpx;
padding-right: 24rpx;
}
.select-box .answer-box .answer-input {
font-size: 26rpx;
width: 400rpx;
}
.add-answer {
padding-bottom: 22rpx;
}
.add-answer .add-answer-text{
line-height: 1;
color: rgba(106, 186, 244, 1);
font-size: 26rpx;
}
.add-answer .add-answer-count{
line-height: 1;
color: rgba(106, 186, 244, 1);
font-size: 26rpx;
padding-left: 10rpx;
}
.select-box .answer-box .del-box {
position: absolute;
right: 0;
top: 0;
width: 40rpx;
height: 40rpx;
display: flex;
align-items: center;
justify-content: center;
}
.select-box .answer-box .del {
width: 21rpx;
height: 24rpx;
}
.bottom-fix-box {
position: fixed;
bottom: 0;
left: 0;
width: 100%;
text-align: center;
line-height: 100rpx;
color: #6ABAF4;
font-size: 28rpx;
background-color: #fff;
display: flex;
}
.viewCustomer {
flex: 1;
position: relative;
}
.viewCustomer:after{
content: '';
width: 1px;
height: 37rpx;
background:rgba(222,222,224,1);
position: absolute;
right: 0;
top: 50%;
transform: translateY(-50%) scaleX(.5);
}
.viewCustomer:last-of-type:after{
display: none
}
.bannerselect {
white-space: nowrap;
overflow-x: auto;
width: 100%;
-webkit-overflow-scrolling: touch;
}
.bannerselect .banner-box {
width: 584rpx;
height: 228rpx;
/* float: left; */
display: inline-block;
margin: 0 20rpx;
margin-top: 40rpx;
position: relative;
}
.bannerselect .banner-box .banner-wrapper{
position: absolute;
width: 584rpx;
height: 228rpx;
left: 0;
bottom: 0;
background: rgba(0,0,0,0.3);
}
.bannerselect .banner-box .banner-image {
width: 584rpx;
height: 228rpx;
display: block;
border-radius: 10rpx;
}
.banner-select {
text-align: center;
color: #959595;
font-size: 24rpx;
line-height: 1;
margin-top: 37rpx;
}
.bannerselected {
width: 78rpx;
height: 78rpx;
position: absolute;
left: 50%;
top: 50%;
margin-left: -39rpx;
margin-top: -39rpx;
z-index: 1;
}
\ No newline at end of file
business/pages/organizationalmgt/index.wxss
View file @ e1eed70e
......@@ -45,7 +45,7 @@ page{
flex: 1;
}
.header-box .top-box .info-box .roletag {
line-height: 36rpx;
line-height: 32rpx;
background: rgba(234,248,255,1);
border-radius: 6rpx;
border: 1px solid rgba(53,186,253,1);
......
business/pages/organizationalmgt/info.js deleted 100644 → 0
View file @ 59f041af
This diff is collapsed.
business/pages/organizationalmgt/info.json deleted 100644 → 0
View file @ 59f041af
{
"navigationBarTitleText": "完善信息",
"usingComponents": {
"expiredTip": "../../components/expiredTip",
"imagecropper": "../../../components/imagecropper",
"permission-box":"../../components/permissionbox"
}
}
\ No newline at end of file
business/pages/organizationalmgt/info.wxml deleted 100644 → 0
View file @ 59f041af
<wxs src="../../../filter/index.wxs" module="filter" />
<view class="container {{showCropper? 'containerDisabledScroll':''}}">
<view class="box" wx:if="{{sid && sid!=0}}">
<view class="box-title">
<view class="title">资料设置</view>
</view>
<view class="line-item">
<view class="item-label">头像</view>
<view class="right" bindtap="updateAvatar">
<image class="logo-upload-img" wx:if="{{avatarUrl != ''}}" src="{{filter.imagify(avatarUrl, 'image/resize,w_640/format,jpg/quality,q_50')}}"></image>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
</view>
<view class="line-item">
<view class="item-label">昵称</view>
<view class="right">
<view class="iteminput" value="" bindtap="updateNickname">{{nickname?nickname:'输入昵称'}}</view>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
</view>
</view>
<permission-box cinfigid="{{sid==0 || dakarole==1? 0: 700}}">
<view slot="menubtn">
<view class="box">
<view class="box-title">
<view class="title">完善机构信息</view>
</view>
<view class="line-item">
<view class="item-label">机构LOGO <text>建议尺寸：120*120</text></view>
<view class="right" bindtap="proMainImgUpload" data-type="schoollogo">
<image class="logo-upload-img" wx:if="{{params.logo != ''}}" src="{{filter.imagify(params.logo, 'image/resize,w_640/format,jpg/quality,q_50')}}"></image>
<!-- <image class="logo-upload-img" wx:else src="{{imageRoot}}2c/pclogin/logo.png?{{imageVersion}}"></image> -->
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
</view>
<view class="line-item">
<view class="item-label">机构名称</view>
<view class="right">
<input type="text" placeholder-class="placeholderclass" class="iteminput" maxlength="30" value="{{params.title}}" bindinput="titleInput" placeholder="输入机构名称"></input>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
</view>
<view class="line-item line-item-subject">
<view class="item-label">机构类型</view>
<view class="right content-box">
<view class="item-box" wx:for="{{allSubject}}" wx:for-index="idx" wx:for-item="item" wx:key="idx" data-active-item="{{item}}" bindtap="selectSubject" >
<view class="{{selectedSubjectStyle[item.id]?'item-box-inner selectd-item-box-inner':'item-box-inner'}}">{{item.name}}</view>
</view>
</view>
</view>
<view class="line-item">
<view class="item-label">地址</view>
<view class="right" bindtap="addressSelect">
<view class="iteminput">{{params.location_address ? params.location_address : '点击定位'}}</view>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
</view>
</view>
<view class="submitbtn" bindtap="save">完成</view>
</view>
</permission-box>
<!-- <view class="common-dialog" wx:if="{{showAuthSettingDia}}">
<view class="dialog-box">
<view class="warn-text">
点击确认前往设置页面开启使用我的地理位置
</view>
<view class="button-box">
<button type="default" class="btn cancel" bindtap="closeDia">取消</button>
<button type="default" class="btn sure" bindtap="openSetting">确认</button>
</view>
</view>
</view> -->
<view class="cropperdialog" wx:if="{{showCropper}}">
<imagecropper
id="image-cropper"
limit_move="{{cropperOpt.limit_move}}"
disable_rotate="{{cropperOpt.disable_rotate}}"
width="{{cropperOpt.width}}"
height="{{cropperOpt.height}}"
imgSrc="{{cropperSrc}}"
bindload="cropperload"
bindimageload="loadimage"
bindtapcut="clickcut"
></imagecropper>
<view class="cropperoperate" >
<view class="" bindtap="cancelcropper">取消</view>
<view class="" bindtap="surecropper">确认</view>
</view>
</view>
</view>
<expiredTip/>
\ No newline at end of file
business/pages/organizationalmgt/info.wxss deleted 100644 → 0
View file @ 59f041af
page{
background: #F7F7F9;
height:100%;
}
.container{
padding-bottom: 100rpx;
}
.placeholderclass {
color: #939393;
font-size: 26rpx;
}
.shopeditor-container {
min-height: 100vh;
background-color:rgba(247,247,249,1);
overflow: hidden;
}
.box{
background: #fff;
padding: 0 24rpx;
margin-bottom: 17rpx;
}
.box-setting{
}
.box-title{
padding-top: 39rpx;
display: flex;
align-items: center;
justify-content: space-between;
}
.box-title .title{
font-size: 24rpx;
color: #000;
font-weight: bold;
}
.btn{
width: 80rpx;
height: 50rpx;
border-radius: 10rpx;
display: flex;
align-items: center;
justify-content: center;
font-size: 24rpx;
color: #fff;
}
.btn-add{
background :#16B0FD;
}
.btn-edit{
background :#C6C6C6;
}
.line-item{
display: flex;
align-items: center;
justify-content: space-between;
padding: 46rpx 0;
background: #fff;
position: relative;
}
.box .line-item::after{
content: '';
width: 726rpx;
height: 1px;
background: rgba(0,0,0,.05);
position: absolute;
bottom: 0;
left: 0;
}
.box .line-item:last-of-type::after{
display: none
}
.line-item .item-label{
font-size: 26rpx;
color: #000;
line-height: 31rpx;
max-width: 400rpx;
word-break: break-all;
}
.line-item .item-label text{
font-size: 24rpx;
color: #686868;
padding-left: 30rpx;
}
.line-item .right{
display: flex;
align-items: center;
}
.line-item .right .logo-upload-img{
width: 100rpx;
height: 100rpx;
z-index: 1;
border-radius: 50%;
}
.line-item .right .iteminput {
width: 450rpx;
text-align: right;
color: #939393;
font-size: 26rpx;
}
.line-item .right .arrowsmall{
width: 12rpx;
height: 20rpx;
margin-left: 20rpx;
}
.line-item .line-item-content {
min-height: 100rpx;
padding: 18rpx 24rpx 18rpx 0;
display: flex;
align-items: center;
border-bottom: 2rpx solid rgba(0,0,0,0.05);
justify-content: space-between;
}
.line-item .line-item-content .right {
display: flex;
align-items: center;
}
.line-item .line-item-content .right .upload-box {
width: 100rpx;
height: 100rpx;
border-radius: 50%;
position: relative;
}
.border-2px {
border: 2rpx solid rgba(147,147,147,1);
}
.line-item .line-item-content .right .upload-box .after {
width: 40rpx;
height: 4rpx;
border-radius: 2rpx;
background-color: rgba(147,147,147,1);
position: absolute;
z-index: 2;
left: 50%;
top: 50%;
margin-left: -20rpx;
margin-top: -2rpx;
}
.line-item .line-item-content .right .upload-box .before {
width: 4rpx;
height: 40rpx;
border-radius: 2rpx;
background-color: rgba(147,147,147,1);
position: absolute;
z-index: 2;
left: 50%;
top: 50%;
margin-top: -20rpx;
margin-left: -2rpx;
}
.line-item .line-item-content .right .upload-box .logo-upload-img {
width: 100rpx;
height: 100rpx;
position: absolute;
left: 0;
top: 0;
z-index: 1;
border-radius: 50%;
}
.line-item .line-item-content .right .arrowsmall {
width: 12rpx;
height: 20rpx;
margin-left: 20rpx;
}
.line-item .line-item-content .right .operatedesc {
color: #939393;
font-size: 26rpx;
max-width: 500rpx;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
}
.line-item .line-item-content .right .iteminput {
width: 450rpx;
text-align: right;
color: #939393;
font-size: 26rpx;
}
.line-item .line-item-content .right .dele_tel {
color: #FF3030;
font-size: 24rpx;
width: 30rpx;
height: 30rpx;
border-radius: 50%;
border:1px solid rgba(255,48,48,1);
display: block;
text-align: center;
align-items: center;
line-height: 1;
margin-left: 22rpx;
}
.line-item-subject{
flex-direction: column;
align-items: flex-start;
padding: 46rpx 0 10rpx;
}
.content-box{
padding-top: 46rpx;
display: flex;
flex-wrap: wrap;
}
.content-box .item-box{
width: 25%;
text-align: center;
height: 66rpx;
line-height: 66rpx;
padding-right: 4%;
margin-bottom: 36rpx ;
}
.content-box .item-box:nth-child(4n){
padding-right: 0;
}
.content-box .item-box .item-box-inner{
background:#fff;
border:1px solid rgba(219,219,219,1);
border-radius: 4px;
width: 100%;
}
.selectd-item-box-inner{
border:1px solid #66B8F4 !important;
color:#66B8F4 !important;
}
.submitbtn {
width: 100%;
display: flex;
align-items: center;
justify-content: center;
height: 100rpx;
background:#66B8F4;
font-size: 28rpx;
color: #fff;
position: fixed;
bottom: 0;
left: 0;
}
\ No newline at end of file
business/pages/organizationalmgt/newinfo.js
View file @ e1eed70e
......@@ -165,37 +165,35 @@ Page({
// })
// },
updateAvatar(e) {
let access = {};
let tempFiles = null;
let filename = '';
bOssAccess({
school_id: this.data.sid != 0 ? this.data.sid : this.data.school_id
}).then((acc) => {
access = acc.data;
return wxChooseImage({})
}).then((res) => {
const { tempFiles } = res;
filename = `${access.dir}${getRandomFilename(tempFiles[0].path)}`;
wx.showLoading({
title: '图片上传中'
wxChooseImage({}).then((res) => {
tempFiles = res.tempFiles;
const path = tempFiles[0].path;
const fileType = path.substr(path.lastIndexOf('.') + 1);
return bOssAccess({
school_id: this.data.sid != 0 ? this.data.sid : this.data.school_id,
ext: fileType
})
}).then((data) => {
const acc = data.data;
filename = acc.path;
return wxUploadFile({
url: "https://cdn.s.shangjiadao.cn",
url: acc.host,
formData: {
key: filename,
policy: access.policy,
OSSAccessKeyId: access.accessid,
signature: access.signature,
callback: access.callback,
policy: acc.policy,
OSSAccessKeyId: acc.accessid,
signature: acc.signature,
callback: acc.callback,
success_action_status: '200'
},
filePath: tempFiles[0].path,
name: 'file',
})
}).then((res) => {
const { data } = res;
const {data} = res;
if (data == '{"status":"ok"}') {
// wx.showToast({
// title: '上传成功'
// })
this.setData({
'avatarUrl': filename
},()=>{
......@@ -221,10 +219,9 @@ Page({
})
}
}).catch((err) => {
});
},
//选择学科
selectSubject(event) {
const subject = event.currentTarget.dataset.activeItem;
......@@ -261,54 +258,57 @@ Page({
.catch(e => {});
},
proMainImgUpload(e) {
let access = {};
let filename = "";
let tempFiles = null;
let filename = '';
const { type } = e.currentTarget.dataset;
bOssAccess({
school_id: this.data.sid
})
.then(acc => {
access = acc.data;
return wxChooseImage({});
wxChooseImage({}).then((res) => {
tempFiles = res.tempFiles;
const path = tempFiles[0].path;
const fileType = path.substr(path.lastIndexOf('.') + 1);
return bOssAccess({
school_id: this.data.sid,
ext: fileType
})
.then(res => {
const { tempFiles } = res;
filename = `${access.dir}${getRandomFilename(tempFiles[0].path)}`;
return wxUploadFile({
url: access.host,
formData: {
key: filename,
policy: access.policy,
OSSAccessKeyId: access.accessid,
signature: access.signature,
callback: access.callback,
success_action_status: "200"
},
filePath: tempFiles[0].path,
name: "file"
});
})
.then(res => {
const { data } = res;
if (data == '{"status":"ok"}') {
this.setData({
uploadType: type,
cropperSrc: imagify(filename, "image/resize,w_1280/format,jpg"),
"cropperOpt.width": 300,
"cropperOpt.height": 300,
showCropper: true,
containerheight: "100vh"
});
} else {
wx.hideLoading();
wx.showModal({
title: "提示",
content: "上传失败",
showCancel: false
});
}
}).then((data) => {
const acc = data.data;
filename = acc.path;
return wxUploadFile({
url: acc.host,
formData: {
key: filename,
policy: acc.policy,
OSSAccessKeyId: acc.accessid,
signature: acc.signature,
callback: acc.callback,
success_action_status: '200'
},
filePath: tempFiles[0].path,
name: 'file',
})
.catch(err => {});
}).then((res) => {
const {data} = res;
console.log(data, 'data')
if (data == '{"status":"ok"}') {
this.setData({
// uploadType: type,
cropperSrc: imagify(filename, 'image/resize,w_1280/format,jpg'),
showCropper: true,
"cropperOpt.width": 300,
"cropperOpt.height": 300,
containerheight: "100vh"
})
} else {
wx.hideLoading();
wx.showModal({
title: '提示',
content: '上传失败',
showCancel: false
})
}
}).catch((err) => {
});
},
surecropper() {
this.cropper = this.selectComponent("#image-cropper");
......@@ -323,60 +323,57 @@ Page({
},
clickcut(e) {
let filepath = e.detail.url;
const fileType = filepath.substr(filepath.lastIndexOf('.') + 1);
let fileName = '';
this.setData({
showCropper: false,
cropperSrc: "",
containerheight: ""
});
let filename = "";
bOssAccess({
school_id: this.data.sid
})
.then(acc => {
return acc.data;
school_id: this.data.sid,
ext: fileType
}).then((res) => {
const access = res.data;
wx.showLoading({
title: '图片上传中'
})
.then(access => {
filename = `${access.dir}${getRandomFilename(filepath)}`;
wx.showLoading({
title: "图片上传中"
fileName = access.path;
return wxUploadFile({
url: access.host,
formData: {
key: access.path,
policy: access.policy,
OSSAccessKeyId: access.accessid,
signature: access.signature,
callback: access.callback,
success_action_status: "200"
},
filePath: filepath,
name: "file"
});
}).then(res => {
const { data } = res;
if (data == '{"status":"ok"}') {
wx.showToast({
title: "上传成功"
});
return wxUploadFile({
url: access.host,
formData: {
key: filename,
policy: access.policy,
OSSAccessKeyId: access.accessid,
signature: access.signature,
callback: access.callback,
success_action_status: "200"
},
filePath: filepath,
name: "file"
this.setData({
showCropper: false
});
})
.then(res => {
const { data } = res;
if (data == '{"status":"ok"}') {
wx.showToast({
title: "上传成功"
});
this.setData({
showCropper: false
});
this.mycropper = null;
this.setData({
"params.logo": filename
});
} else {
wx.hideLoading();
wx.showModal({
title: "提示",
content: "上传失败",
showCancel: false
});
}
})
.catch(err => {});
this.mycropper = null;
this.setData({
"params.logo": fileName
});
} else {
wx.hideLoading();
wx.showModal({
title: "提示",
content: "上传失败",
showCancel: false
});
}
}).catch(err => {});
},
titleInput(e) {
const { value } = e.detail;
......
business/pages/scoremgt/index.wxml
View file @ e1eed70e
......@@ -47,7 +47,7 @@
<block wx:if="{{pointsGoodsList.length>0}}">
<view class="areatitle">商品</view>
<view class="prizecontent">
<view class="prizecardbox {{index%2==0 ?'odd':'even'}}" wx:for="{{pointsGoodsList}}" wx:key="">
<view class="prizecardbox {{index%2==0 ?'odd':'even'}}" wx:for="{{pointsGoodsList}}" wx:key="index">
<view class="">
<view class="prizecard">
<image class="prizeimage" src="{{filter.imagify(item.cover, 'image/resize,w_320/format,jpg/quality,q_50')}}"></image>
......@@ -72,7 +72,7 @@
<block wx:if="{{pointsCardList.length>0}}">
<view class="areatitle">卡券</view>
<view class="couponcontent">
<view class="couponcardbox {{index%2==0 ?'odd':'even'}}" wx:for="{{pointsCardList}}" wx:key="">
<view class="couponcardbox {{index%2==0 ?'odd':'even'}}" wx:for="{{pointsCardList}}" wx:key="index">
<view class="couponcard">
<view class="couponitem">
<image class="couponbg" src="{{imageRoot}}2c/mall/cardbgred.png?{{imageVersion}}"></image>
......
business/pages/todotasks/globaldeal.js
View file @ e1eed70e
import {
commonwaitjobGet
} from "../../../service/business/common.js";
var app = getApp();
Page({
data: {
......@@ -5,38 +8,7 @@ Page({
imageRoot: app.globalData.imageRoot,
imageVersion: app.globalData.imageVersion,
sid: 0,
waitJobList: [
{
type: 1,
title: "创建一个班级",
count: 0,
},
{
type: 2,
title: "创建一个作业打卡活动",
count: 0,
},
{
type: 3,
title: "添加老师至学校",
count: 0,
},
{
type: 4,
title: "配置一个精美的微官网",
count: 0,
},
{
type: 5,
title: "给学生一次课堂点评",
count: 0,
},
{
type: 6,
title: "给学生配置积分奖励",
count: 0,
},
],
waitJobList: [],//新校区待办事项
},
onLoad: function (options) {
const { sid } = options;
......@@ -44,6 +16,70 @@ Page({
sid,
});
},
onShow (){
this.getCommonwaitJob();
},
getCommonwaitJob() {
commonwaitjobGet({
school_id: this.data.sid,
}).then((res) => {
const { code, data} = res;
if (code == 200) {
let waitJobList = [];
for (let i in data.statistic) {
if (data.statistic[i] == 0) {
waitJobList.push({
title: this.transformTitle(i, 2),
type: this.transformTitle(i, 1),
count: data.statistic[i],
});
}
}
this.setData({
waitJobList: waitJobList,
});
}
});
},
// 待办事项处理，kind 1为类型 2为标题
transformTitle(key, kind) {
let title = "";
let type = "";
switch (key) {
case "class_count":
title = "创建一个班级";
type = 1;
break;
case "subject_mixed_count":
title = "创建一个作业打卡活动";
type = 2;
break;
case "teacher_count":
title = "添加老师至学校";
type = 3;
break;
case "website_count":
title = "配置一个精美的微官网";
type = 4;
break;
case "class_review_count":
title = "给学生一次课堂点评";
type = 5;
break;
case "integral_good_count":
title = "给学生配置积分奖励";
type = 6;
break;
default:
break;
}
if (kind == 1) {
return type;
}
if (kind == 2) {
return title;
}
},
jumpTodo(e) {
const { type } = e.currentTarget.dataset;
let url = "";
......@@ -64,7 +100,7 @@ Page({
url = `/business/pages/classservice/classreviewindex?sid=${this.data.sid}`;
break;
case 6:
url = `/business/pages/scorerulesetting/index?sid=${this.data.sid}`;
url = `/business/pages/scoremgt/index?sid=${this.data.sid}?sid=${this.data.sid}`;
break;
default:
url = "";
......
business/pages/todotasks/globaldeal.json
View file @ e1eed70e
{
"navigationBarTitleText": "待处理",
"usingComponents": {
"expiredTip": "../../components/expiredTip"
"expiredTip": "../../components/expiredTip",
"empty-content": "../../../components/emptycontent"
}
}
\ No newline at end of file
business/pages/todotasks/globaldeal.wxml
View file @ e1eed70e
<view class="container">
<view class="waitdeal-box">
<view class="item" wx:for="{{waitJobList}}" wx:key="index" data-type="{{item.type}}" bindtap="jumpTodo">
<view class="waitdeal-box" wx:if="{{waitJobList.length>0}}">
<view class="item" wx:for="{{waitJobList}}" wx:key="index" data-type="{{item.type}}" bindtap="jumpTodo" wx:if="{{item.count==0}}">
<view class="l">
<image class="item-icon" src="{{imageRoot}}2b/deskcenternew/waitdeal/icon_0{{item.type}}.png?{{imageVersion}}"/>
<view class="item-title">{{item.title}}</view>
......@@ -11,4 +11,5 @@
</view>
</view>
</view>
<empty-content text="暂无待处理事项~" emptyimg="" wx:else></empty-content>
</view>
\ No newline at end of file
components/sjdmediaeditor/index.js
View file @ e1eed70e
......@@ -89,6 +89,7 @@ Component({
uploadingIndex: 0,
imageArrBox: [],
iosPhoneWarn: false,
imageUploaded: true,
},
created () {
console.log(this.data.content, 'this.data.content')
......@@ -132,86 +133,153 @@ Component({
})
})
},
addImg (tempFiles) { // 添加图片的操作
if (this.data.maxImgBoxLength == this.data.imgBoxLength) { // 当等于10条了不能继续添加
addImg (tempFiles1) { // 添加图片的操作
// let imgCount = this.data.imageArrBox.filter(ele => ele.type == 'img').length;
let imgCount = this.data.imageArrBox.length;
console.log(imgCount ,this.data.imageArrBox,this.data.maxImgBoxLength,this.data.imageUploaded)
if (imgCount >= this.data.maxImgBoxLength) { // 当等于10条了不能继续添加
return
} else {
if (!this.data.imageUploaded) {
this.setData({
showtip: true
}, () => {
setTimeout(() => {
this.setData({
showtip: false
})
}, 500)
})
return;
}
}
// if (this.data.maxImgBoxLength == this.data.imgBoxLength) { // 当等于10条了不能继续添加
// return
// }
let access = {};
let filename = '';
let fileNameArr = [];
bOssAccess({
school_id:this.data.sid
}).then((acc) => {
access = acc.data;
if(!tempFiles.currentTarget){
return {tempFiles,};
}
return wxChooseImage({
count: this.data.maxImgBoxLength - this.data.imgBoxLength > 9 ? 9 : this.data.maxImgBoxLength - this.data.imgBoxLength
})
this.setData({
imageUploaded: false
})
wxChooseImage({
count: this.data.maxImgBoxLength - this.data.imgBoxLength > 9 ? 9 : this.data.maxImgBoxLength - this.data.imgBoxLength
}).then((res) => {
const {tempFiles} = res;
let imageArrBox = this.data.imageArrBox;
tempFiles.forEach((ele, index) => {
imageArrBox.push(ele.path)
this.setData({
uploadingIndex: imageArrBox.length
})
tempFiles.forEach((ele) => {
console.log(ele,'元素')
if (this.data.imgBoxLength <= this.data.maxImgBoxLength) {
imageArrBox.push(ele.path)
}
})
console.log(imageArrBox,'imageArrBox')
return {
imageArrBox
}
}, () => {
this.setData({
imageUploaded: true
})
return imageArrBox;
}).then((res) => {
this.setData({
imageArrBox: res,
})
this.singleUploadFile(access);
}).catch((err) => {
this.setData({
imageArrBox: res.imageArrBox,
})
this.singleUploadFile()
}).catch((e) => {
wx.hideLoading()
})
// bOssAccess({
// school_id:this.data.sid
// }).then((acc) => {
// access = acc.data;
// if(!tempFiles.currentTarget){
// return {tempFiles,};
// }
// return wxChooseImage({
// count: this.data.maxImgBoxLength - this.data.imgBoxLength > 9 ? 9 : this.data.maxImgBoxLength - this.data.imgBoxLength
// })
// }).then((res) => {
// const {tempFiles} = res;
// let imageArrBox = this.data.imageArrBox;
// tempFiles.forEach((ele, index) => {
// imageArrBox.push(ele.path)
// })
// return imageArrBox;
// }).then((res) => {
// this.setData({
// imageArrBox: res,
// })
// this.singleUploadFile(access);
// }).catch((err) => {
});
// });
},
singleUploadFile(access) {
singleUploadFile() {
wx.showLoading({
title: `图片上传中`,
mask: true
})
let uploadingIndex = this.data.uploadingIndex;
if (uploadingIndex == this.data.imageArrBox.length) {
if (uploadingIndex >= this.data.imageArrBox.length) {
this.setData({
uploadingIndex: 0,
imageArrBox: []
imageArrBox: [],
imageUploaded: true
})
wx.showToast({
title: `上传成功`
})
return;
}
wx.showLoading({
title: `图片上传中`,
mask: true
})
let access = {};
let imageArrBox = JSON.parse(JSON.stringify(this.data.imageArrBox));
let filename = `${access.dir}${getRandomFilename(imageArrBox[uploadingIndex])}`;
wxUploadFile({
url: access.host,
formData: {
key: filename,
policy: access.policy,
OSSAccessKeyId: access.accessid,
signature: access.signature,
callback: access.callback,
success_action_status: '200'
},
filePath: imageArrBox[uploadingIndex],
name: 'file',
}).then((res) => {
const path = imageArrBox[this.data.uploadingIndex];
// console.log(imageArrBox,path,'path',this.data.uploadingIndex)
const fileType = path.substr(path.lastIndexOf('.') + 1);
bOssAccess({
school_id: this.data.sid,
ext: fileType
}).then((acc) => {
this.imageUploaded = true
access = acc.data;
return wxUploadFile({
url: access.host,
formData: {
key: access.path,
policy: access.policy,
OSSAccessKeyId: access.accessid,
signature: access.signature,
callback: access.callback,
success_action_status: '200'
},
filePath: imageArrBox[this.data.uploadingIndex],
name: 'file',
})
}).then((res) =>{
let data = JSON.parse(res.data);
console.log(res,'结果')
if (data.status == 'ok') { // 成功的处理
wx.showToast({
title: `上传成功`
})
let uploadingIndex = this.data.uploadingIndex + 1;
// wx.showToast({
// title: `上传成功`
// })
console.log(res,'resasasasdasdadsasd')
let content = JSON.parse(JSON.stringify(this.data.content));
let uploadingIndex = this.data.uploadingIndex + 1;
content.push({
type: 'img',
value: filename
value: access.path
})
console.log(content,'content')
this.setData({
content,
uploadingIndex,
}, () => {
this.setData({
imgBoxLength: this.countCaculate('img', this.data.content),
......@@ -238,6 +306,7 @@ Component({
})
this.singleUploadFile(access);
})
},
addVoice () { // 添加录音的操作
if (this.data.maxVoiceBoxLength == this.data.voiceBoxLength) { // 当等于10条了不能继续添加
......
constants/api.js
View file @ e1eed70e
......@@ -218,6 +218,7 @@ const apis = {
momentdetail: `${api}common/moment/detail`, //C端-课堂瞬间详情
newslist: `${api}common/news`, //C端-机构新鲜事列表创
newsdetail: `${api}student/news/detail`, //C端-机构新鲜详情
teacherlist: `${api}common/website/teachers`,//名师列表
onlinecourseslist: `${api}common/online_courses`, //C端-在线课列表
onlinecoursesdetail: `${api}common/online_courses/detail`, //C端-在线课列表详情
onlinesubcourses: `${api}student/online_courses/sub_courses`, //C端-线上课专栏对应的单课列表
......@@ -335,9 +336,8 @@ const apis = {
verifyCode: `${constants.host2}/v2/api/service/user/verify_code`,
resetPassword: `${constants.host2}/v2/api/service/user/reset_password`,
register: `${apiv2}member/register`,
memberOssAccess: `${api}member/oss/access`,
bOssAccess: `${api}member/clock/oss/access`,
bMediaOssAccess: `${api}member/media_access`,
bOssAccess: `${apiv4}member/oss/access`,
bMediaOssAccess: `${apiv4}member/media_access`,
generateBusinessQrcode: `${api}common/qr_code_unlimit`,
generateCustomerQrcode: `${api}common/qr_code_unlimit`,
updateUserinfo: `${api}member/clock/userinfo/edit`,
......
constants/constants.js
View file @ e1eed70e
......@@ -3,7 +3,7 @@
// host: 'https://qxapi.qingxiao.online/daka',
// host2: 'https://wx.m.shangjiadao.cn',
storageVersion: '5.0',
imageVersion: '20200408',
imageVersion: '20200409',
host: 'https://clock.wp53.cn',
host2: 'https://test.wp53.cn',
appId: 'wxc1246ea029394785',
......
service/business/common.js
View file @ e1eed70e
......@@ -8,7 +8,7 @@ import apis from '../../constants/api.js';
function bOssAccess (data) {
return wxRequest({
role: '2b',
url: apis.business.common.memberOssAccess,
url: apis.business.common.bOssAccess,
data,
method: 'GET',
errorresolve: 1,
......
service/common.js
View file @ e1eed70e
......@@ -95,10 +95,11 @@ function lastReply({class_id}) {
function bOssAccess (data) {
return wxRequest({
role: '2b',
url: apis.business.common.memberOssAccess,
url: apis.business.common.bOssAccess,
data,
method: 'GET',
errorresolve: 1,
needToken: true
})
}
function bMediaOssAccess (data) {
......
service/customer/websiteindex.js
View file @ e1eed70e
......@@ -115,6 +115,15 @@ function newsdetailGet (data) {
errorresolve: 1,
})
}
function teacherlistGet (data) {
return wxRequest({
url: apis.customer.websiteindex.teacherlist,
data,
method: 'GET',
errorresolve: 1,
notExactly: true
})
}
function onlinecourseslistGet (data) {
return wxRequest({
url: apis.customer.websiteindex.onlinecourseslist,
......@@ -177,6 +186,7 @@ export {
websitecourseshow,
momentdetailGet,
newslistGet,
teacherlistGet,
newsdetailGet,
onlinecourseslistGet,
onlinecoursesdetailGet,
......
src/components/brickLayout/index.js
View file @ e1eed70e
......@@ -46,7 +46,6 @@ Component({
if (!Array.isArray(newVal)) {
throw new Error('BrickLayout : dataSet is expecting a Array.')
}
newVal.forEach(item => {
if (!item['id']) {
throw new Error('BrickLayout : 错误的唯一索引。请检查数组中是否含有 id 作为唯一记录标识。')
......
src/components/brickLayout/index.wxml
View file @ e1eed70e
......@@ -5,13 +5,13 @@
<view wx:for="{{renderList}}" wx:key="index" wx:for-item="column" class="list-side-box">
<view wx:for="{{column}}" wx:key="item" class="list-item" id="card-{{item}}-type{{type}}">
<view class="list-item-inner" data-card-id="{{rawData[item].id}}" bindtap="onBrickItemTap">
<image class="video-image" src="{{filter.imagify(filter.jsonParse(rawData[item].content)[0])}}" wx:if="{{rawData[item].type==1}}" mode="widthFix"></image>
<image class="video-image" src="{{filter.gifvideoPoster(filter.jsonParse(rawData[item].content)[0])}}" wx:else mode="widthFix"></image>
<view class="top-fix" wx:if="{{rawData[item].type==1}}">
<image class="video-image" src="{{filter.gifvideoPoster(filter.jsonParse(rawData[item].content)[0].value)}}" wx:if="{{filter.jsonParse(rawData[item].content)[0].type=='video'}}" mode="widthFix"></image>
<image class="video-image" src="{{filter.imagify(filter.jsonParse(rawData[item].content)[0].value)}}" wx:else mode="widthFix" ></image>
<!-- <view class="top-fix" wx:if="{{rawData[item].type==1}}">
<image class="icon-imglabel" src="{{imageRoot}}2c/websiteindex/img.png?{{imageVersion}}"></image>
</view>
</view> -->
<view class="item-content">
<view class="item-title">{{rawData[item].title}}</view>
<view class="item-title">{{rawData[item].title}} {{filter.jsonParse(rawData[item].content)[0].type}}</view>
<view class="item-info" wx:if="{{type!=1}}">
<image class="avatar" src="{{filter.imagify(rawData[item].school_teacher.avatar, 'image/resize,w_160/format,jpg')}}" wx:if="{{rawData[item].school_teacher.avatar}}"></image>
<image class="avatar" src="https://cdn.img.shangjiadao.cn/qingxiao/biz/image/defaultavatar.png" wx:else></image>
......
src/components/brickLayout/index.wxss
View file @ e1eed70e
......@@ -14,18 +14,15 @@
.list-item {
break-inside: avoid;
box-sizing: border-box;
padding-bottom: 28rpx;
padding-bottom: 26rpx;
}
.list-item-inner {
position: relative;
border-radius: 10px;
box-shadow: 0 2rpx 20rpx 0 rgba(34,34,34,0.2);
background: #fff;
}
.list-item .video-image{
width: 100%;
border-radius: 10rpx 10rpx 0 0;
border-radius: 20rpx;
display: block;
}
.list-item .top-fix{
......@@ -45,36 +42,31 @@
height: 25rpx;
}
.list-item .item-content{
padding: 14rpx 19rpx 13rpx 15rpx;
}
.list-item .item-content .item-title{
font-size: 24rpx;
color: #333;
font-weight: 700;
line-height: 30rpx;
letter-spacing: 2rpx;
font-size: 26rpx;
color: #666;
line-height: 40rpx;
word-break: break-all;
display: -webkit-box;
overflow: hidden;
text-overflow: ellipsis;
-webkit-line-clamp: 3;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
padding: 16rpx 0 10rpx;
}
.list-item .item-content .item-info{
display: flex;
align-items: center;
margin-top: 8rpx;
}
.list-item .item-content .item-info .avatar {
width: 54rpx;
height: 54rpx;
border-radius: 50%;
margin-right: 11rpx;
border: 4rpx solid orange;
margin-right: 9rpx;
}
.list-item .item-content .item-info .name {
font-size: 22rpx;
font-weight: 400;
color: #333;
color: #666;
}
\ No newline at end of file
src/pages/setting/userinfoupdate.js
View file @ e1eed70e
......@@ -215,7 +215,6 @@ Page({
cropperSrc: '',
containerheight: ''
})
let filename = '';
cOssAccess({
school_id: this.data.sid,
ext: fileType
......
src/pages/websiteindex/index.js
View file @ e1eed70e
This diff is collapsed.
src/pages/websiteindex/index.wxml
View file @ e1eed70e
This diff is collapsed.
src/pages/websiteindex/index.wxss
View file @ e1eed70e
This diff is collapsed.
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