diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js index bbf42c5cdd31ca2f3048ef68196e4122813e41d9..9f75e6fb5a9555fe839c3f953eb2e68794d43de3 100755 --- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js @@ -82,7 +82,7 @@ Page({ goods_photo: data.goods.photo, goods_specifications_choose: data.goods.specifications.choose || [], goods_content_app: data.goods.content_app, - temp_buy_number: (data.goods.buy_min_number) || 1, + temp_buy_number: data.goods.buy_min_number || 1, goods_favor_text: (data.goods.is_favor == 1) ? '已收藏' : '收藏', goods_favor_icon: '/images/goods-detail-favor-icon-' + data.goods.is_favor+'.png', nav_submit_text: ((data.common_order_is_booking || 0) == 0) ? '立即购买' : '立即预约', @@ -328,7 +328,7 @@ Page({ } } } - this.setData({goods_specifications_choose: temp_data, goods_spec_base_images: temp_images}); + this.setData({goods_specifications_choose: temp_data, goods_spec_base_images: temp_images, temp_buy_number: 1}); // 不能选择规格处理 this.goods_specifications_choose_handle_dont(key); @@ -510,7 +510,7 @@ Page({ goods_buy_number_func(buy_number) { var buy_min_number = parseInt(this.data.goods.buy_min_number) || 1; var buy_max_number = parseInt(this.data.goods.buy_max_number) || 0; - var inventory = parseInt(this.data.goods.goods_spec_base_inventory); + var inventory = parseInt(this.data.goods_spec_base_inventory); var inventory_unit = this.data.goods.inventory_unit; if(buy_number < buy_min_number) { 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 f9748b652ed80f5e9e16eafb69394ecced12e109..26ff0d18bce70d00d7c1b42be3bdb24b74bc7676 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 @@ -8,6 +8,7 @@ Page({ province_id: null, city_id: null, county_id: null, + is_default: 0, default_province: "请选择省", default_city: "请选择市", @@ -74,7 +75,8 @@ Page({ address: data.address, province_id: data.province, city_id: data.city, - county_id: data.county + county_id: data.county, + is_default: data.is_default || 0, }); self.get_city_list(); @@ -276,6 +278,7 @@ Page({ form_data["city"] = data.city_id; form_data["county"] = data.county_id; form_data["id"] = self.data.params.id || 0; + form_data["is_default"] = self.data.is_default || 0; if (app.fields_check(form_data, validation)) { // 加载loding diff --git a/public/appmini/old/alipay/pages/user-order/user-order.axml b/public/appmini/old/alipay/pages/user-order/user-order.axml index f7d646cecbbd37dbba973a96add1bfeb782d3393..9f75ef98c7d706df738a3ae798ad5c14c4b7c23d 100755 --- a/public/appmini/old/alipay/pages/user-order/user-order.axml +++ b/public/appmini/old/alipay/pages/user-order/user-order.axml @@ -14,8 +14,8 @@ {{item.add_time}} {{item.status_name}} - - + + {{detail.title}} @@ -30,29 +30,30 @@ ¥{{detail.original_price}} x{{detail.buy_number}} - - {{item.describe}} - - - - - - - - - - - + + {{item.describe}} + + + + + + + + + + + + - + + diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js index 2c3dcbfd628851f165431ba9494e0c64ebae2b40..7cf46a500ced1a67aa2be251feb9531534a7c2b3 100755 --- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js @@ -82,7 +82,7 @@ Page({ goods_photo: data.goods.photo, goods_specifications_choose: data.goods.specifications.choose || [], goods_content_app: data.goods.content_app, - temp_buy_number: (data.goods.buy_min_number) || 1, + temp_buy_number: data.goods.buy_min_number || 1, goods_favor_text: (data.goods.is_favor == 1) ? '已收藏' : '收藏', goods_favor_icon: '/images/goods-detail-favor-icon-' + data.goods.is_favor+'.png', nav_submit_text: ((data.common_order_is_booking || 0) == 0) ? '立即购买' : '立即预约', @@ -303,7 +303,7 @@ Page({ } } } - this.setData({goods_specifications_choose: temp_data, goods_spec_base_images: temp_images}); + this.setData({ goods_specifications_choose: temp_data, goods_spec_base_images: temp_images, temp_buy_number: 1}); // 不能选择规格处理 this.goods_specifications_choose_handle_dont(key); @@ -473,14 +473,14 @@ Page({ goods_buy_number_func(buy_number) { var buy_min_number = parseInt(this.data.goods.buy_min_number) || 1; var buy_max_number = parseInt(this.data.goods.buy_max_number) || 0; - var inventory = parseInt(this.data.goods.goods_spec_base_inventory); + var inventory = parseInt(this.data.goods_spec_base_inventory); var inventory_unit = this.data.goods.inventory_unit; if(buy_number < buy_min_number) { buy_number = buy_min_number; if(buy_min_number > 1) { - app.showToast( '起购'+buy_min_number+inventory_unit); + app.showToast('起购'+buy_min_number+inventory_unit); } } if(buy_max_number > 0 && buy_number > buy_max_number) 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 38eaa0b3fc4f8173aea3d080b607914133e6a99d..0603dd09963e6983779decc65079bcaff47e2b72 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 @@ -8,6 +8,7 @@ Page({ province_id: null, city_id: null, county_id: null, + is_default: 0, default_province: "请选择省", default_city: "请选择市", @@ -77,7 +78,8 @@ Page({ address: data.address, province_id: data.province, city_id: data.city, - county_id: data.county + county_id: data.county, + is_default: data.is_default || 0, }); self.get_city_list(); @@ -258,6 +260,7 @@ Page({ form_data["city"] = data.city_id; form_data["county"] = data.county_id; form_data["id"] = self.data.params.id || 0; + form_data["is_default"] = self.data.is_default || 0; if (app.fields_check(form_data, validation)) { // 加载loding diff --git a/public/appmini/old/weixin/pages/user-order/user-order.wxml b/public/appmini/old/weixin/pages/user-order/user-order.wxml index e33e527c79d9e4c0a891187ea822396dc592446c..9928aa6a4c2ab21e47539a6ac1056ed7c205f31c 100755 --- a/public/appmini/old/weixin/pages/user-order/user-order.wxml +++ b/public/appmini/old/weixin/pages/user-order/user-order.wxml @@ -43,13 +43,15 @@ - - - - + + + + + +