Skip to content

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

''

parent ad703f68
Hide whitespace changes
Inline Side-by-side
Showing with 173 additions and 212 deletions
.vscode/settings.json 0 → 100644
View file @ c9d46492
{
"files.associations": {
"*.vue": "vue",
"*.cjson": "jsonc",
"*.wxss": "css",
"*.wxs": "javascript",
"*.wxml": "html"
}
}
\ No newline at end of file
app.json
View file @ c9d46492
......@@ -354,6 +354,13 @@
"index"
]
},
{
"root": "src/pages/poster",
"name": "poster",
"pages": [
"index"
]
},
{
"root": "src/pages/contactindex",
"name": "contactindex",
......@@ -565,25 +572,5 @@
"scope.userLocation": {
"desc": "您的位置信息将用于‘打卡小管家’位置展示"
}
},
"tabBar": {
"color": "#464646",
"selectedColor": "#65B8F4",
"backgroundColor": "#fff",
"list": [
{
"pagePath": "src/pages/schoolindex/index",
"text": "首页",
"iconPath": "./images/2b/ucenter/homenotactive.png",
"selectedIconPath": "./images/2b/ucenter/homeactive.png"
},
{
"pagePath": "ucenter/index",
"text": "个人中心",
"iconPath": "./images/2b/ucenter/ucenternotactive.png",
"selectedIconPath": "./images/2b/ucenter/ucenteractive.png"
}
]
},
"sitemapLocation": "sitemap.json"
}
}
\ No newline at end of file
business/pages/organizationalmgt/index.json
View file @ c9d46492
{
"usingComponents": {},
"navigationBarTitleText": "机构管理"
"navigationBarTitleText": "机构管理",
"usingComponents": {
"btabbar": "../../../components/btabbar"
}
}
\ No newline at end of file
business/pages/organizationalmgt/index.wxml
View file @ c9d46492
......@@ -168,4 +168,5 @@
</view>
</view>
</view>
<btabbar></btabbar>
</view>
components/btabbar/index.js
View file @ c9d46492
......@@ -7,7 +7,9 @@ Component({
},
data: {
imageRoot: app.globalData.imageRoot,
localImageRoot: '../../images/',
imageVersion: app.globalData.imageVersion,
currentTab: 'ucenter'
},
created () {
},
......@@ -23,69 +25,11 @@ Component({
}
},
methods: {
bulletGet() {
let data = {
class_id: this.data.cid,
page: this.data.page,
perPage: this.data.perPage
}
if (this.data.tid) {
data.subject_id = this.data.tid;
}
bulletGet(data).then(res => {
const {data, code} = res;
if (code == 200) {
if (data.total) {
this.setData({
bulletTotal: data.total > this.data.perPage ? this.data.perPage : data.total
})
}
const bulletList = this.data.bulletList;
if (this.data.page == 1) {
this.setData({
bulletList: data.list
})
} else {
this.setData({
bulletList: bulletList.concat(data.list)
})
}
if (this.data.page == 1 && this.data.bulletTotal > 0) {
this.bulletPlay();
}
}
})
},
bulletPlay (type) { // 弹幕播放效果
const that = this;
// this.setData({
// addFade: true,
// })
chooseTab (e) {
const {dataset} = e.currentTarget;
this.setData({
current: 0,
currentBullet: this.data.bulletList[0],
currentTab: dataset.type
})
this.timeOut = setInterval(() => {
that.data.current++;
if (this.data.current >= this.data.bulletTotal - 1) {
clearInterval(this.timeOut);
this.setData({
current: 0,
// bulletTotal: 0,
page: 1,
// bulletList: [],
currentBullet: {}
}, () => {
this.bulletPlay();
// this.bulletGet();
})
} else {
this.setData({
current: that.data.current,
currentBullet: this.data.bulletList[this.data.current],
})
}
}, 3000)
}
}
})
\ No newline at end of file
components/btabbar/index.wxml
View file @ c9d46492
<wxs src="../../filter/index.wxs" module="filter" />
<view class="sjd-bullet-box">
<view hover-class="none" hover-stop-propagation="false" wx:if="{{currentBullet.id}}">
<!-- 打卡的模板 -->
<!-- <view class="bullet-content {{addFade ? 'bulletfade' : ''}}" hover-class="none" hover-stop-propagation="false" wx:if="{{currentBullet.type == 1}}"> -->
<view class="bullet-content bulletfade" hover-class="none" hover-stop-propagation="false" wx:if="{{currentBullet.type == 1}}">
<image class="avator" src="{{currentBullet.info.avatar}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<text class="nickname" selectable="false" space="false" decode="false">{{filter.nameSplice(currentBullet.info.nickname)}}</text>
<text class="time" selectable="false" space="false" decode="false">{{filter.bulletTimeCompare(currentBullet.created_at)}}</text>
<text class="action" selectable="false" space="false" decode="false">{{filter.actionFilter(currentBullet.type)}}</text>
</view>
<!-- 打卡的模板 -->
<!-- 评论的模板 -->
<!-- <view class="bullet-content {{addFade ? 'bulletfade' : ''}}" hover-class="none" hover-stop-propagation="false" wx:if="{{currentBullet.type == 2}}"> -->
<view class="bullet-content bulletfade" hover-class="none" hover-stop-propagation="false" wx:if="{{currentBullet.type == 2}}">
<!-- <image class="avator" wx:if="{{currentBullet.consumer_id == 0}}" src="{{currentBullet.member_user.avator}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image> -->
<image class="avator" src="{{currentBullet.info.avatar}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<text class="nickname" selectable="false" space="false" decode="false">{{filter.nameSplice(currentBullet.info.nickname)}}</text>
<!-- <text class="nickname" wx:if="{{currentBullet.consumer_id > 0}}" selectable="false" space="false" decode="false">{{currentBullet.clock_circle_user && filter.nameSplice(currentBullet.clock_circle_user.remark) || filter.nameSplice(currentBullet.wechat_consumer.nickname)}}</text> -->
<text class="time" selectable="false" space="false" decode="false">{{filter.bulletTimeCompare(currentBullet.created_at)}}</text>
<text class="action" selectable="false" space="false" decode="false">{{filter.actionFilter(currentBullet.type)}}</text>
<text class="pnickname" selectable="false" space="false" decode="false">{{filter.nameSplice(currentBullet.info.record_user_nickname)}}的日记</text>
</view>
<!-- 评论的模板 -->
<!-- 老师点评的模板 -->
<!-- <view class="bullet-content {{addFade ? 'bulletfade' : ''}}" hover-class="none" hover-stop-propagation="false" wx:if="{{currentBullet.type == 3}}"> -->
<view class="bullet-content bulletfade" hover-class="none" hover-stop-propagation="false" wx:if="{{currentBullet.type == 3}}">
<image class="avator" src="{{currentBullet.info.avatar}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<text class="nickname" selectable="false" space="false" decode="false">{{filter.nameSplice(currentBullet.info.nickname)}}</text>
<text class="time" selectable="false" space="false" decode="false">{{filter.bulletTimeCompare(currentBullet.created_at)}}</text>
<text class="action" selectable="false" space="false" decode="false">{{filter.actionFilter(currentBullet.type)}}</text>
<text class="pnickname" selectable="false" space="false" decode="false">{{filter.nameSplice(currentBullet.info.passive_nickname)}}的日记</text>
</view>
<!-- 老师点评的模板 -->
<view class="btabbar">
<view class="btabbaritem {{currentTab == 'class' ? 'active' : ''}}" bindtap="chooseTab" data-type="class" hover-class="none" hover-stop-propagation="false">
<image class="icon class" wx:if="{{currentTab != 'class'}}" src="{{localImageRoot}}2b/tabbar/class.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon class" wx:if="{{currentTab == 'class'}}" src="{{localImageRoot}}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 {{currentTab == 'message' ? 'active' : ''}}" bindtap="chooseTab" data-type="message" hover-class="none" hover-stop-propagation="false">
<image class="icon message" wx:if="{{currentTab != 'message'}}" src="{{localImageRoot}}2b/tabbar/message.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon message" wx:if="{{currentTab == 'message'}}" src="{{localImageRoot}}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>
<view class="btabbaritem {{currentTab == 'ucenter' ? 'active' : ''}}" bindtap="chooseTab" data-type="ucenter" hover-class="none" hover-stop-propagation="false">
<image class="icon ucenter" wx:if="{{currentTab != 'ucenter'}}" src="{{localImageRoot}}2b/tabbar/ucenter.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon ucenter" wx:if="{{currentTab == 'ucenter'}}" src="{{localImageRoot}}2b/tabbar/ucenteractive.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<text class="btabbaritemname" selectable="false" space="false" decode="false">我</text>
</view>
</view>
\ No newline at end of file
components/btabbar/index.wxss
View file @ c9d46492
@keyframes bulletfade {
0% {
opacity: 0;
}
10% {
opacity: 0;
}
20% {
opacity: 1;
}
40% {
opacity: 1;
}
60% {
opacity: 0;
}
80% {
opacity: 0;
}
100% {
opacity: 0;
}
.btabbar {
display: flex;
align-items: center;
justify-content: space-around;
height: 100rpx;
background-color: #fff;
position: fixed;
bottom: 0;
left: 0;
width: 100%;
border-top: 2rpx solid rgba(0,0,0,0.1);
}
@-webkit-keyframes bulletfade {
0% {
opacity: 0;
}
10% {
opacity: 1;
}
20% {
opacity: 1;
}
40% {
opacity: 1;
}
60% {
opacity: 0;
}
80% {
opacity: 0;
}
100% {
opacity: 0;
}
.btabbar image {
display: block;
}
/* @keyframes moveup {
from {
transform: translateY(0) scale(1);
-webkit-transform: translateY(0) scale(1);
}
to {
transform: translateY(100%) scale(1.01);
-webkit-transform: translateY(100%) scale(1.01);
}
} */
.sjd-bullet-box {
position: fixed;
top: 20rpx;
left: 20rpx;
z-index: 200;
color: #fff;
.btabbaritem {
text-align: center;
width: 128rpx;
height: 100rpx;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
}
.btabbaritemname {
font-size: 22rpx;
color: #464646;
}
.bulletfade {
animation: bulletfade 3s linear infinite forwards;
.btabbaritemname.active {
color: #65B8F4;
}
.sjd-bullet-box .bullet-content {
background-color: rgba(0, 0, 0, 0.5);
.btabbaricon {
width: 100%;
height: 41rpx;
display: flex;
display: -webkit-flex;
align-items: center;
justify-content: flex-start;
height: 60rpx;
padding: 0 15rpx 0 5rpx;
border-radius: 40rpx;
padding-right: 40rpx;
font-size: 14rpx;
justify-content: center;
}
.sjd-bullet-box .bullet-content .avator {
width: 50rpx;
height: 50rpx;
display: block;
.btabbaritem .icon{
height: 41rpx;
width: 41rpx;
margin-bottom: 14rpx;
}
.btabbaritem.active {
border-radius: 50%;
margin-right: 20rpx;
height: 128rpx;
box-shadow:0 -4rpx 8rpx 0 rgba(0, 0, 0, 0.05);
background-color: #fff;
}
.btabbaritem.active .class{
width: 66rpx;
height: 66rpx;
margin-bottom: -6rpx;
}
.btabbaritem.active .message{
width: 66rpx;
height: 66rpx;
margin-bottom: -8rpx;
}
.sjd-bullet-box .bullet-content .nickname {
padding-right: 20rpx
.btabbaritem.active .ucenter{
width: 63rpx;
height: 62rpx;
margin-bottom: -8rpx;
}
.sjd-bullet-box .bullet-content .time {
padding-right: 20rpx
.btabbaritem.active .btabbaritemname {
color: #65B8F4;
}
\ No newline at end of file
project.config.json
View file @ c9d46492
......@@ -40,7 +40,7 @@
"list": []
},
"miniprogram": {
"current": 101,
"current": 103,
"list": [
{
"id": 0,
......@@ -755,6 +755,20 @@
"pathName": "src/pages/circleindex/index",
"query": "id=690",
"scene": null
},
{
"id": 102,
"name": "生成海报",
"pathName": "src/pages/poster/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "商家机构管理首页",
"pathName": "business/pages/organizationalmgt/index",
"query": "sid=1",
"scene": null
}
]
}
......
sitemap.json deleted 100644 → 0
View file @ ad703f68
{
"desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
"rules": [{
"action": "allow",
"page": "*"
}]
}
\ No newline at end of file
src/pages/poster/index.js 0 → 100644
View file @ c9d46492
/*
time: 2018-10-31
author: wxl
*/
var app = getApp();
Page({
data: {
id: 0,
imageRoot: app.globalData.imageRoot,
imageVersion: app.globalData.imageVersion
},
onLoad: function (options) { // Do some initialize when page load.
},
onReady: function () { // Do something when page ready.
},
onShow: function () { // Do something when page show.
},
onHide: function () { // Do something when page hide.
},
onUnload: function () { // Do something when page close.
},
onPullDownRefresh: function () { // Do something when pull down.
},
onReachBottom: function () { // Do something when page reach bottom.
},
onShareAppMessage: function () { // return custom share data when user share.
},
onPageScroll: function (e) { // Do something when page scroll
},
onTabItemTap(item) {},
})
\ No newline at end of file
src/pages/poster/index.json 0 → 100644
View file @ c9d46492
{
"navigationBarTitleText": "生成海报"
}
\ No newline at end of file
src/pages/poster/index.wxml 0 → 100644
View file @ c9d46492
<view class="container">
生成海报
</view>
\ No newline at end of file
src/pages/rankingList/index.wxml
View file @ c9d46492
......@@ -8,7 +8,7 @@
<image class="header-box-crownIcon" src="{{imageRoot}}2c/rankingList/crownIcon.png?{{imageVersion}}" hover-class="none" hover-stop-propagation="false"></image>
<view class="conent-box-info" hover-class="none" hover-stop-propagation="false">
<image hidden="{{!(currentTab == 0)}}" class="conent-box-info-img" src="{{filter.imagify(totalList[0].avatar)}}" hover-class="none" hover-stop-propagation="false"></image>
<image hidden="{{!(currentTab == 1)}}" class="conent-box-info-img" src="{{filter.imagify(yweekList[0].avatar)}}" hover-class="none" hover-stop-propagation="false"></image>
<image hidden="{{!(currentTab == 1)}}" class="conent-box-info-img" src="{{filter.imagify(weekList[0].avatar)}}" hover-class="none" hover-stop-propagation="false"></image>
<image hidden="{{!(currentTab == 2)}}" class="conent-box-info-img" src="{{filter.imagify(dailyList[0].avatar)}}" hover-class="none" hover-stop-propagation="false"></image>
<view class="conent-box-info-txt" hover-class="none" hover-stop-propagation="false">
<view class="conent-box-info-txt-name" hover-class="none" hover-stop-propagation="false">
......
src/pages/schoolindex/index.js
View file @ c9d46492
......@@ -4,6 +4,9 @@ import {
getSchoolClassList,
getSchoolDetail
} from '../../../service/customer/schoolindex.js';
import {
scenQueryGet
} from '../../../utilities/index.js';
import {
getCategory,
} from '../../../service/business/shopeditor.js';
......@@ -34,15 +37,26 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
if (options.sid) {
this.setData({
sid: options.sid
})
}else{
if (options.scene) {
let sceneQuery = scenQueryGet(options.scene);
const {
s,
} = sceneQuery;
this.setData({
emptyPage: true
sid: s
})
} else {
if (options.sid) {
this.setData({
sid: options.sid
})
}else{
this.setData({
emptyPage: true
})
}
}
},
/**
......
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