Merge branch 'master' of http://gitee.vandh.cn/walvax/fxc-wecat.git

pages/index/index.wxml

@@ -42,13 +42,26 @@
       </view>
     </view>
   </view>
-  <view wx:if="{{status.statusLabelType}}" class="product_one">
-    <view class="product_All">
-      <view class="product_name">
-        <view class="card_text">疫苗种类统计</view>
-        <view class="card_tab">实时追溯</view>
+  <view>
+    <view wx:if="{{status.statusLabelType}}" class="product_one">
+      <view class="product_All">
+        <view class="product_name">
+          <view class="card_text">疫苗种类统计</view>
+          <view class="card_tab">实时追溯</view>
+        </view>
+        <view class="product_content">
+          <view class="cardTitle1">
+            <view class="{{'cardBtn'+cardIndex%3}}" bindtap="setCard" data-index="0">{{tabLeftTop[0].name+1}}</view>
+            <view class="{{'cardBtn'+(cardIndex+2)%3}}" bindtap="setCard" data-index="1">{{tabLeftTop[1].name+2}}</view>
+            <view class="{{'cardBtn'+(cardIndex+1)%3}}" bindtap="setCard" data-index="2">{{tabLeftTop[2].name+3}}</view>
+          </view>
+          <view class="projectText">
+            <text>{{tabLeftTop_remark ? tabLeftTop_remark:tabLeftTop[0].remark}}</text>
+          </view>
+        </view>
       </view>
-      <view class="product_content">
+      <!-- <view class="card_left">
+        <view class="card_text">产品现状分析</view>
         <view class="cardTitle1">
           <view class="{{'cardBtn'+cardIndex%3}}" bindtap="setCard" data-index="0">{{tabLeftTop[0].name+1}}</view>
           <view class="{{'cardBtn'+(cardIndex+2)%3}}" bindtap="setCard" data-index="1">{{tabLeftTop[1].name+2}}</view>
@@ -58,179 +71,169 @@
           <text>{{tabLeftTop_remark ? tabLeftTop_remark:tabLeftTop[0].remark}}</text>
         </view>
       </view>
-    </view>
-    <!-- <view class="card_left">
-      <view class="card_text">产品现状分析</view>
-      <view class="cardTitle1">
-        <view class="{{'cardBtn'+cardIndex%3}}" bindtap="setCard" data-index="0">{{tabLeftTop[0].name+1}}</view>
-        <view class="{{'cardBtn'+(cardIndex+2)%3}}" bindtap="setCard" data-index="1">{{tabLeftTop[1].name+2}}</view>
-        <view class="{{'cardBtn'+(cardIndex+1)%3}}" bindtap="setCard" data-index="2">{{tabLeftTop[2].name+3}}</view>
-      </view>
-      <view class="projectText">
-        <text>{{tabLeftTop_remark ? tabLeftTop_remark:tabLeftTop[0].remark}}</text>
-      </view>
-    </view>
-    <view class="card_right">
-      <view class="card_right_top">
-        <ec-canvas id="pie4ChartConDom" canvas-id="pie4ChartCon" ec="{{ Ec }}"></ec-canvas>
-      </view>
-      <view class="card_right_but">
-        <ec-canvas id="cardBarChartConDom" canvas-id="cardBarChartCon" ec="{{ Ec }}"></ec-canvas>
-      </view>
-    </view> -->
-
-  </view>
-  <view class="product_two">
-    <view class="product_All">
-      <view class="product_name">
-        <view class="card_text">地区分布统计</view>
-        <view class="card_unit">单位：支</view>
-      </view>
-      <view class="card_but">
-        <ec-canvas id="cardBarChartConDom" canvas-id="cardBarChartCon" ec="{{ Ec }}"></ec-canvas>
-      </view>
-      <!-- <view class="card_left">
-        <ec-canvas id="product_two_left_one" canvas-id="product_two_left" ec="{{ Ec }}"></ec-canvas>
-      </view>
       <view class="card_right">
-        <ec-canvas id="product_two_left_two" canvas-id="product_two_left_two" ec="{{ Ec }}"></ec-canvas>
+        <view class="card_right_top">
+          <ec-canvas id="pie4ChartConDom" canvas-id="pie4ChartCon" ec="{{ Ec }}"></ec-canvas>
+        </view>
+        <view class="card_right_but">
+          <ec-canvas id="cardBarChartConDom" canvas-id="cardBarChartCon" ec="{{ Ec }}"></ec-canvas>
+        </view>
       </view> -->
