Skip to content

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

''

parent 08a49367
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 38 deletions
business/pages/calendarthemeindex/index.json
View file @ 644826a2
......@@ -2,6 +2,7 @@
"navigationBarTitleText": "日历打卡",
"enablePullDownRefresh": true,
"navigationBarBackgroundColor": "#00B1FC",
"navigationBarTextStyle": "white",
"usingComponents": {
"sjd-media-show": "../../../components/sjdmediashow",
"clock-item": "../../components/clockitem",
......
business/pages/calendarthemeindex/index.wxss
View file @ 644826a2
......@@ -78,7 +78,8 @@
display: flex;
align-items: center;
height: 255rpx;
background:linear-gradient(180deg,rgba(53,186,253,1),rgba(79,142,255,1));
/* background:linear-gradient(180deg,rgba(53,186,253,1),rgba(79,142,255,1)); */
background-color: #00B1FC;
}
.topbox .btn-box{
flex: 1;
......
business/pages/circleindex/index.wxss
View file @ 644826a2
......@@ -4,7 +4,8 @@
border-bottom: 1px solid transparent;
}
.circle-index-container .header-box {
background:linear-gradient(180deg,rgba(53,186,253,1),rgba(79,142,255,1));
/* background:linear-gradient(180deg,rgba(53,186,253,1),rgba(79,142,255,1)); */
background:#00B1FC;
position: relative;
height: 300rpx;
}
......@@ -51,7 +52,7 @@
}
.circle-index-container .header-box .circle-name-edit-box text {
font-size: 24rpx;
color: #fff;
color: rgba(255, 255, 255, 0.7);
}
.circle-index-container .header-box .shop-edit-box {
padding-left: 49rpx;
......
business/pages/themeindex/index.json
View file @ 644826a2
......@@ -2,6 +2,7 @@
"navigationBarTitleText": "作业打卡",
"enablePullDownRefresh": true,
"navigationBarBackgroundColor": "#00B1FC",
"navigationBarTextStyle": "white",
"usingComponents": {
"sjd-media-show": "../../../components/sjdmediashow",
"clock-item": "../../components/clockitem",
......
business/pages/themeindex/index.wxss
View file @ 644826a2
......@@ -77,7 +77,8 @@
display: flex;
align-items: center;
height: 255rpx;
background:linear-gradient(180deg,rgba(53,186,253,1),rgba(79,142,255,1));
background-color: #00B1FC;
/* background:linear-gradient(180deg,rgba(53,186,253,1),rgba(79,142,255,1)); */
}
.topbox .btn-box{
flex: 1;
......
components/btabbar/index.wxml
View file @ 644826a2
<view class="btabbar">
<view class="btabbaritem {{current == 'class' ? 'active' : ''}}" bindtap="chooseTab" data-type="class" hover-class="none" hover-stop-propagation="false">
<view class="btabbaritem class {{current == 'class' ? 'active' : ''}}" bindtap="chooseTab" data-type="class" hover-class="none" hover-stop-propagation="false">
<image class="icon class" wx:if="{{current != 'class'}}" src="{{imageRoot}}2b/tabbar/class.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon class" wx:if="{{current == 'class'}}" src="{{imageRoot}}2b/tabbar/classactive.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<text class="btabbaritemname" selectable="false" space="false" decode="false">课程列表</text>
</view>
<view class="btabbaritem {{current == 'message' ? 'active' : ''}}" bindtap="chooseTab" data-type="message" hover-class="none" hover-stop-propagation="false">
<view class="btabbaritem message {{current == 'message' ? 'active' : ''}}" bindtap="chooseTab" data-type="message" hover-class="none" hover-stop-propagation="false">
<image class="icon message" wx:if="{{current != 'message'}}" src="{{imageRoot}}2b/tabbar/message.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon message" wx:if="{{current == 'message'}}" src="{{imageRoot}}2b/tabbar/messageactive.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<text class="btabbaritemname" selectable="false" space="false" decode="false">消息</text>
<view class="message-count" hover-class="none" hover-stop-propagation="false" wx:if="{{waitJob > 0}}">{{waitJob > 99 ? '99+' : waitJob}}</view>
</view>
<view class="btabbaritem {{current == 'ucenter' ? 'active' : ''}}" bindtap="chooseTab" data-type="ucenter" hover-class="none" hover-stop-propagation="false">
<view class="btabbaritem ucenter {{current == 'ucenter' ? 'active' : ''}}" bindtap="chooseTab" data-type="ucenter" hover-class="none" hover-stop-propagation="false">
<image class="icon ucenter" wx:if="{{current != 'ucenter'}}" src="{{imageRoot}}2b/tabbar/ucenter.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon ucenter" wx:if="{{current == 'ucenter'}}" src="{{imageRoot}}2b/tabbar/ucenteractive.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<text class="btabbaritemname" selectable="false" space="false" decode="false">我</text>
......
components/btabbar/index.wxss
View file @ 644826a2
......@@ -17,11 +17,12 @@
text-align: center;
width: 128rpx;
height: 100rpx;
display: flex;
/* display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
flex-direction: column; */
position: relative;
padding-top: 14rpx;
}
.btabbaritemname {
font-size: 22rpx;
......@@ -41,6 +42,7 @@
height: 41rpx;
width: 41rpx;
margin-bottom: 14rpx;
margin: 0 auto;
}
.btabbaritem.active {
border-radius: 50%;
......@@ -51,17 +53,17 @@
.btabbaritem.active .class{
width: 66rpx;
height: 66rpx;
margin-bottom: -6rpx;
margin-bottom:-16rpx;
}
.btabbaritem.active .message{
width: 66rpx;
height: 66rpx;
margin-bottom: -8rpx;
margin-bottom: -16rpx;
}
.btabbaritem.active .ucenter{
width: 63rpx;
height: 62rpx;
margin-bottom: -8rpx;
margin-bottom: -12rpx;
}
.btabbaritem.active .btabbaritemname {
color: #65B8F4;
......@@ -76,7 +78,19 @@
min-width: 36rpx;
border-radius: 18rpx;
padding: 0 6rpx;
top: 0%;
right: 0;
top:4rpx;
right:-10rpx;
transform: translateX(-50%);
}
.btabbaritem.class.active {
padding-top:20rpx;
}
.btabbaritem.message.active {
padding-top:22rpx;
}
.btabbaritem.ucenter.active {
padding-top:20rpx;
}
.btabbaritem.message.active .message-count {
top: 20rpx;
}
\ No newline at end of file
filter/index.wxs
View file @ 644826a2
......@@ -163,6 +163,9 @@ function inputMaxlengthResolve (str, maxLength) {
}
function calculateRate (current, total) {
if (current <= 0) {
return 5;
}
var rate = Math.floor(current/total*100);
if (rate < 5) {
rate = 5;
......
project.config.json
View file @ 644826a2
......@@ -41,7 +41,7 @@
"list": []
},
"miniprogram": {
"current": 165,
"current": 166,
"list": [
{
"id": 0,
......@@ -1204,6 +1204,13 @@
"pathName": "src/pages/schoolclasslist/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "商家课程列表",
"pathName": "business/pages/schoolclasslist/index",
"query": "sid=3",
"scene": null
}
]
}
......
src/pages/calendarthemeindex/index.js
View file @ 644826a2
......@@ -1978,8 +1978,10 @@ Page({
title: '日签生成中...'
})
generateCustomerQrcode({
scene: `ctd=${visitor && visitor.id}&t=${this.data.tid}`,
page: `/src/pages/beforeinvitation/index`
// scene: `ctd=${visitor && visitor.id}&t=${this.data.tid}`,
// page: `src/pages/beforeinvitation/index`
scene: `i=${this.data.id}&t=${this.data.tid}&p=7`,
page: `src/pages/themeindex/index`
}).then((res) => {
const {
code,
......@@ -2097,7 +2099,8 @@ Page({
color: '#fff',
textAlign: 'center',
top: 276,
left: 400,
left: 375,
// width: 750,
// bolder: true
},
{ // 文案第二行
......@@ -2108,6 +2111,7 @@ Page({
textAlign: 'center',
top: 340,
left: 375,
// width: 750,
// bolder: true
},
{ // 昵称
......
src/pages/circleindex/index.wxss
View file @ 644826a2
......@@ -138,6 +138,8 @@
}
.circle-index-container .header-box .operate-btn {
position: relative;
width: 20%;
text-align: center;
}
.circle-index-container .header-box .operate-btn-box .operate-btn .operate-btn-icon {
margin-bottom: 16rpx;
......
src/pages/clockeditor/index.wxml
View file @ 644826a2
......@@ -31,7 +31,7 @@
</view>
<view id="clocktextarea" class="clock-input-box" hover-class="none" hover-stop-propagation="false">
<textarea class="clock-input-item" value="{{params.content}}" bindinput="contentInput" maxlength="600" name="" id="" placeholder="请输入内容"></textarea>
<text class="word-count" selectable="false" space="false" decode="false">{{params.content.length}}/{{maxLength}}</text>
<text class="word-count" selectable="false" space="false" decode="false">{{params.content.length}}/{{maxLength}}(不少于{{contentLimit.text}}个字)</text>
</view>
<view class="clearfix" hover-class="none" hover-stop-propagation="false">
<view class="imgandvideobox" hover-class="none" hover-stop-propagation="false" wx:for="{{imageBox}}" wx:key="{{index}}" wx:if="{{imageBox.length > 0}}">
......
src/pages/invitationcard/index.js
View file @ 644826a2
......@@ -164,8 +164,10 @@ Page({
// }
const visitor = LocalStorage.getItem('visitor');
generateCustomerQrcode({
scene: `ctd=${visitor && visitor.id}&t=${this.data.tid}`,
page: `/src/pages/beforeinvitation/index`
// scene: `ctd=${visitor && visitor.id}&t=${this.data.tid}`,
// page: `/src/pages/beforeinvitation/index`
scene: `i=${this.data.id}&t=${this.data.tid}&p=7`,
page: `src/pages/themeindex/index`
}).then((res) => {
const {
code,
......
src/pages/invitationcard/index.wxss
View file @ 644826a2
......@@ -2,6 +2,7 @@
position: relative;
width: 750rpx;
height: 1334rpx;
box-shadow:0px 0px 26px 0px rgba(0, 0, 0, 0.22);
}
.cardbg {
width: 100%;
......
src/pages/mineclass/index.wxml
View file @ 644826a2
......@@ -32,9 +32,7 @@
</button>
</form>
<view class="item-title" hover-class="none" hover-stop-propagation="false">
<view class='name'>
{{item.title}}
</view>
<view class='name'>{{item.title}}</view>
</view>
<view class='username' hover-class="none" hover-stop-propagation="false">
<view class='blue-icon' hover-class="none" hover-stop-propagation="false"></view>
......
src/pages/myachievement/index.wxss
View file @ 644826a2
......@@ -109,6 +109,11 @@
position: relative;
width: 146rpx;
height: 260rpx;
display: inline-block;
overflow: hidden;
border-radius: 10rpx;
margin-right: 40rpx;
box-shadow:0px 0px 4rpx 0px rgba(0, 0, 0, 0.06);
}
.certificatebox .bg {
position: absolute;
......
src/pages/mylikes/index.wxml
View file @ 644826a2
<!--src/pages/mylikes/index.wxml-->
<view class="container">
<!-- <view class="header clearfix">
<view class="tab-btn" hover-class="none" hover-stop-propagation="false" bindtap="changeTab">
<view class="{{activeBtn==1?'left-btn active-btn':'left-btn'}}" id='leftbtn' hover-class="none" hover-stop-propagation="false">我的点赞</view>
<view class="{{activeBtn==2?'right-btn active-btn':'right-btn'}}" id='rightbtn' hover-class="none" hover-stop-propagation="false">我收到的赞</view>
</view>
</view> -->
<view class="examinelist-container clearfix" wx:if="{{!emptyPage1}}">
<view class="passiveList-container clearfix">
<view class="examinelist-item" hover-class="none" hover-stop-propagation="false" wx:for="{{passiveList}}" wx:key="{{item.id}}" data-item="{{item}}" bindtap="goClockDetail">
......@@ -28,7 +22,7 @@
</view>
<view class="empty-box clearfix" wx:if="{{emptyPage1}}">
<view class="icon-box" hover-class="none" hover-stop-propagation="false">
<image class="empty-icon" src="{{imageRoot}}2b/organizationalmgt/empty-icon.png?{{imageVersion}}" lazy-load="false" binderror="" bindload=""></image>
<image class="empty-icon" src="{{imageRoot}}2c/common/empty2.png?{{imageVersion}}" lazy-load="false" binderror="" bindload=""></image>
</view>
<view class="empty-text" hover-class="none" hover-stop-propagation="false">
还没有朋友给你点赞，赶紧与大家互动吧
......
src/pages/schoolclasslist/index.wxss
View file @ 644826a2
......@@ -14,7 +14,7 @@
width: 100%;
top: 0;
left: 0;
z-index: 100;
z-index: 202;
}
@keyframes modalshow {
from {
......@@ -30,7 +30,7 @@
left: 0;
width: 100%;
height: 100%;
z-index: 99;
z-index: 201;
animation: modalshow 0.1s linear;
}
.classselectedmodal .modalmask {
......
src/pages/tasklist/index.wxml
View file @ 644826a2
<!--business/pages/mytask/index.wxml-->
<wxs src="./../../../filter/index.wxs" module="filter" />
<view class="container">
<view class="" hover-class="none" hover-stop-propagation="false" wx:if="{{!emptyPage}}">
<view class="" hover-class="none" hover-stop-propagation="false" wx:for="{{taskList}}" wx:key="{{index}}" data-task="{{item}}" bindtap="goClock">
......@@ -18,8 +19,8 @@
</view> -->
<view class="goclock" hover-class="none" hover-stop-propagation="false">去打卡</view>
<view class="progress-box" hover-class="none" hover-stop-propagation="false">
<view class="progress" hover-class="none" hover-stop-propagation="false"></view>
<view class="progressdesc" hover-class="none" hover-stop-propagation="false">
<view class="progress" style="width: {{filter.calculateRate(item.extra.now, item.extra.cycle)}}%" hover-class="none" hover-stop-propagation="false"></view>
<view class="progressdesc" wx:if="{{item.extra.cycle > item.extra.now}}" style="left: {{filter.calculateRate(item.extra.now, item.extra.cycle)}}%" hover-class="none" hover-stop-propagation="false">
<view class="current" hover-class="none" hover-stop-propagation="false">第{{item.extra.now}}天</view>
<image class="locate" src="{{imageRoot}}2c/circleindex/locate.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
</view>
......
src/pages/tasklist/index.wxss
View file @ 644826a2
......@@ -8,8 +8,9 @@
background-color: #fff;
position: relative;
border: 2rpx solid rgba(249,249,249,1);
border-bottom: none;
box-shadow:0px 5rpx 10rpx 0px rgba(0, 0, 0, 0.05);
/* overflow: hidden; */
overflow: hidden;
}
.circle-item.rili {
padding-bottom: 64rpx;
......@@ -60,7 +61,8 @@
left: 0;
bottom: 0;
height: 6rpx;
background-color: red;
background-color: #EBEBEB;
border-radius: 20rpx;
/* padding-top: 64rpx; */
}
.progress {
......@@ -74,10 +76,11 @@
}
.progressdesc {
position:absolute;
top:-54rpx;
top:-48rpx;
left:90%;
text-align:center;
width:80rpx;
transform: translateX(-50%);
}
.progressdesc .locate {
width: 14rpx;
......
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