xxxx

GuangZuan/miniprogram/components/tabbar/index.ts

@@ -5,7 +5,26 @@ Component({
     properties: {
         tabs: {
             type: Array,
-            value: [],
+            value: [{
+              icon: 'home-o',
+              text: '首页',
+              url: '/pages/home/index'
+            },
+            {
+              icon: 'todo-list-o',
+              text: '挂牌大厅',
+              url: '/pages/trade/index'
+            },
+            {
+              icon: 'gem-o',
+              text: '钻石圈',
+              url: '/pages/circle/index'
+            },
+            {
+              icon: 'contact',
+              text: '我的',
+              url: '/pages/mine/index'
+            }],
         },
         fixed: {
             type: Boolean,

GuangZuan/miniprogram/components/tabbar/index.wxml

@@ -1,12 +1,12 @@
 <view class="cat-tabbar">
     <view class="cat-tabbar__wrapper" style="{{fixed ? 'position: fixed;' : ''}}">
-        <block wx:for="{{tabs}}" wx:for-index="index" wx:key="index" wx:for-item="item">
+        <block wx:for="{{ tabs }}" wx:for-index="index" wx:key="index" wx:for-item="item">
             <view class="cat-tabbar__item" bindtap="changeTab">
                 <!--判断是否图片图标-->
-                <block wx:if="{{item.icon}}">
+                <block wx:if="{{ item.icon }}">
                     <view class="cat-icon {{['cat-icon-' + item.name, active === index ? 'active' : '']}}">
-                        <image class="image" src="{{item.icon.active}}" wx:if="{{active === index}}"></image>
-                        <image class="image" src="{{item.icon.inactive}}" wx:else></image>
+                        <image class="image" src="{{ item.icon.active }}" wx:if="{{ active === index }}"></image>
+                        <image class="image" src="{{ item.icon.inactive }}" wx:else></image>
                         <text class="text">{{ item.label }}</text>
                     </view>
                 </block>

GuangZuan/miniprogram/custom-tab-bar/index.ts

@@ -1,4 +1,3 @@
-// custom-tab-bar/index.ts
 Component({
   /**
    * 组件的属性列表
@@ -20,22 +19,22 @@ Component({
     activeColor: '#387BDC',
     list: [
 			{
-				icon: 'wap-home',
+				icon: 'home-o',
 				text: '首页',
 				url: '/pages/home/index'
       },
       {
-				icon: 'balance-list',
+				icon: 'todo-list-o',
 				text: '挂牌大厅',
 				url: '/pages/trade/index'
 			},
       {
-				icon: 'gem',
+				icon: 'gem-o',
 				text: '钻石圈',
 				url: '/pages/circle/index'
       },
 			{
-				icon: 'manager',
+				icon: 'contact',
 				text: '我的',
 				url: '/pages/mine/index'
 			}

GuangZuan/miniprogram/mHome/pages/inspection/list/index.less

@@ -99,17 +99,4 @@
     align-items: center;
     font-size: 12px;
   }
-}
-
-.buttom_view {
-  position: sticky;
-  bottom: 10px;
-  z-index: 999;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  margin-top: 20px;
-  align-items: center;
-  align-content: center;
-  width: 100%;
 }

GuangZuan/miniprogram/pages/mine/index.less

@@ -94,12 +94,13 @@
 
   .loginOut-view {
     display: flex;
+    flex-direction: row;
     width: 100%;
     justify-content: center;
     margin-top: 20px;
 
     .loginOut {
-      width: 320px;
+      width: 360px;
       font-size: 28rpx;
       background-color: #226FD9;
       color: white;