+
     </view>
-  </view>
-  <view class="product_three">
-    <view class="product_All">
-      <view class="product_name">
-        <view class="card_text">温度统计</view>
-      </view>
-      <view class="card_but">
-        
-      </view>
-      <!-- <view class="card_left">
-        <ec-canvas id="product_three_left_one" canvas-id="product_three_left" ec="{{ Ec }}"></ec-canvas>
+    <view class="product_two">
+      <view class="product_All">
+        <view class="product_name">
+          <view class="card_text">地区分布统计</view>
+          <view class="card_unit">单位：支</view>
+        </view>
+        <view class="card_but">
+          <ec-canvas id="cardBarChartConDom" canvas-id="cardBarChartCon" ec="{{ Ec }}"></ec-canvas>
+        </view>
+        <!-- <view class="card_left">
+          <ec-canvas id="product_two_left_one" canvas-id="product_two_left" ec="{{ Ec }}"></ec-canvas>
+        </view>
+        <view class="card_right">
+          <ec-canvas id="product_two_left_two" canvas-id="product_two_left_two" ec="{{ Ec }}"></ec-canvas>
+        </view> -->
       </view>
-      <view class="card_right">
-        <ec-canvas id="product_three_left_two" canvas-id="product_three_right" ec="{{ Ec }}"></ec-canvas>
-      </view> -->
     </view>
-  </view>
-  <view class="product_four">
-    <view class="product_All">
-      <view class="product_name">
-        <view class="card_text">最近一周</view>
-        <view class="card_unit">单位：支</view>
-      </view>
-      <view class="card_but">
-        <ec-canvas id="product_four" canvas-id="product_four" ec="{{ Ec }}"></ec-canvas>
-      </view>
-      <!-- <view class="card_left">
-        <ec-canvas id="product_four_left_one" canvas-id="product_four_left" ec="{{ Ec }}"></ec-canvas>
+    <view class="product_three">
+      <view class="product_All">
+        <view class="product_name">
+          <view class="card_text">温度统计</view>
+        </view>
+        <view class="card_but">
+          
+        </view>
+        <!-- <view class="card_left">
+          <ec-canvas id="product_three_left_one" canvas-id="product_three_left" ec="{{ Ec }}"></ec-canvas>
+        </view>
+        <view class="card_right">
+          <ec-canvas id="product_three_left_two" canvas-id="product_three_right" ec="{{ Ec }}"></ec-canvas>
+        </view> -->
       </view>
-      <view class="card_right">
-        <ec-canvas id="product_four_left_two" canvas-id="product_three_right" ec="{{ Ec }}"></ec-canvas>
-      </view> -->
     </view>
-  </view>
-  <view class="product_five">
-    <view class="product_All">
-      <view class="product_name">
-        <view class="card_text">地区产品统计</view>
-        <view class="card_unit">单位：支</view>
-      </view>
-      <view class="card_but">
-        <ec-canvas id="product_five" canvas-id="product_five" ec="{{ Ec }}"></ec-canvas>
+    <view class="product_four">
+      <view class="product_All">
+        <view class="product_name">
+          <view class="card_text">最近一周</view>
+          <view class="card_unit">单位：支</view>
+        </view>
+        <view class="card_but">
+          <ec-canvas id="product_four" canvas-id="product_four" ec="{{ Ec }}"></ec-canvas>
+        </view>
+        <!-- <view class="card_left">
+          <ec-canvas id="product_four_left_one" canvas-id="product_four_left" ec="{{ Ec }}"></ec-canvas>
+        </view>
+        <view class="card_right">
+          <ec-canvas id="product_four_left_two" canvas-id="product_three_right" ec="{{ Ec }}"></ec-canvas>
+        </view> -->
       </view>
-      <!-- <view class="card_left" style="display: flex;">
-        <view class="card_left_pie">
-          <ec-canvas id="product_five_left_one" canvas-id="product_five_left_one" ec="{{ Ec }}"></ec-canvas>
+    </view>
+    <view class="product_five">
+      <view class="product_All">
+        <view class="product_name">
+          <view class="card_text">地区产品统计</view>
+          <view class="card_unit">单位：支</view>
         </view>
