miniprogram / ScienceCaptain · 提交

转到一个项目

作者 刘晓艳
提交 ffe25d5f8a34b131bf08a9c450b669a52e6fbdae 2 个父辈 d5eba654 6faf9900

合并分支 'wumengyu' 到 'master' 

优化购卡页的说明，去掉首页的默认图片



查看合并请求 !12
内嵌 并排对比
正在显示 4 个修改的文件 包含 32 行增加 和 18 行删除
@@ -7,11 +7,7 @@ var QQMapWX = require('../../utils/qqmap-wx-jssdk.min.js'); @@ -7,11 +7,7 @@ var QQMapWX = require('../../utils/qqmap-wx-jssdk.min.js');
7 Page({ 7 Page({
8 data: { 8 data: {
9 is_bingding: false, 9 is_bingding: false,
10 - imgUrls: [  
11 - {'url': '../../images/banner.jpg'},  
12 - {'url': '../../images/banner.jpg'},  
13 - {'url': '../../images/banner.jpg'},],  
14 - imgs: [{'image': '../../images/banner.jpg'},{'image': '../../images/banner.jpg'},{'image': '../../images/banner.jpg'},], 10 + imgUrls: [],
15 cur: 0, 11 cur: 0,
16 currentSwiper: 0, 12 currentSwiper: 0,
17 autoplay: true, //是否自动轮播 13 autoplay: true, //是否自动轮播
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <view class="wrap"> 7 <view class="wrap">
8 <swiper autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" circular="true" 8 <swiper autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" circular="true"
9 bindchange="swiperChange" current="{{cur}}"> 9 bindchange="swiperChange" current="{{cur}}">
10 - <block wx:for="{{imgs}}" wx:key="index"> 10 + <block wx:for="{{imgUrls}}" wx:key="index">
11 <swiper-item> 11 <swiper-item>
12 <navigator url="{{item.url}}" hover-class="navigator-hover"> 12 <navigator url="{{item.url}}" hover-class="navigator-hover">
13 <view class="index_top"> 13 <view class="index_top">
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 </block> 18 </block>
19 </swiper> 19 </swiper>
20 <view class="dots"> 20 <view class="dots">
21 - <block wx:for="{{ imgs}}" wx:key="index" wx:for-index="idx"> 21 + <block wx:for="{{imgUrls}}" wx:key="index" wx:for-index="idx">
22 <view class="dot{{idx == currentSwiper ? ' active' : ''}}"></view> 22 <view class="dot{{idx == currentSwiper ? ' active' : ''}}"></view>
23 </block> 23 </block>
24 </view> 24 </view>
@@ -53,8 +53,8 @@ @@ -53,8 +53,8 @@
53 <view class="test_box"> 53 <view class="test_box">
54 <view class="time">{{this_week_test_info.start_time}} - {{this_week_test_info.end_time}}</view> 54 <view class="time">{{this_week_test_info.start_time}} - {{this_week_test_info.end_time}}</view>
55 <view class="img_box"> 55 <view class="img_box">
56 - <!--<image src="{{this_week_test_info.thumb}}" mode="aspectFill"></image>-->  
57 - <image src="../../images/test_img.jpg" mode="aspectFill"></image> 56 + <image src="{{this_week_test_info.thumb}}" mode="aspectFill"></image>
  57 + <!--<image src="../../images/test_img.jpg" mode="aspectFill"></image>-->
58 </view> 58 </view>
59 </view> 59 </view>
60 <view class="order_box"> 60 <view class="order_box">
@@ -74,8 +74,8 @@ @@ -74,8 +74,8 @@
74 <view class="test_box"> 74 <view class="test_box">
75 <view class="time">{{item.start_time}} - {{item.end_time}}</view> 75 <view class="time">{{item.start_time}} - {{item.end_time}}</view>
76 <view class="img_box"> 76 <view class="img_box">
77 - <!--<image src="{{item.thumb}}" mode="aspectFill"></image>-->  
78 - <image src="../../images/test_img.jpg" mode="aspectFill"></image> 77 + <image src="{{item.thumb}}" mode="aspectFill"></image>
  78 + <!--<image src="../../images/test_img.jpg" mode="aspectFill"></image>-->
79 </view> 79 </view>
80 </view> 80 </view>
81 <view class="order_box"> 81 <view class="order_box">
@@ -2,8 +2,13 @@ @@ -2,8 +2,13 @@
2 <view class='long_img'> 2 <view class='long_img'>
3 <view class="title">{{card_info.title}}</view> 3 <view class="title">{{card_info.title}}</view>
4 <!--<view class="bg"></view>--> 4 <!--<view class="bg"></view>-->
  5 + <view class="description">{{card_info.description}}</view>
  6 + <!--<view class="image">-->
  7 + <!--<image src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1545829829714&di=e8f57b8a14901a56db550865c0ff8db1&imgtype=0&src=http%3A%2F%2Fimg.zcool.cn%2Fcommunity%2F01947559070b53a8012145506106f4.png%402o.png"-->
  8 + <!--mode="aspectFill"></image>-->
  9 + <!--</view>-->
5 <view class="image"> 10 <view class="image">
6 - <image src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1544071979008&di=b42f6a2bbd46902841d0c060ac144d15&imgtype=jpg&src=http%3A%2F%2Fimg1.imgtn.bdimg.com%2Fit%2Fu%3D3708452181%2C3226163538%26fm%3D214%26gp%3D0.jpg" 11 + <image src="{{card_info.thumb}}"
7 mode="aspectFill"></image> 12 mode="aspectFill"></image>
8 </view> 13 </view>
9 </view> 14 </view>
@@ -3,16 +3,21 @@ @@ -3,16 +3,21 @@
3 @import '../charge/charge.wxss'; 3 @import '../charge/charge.wxss';
4 .long_img{ 4 .long_img{
5 width: 100%; 5 width: 100%;
6 - min-height: 1500rpx; 6 + /*min-height: 1500rpx;*/
7 display: flex; 7 display: flex;
8 flex-direction: column; 8 flex-direction: column;
9 align-items: center; 9 align-items: center;
  10 + margin-bottom: 236rpx;
10 } 11 }
11 .long_img .title { 12 .long_img .title {
12 color: #666666; 13 color: #666666;
13 font-size: 30rpx; 14 font-size: 30rpx;
14 margin: 32rpx; 15 margin: 32rpx;
15 } 16 }
  17 +.description {
  18 + font-size: 28rpx;
  19 + color: #666666;
  20 +}
16 .bg { 21 .bg {
17 width: 90%; 22 width: 90%;
18 flex: 1; 23 flex: 1;
@@ -21,16 +26,24 @@ @@ -21,16 +26,24 @@
21 background-size: cover; 26 background-size: cover;
22 } 27 }
23 .long_img .image { 28 .long_img .image {
  29 + padding: 10rpx 30rpx;
  30 + -webkit-box-sizing: border-box;
  31 + -moz-box-sizing: border-box;
  32 + box-sizing: border-box;
24 width: 100%; 33 width: 100%;
  34 + height: 1500rpx;
25 min-height: 1500rpx; 35 min-height: 1500rpx;
26 - overflow-y: scroll;  
27 - display: -webkit-box;  
28 - -webkit-overflow-scrolling: touch; 36 + /*width: 100%;*/
  37 + /*min-height: 1500rpx;*/
  38 + /*overflow-y: scroll;*/
  39 + /*display: -webkit-box;*/
  40 + /*-webkit-overflow-scrolling: touch;*/
29 } 41 }
30 .long_img image { 42 .long_img image {
31 width: 100%; 43 width: 100%;
32 - min-height: 1500rpx;  
33 - flex:1; 44 + height: 100%;
  45 + /*min-height: 1500rpx;*/
  46 + /*flex:1;*/
34 } 47 }
35 .list_input { 48 .list_input {
36 height: 50rpx; 49 height: 50rpx;