Commit 77f88982 authored by Junling Bu's avatar Junling Bu
Browse files

chore[litemall-wx]: 清理图片资源,尽可能使用vant-weapp图标

parent 6b5db0b9
......@@ -13,7 +13,7 @@
<text>{{address}}</text>
</view>
<view class="item-right" bindtap="showLocation">
<image src="/static/images/ico-addr.png" class="right-icon"></image>
<van-icon class="right-icon" name="location-o" />
</view>
</view>
......@@ -23,7 +23,7 @@
<text>{{phone}}</text>
</view>
<view class="item-right" bindtap="callPhone">
<image src="/static/images/telephone.png" class="right-icon"></image>
<van-icon class="right-icon" name="phone-o" />
</view>
</view>
......@@ -33,7 +33,7 @@
<text>{{qq}}</text>
</view>
<view class="item-right">
<image src="/static/images/mobile.png" class="right-icon"></image>
<van-icon class="right-icon" name="friends-o" />
</view>
</view>
......
......@@ -3,18 +3,18 @@
<view class="form-item">
<input class="username" value="{{username}}" bindinput="bindUsernameInput" placeholder="账号"/>
<image wx:if="{{ username.length > 0 }}" id="clear-username" class="clear" src="/static/images/clear_input.png" catchtap="clearInput"></image>
<van-icon name="close" wx:if="{{ username.length > 0 }}" id="clear-username" class="clear" catchtap="clearInput"/>
</view>
<view class="form-item">
<input class="password" value="{{password}}" password bindinput="bindPasswordInput" placeholder="密码"/>
<image class="clear" id="clear-password" wx:if="{{ password.length > 0 }}" src="/static/images/clear_input.png" catchtap="clearInput"></image>
<van-icon class="clear" id="clear-password" wx:if="{{ password.length > 0 }}" name="close" catchtap="clearInput"/>
</view>
<!-- <view class="form-item-code" wx-if="{{loginErrorCount >= 3}}">
<view class="form-item code-item">
<input class="code" value="{{code}}" bindinput="bindCodeInput" placeholder="验证码"/>
<image class="clear" id="clear-code" wx:if="{{ code.length > 0 }}" src="/static/images/clear_input.png" catchtap="clearInput"></image>
<van-icon class="clear" id="clear-code" wx:if="{{ code.length > 0 }}" name="close" catchtap="clearInput"/>
</view>
<image class="code-img" src="captcha.png"></image>
</view> -->
......
......@@ -47,13 +47,11 @@
.form-item .clear {
position: absolute;
top: 26rpx;
top: 32rpx;
right: 18rpx;
z-index: 2;
display: block;
background: #fff;
height: 44rpx;
width: 44rpx;
}
.login-btn {
......
......@@ -3,28 +3,28 @@
<view class="form-item">
<input class="username" value="{{username}}" bindinput="bindUsernameInput" placeholder="用户名" auto-focus/>
<image wx:if="{{ username.length > 0 }}" id="clear-username" class="clear" src="/static/images/clear_input.png" catchtap="clearInput"></image>
<van-icon wx:if="{{ username.length > 0 }}" id="clear-username" class="clear" name="close" catchtap="clearInput"/>
</view>
<view class="form-item">
<input class="password" value="{{password}}" password bindinput="bindPasswordInput" placeholder="密码" />
<image class="clear" id="clear-password" wx:if="{{ password.length > 0 }}" src="/static/images/clear_input.png" catchtap="clearInput"></image>
<van-icon class="clear" id="clear-password" wx:if="{{ password.length > 0 }}" name="close" catchtap="clearInput"/>
</view>
<view class="form-item">
<input class="password" value="{{confirmPassword}}" password bindinput="bindConfirmPasswordInput" placeholder="确认密码" />
<image class="clear" id="clear-confirm-password" wx:if="{{ confirmPassword.length > 0 }}" src="/static/images/clear_input.png" catchtap="clearInput"></image>
<van-icon class="clear" id="clear-confirm-password" wx:if="{{ confirmPassword.length > 0 }}" name="close" catchtap="clearInput"/>
</view>
<view class="form-item">
<input class="mobile" value="{{mobile}}" bindinput="bindMobileInput" placeholder="手机号" />
<image wx:if="{{ mobile.length > 0 }}" id="clear-mobile" class="clear" src="/static/images/clear_input.png" catchtap="clearInput"></image>
<van-icon class="clear" id="clear-mobile" wx:if="{{ mobile.length > 0 }}" name="close" catchtap="clearInput"/>
</view>
<view class="form-item-code">
<view class="form-item code-item">
<input class="code" value="{{code}}" bindinput="bindCodeInput" placeholder="验证码" />
<image class="clear" id="clear-code" wx:if="{{ code.length > 0 }}" src="/static/images/clear_input.png" catchtap="clearInput"></image>
<van-icon class="clear" id="clear-code" wx:if="{{ code.length > 0 }}" name="close" catchtap="clearInput"/>
</view>
<view class="code-btn" bindtap="sendCode">获取验证码</view>
</view>
......
......@@ -49,13 +49,11 @@
.form-item .clear {
position: absolute;
top: 26rpx;
top: 32rpx;
right: 18rpx;
z-index: 2;
display: block;
background: #fff;
height: 44rpx;
width: 44rpx;
}
.register-btn {
......
......@@ -3,25 +3,25 @@
<view class="form-item">
<input class="mobile" value="{{mobile}}" bindinput="bindMobileInput" placeholder="手机号" />
<image wx:if="{{ mobile.length > 0 }}" id="clear-mobile" class="clear" src="/static/images/clear_input.png" catchtap="clearInput"></image>
<van-icon wx:if="{{ mobile.length > 0 }}" id="clear-mobile" class="clear" catchtap="clearInput" name="close" />
</view>
<view class="form-item-code">
<view class="form-item code-item">
<input class="code" value="{{code}}" bindinput="bindCodeInput" placeholder="验证码" />
<image class="clear" id="clear-code" wx:if="{{ code.length > 0 }}" src="/static/images/clear_input.png" catchtap="clearInput"></image>
<van-icon wx:if="{{ code.length > 0 }}" id="clear-code" class="clear" catchtap="clearInput" name="close" />
</view>
<view class="code-btn" bindtap="sendCode">获取验证码</view>
</view>
<view class="form-item">
<input class="password" value="{{password}}" password bindinput="bindPasswordInput" placeholder="密码" />
<image class="clear" id="clear-password" wx:if="{{ password.length > 0 }}" src="/static/images/clear_input.png" catchtap="clearInput"></image>
<van-icon wx:if="{{ password.length > 0 }}" id="clear-password" class="clear" catchtap="clearInput" name="close" />
</view>
<view class="form-item">
<input class="password" value="{{confirmPassword}}" password bindinput="bindConfirmPasswordInput" placeholder="确认密码" />
<image class="clear" id="clear-confirm-password" wx:if="{{ confirmPassword.length > 0 }}" src="/static/images/clear_input.png" catchtap="clearInput"></image>
<van-icon wx:if="{{ confirmPassword.length > 0 }}" id="clear-confirm-password" class="clear" catchtap="clearInput" name="close" />
</view>
<button type="default" class="reset-btn" bindtap="startReset">密码重置</button>
......
......@@ -47,13 +47,11 @@
.form-item .clear {
position: absolute;
top: 26rpx;
top: 32rpx;
right: 18rpx;
z-index: 2;
display: block;
background: #fff;
height: 44rpx;
width: 44rpx;
}
.reset-btn {
......
......@@ -10,7 +10,7 @@
<text class="address">{{checkedAddress.addressDetail}}</text>
</view>
<view class="r">
<image src="/static/images/address_right.png"></image>
<van-icon name="arrow" />
</view>
</view>
<view class="address-item address-empty" bindtap="selectAddress" wx:else>
......@@ -18,7 +18,7 @@
还没有收货地址,去添加
</view>
<view class="r">
<image src="/static/images/address_right.png"></image>
<van-icon name="arrow" />
</view>
</view>
</view>
......@@ -38,7 +38,7 @@
<text class="txt">-¥{{couponPrice}}元</text>
</view>
<view class="r">
<image src="/static/images/address_right.png"></image>
<van-icon name="arrow" />
</view>
</view>
</view>
......
......@@ -14,8 +14,8 @@
<view class="rater">
<text class="rater-title">评分</text>
<block wx:for="{{stars}}" wx:key="*this" wx:for-item="item">
<image src="/static/images/icon_collect_checked.png" bindtap="selectRater" data-star="{{item}}" wx:if="{{item < star}}"></image>
<image src="/static/images/icon_collect.png" bindtap="selectRater" data-star="{{item}}" wx:else></image>
<van-icon name="star" bindtap="selectRater" color="#ab956d" data-star="{{item}}" wx:if="{{item < star}}"/>
<van-icon name="star-o" bindtap="selectRater" data-star="{{item}}" wx:else/>
</block>
<text class="rater-desc">{{starText}}</text>
</view>
......
......@@ -26,9 +26,7 @@ Page({
checkedSpecPrice: 0,
openAttr: false,
openShare: false,
noCollectImage: '/static/images/icon_collect.png',
hasCollectImage: '/static/images/icon_collect_checked.png',
collectImage: '/static/images/icon_collect.png',
collect: false,
shareImage: '',
isGroupon: false, //标识是否是一个参团购买
soldout: false,
......@@ -189,11 +187,11 @@ Page({
if (res.data.userHasCollect == 1) {
that.setData({
collectImage: that.data.hasCollectImage
collect: true
});
} else {
that.setData({
collectImage: that.data.noCollectImage
collect: false
});
}
......@@ -471,12 +469,12 @@ Page({
.then(function(res) {
if (that.data.userHasCollect == 1) {
that.setData({
collectImage: that.data.noCollectImage,
collect: false,
userHasCollect: 0
});
} else {
that.setData({
collectImage: that.data.hasCollectImage,
collect: true,
userHasCollect: 1
});
}
......@@ -497,10 +495,7 @@ Page({
//提示选择完整规格
if (!this.isCheckedAllSpec()) {
wx.showToast({
image: '/static/images/icon_error.png',
title: '请选择完整规格'
});
util.showErrorToast('请选择完整规格');
return false;
}
......@@ -508,20 +503,14 @@ Page({
let checkedProductArray = this.getCheckedProductItem(this.getCheckedSpecKey());
if (!checkedProductArray || checkedProductArray.length <= 0) {
//找不到对应的product信息,提示没有库存
wx.showToast({
image: '/static/images/icon_error.png',
title: '没有库存'
});
util.showErrorToast('没有库存');
return false;
}
let checkedProduct = checkedProductArray[0];
//验证库存
if (checkedProduct.number <= 0) {
wx.showToast({
image: '/static/images/icon_error.png',
title: '没有库存'
});
util.showErrorToast('没有库存');
return false;
}
......@@ -548,11 +537,7 @@ Page({
} catch (e) {}
} else {
wx.showToast({
image: '/static/images/icon_error.png',
title: res.errmsg,
mask: true
});
util.showErrorToast(res.errmsg);
}
});
}
......@@ -572,10 +557,7 @@ Page({
//提示选择完整规格
if (!this.isCheckedAllSpec()) {
wx.showToast({
image: '/static/images/icon_error.png',
title: '请选择完整规格'
});
util.showErrorToast('请选择完整规格');
return false;
}
......@@ -583,20 +565,14 @@ Page({
let checkedProductArray = this.getCheckedProductItem(this.getCheckedSpecKey());
if (!checkedProductArray || checkedProductArray.length <= 0) {
//找不到对应的product信息,提示没有库存
wx.showToast({
image: '/static/images/icon_error.png',
title: '没有库存'
});
util.showErrorToast('没有库存');
return false;
}
let checkedProduct = checkedProductArray[0];
//验证库存
if (checkedProduct.number <= 0) {
wx.showToast({
image: '/static/images/icon_error.png',
title: '没有库存'
});
util.showErrorToast('没有库存');
return false;
}
......@@ -618,19 +594,15 @@ Page({
});
if (that.data.userHasCollect == 1) {
that.setData({
collectImage: that.data.hasCollectImage
collect: true
});
} else {
that.setData({
collectImage: that.data.noCollectImage
collect: false
});
}
} else {
wx.showToast({
image: '/static/images/icon_error.png',
title: _res.errmsg,
mask: true
});
util.showErrorToast(_res.errmsg);
}
});
......
......@@ -12,7 +12,7 @@
<view class="share-pop-box" hidden="{{!openShare}}">
<view class="share-pop">
<view class="close" bindtap="closeShare">
<image class="icon" src="/static/images/icon_close.png"></image>
<van-icon class="icon" name="cross" />
</view>
<view class='share-info'>
<button class="sharebtn" open-type="share" wx:if="{{!isGroupon}}">
......@@ -48,7 +48,7 @@
</view>
<view class="section-nav section-attr" bindtap="switchAttrPop">
<view class="t">{{checkedSpecText}}</view>
<image class="i" src="/static/images/address_right.png" background-size="cover"></image>
<van-icon class="i" name="arrow" />
</view>
<view class="comments" wx:if="{{comment.count > 0}}">
<view class="h">
......@@ -132,7 +132,7 @@
<view class="attr-pop-box" hidden="{{!openAttr}}">
<view class="attr-pop">
<view class="close" bindtap="closeAttr">
<image class="icon" src="/static/images/icon_close.png"></image>
<van-icon class="icon" name="cross" />
</view>
<view class="img-info">
<image class="img" src="{{goods.picUrl}}"></image>
......@@ -184,12 +184,13 @@
<!-- 底部按钮 -->
<view class="bottom-btn">
<view class="l l-collect" bindtap="addCollectOrNot" wx:if="{{!isGroupon}}">
<image class="icon" src="{{ collectImage }}"></image>
<van-icon class="icon" name="star" color="#ab956d" wx:if="{{collect}}"/>
<van-icon class="icon" name="star-o" wx:else/>
</view>
<view class="l l-cart" wx:if="{{!isGroupon}}">
<view class="box">
<text class="cart-count">{{cartGoodsCount}}</text>
<image bindtap="openCartPage" class="icon" src="/static/images/ic_menu_shoping_nor.png"></image>
<van-icon bindtap="openCartPage" class="icon" name="cart-o" />
</view>
</view>
<view class="r" bindtap="addToCart" wx:if="{{!soldout}}" wx:if="{{!isGroupon}}">加入购物车</view>
......
......@@ -569,6 +569,13 @@
width: 90rpx;
}
.bottom-btn .l.l-collect .icon {
position: absolute;
top: 28rpx;
left: 20rpx;
font-size: 44rpx;
}
.bottom-btn .l.l-kefu {
position: relative;
height: 54rpx;
......@@ -600,12 +607,7 @@
position: absolute;
top: 10rpx;
left: 0;
}
.bottom-btn .l .icon {
display: block;
height: 44rpx;
width: 44rpx;
font-size: 44rpx;
}
.bottom-btn .c {
......
......@@ -3,7 +3,7 @@
<view class="input-box">
<van-icon name="search"/>
<input name="input" class="keywrod" focus="true" value="{{keyword}}" confirm-type="search" bindinput="inputChange" bindfocus="inputFocus" bindconfirm="onKeywordConfirm" placeholder="{{defaultKeyword.keyword}}" />
<image class="del" wx:if="{{keyword}}" bindtap="clearKeyword" src="/static/images/icon_close.png"></image>
<van-icon class="del" wx:if="{{keyword}}" bindtap="clearKeyword" name="cross" />
</view>
<view class="right" bindtap="closeSearch">取消</view>
</view>
......@@ -11,7 +11,7 @@
<view class="search-keywords search-history" wx:if="{{!keyword && historyKeyword.length}}">
<view class="h">
<text class="title">历史记录</text>
<image class="icon" bindtap="clearHistory" src="/static/images/delete.png"></image>
<van-icon bindtap="clearHistory" name="delete" class="icon"/>
</view>
<view class="b">
<view class="item" bindtap="onKeywordTap" data-keyword="{{item.keyword}}" wx:for="{{historyKeyword}}" wx:key="keyword" hover-class="navigator-hover">{{item.keyword}}</view>
......
......@@ -14,8 +14,8 @@
<view class="rater">
<text class="rater-title">评分</text>
<block wx:for="{{stars}}" wx:key="*this" wx:for-item="item">
<image src="/static/images/icon_collect_checked.png" bindtap="selectRater" data-star="{{item}}" wx:if="{{item < star}}"></image>
<image src="/static/images/icon_collect.png" bindtap="selectRater" data-star="{{item}}" wx:else></image>
<van-icon name="star" bindtap="selectRater" color="#ab956d" data-star="{{item}}" wx:if="{{item < star}}"/>
<van-icon name="star-o" bindtap="selectRater" data-star="{{item}}" wx:else/>
</block>
<text class="rater-desc">{{starText}}</text>
</view>
......
......@@ -27,7 +27,7 @@
<scroll-view class="comments">
<view class="h">
<text class="t">精选留言</text>
<image bindtap="postComment" class="i" src="/static/images/edit.png"></image>
<van-icon bindtap="postComment" class="i" name="comment-o" />
</view>
<view class="has-comments" wx:if="{{commentList.length > 0 }}">
<view class="b">
......
......@@ -36,7 +36,6 @@
.comments .h .i {
display: block;
float: right;
margin-top: 30rpx;
width: 33rpx;
height: 33rpx;
}
......
......@@ -10,7 +10,7 @@
<view class="address">{{item.addressDetail}}</view>
</view>
<view class="r">
<image catchtap="deleteAddress" data-address-id="{{item.id}}" class="del" src="/static/images/delete.png"></image>
<van-icon catchtap="deleteAddress" data-address-id="{{item.id}}" class="del" name="delete"/>
</view>
</view>
</view>
......
......@@ -17,7 +17,7 @@
<view class="coupon-form" wx:if="{{status == 0}}">
<view class="input-box">
<input class="coupon-sn" placeholder="请输入优惠码" value="{{code}}" bindinput="bindExchange"/>
<image class="clear-icon" wx:if="{{ code.length > 0 }}" src="/static/images/clear_input.png" catchtap="clearExchange"></image>
<van-icon name="close" class="clear-icon" wx:if="{{ code.length > 0 }}" catchtap="clearExchange"/>
</view>
<view class="add-btn" bindtap='goExchange'>兑换</view>
</view>
......
......@@ -84,13 +84,11 @@ page {
.container .b .clear-icon {
position: absolute;
top: 10rpx;
top: 25rpx;
right: 18rpx;
z-index: 2;
display: block;
background: #fff;
height: 44rpx;
width: 44rpx;
}
.container .b .add-btn {
......
......@@ -4,7 +4,7 @@
<view class="picker">
<view class="fb-type">
<view class="type-label">{{array[index]}}</view>
<image class="type-icon" src="/static/images/down.png"></image>
<van-icon class="type-icon" name="arrow-down" />
</view>
</view>
</picker>
......@@ -26,7 +26,7 @@
<view class="label">手机号码</view>
<view class="mobile-box">
<input class="mobile" maxlength="11" type="number" placeholder="方便我们与你联系" bindinput="mobileInput" value="{{mobile}}" />
<image class="clear-icon" src="/static/images/clear_input.png" wx:if="{{ mobile.length > 0 }}" catchtap="clearMobile"></image>
<van-icon class="clear-icon" name="close" wx:if="{{ mobile.length > 0 }}" catchtap="clearMobile"/>
</view>
</view>
......
Supports Markdown
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