@cloudbase/weda-ui 2.0.9 → 2.0.12

package/src/mp/components/form/uploaderFile/index.wxml

@@ -1,46 +1,45 @@
 <view class="weda-uploader-files {{extClass}}">
-    <view class="weda-uploader-files__hd">
-        <view class="weda-uploader-files__title" wx:if="{{labelVisible}}">{{label}}</view>
-        <view>
-            <button class="weui-btn weda-uploader-files__btn" bindtap="uploadFile">上传文件</button>
-            <view wx:if="{{maxCount!=1}}" class="weda-uploader-files__tips">支持批量上传</view>
-            <view wx:else><slot name="tips"></slot></view>
-        </view>
+  <view class="weda-uploader-files__hd">
+    <view class="weda-uploader-files__title" wx:if="{{labelVisible}}">{{label}}</view>
+    <view>
+      <button class="weui-btn weda-uploader-files__btn" bindtap="uploadFile">上传文件</button>
+      <view wx:if="{{maxCount!=1}}" class="weda-uploader-files__tips">支持批量上传</view>
+      <view wx:else><slot name="tips"></slot></view>
     </view>
-    <view class="weda-uploader-files__bd">
-        <view class="weda-uploader-files__files" wx-if="{{files.length > 0}}">
-            <block wx:for="{{files}}" wx:key="index">
-                <view class="weda-uploader-files__item">
-                    <view class="weda-uploader-files__item-left">
-                        <view class="weda-uploader-files__file-detail">
-                            <text class="weda-uploader-files__file-name">{{item.name}}</text>
-                            <view wx:if="{{item.status === 'success' || item.status === 'fail'}}" class="weda-uploader-files__file-status">
-                                <mp-icon wx:if="{{item.status === 'success' }}" icon="done2" size="{{16}}" color="#00A870" type="field"></mp-icon>
-                                <mp-icon wx:if="{{item.status === 'fail' }}" icon="close2" size="{{16}}" color="#E34D59" type="field"></mp-icon>
-                                <text class="weda-uploader-files__file-status--msg">{{item.status === 'success' ? '上传成功' : '上传失败'}}</text>
-                            </view>
-                        </view>
-                        <view class="weda-uploader-files__progress weui-progress" wx-if="{{item.status === 'pending' || item.status === 'uploading'}}">
-                            <view class="weui-progress__bar">
-                                <progress percent="{{item.percent}}" stroke-width="3" activeColor="#0052D9" backgroundColor="#E7E7E7" stroke-width="3"/>
-                            </view>
-                        </view>
-                        <view class="weda-uploader-files__file-foot">
-                            <div>
-                              <text wx-if="{{item.status === 'uploading' || item.status === 'pending'}}">{{item.status === 'uploading' ? item.uploaded : '0K' }}/</text>
-                              <text>{{item.size}}</text>
-                            </div>
-                            <div wx-if="{{item.status === 'uploading' || item.status === 'pending'}}">{{item.status === 'pending' ? '等待上传' : '上传中'}}</div>
-
-                        </view>
-                    </view>
-                    <view class="weda-uploader-files__btn-group">
-                        <image wx-if="{{item.status === 'success'&&downloadVisible}}" data-item="{{item}}"  bindtap="downloadFile" class="weda-uploader-files__icon" src="https://imgcache.qq.com/qcloud/tcloud_dtc/static/static_source_business/4cba5da1-cde4-40c6-a075-86eff22858a4.svg"></image>
-                        <image wx-if="{{item.status === 'fail'}}" data-item="{{item}}"  bindtap="reload" class="weda-uploader-files__icon" src="https://imgcache.qq.com/qcloud/tcloud_dtc/static/static_source_business/af5486eb-65e0-4536-8e51-6c68a17b71ac.svg"></image>
-                        <image class="weda-uploader-files__icon" data-item="{{item}}" bindtap="onDelete" src="https://imgcache.qq.com/qcloud/tcloud_dtc/static/static_source_business/2372f6a8-2f6a-4f30-92bf-73c62a5c0ae7.svg"></image>
-                    </view>
-                </view>
-            </block>
+  </view>
+  <view class="weda-uploader-files__bd">
+    <view class="weda-uploader-files__files" wx-if="{{files.length > 0}}">
+      <block wx:for="{{files}}" wx:key="index">
+        <view class="weda-uploader-files__item">
+          <view class="weda-uploader-files__item-left">
+            <view class="weda-uploader-files__file-detail">
+              <text class="weda-uploader-files__file-name">{{item.name}}</text>
+              <view wx:if="{{item.status === 'success' || item.status === 'fail'}}" class="weda-uploader-files__file-status">
+                <mp-icon wx:if="{{item.status === 'success' }}" icon="done2" size="{{16}}" color="#00A870" type="field"></mp-icon>
+                <mp-icon wx:if="{{item.status === 'fail' }}" icon="close2" size="{{16}}" color="#E34D59" type="field"></mp-icon>
+                <text class="weda-uploader-files__file-status--msg">{{item.status === 'success' ? '上传成功' : '上传失败'}}</text>
+              </view>
+            </view>
+            <view class="weda-uploader-files__progress weui-progress" wx-if="{{item.status === 'pending' || item.status === 'uploading'}}">
+              <view class="weui-progress__bar">
+                <progress percent="{{item.percent}}" stroke-width="3" activeColor="#0052D9" backgroundColor="#E7E7E7" stroke-width="3" />
+              </view>
+            </view>
+            <view class="weda-uploader-files__file-foot">
+              <div>
+                <text wx-if="{{item.status === 'uploading' || item.status === 'pending'}}">{{item.status === 'uploading' ? item.uploaded : '0K' }}/</text>
+                <text>{{item.size}}</text>
+              </div>
+              <div wx-if="{{item.status === 'uploading' || item.status === 'pending'}}">{{item.status === 'pending' ? '等待上传' : '上传中'}}</div>
+            </view>
+          </view>
+          <view class="weda-uploader-files__btn-group">
+            <image wx-if="{{item.status === 'success'&&downloadVisible}}" data-item="{{item}}" bindtap="downloadFile" class="weda-uploader-files__icon" src="https://imgcache.qq.com/qcloud/tcloud_dtc/static/static_source_business/4cba5da1-cde4-40c6-a075-86eff22858a4.svg"></image>
+            <image wx-if="{{item.status === 'fail'}}" data-item="{{item}}" bindtap="reload" class="weda-uploader-files__icon" src="https://imgcache.qq.com/qcloud/tcloud_dtc/static/static_source_business/af5486eb-65e0-4536-8e51-6c68a17b71ac.svg"></image>
+            <image class="weda-uploader-files__icon" data-item="{{item}}" bindtap="onDelete" src="https://imgcache.qq.com/qcloud/tcloud_dtc/static/static_source_business/2372f6a8-2f6a-4f30-92bf-73c62a5c0ae7.svg"></image>
+          </view>
         </view>
