Compare commits

..

No commits in common. "e835808a399fd63ec2be871669af15261ff60973" and "17b566beb980caf225b1157dab07aa18f24119ce" have entirely different histories.

6 changed files with 11 additions and 15 deletions

View File

@ -11,7 +11,7 @@ page {
.icon { .icon {
margin: 16px 0; margin: 16px 0;
color: #323233; color: #323233 !important;
} }
.text { .text {

View File

@ -39,7 +39,7 @@
"homepage": "https://github.com/youzan/vant-weapp#readme", "homepage": "https://github.com/youzan/vant-weapp#readme",
"devDependencies": { "devDependencies": {
"@vant/cli": "^3.10.3", "@vant/cli": "^3.10.3",
"@vant/icons": "^1.6.0", "@vant/icons": "1.5.3",
"gulp": "^4.0.2", "gulp": "^4.0.2",
"gulp-insert": "^0.5.0", "gulp-insert": "^0.5.0",
"gulp-less": "^4.0.1", "gulp-less": "^4.0.1",

View File

@ -27,7 +27,7 @@
<button <button
wx:for="{{ actions }}" wx:for="{{ actions }}"
wx:key="index" wx:key="index"
open-type="{{ item.disabled || item.loading || (canIUseGetUserProfile && item.openType === 'getUserInfo') ? '' : item.openType }}" open-type="{{ item.disabled || item.loading || canIUseGetUserProfile ? '' : item.openType }}"
style="{{ item.color ? 'color: ' + item.color : '' }}" style="{{ item.color ? 'color: ' + item.color : '' }}"
class="{{ utils.bem('action-sheet__item', { disabled: item.disabled || item.loading }) }} {{ item.className || '' }}" class="{{ utils.bem('action-sheet__item', { disabled: item.disabled || item.loading }) }} {{ item.className || '' }}"
hover-class="van-action-sheet__item--hover" hover-class="van-action-sheet__item--hover"

View File

@ -9,7 +9,7 @@
lang="{{ lang }}" lang="{{ lang }}"
form-type="{{ formType }}" form-type="{{ formType }}"
style="{{ computed.rootStyle({ plain, color, customStyle }) }}" style="{{ computed.rootStyle({ plain, color, customStyle }) }}"
open-type="{{ disabled || loading || (canIUseGetUserProfile && openType === 'getUserInfo') ? '' : openType }}" open-type="{{ disabled || loading || canIUseGetUserProfile ? '' : openType }}"
business-id="{{ businessId }}" business-id="{{ businessId }}"
session-from="{{ sessionFrom }}" session-from="{{ sessionFrom }}"
send-message-title="{{ sendMessageTitle }}" send-message-title="{{ sendMessageTitle }}"

View File

@ -185,14 +185,10 @@ VantComponent({
this.currentValue = this.currentValue || 0; this.currentValue = this.currentValue || 0;
this.interval = setInterval(() => { this.interval = setInterval(() => {
if (this.currentValue !== value) { if (this.currentValue !== value) {
if (Math.abs(this.currentValue - value) < STEP) { if (this.currentValue < value) {
this.currentValue = value; this.currentValue += STEP;
} else { } else {
if (this.currentValue < value) { this.currentValue -= STEP;
this.currentValue += STEP;
} else {
this.currentValue -= STEP;
}
} }
this.drawCircle(this.currentValue); this.drawCircle(this.currentValue);
} else { } else {

View File

@ -3055,10 +3055,10 @@
eslint-plugin-markdown "^2.0.0" eslint-plugin-markdown "^2.0.0"
eslint-plugin-vue "^7.1.0" eslint-plugin-vue "^7.1.0"
"@vant/icons@^1.6.0": "@vant/icons@1.5.3":
version "1.6.0" version "1.5.3"
resolved "https://registry.npmjs.org/@vant/icons/-/icons-1.6.0.tgz#3db7eb7f963f51a2a08676720d5af9c4c3512feb" resolved "https://registry.yarnpkg.com/@vant/icons/-/icons-1.5.3.tgz#b7779f67bf608d417a82452fbede406dfa46b439"
integrity sha512-4Hvq4tl4grCOJLZ0e8ZaivBV8xOcmTPmTT8BDkTrEIKqnDowRFDdsXxcHECzWmbmMx+CYGdngvd2Cq8YR9DfKA== integrity sha512-OQaJqAWN6quHicWje4buknX9zcDo3UDy3X4nrk/ldnr9Fj8Str4nMtQbMbIrCMtmjQdP2ei769uuY508dudrjA==
"@vant/markdown-loader@^4.1.0": "@vant/markdown-loader@^4.1.0":
version "4.1.0" version "4.1.0"