From 5136891ab27b05873fee563ba5a4aab31e7e7499 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Fri, 25 Jan 2019 15:41:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E6=8B=92=E7=BB=9D=E6=8E=88=E6=9D=83=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alipay/pages/answer-form/answer-form.axml  |  9 +++++++--
 .../alipay/pages/answer-form/answer-form.js    | 18 ++++++++++++++++++
 public/appmini/old/alipay/pages/cart/cart.axml |  4 ++--
 public/appmini/old/alipay/pages/cart/cart.js   | 12 ++++++++++--
 .../old/alipay/pages/message/message.js        |  5 +++++
 .../user-address-save/user-address-save.axml   |  9 +++++++--
 .../user-address-save/user-address-save.js     | 17 +++++++++++++++++
 .../alipay/pages/user-address/user-address.js  |  5 +++++
 .../pages/user-answer-list/user-answer-list.js |  5 +++++
 .../old/alipay/pages/user-faovr/user-faovr.js  |  5 +++++
 .../user-goods-browse/user-goods-browse.js     |  5 +++++
 .../pages/user-integral/user-integral.js       |  5 +++++
 .../old/alipay/pages/user-order/user-order.js  |  5 +++++
 13 files changed, 96 insertions(+), 8 deletions(-)

diff --git a/public/appmini/old/alipay/pages/answer-form/answer-form.axml b/public/appmini/old/alipay/pages/answer-form/answer-form.axml
index 3b8005f52..8c33dcd3b 100755
--- a/public/appmini/old/alipay/pages/answer-form/answer-form.axml
+++ b/public/appmini/old/alipay/pages/answer-form/answer-form.axml
@@ -1,4 +1,4 @@
-<form onSubmit="formSubmit">
+<form onSubmit="formSubmit" a:if="{{data_list_loding_status == 0}}">
     <view class="form-input bg-white spacing-mb">
         <input type="text" class="wh-auto" name="name" placeholder="联系人" maxlength="30" />
     </view>
@@ -12,4 +12,9 @@
     <view class="bottom-btn-box fixed">
         <button type="default" formType="submit" class="my-btn-default" hover-class="none" onTap="submit_event" loading="{{form_submit_loading}}" disabled="{{form_submit_loading}}">提交</button>
     </view>
