Merge branch 'master' of http://120.77.182.185/yanl/mini-shimao

pages/mine/order/order.js

@@ -177,11 +177,34 @@ Page({
                     'name': '全部分类'
                     'name': '全部分类'
                 }]
                 }]
                 for (let i = 0, l = funcResponse.length; i < l; i++) {
                 for (let i = 0, l = funcResponse.length; i < l; i++) {
-                    let funcItem = {
+                    let funcItem ={
                         'value': funcResponse[i].value,
                         'value': funcResponse[i].value,
-                        'name': funcResponse[i].label,
                     }
                     }
-                    funcList.push(funcItem)
+                    if(funcResponse[i].value==3  ){
+                        //门票
+                        funcItem.name  = "门票"
+                        funcList.push(funcItem)
+                    } else if( funcResponse[i].value==5 ){
+                        // 餐饮
+                        funcItem.name  = "餐饮"
+                        funcList.push(funcItem)
+                    }else if( funcResponse[i].value==-2 ){
+                        // 影票
+                        funcItem.name  = "影票"
+                        funcList.push(funcItem)
+                    }else if( funcResponse[i].value==2 ){
+                        // SPA
+                        funcItem.name  = "SPA"
+                        funcList.push(funcItem)
+                    }else if( funcResponse[i].value==4 ){
+                        // 文创
+                        funcItem.name  = "文创"
+                        funcList.push(funcItem)
+                    }
+
+                   
+
+                   
                 }
                 }
                 let typeTitle = '全部分类' //
                 let typeTitle = '全部分类' //
                 let orderTypeActive = 0 //
                 let orderTypeActive = 0 //

pages/mine/order/order.wxml

@@ -29,7 +29,7 @@
 				</view>
 				</view>
 			</block>
 			</block>
 		</view>
 		</view>
-		<view class="order-type-row row con-b align-c">
+		<!-- <view class="order-type-row row con-b align-c">
 			<block wx:for="{{orderType}}" wx:for-index="index" wx:for-item="item" wx:key="index">
 			<block wx:for="{{orderType}}" wx:for-index="index" wx:for-item="item" wx:key="index">
 				<view wx:if="{{6 <= index && index < 9}}"
 				<view wx:if="{{6 <= index && index < 9}}"
 					class="order-type-item row con-c align-c {{orderTypeActive === index ? 'order-type-item-active' : ''}}"
 					class="order-type-item row con-c align-c {{orderTypeActive === index ? 'order-type-item-active' : ''}}"
@@ -37,7 +37,7 @@
 					<text>{{item.name}}</text>
 					<text>{{item.name}}</text>
 				</view>
 				</view>
 			</block>
 			</block>
-		</view>
+		</view> -->
 	</view>
 	</view>
 </view>
 </view>