fix: 修改loading组件，支持指定区域

Author: dpp050700

dist/loading/index.js

@@ -15,10 +15,13 @@ Component({
       type: String,
       value: '1'
     },
-    bgColor: String,
+    bgColor: {
+      type: String,
+      value: '#fff'
+    },
     zIndex:{
-      type:String,
-      value: '776'
+      type: Number,
+      value: 776
     },
     // 类型
     type: {

dist/loading/index.wxml

@@ -36,10 +36,10 @@
   </view>
 </view>
 
-<view wx:if="{{show && !fullScreen}}" style="position: relative">
+<view wx:if="{{!fullScreen}}" style="position: relative">
     <slot name="content"/>
-    <view class="inner-loading-container" style="background:{{bgColor}};opacity:{{opacity}};z-index:{{zIndex}}"></view>
-    <view class="l-class loading-icon-container">
+    <view wx:if="{{show}}" class="inner-loading-container" style="background:{{bgColor}};opacity:{{opacity}};z-index:{{zIndex}}"></view>
+    <view wx:if="{{show}}" class="l-class loading-icon-container" style="z-index:{{zIndex + 1}}">
         <view class="{{type + '-spinner'}} {{type=='change'||custom?'':'spinner-' + type + '-' + size}}">
             <block wx:if="{{custom}}">
                 <slot />

examples/dist/loading/index.js

@@ -15,10 +15,13 @@ Component({
       type: String,
       value: '1'
     },
-    bgColor: String,
+    bgColor: {
+      type: String,
+      value: '#fff'
+    },
     zIndex:{
-      type:String,
-      value: '776'
+      type: Number,
+      value: 776
     },
     // 类型
     type: {

examples/dist/loading/index.wxml

@@ -36,10 +36,10 @@
   </view>
 </view>
 
-<view wx:if="{{show && !fullScreen}}" style="position: relative">
+<view wx:if="{{!fullScreen}}" style="position: relative">
     <slot name="content"/>
-    <view class="inner-loading-container" style="background:{{bgColor}};opacity:{{opacity}};z-index:{{zIndex}}"></view>
-    <view class="l-class loading-icon-container">
+    <view wx:if="{{show}}" class="inner-loading-container" style="background:{{bgColor}};opacity:{{opacity}};z-index:{{zIndex}}"></view>
+    <view wx:if="{{show}}" class="l-class loading-icon-container" style="z-index:{{zIndex + 1}}">
         <view class="{{type + '-spinner'}} {{type=='change'||custom?'':'spinner-' + type + '-' + size}}">
             <block wx:if="{{custom}}">
                 <slot />

examples/pages/components/view/pages/loading/index.wxml

@@ -15,8 +15,8 @@
     class="content"
     name="指定loading区域"
   >
-    <l-loading show="{{true}}" type="circle" opacity="0.1" bg-color="#ccc" custom l-class="position-top">
-      <view slot="content" style="height: 300px;"></view>
+    <l-loading show="{{true}}" type="circle" custom l-class="position-top" z-index="112">
+      <view slot="content" style="height: 300px;">1111</view>
       <image class='custom-img' src='/images/static/loading.gif'></image>
     </l-loading>
   </content-card>

src/loading/index.js

@@ -15,10 +15,13 @@ Component({
       type: String,
       value: '1'
     },
-    bgColor: String,
+    bgColor: {
+      type: String,
+      value: '#fff'
+    },
     zIndex:{
-      type:String,
-      value: '776'
+      type: Number,
+      value: 776
     },
     // 类型
     type: {

src/loading/index.wxml

@@ -36,10 +36,10 @@
   </view>
 </view>
 
-<view wx:if="{{show && !fullScreen}}" style="position: relative">
+<view wx:if="{{!fullScreen}}" style="position: relative">
     <slot name="content"/>
-    <view class="inner-loading-container" style="background:{{bgColor}};opacity:{{opacity}};z-index:{{zIndex}}"></view>
-    <view class="l-class loading-icon-container">
+    <view wx:if="{{show}}" class="inner-loading-container" style="background:{{bgColor}};opacity:{{opacity}};z-index:{{zIndex}}"></view>
+    <view wx:if="{{show}}" class="l-class loading-icon-container" style="z-index:{{zIndex + 1}}">
         <view class="{{type + '-spinner'}} {{type=='change'||custom?'':'spinner-' + type + '-' + size}}">
             <block wx:if="{{custom}}">
                 <slot />