Commit d5d765cc6e5db91b1f11849c3b84675de9d984bb

Authored by vking
1 parent e81e96e9

taocan ui fix

@@ -22,6 +22,7 @@ Page({ @@ -22,6 +22,7 @@ Page({
22 App.Foodset.GetFoodsetList({sid:options.sid}).then(res=>{ 22 App.Foodset.GetFoodsetList({sid:options.sid}).then(res=>{
23 let packs={} 23 let packs={}
24 res.data.some(r=>{ 24 res.data.some(r=>{
  25 + r.nameSub=r.name.length>6?(r.name.substr(0,6)+'…'):r.name;
25 r['包间可用']=r.service.indexOf('包间可用')>-1; 26 r['包间可用']=r.service.indexOf('包间可用')>-1;
26 r['免预约']=r.service.indexOf('免预约')>-1; 27 r['免预约']=r.service.indexOf('免预约')>-1;
27 r['随时退']=r.service.indexOf('随时退')>-1; 28 r['随时退']=r.service.indexOf('随时退')>-1;
1 <!--pages/taocan/index.wxml--> 1 <!--pages/taocan/index.wxml-->
2 <wxs src="../../utils/util.wxs" module="util" /> 2 <wxs src="../../utils/util.wxs" module="util" />
3 <nav hasHome>套餐详情</nav> 3 <nav hasHome>套餐详情</nav>
  4 +<!--
4 <swiper 5 <swiper
5 display-multiple-items="3" 6 display-multiple-items="3"
6 class="view margin-left-lg header text-black" 7 class="view margin-left-lg header text-black"
@@ -17,7 +18,21 @@ @@ -17,7 +18,21 @@
17 </swiper-item> 18 </swiper-item>
18 </block> 19 </block>
19 </swiper> 20 </swiper>
20 -<view class="view" style="padding-bottom: 150rpx;padding-top: 70rpx;"> 21 +-->
  22 +<scroll-view class="view margin-left-lg header text-black"
  23 + scroll-x="true" bindscroll="scroll"
  24 + style="width: 100%;white-space: nowrap;height:80rpx;padding-top: 16rpx;">
  25 + <block wx:for="{{packs}}" wx:key="*this">
  26 + <view
  27 + bindtap="touchTab" data-id="{{item.id}}" data-index="{{index}}"
  28 + class="view swiper-item {{activityId==item.id?'active':''}} flex align-center">
  29 + <view class="txt-32-h swiper-item-txt">
  30 + {{item.nameSub}}
  31 + </view>
  32 + </view>
  33 + </block>
  34 +</scroll-view>
  35 +<view class="view" style="padding-bottom: 150rpx;padding-top: 80rpx;">
21 <view class="view box margin-lr margin-top-lg margin-bottom-sm padding"> 36 <view class="view box margin-lr margin-top-lg margin-bottom-sm padding">
22 <view class="view txt-40-h text-bold">{{packs[activityId].name}}</view> 37 <view class="view txt-40-h text-bold">{{packs[activityId].name}}</view>
23 <view class="view flex align-end"> 38 <view class="view flex align-end">
1 /* pages/taocan/index.wxss */ 1 /* pages/taocan/index.wxss */
2 @import "../../colorui/main.wxss"; 2 @import "../../colorui/main.wxss";
  3 +.swiper-item{
  4 + display: inline-block;
  5 + margin-right: 80rpx;
  6 + min-width: 60rpx;
  7 +}
  8 +.swiper-item:last-child{
  9 + padding-right: 40rpx;
  10 +}
3 .swiper-item-txt{ 11 .swiper-item-txt{
4 position: relative; 12 position: relative;
5 } 13 }
1 <!--pages/taocan/detail.wxml--> 1 <!--pages/taocan/detail.wxml-->
2 <wxs src="../../utils/util.wxs" module="util" /> 2 <wxs src="../../utils/util.wxs" module="util" />
3 <view class="view bg-blue-img"></view> 3 <view class="view bg-blue-img"></view>
4 -<nav backgroundColor="rgba(0,0,0,0)" color="#ffffff"></nav> 4 +<nav hasHome backgroundColor="rgba(0,0,0,0)" color="#ffffff"></nav>
5 <view class="view padding-lr padding-bottom-lg" style="position: relative"> 5 <view class="view padding-lr padding-bottom-lg" style="position: relative">
6 <view class="text-white txt-40-h text-bold margin-top-sm">{{order_tips.status}}</view> 6 <view class="text-white txt-40-h text-bold margin-top-sm">{{order_tips.status}}</view>
7 <view class="text-white txt-28-h margin-bottom-lg" style="margin-top: 6rpx;">{{order_tips.info}}</view> 7 <view class="text-white txt-28-h margin-bottom-lg" style="margin-top: 6rpx;">{{order_tips.info}}</view>
1 <!--pages/taocan/orderHis.wxml--> 1 <!--pages/taocan/orderHis.wxml-->
2 <wxs src="../../utils/util.wxs" module="util" /> 2 <wxs src="../../utils/util.wxs" module="util" />
3 -<nav>套餐详情</nav> 3 +<nav hasHome>套餐详情</nav>
4 <view class="text-orange txt-28-h padding-lr-lg tips">发生交易纠纷时,此页面可作为判断依据。</view> 4 <view class="text-orange txt-28-h padding-lr-lg tips">发生交易纠纷时,此页面可作为判断依据。</view>
5 <view class="view" style="padding-bottom: 150rpx;"> 5 <view class="view" style="padding-bottom: 150rpx;">
6 <view class="view box margin-lr margin-top-lg margin-bottom-sm padding"> 6 <view class="view box margin-lr margin-top-lg margin-bottom-sm padding">