From 209fdac5e66117280d724cd2e221fddd6b568d91 Mon Sep 17 00:00:00 2001
From: chenxuhui <qwehui12@163.com>
Date: Tue, 20 Nov 2018 15:41:14 +0800
Subject: [PATCH] x:for-item => x:key

---
 pages/homePage/homePage.wxml                 | 3 +--
 pages/message/message.wxml                   | 2 +-
 pages/myCars/myCars.wxml                     | 2 +-
 pages/orderList/orderDetail/orderDetail.wxml | 1 -
 pages/orderList/orderList.wxml               | 4 ++--
 utils/net.js                                 | 8 ++++----
 6 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/pages/homePage/homePage.wxml b/pages/homePage/homePage.wxml
index 65292ca..36179f7 100644
--- a/pages/homePage/homePage.wxml
+++ b/pages/homePage/homePage.wxml
@@ -11,11 +11,10 @@
     </view>
     <view class="ico" catchtap='transBtnClicked' data-itemid='2'>
       <image src="/imgs/carsApply.png"></image>
-      <text class='text'>车辆申请</text>
+      <text class='text'>我的车辆</text>
     </view>
      <view class="ico" catchtap='transBtnClicked' data-itemid='3'>
       <image src="/imgs/outStore.png"></image>
       <text class='text'>销售出库</text>
     </view>
-    
   </view>
diff --git a/pages/message/message.wxml b/pages/message/message.wxml
index b4e957c..007d879 100644
--- a/pages/message/message.wxml
+++ b/pages/message/message.wxml
@@ -1,6 +1,6 @@
 <!--pages/message/message.wxml-->
 <view class='pageContainer'>
-  <block wx:for="{{messageArr}}" wx:for-item="item">
+  <block wx:for="{{messageArr}}" wx:key="item">
     <template is="messageTemplate" data="{{item}}" />
   </block>
 </view>
diff --git a/pages/myCars/myCars.wxml b/pages/myCars/myCars.wxml
index b68f1ca..c9ac201 100644
--- a/pages/myCars/myCars.wxml
+++ b/pages/myCars/myCars.wxml
@@ -1,6 +1,6 @@
 <!--pages/myCars/myCars.wxml-->
 <scroll-view scroll-x="false" scroll-y="true" class='scroll-views' bindscrolltoupper="unCheckedScrollUpper" bindscrolltolower="unCheckedScrollLower">
-  <block wx:for="{{carsList}}" wx:for-item="item">
+  <block wx:for="{{carsList}}" wx:key="item">
     <template is="outStoreOrderTemplate" data="{{item}}" />
   </block>
 </scroll-view>
diff --git a/pages/orderList/orderDetail/orderDetail.wxml b/pages/orderList/orderDetail/orderDetail.wxml
index bf2a795..22dc21d 100644
--- a/pages/orderList/orderDetail/orderDetail.wxml
+++ b/pages/orderList/orderDetail/orderDetail.wxml
@@ -142,7 +142,6 @@
   </view>
   <view class='horizontallineView'></view>
 
-
  <view class='baseitem'>
     <text class='baseitem_key'>辅数量</text>
     <view class='baseitem_value'>
diff --git a/pages/orderList/orderList.wxml b/pages/orderList/orderList.wxml
index 3cd237f..e2ec246 100644
--- a/pages/orderList/orderList.wxml
+++ b/pages/orderList/orderList.wxml
@@ -9,7 +9,7 @@
   <!-- 未审核 -->
   <swiper-item class="swiper-items1">
     <scroll-view scroll-x="false" scroll-y="true" class='scroll-views' bindscrolltoupper="unCheckedScrollUpper" bindscrolltolower="unCheckedScrollLower">
-      <block wx:for="{{unCheckDataArr}}" wx:for-item="item">
+      <block wx:for="{{unCheckDataArr}}" wx:key="item">
         <template is="outStoreOrderTemplate" data="{{item}}" />
       </block>
     </scroll-view>
@@ -18,7 +18,7 @@
   <!-- 已审核 -->
   <swiper-item class="swiper-items2">
     <scroll-view scroll-x="false" scroll-y="true" class='scroll-views' bindscrolltoupper="checkedScrollUpper" bindscrolltolower="CheckedScrollLower">
-      <block wx:for="{{checkedDataArr}}" wx:for-item="item">
+      <block wx:for="{{checkedDataArr}}" wx:key="item">
         <template is="outStoreOrderTemplate" data="{{item}}" />
       </block>
     </scroll-view>
diff --git a/utils/net.js b/utils/net.js
index 4fcd816..f741df7 100644
--- a/utils/net.js
+++ b/utils/net.js
@@ -6,7 +6,7 @@ function request(url, params, success, fail) {
 }
 
 //原来的请求方式 。现在首页五个接口沿用，直接在中转服务器获取数据
-function previousRequestLoading(method, params, successaction) {
+function requestLoading(method, params, successaction) {
   wx.showLoading({
     title: "加载中",
   });
@@ -48,8 +48,8 @@ function previousRequestLoading(method, params, successaction) {
   })
 }
 
-// 新请求方式，添加中转服务器
-function requestLoading(method, params, successaction) {
+// 中转服务器，跳转请求
+function transferRequestLoading(method, params, successaction) {
   wx.showLoading({
     title: "加载中",
   })
@@ -97,5 +97,5 @@ function requestLoading(method, params, successaction) {
 module.exports = {
   request: request,
   requestLoading: requestLoading,
-  previousRequestLoading: previousRequestLoading,
+  transferRequestLoading: transferRequestLoading,
 }
\ No newline at end of file