优化首页探店途中列表

@@ -31,7 +31,7 @@ Page({
         slide: [],
         slide: [],
         cate: [],
         cate: [],
         meal_banner: [],
         meal_banner: [],
-        currentBannerIndex: 1,
+        currentBannerIndex: 0,
         tabcurrent: {tab: 0, bubble: ''},
         tabcurrent: {tab: 0, bubble: ''},
         noticeList: [],
         noticeList: [],
         is_showAnswer: false,
         is_showAnswer: false,
@@ -447,6 +447,7 @@ Page({
                     items: res.data.active,
                     items: res.data.active,
                     is_canSend: res.data.is_canSend,
                     is_canSend: res.data.is_canSend,
                 });
                 });
+                console.log('meal',res.data.meal);
                 wx.setStorageSync('is_canSend', res.data.is_canSend);//1:可以发布2：不可以发布
                 wx.setStorageSync('is_canSend', res.data.is_canSend);//1:可以发布2：不可以发布
                 wx.setStorageSync('is_answer', res.data.is_answer);//1:已答题2：未答题
                 wx.setStorageSync('is_answer', res.data.is_answer);//1:已答题2：未答题
                 // is_answer
                 // is_answer

@@ -50,7 +50,7 @@ Page({
      */
      */
     onLoad: function (options) {
     onLoad: function (options) {
         console.log('options', options);
         console.log('options', options);
-        this.setData({id:+options.id?+options.id:'',user_pic:app.globalData.userInfo.avatarUrl})
+        this.setData({id:+options.id?+options.id:'',user_pic:app.globalData.userInfo.avatarUrl,user_name:app.globalData.userInfo.nickName})
     },
     },
 
 
     /**
     /**

@@ -6,7 +6,7 @@
                 <view class="head">
                 <view class="head">
                     <!--<image src="../../../../images/avatar@2x.png"></image>-->
                     <!--<image src="../../../../images/avatar@2x.png"></image>-->
                     <image src="{{user_pic}}"></image>
                     <image src="{{user_pic}}"></image>
-                    <text class="name">{{detail.userName}}</text>
+                    <text class="name">{{user_name}}</text>
                     <!--<text class="phone">手机号: 13026256485</text>-->
                     <!--<text class="phone">手机号: 13026256485</text>-->
                     <text class="num">{{detail.number}}人</text>
                     <text class="num">{{detail.number}}人</text>
                 </view>
                 </view>

@@ -5,9 +5,11 @@
         <view class="no-data" wx:if="{{list.length===0}}">钱包是空的~</view>
         <view class="no-data" wx:if="{{list.length===0}}">钱包是空的~</view>
         <view class="list-item {{item.type === 1?'change-bg':''}} {{item.status === 6?'change-bg-end':''}} {{item.status === 10?'change-bg-cancel':''}}"
         <view class="list-item {{item.type === 1?'change-bg':''}} {{item.status === 6?'change-bg-end':''}} {{item.status === 10?'change-bg-cancel':''}}"
               wx:for="{{list}}" wx:key="index" data-id="{{item.id}}" bindtap="goDetail">
               wx:for="{{list}}" wx:key="index" data-id="{{item.id}}" bindtap="goDetail">
+            <!--已完成icon-->
             <image src="../../../images/end-flag@2x.png" wx:if="{{item.status === 6}}" class="flag-img"></image>
             <image src="../../../images/end-flag@2x.png" wx:if="{{item.status === 6}}" class="flag-img"></image>
+            <!--已取消icon-->
             <image src="../../../images/quxiao@2x.png" wx:if="{{item.status === 10}}" class="flag-img"></image>
             <image src="../../../images/quxiao@2x.png" wx:if="{{item.status === 10}}" class="flag-img"></image>
-            <view class="detail {{item.status === 6?'change-color':''}}">
+            <view class="detail {{item.status === 6 || item.status === 10?'change-color':''}}">
                 <view class="area">
                 <view class="area">
                     <text class="addr">{{item.title}}</text>
                     <text class="addr">{{item.title}}</text>
                     <text>{{nickName}}</text>
                     <text>{{nickName}}</text>