From b30df80b4aeede091768c50e90eb6baa3a8e71ca Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Thu, 5 Dec 2019 00:29:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/user-address-save/user-address-save.axml     |  6 ++++--
 .../pages/user-address-save/user-address-save.js       | 10 ++++++++++
 .../baidu/pages/user-address-save/user-address-save.js | 10 ++++++++++
 .../pages/user-address-save/user-address-save.swan     |  6 ++++--
 .../qq/pages/user-address-save/user-address-save.js    | 10 ++++++++++
 .../qq/pages/user-address-save/user-address-save.qml   |  6 ++++--
 .../pages/user-address-save/user-address-save.js       | 10 ++++++++++
 .../pages/user-address-save/user-address-save.ttml     |  6 ++++--
 .../pages/user-address-save/user-address-save.js       | 10 ++++++++++
 .../pages/user-address-save/user-address-save.wxml     |  6 ++++--
 10 files changed, 70 insertions(+), 10 deletions(-)

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 6267ef57e..375fdc871 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
@@ -13,14 +13,16 @@
                 </picker>
             </view>
             <view class="section fl br-r">
-                <picker name="city" onChange="select_city" value="{{city_value}}" range="{{city_list}}" range-key="name">
+                <picker a:if="{{(province_id || null) != null}}" name="city" onChange="select_city" value="{{city_value}}" range="{{city_list}}" range-key="name">
                     <view class="name {{(city_value == null) ? 'cr-888' : '' }}">{{city_list[city_value].name || default_city}}</view>
                 </picker>
+                <text a:else class="cr-888" onTap="region_select_error_event" data-value="请先选择省份">请先选择省份</text>
             </view>
             <view class="section fl">
-                <picker name="county" onChange="select_county" value="{{county_value}}" range="{{county_list}}" range-key="name">
+                <picker a:if="{{(city_id || null) != null}}" name="county" onChange="select_county" value="{{county_value}}" range="{{county_list}}" range-key="name">
                     <view class="name {{(county_value == null) ? 'cr-888' : '' }}">{{county_list[county_value].name || default_county}}</view>
                 </picker>
+                <text a:else class="cr-888" onTap="region_select_error_event" data-value="请先选择城市">请先选择城市</text>
             </view>
         </view>
         <!-- end地区选择 -->
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 03a3d72dd..394d701c5 100644
--- 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
@@ -270,6 +270,7 @@ Page({
     return value;
   },
 
+  // 数据提交
   form_submit(e) {
     var self = this,
       data = self.data;
@@ -323,5 +324,14 @@ Page({
         }
       });
     }
+  },
+
+  // 省市区未按照顺序选择提示
+  region_select_error_event(e) {
+    var value = e.currentTarget.dataset.value || null;
+    if(value != null)
+    {
+      app.showToast(value);
+    }
   }
 });
diff --git a/public/appmini/old/baidu/pages/user-address-save/user-address-save.js b/public/appmini/old/baidu/pages/user-address-save/user-address-save.js
index 2b07ee78a..4119fee94 100755
--- a/public/appmini/old/baidu/pages/user-address-save/user-address-save.js
+++ b/public/appmini/old/baidu/pages/user-address-save/user-address-save.js
@@ -261,6 +261,7 @@ Page({
     return value;
   },
 
+  // 数据提交
   form_submit(e) {
     var self = this,
         data = self.data;
@@ -307,5 +308,14 @@ Page({
         }
       });
     }
+  },
+
+  // 省市区未按照顺序选择提示
+  region_select_error_event(e) {
+    var value = e.currentTarget.dataset.value || null;
+    if(value != null)
+    {
+      app.showToast(value);
+    }
   }
 });
\ No newline at end of file
diff --git a/public/appmini/old/baidu/pages/user-address-save/user-address-save.swan b/public/appmini/old/baidu/pages/user-address-save/user-address-save.swan
index 408b756d5..3547fa2b2 100755
--- a/public/appmini/old/baidu/pages/user-address-save/user-address-save.swan
+++ b/public/appmini/old/baidu/pages/user-address-save/user-address-save.swan
@@ -13,14 +13,16 @@
                 </picker>
             </view>
             <view class="section fl br-r">