+      </block>
     </view>
+  </view>
 </view>

package/src/mp/components/graphicCard/index.js

@@ -99,24 +99,22 @@ Component({
   },
   methods: {
     navigaTo: function (itemInfo) {
+      let { app } = getApp();
       const item = itemInfo?.currentTarget?.dataset?.item;
       if (item.tapStatus == 'inside') {
-        const paramObj = [];
+        const paramObj = {};
         if (item.withParams && item?.params) {
           for (let info of item.params) {
-            paramObj.push(info.key + '=' + info.value);
+            paramObj[info.key] = info.value;
           }
         }
         item.paramObj = paramObj;
-        if (item.withParams && item.params.length > 0) {
-          wx.redirectTo({
-            url: '../' + item?.insideUrl + '/index?' + item.paramObj.join('&'),
-          });
-        } else {
-          wx.redirectTo({
-            url: '../' + item?.insideUrl + '/index',
-          });
-        }
+        app.navigateTo({
+          mode: 'weDa',
+          pageId: item?.insideUrl,
+          params:
+            item?.withParams && item?.params.length > 0 ? item.paramObj : null,
+        });
       }
     },
   },
@@ -161,16 +159,17 @@ Component({
         optionList,
       });
     },
-    'titleMaxLines,titleColor,titleFontWeight,titleFontSize,textAlign,titleLineHeight': function (
-      titleMaxLines,
-      titleColor,
-      titleFontWeight,
-      titleFontSize,
-      textAlign,
-      titleLineHeight
-    ) {
-      let titleStyle = this.properties.titleStyle;
-      titleStyle = `
+    'titleMaxLines,titleColor,titleFontWeight,titleFontSize,textAlign,titleLineHeight':
+      function (
+        titleMaxLines,
+        titleColor,
+        titleFontWeight,
+        titleFontSize,
+        textAlign,
+        titleLineHeight
+      ) {
+        let titleStyle = this.properties.titleStyle;
+        titleStyle = `
       -webkit-line-clamp:${titleMaxLines ? titleMaxLines : 'revert'};
       color: ${titleColor};
       font-weight: ${titleFontWeight};
@@ -178,18 +177,19 @@ Component({
       text-align: ${textAlign};
       line-height: ${titleLineHeight == 'auto' ? 'normal' : titleLineHeight};
       `;
-      this.setData({ titleStyle });
-    },
-    'desMaxLines,desColor,desFontWeight,desFontSize,textAlign,desLineHeight': function (
-      desMaxLines,
-      desColor,
-      desFontWeight,
-      desFontSize,
-      textAlign,
-      desLineHeight
-    ) {
-      let desStyle = this.properties.desStyle;
-      desStyle = `
+        this.setData({ titleStyle });
+      },
+    'desMaxLines,desColor,desFontWeight,desFontSize,textAlign,desLineHeight':
+      function (
+        desMaxLines,
+        desColor,
+        desFontWeight,
+        desFontSize,
+        textAlign,
+        desLineHeight
+      ) {
+        let desStyle = this.properties.desStyle;
+        desStyle = `
       -webkit-line-clamp:${desMaxLines ? desMaxLines : 'revert'};
       color: ${desColor};
       font-weight: ${desFontWeight};
@@ -197,7 +197,7 @@ Component({
       text-align: ${textAlign};
       line-height: ${desLineHeight == 'auto' ? 'normal' : desLineHeight};
       `;
-      this.setData({ desStyle });
-    },
+        this.setData({ desStyle });
+      },
   },
 });