-        <view class="card_right_pie">
-          <view wx:for="{{3}}" wx:for-item="item" class="card_right_pie_index">
-            <ec-canvas id="{{'product_five_right_one'+item}}" canvas-id="{{'product_five_right_one'+item}}" ec="{{ Ec }}"></ec-canvas>
+        <view class="card_but">
+          <ec-canvas id="product_five" canvas-id="product_five" ec="{{ Ec }}"></ec-canvas>
+        </view>
+        <!-- <view class="card_left" style="display: flex;">
+          <view class="card_left_pie">
+            <ec-canvas id="product_five_left_one" canvas-id="product_five_left_one" ec="{{ Ec }}"></ec-canvas>
+          </view>
+          <view class="card_right_pie">
+            <view wx:for="{{3}}" wx:for-item="item" class="card_right_pie_index">
+              <ec-canvas id="{{'product_five_right_one'+item}}" canvas-id="{{'product_five_right_one'+item}}" ec="{{ Ec }}"></ec-canvas>
+            </view>
           </view>
         </view>
+        <view class="card_right">
+          <ec-canvas id="product_five_right" canvas-id="product_five_right" ec="{{ Ec }}"></ec-canvas>
+        </view> -->
       </view>
-      <view class="card_right">
-        <ec-canvas id="product_five_right" canvas-id="product_five_right" ec="{{ Ec }}"></ec-canvas>
-      </view> -->
     </view>
-  </view>
-  <view class="product_six">
-    <view class="product_All">
-      <view class="product_name">
-        <view class="card_text">产品状态</view>
-      </view>
-      <view class="product_All_Flex">
-        <view class="card_left">
-          <ec-canvas id="product_four_left_two" canvas-id="product_three_right" ec="{{ Ec }}"></ec-canvas>
+    <view class="product_six">
+      <view class="product_All">
+        <view class="product_name">
+          <view class="card_text">产品状态</view>
         </view>
-        <view class="card_right">
-          <view wx:for="{{4}}" wx:for-item="item" class="card_right_pie_index">
-            <ec-canvas id="{{'product_five_right_one'+item}}" canvas-id="{{'product_five_right_one'+item}}" ec="{{ Ec }}"></ec-canvas>
+        <view class="product_All_Flex">
+          <view class="card_left">
+            <ec-canvas id="product_four_left_two" canvas-id="product_three_right" ec="{{ Ec }}"></ec-canvas>
+          </view>
+          <view class="card_right">
+            <view wx:for="{{4}}" wx:for-item="item" class="card_right_pie_index">
+              <ec-canvas id="{{'product_five_right_one'+item}}" canvas-id="{{'product_five_right_one'+item}}" ec="{{ Ec }}"></ec-canvas>
+            </view>
           </view>
         </view>
+        <!-- <view class="card_left">
+          <ec-canvas id="product_six_left" canvas-id="product_six_left" ec="{{ Ec }}"></ec-canvas>
+        </view>
+        <view class="card_right">
+          <ec-canvas id="product_six_right" canvas-id="product_six_right" ec="{{ Ec }}"></ec-canvas>
+        </view> -->
       </view>
-      <!-- <view class="card_left">
-        <ec-canvas id="product_six_left" canvas-id="product_six_left" ec="{{ Ec }}"></ec-canvas>
-      </view>
-      <view class="card_right">
-        <ec-canvas id="product_six_right" canvas-id="product_six_right" ec="{{ Ec }}"></ec-canvas>
-      </view> -->
     </view>
