mobile / tt-yoho-app · Commits

Go to a project

Authored by 肖亚东
Commit 5a000a3e35c099d9b17728c90f7c1c1ec09e7c79 1 parent cfd85573

快捷导航添加

Inline Side-by-side
Showing 13 changed files with 22 additions and 13 deletions
1 { 1 {
2 "usingComponents": { 2 "usingComponents": {
3 - "productListCell": "../../components/productList/productCell" 3 + "productListCell": "../../components/productList/productCell",
  4 + "quickNavigation": "/pages/quickNavigation/quickNavigation"
4 } 5 }
5 } 6 }
1 { 1 {
2 "usingComponents": { 2 "usingComponents": {
  3 + "quickNavigation": "/pages/quickNavigation/quickNavigation",
  4 + "snapshootShare": "/pages/snapshootShare/snapshootShare",
3 "productCell": "../../components/productList/productCell" 5 "productCell": "../../components/productList/productCell"
4 } 6 }
5 } 7 }
1 1
2 <import src="categoryProductListFilter.ttml"/> 2 <import src="categoryProductListFilter.ttml"/>
3 -<!-- <import src="../../vendors/zanui/actionsheet/index.wxml"/> --> 3 +<import src="../../vendors/zanui/actionsheet/index.ttml"/>
4 <form bindsubmit="formSubmit" report-submit='true'> 4 <form bindsubmit="formSubmit" report-submit='true'>
5 5
6 <scroll-view class="scroll-view" scroll-y style="height: {{screenHeight - 50}}px" bindscrolltolower="loadMore" bindscroll="scroll" scroll-top="{{scrollTop}}" enable-back-to-top="true"> 6 <scroll-view class="scroll-view" scroll-y style="height: {{screenHeight - 50}}px" bindscrolltolower="loadMore" bindscroll="scroll" scroll-top="{{scrollTop}}" enable-back-to-top="true">
@@ -19,11 +19,11 @@ @@ -19,11 +19,11 @@
19 </view> 19 </view>
20 20
21 <!--优惠券 --> 21 <!--优惠券 -->
22 - <!-- <view class='coupon-container' tt:if="{{couponList.length > 0}}"> 22 + <view class='coupon-container' tt:if="{{couponList.length > 0}}">
23 <scroll-view class='coupon-scroll' scroll-x> 23 <scroll-view class='coupon-scroll' scroll-x>
24 <block tt:for="{{couponList}}" tt:key="coupon"> 24 <block tt:for="{{couponList}}" tt:key="coupon">
25 <view class='coupon-content' style="margin-left: {{index == 0 ? 15*scale : 0}}px; margin-right: {{index == couponList.length-1 ? 15*scale : 20*scale}}px" data-item="{{item}}" data-index="{{index}}" bindtap='getShopCoupon'> 25 <view class='coupon-content' style="margin-left: {{index == 0 ? 15*scale : 0}}px; margin-right: {{index == couponList.length-1 ? 15*scale : 20*scale}}px" data-item="{{item}}" data-index="{{index}}" bindtap='getShopCoupon'>
26 - <image class='coupon-bg-icon' src="{{item.status == 1 ? './images/coupon_bg_normal@2x.png' : './images/coupon_bg_disable@2x.png'}}"> 26 + <image class='coupon-bg-icon' src="{{item.status == 1 ? '../../images/coupon_bg_normal@2x.png' : '../../images/coupon_bg_disable@2x.png'}}">
27 </image> 27 </image>
28 <view class='coupon-info-content'> 28 <view class='coupon-info-content'>
29 <view class='coupon-info'> 29 <view class='coupon-info'>
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 </view> 42 </view>
43 </block> 43 </block>
44 </scroll-view> 44 </scroll-view>
45 - </view> --> 45 + </view>
46 46
47 <!-- 筛选框 --> 47 <!-- 筛选框 -->
48 <view class="{{fixedFilter ? 'store-fixedFilter' : ''}}"> 48 <view class="{{fixedFilter ? 'store-fixedFilter' : ''}}">
@@ -64,8 +64,8 @@ @@ -64,8 +64,8 @@
64 <loading tt:if="{{(list.currentPage == 0 && list.isLoading) || isGettingCoupon}}">加载中</loading> 64 <loading tt:if="{{(list.currentPage == 0 && list.isLoading) || isGettingCoupon}}">加载中</loading>
65 </scroll-view> 65 </scroll-view>
66 </form> 66 </form>
67 - <!-- <quickNavigation id="quickNavigation" isShowIndicator="{{isShowIndicator}}" appParameter="{{appParameter}}" isGoApp="{{isGoApp}}" bind:backToTop="backToTop"></quickNavigation> 67 + <quickNavigation id="quickNavigation" isShowIndicator="{{isShowIndicator}}" appParameter="{{appParameter}}" isGoApp="{{isGoApp}}" bind:backToTop="backToTop"></quickNavigation>
68 <template is="zan-actionsheet" data="{{...actionsheet}}" /> 68 <template is="zan-actionsheet" data="{{...actionsheet}}" />
69 <snapshootShare id="snapshootShare" isShow="{{isShowSnapshoot}}" sourceType="shop" shareData="{{snapshootShareData}}" bind:hiddenSheet="hiddenSheet"></snapshootShare> 69 <snapshootShare id="snapshootShare" isShow="{{isShowSnapshoot}}" sourceType="shop" shareData="{{snapshootShareData}}" bind:hiddenSheet="hiddenSheet"></snapshootShare>
70 <import src="../../vendors/toast/wetoast.wxml" /> 70 <import src="../../vendors/toast/wetoast.wxml" />
71 -<template is="wetoast" data="{{...__wetoast__}}" /> --> 71 +<template is="wetoast" data="{{...__wetoast__}}" />
1 1
2 @import "categoryProductListFilter.ttss"; 2 @import "categoryProductListFilter.ttss";
3 -/* @import '../../vendors/zanui/actionsheet/index.wxss'; */ 3 +@import '../../vendors/zanui/actionsheet/index.ttss';
4 .scroll-view { 4 .scroll-view {
5 display: flex; 5 display: flex;
6 flex-direction: column; 6 flex-direction: column;
1 { 1 {
2 "navigationBarTitleText": "新品到着", 2 "navigationBarTitleText": "新品到着",
3 "usingComponents": { 3 "usingComponents": {
  4 + "quickNavigation": "/pages/quickNavigation/quickNavigation",
4 "productListCell": "../../components/productList/productCell" 5 "productListCell": "../../components/productList/productCell"
5 } 6 }
6 } 7 }
1 { 1 {
2 "navigationBarTitleText": " ", 2 "navigationBarTitleText": " ",
3 "usingComponents": { 3 "usingComponents": {
  4 + "quickNavigation": "/pages/quickNavigation/quickNavigation",
4 "filterComponent": "../../components/category/filterComponent/filterComponent", 5 "filterComponent": "../../components/category/filterComponent/filterComponent",
5 "productCell": "../../components/productList/productCell" 6 "productCell": "../../components/productList/productCell"
6 } 7 }
  1 +<import src="../../vendors/zanui/actionsheet/index.ttml"/>
1 2
2 <scroll-view scroll-y style="height: {{screenHeight - 50}}px;" bindscrolltolower="loadMore" bindscroll="onScroll" scroll-top="{{scrollTop}}" enable-back-to-top="true"> 3 <scroll-view scroll-y style="height: {{screenHeight - 50}}px;" bindscrolltolower="loadMore" bindscroll="onScroll" scroll-top="{{scrollTop}}" enable-back-to-top="true">
3 <view class="fixedFilter"> 4 <view class="fixedFilter">
@@ -24,8 +25,8 @@ @@ -24,8 +25,8 @@
24 <loading tt:if="{{list.currentPage == 0 && list.isLoading}}">加载中</loading> 25 <loading tt:if="{{list.currentPage == 0 && list.isLoading}}">加载中</loading>
25 </scroll-view> 26 </scroll-view>
26 27
27 - <!-- <quickNavigation id="quickNavigation" isShowIndicator="{{isShowIndicator}}" isUnionShare="{{isUnionShare}}" bind:unionShare="unionShare" bind:backToTop="backToTop"></quickNavigation> 28 + <quickNavigation id="quickNavigation" isShowIndicator="{{isShowIndicator}}" isUnionShare="{{isUnionShare}}" bind:unionShare="unionShare" bind:backToTop="backToTop"></quickNavigation>
28 <template is="zan-actionsheet" data="{{...actionsheet}}" /> 29 <template is="zan-actionsheet" data="{{...actionsheet}}" />
29 - <snapshootShare id="snapshootShare" isShow="{{isShowSnapshoot}}" sourceType="list_union" shareData="{{snapshootShareData}}" bind:hiddenSheet="hiddenSheet"></snapshootShare> --> 30 + <snapshootShare id="snapshootShare" isShow="{{isShowSnapshoot}}" sourceType="list_union" shareData="{{snapshootShareData}}" bind:hiddenSheet="hiddenSheet"></snapshootShare>
30 31
31 32
  1 +@import '../../vendors/zanui/actionsheet/index.ttss';
1 2
2 .productListContainer { 3 .productListContainer {
3 /*position: absolute;*/ 4 /*position: absolute;*/
1 { 1 {
2 "navigationBarTitleText": "搜索", 2 "navigationBarTitleText": "搜索",
3 "usingComponents": { 3 "usingComponents": {
  4 + "quickNavigation": "/pages/quickNavigation/quickNavigation",
4 "FilterComponent": "../../components/category/filterComponent/filterComponent", 5 "FilterComponent": "../../components/category/filterComponent/filterComponent",
5 "productListCell": "../../components/productList/productCell" 6 "productListCell": "../../components/productList/productCell"
6 } 7 }
1 <!--search.wxml--> 1 <!--search.wxml-->
2 2
3 <import src="../brandStore/categoryProductListFilter.ttml"/> 3 <import src="../brandStore/categoryProductListFilter.ttml"/>
4 -<!-- <import src="../../vendors/zanui/actionsheet/index.ttml"/> --> 4 +<import src="../../vendors/zanui/actionsheet/index.ttml"/>
5 5
6 <view class="sContainer"> 6 <view class="sContainer">
7 <view class="searchContainer"> 7 <view class="searchContainer">
@@ -108,6 +108,6 @@ @@ -108,6 +108,6 @@
108 <loading tt:if="{{list.currentPage == 0 && list.isLoading}}">加载中</loading> 108 <loading tt:if="{{list.currentPage == 0 && list.isLoading}}">加载中</loading>
109 </view> 109 </view>
110 </view> 110 </view>
111 - <!-- <quickNavigation id="quickNavigation" isShowIndicator="{{isShowIndicator}}" isShowMenu="{{true}}" bind:backToTop="backToTop" isUnionShare="{{status==2 && keyword && isUnionShare}}" bind:unionShare="unionShare"></quickNavigation> 111 + <quickNavigation id="quickNavigation" isShowIndicator="{{isShowIndicator}}" isShowMenu="{{true}}" bind:backToTop="backToTop" isUnionShare="{{status==2 && keyword && isUnionShare}}" bind:unionShare="unionShare"></quickNavigation>
112 <template is="zan-actionsheet" data="{{...actionsheet}}" /> 112 <template is="zan-actionsheet" data="{{...actionsheet}}" />
113 - <snapshootShare id="snapshootShare" isShow="{{isShowSnapshoot}}" sourceType="list_union" shareData="{{snapshootShareData}}" bind:hiddenSheet="hiddenSheet"></snapshootShare> -->  
  113 + <snapshootShare id="snapshootShare" isShow="{{isShowSnapshoot}}" sourceType="list_union" shareData="{{snapshootShareData}}" bind:hiddenSheet="hiddenSheet"></snapshootShare>
1 { 1 {
2 "navigationBarTitleText": "我的", 2 "navigationBarTitleText": "我的",
3 "usingComponents": { 3 "usingComponents": {
  4 + "quickNavigation": "/pages/quickNavigation/quickNavigation",
4 "productListCell": "../../components/productList/productCell", 5 "productListCell": "../../components/productList/productCell",
5 "login-button": "../../components/login-button/login-button" 6 "login-button": "../../components/login-button/login-button"
6 } 7 }