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 849b4365dec9fbed2b737d3dfde13267a97b7afb..6267ef57e765bb039df2ab8ba2d521e24d5a9fcf 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
@@ -9,17 +9,17 @@
- {{province_list[province_value].name || default_province}}
+ {{province_list[province_value].name || default_province}}
- {{city_list[city_value].name || default_city}}
+ {{city_list[city_value].name || default_city}}
- {{county_list[county_value].name || default_county}}
+ {{county_list[county_value].name || default_county}}
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 15255c50888cca23c1ab175fd079262fe6d7182d..1449c0163eb1940102cc273d2069139f7ae8b497 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
@@ -17,6 +17,10 @@ Page({
default_city: "请选择市",
default_county: "请选择区/县",
+ province_value: null,
+ city_value: null,
+ county_value: null,
+
params: null,
},
@@ -197,38 +201,47 @@ Page({
},
select_province(e) {
- var value = e.detail.value,
- data = this.data.province_list[value];
- this.setData({
- province_value: value,
- province_id: data.id,
- city_value: null,
- county_value: null,
- city_id: null,
- county_id: null
- });
- this.get_city_list();
+ if(e.detail.value >= 0)
+ {
+ var value = e.detail.value,
+ data = this.data.province_list[value];
+ this.setData({
+ province_value: value,
+ province_id: data.id,
+ city_value: null,
+ county_value: null,
+ city_id: null,
+ county_id: null
+ });
+ this.get_city_list();
+ }
},
select_city(e) {
- var value = e.detail.value,
- data = this.data.city_list[value];
- this.setData({
- city_value: value,
- city_id: data.id,
- county_value: null,
- county_id: null
- });
- this.get_county_list();
+ if(e.detail.value >= 0)
+ {
+ var value = e.detail.value,
+ data = this.data.city_list[value];
+ this.setData({
+ city_value: value,
+ city_id: data.id,
+ county_value: null,
+ county_id: null
+ });
+ this.get_county_list();
+ }
},
select_county(e) {
- var value = e.detail.value,
- data = this.data.county_list[value];
- this.setData({
- county_value: value,
- county_id: data.id
- });
+ if(e.detail.value >= 0)
+ {
+ var value = e.detail.value,
+ data = this.data.county_list[value];
+ this.setData({
+ county_value: value,
+ county_id: data.id
+ });
+ }
},
init_value() {
diff --git a/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.axml b/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.axml
index c4c931806984da510c2bfc5a6d43ff3b16f29bc3..1c427637869fb940eccbff58d48c775a7535dd4d 100644
--- a/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.axml
+++ b/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.axml
@@ -95,12 +95,12 @@
-
+
退款原因必选
-
- {{form_reason_index == -1 ? '请选择原因' : reason_data_list[form_reason_index]}}
+
+ {{form_reason_index == null ? '请选择原因' : reason_data_list[form_reason_index]}}
diff --git a/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.js b/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
index 985982c7066192262c84ec51992a40d17cfb5851..5a55740d9388f60e9b6e9e01a01d6d18d6d31ff9 100644
--- a/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
+++ b/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
@@ -101,8 +101,8 @@ Page({
// 表单数据
form_button_disabled: false,
- form_type: -1,
- form_reason_index: -1,
+ form_type: null,
+ form_reason_index: null,
form_price: '',
form_msg: '',
form_number: 0,
@@ -188,7 +188,7 @@ Page({
var value = e.target.dataset.value;
this.setData({
form_type: value,
- form_reason_index: (this.data.form_type == value) ? this.data.form_reason_index : -1,
+ form_reason_index: (this.data.form_type == value) ? this.data.form_reason_index : null,
reason_data_list: (value == 0) ? this.data.return_only_money_reason : this.data.return_money_goods_reason,
form_number: (value == 0) ? 0 : this.data.returned_data.returned_quantity,
});
diff --git a/public/appmini/old/baidu/pages/user-address-save/user-address-save.css b/public/appmini/old/baidu/pages/user-address-save/user-address-save.css
index 47dee54700dd04746afccd637df88882462d5f1d..7aff2aeea2638698ab94c12be3a9808a3f0713f1 100755
--- a/public/appmini/old/baidu/pages/user-address-save/user-address-save.css
+++ b/public/appmini/old/baidu/pages/user-address-save/user-address-save.css
@@ -38,7 +38,4 @@
.addressee-address{
box-sizing: border-box;
width: 100%;
-}
-.not-selected {
- color: #888;
-}
+}
\ No newline at end of file
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 219c37e30d8085285b7ec9d1f1b3278391ed2a23..c8158d4f780ef4d6677e405e896cd61fa2e1a51b 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
@@ -14,9 +14,9 @@ Page({
default_city: "请选择市",
default_county: "请选择区/县",
- province_value: -1,
- city_value: -1,
- county_value: -1,
+ province_value: null,
+ city_value: null,
+ county_value: null,
params: null
},
@@ -180,38 +180,47 @@ Page({
},
select_province(e) {
- var value = e.detail.value,
+ if(e.detail.value >= 0)
+ {
+ var value = e.detail.value,
data = this.data.province_list[value];
- this.setData({
- province_value: value,
- province_id: data.id,
- city_value: null,
- county_value: null,
- city_id: null,
- county_id: null
- });
- this.get_city_list();
+ this.setData({
+ province_value: value,
+ province_id: data.id,
+ city_value: null,
+ county_value: null,
+ city_id: null,
+ county_id: null
+ });
+ this.get_city_list();
+ }
},
select_city(e) {
- var value = e.detail.value,
+ if(e.detail.value >= 0)
+ {
+ var value = e.detail.value,
data = this.data.city_list[value];
- this.setData({
- city_value: value,
- city_id: data.id,
- county_value: null,
- county_id: null
- });
- this.get_county_list();
+ this.setData({
+ city_value: value,
+ city_id: data.id,
+ county_value: null,
+ county_id: null
+ });
+ this.get_county_list();
+ }
},
select_county(e) {
- var value = e.detail.value,
+ if(e.detail.value >= 0)
+ {
+ var value = e.detail.value,
data = this.data.county_list[value];
- this.setData({
- county_value: value,
- county_id: data.id
- });
+ this.setData({
+ county_value: value,
+ county_id: data.id
+ });
+ }
},
init_value() {
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 87b2eac84780cbc6e9f8fa030dc9f0f81bf63059..408b756d5430bfbff721024f8cd6dfb3b9c32f8d 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
@@ -9,17 +9,17 @@
- {{province_list[province_value].name || default_province}}
+ {{province_list[province_value].name || default_province}}
- {{city_list[city_value].name || default_city}}
+ {{city_list[city_value].name || default_city}}
- {{county_list[county_value].name || default_county}}
+ {{county_list[county_value].name || default_county}}
diff --git a/public/appmini/old/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.js b/public/appmini/old/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
index 97e7df12465e09af654d134783dde4943cc62d8b..f39fa8eb60724ea793fd0856daeff798279c6b5d 100644
--- a/public/appmini/old/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
+++ b/public/appmini/old/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
@@ -81,8 +81,8 @@ Page({
// 表单数据
form_button_disabled: false,
- form_type: -1,
- form_reason_index: -1,
+ form_type: null,
+ form_reason_index: null,
form_price: '',
form_msg: '',
form_number: 0,
@@ -168,7 +168,7 @@ Page({
var value = e.currentTarget.dataset.value;
this.setData({
form_type: value,
- form_reason_index: this.data.form_type == value ? this.data.form_reason_index : -1,
+ form_reason_index: this.data.form_type == value ? this.data.form_reason_index : null,
reason_data_list: value == 0 ? this.data.return_only_money_reason : this.data.return_money_goods_reason,
form_number: value == 0 ? 0 : this.data.returned_data.returned_quantity
});
diff --git a/public/appmini/old/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.swan b/public/appmini/old/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.swan
index 970101a602c096178839a32dfcafc72a154975a7..a4e93a8eff77649cddb5858a3afc2274f0d1736d 100644
--- a/public/appmini/old/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.swan
+++ b/public/appmini/old/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.swan
@@ -95,12 +95,12 @@
-
+
退款原因必选
-
- {{form_reason_index == -1 ? '请选择原因' : reason_data_list[form_reason_index]}}
+
+ {{form_reason_index == null ? '请选择原因' : reason_data_list[form_reason_index]}}
diff --git a/public/appmini/old/qq/pages/goods-detail/goods-detail.js b/public/appmini/old/qq/pages/goods-detail/goods-detail.js
index 9fc2cc93dd557d8ef29eda363a119caa9864a191..578a8df9c39862905e74875846d24aa911bade3a 100755
--- a/public/appmini/old/qq/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/qq/pages/goods-detail/goods-detail.js
@@ -34,7 +34,6 @@ Page({
goods_video_is_autoplay: false,
common_app_is_use_mobile_detail: 1,
- popup_share_status: false,
common_app_is_online_service: 0,
// 限时秒杀插件
@@ -45,18 +44,6 @@ Page({
plugins_limitedtimediscount_timer: null,
plugins_limitedtimediscount_timers: null,
- // 好物圈分享信息
- common_app_is_good_thing : 0,
- share_product: {
- "item_code": "",
- "title": "",
- "desc": "",
- "category_list": [],
- "image_list": [],
- "src_mini_program_path": "",
- "brand_info": {},
- },
-
// 海报分享
common_app_is_poster_share: 0,
@@ -144,16 +131,6 @@ Page({
common_app_is_limitedtimediscount: data.common_app_is_limitedtimediscount || 0,
plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null,
- common_app_is_good_thing: data.common_app_is_good_thing || 0,
- 'share_product.item_code': data.goods.id.toString(),
- 'share_product.title': data.goods.title,
- 'share_product.image_list': data.goods.photo.map(function (v) { return v.images;}),
- 'share_product.desc': data.goods.simple_desc,
- 'share_product.category_list': data.goods.category_names || [],
- 'share_product.src_mini_program_path': '/pages/goods-detail/goods-detail?goods_id='+data.goods.id,
- 'share_product.brand_info.name': data.goods.brand_name,
-
- common_app_is_poster_share: data.common_app_is_poster_share || 0,
plugins_coupon_data: data.plugins_coupon_data || null,
quick_nav_cart_count: data.common_cart_total || 0,
});
@@ -669,16 +646,6 @@ Page({
this.setData({ goods_video_is_autoplay: false });
},
- // 分享开启弹层
- popup_share_event(e) {
- this.setData({ popup_share_status: true });
- },
-
- // 分享弹层关闭
- popup_share_close_event(e) {
- this.setData({ popup_share_status: false });
- },
-
// 显示秒杀插件-倒计时
plugins_limitedtimediscount_countdown() {
// 销毁之前的任务
diff --git a/public/appmini/old/qq/pages/goods-detail/goods-detail.qml b/public/appmini/old/qq/pages/goods-detail/goods-detail.qml
index e921012ec844f7234f96653d8d40b313dbbb80bd..450ad9a78ca9fd4806de9fd536c253acb39edeca 100755
--- a/public/appmini/old/qq/pages/goods-detail/goods-detail.qml
+++ b/public/appmini/old/qq/pages/goods-detail/goods-detail.qml
@@ -38,9 +38,11 @@
-
-
- 分享
+
+
{{show_field_price_text}}
¥{{goods.price}}
@@ -188,35 +190,6 @@
-
-
-
-
-
diff --git a/public/appmini/old/qq/pages/goods-detail/goods-detail.qss b/public/appmini/old/qq/pages/goods-detail/goods-detail.qss
index 07c6570790ae5b31a6d07c6f47b04c4ac48273a8..8ad6ee4fb0f4713a65cda72ef4373d9ff36c6093 100755
--- a/public/appmini/old/qq/pages/goods-detail/goods-detail.qss
+++ b/public/appmini/old/qq/pages/goods-detail/goods-detail.qss
@@ -179,6 +179,7 @@
}
.goods-base button {
background: #fff;
+ padding: 0;
}
.goods-base .goods-share {
position: absolute;
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 4b63a905dff44c640e494875829836171d30eaa3..945e405e0587558dbab367bb2f087e196ec46261 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
@@ -14,9 +14,9 @@ Page({
default_city: "请选择市",
default_county: "请选择区/县",
- province_value: -1,
- city_value: -1,
- county_value: -1,
+ province_value: null,
+ city_value: null,
+ county_value: null,
params: null,
},
@@ -182,38 +182,47 @@ Page({
},
select_province(e) {
- var value = e.detail.value,
- data = this.data.province_list[value];
- this.setData({
- province_value: value,
- province_id: data.id,
- city_value: null,
- county_value: null,
- city_id: null,
- county_id: null
- });
- this.get_city_list();
+ if(e.detail.value >= 0)
+ {
+ var value = e.detail.value,
+ data = this.data.province_list[value];
+ this.setData({
+ province_value: value,
+ province_id: data.id,
+ city_value: null,
+ county_value: null,
+ city_id: null,
+ county_id: null
+ });
+ this.get_city_list();
+ }
},
select_city(e) {
- var value = e.detail.value,
- data = this.data.city_list[value];
- this.setData({
- city_value: value,
- city_id: data.id,
- county_value: null,
- county_id: null
- });
- this.get_county_list();
+ if(e.detail.value >= 0)
+ {
+ var value = e.detail.value,
+ data = this.data.city_list[value];
+ this.setData({
+ city_value: value,
+ city_id: data.id,
+ county_value: null,
+ county_id: null
+ });
+ this.get_county_list();
+ }
},
select_county(e) {
- var value = e.detail.value,
- data = this.data.county_list[value];
- this.setData({
- county_value: value,
- county_id: data.id
- });
+ if(e.detail.value >= 0)
+ {
+ var value = e.detail.value,
+ data = this.data.county_list[value];
+ this.setData({
+ county_value: value,
+ county_id: data.id
+ });
+ }
},
init_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 0c61143f31728b85ce9c3d6f977ea12f81ae83ed..a7aafd138ebb6100d8b2f01f11006b51ec859709 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
@@ -9,17 +9,17 @@
- {{province_list[province_value].name || default_province}}
+ {{province_list[province_value].name || default_province}}
- {{city_list[city_value].name || default_city}}
+ {{city_list[city_value].name || default_city}}
- {{county_list[county_value].name || default_county}}
+ {{county_list[county_value].name || default_county}}
diff --git a/public/appmini/old/qq/pages/user-address-save/user-address-save.qss b/public/appmini/old/qq/pages/user-address-save/user-address-save.qss
index ad75aa724a055055a6e3a591d2c10079bdec24ae..2d7ec10f54ea25efb1937bb8aa96b8f4ed564742 100755
--- a/public/appmini/old/qq/pages/user-address-save/user-address-save.qss
+++ b/public/appmini/old/qq/pages/user-address-save/user-address-save.qss
@@ -36,6 +36,3 @@
box-sizing: border-box;
width: 100%;
}
-.not-selected {
- color: #888;
-}
diff --git a/public/appmini/old/qq/pages/user-order/user-order.qss b/public/appmini/old/qq/pages/user-order/user-order.qss
index b88114d6260e8d2fe0d33666874954c5e9d8f61c..07c66c80a51f9416428a1340f9b7cffa1ad9a426 100755
--- a/public/appmini/old/qq/pages/user-order/user-order.qss
+++ b/public/appmini/old/qq/pages/user-order/user-order.qss
@@ -58,7 +58,7 @@
margin-left: 20rpx;
}
.item-operation button {
- padding: 0 35rpx;
+ padding: 15rpx 35rpx;
}
.orderaftersale-btn-text {
position: absolute;
diff --git a/public/appmini/old/qq/pages/user-orderaftersale-detail/user-orderaftersale-detail.js b/public/appmini/old/qq/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
index 7d0ab617d390c5da1842d563c3f175c9344e1ad9..c3dfe927ed778fc9c5301bac2f1704b8232cd911 100644
--- a/public/appmini/old/qq/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
+++ b/public/appmini/old/qq/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
@@ -101,8 +101,8 @@ Page({
// 表单数据
form_button_disabled: false,
- form_type: -1,
- form_reason_index: -1,
+ form_type: null,
+ form_reason_index: null,
form_price: '',
form_msg: '',
form_number: 0,
@@ -188,7 +188,7 @@ Page({
var value = e.currentTarget.dataset.value;
this.setData({
form_type: value,
- form_reason_index: (this.data.form_type == value) ? this.data.form_reason_index : -1,
+ form_reason_index: (this.data.form_type == value) ? this.data.form_reason_index : null,
reason_data_list: (value == 0) ? this.data.return_only_money_reason : this.data.return_money_goods_reason,
form_number: (value == 0) ? 0 : this.data.returned_data.returned_quantity,
});
diff --git a/public/appmini/old/qq/pages/user-orderaftersale-detail/user-orderaftersale-detail.qml b/public/appmini/old/qq/pages/user-orderaftersale-detail/user-orderaftersale-detail.qml
index 8ecbb468f95ee0ec38483059df75bfce53d6398f..b2fc8685308ee72afb4aeb61378394e319fbf92b 100644
--- a/public/appmini/old/qq/pages/user-orderaftersale-detail/user-orderaftersale-detail.qml
+++ b/public/appmini/old/qq/pages/user-orderaftersale-detail/user-orderaftersale-detail.qml
@@ -95,12 +95,12 @@
-
+
退款原因必选
-
- {{form_reason_index == -1 ? '请选择原因' : reason_data_list[form_reason_index]}}
+
+ {{form_reason_index == null ? '请选择原因' : reason_data_list[form_reason_index]}}
diff --git a/public/appmini/old/qq/pages/user-orderaftersale/user-orderaftersale.qss b/public/appmini/old/qq/pages/user-orderaftersale/user-orderaftersale.qss
index d56cc55d71417af9a85a64d8e626fd7276c16d99..794f061e62895a89fdad615690f6b7ff67fa43f1 100644
--- a/public/appmini/old/qq/pages/user-orderaftersale/user-orderaftersale.qss
+++ b/public/appmini/old/qq/pages/user-orderaftersale/user-orderaftersale.qss
@@ -61,5 +61,5 @@
margin-left: 20rpx;
}
.item-operation button {
- padding: 0 35rpx;
+ padding: 15rpx 35rpx;
}
\ No newline at end of file
diff --git a/public/appmini/old/toutiao/pages/goods-detail/goods-detail.js b/public/appmini/old/toutiao/pages/goods-detail/goods-detail.js
index ae93922bf220235b4d51016235a6a3a0b25051ab..9336ded856b8d2e01a5653047404b3e6052de571 100755
--- a/public/appmini/old/toutiao/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/toutiao/pages/goods-detail/goods-detail.js
@@ -42,18 +42,6 @@ Page({
plugins_limitedtimediscount_timer: null,
plugins_limitedtimediscount_timers: null,
- // 好物圈分享信息
- common_app_is_good_thing : 0,
- share_product: {
- "item_code": "",
- "title": "",
- "desc": "",
- "category_list": [],
- "image_list": [],
- "src_mini_program_path": "",
- "brand_info": {},
- },
-
// 优惠劵
plugins_coupon_data: null,
@@ -137,15 +125,6 @@ Page({
common_app_is_limitedtimediscount: data.common_app_is_limitedtimediscount || 0,
plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null,
- common_app_is_good_thing: data.common_app_is_good_thing || 0,
- 'share_product.item_code': data.goods.id.toString(),
- 'share_product.title': data.goods.title,
- 'share_product.image_list': data.goods.photo.map(function (v) { return v.images;}),
- 'share_product.desc': data.goods.simple_desc,
- 'share_product.category_list': data.goods.category_names || [],
- 'share_product.src_mini_program_path': '/pages/goods-detail/goods-detail?goods_id='+data.goods.id,
- 'share_product.brand_info.name': data.goods.brand_name,
-
plugins_coupon_data: data.plugins_coupon_data || null,
quick_nav_cart_count: data.common_cart_total || 0,
});
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 cf0e24a5656f3bd3bca3367597357ba1e7dce301..7e703e9f218d674e87d45297f9b7d4185dbbdbda 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
@@ -14,9 +14,9 @@ Page({
default_city: "请选择市",
default_county: "请选择区/县",
- province_value: -1,
- city_value: -1,
- county_value: -1,
+ province_value: null,
+ city_value: null,
+ county_value: null,
params: null,
},
@@ -182,38 +182,47 @@ Page({
},
select_province(e) {
- var value = e.detail.value,
- data = this.data.province_list[value];
- this.setData({
- province_value: value,
- province_id: data.id,
- city_value: null,
- county_value: null,
- city_id: null,
- county_id: null
- });
- this.get_city_list();
+ if(e.detail.value >= 0)
+ {
+ var value = e.detail.value,
+ data = this.data.province_list[value];
+ this.setData({
+ province_value: value,
+ province_id: data.id,
+ city_value: null,
+ county_value: null,
+ city_id: null,
+ county_id: null
+ });
+ this.get_city_list();
+ }
},
select_city(e) {
- var value = e.detail.value,
- data = this.data.city_list[value];
- this.setData({
- city_value: value,
- city_id: data.id,
- county_value: null,
- county_id: null
- });
- this.get_county_list();
+ if(e.detail.value >= 0)
+ {
+ var value = e.detail.value,
+ data = this.data.city_list[value];
+ this.setData({
+ city_value: value,
+ city_id: data.id,
+ county_value: null,
+ county_id: null
+ });
+ this.get_county_list();
+ }
},
select_county(e) {
- var value = e.detail.value,
- data = this.data.county_list[value];
- this.setData({
- county_value: value,
- county_id: data.id
- });
+ if(e.detail.value >= 0)
+ {
+ var value = e.detail.value,
+ data = this.data.county_list[value];
+ this.setData({
+ county_value: value,
+ county_id: data.id
+ });
+ }
},
init_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 0c61143f31728b85ce9c3d6f977ea12f81ae83ed..a7aafd138ebb6100d8b2f01f11006b51ec859709 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
@@ -9,17 +9,17 @@
- {{province_list[province_value].name || default_province}}
+ {{province_list[province_value].name || default_province}}
- {{city_list[city_value].name || default_city}}
+ {{city_list[city_value].name || default_city}}
- {{county_list[county_value].name || default_county}}
+ {{county_list[county_value].name || default_county}}
diff --git a/public/appmini/old/toutiao/pages/user-address-save/user-address-save.ttss b/public/appmini/old/toutiao/pages/user-address-save/user-address-save.ttss
index ad75aa724a055055a6e3a591d2c10079bdec24ae..80f6f206f452b64d7204cd2cf2972fc97092aa90 100755
--- a/public/appmini/old/toutiao/pages/user-address-save/user-address-save.ttss
+++ b/public/appmini/old/toutiao/pages/user-address-save/user-address-save.ttss
@@ -35,7 +35,4 @@
.addressee-address{
box-sizing: border-box;
width: 100%;
-}
-.not-selected {
- color: #888;
-}
+}
\ No newline at end of file
diff --git a/public/appmini/old/toutiao/pages/user-orderaftersale-detail/user-orderaftersale-detail.js b/public/appmini/old/toutiao/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
index 7391a0e008a8e1d024b0f55aaa9d3dd1d331b944..7d4fe15c64e5594b38645fd4d1558823512ded5d 100644
--- a/public/appmini/old/toutiao/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
+++ b/public/appmini/old/toutiao/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
@@ -101,8 +101,8 @@ Page({
// 表单数据
form_button_disabled: false,
- form_type: -1,
- form_reason_index: -1,
+ form_type: null,
+ form_reason_index: null,
form_price: '',
form_msg: '',
form_number: 0,
@@ -188,7 +188,7 @@ Page({
var value = e.currentTarget.dataset.value;
this.setData({
form_type: value,
- form_reason_index: (this.data.form_type == value) ? this.data.form_reason_index : -1,
+ form_reason_index: (this.data.form_type == value) ? this.data.form_reason_index : null,
reason_data_list: (value == 0) ? this.data.return_only_money_reason : this.data.return_money_goods_reason,
form_number: (value == 0) ? 0 : this.data.returned_data.returned_quantity,
});
diff --git a/public/appmini/old/toutiao/pages/user-orderaftersale-detail/user-orderaftersale-detail.ttml b/public/appmini/old/toutiao/pages/user-orderaftersale-detail/user-orderaftersale-detail.ttml
index fb511a9835c188c570bcaed85e4bfc729d791725..84f5a3d9ef15e4b04f4880b850e0bcc667a08745 100644
--- a/public/appmini/old/toutiao/pages/user-orderaftersale-detail/user-orderaftersale-detail.ttml
+++ b/public/appmini/old/toutiao/pages/user-orderaftersale-detail/user-orderaftersale-detail.ttml
@@ -95,12 +95,12 @@
-
+
退款原因必选
-
- {{form_reason_index == -1 ? '请选择原因' : reason_data_list[form_reason_index]}}
+
+ {{form_reason_index == null ? '请选择原因' : reason_data_list[form_reason_index]}}
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 c167aa0c615a30a5f3f6459a2c8e18deb20dea5a..abfed87720187f86dc8af128489d3b3a6a67a81f 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
@@ -14,9 +14,9 @@ Page({
default_city: "请选择市",
default_county: "请选择区/县",
- province_value: -1,
- city_value: -1,
- county_value: -1,
+ province_value: null,
+ city_value: null,
+ county_value: null,
params: null,
},
@@ -182,38 +182,47 @@ Page({
},
select_province(e) {
- var value = e.detail.value,
- data = this.data.province_list[value];
- this.setData({
- province_value: value,
- province_id: data.id,
- city_value: null,
- county_value: null,
- city_id: null,
- county_id: null
- });
- this.get_city_list();
+ if(e.detail.value >= 0)
+ {
+ var value = e.detail.value,
+ data = this.data.province_list[value];
+ this.setData({
+ province_value: value,
+ province_id: data.id,
+ city_value: null,
+ county_value: null,
+ city_id: null,
+ county_id: null
+ });
+ this.get_city_list();
+ }
},
select_city(e) {
- var value = e.detail.value,
- data = this.data.city_list[value];
- this.setData({
- city_value: value,
- city_id: data.id,
- county_value: null,
- county_id: null
- });
- this.get_county_list();
+ if(e.detail.value >= 0)
+ {
+ var value = e.detail.value,
+ data = this.data.city_list[value];
+ this.setData({
+ city_value: value,
+ city_id: data.id,
+ county_value: null,
+ county_id: null
+ });
+ this.get_county_list();
+ }
},
select_county(e) {
- var value = e.detail.value,
- data = this.data.county_list[value];
- this.setData({
- county_value: value,
- county_id: data.id
- });
+ if(e.detail.value >= 0)
+ {
+ var value = e.detail.value,
+ data = this.data.county_list[value];
+ this.setData({
+ county_value: value,
+ county_id: data.id
+ });
+ }
},
init_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 0c61143f31728b85ce9c3d6f977ea12f81ae83ed..a7aafd138ebb6100d8b2f01f11006b51ec859709 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
@@ -9,17 +9,17 @@
- {{province_list[province_value].name || default_province}}
+ {{province_list[province_value].name || default_province}}
- {{city_list[city_value].name || default_city}}
+ {{city_list[city_value].name || default_city}}
- {{county_list[county_value].name || default_county}}
+ {{county_list[county_value].name || default_county}}
diff --git a/public/appmini/old/weixin/pages/user-address-save/user-address-save.wxss b/public/appmini/old/weixin/pages/user-address-save/user-address-save.wxss
index ad75aa724a055055a6e3a591d2c10079bdec24ae..80f6f206f452b64d7204cd2cf2972fc97092aa90 100755
--- a/public/appmini/old/weixin/pages/user-address-save/user-address-save.wxss
+++ b/public/appmini/old/weixin/pages/user-address-save/user-address-save.wxss
@@ -35,7 +35,4 @@
.addressee-address{
box-sizing: border-box;
width: 100%;
-}
-.not-selected {
- color: #888;
-}
+}
\ No newline at end of file
diff --git a/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.js b/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
index 970aa95a98f389dd6c9533b3905a4925ff2bc288..bc3f6bbdf2fe61e777cf8d7139ef39a82e9416b7 100644
--- a/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
+++ b/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
@@ -101,8 +101,8 @@ Page({
// 表单数据
form_button_disabled: false,
- form_type: -1,
- form_reason_index: -1,
+ form_type: null,
+ form_reason_index: null,
form_price: '',
form_msg: '',
form_number: 0,
@@ -188,7 +188,7 @@ Page({
var value = e.currentTarget.dataset.value;
this.setData({
form_type: value,
- form_reason_index: (this.data.form_type == value) ? this.data.form_reason_index : -1,
+ form_reason_index: (this.data.form_type == value) ? this.data.form_reason_index : null,
reason_data_list: (value == 0) ? this.data.return_only_money_reason : this.data.return_money_goods_reason,
form_number: (value == 0) ? 0 : this.data.returned_data.returned_quantity,
});
diff --git a/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxml b/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxml
index a414121a91916ae443f5b950ffd98a8ff029008a..7685206c60d2674e6cc051b27052798baed59693 100644
--- a/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxml
+++ b/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxml
@@ -95,12 +95,12 @@
-
+
退款原因必选
-
- {{form_reason_index == -1 ? '请选择原因' : reason_data_list[form_reason_index]}}
+
+ {{form_reason_index == null ? '请选择原因' : reason_data_list[form_reason_index]}}