合并分支 'wumengyu' 到 'master'

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



查看合并请求 !12

@@ -7,11 +7,7 @@ var QQMapWX = require('../../utils/qqmap-wx-jssdk.min.js');
 Page({
     data: {
         is_bingding: false,
-        imgUrls: [
-            {'url': '../../images/banner.jpg'},
-            {'url': '../../images/banner.jpg'},
-            {'url': '../../images/banner.jpg'},],
-        imgs: [{'image': '../../images/banner.jpg'},{'image': '../../images/banner.jpg'},{'image': '../../images/banner.jpg'},],
+        imgUrls: [],
         cur: 0,
         currentSwiper: 0,
         autoplay: true, //是否自动轮播

@@ -7,7 +7,7 @@
     <view class="wrap">
         <swiper autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" circular="true"
                 bindchange="swiperChange" current="{{cur}}">
-            <block wx:for="{{imgs}}" wx:key="index">
+            <block wx:for="{{imgUrls}}" wx:key="index">
                 <swiper-item>
                     <navigator url="{{item.url}}" hover-class="navigator-hover">
                         <view class="index_top">
@@ -18,7 +18,7 @@
             </block>
         </swiper>
         <view class="dots">
-            <block wx:for="{{ imgs}}" wx:key="index" wx:for-index="idx">
+            <block wx:for="{{imgUrls}}" wx:key="index" wx:for-index="idx">
                 <view class="dot{{idx == currentSwiper ? ' active' : ''}}"></view>
             </block>
         </view>
@@ -53,8 +53,8 @@
                 <view class="test_box">
                     <view class="time">{{this_week_test_info.start_time}} - {{this_week_test_info.end_time}}</view>
                     <view class="img_box">
-                        <!--<image src="{{this_week_test_info.thumb}}"  mode="aspectFill"></image>-->
-                        <image src="../../images/test_img.jpg"  mode="aspectFill"></image>
+                        <image src="{{this_week_test_info.thumb}}"  mode="aspectFill"></image>
+                        <!--<image src="../../images/test_img.jpg"  mode="aspectFill"></image>-->
                     </view>
                 </view>
                 <view class="order_box">
@@ -74,8 +74,8 @@
                 <view class="test_box">
                     <view class="time">{{item.start_time}} - {{item.end_time}}</view>
                     <view class="img_box">
-                        <!--<image src="{{item.thumb}}"  mode="aspectFill"></image>-->
-                        <image src="../../images/test_img.jpg"  mode="aspectFill"></image>
+                        <image src="{{item.thumb}}"  mode="aspectFill"></image>
+                        <!--<image src="../../images/test_img.jpg"  mode="aspectFill"></image>-->
                     </view>
                 </view>
                 <view class="order_box">

@@ -2,8 +2,13 @@
 <view class='long_img'>
     <view class="title">{{card_info.title}}</view>
     <!--<view class="bg"></view>-->
+    <view class="description">{{card_info.description}}</view>
+    <!--<view class="image">-->
+        <!--<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"-->
+               <!--mode="aspectFill"></image>-->
+    <!--</view>-->
     <view class="image">
-        <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"
+        <image src="{{card_info.thumb}}"
                mode="aspectFill"></image>
     </view>
 </view>

@@ -3,16 +3,21 @@
 @import '../charge/charge.wxss';
 .long_img{
   width: 100%;
-  min-height: 1500rpx;
+  /*min-height: 1500rpx;*/
   display: flex;
   flex-direction: column;
   align-items: center;
+  margin-bottom: 236rpx;
 }
 .long_img .title {
   color: #666666;
   font-size: 30rpx;
   margin: 32rpx;
 }
+.description {
+  font-size: 28rpx;
+  color: #666666;
+}
 .bg {
   width: 90%;
   flex: 1;
@@ -21,16 +26,24 @@
   background-size: cover;
 }
 .long_img .image {
+  padding: 10rpx 30rpx;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
   width: 100%;
+  height: 1500rpx;
   min-height: 1500rpx;
-  overflow-y: scroll;
-  display: -webkit-box;
-  -webkit-overflow-scrolling: touch;
+  /*width: 100%;*/
+  /*min-height: 1500rpx;*/
+  /*overflow-y: scroll;*/
+  /*display: -webkit-box;*/
+  /*-webkit-overflow-scrolling: touch;*/
 }
 .long_img image {
   width: 100%;
-  min-height: 1500rpx;
-  flex:1;
+  height: 100%;
+  /*min-height: 1500rpx;*/
+  /*flex:1;*/
 }
 .list_input {
   height: 50rpx;