Skip to content

T
thinkApp
Commit c74dee3d authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/youjie/thinkapp

parents f528002d 563252ec
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 372 additions and 11 deletions
src/components/index/workSituation/courseCard.vue 0 → 100644
View file @ c74dee3d
This diff is collapsed.
src/pages/index/workSituation.vue
View file @ c74dee3d
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<view style="font-size: 50rpx;">李老师</view> <view style="font-size: 50rpx;">李老师</view>
</view> </view>
</view> </view>
<course-card></course-card> <courseCard></courseCard>
<view class="index-student-information"> <view class="index-student-information">
<view class="workSituation-title-box flex"> <view class="workSituation-title-box flex">
<view class="workSituation-title flex" <view class="workSituation-title flex"
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</template> </template>
<script> <script>
import courseCard from '../../components/index/course-card' import courseCard from '@/components/index/workSituation/courseCard'
import operation from '@/components/index/workSituation/operation' import operation from '@/components/index/workSituation/operation'
import studentList from '@/components/index/workSituation/studentList' import studentList from '@/components/index/workSituation/studentList'
import examList from '@/components/index/workSituation/examList' import examList from '@/components/index/workSituation/examList'
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
border-radius: 30rpx; border-radius: 30rpx;
} }
.index-student-information{ .index-student-information{
min-height: 500rpx; min-height: 800rpx;
background: rgba(255,255,255,.7); background: rgba(255,255,255,.7);
border-radius: 50rpx 50rpx 0 0; border-radius: 50rpx 50rpx 0 0;
padding: 50rpx 0 30rpx 0; padding: 50rpx 0 30rpx 0;
......
src/utils/wxcomponents/vant/search/index.vue
View file @ c74dee3d
...@@ -126,8 +126,8 @@ export default global['__wxComponents']['vant/search/index'] ...@@ -126,8 +126,8 @@ export default global['__wxComponents']['vant/search/index']
padding-left: var(--padding-sm,24rpx); padding-left: var(--padding-sm,24rpx);
border-radius: 4rpx; border-radius: 4rpx;
border-radius: var(--border-radius-sm,4rpx); border-radius: var(--border-radius-sm,4rpx);
background-color: #f7f8fa; background-color: #FFFFFF;
background-color: var(--search-background-color,#f7f8fa); background-color: var(--search-background-color,#FFFFFF);
} }
.van-search__content--round { .van-search__content--round {
......
src/utils/wxcomponents/vant/search/index.wxss
View file @ c74dee3d
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
padding-left: var(--padding-sm,24rpx); padding-left: var(--padding-sm,24rpx);
border-radius: 4rpx; border-radius: 4rpx;
border-radius: var(--border-radius-sm,4rpx); border-radius: var(--border-radius-sm,4rpx);
background-color: #f7f8fa; background-color: #FFFFFF;
background-color: var(--search-background-color,#f7f8fa); background-color: var(--search-background-color,#FFFFFF);
} }
.van-search__content--round { .van-search__content--round {
......
src/wxcomponents/vant/search/index.vue
View file @ c74dee3d
...@@ -126,8 +126,8 @@ export default global['__wxComponents']['vant/search/index'] ...@@ -126,8 +126,8 @@ export default global['__wxComponents']['vant/search/index']
padding-left: var(--padding-sm,24rpx); padding-left: var(--padding-sm,24rpx);
border-radius: 4rpx; border-radius: 4rpx;
border-radius: var(--border-radius-sm,4rpx); border-radius: var(--border-radius-sm,4rpx);
background-color: #f7f8fa; background-color: #FFFFFF;
background-color: var(--search-background-color,#f7f8fa); background-color: var(--search-background-color,#FFFFFF);
} }
.van-search__content--round { .van-search__content--round {
......
src/wxcomponents/vant/search/index.wxss
View file @ c74dee3d
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
padding-left: var(--padding-sm,24rpx); padding-left: var(--padding-sm,24rpx);
border-radius: 4rpx; border-radius: 4rpx;
border-radius: var(--border-radius-sm,4rpx); border-radius: var(--border-radius-sm,4rpx);
background-color: #f7f8fa; background-color: #FFFFFF;
background-color: var(--search-background-color,#f7f8fa); background-color: var(--search-background-color,#FFFFFF);
} }
.van-search__content--round { .van-search__content--round {
......
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