-                <picker name="city" bindchange="select_city" value="{{city_value}}" range="{{city_list}}" range-key="name">
+                <picker s-if="(province_id || null) != null" name="city" bindchange="select_city" value="{{city_value}}" range="{{city_list}}" range-key="name">
                     <view class="name {{(city_value == null) ? 'cr-888' : '' }}">{{city_list[city_value].name || default_city}}</view>
                 </picker>
+                <text s-else class="cr-888" bindtap="region_select_error_event" data-value="请先选择省份">请先选择省份</text>
             </view>
             <view class="section fl">
-                <picker name="county" bindchange="select_county" value="{{county_value}}" range="{{county_list}}" range-key="name">
+                <picker s-if="(city_id || null) != null" name="county" bindchange="select_county" value="{{county_value}}" range="{{county_list}}" range-key="name">
                     <view class="name {{(county_value == null) ? 'cr-888' : '' }}">{{county_list[county_value].name || default_county}}</view>
                 </picker>
+                <text s-else class="cr-888" bindtap="region_select_error_event" data-value="请先选择城市">请先选择城市</text>
             </view>
         </view>
         <!-- end地区选择 -->
diff --git a/public/appmini/old/qq/pages/user-address-save/user-address-save.js b/public/appmini/old/qq/pages/user-address-save/user-address-save.js
index a3445546f..d4095e3fb 100755
--- a/public/appmini/old/qq/pages/user-address-save/user-address-save.js
+++ b/public/appmini/old/qq/pages/user-address-save/user-address-save.js
@@ -262,6 +262,7 @@ Page({
     return value;
   },
 
+  // 数据提交
   form_submit(e) {
     var self = this,
       data = self.data;
@@ -315,5 +316,14 @@ Page({
         }
       });
     }
+  },
+
+  // 省市区未按照顺序选择提示
+  region_select_error_event(e) {
+    var value = e.currentTarget.dataset.value || null;
+    if(value != null)
+    {
+      app.showToast(value);
+    }
   }
 });
diff --git a/public/appmini/old/qq/pages/user-address-save/user-address-save.qml b/public/appmini/old/qq/pages/user-address-save/user-address-save.qml
index a7aafd138..b8487e3b6 100755
--- a/public/appmini/old/qq/pages/user-address-save/user-address-save.qml
+++ b/public/appmini/old/qq/pages/user-address-save/user-address-save.qml
@@ -13,14 +13,16 @@
                 </picker>
             </view>
             <view class="section fl br-r">
-                <picker name="city" bindchange="select_city" value="{{city_value}}" range="{{city_list}}" range-key="name">
+                <picker qq:if="{{(province_id || null) != null}}" name="city" bindchange="select_city" value="{{city_value}}" range="{{city_list}}" range-key="name">
                     <view class="name {{(city_value == null) ? 'cr-888' : '' }}">{{city_list[city_value].name || default_city}}</view>
                 </picker>
+                <text qq:else class="cr-888" bindtap="region_select_error_event" data-value="请先选择省份">请先选择省份</text>
             </view>
             <view class="section fl">
-                <picker name="county" bindchange="select_county" value="{{county_value}}" range="{{county_list}}" range-key="name">
+                <picker qq:if="{{(city_id || null) != null}}" name="county" bindchange="select_county" value="{{county_value}}" range="{{county_list}}" range-key="name">
                     <view class="name {{(county_value == null) ? 'cr-888' : '' }}">{{county_list[county_value].name || default_county}}</view>
                 </picker>
+                <text qq:else class="cr-888" bindtap="region_select_error_event" data-value="请先选择城市">请先选择城市</text>
             </view>
         </view>
         <!-- end地区选择 -->
diff --git a/public/appmini/old/toutiao/pages/user-address-save/user-address-save.js b/public/appmini/old/toutiao/pages/user-address-save/user-address-save.js
index d5a77442e..50d754480 100755
--- a/public/appmini/old/toutiao/pages/user-address-save/user-address-save.js
+++ b/public/appmini/old/toutiao/pages/user-address-save/user-address-save.js
@@ -262,6 +262,7 @@ Page({
     return value;
   },
 
+  // 数据提交
   form_submit(e) {
     var self = this,
       data = self.data;
@@ -315,5 +316,14 @@ Page({
         }
       });
     }
+  },
+  
+  // 省市区未按照顺序选择提示
+  region_select_error_event(e) {
+    var value = e.currentTarget.dataset.value || null;
+    if(value != null)
+    {
+      app.showToast(value);
+    }
   }
 });
diff --git a/public/appmini/old/toutiao/pages/user-address-save/user-address-save.ttml b/public/appmini/old/toutiao/pages/user-address-save/user-address-save.ttml
index a7aafd138..4d96e2c05 100755
--- a/public/appmini/old/toutiao/pages/user-address-save/user-address-save.ttml
+++ b/public/appmini/old/toutiao/pages/user-address-save/user-address-save.ttml
@@ -13,14 +13,16 @@
                 </picker>
             </view>
             <view class="section fl br-r">
-                <picker name="city" bindchange="select_city" value="{{city_value}}" range="{{city_list}}" range-key="name">
+                <picker tt:if="{{(province_id || null) != null}}" name="city" bindchange="select_city" value="{{city_value}}" range="{{city_list}}" range-key="name">
                     <view class="name {{(city_value == null) ? 'cr-888' : '' }}">{{city_list[city_value].name || default_city}}</view>
                 </picker>
+                <text tt:else class="cr-888" bindtap="region_select_error_event" data-value="请先选择省份">请先选择省份</text>
             </view>
             <view class="section fl">
-                <picker name="county" bindchange="select_county" value="{{county_value}}" range="{{county_list}}" range-key="name">
+                <picker tt:if="{{(city_id || null) != null}}" name="county" bindchange="select_county" value="{{county_value}}" range="{{county_list}}" range-key="name">
                     <view class="name {{(county_value == null) ? 'cr-888' : '' }}">{{county_list[county_value].name || default_county}}</view>
                 </picker>
+                <text tt:else class="cr-888" bindtap="region_select_error_event" data-value="请先选择城市">请先选择城市</text>
             </view>
         </view>
         <!-- end地区选择 -->
diff --git a/public/appmini/old/weixin/pages/user-address-save/user-address-save.js b/public/appmini/old/weixin/pages/user-address-save/user-address-save.js
index df49e31d6..b20f0c601 100755
--- a/public/appmini/old/weixin/pages/user-address-save/user-address-save.js
+++ b/public/appmini/old/weixin/pages/user-address-save/user-address-save.js
@@ -262,6 +262,7 @@ Page({
     return value;
   },
 
+  // 数据提交
   form_submit(e) {
     var self = this,
       data = self.data;
@@ -315,5 +316,14 @@ Page({
         }
       });
     }
+  },
+
+  // 省市区未按照顺序选择提示
+  region_select_error_event(e) {
+    var value = e.currentTarget.dataset.value || null;
+    if(value != null)
+    {
+      app.showToast(value);
+    }
   }
 });
diff --git a/public/appmini/old/weixin/pages/user-address-save/user-address-save.wxml b/public/appmini/old/weixin/pages/user-address-save/user-address-save.wxml
index a7aafd138..00d4fc2b9 100755
--- a/public/appmini/old/weixin/pages/user-address-save/user-address-save.wxml
+++ b/public/appmini/old/weixin/pages/user-address-save/user-address-save.wxml
@@ -13,14 +13,16 @@
                 </picker>
             </view>
             <view class="section fl br-r">
-                <picker name="city" bindchange="select_city" value="{{city_value}}" range="{{city_list}}" range-key="name">
+                <picker wx:if="{{(province_id || null) != null}}" name="city" bindchange="select_city" value="{{city_value}}" range="{{city_list}}" range-key="name">
                     <view class="name {{(city_value == null) ? 'cr-888' : '' }}">{{city_list[city_value].name || default_city}}</view>
                 </picker>
+                <text wx:else class="cr-888" bindtap="region_select_error_event" data-value="请先选择省份">请先选择省份</text>
             </view>
             <view class="section fl">
-                <picker name="county" bindchange="select_county" value="{{county_value}}" range="{{county_list}}" range-key="name">
+                <picker wx:if="{{(city_id || null) != null}}" name="county" bindchange="select_county" value="{{county_value}}" range="{{county_list}}" range-key="name">
                     <view class="name {{(county_value == null) ? 'cr-888' : '' }}">{{county_list[county_value].name || default_county}}</view>
                 </picker>
+                <text wx:else class="cr-888" bindtap="region_select_error_event" data-value="请先选择城市">请先选择城市</text>
             </view>
         </view>
         <!-- end地区选择 -->