Merge branch 'dev' of https://github.com/dcloudio/uni-app into alpha

packages/uni-stat/dist/index.js

@@ -484,13 +484,6 @@ class Util {
       t: getTime(),
       p: this.statData.p
     };
-    if (getPlatformName() === 'n' && this.statData.p === 'a') {
-      setTimeout(() => {
-        this.request(options);
-      }, 200);
-      return
-    }
-
     this.request(options);
   }
 
@@ -511,12 +504,6 @@ class Util {
       t: getTime(),
       p: this.statData.p
     };
-    if (getPlatformName() === 'n' && this.statData.p === 'a') {
-      setTimeout(() => {
-        this.request(options, type);
-      }, 200);
-      return
-    }
     this.request(options, type);
   }
   _sendEventRequest({
@@ -642,31 +629,39 @@ class Util {
       this.imageRequest(optionsData);
       return
     }
-
-    uni.request({
-      url: STAT_URL,
-      method: 'POST',
-      // header: {
-      //   'content-type': 'application/json' // 默认值
-      // },
-      data: optionsData,
-      success: () => {
-        // if (process.env.NODE_ENV === 'development') {
-        //   console.log('stat request success');
-        // }
-      },
-      fail: (e) => {
-        // if (process.env.NODE_ENV === 'development') {
-        //   console.log('stat request fail', e);
-        // }
-        if (++this._retry < 3) {
-          setTimeout(() => {
-            this.request(data);
-          }, 1000);
-        }
-      }
-    });
-
+
+    if (getPlatformName() === 'n' && this.statData.p === 'a') {
+      setTimeout(() => {
+        this._sendRequest(optionsData);
+      }, 200);
+      return
+    }
+    this._sendRequest(optionsData);
+  }
+  _sendRequest(optionsData){
+    uni.request({
+      url: STAT_URL,
+      method: 'POST',
+      // header: {
+      //   'content-type': 'application/json' // 默认值
+      // },
+      data: optionsData,
+      success: () => {
+        // if (process.env.NODE_ENV === 'development') {
+        //   console.log('stat request success');
+        // }
+      },
+      fail: (e) => {
+        // if (process.env.NODE_ENV === 'development') {
+        //   console.log('stat request fail', e);
+        // }
+        if (++this._retry < 3) {
+          setTimeout(() => {
+            this.request(data);
+          }, 1000);
+        }
+      }
+    });
   }
   /**
    * h5 请求

packages/uni-stat/src/stat.js

@@ -219,13 +219,6 @@ class Util {
       t: getTime(),
       p: this.statData.p
     }
-    if (getPlatformName() === 'n' && this.statData.p === 'a') {
-      setTimeout(() => {
-        this.request(options);
-      }, 200)
-      return
-    }
-
     this.request(options);
   }
 
@@ -246,12 +239,6 @@ class Util {
       t: getTime(),
       p: this.statData.p
     }
-    if (getPlatformName() === 'n' && this.statData.p === 'a') {
-      setTimeout(() => {
-        this.request(options, type)
-      }, 200)
-      return
-    }
     this.request(options, type)
   }
   _sendEventRequest({
@@ -377,31 +364,39 @@ class Util {
       this.imageRequest(optionsData)
       return
     }
-
-    uni.request({
-      url: STAT_URL,
-      method: 'POST',
-      // header: {
-      //   'content-type': 'application/json' // 默认值
-      // },
-      data: optionsData,
-      success: () => {
-        // if (process.env.NODE_ENV === 'development') {
-        //   console.log('stat request success');
-        // }
-      },
-      fail: (e) => {
-        // if (process.env.NODE_ENV === 'development') {
-        //   console.log('stat request fail', e);
-        // }
-        if (++this._retry < 3) {
-          setTimeout(() => {
-            this.request(data);
-          }, 1000);
-        }
-      }
-    });
-
+
+    if (getPlatformName() === 'n' && this.statData.p === 'a') {
+      setTimeout(() => {
+        this._sendRequest(optionsData);
+      }, 200)
+      return
+    }
+    this._sendRequest(optionsData)
+  }
+  _sendRequest(optionsData){
+    uni.request({
+      url: STAT_URL,
+      method: 'POST',
+      // header: {
+      //   'content-type': 'application/json' // 默认值
+      // },
+      data: optionsData,
+      success: () => {
+        // if (process.env.NODE_ENV === 'development') {
+        //   console.log('stat request success');
+        // }
+      },
+      fail: (e) => {
+        // if (process.env.NODE_ENV === 'development') {
+        //   console.log('stat request fail', e);
+        // }
+        if (++this._retry < 3) {
+          setTimeout(() => {
+            this.request(data);
+          }, 1000);
+        }
+      }
+    });
   }
   /**
    * h5 请求

src/core/view/components/input/index.vue

 <template>
-  <uni-input v-on="$listeners">
+  <uni-input
+    @change.stop
+    v-on="$listeners">
     <div
       ref="wrapper"
       class="uni-input-wrapper">

src/core/view/components/textarea/index.vue

@@ -12,6 +12,7 @@
     :cursor="cursorNumber"
     :selection-start="selectionStartNumber"
     :selection-end="selectionEndNumber"
+    @change.stop
     v-on="$listeners"
   >
     <div class="uni-textarea-wrapper">