fix(button): fix open-type not work (#4222)

#4217

example/pages/icon/index.wxss

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

package.json

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

packages/action-sheet/index.wxml

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

packages/button/index.wxml

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

packages/circle/index.ts

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

yarn.lock

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