Skip to content

7
7-Eleven
Commit de565860 by 高淑倩
Options

add: 内部功能页_goHome

parent 0032f05d
Showing with 520 additions and 176 deletions
src/pages/IntegralMall/IntegralMall.json
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
"navigationBarTitleText": "积分商城", "navigationBarTitleText": "积分商城",
"usingComponents": { "usingComponents": {
"no-more": "/component/noMore/noMore", "no-more": "/component/noMore/noMore",
"exchange-coupon-modal": "/component/exchange-coupon-modal/exchange-coupon-modal" "exchange-coupon-modal": "/component/exchange-coupon-modal/exchange-coupon-modal",
"go-home": "/component/goHome/goHome"
} }
} }
\ No newline at end of file
src/pages/IntegralMall/IntegralMall.wxml
...@@ -2,27 +2,44 @@ ...@@ -2,27 +2,44 @@
<view class='page-integral-mall' style="padding-bottom: 40rpx"> <view class='page-integral-mall' style="padding-bottom: 40rpx">
<view class='integral-vip-rules' wx:if="{{integralCouponList.length}}" bindtap="handleGoMemberRulesRules">会员规则</view> <view class='integral-vip-rules' wx:if="{{integralCouponList.length}}" bindtap="handleGoMemberRulesRules">会员规则</view>
<view class='coupon-wrap' wx:if="{{integralCouponList.length}}"> <view class='coupon-wrap' wx:if="{{integralCouponList.length}}">
<view class='coupon-list' wx:for="{{integralCouponList}}" wx:for-item="item" wx:for-index="k" wx:key="{{k}}" data-id="{{item.id}}" bindtap="goCouponDetail"> <view
class='coupon-list'
wx:for="{{integralCouponList}}"
wx:for-item="item"
wx:for-index="k"
wx:key="{{k}}"
data-id="{{item.id}}"
bindtap="goCouponDetail"
>
<view class="coupon-item"> <view class="coupon-item">
<view class='coupon-img'> <view class='coupon-img'>
<image wx:if="{{item.thumbnail}}" src='{{item.thumbnail}}'></image> <image wx:if="{{item.thumbnail}}" src='{{item.thumbnail}}' />
<image wx:else src='/assets/imgs/qr-code.png'></image> <image wx:else src='/assets/imgs/qr-code.png' />
</view> </view>
<view class='coupon-info'> <view class='coupon-info'>
<view class='coupon-time fs-24'>{{item.point}}积分</view> <view class='coupon-time fs-24'>{{item.point}}积分</view>
<view class='coupon-name fs-28'>{{item.title}}</view> <view class='coupon-name fs-28'>{{item.title}}</view>
<view class='coupon-desc fs-24'>查看详情 >>></view> <view class='coupon-desc fs-24'>查看详情 >>></view>
</view> </view>
<view class='coupon-code fs-24' data-id="{{item.id}}" data-point="{{item.point}}" catchtap='exchange'>立即兑换</view> <view
class='coupon-code fs-24'
data-id="{{item.id}}"
data-point="{{item.point}}"
catchtap='exchange'
>立即兑换
</view>
</view> </view>
</view> </view>
</view> </view>
<view class='empty-wrap' wx:if="{{!integralCouponList.length}}"> <view class='empty-wrap' wx:if="{{!integralCouponList.length}}">
<view class='empty-info'> <view class='empty-info'>
<image class='empty-img' src='/assets/imgs/empty-coupon.png'></image> <image class='empty-img' src='/assets/imgs/empty-coupon.png' />
<view class='empty-text'>没有任何卡劵</view> <view class='empty-text'>没有任何卡劵</view>
</view> </view>
</view> </view>
<exchange-coupon-modal exchangeId="{{exchangeId}}" exchangePoint="{{exchangePoint}}" isExchange='{{isExchange}}'/> <exchange-coupon-modal exchangeId="{{exchangeId}}" exchangePoint="{{exchangePoint}}" isExchange='{{isExchange}}' />
<!--<no-more wx:if="{{noMore}}"/>--> <!--<no-more wx:if="{{noMore}}"/>-->
<!--goHome-->
<go-home/>
</view> </view>
src/pages/activateCard/activateCardCallback.json
{ {
"navigationBarTitleText": "激活卡面", "navigationBarTitleText": "激活卡面",
"usingComponents": {} "usingComponents": { }
} }
\ No newline at end of file
src/pages/addAddress/addAddress.json
{ {
"usingComponents": {} "usingComponents": {
"go-home": "/component/goHome/goHome"
}
} }
\ No newline at end of file
src/pages/addAddress/addAddress.wxml
...@@ -4,30 +4,67 @@ ...@@ -4,30 +4,67 @@
<form bindsubmit="formSubmit"> <form bindsubmit="formSubmit">
<view class="form"> <view class="form">
<view class="form-label">姓名</view> <view class="form-label">姓名</view>
<input class="form-input" value="{{params.name}}" placeholder-class="placeholder-picker" name="name" placeholder="请输入收货人真实姓名" /> <input
class="form-input"
value="{{params.name}}"
placeholder-class="placeholder-picker"
name="name"
placeholder="请输入收货人真实姓名"
/>
</view> </view>
<view class="form"> <view class="form">
<view class="form-label">电话</view> <view class="form-label">电话</view>
<input class="form-input" value="{{params.phone}}" placeholder-class="placeholder-picker" name="phone" placeholder="请输入收货人手机号" type="number" maxlength="11" /> <input
class="form-input"
value="{{params.phone}}"
placeholder-class="placeholder-picker"
name="phone"
placeholder="请输入收货人手机号"
type="number"
maxlength="11"
/>
</view> </view>
<view class="form"> <view class="form">
<view class="form-label">地区</view> <view class="form-label">地区</view>
<picker mode="multiSelector" bindchange="bindMultiPickerChange" bindcolumnchange="bindMultiPickerColumnChange" value="{{multiIndex}}" range="{{citys}}"> <picker
mode="multiSelector"
bindchange="bindMultiPickerChange"
bindcolumnchange="bindMultiPickerColumnChange"
value="{{multiIndex}}"
range="{{citys}}"
>
<view class="form-picker" wx:if="{{cityView}}"> <view class="form-picker" wx:if="{{cityView}}">
{{cityView}} {{cityView}}
</view> </view>
<view wx:if="{{!cityView}}"> <view wx:if="{{!cityView}}">
<input class='form-input' placeholder-class="placeholder-picker" type="text" disabled placeholder="请选择地区" /> <input
class='form-input'
placeholder-class="placeholder-picker"
type="text"
disabled
placeholder="请选择地区"
/>
</view> </view>
</picker> </picker>
</view> </view>
<view class="form"> <view class="form">
<view class="form-label">详细地址</view> <view class="form-label">详细地址</view>
<input class="form-input" value="{{params.address}}" placeholder-class="placeholder-picker" name="address" placeholder="请输入街道、楼牌号" /> <input
class="form-input"
value="{{params.address}}"
placeholder-class="placeholder-picker"
name="address"
placeholder="请输入街道、楼牌号"
/>
</view> </view>
<view class="default-address" bindtap="settingDefaultAddress"> <view class="default-address" bindtap="settingDefaultAddress">
<view class="{{isSelect ? 'theme-color' : ''}} circle-radio" > <view class="{{isSelect ? 'theme-color' : ''}} circle-radio">
<image wx:if="{{isSelect}}" class="tick-success" src="/assets/imgs/7_1_0/tick-success.png" mode="widthFix"></image> <image
wx:if="{{isSelect}}"
class="tick-success"
src="/assets/imgs/7_1_0/tick-success.png"
mode="widthFix"
/>
</view> </view>
<text class="setting-default">设为默认地址</text> <text class="setting-default">设为默认地址</text>
</view> </view>
...@@ -36,4 +73,7 @@ ...@@ -36,4 +73,7 @@
</view> </view>
</form> </form>
</view> </view>
<!--goHome-->
<go-home/>
</view> </view>
src/pages/cart/cart.json
{ {
"navigationBarTitleText": "购物车", "navigationBarTitleText": "购物车",
"usingComponents": { "usingComponents": {
"scroll-del": "/component/scrollDel/scrollDel" "scroll-del": "/component/scrollDel/scrollDel",
"go-home": "/component/goHome/goHome"
} }
} }
\ No newline at end of file
src/pages/cart/cart.wxml
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</view> </view>
<!-- 底部 --> <!-- 底部 -->
<!-- <view class="cart-bottom" style="bottom:{{currentHeight}}px">--> <!-- <view class="cart-bottom" style="bottom:{{currentHeight}}px">-->
<view class="cart-bottom"> <view class="cart-bottom">
<view class="total"> <view class="total">
<view class="select-radio all-radio" bindtap="checkAll"> <view class="select-radio all-radio" bindtap="checkAll">
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
</view> </view>
<view class="theme-color buy-btn" bindtap="goBuy">立即购买</view> <view class="theme-color buy-btn" bindtap="goBuy">立即购买</view>
</view> </view>
<!--goHome-->
<go-home/>
</view> </view>
src/pages/category/category.json
{ {
"navigationBarTitleText": "分类", "navigationBarTitleText": "分类",
"usingComponents": {} "usingComponents": { "go-home": "/component/goHome/goHome"}
} }
\ No newline at end of file
src/pages/category/category.wxml
...@@ -2,22 +2,56 @@ ...@@ -2,22 +2,56 @@
<view class="nav-container search-top"> <view class="nav-container search-top">
<scroll-view class="nav-menu" scroll-y="true"> <scroll-view class="nav-menu" scroll-y="true">
<view wx:for="{{navData}}" wx:key="{{j}}" wx:for-index="j" wx:for-item="menuSec" class="menu-item{{j == curMenu[1] ? ' active' : ''}}"> <view
<view class="menu-name{{j == curMenu[1] ? ' theme-text-color' : ''}}" data-j="{{j}}" wx:for="{{navData}}"
data-name="{{menuSec.label}}" data-id="{{menuSec.id}}" bindtap="selectMenu">{{menuSec.label}}</view> wx:key="{{j}}"
wx:for-index="j"
wx:for-item="menuSec"
class="menu-item{{j == curMenu[1] ? ' active' : ''}}"
>
<view
class="menu-name{{j == curMenu[1] ? ' theme-text-color' : ''}}"
data-j="{{j}}"
data-name="{{menuSec.label}}"
data-id="{{menuSec.id}}"
bindtap="selectMenu"
>{{menuSec.label}}
</view>
</view> </view>
</scroll-view> </scroll-view>
<scroll-view class="nav-contents" scroll-y="true"> <scroll-view class="nav-contents" scroll-y="true">
<view wx:for="{{navData}}" wx:key="{{j}}" wx:for-index="j" wx:for-item="menuSec" class="nav-content{{j == curMenu[1] ? ' active' : ''}}"> <view
<navigator hover-class="none" class="sec-menu-image" open-type="navigate" url="/subPackage/page/pages/fun/fun?id={{menuSec.id}}&name={{menuSec.label}}"> wx:for="{{navData}}"
<image src="{{menuSec.image}}" mode="widthFix"></image> wx:key="{{j}}"
wx:for-index="j"
wx:for-item="menuSec"
class="nav-content{{j == curMenu[1] ? ' active' : ''}}"
>
<navigator
hover-class="none"
class="sec-menu-image"
open-type="navigate"
url="/subPackage/page/pages/fun/fun?id={{menuSec.id}}&name={{menuSec.label}}"
>
<image src="{{menuSec.image}}" mode="widthFix" />
</navigator> </navigator>
<view class="menu-list"> <view class="menu-list">
<view wx:for="{{menuSec.children}}" wx:key="{{k}}" wx:for-index="k" wx:for-item="menuThr" class="menu-third" > <view
wx:for="{{menuSec.children}}"
wx:key="{{k}}"
wx:for-index="k"
wx:for-item="menuThr"
class="menu-third"
>
<view data-id="{{menuThr.id}}" data-name="{{menuThr.label}}" bindtap="navPage"> <view data-id="{{menuThr.id}}" data-name="{{menuThr.label}}" bindtap="navPage">
<navigator hover-class="none" class="sec-menu-image" open-type="navigate" url="/subPackage/page/pages/categoryPro/categoryPro?id={{menuThr.id}}&name={{menuThr.label}}"> <navigator
<image src="{{menuThr.image}}" class="thr-menu-image" ></image> hover-class="none"
class="sec-menu-image"
open-type="navigate"
url="/subPackage/page/pages/categoryPro/categoryPro?id={{menuThr.id}}&name={{menuThr.label}}"
>
<image src="{{menuThr.image}}" class="thr-menu-image" />
<view class="thr-menu-name">{{menuThr.label}}</view> <view class="thr-menu-name">{{menuThr.label}}</view>
</navigator> </navigator>
</view> </view>
...@@ -25,4 +59,7 @@ ...@@ -25,4 +59,7 @@
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
<!--goHome-->
<go-home/>
</view> </view>
src/pages/confirmOrder/confirmOrder.json
{ {
"navigationBarTitleText": "确认订单", "navigationBarTitleText": "确认订单",
"usingComponents": { "usingComponents": {
"select-coupon": "/component/selectCoupon/selectCoupon" "select-coupon": "/component/selectCoupon/selectCoupon",
"go-home": "/component/goHome/goHome"
} }
} }
\ No newline at end of file
src/pages/confirmOrder/confirmOrder.wxml
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
<image class="check-status-img" src="{{isSelect ? '/assets/imgs/7_1_0/08_22/trade-success.png' : '/assets/imgs/7_1_0/08_22/trade-unsel.png'}}" /> <image class="check-status-img" src="{{isSelect ? '/assets/imgs/7_1_0/08_22/trade-success.png' : '/assets/imgs/7_1_0/08_22/trade-unsel.png'}}" />
</view> </view>
<view class="right-check-tips {{isSelect? 'tip-check' : 'tip-un-check'}}"> <view class="right-check-tips {{isSelect? 'tip-check' : 'tip-un-check'}}">
<image class="select-check-open {{isSelect? 'tip-check' : 'tip-un-check'}}" src="{{isSelect ? '/assets/imgs/7_1_0/08_22/sel.png' : '/assets/imgs/7_1_0/08_22/un-sel.png'}}"/> <image class="select-check-open {{isSelect? 'tip-check' : 'tip-un-check'}}" src="{{isSelect ? '/assets/imgs/7_1_0/08_22/sel.png' : '/assets/imgs/7_1_0/08_22/un-sel.png'}}" />
</view> </view>
</view> </view>
</view> </view>
...@@ -138,6 +138,7 @@ ...@@ -138,6 +138,7 @@
<view class="theme-color buy-btn" bindtap="handelGobuy">立即购买</view> <view class="theme-color buy-btn" bindtap="handelGobuy">立即购买</view>
</view> </view>
</view> </view>
<!--goHome-->
<go-home/>
<select-coupon show="{{showSelectCoupon}}" /> <select-coupon show="{{showSelectCoupon}}" />
src/pages/consumptionDetails/consumptionDetails.json
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
"navigationBarTitleText": "消费详情", "navigationBarTitleText": "消费详情",
"usingComponents": { "usingComponents": {
"table": "./../../component/table/table", "table": "./../../component/table/table",
"bottom-tabs": "./../../component/bottomTabs/bottomTabs" "bottom-tabs": "./../../component/bottomTabs/bottomTabs",
"go-home": "/component/goHome/goHome"
} }
} }
\ No newline at end of file
src/pages/consumptionDetails/consumptionDetails.wxml
...@@ -51,6 +51,6 @@ ...@@ -51,6 +51,6 @@
<view class="consumption-tips">-香烟与服务类商品不计分-</view> <view class="consumption-tips">-香烟与服务类商品不计分-</view>
</view> </view>
<!--goHome-->
<bottom-tabs /> <go-home/>
src/pages/couponCodeDetail/couponCodeDetail.json
{ {
"navigationBarTitleText": "会员券详情页", "navigationBarTitleText": "会员券详情页",
"usingComponents": {} "usingComponents": { "go-home": "/component/goHome/goHome"}
} }
\ No newline at end of file
src/pages/couponCodeDetail/couponCodeDetail.wxml
...@@ -3,17 +3,20 @@ ...@@ -3,17 +3,20 @@
<view class="panel"> <view class="panel">
<view class="qrcode"> <view class="qrcode">
<view class='avatar-img'> <view class='avatar-img'>
<image wx:if="{{codeDetail.couponDetail.style.takeCouponBgimg}}" src='{{codeDetail.couponDetail.style.takeCouponBgimg}}'></image> <image wx:if="{{codeDetail.couponDetail.style.takeCouponBgimg}}" src='{{codeDetail.couponDetail.style.takeCouponBgimg}}' />
<image wx:else src='/assets/imgs/avatar.png'></image> <image wx:else src='/assets/imgs/avatar.png' />
</view> </view>
<view class='title fs-36'>{{codeDetail.couponSetting.title}}</view> <view class='title fs-36'>{{codeDetail.couponSetting.title}}</view>
</view> </view>
<view class='line'> <view class='line'>
<image src='/assets/imgs/line.png'></image> <image src='/assets/imgs/line.png' />
</view> </view>
<view class="barcode"> <view class="barcode">
<canvas canvas-id="barcode" binderror="canvasIdErrorCallback"/> <canvas canvas-id="barcode" binderror="canvasIdErrorCallback" />
</view> </view>
<view class='bottom-code'>{{cardno}}</view> <view class='bottom-code'>{{cardno}}</view>
</view> </view>
<!--goHome-->
<go-home/>
</view> </view>
src/pages/couponDetail/couponDetail.json
{ {
"navigationBarTitleText": "我的卡券", "navigationBarTitleText": "我的卡券",
"usingComponents": {} "usingComponents": { "go-home": "/component/goHome/goHome"}
} }
\ No newline at end of file
src/pages/couponDetail/couponDetail.wxml
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
<view class='coupon-list'> <view class='coupon-list'>
<image class='coupon-bg' src='/assets/imgs/coupon-bg.png' /> <image class='coupon-bg' src='/assets/imgs/coupon-bg.png' />
<view class='coupon-img'> <view class='coupon-img'>
<image wx:if="{{couponDetail.couponDetail.style.takeCouponBgimg}}" src='{{couponDetail.couponDetail.style.takeCouponBgimg}}'></image> <image wx:if="{{couponDetail.couponDetail.style.takeCouponBgimg}}" src='{{couponDetail.couponDetail.style.takeCouponBgimg}}' />
<image wx:else src='/assets/imgs/qr-code.png'></image> <image wx:else src='/assets/imgs/qr-code.png' />
</view> </view>
<view class='coupon-info'> <view class='coupon-info'>
<view class='coupon-name fs-28'>{{couponDetail.couponSetting.title}}</view> <view class='coupon-name fs-28'>{{couponDetail.couponSetting.title}}</view>
...@@ -26,7 +26,9 @@ ...@@ -26,7 +26,9 @@
<!--<button type='primary' class="redeem-now" bindtap="handelPresentCouponCode">出示券码</button>--> <!--<button type='primary' class="redeem-now" bindtap="handelPresentCouponCode">出示券码</button>-->
</view> </view>
</view> </view>
<!--goHome-->
<go-home/>
<view class="position-bottom"> <view class="position-bottom">
<button type='primary' class="redeem-now" bindtap='handelPresentCouponCode'>出示券码</button> <button type='primary' class="redeem-now" bindtap='handelPresentCouponCode'>出示券码</button>
</view> </view>
src/pages/coupons/coupons.json
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
"enablePullDownRefresh":true, "enablePullDownRefresh":true,
"navigationBarTitleText": "我的卡券", "navigationBarTitleText": "我的卡券",
"usingComponents": { "usingComponents": {
"no-more": "/component/noMore/noMore" "no-more": "/component/noMore/noMore",
"go-home": "/component/goHome/goHome"
} }
} }
\ No newline at end of file
src/pages/coupons/coupons.wxml
...@@ -16,9 +16,14 @@ ...@@ -16,9 +16,14 @@
wx:for-index="k" wx:for-index="k"
wx:key="{{k}}" wx:key="{{k}}"
> >
<view data-title="{{item.title}}" data-cardNo="{{item.cardNo}}" data-id="{{item.couponId}}" bindtap="handelPresentCouponDetail"> <view
<image class='coupon-bg' src='/assets/imgs/coupon-bg.png'/> data-title="{{item.title}}"
<view class='coupon-img' > data-cardNo="{{item.cardNo}}"
data-id="{{item.couponId}}"
bindtap="handelPresentCouponDetail"
>
<image class='coupon-bg' src='/assets/imgs/coupon-bg.png' />
<view class='coupon-img'>
<image wx:if="{{item.takeCouponBgimg}}" class='coupon-bg' src='{{item.takeCouponBgimg}}' /> <image wx:if="{{item.takeCouponBgimg}}" class='coupon-bg' src='{{item.takeCouponBgimg}}' />
<image wx:else src='/assets/imgs/qr-code.png' /> <image wx:else src='/assets/imgs/qr-code.png' />
</view> </view>
...@@ -80,4 +85,6 @@ ...@@ -80,4 +85,6 @@
</swiper-item> </swiper-item>
</swiper> </swiper>
</view> </view>
<!--goHome-->
<go-home/>
src/pages/deliveryService/deliveryService.json
{ {
"navigationBarTitleText": "外卖服务", "navigationBarTitleText": "外卖服务",
"usingComponents": { "usingComponents": {
"pic-nav-serve": "/component/picNavServe/picNavServe" "pic-nav-serve": "/component/picNavServe/picNavServe",
"go-home": "/component/goHome/goHome"
} }
} }
\ No newline at end of file
src/pages/deliveryService/deliveryService.wxml
<!--pages/userCenter.wxml--> <!--pages/userCenter.wxml-->
<block wx:for="{{pages}}" wx:key="{{index}}" wx:for-item="pItem"> <block wx:for="{{pages}}" wx:key="{{index}}" wx:for-item="pItem">
<pic-nav-serve pic-nav="{{pItem.navigation.images}}" /> <pic-nav-serve pic-nav="{{pItem.navigation.images}}" />
<!--goHome-->
<go-home/>
</block> </block>
src/pages/extendProduct/extendProduct.json
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
"navigationBarTitleText": "推广商品", "navigationBarTitleText": "推广商品",
"usingComponents": { "usingComponents": {
"card-modal": "/component/cardModal/cardModal" "card-modal": "/component/cardModal/cardModal",
"go-home": "/component/goHome/goHome"
} }
} }
\ No newline at end of file
src/pages/extendProduct/extendProduct.wxml
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
<view class="swiper-tab"> <view class="swiper-tab">
<view class="swiper-tab-item {{currentTab==0 ? 'active' : ''}}" data-current="0" bindtap="clickTab"> <view class="swiper-tab-item {{currentTab==0 ? 'active' : ''}}" data-current="0" bindtap="clickTab">
推广商品 推广商品
<view class="line" wx-if="{{currentTab==0}}"></view> <view class="line" wx-if="{{currentTab==0}}" />
</view> </view>
<view class="swiper-tab-item {{currentTab==1 ? 'active' : ''}}" data-current="1" bindtap="clickTab">我的推广 <view class="swiper-tab-item {{currentTab==1 ? 'active' : ''}}" data-current="1" bindtap="clickTab">我的推广
<view class="line" wx-if="{{currentTab==1}}"></view> <view class="line" wx-if="{{currentTab==1}}" />
</view> </view>
</view> </view>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<swiper-item > --> <swiper-item > -->
<scroll-view scroll-y wx:if="{{currentTab==0}}"> <scroll-view scroll-y wx:if="{{currentTab==0}}">
<view class="extend-img"> <view class="extend-img">
<image mode="widthFix" src="{{extendProBanner}}"></image> <image mode="widthFix" src="{{extendProBanner}}" />
</view> </view>
<view class="pro-nav-wrap"> <view class="pro-nav-wrap">
<view class="nav-list"> <view class="nav-list">
...@@ -26,8 +26,13 @@ ...@@ -26,8 +26,13 @@
</view> </view>
<view class="select-radio all-radio" bindtap="allSelect"> <view class="select-radio all-radio" bindtap="allSelect">
<text class="all" >全选</text> <text class="all" >全选</text>
<view class="{{isAllSelect ? 'theme-color' : ''}} circle-radio " > <view class="{{isAllSelect ? 'theme-color' : ''}} circle-radio ">
<image wx:if="{{isAllSelect}}" class="tick-success" src="/assets/imgs/7_1_0/tick-success.png" mode="widthFix"></image> <image
wx:if="{{isAllSelect}}"
class="tick-success"
src="/assets/imgs/7_1_0/tick-success.png"
mode="widthFix"
/>
</view> </view>
</view> </view>
...@@ -36,7 +41,7 @@ ...@@ -36,7 +41,7 @@
<view class="buy-product-content"> <view class="buy-product-content">
<view class="buy-list" wx:for="{{extendProList}}" wx:key="{{index}}"> <view class="buy-list" wx:for="{{extendProList}}" wx:key="{{index}}">
<view class="prod-img"> <view class="prod-img">
<image src="{{item.productImgUrl}}"></image> <image src="{{item.productImgUrl}}" />
</view> </view>
<view class="prod-info"> <view class="prod-info">
<view class="prod-name">{{item.productName}}</view> <view class="prod-name">{{item.productName}}</view>
...@@ -45,20 +50,30 @@ ...@@ -45,20 +50,30 @@
</view> --> </view> -->
<view class="benefit-info"> <view class="benefit-info">
<view class="benefit-point"> <view class="benefit-point">
<image src="/assets/imgs/7_1_0/integral-icon.png" class="integral-icon" mode="widthFix"></image> <image src="/assets/imgs/7_1_0/integral-icon.png" class="integral-icon" mode="widthFix" />
<text class="benefit-num">{{item.point}}</text> <text class="benefit-num">{{item.point}}</text>
</view> </view>
<view class="coupon-title"> <view class="coupon-title">
<image src="/assets/imgs/7_1_0/coupon-icon.png" class="coupon-icon" mode="widthFix"></image> <image src="/assets/imgs/7_1_0/coupon-icon.png" class="coupon-icon" mode="widthFix" />
<block wx:for="{{item.shareBonuses}}" wx:for-item="shareItem" wx:for-index="idx" wx:key="{{idx}}"> <block
wx:for="{{item.shareBonuses}}"
wx:for-item="shareItem"
wx:for-index="idx"
wx:key="{{idx}}"
>
<text class="benefit-num " >{{shareItem.couponSettingTitle}} </text> <text class="benefit-num " >{{shareItem.couponSettingTitle}} </text>
</block> </block>
</view> </view>
</view> </view>
</view> </view>
<view class="select-radio pro-radio" catchtap="selectPro" data-index="{{index}}"> <view class="select-radio pro-radio" catchtap="selectPro" data-index="{{index}}">
<view class="{{item.isSelect ? 'theme-color' : ''}} circle-radio" > <view class="{{item.isSelect ? 'theme-color' : ''}} circle-radio">
<image wx:if="{{item.isSelect}}" class="tick-success" src="/assets/imgs/7_1_0/tick-success.png" mode="widthFix"></image> <image
wx:if="{{item.isSelect}}"
class="tick-success"
src="/assets/imgs/7_1_0/tick-success.png"
mode="widthFix"
/>
</view> </view>
</view> </view>
</view> </view>
...@@ -67,11 +82,11 @@ ...@@ -67,11 +82,11 @@
</view> </view>
<view class="share-wrap"> <view class="share-wrap">
<view class="share-button" bindtap="onTapShare"> <view class="share-button" bindtap="onTapShare">
<image mode="widthFix"></image> <image mode="widthFix" />
<text>快速分享</text> <text>快速分享</text>
</view> </view>
<view class="share-button" bindtap="onTapPoster"> <view class="share-button" bindtap="onTapPoster">
<image mode="widthFix"></image> <image mode="widthFix" />
<text>生成卡片</text> <text>生成卡片</text>
</view> </view>
</view> </view>
...@@ -84,14 +99,19 @@ ...@@ -84,14 +99,19 @@
<view class="share-number">{{myShareCount.totalCount}}</view> <view class="share-number">{{myShareCount.totalCount}}</view>
<view class="share-title">当前分享订单</view> <view class="share-title">当前分享订单</view>
</view> </view>
<view class="extension-line"></view> <view class="extension-line" />
<view class="num-invite-yesterday df-1 border_box"> <view class="num-invite-yesterday df-1 border_box">
<view class="share-number">{{myShareCount.yesterdayCount}}</view> <view class="share-number">{{myShareCount.yesterdayCount}}</view>
<view class="share-title">昨日新增分享订单</view> <view class="share-title">昨日新增分享订单</view>
</view> </view>
</view> </view>
<view class="order-content"> <view class="order-content">
<view class="order-list" wx:for="{{myExtendList}}" wx:key="{{index}}" wx:for-item="extendItem"> <view
class="order-list"
wx:for="{{myExtendList}}"
wx:key="{{index}}"
wx:for-item="extendItem"
>
<view class="order-header"> <view class="order-header">
<view class="order-number"> <view class="order-number">
<text>{{extendItem.createTime}}</text> <text>{{extendItem.createTime}}</text>
...@@ -99,21 +119,31 @@ ...@@ -99,21 +119,31 @@
<text class="order-status">查看收益</text> <text class="order-status">查看收益</text>
</view> </view>
<view class="pro-list"> <view class="pro-list">
<image class="pro-img"></image> <image class="pro-img" />
<image class="pro-img"></image> <image class="pro-img" />
<image class="pro-img"></image> <image class="pro-img" />
<image class="pro-img"></image> <image class="pro-img" />
<text class="pro-img-dot">...</text> <text class="pro-img-dot">...</text>
</view> </view>
<view class="pro-number"> <view class="pro-number">
<text class="total-pro">促成订单 <text class="help-order">5</text> 笔</text> <text class="total-pro">促成订单 <text class="help-order">5</text>
笔
</text>
</view> </view>
</view> </view>
</view> </view>
<view class="loading-complete">已经到底啦！</view> <view class="loading-complete">已经到底啦！</view>
</scroll-view > </scroll-view>
<!-- </swiper-item> <!-- </swiper-item>
</swiper> --> </swiper> -->
</view> </view>
<share-modal show="{{showShareModal}}" /> <share-modal show="{{showShareModal}}" />
<card-modal show-card-modal="{{showCardModal}}" card-title="{{cardTitle}}" card-url="{{cardUrl}}" page-path="{{pagePath}}"/> <card-modal
show-card-modal="{{showCardModal}}"
card-title="{{cardTitle}}"
card-url="{{cardUrl}}"
page-path="{{pagePath}}"
/>
<!--goHome-->
<go-home/>
src/pages/integralMallDetail/integralMallDetail.json
{ {
"navigationBarTitleText": "积分兑换详情页", "navigationBarTitleText": "积分兑换详情页",
"usingComponents": { "usingComponents": {
"exchange-coupon-modal": "/component/exchange-coupon-modal/exchange-coupon-modal" "exchange-coupon-modal": "/component/exchange-coupon-modal/exchange-coupon-modal",
"go-home": "/component/goHome/goHome"
} }
} }
\ No newline at end of file
src/pages/integralMallDetail/integralMallDetail.wxml
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
<view class='coupon-list'> <view class='coupon-list'>
<view class='coupon-img'> <view class='coupon-img'>
<image wx:if="{{integralMallDetail.thumbnail}}" src='{{integralMallDetail.thumbnail}}'></image> <image wx:if="{{integralMallDetail.thumbnail}}" src='{{integralMallDetail.thumbnail}}' />
<image wx:else src='/assets/imgs/qr-code.png'></image> <image wx:else src='/assets/imgs/qr-code.png' />
</view> </view>
<view class='coupon-info'> <view class='coupon-info'>
<view class='coupon-name fs-28'>{{integralMallDetail.point}}积分</view> <view class='coupon-name fs-28'>{{integralMallDetail.point}}积分</view>
...@@ -29,3 +29,6 @@ ...@@ -29,3 +29,6 @@
<button type='primary' class="redeem-now" bindtap='exchange'>立即兑换</button> <button type='primary' class="redeem-now" bindtap='exchange'>立即兑换</button>
</view> </view>
<exchange-coupon-modal exchangeId="{{integralMallDetail.id}}" exchangePoint="{{integralMallDetail.point}}" isExchange='{{isExchange}}' /> <exchange-coupon-modal exchangeId="{{integralMallDetail.id}}" exchangePoint="{{integralMallDetail.point}}" isExchange='{{isExchange}}' />
<!--goHome-->
<go-home/>
src/pages/integralWater/integralWater.json
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
"enablePullDownRefresh":true, "enablePullDownRefresh":true,
"navigationBarTitleText": "积分流水", "navigationBarTitleText": "积分流水",
"usingComponents": { "usingComponents": {
"no-more": "/component/noMore/noMore" "no-more": "/component/noMore/noMore",
"go-home": "/component/goHome/goHome"
} }
} }
\ No newline at end of file
src/pages/integralWater/integralWater.wxml
...@@ -12,18 +12,31 @@ ...@@ -12,18 +12,31 @@
<view wx:if="{{integralList.length}}"> <view wx:if="{{integralList.length}}">
<view class="integral-tips"> <view class="integral-tips">
<view class="tips-detail">显示你最近30笔变动明细</view> <view class="tips-detail">显示你最近30笔变动明细</view>
<span class="tips-much">这么多积分</span><span class="tips-gomall" bindtap="handleGoIntegralMall"> 去积分商城看看>>> </span> <span class="tips-much">这么多积分</span>
<span class="tips-gomall" bindtap="handleGoIntegralMall"> 去积分商城看看>>> </span>
</view> </view>
<!--积分列表--> <!--积分列表-->
<view> <view>
<view class="detail-integral" wx:for="{{integralList}}" wx:for-item="item" data-memberId = "{{item.memberId}}" data-expandInfo= "{{item.expandInfo}}" wx:for-index="k" wx:key="{{k}}" bindtap="handleGoDetail"> <view
class="detail-integral"
wx:for="{{integralList}}"
wx:for-item="item"
data-memberId="{{item.memberId}}"
data-expandInfo="{{item.expandInfo}}"
wx:for-index="k"
wx:key="{{k}}"
bindtap="handleGoDetail"
>
<view class="detail-left"> <view class="detail-left">
<view class="detail-title">{{item.changeTypeDesc}}</view> <view class="detail-title">{{item.changeTypeDesc}}</view>
<view class="detail-time">{{item.changeTime}}</view> <view class="detail-time">{{item.changeTime}}</view>
</view> </view>
<view class="detail-num {{item.operation==true ? 'add' : 'less'}}">{{item.operation == 1? '+':''}}{{item.operation*item.changeValue}}</view> <view class="detail-num {{item.operation==true ? 'add' : 'less'}}">{{item.operation == 1? '+':''}}{{item.operation*item.changeValue}}</view>
</view> </view>
<no-more wx:if="{{noMore}}"/> <no-more wx:if="{{noMore}}" />
</view> </view>
</view> </view>
</view> </view>
<!--goHome-->
<go-home/>
src/pages/logistics/logistics.json
{ {
"navigationBarTitleText": "订单详情", "navigationBarTitleText": "订单详情",
"usingComponents": {} "usingComponents": {
"go-home": "/component/goHome/goHome"
}
} }
\ No newline at end of file
src/pages/logistics/logistics.wxml
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<view class="page-logistics"> <view class="page-logistics">
<view class="header-wrap"> <view class="header-wrap">
<image class="header-bg" src="/assets/imgs/7_1_0/logistics-bg.jpg"></image> <image class="header-bg" src="/assets/imgs/7_1_0/logistics-bg.jpg" />
<view class="logistics-status"> <view class="logistics-status">
<view class="status">物流公司：{{logisData.company}}</view> <view class="status">物流公司：{{logisData.company}}</view>
<view class="desc">物流单号：{{logisData.no}}</view> <view class="desc">物流单号：{{logisData.no}}</view>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<view class='expressRecord'> <view class='expressRecord'>
<view class='expressRecord-single-close' wx:for="{{logisData.list}}" wx:key="{{index}}"> <view class='expressRecord-single-close' wx:for="{{logisData.list}}" wx:key="{{index}}">
<view class='expressRecord-single-noReach-online-top-close'> <view class='expressRecord-single-noReach-online-top-close'>
<view class="online-top-close {{index ==0 ? 'online-top-closing' : ''}}" ></view> <view class="online-top-close {{index ==0 ? 'online-top-closing' : ''}}" />
<view class="dot-icon"> <view class="dot-icon">
<!-- 订单提交成功 --> <!-- 订单提交成功 -->
<!-- <image class="dot-icon-close" src="/assets/imgs/7_1_0/submit-order.png"></image> --> <!-- <image class="dot-icon-close" src="/assets/imgs/7_1_0/submit-order.png"></image> -->
...@@ -33,10 +33,10 @@ ...@@ -33,10 +33,10 @@
<!-- <image class="dot-icon-closing" src="/assets/imgs/7_1_0/sign-success.png"></image> --> <!-- <image class="dot-icon-closing" src="/assets/imgs/7_1_0/sign-success.png"></image> -->
<!-- 交易完成 --> <!-- 交易完成 -->
<image class="dot-icon-closing" src="/assets/imgs/7_1_0/trade-success.png"></image> <image class="dot-icon-closing" src="/assets/imgs/7_1_0/trade-success.png" />
</view> </view>
<view class='dot-close' wx:if="{{false}}"></view> <view class='dot-close' wx:if="{{false}}" />
<view class="online-bottom {{index == logisData.list.length-1 ? 'online-top-closing' : ''}}" ></view> <view class="online-bottom {{index == logisData.list.length-1 ? 'online-top-closing' : ''}}" />
</view> </view>
<view class='expressRecord-text'> <view class='expressRecord-text'>
...@@ -61,6 +61,6 @@ ...@@ -61,6 +61,6 @@
</view> </view>
</view> </view>
<!--goHome-->
<go-home/>
src/pages/memberOfOwn/memberOfOwn.json
{ {
"navigationBarTitleText": "我的会员", "navigationBarTitleText": "我的会员",
"usingComponents": {} "usingComponents": {
"go-home": "/component/goHome/goHome"
}
} }
\ No newline at end of file
src/pages/memberOfOwn/memberOfOwn.wxml
...@@ -112,6 +112,7 @@ ...@@ -112,6 +112,7 @@
<button type='primary' class='btn-primary' form-type="submit" style="background-color: rgb(2, 186, 112);">确认</button> <button type='primary' class='btn-primary' form-type="submit" style="background-color: rgb(2, 186, 112);">确认</button>
</form> </form>
</view> </view>
<!--goHome-->
<go-home />
</view> </view>
src/pages/memberRules/memberRules.json
{ {
"navigationBarTitleText": "会员规则", "navigationBarTitleText": "会员规则",
"usingComponents": {} "usingComponents": {
"go-home": "/component/goHome/goHome"
}
} }
\ No newline at end of file
src/pages/memberRules/memberRules.wxml
<!--pages/memberRules.wxml--> <!--pages/memberRules.wxml-->
<view class="memberRules"> <view class="memberRules">
<image class='rule-img' src='{{ruleImg}}' mode="widthFix"></image> <image class='rule-img' src='{{ruleImg}}' mode="widthFix" />
<!--goHome-->
<go-home/>
</view> </view>
src/pages/my/my.json
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
"navigationBarTitleText": "我的", "navigationBarTitleText": "我的",
"disableScroll": true, "disableScroll": true,
"usingComponents": { "usingComponents": {
"bottom-tabs": "./../../component/bottomTabs/bottomTabs" "bottom-tabs": "./../../component/bottomTabs/bottomTabs",
"go-home": "/component/goHome/goHome"
} }
} }
\ No newline at end of file
src/pages/my/my.wxml
...@@ -5,16 +5,16 @@ ...@@ -5,16 +5,16 @@
<view class="header-content"> <view class="header-content">
<view class="avatar-wrap"> <view class="avatar-wrap">
<view class="avatar"> <view class="avatar">
<open-data type="userAvatarUrl" ></open-data> <open-data type="userAvatarUrl" />
</view> </view>
<image class="crown" src="/assets/imgs/crown.png"></image> <image class="crown" src="/assets/imgs/crown.png" />
</view> </view>
<view class="user-info"> <view class="user-info">
<text class="member">分享号会员</text> <text class="member">分享号会员</text>
<text class="name">会员名称</text> <text class="name">会员名称</text>
</view> </view>
<view class="method-btn">不会玩看这里 <view class="method-btn">不会玩看这里
<image class="small-arrow" src="/assets/imgs/small-arrow-right.png"></image> <image class="small-arrow" src="/assets/imgs/small-arrow-right.png" />
</view> </view>
</view> </view>
<view class="opration-wrap"> <view class="opration-wrap">
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<text>分享值</text> <text>分享值</text>
</view> </view>
<view class="opration-list"> <view class="opration-list">
<image class="code" src="/assets/imgs/member-code.png"></image> <image class="code" src="/assets/imgs/member-code.png" />
<text>会员码</text> <text>会员码</text>
</view> </view>
</view> </view>
...@@ -40,18 +40,18 @@ ...@@ -40,18 +40,18 @@
<view class="member-interest"> <view class="member-interest">
<!-- 收起 --> <!-- 收起 -->
<view class="interest-fold" bindtap="onTapUnfold"> <view class="interest-fold" bindtap="onTapUnfold">
<image src="/assets/imgs/plus-bg.png"></image> <image src="/assets/imgs/plus-bg.png" />
<view class="interest-top"> <view class="interest-top">
<text class="title">PLUS 已为你节省 xxx 元</text> <text class="title">PLUS 已为你节省 xxx 元</text>
</view> </view>
<view class="recharge"> <view class="recharge">
<text>一键续费PLUS会员</text> <text>一键续费PLUS会员</text>
<image src="/assets/imgs/small-arrow-right.png"></image> <image src="/assets/imgs/small-arrow-right.png" />
</view> </view>
</view> </view>
<!-- 普通会员 --> <!-- 普通会员 -->
<view class="interest-fold" bindtap="onTapUnfold" wx:if="{{false}}"> <view class="interest-fold" bindtap="onTapUnfold" wx:if="{{false}}">
<image src="/assets/imgs/regular-member.png"></image> <image src="/assets/imgs/regular-member.png" />
<view class="regular-top"> <view class="regular-top">
即刻成为 即刻成为
<text class="regular-title"> PLUS </text> <text class="regular-title"> PLUS </text>
...@@ -59,14 +59,14 @@ ...@@ -59,14 +59,14 @@
</view> </view>
<view class="recharge"> <view class="recharge">
<!-- <text>一键续费PLUS会员</text> --> <!-- <text>一键续费PLUS会员</text> -->
<image src="/assets/imgs/small-arrow-right.png"></image> <image src="/assets/imgs/small-arrow-right.png" />
</view> </view>
</view> </view>
<!-- 展开 --> <!-- 展开 -->
<view class="interest-unfold" id="plusImg"> <view class="interest-unfold" id="plusImg">
<image class="interest-unfold-bg" src="/assets/imgs/interest-unfold.png"></image> <image class="interest-unfold-bg" src="/assets/imgs/interest-unfold.png" />
<view class="interest-title-line"> <view class="interest-title-line">
<image src="/assets/imgs/interest-line.png"></image> <image src="/assets/imgs/interest-line.png" />
</view> </view>
<view class="personal-interest"> <view class="personal-interest">
专属xxx权益 专属xxx权益
...@@ -74,31 +74,31 @@ ...@@ -74,31 +74,31 @@
<view class="interest-name"> <view class="interest-name">
<view class="interest-ul"> <view class="interest-ul">
<view class="interest-list"> <view class="interest-list">
<image class="interest-icon" src="/assets/imgs/interest-icon.png"></image> <image class="interest-icon" src="/assets/imgs/interest-icon.png" />
<view class="interest-title"> <view class="interest-title">
<text>权益名称</text> <text>权益名称</text>
</view> </view>
</view> </view>
<view class="interest-list"> <view class="interest-list">
<image class="interest-icon" src="/assets/imgs/interest-icon.png"></image> <image class="interest-icon" src="/assets/imgs/interest-icon.png" />
<view class="interest-title"> <view class="interest-title">
<text>权益名称</text> <text>权益名称</text>
</view> </view>
</view> </view>
<view class="interest-list"> <view class="interest-list">
<image class="interest-icon" src="/assets/imgs/interest-icon.png"></image> <image class="interest-icon" src="/assets/imgs/interest-icon.png" />
<view class="interest-title"> <view class="interest-title">
<text>权益名称</text> <text>权益名称</text>
</view> </view>
</view> </view>
<view class="interest-list"> <view class="interest-list">
<image class="interest-icon" src="/assets/imgs/interest-icon.png"></image> <image class="interest-icon" src="/assets/imgs/interest-icon.png" />
<view class="interest-title"> <view class="interest-title">
<text>权益名称</text> <text>权益名称</text>
</view> </view>
</view> </view>
<view class="interest-list"> <view class="interest-list">
<image class="interest-icon" src="/assets/imgs/interest-icon.png"></image> <image class="interest-icon" src="/assets/imgs/interest-icon.png" />
<view class="interest-title"> <view class="interest-title">
<text>权益名称</text> <text>权益名称</text>
</view> </view>
...@@ -109,7 +109,13 @@ ...@@ -109,7 +109,13 @@
</view> </view>
</view> </view>
<view class="main-content" bindtouchstart="touchS" bindtouchmove="touchM" bindtouchend="touchE" style="{{refreshClass}}"> <view
class="main-content"
bindtouchstart="touchS"
bindtouchmove="touchM"
bindtouchend="touchE"
style="{{refreshClass}}"
>
<view class="order-ul"> <view class="order-ul">
<view class="order-list"> <view class="order-list">
<view class="my-order"> <view class="my-order">
...@@ -118,26 +124,26 @@ ...@@ -118,26 +124,26 @@
</view> </view>
<view class="order-item"> <view class="order-item">
<view class="item"> <view class="item">
<image class="order-icon"></image> <image class="order-icon" />
<view class="order-desc">待付款</view> <view class="order-desc">待付款</view>
</view> </view>
<view class="item"> <view class="item">
<image class="order-icon"></image> <image class="order-icon" />
<view class="order-desc">待付款</view> <view class="order-desc">待付款</view>
</view> </view>
<view class="item"> <view class="item">
<image class="order-icon"></image> <image class="order-icon" />
<view class="order-desc">待付款</view> <view class="order-desc">待付款</view>
</view> </view>
<view class="item"> <view class="item">
<image class="order-icon"></image> <image class="order-icon" />
<view class="order-desc">待付款</view> <view class="order-desc">待付款</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="banner"> <view class="banner">
<image src="/assets/imgs/invitation-bg.png"></image> <image src="/assets/imgs/invitation-bg.png" />
<view class="banner-title"> <view class="banner-title">
<view class="top-title">拉卡萨解放军</view> <view class="top-title">拉卡萨解放军</view>
<view class="bottom-title">地方的对方水电费第三方第三方</view> <view class="bottom-title">地方的对方水电费第三方第三方</view>
...@@ -150,41 +156,41 @@ ...@@ -150,41 +156,41 @@
</view> </view>
<view class="order-item"> <view class="order-item">
<view class="item"> <view class="item">
<image class="order-icon"></image> <image class="order-icon" />
<view class="order-desc">待付款</view> <view class="order-desc">待付款</view>
</view> </view>
<view class="item"> <view class="item">
<image class="order-icon"></image> <image class="order-icon" />
<view class="order-desc">待付款</view> <view class="order-desc">待付款</view>
</view> </view>
<view class="item"> <view class="item">
<image class="order-icon"></image> <image class="order-icon" />
<view class="order-desc">待付款</view> <view class="order-desc">待付款</view>
</view> </view>
<view class="item"> <view class="item">
<image class="order-icon"></image> <image class="order-icon" />
<view class="order-desc">待付款</view> <view class="order-desc">待付款</view>
</view> </view>
<view class="item"> <view class="item">
<image class="order-icon"></image> <image class="order-icon" />
<view class="order-desc">待付款</view> <view class="order-desc">待付款</view>
</view> </view>
</view> </view>
<view class="tool-list" wx:if="{{false}}"> <view class="tool-list" wx:if="{{false}}">
<view class="tool-item"> <view class="tool-item">
<image class="tool-icon"></image> <image class="tool-icon" />
<view class="tool-desc">待付款</view> <view class="tool-desc">待付款</view>
</view> </view>
<view class="tool-item"> <view class="tool-item">
<image class="tool-icon"></image> <image class="tool-icon" />
<view class="tool-desc">待付款</view> <view class="tool-desc">待付款</view>
</view> </view>
<view class="tool-item"> <view class="tool-item">
<image class="tool-icon"></image> <image class="tool-icon" />
<view class="tool-desc">待付款</view> <view class="tool-desc">待付款</view>
</view> </view>
<view class="tool-item"> <view class="tool-item">
<image class="tool-icon"></image> <image class="tool-icon" />
<view class="tool-desc">待付款</view> <view class="tool-desc">待付款</view>
</view> </view>
</view> </view>
...@@ -193,8 +199,10 @@ ...@@ -193,8 +199,10 @@
</view> </view>
</view> </view>
<bottom-tabs /> <bottom-tabs/>
<!--goHome-->
<go-home/>
<!--<view class="animation-element-wrapper"> <!--<view class="animation-element-wrapper">
<view class="animation-element" animation="{{animation}}"></view> <view class="animation-element" animation="{{animation}}"></view>
...@@ -204,5 +212,3 @@ ...@@ -204,5 +212,3 @@
<button class="animation-button animation-button-reset" bindtap="reset">还原</button> <button class="animation-button animation-button-reset" bindtap="reset">还原</button>
</view>--> </view>-->
src/pages/myAddress/myAddress.json
{ {
"navigationBarTitleText": "我的地址", "navigationBarTitleText": "我的地址",
"usingComponents": {} "usingComponents": {
"go-home": "/component/goHome/goHome"
}
} }
\ No newline at end of file
src/pages/myAddress/myAddress.wxml
<!--pages/myAddress/myAddress.wxml--> <!--pages/myAddress/myAddress.wxml-->
<view class="page-my-address"> <view class="page-my-address">
<view class="wx-address" bindtap="chooseWxAddress"> <view class="wx-address" bindtap="chooseWxAddress">
<image class="wx-icon" src="/assets/imgs/7_1_0/wx-icon.png" mode="widthFix"></image> <image class="wx-icon" src="/assets/imgs/7_1_0/wx-icon.png" mode="widthFix" />
<text class="wx-text">使用微信地址</text> <text class="wx-text">使用微信地址</text>
<image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png" mode="widthFix"></image> <image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png" mode="widthFix" />
</view> </view>
<view class="address-wrap"> <view class="address-wrap">
<view class="address-ul"> <view class="address-ul">
<view class="address-list" wx:for="{{addressList}}" wx:key="{{index}}" bindtouchstart="drawStart" bindtouchmove="drawMove" bindtouchend="drawEnd" style="right:{{item.right}}rpx" data-index="{{index}}"> <view
class="address-list"
wx:for="{{addressList}}"
wx:key="{{index}}"
bindtouchstart="drawStart"
bindtouchmove="drawMove"
bindtouchend="drawEnd"
style="right:{{item.right}}rpx"
data-index="{{index}}"
>
<view class="name"> <view class="name">
{{item.name}} {{item.phone}} {{item.name}} {{item.phone}}
</view> </view>
<view class="address-detail">{{item.fullArea}} {{item.address}}</view> <view class="address-detail">{{item.fullArea}} {{item.address}}</view>
<view class="default-address" bindtap="settingDefalutAddress" data-type="{{item.type}}" data-id="{{item.id}}"> <view
<view class="{{item.type == 1 ? 'theme-color' : ''}} circle-radio" > class="default-address"
<image wx:if="{{item.type == 1}}" class="tick-success" src="/assets/imgs/7_1_0/tick-success.png" mode="widthFix"></image> bindtap="settingDefalutAddress"
data-type="{{item.type}}"
data-id="{{item.id}}"
>
<view class="{{item.type == 1 ? 'theme-color' : ''}} circle-radio">
<image
wx:if="{{item.type == 1}}"
class="tick-success"
src="/assets/imgs/7_1_0/tick-success.png"
mode="widthFix"
/>
</view> </view>
<text class="setting-default">设为默认地址</text> <text class="setting-default">设为默认地址</text>
</view> </view>
<navigator url="/pages/addAddress/addAddress?id={{item.id}}"> <navigator url="/pages/addAddress/addAddress?id={{item.id}}">
<image class="edit-img" mode="widthFix" src="/assets/imgs/7_1_0/edit.png"></image> <image class="edit-img" mode="widthFix" src="/assets/imgs/7_1_0/edit.png" />
</navigator> </navigator>
<view class="delete" bindtap="deleteAddress" data-id="{{item.id}}">删除</view> <view class="delete" bindtap="deleteAddress" data-id="{{item.id}}">删除</view>
</view> </view>
...@@ -32,5 +51,14 @@ ...@@ -32,5 +51,14 @@
</navigator> </navigator>
</view> </view>
</view> </view>
<!--goHome-->
<go-home/>
<share-poster
id="getPoster"
bindmyevent="myEventListener"
avater="http://t2.hddhhn.com/uploads/tu/201806/9999/91480c0c87.jpg"
codeimg="http://i4.hexun.com/2018-07-05/193365388.jpg"
productDesc="1111"
userAvatar="http://t2.hddhhn.com/uploads/tu/201806/9999/91480c0c87.jpg"
/>
<share-poster id="getPoster" bindmyevent="myEventListener" avater="http://t2.hddhhn.com/uploads/tu/201806/9999/91480c0c87.jpg" codeimg="http://i4.hexun.com/2018-07-05/193365388.jpg" productDesc="1111" userAvatar="http://t2.hddhhn.com/uploads/tu/201806/9999/91480c0c87.jpg"></share-poster>
\ No newline at end of file
src/pages/myShare/myShare.json
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
"usingComponents": { "usingComponents": {
"water-flow-layout": "/component/waterFlowLayout/waterFlowLayout", "water-flow-layout": "/component/waterFlowLayout/waterFlowLayout",
"card-modal": "/component/cardModal/cardModal" "card-modal": "/component/cardModal/cardModal",
"go-home": "/component/goHome/goHome"
} }
} }
\ No newline at end of file
src/pages/myShare/myShare.wxml
<view class='page-want-buy'> <view class='page-want-buy'>
<view class="swiper-tab {{categoryList.length > 5 ? 'categoryList' : ''}}"> <view class="swiper-tab {{categoryList.length > 5 ? 'categoryList' : ''}}">
<view class="swiper-tab-item {{currentTab==item.id ? 'active' : ''}} " data-current="{{item.id}}" bindtap="clickTab" wx:for="{{categoryList}}" wx:key="{{index}}"> <view
class="swiper-tab-item {{currentTab==item.id ? 'active' : ''}} "
data-current="{{item.id}}"
bindtap="clickTab"
wx:for="{{categoryList}}"
wx:key="{{index}}"
>
{{item.name}} {{item.name}}
<view class="line" wx-if="{{currentTab==item.id}}"></view> <view class="line" wx-if="{{currentTab==item.id}}" />
</view> </view>
</view> </view>
<scroll-view scroll-y > <scroll-view scroll-y>
<view class="main-content" wx:if="{{contentList.length > 0}}"> <view class="main-content" wx:if="{{contentList.length > 0}}">
<water-flow-layout type="1" image-data="{{contentList}}" bind:updataLike="gotoLike" bind:_onTapShare="_onTapShare"/> <water-flow-layout
type="1"
image-data="{{contentList}}"
bind:updataLike="gotoLike"
bind:_onTapShare="_onTapShare"
/>
</view> </view>
<view class="empty" wx:if="{{!contentList || contentList.length < 1}}"> <view class="empty" wx:if="{{!contentList || contentList.length < 1}}">
暂无内容哦~ 暂无内容哦~
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<card-modal show-card-modal="{{showCardModal}}" card-title="{{cardTitle}}" card-url="{{cardUrl}}" page-path="{{pagePath}}"/> <card-modal
show-card-modal="{{showCardModal}}"
card-title="{{cardTitle}}"
card-url="{{cardUrl}}"
page-path="{{pagePath}}"
/>
<!--goHome-->
<go-home/>
src/pages/mySpend/mySpend.json
{ {
"navigationBarTitleText": "我的消费", "navigationBarTitleText": "我的消费",
"usingComponents": { "usingComponents": {
"no-more": "/component/noMore/noMore" "no-more": "/component/noMore/noMore",
"go-home": "/component/goHome/goHome"
}, },
"enablePullDownRefresh": true "enablePullDownRefresh": true
} }
\ No newline at end of file
src/pages/mySpend/mySpend.wxml
...@@ -2,7 +2,13 @@ ...@@ -2,7 +2,13 @@
<view wx:if="{{!orderList.length}}" class="detail-list-no">还没有任何消费记录</view> <view wx:if="{{!orderList.length}}" class="detail-list-no">还没有任何消费记录</view>
<view class='page-mySpend' wx:if="{{orderList.length}}"> <view class='page-mySpend' wx:if="{{orderList.length}}">
<scroll-view scroll-y bindscrolltolower="bindDownLoad"> <scroll-view scroll-y bindscrolltolower="bindDownLoad">
<view class='spend-wrap' wx:for='{{orderList}}' wx:for-item="item" wx:for-index="k" wx:key="{{k}}"> <view
class='spend-wrap'
wx:for='{{orderList}}'
wx:for-item="item"
wx:for-index="k"
wx:key="{{k}}"
>
<view class='spend-list' data-order-no="{{item.orderNo}}" bindtap="goDetail"> <view class='spend-list' data-order-no="{{item.orderNo}}" bindtap="goDetail">
<view class='spend-id fs-22'>订单编号：{{item.orderNo}}</view> <view class='spend-id fs-22'>订单编号：{{item.orderNo}}</view>
<view class='spend-time fs-25'>消费时间：{{item.payTime}}</view> <view class='spend-time fs-25'>消费时间：{{item.payTime}}</view>
...@@ -12,6 +18,9 @@ ...@@ -12,6 +18,9 @@
</view> </view>
</scroll-view> </scroll-view>
<view class="no-bottom"> <view class="no-bottom">
<no-more wx:if="{{noMore}}"/> <no-more wx:if="{{noMore}}" />
</view> </view>
</view> </view>
<!--goHome-->
<go-home/>
src/pages/order/order.json
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
"navigationBarTitleText": "我的订单", "navigationBarTitleText": "我的订单",
"usingComponents": { "usingComponents": {
"no-more": "/component/noMore/noMore" "no-more": "/component/noMore/noMore",
"go-home": "/component/goHome/goHome"
} }
} }
\ No newline at end of file
src/pages/order/order.wxml
...@@ -165,3 +165,6 @@ ...@@ -165,3 +165,6 @@
</view> </view>
</view> </view>
<!--goHome-->
<go-home/>
src/pages/orderDetail/orderDetail.json
{ {
"navigationBarTitleText": "订单详情", "navigationBarTitleText": "订单详情",
"usingComponents": {} "usingComponents": {
"go-home": "/component/goHome/goHome"
}
} }
\ No newline at end of file
src/pages/orderDetail/orderDetail.wxml
...@@ -106,14 +106,34 @@ ...@@ -106,14 +106,34 @@
<button class="btn btn-lg btn-gray" data-id="{{detail.id}}" bindtap="handelCancelOrder">取消订单</button> <button class="btn btn-lg btn-gray" data-id="{{detail.id}}" bindtap="handelCancelOrder">取消订单</button>
</view> </view>
<view class="button-wrap" wx-if="{{detail.status == 'P'}}"> <view class="button-wrap" wx-if="{{detail.status == 'P'}}">
<button class="btn btn-lg btn-gray" data-id="{{detail.id}}" data-detail="{{detail}}" bindtap="handelRequestRefund">申请退款</button> <button
class="btn btn-lg btn-gray"
data-id="{{detail.id}}"
data-detail="{{detail}}"
bindtap="handelRequestRefund"
>申请退款
</button>
</view> </view>
<view class="button-wrap" wx-if="{{detail.status == 'D'}}"> <view class="button-wrap" wx-if="{{detail.status == 'D'}}">
<button class="btn btn-primary btn-lg" data-id="{{detail.id}}" data-detail="{{detail}}" bindtap="handelRequestRefund">申请退款</button> <button
class="btn btn-primary btn-lg"
data-id="{{detail.id}}"
data-detail="{{detail}}"
bindtap="handelRequestRefund"
>申请退款
</button>
<button class="btn btn-lg btn-gray" data-id="{{detail.id}}" bindtap="handelConfirmReceipt">确认收货</button> <button class="btn btn-lg btn-gray" data-id="{{detail.id}}" bindtap="handelConfirmReceipt">确认收货</button>
</view> </view>
<view class="button-wrap" wx-if="{{detail.status == 'R'}}"> <view class="button-wrap" wx-if="{{detail.status == 'R'}}">
<button class="btn btn-lg btn-gray" data-id="{{detail.id}}" data-detail="{{detail}}" bindtap="handelRequestRefund">申请退款</button> <button
class="btn btn-lg btn-gray"
data-id="{{detail.id}}"
data-detail="{{detail}}"
bindtap="handelRequestRefund"
>申请退款
</button>
</view> </view>
</view> </view>
<!--goHome-->
<go-home/>
src/pages/pointDetail/pointDetail.json
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
"x-dialog":"/component/dialog/dialog", "x-dialog":"/component/dialog/dialog",
"x-progress-point":"/component/progressPoint/progressPoint", "x-progress-point":"/component/progressPoint/progressPoint",
"x-progress-image":"/component/progressImage/progressImage", "x-progress-image":"/component/progressImage/progressImage",
"authorization-modal-point": "/component/authorization-modal-point/authorization-modal-point" "authorization-modal-point": "/component/authorization-modal-point/authorization-modal-point",
"go-home": "/component/goHome/goHome"
} }
} }
\ No newline at end of file
src/pages/pointDetail/pointDetail.wxml
<!--pages/pointDetail/pointDetail.wxml--> <!--pages/pointDetail/pointDetail.wxml-->
<wxs src="./tools.wxs" module="tools" /> <wxs src="./tools.wxs" module="tools" />
<status-img imgHeight="{{imgHeight}}" img="{{detailImage}}" currentStatus="{{currentStatus}}" currentTimeStatus="{{currentTimeStatus}}"/> <status-img
imgHeight="{{imgHeight}}"
img="{{detailImage}}"
currentStatus="{{currentStatus}}"
currentTimeStatus="{{currentTimeStatus}}"
/>
<view class="detail-info border_box" wx:if="{{goal}}"> <view class="detail-info border_box" wx:if="{{goal}}">
<view class="info-top weui-flex df-j--bt"> <view class="info-top weui-flex df-j--bt">
<view class="info-num"> <view class="info-num">
...@@ -27,7 +32,14 @@ ...@@ -27,7 +32,14 @@
stroke-width='20' stroke-width='20'
radius='20' radius='20'
/>--> />-->
<x-progress-image goal="{{goal}}" iconImageFinsh="{{iconImageFinsh}}" iconImage="{{iconImage}}" AvailableNum="{{countObj.surplusExchangeCount}}" showRemNum="{{countObj.totalPoints ? tools.parse(countObj.totalPoints % goal) : 0}}" showNum="{{tools.parse(countObj.totalPoints % goal) == 0}}"/> <x-progress-image
goal="{{goal}}"
iconImageFinsh="{{iconImageFinsh}}"
iconImage="{{iconImage}}"
AvailableNum="{{countObj.surplusExchangeCount}}"
showRemNum="{{countObj.totalPoints ? tools.parse(countObj.totalPoints % goal) : 0}}"
showNum="{{tools.parse(countObj.totalPoints % goal) == 0}}"
/>
</view> </view>
<!-- 活动剩余点数 >= 目标点数 wx:if="{{countObj.surplusPoints >= goal}}"--> <!-- 活动剩余点数 >= 目标点数 wx:if="{{countObj.surplusPoints >= goal}}"-->
<button <button
...@@ -58,5 +70,7 @@ ...@@ -58,5 +70,7 @@
bind:_closeDialog="_closeDialog" bind:_closeDialog="_closeDialog"
show="{{dialog.show}}" show="{{dialog.show}}"
/> />
<!--goHome-->
<go-home/>
<authorization-modal-point isAuthorization='{{isAuthorization}}' />
<authorization-modal-point isAuthorization='{{isAuthorization}}'/>
src/pages/pointList/pointList.json
{ {
"navigationBarTitleText": "集点列表", "navigationBarTitleText": "集点列表",
"usingComponents": { "usingComponents": {
"status-img": "/component/statusPoint/statusPoint" "status-img": "/component/statusPoint/statusPoint",
"go-home": "/component/goHome/goHome"
} }
} }
\ No newline at end of file
src/pages/pointList/pointList.wxml
...@@ -6,7 +6,12 @@ ...@@ -6,7 +6,12 @@
<view class="point-list border_box" wx:if="{{pointList.length}}"> <view class="point-list border_box" wx:if="{{pointList.length}}">
<block wx:for="{{pointList}}" wx:key="item"> <block wx:for="{{pointList}}" wx:key="item">
<view class="point border_box" data-id="{{item.id}}" bindtap="handleDetail"> <view class="point border_box" data-id="{{item.id}}" bindtap="handleDetail">
<status-img img="{{item.listImage}}" currentStatus="{{currentStatus}}" currentTimeStatus="{{currentTimeStatus}}"-/> <status-img
img="{{item.listImage}}"
currentStatus="{{currentStatus}}"
currentTimeStatus="{{currentTimeStatus}}"
-
/>
<view class="progress weui-flex df-j--bt"> <view class="progress weui-flex df-j--bt">
<view class="rate">进度： <view class="rate">进度：
<span wx:if="{{item.surplusExchangeCount}}"> <span wx:if="{{item.surplusExchangeCount}}">
...@@ -26,3 +31,6 @@ ...@@ -26,3 +31,6 @@
</block> </block>
</view> </view>
<!--goHome-->
<go-home/>
src/pages/productDetail/productDetail.json
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
"buy-image-swiper": "/component/buyImageSwiper/buyImageSwiper", "buy-image-swiper": "/component/buyImageSwiper/buyImageSwiper",
"sku-popup": "/component/skuPopup/skuPopup", "sku-popup": "/component/skuPopup/skuPopup",
"card-modal": "/component/cardModal/cardModal", "card-modal": "/component/cardModal/cardModal",
"x-html": "/component/html2wxml/wxHtml" "x-html": "/component/html2wxml/wxHtml",
"go-home": "/component/goHome/goHome"
} }
} }
\ No newline at end of file
src/pages/productDetail/productDetail.wxml
...@@ -78,7 +78,6 @@ ...@@ -78,7 +78,6 @@
<x-html html="{{productInfo.descHtml}}" /> <x-html html="{{productInfo.descHtml}}" />
</block> </block>
<view class="product-footer"> <view class="product-footer">
<view class="footer-icons clearfix"> <view class="footer-icons clearfix">
<form <form
...@@ -159,11 +158,18 @@ ...@@ -159,11 +158,18 @@
product-stock="{{productInfo.stock}}" product-stock="{{productInfo.stock}}"
/> />
<card-modal show-card-modal="{{showCardModal}}" card-title="{{cardTitle}}" card-url="{{cardUrl}}" page-path="{{pagePath}}"/> <card-modal
show-card-modal="{{showCardModal}}"
card-title="{{cardTitle}}"
card-url="{{cardUrl}}"
page-path="{{pagePath}}"
/>
<!-- <sku-popup <!-- <sku-popup
product-sku="{{productInfo.productSku}}" product-sku="{{productInfo.productSku}}"
/> --> /> -->
<!--goHome-->
<go-home/>
src/pages/refund/refund.json
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
"navigationBarTitleText": "退款/售后", "navigationBarTitleText": "退款/售后",
"usingComponents": { "usingComponents": {
"upload-img": "/component/uploadImg/uploadImg", "upload-img": "/component/uploadImg/uploadImg",
"scroll-del": "/component/scrollDel/scrollDel" "scroll-del": "/component/scrollDel/scrollDel",
"go-home": "/component/goHome/goHome"
} }
} }
\ No newline at end of file
src/pages/refund/refund.wxml
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<text class="img-number">最多5张</text> <text class="img-number">最多5张</text>
</view> </view>
<view class="form-input"> <view class="form-input">
<upload-img bind:_uploadImg="_uploadImg"/> <upload-img bind:_uploadImg="_uploadImg" />
</view> </view>
</view> </view>
</view> </view>
...@@ -85,3 +85,6 @@ ...@@ -85,3 +85,6 @@
</view> </view>
</view> </view>
<!--goHome-->
<go-home/>
src/pages/refundDetail/refundDetail.json
{ {
"navigationBarTitleText": "退单详情", "navigationBarTitleText": "退单详情",
"usingComponents": { "usingComponents": {
"apply-refund": "/component/applyRefund/applyRefund" "apply-refund": "/component/applyRefund/applyRefund",
"go-home": "/component/goHome/goHome"
} }
} }
\ No newline at end of file
src/pages/refundDetail/refundDetail.wxml
...@@ -119,3 +119,6 @@ ...@@ -119,3 +119,6 @@
<apply-refund show="{{showApplyRefundModal}}" /> <apply-refund show="{{showApplyRefundModal}}" />
<!--goHome-->
<go-home/>
src/pages/shareNumber/shareNumber.json
{ {
"usingComponents": {} "usingComponents": { "go-home": "/component/goHome/goHome"}
} }
\ No newline at end of file
src/pages/wantToBuyDetail/wantToBuyDetail.json
{} {
\ No newline at end of file "navigationBarTitleText": "",
"usingComponents": {
"go-home": "/component/goHome/goHome"
}
}
\ No newline at end of file
src/pages/wantToBuyDetail/wantToBuyDetail.wxml
<view class='page-want-buy'> <view class='page-want-buy'>
<buy-image-swiper bind:updatePage="updatePage" image-data="{{contentInfo.shareShowPictureRESDTOList}}"/> <buy-image-swiper bind:updatePage="updatePage" image-data="{{contentInfo.shareShowPictureRESDTOList}}" />
<view class="buy-desc"> <view class="buy-desc">
<view>{{contentInfo.describe}}</view> <view>{{contentInfo.describe}}</view>
<view class="share-wrap"> <view class="share-wrap">
<view class="share-oprate" bindtap="gotoLike"> <view class="share-oprate" bindtap="gotoLike">
<image class="share-img" src="{{contentInfo.currentType ? '/assets/imgs/heart-primary.png' : '/assets/imgs/heart-default.png'}}"></image> <image class="share-img" src="{{contentInfo.currentType ? '/assets/imgs/heart-primary.png' : '/assets/imgs/heart-default.png'}}" />
<text class="share-number">{{contentInfo.enjoySum || 0}}</text> <text class="share-number">{{contentInfo.enjoySum || 0}}</text>
</view> </view>
<view class="share-oprate" bindtap="onTapShare"> <view class="share-oprate" bindtap="onTapShare">
<image class="share-img" src="/assets/imgs/share.png"></image> <image class="share-img" src="/assets/imgs/share.png" />
<text class="share-number">{{contentInfo.transmitSum || 0}}</text> <text class="share-number">{{contentInfo.transmitSum || 0}}</text>
</view> </view>
</view> </view>
...@@ -19,9 +18,9 @@ ...@@ -19,9 +18,9 @@
<view class="buy-product-content"> <view class="buy-product-content">
<block wx:for="{{proList}}" wx:key="{{index}}"> <block wx:for="{{proList}}" wx:key="{{index}}">
<navigator hover-class="none" url="/pages/productDetail/productDetail?productId={{item.productId}}"> <navigator hover-class="none" url="/pages/productDetail/productDetail?productId={{item.productId}}">
<view class="buy-list" > <view class="buy-list">
<view class="prod-img"> <view class="prod-img">
<image src="{{item.indexUrl}}"></image> <image src="{{item.indexUrl}}" />
</view> </view>
<view class="prod-info"> <view class="prod-info">
<view class="prod-name">{{item.productName}}</view> <view class="prod-name">{{item.productName}}</view>
...@@ -38,6 +37,13 @@ ...@@ -38,6 +37,13 @@
</view> </view>
</view> </view>
</view> </view>
<card-modal show-card-modal="{{showCardModal}}" card-title="{{cardTitle}}" card-url="{{cardUrl}}" page-path="{{pagePath}}"/> <card-modal
show-card-modal="{{showCardModal}}"
card-title="{{cardTitle}}"
card-url="{{cardUrl}}"
page-path="{{pagePath}}"
/>
<!--goHome-->
<go-home/>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment