Commit 4a959864 authored by lvtz's avatar lvtz

new add

parent 92e2182e
......@@ -579,7 +579,8 @@
"root": "business/pages/scoremgt",
"name": "businessscoremgt",
"pages": [
"index"
"index",
"integralchange"
]
},
{
......
......@@ -357,4 +357,22 @@ button::after{
color: #fff;
height: 200rpx;
padding: 0 100rpx;
}
/* 单个按钮 悬浮页面底部 */
.form-fixbtn{
width: 365rpx;
height: 80rpx;
background: rgba(101,184,244,1);
border-radius: 40rpx;
display: flex;
justify-content: center;
align-items: center;
font-size: 30rpx;
color: #fff;
position: fixed;
left: 50%;
transform: translateX(-50%);
bottom: 128rpx;
z-index: 9;
}
\ No newline at end of file
......@@ -5,36 +5,36 @@
<view class="form-label">课程</view>
<view class="form-content">
<input type="text" class="form-input" value="{{}}" placeholder="请选择课程" bindinput=""/>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
<view class="form-item">
<view class="form-label">班级名称</view>
<view class="form-content">
<input type="text" class="form-input" value="{{params.title}}" placeholder="请输入班级名称" bindinput="titleinput"/>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
<view class="form-item">
<view class="form-label">最大人数</view>
<view class="form-content">
<input type="number" class="form-input" value="{{params.nickname}}" placeholder="请输入班级最大人数" bindinput=""/>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
<view class="form-item">
<view class="form-label">老师</view>
<view class="form-content" bindtap="toSelectTeachers">
<input type="text" class="form-input" value="{{params.nickname}}" placeholder="请选择老师" disabled/>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
<view class="form-item">
<view class="form-label">教室</view>
<view class="form-content">
<input type="text" class="form-input" value="{{params.nickname}}" placeholder="请选择教室" bindinput=""/>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
</view>
<view class="devided-line"></view>
......
/* @import '../../../style/editor.wxss';
page{} */
.form-box{
width: 100%;
}
.form-box .form-item{
padding: 20rpx 25rpx;
display: flex;
align-items: center;
justify-content: space-between;
position: relative;
}
.form-box .form-item .form-label{
font-size: 26rpx;
color: #000;
}
.form-box .form-item .form-label text{
font-size: 24rpx;
color: #8C8C8C;
padding-left: 20rpx;
}
.form-box .form-item::after{
content: '';
width: calc(100% - 25rpx);
height: 1px;
background: rgba(0,0,0,.05);
position: absolute;
bottom: 0;
right: 0;
transform: scaleY(.5);
}
.form-box .form-item:last-of-type::after{
display: none;
}
.form-box .form-item .arrowsmall{
position: absolute;
width: 12rpx;
height: 21rpx;
top: 50%;
right: 25rpx;
transform: translateY(-50%);
}
.form-box .form-item .form-content .avatar {
width: 96rpx;
height: 96rpx;
border-radius: 50%;
display: block;
}
.form-box .form-item .form-content {
/* background: #eee; */
padding: 0 40rpx;
}
.form-box .form-item .form-content .form-input{
text-align: right;
color: #8C8C8C;
height: 60rpx;
line-height: 60rpx;
}
.circle-name-box {
position: relative;
}
.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;
}
.arrowsmall {
width: 12rpx;
height: 20rpx;
margin-left: 20rpx;
}
@import '../../../style/commonform.wxss';
.devided-line{
width: 100%;
height: 20rpx;
background: #F7F7F9;
}
.form-box .form-item{
padding: 33rpx 25rpx;
}
.form-switch-box .form-item .switch-title{
font-weight: bold;
}
......
......@@ -29,21 +29,21 @@
</view>
<view class="form-item">
<view class="form-label">收费模式</view>
<view class="form-content form-modebox">
<view class="mode-item" bindtap="modetimeChange">
<view class="form-content">
<view class="radio-item" bindtap="modetimeChange">
<image class="icon-checkbox" src="{{imageRoot}}2b/common/radioactive2.png?{{imageVersion}}" wx:if="{{params.mode_time==1}}"></image>
<image class="icon-checkbox" src="{{localImageRoot}}2b/common/radiono.png?{{imageVersion}}" wx:if="{{params.mode_time==2}}"></image>
<view class="mode-title">按课时</view>
<view class="radio-title">按课时</view>
</view>
<view class="mode-item" bindtap="modeintervalChange">
<view class="radio-item" bindtap="modeintervalChange">
<image class="icon-checkbox" src="{{imageRoot}}2b/common/radioactive2.png?{{imageVersion}}" wx:if="{{params.mode_interval==1}}"></image>
<image class="icon-checkbox" src="{{localImageRoot}}2b/common/radiono.png?{{imageVersion}}" wx:if="{{params.mode_interval==2}}"></image>
<view class="mode-title">按时段</view>
<view class="radio-title">按时段</view>
</view>
<view class="mode-item" bindtap="modeclassChange">
<view class="radio-item" bindtap="modeclassChange">
<image class="icon-checkbox" src="{{imageRoot}}2b/common/radioactive2.png?{{imageVersion}}" wx:if="{{params.mode_class==1}}"></image>
<image class="icon-checkbox" src="{{localImageRoot}}2b/common/radiono.png?{{imageVersion}}" wx:if="{{params.mode_class==2}}"></image>
<view class="mode-title">按班级</view>
<view class="radio-title">按班级</view>
</view>
</view>
</view>
......
......@@ -9,16 +9,7 @@ page::after{
right: 0;
transform: scaleY(.5);
}
.form-box .form-item::after{
content: '';
width: 100%;
height: 1px;
background: rgba(0,0,0,.05);
position: absolute;
bottom: 0;
right: 0;
transform: scaleY(.5);
}
/* 页面单独设置 */
.color-item{
width: 40rpx;
height: 40rpx;
......@@ -39,20 +30,4 @@ page::after{
}
.color-item.active::after{
border: 1px solid #000;
}
.mode-item{
margin-left: 47rpx;
display: flex;
align-items: center;
}
.mode-item .icon-checkbox{
width: 31rpx;
height: 31rpx;
position: relative;
margin-right: 14rpx;
}
.mode-item .mode-title{
color: #8C8C8C
}
\ No newline at end of file
......@@ -114,6 +114,12 @@ Page({
url: `/business/pages/scorerulesetting/index?sid=${this.data.sid}`
})
},
// 积分变动
toIntegralChange(){
wx.navigateTo({
url: `/business/pages/scoremgt/integralchange?sid=${this.data.sid}`
})
},
// 添加商品 弹窗选择
toAddPointsGift () {
this.setData({
......
......@@ -7,15 +7,15 @@
</view>
<view class="btnname">积分设置</view>
</view>
<view class="btnitem" bindtap="toAddPointsGift">
<view class="btnitem" bindtap="toIntegralChange">
<view class="iconbox">
<image class="icon addprize" src="{{imageRoot}}2b/scoremgt/addprize.png?{{imageVersion}}"></image>
<image class="icon change" src="{{localImageRoot}}2b/scoremgt/change.png?{{imageVersion}}"></image>
</view>
<view class="btnname">积分变动</view>
</view>
<view class="btnitem" bindtap="toAddPointsGift">
<view class="iconbox">
<image class="icon change" src="{{localImageRoot}}2b/scoremgt/change.png?{{imageVersion}}"></image>
<image class="icon addprize" src="{{imageRoot}}2b/scoremgt/addprize.png?{{imageVersion}}"></image>
</view>
<view class="btnname">添加奖品</view>
</view>
......
......@@ -31,6 +31,10 @@ page{
width: 64rpx;
height: 61rpx;
}
.btnitem .iconbox .change {
width: 61rpx;
height: 63rpx;
}
.btnitem .iconbox .addprize {
width: 75rpx;
height: 55rpx;
......
import {
formIdCreate
} from '../../../service/common.js';
import {
memberIntegral
} from '../../../service/business/circlemember.js';
var app = getApp();
Page({
data: {
localImageRoot: '../../../images/',
imageRoot: app.globalData.imageRoot,
imageVersion: app.globalData.imageVersion,
id: 0,
sid: 0,
params: {
students: '',
type: 1,
number: '',
remark: '',
},
submit: false,
},
onLoad: function(options) { // Do some initialize when page load.
const {sid} = options;
this.setData({
sid
})
},
onReady: function() { // Do something when page ready.
},
onShow: function(options) { // Do something when page show.
},
toSelectStudents(){
wx.navigateTo({
url: `/business/pages/studentmgt/list?sid=${this.data.sid}`
})
},
numberinput(e){
const {value} = e.detail;
this.setData({
'params.number': Number(value)
})
},
remarkinput (e) {
const {value} = e.detail;
this.setData({
'params.remark': value.length > 500 ? value.substr(0, 500) : value
})
},
// 类型选择
typeChange(){
let type=this.data.params.type;
if(type==1){
type=2
}else{
type=1
}
this.setData({
'params.type': type
})
},
doSave (e) {
const number = parseInt(Number(this.data.params.number))
if (number<1) {
wx.showModal({
title: '提示',
content: '积分值至少为1',
showCancel: false,
confirm: true,
confirmColor: '#65B8F4'
})
return;
}
if (!this.data.params.remark) {
wx.showModal({
title: '提示',
content: '备注内容不能为空',
showCancel: false,
confirm: true,
confirmColor: '#65B8F4'
})
return;
}
if (this.data.submit) { // 防止数据重复提交
return
}
this.setData({
submit: true
})
wx.showLoading({
title: '保存中...'
})
// TODO 换接口
memberIntegral(Object.assign({},this.data.params,{
school_id: this.data.sid,
// consumer_id: this.data.singleStudentInfo.consumer_id,
})).then((res) => {
const { code, data } = res;
this.setData({
listLoading: false
})
if (code != 200) { // 失败的处理
this.setData({
submit: false
})
wx.hideLoading();
} else {
wx.navigateBack({
delta: 1, // 回退前 delta(默认为1) 页面
})
}
}).catch(() => {
wx.hideLoading();
this.setData({
submit: false
})
})
},
})
\ No newline at end of file
{
"usingComponents": {},
"navigationBarTitleText": "积分变动"
}
\ No newline at end of file
<wxs src="../../../filter/index.wxs" module="filter" />
<view class="container">
<view class="form-box">
<view class="form-item">
<view class="form-label">学员</view>
<view class="form-content" bindtap="toSelectStudents">
<input type="text" class="form-input" value="{{params.students}}" placeholder="请选择学员" disabled/>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
</view>
<view class="form-item">
<view class="form-label">类型</view>
<view class="form-content">
<view class="radio-item" bindtap="typeChange">
<image class="icon-checkbox" src="{{imageRoot}}2b/common/radioactive2.png?{{imageVersion}}" wx:if="{{params.type==1}}"></image>
<image class="icon-checkbox" src="{{localImageRoot}}2b/common/radiono.png?{{imageVersion}}" wx:if="{{params.type!=1}}"></image>
<view class="radio-title">增加积分</view>
</view>
<view class="radio-item" bindtap="typeChange">
<image class="icon-checkbox" src="{{imageRoot}}2b/common/radioactive2.png?{{imageVersion}}" wx:if="{{params.type==2}}"></image>
<image class="icon-checkbox" src="{{localImageRoot}}2b/common/radiono.png?{{imageVersion}}" wx:if="{{params.type!=2}}"></image>
<view class="radio-title">减少积分</view>
</view>
</view>
</view>
<view class="form-item">
<view class="form-label">积分值</view>
<view class="form-content">
<input type="number" class="form-input" value="{{params.number}}" placeholder="请输入积分值" bindinput="numberinput"/>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
</view>
<view class="form-item">
<view class="form-label">备注</view>
<view class="form-content">
<textarea class="form-input form-remark" style="line-height: 1.2" auto-height value="{{params.remark}}"placeholder="请输入备注信息" bindinput="remarkinput"></textarea>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
</view>
</view>
<view class="form-fixbtn" bindtap="doSave">确认</view>
</view>
\ No newline at end of file
@import '../../../style/commonform.wxss';
page::after{
content: '';
width: 100%;
height: 1px;
background: rgba(0,0,0,.05);
position: absolute;
top: 0;
right: 0;
transform: scaleY(.5);
}
/* 页面单独设置 */
.form-box .form-item .form-content .radio-item{
margin-left: 88rpx;
}
\ No newline at end of file
......@@ -14,7 +14,7 @@
<list-loading loading="{{listLoading}}"></list-loading>
</view>
<view class="bottom-fixbox" bindtap="sureSelect">确认</view>
<view class="form-fixbtn" bindtap="sureSelect">确认</view>
<view class="empty-content" wx:if="{{emptyPage}}">
<image class='empty-img' src='{{imageRoot}}2c/rankinglist/empty.png?{{imageVersion}}'></image>
......
......@@ -81,22 +81,3 @@
color: #FFB97A;
font-weight: 500;
}
/* 底部固定操作栏 */
.bottom-fixbox{
font-size: 30rpx;
color: #fff;
position: fixed;
bottom: 120rpx;
left: 50%;
transform: translateX(-50%);
width: 365rpx;
height: 80rpx;
background: #65B8F4;
border-radius: 40rpx;
display: flex;
align-items: center;
justify-content: center;
z-index: 5;
}
......@@ -6,52 +6,53 @@
<view class="form-label">头像</view>
<view class="form-content">
<image class="avatar" src="{{filter.imagify(params.avatar, 'image/resize,w_320/format,jpg/quality,q_50')}}" bindtap="proMainImgUpload"></image>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
<view class="form-item">
<view class="form-label">姓名</view>
<view class="form-content">
<input type="text" class="form-input" value="{{params.nickname}}" placeholder="请输入姓名" bindinput="nicknameInput"/>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
<view class="form-item">
<view class="form-label">性别</view>
<picker class="form-content" value="{{sexindex}}" range="{{sexArr}}" bindchange="bindSexChange">
<input type="text" class="form-input" value="{{sexArr[sexindex]}}" placeholder="请选择性别" disabled/>
</picker>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
<view class="form-content">
<picker value="{{sexindex}}" range="{{sexArr}}" bindchange="bindSexChange">
<input type="text" class="form-input" value="{{sexArr[sexindex]}}" placeholder="请选择性别" disabled/>
</picker>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
</view>
<view class="form-item">
<view class="form-label">身份证号<text class="">(选填)</text></view>
<view class="form-content">
<input type="text" class="form-input" value="{{params.identifycard}}" placeholder="请输入身份证号码" bindinput="nicknameInput"/>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
<view class="form-item">
<view class="form-label">联系方式</view>
<view class="form-content">
<input type="number" class="form-input" value="{{params.phone}}" placeholder="请输入手机号" bindinput="phoneInput"/>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
<view class="form-item">
<view class="form-label">入职时间</view>
<picker class="form-content" mode="date" fields="day" value="{{params.entrytime}}" start="2015-09-01" end="2030-09-01" bindchange="bindDateChange">
<input type="text" class="form-input" value="{{params.entrytime}}" placeholder="请选择入职日期" disabled/>
</picker>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
<view class="form-content">
<picker mode="date" fields="day" value="{{params.entrytime}}" start="2015-09-01" end="2030-09-01" bindchange="bindDateChange">
<input type="text" class="form-input" value="{{params.entrytime}}" placeholder="请选择入职日期" disabled/>
</picker>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
</view>
<!-- <picker mode="date" fields="day" value="{{params.entrytime}}" start="2015-09-01" end="2030-09-01" bindchange="bindDateChange" class="select-box">
<text class="select-month">{{params.entrytime}}</text>
<image class="icon-arrow" src="{{localImageRoot}}2c/myschedule/arr_b.png?{{imageVersion}}"></image>
</picker> -->
</view>
<view class="submitbtn" bindtap="save">保存</view>
<view class="form-fixbtn" bindtap="save">保存</view>
<view class="cropperdialog" wx:if="{{showCropper}}">
<imagecropper
......
@import '../../../style/commonform.wxss';
page::after{
content: '';
width: calc(100% - 25rpx);
......@@ -11,72 +13,6 @@ page::after{
.container {
min-height: 100vh;
}
.form-box{
width: 100%;
}
.form-box .form-item{
padding: 20rpx 25rpx;
display: flex;
align-items: center;
justify-content: space-between;
position: relative;
}
.form-box .form-item .form-label{
font-size: 26rpx;
color: #000;
}
.form-box .form-item .form-label text{
font-size: 24rpx;
color: #8C8C8C;
padding-left: 20rpx;
}
.form-box .form-item::after{
content: '';
width: calc(100% - 25rpx);
height: 1px;
background: rgba(0,0,0,.05);
position: absolute;
bottom: 0;
right: 0;
transform: scaleY(.5);
}
.form-box .form-item .arrowsmall{
position: absolute;
width: 12rpx;
height: 21rpx;
top: 50%;
right: 25rpx;
transform: translateY(-50%);
}
.form-box .form-item .form-content .avatar {
width: 96rpx;
height: 96rpx;
border-radius: 50%;
display: block;
}
.form-box .form-item .form-content {
/* background: #eee; */
padding: 0 40rpx;
}
.form-box .form-item .form-content .form-input{
text-align: right;
color: #8C8C8C;
height: 60rpx;
line-height: 60rpx;
}
.submitbtn {
position: fixed;
left: 50%;
bottom: 86rpx;
transform: translateX(-50%);
width: 365rpx;
height: 80rpx;
background: rgba(101,184,244,1);
border-radius: 40px;
display: flex;
align-items: center;
justify-content: center;
font-size: 30rpx;
color: #fff;
}
\ No newline at end of file
......@@ -63,7 +63,7 @@
</view>
<view class="has-nomore" wx:if="{{!emptyPage && !hasmore}}">没有更多了</view>
<view class="add-teacher" bindtap="addOrEditTeacher">
<view class="form-fixbtn" bindtap="addOrEditTeacher">
<form report-submit="true" bindsubmit="formIdCreate" class="createidform">
<button form-type="submit" class="createidbutton"></button>
</form>
......
......@@ -395,21 +395,4 @@
color: #9C9C9D;
padding: 75rpx 0;
text-align: center;
}
.add-teacher{
width: 365rpx;
height: 80rpx;
background: rgba(101,184,244,1);
border-radius: 40rpx;
font-size: 30rpx;
position: absolute;
left: 50%;
transform: translateX(-50%);
bottom: 86rpx;
font-size: 30rpx;
color: #fff;
display: flex;
align-items: center;
justify-content: center;
}
\ No newline at end of file
......@@ -12,6 +12,8 @@
.form-box .form-item .form-label{
font-size: 26rpx;
color: #000;
white-space: nowrap;
min-width: 160rpx;
}
.form-box .form-item .form-label text{
font-size: 24rpx;
......@@ -20,7 +22,7 @@
}
.form-box .form-item::after{
content: '';
width: calc(100% - 25rpx);
width: 100%;
height: 1px;
background: rgba(0,0,0,.05);
position: absolute;
......@@ -50,21 +52,25 @@
height: 60rpx;
line-height: 60rpx;
}
.form-box .form-item .form-content .form-remark{
width: 360rpx;
line-height: 1.5;
}
.form-fixbtn{
width: 365rpx;
height: 80rpx;
background: rgba(101,184,244,1);
border-radius: 40rpx;
.form-box .form-item .form-content .radio-item{
margin-left: 47rpx;
display: flex;
justify-content: center;
align-items: center;
font-size: 30rpx;
color: #fff;
position: fixed;
left: 50%;
transform: translateX(-50%);
bottom: 128rpx;
z-index: 9;
}
.form-box .form-item .form-content .radio-item:first-of-type{
margin-left: 0;
}
.form-box .form-item .form-content .radio-item .icon-checkbox{
width: 31rpx;
height: 31rpx;
position: relative;
margin-right: 14rpx;
}
.form-box .form-item .form-content .radio-item .radio-title{
color: #8C8C8C
}
\ No newline at end of file
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