-</form>
\ No newline at end of file
+</form>
+
+<view a:if="{{data_list_loding_status != 0}}">
+  <import src="/pages/common/nodata.axml" />
+  <template is="nodata" data="{{status: data_list_loding_status, msg: data_list_loding_msg}}"></template>
+</view>
\ No newline at end of file
diff --git a/public/appmini/old/alipay/pages/answer-form/answer-form.js b/public/appmini/old/alipay/pages/answer-form/answer-form.js
index 61dcedeaa..104b7944e 100755
--- a/public/appmini/old/alipay/pages/answer-form/answer-form.js
+++ b/public/appmini/old/alipay/pages/answer-form/answer-form.js
@@ -1,6 +1,9 @@
 const app = getApp();
 Page({
   data: {
+    data_list_loding_status: 1,
+    data_list_loding_msg: '处理错误',
+
     form_submit_loading: false,
   },
 
@@ -20,8 +23,23 @@ Page({
         my.redirectTo({
           url: "/pages/login/login?event_callback=init"
         });
+
+        this.setData({
+          data_list_loding_status: 2,
+          data_list_loding_msg: '请先绑定手机号码',
+        });
         return false;
+      } else {
+        this.setData({
+          data_list_loding_status: 0,
+          data_list_loding_msg: '',
+        });
       }
+    } else {
+      this.setData({
+        data_list_loding_status: 2,
+        data_list_loding_msg: '请先授权用户信息',
+      });
     }
   },
 
diff --git a/public/appmini/old/alipay/pages/cart/cart.axml b/public/appmini/old/alipay/pages/cart/cart.axml
index c8b8dc8bf..04f17328b 100755
--- a/public/appmini/old/alipay/pages/cart/cart.axml
+++ b/public/appmini/old/alipay/pages/cart/cart.axml
@@ -60,7 +60,7 @@
 <!-- 空购物车 -->
 <view a:if="{{data_list.length == 0 && data_list_loding_status == 0}}" class="no-data-box tc">
   <image src="/images/default-cart-empty.png" mode="widthFix" />
-  <view class="no-data-tips">购物车空空如也</view>
+  <view class="no-data-tips">{{data_list_loding_msg}}</view>
   <button type="default" class="my-btn-default" hover-class="none">
     <navigator url="/pages/index/index" open-type="switchTab" hover-class="none">去逛逛</navigator>
   </button>
@@ -68,5 +68,5 @@
 
 <view a:if="{{data_list.length == 0 && data_list_loding_status != 0}}">
   <import src="/pages/common/nodata.axml" />
-  <template is="nodata" data="{{status: data_list_loding_status}}"></template>
+  <template is="nodata" data="{{status: data_list_loding_status, msg: data_list_loding_msg}}"></template>
 </view>
\ No newline at end of file
diff --git a/public/appmini/old/alipay/pages/cart/cart.js b/public/appmini/old/alipay/pages/cart/cart.js
index 36db0d74d..db01cd66c 100755
--- a/public/appmini/old/alipay/pages/cart/cart.js
+++ b/public/appmini/old/alipay/pages/cart/cart.js
@@ -2,7 +2,7 @@ const app = getApp();
 Page({
   data: {
     data_list_loding_status: 1,
-    data_list_loding_msg: '',
+    data_list_loding_msg: '购物车空空如也',
     data_bottom_line_status: false,
     data_list: [],
     swipe_index: null,
@@ -33,6 +33,7 @@ Page({
                 url: "/pages/login/login?event_callback=init"
               });
             } else {
+              my.stopPullDownRefresh();
               this.setData({
                 data_list_loding_status: 0,
                 data_bottom_line_status: false,
@@ -44,6 +45,13 @@ Page({
       } else {
         this.get_data();
       }
+    } else {
+      my.stopPullDownRefresh();
+      this.setData({
+        data_list_loding_status: 0,
+        data_bottom_line_status: false,
+        data_list_loding_msg: '请先授权用户信息',
+      });
     }
   },
 
@@ -74,7 +82,7 @@ Page({
             data_list: data,
             data_list_loding_status: data.length == 0 ? 0 : 3,
             data_bottom_line_status: true,
-            data_list_loding_msg: '',
+            data_list_loding_msg: '购物车空空如也',
           });
         } else {
           this.setData({
diff --git a/public/appmini/old/alipay/pages/message/message.js b/public/appmini/old/alipay/pages/message/message.js
index 82ac18fc9..2cf5de63c 100755
--- a/public/appmini/old/alipay/pages/message/message.js
+++ b/public/appmini/old/alipay/pages/message/message.js
@@ -26,6 +26,11 @@ Page({
         // 获取数据
         this.get_data_list();
       }
+    } else {
+      this.setData({
+        data_list_loding_status: 0,
+        data_bottom_line_status: false,
+      });
     }
   },
 
diff --git a/public/appmini/old/alipay/pages/user-address-save/user-address-save.axml b/public/appmini/old/alipay/pages/user-address-save/user-address-save.axml
index ec4e97576..35d673bc4 100755
--- a/public/appmini/old/alipay/pages/user-address-save/user-address-save.axml
+++ b/public/appmini/old/alipay/pages/user-address-save/user-address-save.axml
@@ -1,4 +1,4 @@
-<form onSubmit="form_submit">
+<form onSubmit="form_submit" a:if="{{data_list_loding_status == 0}}">
     <view class="person-box bg-white">
         <view class="addressee br-b oh">
             <input class="addressee-name fl br-r" name="name" type="text" value="{{name}}" placeholder="姓名" />
@@ -29,4 +29,9 @@
     </view>
 
     <button class="submit-fixed submit-bottom" type="default" formType="submit" hover-class="none">保存</button>
-</form>
\ No newline at end of file
+</form>
+
+<view a:if="{{data_list_loding_status != 0}}">
+  <import src="/pages/common/nodata.axml" />
+  <template is="nodata" data="{{status: data_list_loding_status, msg: data_list_loding_msg}}"></template>
+</view>
\ No newline at end of file
diff --git a/public/appmini/old/alipay/pages/user-address-save/user-address-save.js b/public/appmini/old/alipay/pages/user-address-save/user-address-save.js
index 26ff0d18b..383aa067d 100755
--- a/public/appmini/old/alipay/pages/user-address-save/user-address-save.js
+++ b/public/appmini/old/alipay/pages/user-address-save/user-address-save.js
@@ -2,6 +2,9 @@ const app = getApp();
 
 Page({
   data: {
+    data_list_loding_status: 1,
+    data_list_loding_msg: '处理错误',
+
     province_list: [],
     city_list: [],
     county_list: [],
@@ -40,8 +43,17 @@ Page({
         my.redirectTo({
           url: "/pages/login/login?event_callback=init"
         });
+        this.setData({
+          data_list_loding_status: 2,
+          data_list_loding_msg: '请先绑定手机号码',
+        });
         return false;
       } else {
+        this.setData({
+          data_list_loding_status: 0,
+          data_list_loding_msg: '',
+        });
+
         // 获取地址数据
         if((this.data.params.id || null) != null)
         {
@@ -51,6 +63,11 @@ Page({
         // 获取省
         this.get_province_list();
       }
+    } else {
+      this.setData({
+        data_list_loding_status: 2,
+        data_list_loding_msg: '请先授权用户信息',
+      });
     }
   },
 
diff --git a/public/appmini/old/alipay/pages/user-address/user-address.js b/public/appmini/old/alipay/pages/user-address/user-address.js
index 167fb4b1a..b64f104f9 100755
--- a/public/appmini/old/alipay/pages/user-address/user-address.js
+++ b/public/appmini/old/alipay/pages/user-address/user-address.js
@@ -31,6 +31,11 @@ Page({
         // 获取数据
         this.get_data_list();
       }
+    } else {
+      this.setData({
+        data_list_loding_status: 0,
+        data_bottom_line_status: false,
+      });
     }
   },
 
diff --git a/public/appmini/old/alipay/pages/user-answer-list/user-answer-list.js b/public/appmini/old/alipay/pages/user-answer-list/user-answer-list.js
index 9bbee1b4e..8f178951d 100755
--- a/public/appmini/old/alipay/pages/user-answer-list/user-answer-list.js
+++ b/public/appmini/old/alipay/pages/user-answer-list/user-answer-list.js
@@ -28,6 +28,11 @@ Page({
         // 获取数据
         this.get_data_list();
       }
+    } else {
+      this.setData({
+        data_list_loding_status: 0,
+        data_bottom_line_status: false,
+      });
     }
   },
 
diff --git a/public/appmini/old/alipay/pages/user-faovr/user-faovr.js b/public/appmini/old/alipay/pages/user-faovr/user-faovr.js
index 26a09d62a..324ce4535 100755
--- a/public/appmini/old/alipay/pages/user-faovr/user-faovr.js
+++ b/public/appmini/old/alipay/pages/user-faovr/user-faovr.js
@@ -26,6 +26,11 @@ Page({
         // 获取数据
         this.get_data_list();
       }
+    } else {
+      this.setData({
+        data_list_loding_status: 0,
+        data_bottom_line_status: false,
+      });
     }
   },
 
diff --git a/public/appmini/old/alipay/pages/user-goods-browse/user-goods-browse.js b/public/appmini/old/alipay/pages/user-goods-browse/user-goods-browse.js
index 031676d1e..4d011ba26 100755
--- a/public/appmini/old/alipay/pages/user-goods-browse/user-goods-browse.js
+++ b/public/appmini/old/alipay/pages/user-goods-browse/user-goods-browse.js
@@ -26,6 +26,11 @@ Page({
         // 获取数据
         this.get_data_list();
       }
+    } else {
+      this.setData({
+        data_list_loding_status: 0,
+        data_bottom_line_status: false,
+      });
     }
   },
 
diff --git a/public/appmini/old/alipay/pages/user-integral/user-integral.js b/public/appmini/old/alipay/pages/user-integral/user-integral.js
index ee9d30a4f..b0d42a047 100755
--- a/public/appmini/old/alipay/pages/user-integral/user-integral.js
+++ b/public/appmini/old/alipay/pages/user-integral/user-integral.js
@@ -26,6 +26,11 @@ Page({
         // 获取数据
         this.get_data_list();
       }
+    } else {
+      this.setData({
+        data_list_loding_status: 0,
+        data_bottom_line_status: false,
+      });
     }
   },
 
diff --git a/public/appmini/old/alipay/pages/user-order/user-order.js b/public/appmini/old/alipay/pages/user-order/user-order.js
index 70dd05d8b..46e21737a 100755
--- a/public/appmini/old/alipay/pages/user-order/user-order.js
+++ b/public/appmini/old/alipay/pages/user-order/user-order.js
@@ -61,6 +61,11 @@ Page({
         // 获取数据
         this.get_data_list();
       }
+    } else {
+      this.setData({
+        data_list_loding_status: 0,
+        data_bottom_line_status: false,
+      });
     }
   },
 
-- 
GitLab