Merge branch 'master' of http://118.190.145.217:3000/xiaojincai/wanzb_xcx

pages/detail/detail.wxml

@@ -25,12 +25,12 @@
         <block  wx:if='{{!datas.is_markt && datas.today_stock.length>0}}'>
             <view wx:for='{{datas.today_stock}}' wx:for-item='stock' >
             {{stock.name}}  <text wx:if='{{stock.fund>0}}'>{{stock.fund}}万</text></view>
-             <view style="width:100%;background:none;" wx:if='{{datas.today_stock_img.length>0}}'>
-             <text wx:if='{{datas.yesterday_stock_img.length>0}}'>点击查看完整交割单</text>
-              <image style="width:100rpx;height:100rpx;margin-right:10rpx;" mode="scaleToFill" wx:for='{{datas.today_stock_img}}' wx:for-item='img' 
-            src='{{img}}' data-src="{{img}}"  bindtap="prview"></image>
-             </view>
         </block>
+        <view style="width:100%;background:none;" wx:if='{{datas.today_stock_img.length>0}}'>
+          <text wx:if='{{datas.today_stock_img.length>0}}'>点击查看完整交割单</text>
+          <image style="width:100rpx;height:100rpx;margin-right:10rpx;" mode="scaleToFill" wx:for='{{datas.today_stock_img}}' wx:for-item='img' 
+        src='{{img}}' data-src="{{img}}"  bindtap="prview"></image>
+        </view>
         <view wx:if='{{!datas.is_markt && datas.today_stock.length<=0 && datas.auto_complete<=0}}'>空仓</view>
         <view wx:if='{{!datas.is_markt && datas.today_stock.length<=0 && datas.auto_complete>0}}'>请假</view>
 
@@ -42,12 +42,12 @@
           <block wx:if='{{!datas.yesterday_is_markt && datas.yesterday_stock.length>0}}'>
               <view wx:for='{{datas.yesterday_stock}}' wx:for-item='stock' >
               {{stock.name}}  <text wx:if='{{stock.fund>0}}'>{{stock.fund}}万</text></view>
-              <view style="width:100%;background:none;" wx:if='{{datas.yesterday_stock_img.length>0}}'>
-              <text wx:if='{{datas.yesterday_stock_img.length>0}}'>点击查看完整交割单</text>
-                <image style="width:100rpx;height:100rpx;margin-right:10rpx;"  mode="scaleToFill" wx:for='{{datas.yesterday_stock_img}}' wx:for-item='img' 
-              src='{{img}}' data-src="{{img}}" bindtap="prview"></image>
-              </view>
-          </block>  
+          </block>
+          <view style="width:100%;background:none;" wx:if='{{datas.yesterday_stock_img.length>0}}'>
+            <text wx:if='{{datas.yesterday_stock_img.length>0}}'>点击查看完整交割单</text>
+            <image style="width:100rpx;height:100rpx;margin-right:10rpx;"  mode="scaleToFill" wx:for='{{datas.yesterday_stock_img}}' wx:for-item='img' 
+          src='{{img}}' data-src="{{img}}" bindtap="prview"></image>
+          </view>  
           <view wx:if='{{!datas.yesterday_is_markt && datas.yesterday_stock.length<=0 && datas.yesterday_auto_complete<=0}}'>空仓</view>
           <view wx:if='{{!datas.yesterday_is_markt && datas.yesterday_stock.length<=0 && datas.yesterday_auto_complete>0}}'>请假</view>
 

pages/detail/detail.wxss

@@ -79,7 +79,7 @@ page{
   background: #F4F6F8;
   border-radius: 8rpx;
   margin-bottom: 16rpx;
-  margin-right: 16rpx;
+  margin-right: 16rpx 0rpx;
 }
 .list text{
   display: block;

project.config.json

@@ -38,7 +38,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.15.0",
-	"appid": "wx2938132b773c7b5a",
+	"appid": "wxb299e10e65157301",
 	"projectname": "wanzhubei",
 	"simulatorType": "wechat",
 	"simulatorPluginLibVersion": {},