-  </view>
-  <view class="product_seven">
-    <view class="product_All">
-      <view class="product_name">
-        <view class="card_text">产品状态统计</view>
-        <view class="card_unit">单位：支</view>
-      </view>
-      <view class="card_but">
-        <ec-canvas id="product_two_left_one" canvas-id="product_two_left_one" ec="{{ Ec }}"></ec-canvas>
-      </view>
-      <!-- <view class="card_left" style="display: flex;">
-        <view class="card_left_pie">
-          <ec-canvas id="product_seven_left" canvas-id="product_seven_left" ec="{{ Ec }}"></ec-canvas>
-        </view>
-        <view class="card_right_pie" style="padding:20rpx 0 0 0;">
-          <view class="sj_yc_item">
-            <view class="sj_yc_tr1">
-              <view>订单号</view>
-              <view>已生产</view>
-            </view>
-            <view class="sj_yc_tr2" wx:for="{{orderCardList}}" wx:for-item="item">
-              <view>{{item.createTime}}</view>
-              <view>{{item.num}}</view>
+    <view class="product_seven">
+      <view class="product_All">
+        <view class="product_name">
+          <view class="card_text">产品状态统计</view>
+          <view class="card_unit">单位：支</view>
+        </view>
+        <view class="card_but">
+          <ec-canvas id="product_two_left_one" canvas-id="product_two_left_one" ec="{{ Ec }}"></ec-canvas>
+        </view>
+        <!-- <view class="card_left" style="display: flex;">
+          <view class="card_left_pie">
+            <ec-canvas id="product_seven_left" canvas-id="product_seven_left" ec="{{ Ec }}"></ec-canvas>
+          </view>
+          <view class="card_right_pie" style="padding:20rpx 0 0 0;">
+            <view class="sj_yc_item">
+              <view class="sj_yc_tr1">
+                <view>订单号</view>
+                <view>已生产</view>
+              </view>
+              <view class="sj_yc_tr2" wx:for="{{orderCardList}}" wx:for-item="item">
+                <view>{{item.createTime}}</view>
+                <view>{{item.num}}</view>
+              </view>
             </view>
           </view>
         </view>
+        <view class="card_right">
+          <view class="card_text">HPV疫苗</view>
+          <view class="card_seven_right_pie">
+            <ec-canvas id="product_seven_right" canvas-id="product_seven_right" ec="{{ Ec }}"></ec-canvas>
+          </view>
+        </view> -->
       </view>
-      <view class="card_right">
-        <view class="card_text">HPV疫苗</view>
-        <view class="card_seven_right_pie">
-          <ec-canvas id="product_seven_right" canvas-id="product_seven_right" ec="{{ Ec }}"></ec-canvas>
-        </view>
-      </view> -->
     </view>
-  </view>
-  <view class="card_eight">
-    <view class="product_All">
-      <!-- <view class="card_left">
-        <ec-canvas id="product_eight_left" canvas-id="product_eight_left" ec="{{ Ec }}"></ec-canvas>
+    <view class="card_eight">
+      <view class="product_All">
+        <!-- <view class="card_left">
+          <ec-canvas id="product_eight_left" canvas-id="product_eight_left" ec="{{ Ec }}"></ec-canvas>
+        </view>
+        <view class="card_left">
+          <ec-canvas id="product_eight_right" canvas-id="product_eight_right" ec="{{ Ec }}"></ec-canvas>
+        </view> -->
       </view>
-      <view class="card_left">
-        <ec-canvas id="product_eight_right" canvas-id="product_eight_right" ec="{{ Ec }}"></ec-canvas>
-      </view> -->
     </view>
-  </view>
-  <view class="card_nine">
-    <view class="product_All">
-      <!-- <view class="card_left">
-        <ec-canvas id="product_nine_left" canvas-id="product_nine_left" ec="{{ Ec }}"></ec-canvas>
+    <view class="card_nine">
+      <view class="product_All">
+        <!-- <view class="card_left">
+          <ec-canvas id="product_nine_left" canvas-id="product_nine_left" ec="{{ Ec }}"></ec-canvas>
+        </view>
+        <view class="card_right">
+          <ec-canvas id="product_nine_right" canvas-id="product_nine_right" ec="{{ Ec }}"></ec-canvas>
+        </view> -->
       </view>
-      <view class="card_right">
-        <ec-canvas id="product_nine_right" canvas-id="product_nine_right" ec="{{ Ec }}"></ec-canvas>
-      </view> -->
     </view>
   </view>
+  
   <view class="textFoot">
     <text class="textH1">免责声明:</text>
     <view class="textActive">

project.private.config.json

@@ -2,6 +2,7 @@
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "libVersion": "2.25.2",
   "setting": {
-    "compileHotReLoad": false
-  }
+    "compileHotReLoad": true
+  },
+  "projectname": "%E6%94%BE%E8%8A%AF%E6%9F%A5_%E6%B2%83%E6%A3%AE"
 }