Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
tianzerencai_xcx
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
石盼盼
tianzerencai_xcx
Commits
1069887f
Commit
1069887f
authored
Oct 27, 2021
by
石盼盼
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'spp' into 'master'
Spp See merge request
!2
parents
112fc9b4
dc2b673f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
27 deletions
+12
-27
translate.js
pages/translate/translate.js
+0
-20
translate.wxml
pages/translate/translate.wxml
+4
-3
translate.wxss
pages/translate/translate.wxss
+8
-4
No files found.
pages/translate/translate.js
View file @
1069887f
...
@@ -9,26 +9,6 @@ Page({
...
@@ -9,26 +9,6 @@ Page({
*/
*/
data
:
{
data
:
{
endLoading
:
false
,
endLoading
:
false
,
// list: [
// {
// bigUrl: '/images/1.png',
// littleUrl: '/images/1.png',
// name: '金地物业秋季线上校园宣讲会',
// time: '10-12 09:00'
// },
// {
// bigUrl: '/images/2.png',
// littleUrl: '/images/2.png',
// name: '泡泡玛特秋季线上校园宣讲会',
// time: '10-13 09:00'
// },
// {
// bigUrl: '/images/3.png',
// littleUrl: '/images/3.png',
// name: '蔚来汽车秋季线上校园宣讲会',
// time: '10-14 09:00'
// },
// ],
list
:
[],
list
:
[],
next_page
:
1
,
// 下一页
next_page
:
1
,
// 下一页
has_more
:
true
,
// 是否还有更多
has_more
:
true
,
// 是否还有更多
...
...
pages/translate/translate.wxml
View file @
1069887f
...
@@ -4,18 +4,18 @@
...
@@ -4,18 +4,18 @@
catchtap="goLive">
catchtap="goLive">
<view class="fm">
<view class="fm">
<view class="time">{{item.starttime}}</view>
<view class="time">{{item.starttime}}</view>
<image class="fm-img" src="{{item.feedImg}}"></image>
<image class="fm-img" src="{{item.feedImg}}"
mode="aspectFill"
></image>
</view>
</view>
<view class="company flex-h flex-vc flex-hb">
<view class="company flex-h flex-vc flex-hb">
<view class="flex-h flex-vc">
<view class="flex-h flex-vc">
<view class="img">
<view class="img">
<image src="{{item.one.logo}}"></image>
<image src="{{item.one.logo}}"
mode="aspectFill"
></image>
</view>
</view>
<view class="company_name text-line-one">{{item.title}}</view>
<view class="company_name text-line-one">{{item.title}}</view>
</view>
</view>
<view wx:if="{{item.live.islive==101 ||item.live.islive==105}}" class="ing-btn flex-h flex-vc flex-hc">
<view wx:if="{{item.live.islive==101 ||item.live.islive==105}}" class="ing-btn flex-h flex-vc flex-hc">
<text>直播中</text>
<text>直播中</text>
<image src="/images/living.gif"></image>
<image src="/images/living.gif"
mode="aspectFill"
></image>
</view>
</view>
<view wx:if="{{item.live.islive==102}}" class="yy-btn" catchtap="impower"
<view wx:if="{{item.live.islive==102}}" class="yy-btn" catchtap="impower"
data-roomId="{{item.live.room_id}}">预约直播</view>
data-roomId="{{item.live.room_id}}">预约直播</view>
...
@@ -25,6 +25,7 @@
...
@@ -25,6 +25,7 @@
已结束</view>
已结束</view>
</view>
</view>
</view>
</view>
<view class="blank"></view>
</view>
</view>
<view wx:else class="noneBox column">
<view wx:else class="noneBox column">
<image src="/images/none.png"></image>
<image src="/images/none.png"></image>
...
...
pages/translate/translate.wxss
View file @
1069887f
...
@@ -45,14 +45,14 @@ page {
...
@@ -45,14 +45,14 @@ page {
}
}
.item .company .img {
.item .company .img {
width:
37
rpx;
width:
60
rpx;
height:
37
rpx;
height:
60
rpx;
margin-right: 22rpx;
margin-right: 22rpx;
}
}
.item .company .img image {
.item .company .img image {
width:
37
rpx;
width:
60
rpx;
height:
37
rpx;
height:
60
rpx;
}
}
.item .company .company_name {
.item .company .company_name {
...
@@ -120,4 +120,8 @@ page {
...
@@ -120,4 +120,8 @@ page {
.ing-btn image{
.ing-btn image{
width: 28rpx;
width: 28rpx;
height: 28rpx;
height: 28rpx;
}
.blank{
width: 100%;
height: 100rpx;
}
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment