Browse Source

no message

yanjie 4 years ago
parent
commit
b994eaed04

+ 1 - 1
mini/components/inner-device-card/index.wxml

xqd
@@ -1,7 +1,7 @@
 <!--components/inner-device-card/index.wxml-->
 <view class="sg-item sg-white-bg sg-pad sg-margin-bottom" bindtap="switchChecked" data-index="{{index}}">
   <view class="sg-top sg-flex sg-space-between sg-bottom-border sg-pad-bottom-sm sg-font-small sg-bold">
-    <view class="sg-name">{{item.device_name ? item.device_name.name : ''}} - {{item.spec_name ? item.spec_name : ''}}
+    <view class="sg-name">{{item.device_name ? item.device_name.name : ''}} - {{item.inner_name ? item.inner_name : ''}}
     </view>
     <view class="sg-flex sg-align-center">
       <view class="sg-status sg-flex sg-align-center" wx:if="{{showStatus}}">

+ 2 - 2
mini/components/sg-date-picker/index.wxml

xqd
@@ -1,7 +1,7 @@
 <!--components/sg-date-picker/index.wxml-->
 <view class="picker">
-  <view>时间选择</view>
-  <picker mode="multiSelector" bindchange="bindChange" bindcolumnchange="bindColumnChange" value="{{multiIndex}}" range="{{multiArray}}" range-key="name">
+  <view style="margin-bottom:15rpx;font-size:26rpx;">时间选择</view>
+  <picker mode="multiSelector" style="font-size:26rpx" bindchange="bindChange" bindcolumnchange="bindColumnChange" value="{{multiIndex}}" range="{{multiArray}}" range-key="name">
     <view class="picker">
       <text>{{multiArray[0][multiIndex[0]].id == '' ? multiArray[0][multiIndex[0]].name : multiArray[0][multiIndex[0]].name + '-' + multiArray[1][multiIndex[1]].name}}</text>
       <van-icon name="arrow-down" class="sg-icon"></van-icon>

+ 12 - 5
mini/pages/data/index.wxml

xqd xqd
@@ -16,23 +16,30 @@
     <view class="sg-center">
       <view class="sg-font-lg">{{year_money}}</view>
       <view class="sg-font-xs sg-pad-tb-sm">
-        <view>当年公司租赁设备</view>
+        <view style="margin-bottom:10rpx">当年公司租赁设备</view>
         <view>费用总和</view>
       </view>
     </view>
     <view class="sg-center">
       <view class="sg-font-lg">{{month_money}}</view>
       <view class="sg-font-xs sg-pad-tb-sm">
-        <view>当月公司租赁设备</view>
+        <view style="margin-bottom:10rpx">当月公司租赁设备</view>
         <view>费用总和</view>
       </view>
     </view>
     <view class="sg-center">
       <sg-date-picker bind:update="updateDate"></sg-date-picker>
+      <view class="sg-flex sg-align-center condition">
+        <view class="sg-flex sg-align-center" bindtap="navigate" data-url="/pages/data-center/index">
+          <van-icon name="search" class=" sg-index-color" style="font-size:1.3rem" bindtap="switchShow" data-name="dateShow"
+            data-show="{{true}}"></van-icon>
+          <text class="sg-index-color" style="font-size:26rpx">条件查找</text>
+        </view>
+      </view>
     </view>
   </view>
   <view class="sg-white-bg sg-chart-box">
-    <view class="sg-flex sg-pad sg-align-center sg-space-between">
+    <view class="sg-flex sg-pad sg-align-center" style="justify-content: flex-end;">
       <view wx:if="{{chartIndex == 0}}">
         <van-icon name="setting-o" class="sg-icon-lg" bindtap="switchShow" data-name="projectShow"
           data-show="{{true}}" />
@@ -51,13 +58,13 @@
         <van-icon name="filter-o" class="sg-index-color sg-icon-lg" bindtap="navigate"
           data-url="/pages/filter-data/index" />
       </view>
-      <view class="sg-flex sg-align-center">
+      <!-- <view class="sg-flex sg-align-center">
         <view class="sg-flex sg-align-center" bindtap="navigate" data-url="/pages/data-center/index">
           <van-icon name="search" class="sg-icon-lg sg-index-color" bindtap="switchShow" data-name="dateShow"
             data-show="{{true}}"></van-icon>
           <text class="sg-index-color">条件查找</text>
         </view>
-      </view>
+      </view> -->
     </view>
     <view class="sg-chart sg-flex sg-align-center sg-space-between" hidden="{{projectShow}}">
       <view hidden="{{chartIndex == 0}}" bindtap="changeChartIndex" data-type="-">

+ 14 - 1
mini/pages/data/index.wxss

xqd
@@ -1,23 +1,36 @@
 /* pages/data/index.wxss */
+.condition {
+  background-color: #fff;
+  width: 175rpx;
+  justify-content: center;
+  border-radius: 16rpx;
+  margin-top: 24rpx;
+}
+
 .sg-chart-box {
   min-height: 90vh;
   border-top-right-radius: 50rpx;
   border-top-left-radius: 50rpx;
   margin-top: 40rpx;
 }
+
 .sg-radio-group {
   padding: 10rpx;
   border-radius: 40rpx;
 }
-.sg-radio-group  .sg-selected {
+
+.sg-radio-group .sg-selected {
   border-radius: 40rpx;
 }
+
 .sg-radio-group .sg-radio {
   padding: 10rpx 30rpx;
 }
+
 .sg-calendar {
   margin-bottom: 200rpx;
 }
+
 .sg-chart {
   width: 100vw;
   height: 70vh;