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

packages/uni-template-compiler/__tests__/compiler-mp-weixin.spec.js

@@ -365,14 +365,14 @@ describe('mp:compiler-mp-weixin', () => {
     )
     assertCodegen( // TODO vue-id
       '<span><slot v-bind:user="user">{{ user.lastName }}</slot></span>',
-      '<span><block wx:if="{{$slots.default}}"><slot></slot><scoped-slots-default user="{{user}}" class="scoped-ref" bind:__l="__l"></scoped-slots-default></block><block wx:else>{{user.lastName}}</block></span>',
+      '<label class="_span"><block wx:if="{{$slots.default}}"><slot></slot><scoped-slots-default user="{{user}}" class="scoped-ref" bind:__l="__l"></scoped-slots-default></block><block wx:else>{{user.lastName}}</block></label>',
       function (res) {
         expect(res.componentGenerics['scoped-slots-default']).toBe(true)
       }
     )
     assertCodegen(
       '<span><slot name="header" v-bind:user="user">{{ user.lastName }}</slot></span>',
-      '<span><block wx:if="{{$slots.header}}"><slot name="header"></slot><scoped-slots-header user="{{user}}" class="scoped-ref" bind:__l="__l"></scoped-slots-header></block><block wx:else>{{user.lastName}}</block></span>',
+      '<label class="_span"><block wx:if="{{$slots.header}}"><slot name="header"></slot><scoped-slots-header user="{{user}}" class="scoped-ref" bind:__l="__l"></scoped-slots-header></block><block wx:else>{{user.lastName}}</block></label>',
       function (res) {
         expect(res.componentGenerics['scoped-slots-header']).toBe(true)
       }
@@ -521,7 +521,7 @@ describe('mp:compiler-mp-weixin', () => {
   it('span', () => {
     assertCodegen(
       '<span></span>',
-      '<span></span>'
+      '<label class="_span"></label>'
     )
   })
 })

packages/uni-template-compiler/__tests__/compiler.spec.js

@@ -777,7 +777,7 @@ describe('mp:compiler', () => {
     // TODO vue的数字 item 是从1，小程序是从0，后续考虑抹平差异
     assertCodegen(
       '<div><div v-for="i in 10"><p><span></span></p></div></div>',
-      '<view class="_div"><block wx:for="{{10}}" wx:for-item="i" wx:for-index="__i0__"><view class="_div"><view class="_p"><span></span></view></view></block></view>'
+      '<view class="_div"><block wx:for="{{10}}" wx:for-item="i" wx:for-index="__i0__"><view class="_div"><view class="_p"><label class="_span"></label></view></view></block></view>'
     )
   })