package/src/mp/components/graphicCard/index.wxml

@@ -9,12 +9,8 @@
                 <view class="weda-graphic-card__icon" style="{{iconStyle}}">
                   <image src="{{col.icon}}" mode="scaleToFill" class="weda-graphic-card__img"></image>
                 </view>
-                <view class="weda-graphic-card__title" style="{{titleStyle}}" wx:if="{{titleVisible}}">
-                  {{col.title}}
-                </view>
-                <view class="weda-graphic-card__desc" style="text-align: {{textAlign}}" wx:if="{{desVisible}}" style="{{desStyle}}">
-                  {{col.des}}
-                </view>
+                <view class="weda-graphic-card__title" style="{{titleStyle}}" wx:if="{{titleVisible}}"> {{col.title}} </view>
+                <view class="weda-graphic-card__desc" style="text-align: {{textAlign}}" wx:if="{{desVisible}}" style="{{desStyle}}"> {{col.des}} </view>
               </view>
               <view class="wedatea2td-btn wedatea2td-btn--link weda-graphic-card__btn" wx:if="{{buttonVisible && col}}">
                 <text class="weda-graphic-card__btn--text">{{buttonText}}</text>

package/src/mp/components/image/index.wxml

@@ -1,20 +1,9 @@
-<image
- style="{{style}}"
- class="weda-ui weda-image {{clsx}}"
- src="{{realSrc}}"
- alt="{{alt}}"
- mode="{{imgMode}}"
- lazy-load="{{lazyLoad}}"
- show-menu-by-longpress="{{showMenuByLongpress}}"
- bindtap="onImgTap"
- bindload="load"
- binderror="error"
-/>
-<view wx:if="{{showImg}}" class="weda-img-mask" bindtap="onMaskClick" >
-        <view bindtap="onCloseClick" class="weda-img-modal-close-btn">
-          <icon type="clear" size="23" color="white"></icon>
-        </view>
-        <gesture bindpinch="onPinch" catchtap="onTapImgPreview" bindpressMove="onPressMove">
-          <view class="weda-img-preview" style="margin-top:{{offsetHeight}}px;width: 100%;height:{{showHeight}}px;background-image: url('{{realSrc}}');transform: scale({{zoom}}) translateX({{previewTranslateX}}px) translateY({{previewTranslateY}}px);"></view>
-        </gesture>
-</view>
+<image style="{{style}}" class="weda-ui weda-image {{clsx}}" src="{{realSrc}}" alt="{{alt}}" mode="{{imgMode}}" lazy-load="{{lazyLoad}}" show-menu-by-longpress="{{showMenuByLongpress}}" bindtap="onImgTap" bindload="load" binderror="error" />
+<view wx:if="{{showImg}}" class="weda-img-mask" bindtap="onMaskClick">
+  <view bindtap="onCloseClick" class="weda-img-modal-close-btn">
+    <icon type="clear" size="23" color="white"></icon>
+  </view>
+  <gesture bindpinch="onPinch" catchtap="onTapImgPreview" bindpressMove="onPressMove">
+    <view class="weda-img-preview" style="margin-top:{{offsetHeight}}px;width: 100%;height:{{showHeight}}px;background-image: url('{{realSrc}}');transform: scale({{zoom}}) translateX({{previewTranslateX}}px) translateY({{previewTranslateY}}px);"></view>
+  </gesture>
+</view>

package/src/mp/components/image/index.wxss

@@ -38,7 +38,9 @@
 
 .weda-image-error::before {
   content: '';
-  background: #f5f5f5 url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgdmlld0JveD0iMCAwIDMyIDMyIiBmaWxsPSJub25lIj4KICA8cGF0aCBkPSJNMjUuMzIgMTYuMzU5N0MyNi4wNzY0IDE2LjM1OTcgMjYuODI1NCAxNi41MDg3IDI3LjUyNDMgMTYuNzk4MUMyOC4yMjMxIDE3LjA4NzYgMjguODU4MSAxNy41MTE5IDI5LjM5MjkgMTguMDQ2OEMyOS45Mjc4IDE4LjU4MTYgMzAuMzUyMSAxOS4yMTY2IDMwLjY0MTYgMTkuOTE1NEMzMC45MzEgMjAuNjE0MyAzMS4wOCAyMS4zNjMzIDMxLjA4IDIyLjExOTdDMzEuMDggMjIuODc2MSAzMC45MzEgMjMuNjI1MSAzMC42NDE2IDI0LjMyMzlDMzAuMzUyMSAyNS4wMjI4IDI5LjkyNzggMjUuNjU3OCAyOS4zOTI5IDI2LjE5MjZDMjguODU4MSAyNi43Mjc1IDI4LjIyMzEgMjcuMTUxOCAyNy41MjQzIDI3LjQ0MTJDMjYuODI1NCAyNy43MzA3IDI2LjA3NjQgMjcuODc5NyAyNS4zMiAyNy44Nzk3QzIzLjc5MjQgMjcuODc5NyAyMi4zMjczIDI3LjI3MjggMjEuMjQ3MSAyNi4xOTI2QzIwLjE2NjkgMjUuMTEyNCAxOS41NiAyMy42NDczIDE5LjU2IDIyLjExOTdDMTkuNTYgMjAuNTkyIDIwLjE2NjkgMTkuMTI3IDIxLjI0NzEgMTguMDQ2OEMyMi4zMjczIDE2Ljk2NjUgMjMuNzkyNCAxNi4zNTk3IDI1LjMyIDE2LjM1OTdaTTI4IDMuNTU5NjlWMTQuODc2OEMyNy4xNzc3IDE0LjU4NjYgMjYuMTkyIDE0LjQzODggMjUuMzIgMTQuNDM5N0MyNC4wMzEgMTQuNDM5NyAyMi44MTU3IDE0Ljc1NzEgMjEuNzQ4OCAxNS4zMTg0TDIwLjc5NTIgMTMuMTU5N0wxNi4wMjU5IDIwLjAyNzVMOC40NDU3NiAxNi40NDFMMy41NiAyMy4zOTk3SDE3Ljc0NjJDMTcuOTg2NyAyNC44MjkgMTguNjI4MiAyNi4xNjA2IDE5LjU5NTggMjcuMjM5N0gxVjMuNTU5NjlIMjhaTTI1Ljk2IDI0LjAzOTdIMjQuNjhWMjUuMzE5N0gyNS45NlYyNC4wMzk3Wk0yNS45NiAxOC45MTk3SDI0LjY4VjIzLjM5OTdIMjUuOTZWMTguOTE5N1pNNi4xMiAxMC41OTk3QzYuMTIgMTEuOTk4MSA3LjE5OTA0IDEzLjEwODUgOC42MDc2OCAxMy4xNTg0QzEwLjAyMDggMTMuMjA3NyAxMS4yNCAxMi4wNDggMTEuMjQgMTAuNTk5N0MxMS4yNCA5LjI0NjA5IDEwLjA2NDMgOC4wODU3NyA4Ljc1MjMyIDguMDQwOTdDNy4yOTU2OCA3Ljk5MTY5IDYuMTIgOS4xNTEzNyA2LjEyIDEwLjU5OTdaIiBmaWxsPSIjQkNDNEQwIj48L3BhdGg+Cjwvc3ZnPgo=') no-repeat center / 50% 50%;
+  background: #f5f5f5
+    url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgdmlld0JveD0iMCAwIDMyIDMyIiBmaWxsPSJub25lIj4KICA8cGF0aCBkPSJNMjUuMzIgMTYuMzU5N0MyNi4wNzY0IDE2LjM1OTcgMjYuODI1NCAxNi41MDg3IDI3LjUyNDMgMTYuNzk4MUMyOC4yMjMxIDE3LjA4NzYgMjguODU4MSAxNy41MTE5IDI5LjM5MjkgMTguMDQ2OEMyOS45Mjc4IDE4LjU4MTYgMzAuMzUyMSAxOS4yMTY2IDMwLjY0MTYgMTkuOTE1NEMzMC45MzEgMjAuNjE0MyAzMS4wOCAyMS4zNjMzIDMxLjA4IDIyLjExOTdDMzEuMDggMjIuODc2MSAzMC45MzEgMjMuNjI1MSAzMC42NDE2IDI0LjMyMzlDMzAuMzUyMSAyNS4wMjI4IDI5LjkyNzggMjUuNjU3OCAyOS4zOTI5IDI2LjE5MjZDMjguODU4MSAyNi43Mjc1IDI4LjIyMzEgMjcuMTUxOCAyNy41MjQzIDI3LjQ0MTJDMjYuODI1NCAyNy43MzA3IDI2LjA3NjQgMjcuODc5NyAyNS4zMiAyNy44Nzk3QzIzLjc5MjQgMjcuODc5NyAyMi4zMjczIDI3LjI3MjggMjEuMjQ3MSAyNi4xOTI2QzIwLjE2NjkgMjUuMTEyNCAxOS41NiAyMy42NDczIDE5LjU2IDIyLjExOTdDMTkuNTYgMjAuNTkyIDIwLjE2NjkgMTkuMTI3IDIxLjI0NzEgMTguMDQ2OEMyMi4zMjczIDE2Ljk2NjUgMjMuNzkyNCAxNi4zNTk3IDI1LjMyIDE2LjM1OTdaTTI4IDMuNTU5NjlWMTQuODc2OEMyNy4xNzc3IDE0LjU4NjYgMjYuMTkyIDE0LjQzODggMjUuMzIgMTQuNDM5N0MyNC4wMzEgMTQuNDM5NyAyMi44MTU3IDE0Ljc1NzEgMjEuNzQ4OCAxNS4zMTg0TDIwLjc5NTIgMTMuMTU5N0wxNi4wMjU5IDIwLjAyNzVMOC40NDU3NiAxNi40NDFMMy41NiAyMy4zOTk3SDE3Ljc0NjJDMTcuOTg2NyAyNC44MjkgMTguNjI4MiAyNi4xNjA2IDE5LjU5NTggMjcuMjM5N0gxVjMuNTU5NjlIMjhaTTI1Ljk2IDI0LjAzOTdIMjQuNjhWMjUuMzE5N0gyNS45NlYyNC4wMzk3Wk0yNS45NiAxOC45MTk3SDI0LjY4VjIzLjM5OTdIMjUuOTZWMTguOTE5N1pNNi4xMiAxMC41OTk3QzYuMTIgMTEuOTk4MSA3LjE5OTA0IDEzLjEwODUgOC42MDc2OCAxMy4xNTg0QzEwLjAyMDggMTMuMjA3NyAxMS4yNCAxMi4wNDggMTEuMjQgMTAuNTk5N0MxMS4yNCA5LjI0NjA5IDEwLjA2NDMgOC4wODU3NyA4Ljc1MjMyIDguMDQwOTdDNy4yOTU2OCA3Ljk5MTY5IDYuMTIgOS4xNTEzNyA2LjEyIDEwLjU5OTdaIiBmaWxsPSIjQkNDNEQwIj48L3BhdGg+Cjwvc3ZnPgo=')
+    no-repeat center / 50% 50%;
   position: absolute;
   left: 0;
   top: 0;

package/src/mp/components/listView/index.wxml

@@ -1,5 +1,4 @@
-<scroll-view scroll-y scroll-with-animation lower-threshold="5" style="{{style}}"
-  class="weda-list-view__containor weda-ui {{className}}">
+<scroll-view scroll-y scroll-with-animation lower-threshold="5" style="{{style}}" class="weda-list-view__containor weda-ui {{className}}">
   <!-- 列表插槽 -->
   <view class="{{template === 'cardList' ? 'weda-list-view-card' : ''}}" id="weda-list-view_content">
     <slot></slot>
@@ -24,17 +23,16 @@
     <block wx:elif="{{pagination==='pagination'}}">
       <view class="weda-list-view__more-pagination">
         <view class="weda-list-view__pagination-pre {{pageNo > 1 ? 'active': ''}}" bindtap="handlePre">
-          <image class="weda-list-view__pagination-icon" src='arrow-right-line.svg' />
+          <image class="weda-list-view__pagination-icon" src="arrow-right-line.svg" />
           上一页
         </view>
         <view class="weda-list-view__pagination-text">{{pageStr}}</view>
-        <view class="weda-list-view__pagination-next {{pageSize * pageNo < total ? 'active' : ''}}"
-          bindtap="handleNext">
-          <image class="weda-list-view__pagination-icon" src='arrow-right-line.svg' />
+        <view class="weda-list-view__pagination-next {{pageSize * pageNo < total ? 'active' : ''}}" bindtap="handleNext">
+          <image class="weda-list-view__pagination-icon" src="arrow-right-line.svg" />
           下一页
         </view>
       </view>
     </block>
     <block wx:else></block>
   </view>
-</scroll-view>
+</scroll-view>

package/src/mp/components/lottery/index.wxml

@@ -21,9 +21,7 @@
                 <view class="weda-lottery__turntable-cell-image" wx-if="{{item.src}}">
                   <image mode="aspectFit" src="{{item.src}}" alt="{{item.desc}}" class="weda-lottery__turntable-cell-icon"></image>
                 </view>
-                <view class="weda-lottery__turntable-cell-desc" wx-if="{{item.desc}}">
-                  {{item.desc}}
-                </view>
+                <view class="weda-lottery__turntable-cell-desc" wx-if="{{item.desc}}"> {{item.desc}} </view>
               </view>
             </view>
           </block>

package/src/mp/components/lottery/index.wxss

@@ -8,7 +8,7 @@
   position: relative;
   width: 100%;
   height: 652rpx;
-  background: #FF465C;
+  background: #ff465c;
   border: 2rpx solid rgba(255, 255, 255, 0.6);
   box-shadow: inset 0px 0px 8rpx rgba(255, 255, 255, 0.5);
   border-radius: 20rpx;
@@ -57,15 +57,15 @@
   height: 18rpx;
   box-shadow: 0px 0px 8rpx rgba(255, 255, 255, 0.3);
   border-radius: 50%;
-  background: #FFFFFF;
+  background: #ffffff;
 }
 
 .weda-lottery .weda-lottery__dot .weda-lottery__dot-item:nth-child(odd) {
-  background: #FFEE52;
+  background: #ffee52;
 }
 
 .weda-lottery .weda-lottery__dot .weda-lottery__dot-item:nth-child(even) {
-  background: #FFFFFF
+  background: #ffffff;
 }
 
 .weda-lottery .weda-lottery__dot-horizontal .weda-lottery__dot-item {
@@ -119,7 +119,7 @@
   position: relative;
   width: 100%;
   box-sizing: border-box;
-  background: linear-gradient(180deg, #DD0D00 0%, #D80027 100%);
+  background: linear-gradient(180deg, #dd0d00 0%, #d80027 100%);
   border: 2rpx solid rgba(255, 255, 255, 0.25);
   box-shadow: inset 0px 0px 8rpx rgba(255, 255, 255, 0.5);
   border-radius: 20rpx;
@@ -142,20 +142,20 @@
   height: calc((100% - 64rpx) / 3);
   font-size: 0;
   text-align: center;
-  background: #FFF8EE;
-  box-shadow: inset 0px -4rpx 0px #FFDDBD;
+  background: #fff8ee;
+  box-shadow: inset 0px -4rpx 0px #ffddbd;
   border-radius: 16rpx;
   box-sizing: border-box;
 }
 
 .weda-lottery .weda-lottery__inner .weda-lottery__turntable-item.is-actived {
-  background: #FFF8EE;
-  box-shadow: 0px 0px 12rpx #FFFFFF;
+  background: #fff8ee;
+  box-shadow: 0px 0px 12rpx #ffffff;
 }
 
 .weda-lottery .weda-lottery__inner .weda-lottery__turntable-item.is-selected {
-  background: #FF6666;
-  box-shadow: inset 0px -4rpx 0px #FFA4A4;
+  background: #ff6666;
+  box-shadow: inset 0px -4rpx 0px #ffa4a4;
 }
 
 .weda-lottery .weda-lottery__inner .weda-lottery__turntable-item:first-child {
@@ -215,8 +215,11 @@
   padding: 16rpx 5rpx 16rpx 5rpx;
 }
 
-.weda-lottery .weda-lottery__inner .weda-lottery__turntable-item.is-actived .weda-lottery__turntable-cell {
-  border-color: #FFE05F;
+.weda-lottery
+  .weda-lottery__inner
+  .weda-lottery__turntable-item.is-actived
+  .weda-lottery__turntable-cell {
+  border-color: #ffe05f;
 }
 
 .weda-lottery .weda-lottery__inner .weda-lottery__turntable-cell-image {
@@ -238,15 +241,18 @@
   font-size: 24rpx;
   line-height: 34rpx;
   text-align: center;
-  color: #BA0000;
+  color: #ba0000;
   white-space: nowrap;
   text-overflow: ellipsis;
   overflow: hidden;
   width: 100%;
 }
 
-.weda-lottery .weda-lottery__inner .weda-lottery__turntable-item.is-selected .weda-lottery__turntable-cell-desc {
-  color: #FFFFFF;
+.weda-lottery
+  .weda-lottery__inner
+  .weda-lottery__turntable-item.is-selected
+  .weda-lottery__turntable-cell-desc {
+  color: #ffffff;
 }
 
 .weda-lottery .weda-lottery__turntable-btn {
@@ -256,14 +262,14 @@
   height: calc((100% - 64rpx) / 3);
   top: calc((100% - 64rpx) / 3 + 32rpx);
   left: calc((100% - 64rpx) / 3 + 32rpx);
-  background: linear-gradient(180deg, #FFEE81 0%, #FFD646 100%);
-  box-shadow: inset 0px -4rpx 0px #FF7A00;
+  background: linear-gradient(180deg, #ffee81 0%, #ffd646 100%);
+  box-shadow: inset 0px -4rpx 0px #ff7a00;
   border-radius: 50%;
 }
 
 .weda-lottery .weda-lottery__turntable-btn.is-actived {
-  background: linear-gradient(180deg, #FFEE81 0%, #FFD646 100%);
-  box-shadow: inset 0px 4rpx 0px #FFFFFF;
+  background: linear-gradient(180deg, #ffee81 0%, #ffd646 100%);
+  box-shadow: inset 0px 4rpx 0px #ffffff;
 }
 
 .weda-lottery .weda-lottery__btn-inner {
@@ -276,7 +282,7 @@
 .weda-lottery .weda-lottery__btn {
   width: 100%;
   height: 100%;
-  background: linear-gradient(180deg, #FF922D 0%, #FF3C76 100%);
+  background: linear-gradient(180deg, #ff922d 0%, #ff3c76 100%);
   box-shadow: inset 0px 0px 16rpx rgba(234, 27, 53, 0.5);
   border-radius: 50%;
   display: flex;
@@ -285,7 +291,7 @@
 }
 
 .weda-lottery .weda-lottery__turntable-btn.is-actived .weda-lottery__btn {
-  background: linear-gradient(180deg, #FF922D 0%, #FF3C76 100%);
+  background: linear-gradient(180deg, #ff922d 0%, #ff3c76 100%);
   box-shadow: inset 0px 0px 16rpx rgba(234, 27, 53, 0.5);
 }
 
@@ -295,13 +301,13 @@
   box-sizing: border-box;
 }
 
-.weda-lottery .weda-lottery__btn-image  .weda-lottery__btn-text {
+.weda-lottery .weda-lottery__btn-image .weda-lottery__btn-text {
   font-weight: 600;
   font-size: 18px;
   line-height: 22px;
   text-align: center;
-  color: #FFFFFF;
-  text-shadow: 0px 0.5px 0px #E42B27;
+  color: #ffffff;
+  text-shadow: 0px 0.5px 0px #e42b27;
   max-height: 100%;
   display: -webkit-box;
   overflow: hidden;

package/src/mp/components/navLayout/index.js

@@ -54,25 +54,22 @@ Component({
 
   methods: {
     navigaTo: function (itemInfo) {
+      let { app } = getApp();
       const item = itemInfo?.currentTarget?.dataset?.item;
       if (item.tapStatus == 'inside') {
-        const paramObj = [];
+        const paramObj = {};
         if (item.withParams && item?.params) {
           for (let info of item.params) {
-            paramObj.push(info.key + '=' + info.value);
+            paramObj[info.key] = info.value;
           }
         }
         item.paramObj = paramObj;
-        if (item.withParams && item.params.length > 0) {
-          wx.redirectTo({
-            url:
-              '/pages/' + item?.insideUrl + '/index?' + item.paramObj.join('&'),
-          });
-        } else {
-          wx.redirectTo({
-            url: '/pages/' + item?.insideUrl + '/index',
-          });
-        }
+        app.navigateTo({
+          mode: 'weDa',
+          pageId: item?.insideUrl,
+          params:
+            item?.withParams && item?.params.length > 0 ? item.paramObj : null,
+        });
       }
     },
   },

package/src/mp/components/navLayout/index.wxml

@@ -7,11 +7,9 @@
             <view class="weda-grid__box">
               <view class="weda-grid-navigation__col">
                 <view wx:if="{{col.icon!='自定义图片'}}" class="weda-grid-navigation__icon">
+                  <view wx:if="{{col.tdicon}}" class="weda-icon t-icon t-icon-{{col.tdicon}}"></view>
 
-                    <view wx:if="{{col.tdicon}}" class="weda-icon t-icon t-icon-{{col.tdicon}}"></view>
-
-                  <view wx:if="{{!col.tdicon}}" class="weda-icon lcap-icon-padding lcap-icon lcap-icon-{{col.icon}}">
-                  </view>
+                  <view wx:if="{{!col.tdicon}}" class="weda-icon lcap-icon-padding lcap-icon lcap-icon-{{col.icon}}"> </view>
                 </view>
                 <image wx:if="{{col.icon=='自定义图片'&&col.iconSrc}}" src="{{col.iconSrc}}" class="weda-grid-navigation__img"></image>
               </view>

package/src/mp/components/navigationBar/index.json

@@ -1,6 +1,5 @@
 {
   "component": true,
   "styleIsolation": "shared",
-  "usingComponents": {
-  }
+  "usingComponents": {}
 }