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 5c629c133..8db2dedc7 100644
--- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js
@@ -839,7 +839,7 @@ Page({
// 自定义分享
onShareAppMessage() {
- var user = app.get_user_info(this, 'onShareAppMessage') || null;
+ var user = app.get_user_cache_info() || null;
var user_id = (user != null && (user.id || null) != null) ? user.id : 0;
return {
title: app.data.application_title +'-'+ this.data.goods.title,
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 e150a7bca..1848cf640 100644
--- a/public/appmini/old/alipay/pages/user-address/user-address.js
+++ b/public/appmini/old/alipay/pages/user-address/user-address.js
@@ -160,7 +160,11 @@ Page({
}
} else {
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data)) {
+ app.showToast(res.data.msg);
+ } else {
+ app.showToast('提交失败，请重试！');
+ }
}
},
fail: () => {
@@ -206,7 +210,11 @@ Page({
self.setData({is_default: value});
app.showToast(res.data.msg, 'success');
} else {
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data)) {
+ app.showToast(res.data.msg);
+ } else {
+ app.showToast('提交失败，请重试！');
+ }
}
},
fail: () => {
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 920783f1d..8a8acbe20 100644
--- a/public/appmini/old/alipay/pages/user-faovr/user-faovr.js
+++ b/public/appmini/old/alipay/pages/user-faovr/user-faovr.js
@@ -163,7 +163,11 @@ Page({
}
app.showToast(res.data.msg, 'success');
} else {
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data)) {
+ app.showToast(res.data.msg);
+ } else {
+ app.showToast('提交失败，请重试！');
+ }
}
},
fail: () => {
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 c36ac57b8..a6692fc01 100644
--- 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
@@ -161,7 +161,11 @@ Page({
}
app.showToast(res.data.msg, 'success');
} else {
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data)) {
+ app.showToast(res.data.msg);
+ } else {
+ app.showToast('提交失败，请重试！');
+ }
}
},
fail: () => {
diff --git a/public/appmini/old/alipay/pages/user-orderaftersale/user-orderaftersale.js b/public/appmini/old/alipay/pages/user-orderaftersale/user-orderaftersale.js
index a8f2461b0..0b20de37a 100644
--- a/public/appmini/old/alipay/pages/user-orderaftersale/user-orderaftersale.js
+++ b/public/appmini/old/alipay/pages/user-orderaftersale/user-orderaftersale.js
@@ -217,7 +217,11 @@ Page({
app.showToast(res.data.msg, "success");
} else {
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data)) {
+ app.showToast(res.data.msg);
+ } else {
+ app.showToast('提交失败，请重试！');
+ }
}
},
fail: () => {
diff --git a/public/appmini/old/baidu/pages/user-address/user-address.js b/public/appmini/old/baidu/pages/user-address/user-address.js
index 383864611..a2c717206 100755
--- a/public/appmini/old/baidu/pages/user-address/user-address.js
+++ b/public/appmini/old/baidu/pages/user-address/user-address.js
@@ -152,7 +152,11 @@ Page({
}
}
} else {
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data)) {
+ app.showToast(res.data.msg);
+ } else {
+ app.showToast('提交失败，请重试！');
+ }
}
},
fail: () => {
@@ -196,7 +200,11 @@ Page({
app.showToast(res.data.msg, "success");
} else {
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data)) {
+ app.showToast(res.data.msg);
+ } else {
+ app.showToast('提交失败，请重试！');
+ }
}
},
fail: () => {
diff --git a/public/appmini/old/baidu/pages/user-faovr/user-faovr.js b/public/appmini/old/baidu/pages/user-faovr/user-faovr.js
index 66f71c1d1..36b51fbcb 100755
--- a/public/appmini/old/baidu/pages/user-faovr/user-faovr.js
+++ b/public/appmini/old/baidu/pages/user-faovr/user-faovr.js
@@ -162,7 +162,11 @@ Page({
app.showToast(res.data.msg, "success");
} else {
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data)) {
+ app.showToast(res.data.msg);
+ } else {
+ app.showToast('提交失败，请重试！');
+ }
}
},
fail: () => {
diff --git a/public/appmini/old/baidu/pages/user-goods-browse/user-goods-browse.js b/public/appmini/old/baidu/pages/user-goods-browse/user-goods-browse.js
index 98280542d..3e352cfd1 100755
--- a/public/appmini/old/baidu/pages/user-goods-browse/user-goods-browse.js
+++ b/public/appmini/old/baidu/pages/user-goods-browse/user-goods-browse.js
@@ -162,7 +162,11 @@ Page({
app.showToast(res.data.msg, "success");
} else {
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data)) {
+ app.showToast(res.data.msg);
+ } else {
+ app.showToast('提交失败，请重试！');
+ }
}
},
fail: () => {
diff --git a/public/appmini/old/baidu/pages/user-orderaftersale/user-orderaftersale.js b/public/appmini/old/baidu/pages/user-orderaftersale/user-orderaftersale.js
index 1a482ac01..db0e7acb5 100644
--- a/public/appmini/old/baidu/pages/user-orderaftersale/user-orderaftersale.js
+++ b/public/appmini/old/baidu/pages/user-orderaftersale/user-orderaftersale.js
@@ -209,7 +209,11 @@ Page({
app.showToast(res.data.msg, "success");
} else {
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data)) {
+ app.showToast(res.data.msg);
+ } else {
+ app.showToast('提交失败，请重试！');
+ }
}
},
fail: () => {
diff --git a/public/appmini/old/qq/app.js b/public/appmini/old/qq/app.js
index b1779a046..b4179afe9 100755
--- a/public/appmini/old/qq/app.js
+++ b/public/appmini/old/qq/app.js
@@ -67,8 +67,8 @@ App({
// 请求地址
request_url: "{{request_url}}",
- // request_url: 'http://tp5-dev.com/',
- // request_url: 'https://test.shopxo.net/',
+ request_url: 'http://tp5-dev.com/',
+ request_url: 'https://dev.shopxo.net/',
// 基础信息
application_title: "{{application_title}}",
diff --git a/public/appmini/old/qq/app.json b/public/appmini/old/qq/app.json
index a48234485..773b4cf51 100755
--- a/public/appmini/old/qq/app.json
+++ b/public/appmini/old/qq/app.json
@@ -27,7 +27,8 @@
"pages/user-orderaftersale/user-orderaftersale",
"pages/user-orderaftersale-detail/user-orderaftersale-detail",
"pages/coupon/coupon",
- "pages/user-coupon/user-coupon"
+ "pages/user-coupon/user-coupon",
+ "pages/extraction-address/extraction-address"
],
"window": {
"navigationBarTitleText": "{{application_title}}",
diff --git a/public/appmini/old/qq/pages/answer-form/answer-form.js b/public/appmini/old/qq/pages/answer-form/answer-form.js
index d2d9c2db7..5d758e4cb 100755
--- a/public/appmini/old/qq/pages/answer-form/answer-form.js
+++ b/public/appmini/old/qq/pages/answer-form/answer-form.js
@@ -13,13 +13,15 @@ Page({
// 初始化
init() {
- var user = app.get_user_cache_info(this, "init");
- // 用户未绑定用户则转到登录页面
- if (app.user_is_need_login(user)) {
- qq.redirectTo({
- url: "/pages/login/login?event_callback=init"
- });
- return false;
+ var user = app.get_user_info(this, "init");
+ if (user != false) {
+ // 用户未绑定用户则转到登录页面
+ if (app.user_is_need_login(user)) {
+ qq.redirectTo({
+ url: "/pages/login/login?event_callback=init"
+ });
+ return false;
+ }
}
},
@@ -60,8 +62,11 @@ Page({
}, 2000);
} else {
this.setData({form_submit_loading: false});
-
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data)) {
+ app.showToast(res.data.msg);
+ } else {
+ app.showToast('提交失败，请重试！');
+ }
}
},
fail: () => {
diff --git a/public/appmini/old/qq/pages/answer-list/answer-list.qml b/public/appmini/old/qq/pages/answer-list/answer-list.qml
index d115099ec..4c821a66f 100755
--- a/public/appmini/old/qq/pages/answer-list/answer-list.qml
+++ b/public/appmini/old/qq/pages/answer-list/answer-list.qml
@@ -13,10 +13,10 @@
-
+
-
+
\ No newline at end of file
diff --git a/public/appmini/old/qq/pages/buy/buy.js b/public/appmini/old/qq/pages/buy/buy.js
index d79ce976d..490614453 100755
--- a/public/appmini/old/qq/pages/buy/buy.js
+++ b/public/appmini/old/qq/pages/buy/buy.js
@@ -8,13 +8,15 @@ Page({
payment_list: [],
goods_list: [],
address: null,
- address_id: 0,
+ address_id: null,
total_price: 0,
user_note_value: '',
is_first: 1,
extension_data: [],
payment_id: 0,
common_order_is_booking: 0,
+ common_site_type: 0,
+ extraction_address: [],
// 优惠劵
plugins_coupon_data: null,
@@ -23,17 +25,9 @@ Page({
popup_plugins_coupon_status: false,
},
onLoad(params) {
- if((params.data || null) == null || app.get_length(JSON.parse(params.data)) == 0)
+ //params['data'] = '{"buy_type":"goods","goods_id":"1","stock":"1","spec":"[]"}';
+ if((params.data || null) != null && app.get_length(JSON.parse(params.data)) > 0)
{
- qq.alert({
- title: '温馨提示',
- content: '订单信息有误',
- buttonText: '确认',
- success: () => {
- qq.navigateBack();
- },
- });
- } else {
this.setData({ params: JSON.parse(params.data)});
// 删除地址缓存
@@ -42,13 +36,22 @@ Page({
},
onShow() {
- qq.setNavigationBarTitle({title: app.data.common_pages_title.buy});
this.init();
- this.setData({is_first: 0});
+ this.setData({ is_first: 0 });
},
// 获取数据列表
init() {
+ // 订单参数信息是否正确
+ if (this.data.params == null) {
+ this.setData({
+ data_list_loding_status: 2,
+ data_list_loding_msg: '订单信息有误',
+ });
+ qq.stopPullDownRefresh();
+ return false;
+ }
+
// 本地缓存地址
if(this.data.is_first == 0)
{
@@ -57,12 +60,7 @@ Page({
{
this.setData({
address: cache_address,
- address_id: cache_address.id
- });
- } else {
- this.setData({
- address: null,
- address_id: 0
+ address_id: cache_address.id || null,
});
}
}
@@ -97,6 +95,8 @@ Page({
extension_data: data.extension_data || [],
data_list_loding_status: 3,
common_order_is_booking: data.common_order_is_booking || 0,
+ common_site_type: data.common_site_type || 0,
+ extraction_address: data.base.extraction_address || [],
plugins_coupon_data: data.plugins_coupon_data || null,
});
@@ -113,19 +113,14 @@ Page({
}
// 地址
- if (this.data.address == null || this.data.address_id == 0) {
- if((data.base.address || null) != null) {
- this.setData({
- address: data.base.address,
- address_id: data.base.address.id,
- });
-
- qq.setStorage({
- key: app.data.cache_buy_user_address_select_key,
- data: data.base.address,
- });
- }
- }
+ this.setData({
+ address: data.base.address || null,
+ address_id: ((data.base.address || null) != null && (data.base.address.id || null) != null) ? data.base.address.id : null,
+ });
+ qq.setStorage({
+ key: app.data.cache_buy_user_address_select_key,
+ data: data.base.address || null,
+ });
// 支付方式
this.payment_list_data(data.payment_list);
@@ -135,7 +130,9 @@ Page({
data_list_loding_status: 2,
data_list_loding_msg: res.data.msg,
});
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data, this, 'init')) {
+ app.showToast(res.data.msg);
+ }
}
},
fail: () => {
@@ -171,9 +168,11 @@ Page({
data['coupon_id'] = this.data.plugins_use_coupon_id;
// 数据验证
- var validation = [
- { fields: 'address_id', msg: '请选择地址' }
- ];
+ var validation = [];
+ if (this.data.common_site_type == 0 || this.data.common_site_type == 2)
+ {
+ validation.push({ fields: 'address_id', msg: '请选择地址', is_can_zero: 1 });
+ }
if (this.data.common_order_is_booking != 1) {
validation.push({ fields: 'payment_id', msg: '请选择支付方式' });
}
@@ -263,4 +262,21 @@ Page({
this.init();
},
+ // 地址选择事件
+ address_event(e) {
+ if(this.data.common_site_type == 0)
+ {
+ qq.navigateTo({
+ url: '/pages/user-address/user-address?is_back=1'
+ });
+ } else if (this.data.common_site_type == 2)
+ {
+ qq.navigateTo({
+ url: '/pages/extraction-address/extraction-address?is_back=1'
+ });
+ } else {
+ app.showToast('当前模式不允许使用地址');
+ }
+ },
+
});
diff --git a/public/appmini/old/qq/pages/buy/buy.qml b/public/appmini/old/qq/pages/buy/buy.qml
index bc0f8ff88..8e623eaa5 100755
--- a/public/appmini/old/qq/pages/buy/buy.qml
+++ b/public/appmini/old/qq/pages/buy/buy.qml
@@ -1,125 +1,132 @@
-
-
-
-
-
-
- {{address.name}}
- {{address.tel}}
+
+
+
+
+
+
+
+
+
+
+
+ {{address.alias}}
+ {{address.name}}
+ {{address.tel}}
+
+
+
+ {{address.province_name}}{{address.city_name}}{{address.county_name}}{{address.address}}
+
-
-
- {{address.province_name}}{{address.city_name}}{{address.county_name}}{{address.address}}
+
+ 请选择地址
-
- 请选择地址
-
-
-
-
+
+
-
-
-
-
-
- {{item.title}}
-
- {{spec.type}}:{{spec.value}}
+
+
+
+
+
+ {{item.title}}
+
+ {{spec.type}}:{{spec.value}}
+
+
+
+
+ ￥{{item.price}}
+
+ ￥{{item.original_price}}
+
+ x{{item.stock}}
+
+
+
+
+
+
+
+
+ {{user_note_value || '留言'}}
+
+
+
+
+ 优惠劵
+ {{plugins_choice_coupon_value}}
+
+
+
+
+
+ {{item.name}}
+
+ {{item.tips}}
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+ 合计：
+ ￥{{total_price}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
- {{user_note_value || '留言'}}
-
-
-
-
- 优惠劵
- {{plugins_choice_coupon_value}}
-
-
-
-
-
- {{item.name}}
-
- {{item.tips}}
-
-
-
-
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
-
- 合计：
- ￥{{total_price}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/public/appmini/old/qq/pages/buy/buy.qss b/public/appmini/old/qq/pages/buy/buy.qss
index 8e4fb8d5a..c3283e906 100755
--- a/public/appmini/old/qq/pages/buy/buy.qss
+++ b/public/appmini/old/qq/pages/buy/buy.qss
@@ -12,7 +12,7 @@
padding: 10rpx 35rpx 10rpx 10rpx;
}
.address-detail .icon {
- width: 35rpx;
+ width: 30rpx;
height: 35rpx !important;
}
.address-detail .text {
@@ -30,6 +30,13 @@
height: 85rpx;
line-height: 85rpx;
}
+.address-alias {
+ border: 1px solid #d2364c;
+ color: #d2364c;
+ padding: 2rpx 10rpx;
+ border-radius: 6rpx;
+ margin-right: 10rpx;
+}
/**
* 商品
diff --git a/public/appmini/old/qq/pages/cart/cart.js b/public/appmini/old/qq/pages/cart/cart.js
index 68b4919e3..d6d8dad12 100755
--- a/public/appmini/old/qq/pages/cart/cart.js
+++ b/public/appmini/old/qq/pages/cart/cart.js
@@ -22,31 +22,39 @@ Page({
},
init(e) {
- var user = app.get_user_cache_info(this, "init");
- // 用户未绑定用户则转到登录页面
- var msg = (user == false) ? '授权用户信息' : '绑定手机号码';
- if (app.user_is_need_login(user)) {
- qq.showModal({
- title: '温馨提示',
- content: msg,
- confirmText: '确认',
- cancelText: '暂不',
- success: (result) => {
- if (result.confirm) {
- qq.navigateTo({
- url: "/pages/login/login?event_callback=init"
- });
- } else {
- this.setData({
- data_list_loding_status: 0,
- data_bottom_line_status: false,
- data_list_loding_msg: '请先' + msg,
- });
- }
- },
- });
+ var user = app.get_user_info(this, "init");
+ if (user != false) {
+ // 用户未绑定用户则转到登录页面
+ if (app.user_is_need_login(user)) {
+ qq.showModal({
+ title: '温馨提示',
+ content: msg,
+ confirmText: '确认',
+ cancelText: '暂不',
+ success: (result) => {
+ if (result.confirm) {
+ qq.navigateTo({
+ url: "/pages/login/login?event_callback=init"
+ });
+ } else {
+ this.setData({
+ data_list_loding_status: 0,
+ data_bottom_line_status: false,
+ data_list_loding_msg: '请先' + msg,
+ });
+ }
+ },
+ });
+ } else {
+ this.get_data();
+ }
} else {
- this.get_data();
+ qq.stopPullDownRefresh();
+ this.setData({
+ data_list_loding_status: 0,
+ data_bottom_line_status: false,
+ data_list_loding_msg: '请先授权用户信息',
+ });
}
},
@@ -87,7 +95,9 @@ Page({
data_bottom_line_status: false,
data_list_loding_msg: res.data.msg,
});
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data, this, 'get_data')) {
+ app.showToast(res.data.msg);
+ }
}
},
fail: () => {
diff --git a/public/appmini/old/qq/pages/cart/cart.qml b/public/appmini/old/qq/pages/cart/cart.qml
index eb3f7c447..e6a215ec3 100755
--- a/public/appmini/old/qq/pages/cart/cart.qml
+++ b/public/appmini/old/qq/pages/cart/cart.qml
@@ -79,6 +79,6 @@
-
+
\ No newline at end of file
diff --git a/public/appmini/old/qq/pages/common/nodata.qml b/public/appmini/old/qq/pages/common/nodata.qml
index 392e88638..8861f9154 100755
--- a/public/appmini/old/qq/pages/common/nodata.qml
+++ b/public/appmini/old/qq/pages/common/nodata.qml
@@ -5,13 +5,13 @@
-
+
{{msg || '处理错误'}}
-
+
{{msg || '没有相关数据'}}
diff --git a/public/appmini/old/qq/pages/coupon/coupon.js b/public/appmini/old/qq/pages/coupon/coupon.js
index af2073705..3ddf606ef 100644
--- a/public/appmini/old/qq/pages/coupon/coupon.js
+++ b/public/appmini/old/qq/pages/coupon/coupon.js
@@ -6,6 +6,10 @@ Page({
data_list_loding_msg: '',
data_list: [],
data_base: null,
+
+ // 优惠劵领取
+ temp_coupon_receive_index: null,
+ temp_coupon_receive_value: null,
},
onLoad(params) {
@@ -80,45 +84,59 @@ Page({
// 优惠劵领取事件
coupon_receive_event(e) {
- var user = app.get_user_cache_info(this, "coupon_receive_event");
- // 用户未绑定用户则转到登录页面
- if (app.user_is_need_login(user)) {
- qq.redirectTo({
- url: "/pages/login/login?event_callback=coupon_receive_event"
- });
- return false;
+ // 参数处理
+ if((e || null) == null)
+ {
+ var index = this.data.temp_coupon_receive_index;
+ var value = this.data.temp_coupon_receive_value;
} else {
- var self = this;
var index = e.currentTarget.dataset.index;
var value = e.currentTarget.dataset.value;
- var temp_list = this.data.data_list;
- if (temp_list[index]['is_operable'] != 0) {
- qq.showLoading({ title: "处理中..." });
- qq.request({
- url: app.get_request_url("receive", "coupon"),
- method: "POST",
- data: { "coupon_id": value },
- dataType: "json",
- header: { 'content-type': 'application/x-www-form-urlencoded' },
- success: res => {
- qq.hideLoading();
- if (res.data.code == 0) {
- app.showToast(res.data.msg, "success");
- if (self.data.data_base != null && self.data.data_base.is_repeat_receive != 1)
- {
- temp_list[index]['is_operable'] = 0;
- temp_list[index]['is_operable_name'] = '已领取';
- self.setData({ data_list: temp_list });
- }
- } else {
- app.showToast(res.data.msg);
- }
- },
- fail: () => {
- qq.hideLoading();
- app.showToast("服务器请求出错");
- }
+ this.setData({temp_coupon_receive_index: index, temp_coupon_receive_value: value});
+ }
+
+ // 登录校验
+ var user = app.get_user_info(this, 'coupon_receive_event');
+ if (user != false) {
+ // 用户未绑定用户则转到登录页面
+ if (app.user_is_need_login(user)) {
+ qq.navigateTo({
+ url: "/pages/login/login?event_callback=coupon_receive_event"
});
+ return false;
+ } else {
+ var self = this;
+ var temp_list = this.data.data_list;
+ if (temp_list[index]['is_operable'] != 0) {
+ qq.showLoading({ title: "处理中..." });
+ qq.request({
+ url: app.get_request_url("receive", "coupon"),
+ method: "POST",
+ data: { "coupon_id": value },
+ dataType: "json",
+ header: { 'content-type': 'application/x-www-form-urlencoded' },
+ success: res => {
+ qq.hideLoading();
+ if (res.data.code == 0) {
+ app.showToast(res.data.msg, "success");
+ if (self.data.data_base != null && self.data.data_base.is_repeat_receive != 1)
+ {
+ temp_list[index]['is_operable'] = 0;
+ temp_list[index]['is_operable_name'] = '已领取';
+ self.setData({ data_list: temp_list });
+ }
+ } else {
+ if (app.is_login_check(res.data, self, 'coupon_receive_event')) {
+ app.showToast(res.data.msg);
+ }
+ }
+ },
+ fail: () => {
+ qq.hideLoading();
+ app.showToast("服务器请求出错");
+ }
+ });
+ }
}
}
},
diff --git a/public/appmini/old/qq/pages/coupon/coupon.qml b/public/appmini/old/qq/pages/coupon/coupon.qml
index b33c62bbd..12fe66e0e 100644
--- a/public/appmini/old/qq/pages/coupon/coupon.qml
+++ b/public/appmini/old/qq/pages/coupon/coupon.qml
@@ -22,9 +22,9 @@
-
+
-
+
\ No newline at end of file
diff --git a/public/appmini/old/qq/pages/extraction-address/extraction-address.js b/public/appmini/old/qq/pages/extraction-address/extraction-address.js
new file mode 100644
index 000000000..7e913e39a
--- /dev/null
+++ b/public/appmini/old/qq/pages/extraction-address/extraction-address.js
@@ -0,0 +1,146 @@
+const app = getApp();
+Page({
+ data: {
+ data_list_loding_status: 1,
+ data_bottom_line_status: false,
+ data_list: [],
+ params: null,
+ is_default: 0,
+ },
+
+ onLoad(params) {
+ this.setData({ params: params });
+ },
+
+ onShow() {
+ qq.setNavigationBarTitle({ title: app.data.common_pages_title.extraction_address });
+ this.init();
+ },
+
+ // 初始化
+ init() {
+ var user = app.get_user_info(this, "init");
+ if (user != false) {
+ // 用户未绑定用户则转到登录页面
+ if (app.user_is_need_login(user)) {
+ qq.redirectTo({
+ url: "/pages/login/login?event_callback=init"
+ });
+ return false;
+ } else {
+ // 获取数据
+ this.get_data_list();
+ }
+ } else {
+ this.setData({
+ data_list_loding_status: 0,
+ data_bottom_line_status: false,
+ });
+ }
+ },
+
+ // 获取数据列表
+ get_data_list() {
+ // 加载loding
+ qq.showLoading({ title: "加载中..." });
+ this.setData({
+ data_list_loding_status: 1
+ });
+
+ // 获取数据
+ qq.request({
+ url: app.get_request_url("extraction", "useraddress"),
+ method: "POST",
+ data: {},
+ dataType: "json",
+ success: res => {
+ qq.hideLoading();
+ qq.stopPullDownRefresh();
+ if (res.data.code == 0) {
+ if (res.data.data.length > 0) {
+ // 获取当前默认地址
+ var is_default = 0;
+ for (var i in res.data.data) {
+ if (res.data.data[i]['is_default'] == 1) {
+ is_default = res.data.data[i]['id'];
+ }
+ }
+
+ // 设置数据
+ this.setData({
+ data_list: res.data.data,
+ is_default: is_default,
+ data_list_loding_status: 3,
+ data_bottom_line_status: true,
+ });
+ } else {
+ this.setData({
+ data_list_loding_status: 0
+ });
+ }
+ } else {
+ this.setData({
+ data_list_loding_status: 0
+ });
+ if (app.is_login_check(res.data, this, 'get_data_list')) {
+ app.showToast(res.data.msg);
+ }
+ }
+ },
+ fail: () => {
+ qq.hideLoading();
+ qq.stopPullDownRefresh();
+
+ this.setData({
+ data_list_loding_status: 2
+ });
+ app.showToast("服务器请求出错");
+ }
+ });
+ },
+
+ // 下拉刷新
+ onPullDownRefresh() {
+ this.get_data_list();
+ },
+
+ // 地图查看
+ address_map_event(e) {
+ var index = e.currentTarget.dataset.index || 0;
+ var ads = this.data.data_list[index] || null;
+ if (ads == null)
+ {
+ app.showToast("地址有误");
+ return false;
+ }
+
+ var lng = parseFloat(ads.lng || 0);
+ var lat = parseFloat(ads.lat || 0);
+ if (lng <= 0 || lat <= 0) {
+ app.showToast("坐标有误");
+ return false;
+ }
+
+ qq.openLocation({
+ latitude: lat,
+ longitude: lng,
+ scale: 18,
+ name: ads.alias || '',
+ address: (ads.province_name || '') + (ads.city_name || '') + (ads.county_name || '') + (ads.address || ''),
+ });
+ },
+
+ // 地址内容事件
+ address_conent_event(e) {
+ var index = e.currentTarget.dataset.index || 0;
+ var is_back = this.data.params.is_back || 0;
+ if (is_back == 1) {
+ qq.setStorage({
+ key: app.data.cache_buy_user_address_select_key,
+ data: this.data.data_list[index]
+ });
+ qq.navigateBack();
+ }
+ },
+
+});
diff --git a/public/appmini/old/qq/pages/extraction-address/extraction-address.json b/public/appmini/old/qq/pages/extraction-address/extraction-address.json
new file mode 100644
index 000000000..331ad4f3d
--- /dev/null
+++ b/public/appmini/old/qq/pages/extraction-address/extraction-address.json
@@ -0,0 +1,3 @@
+{
+ "enablePullDownRefresh": true
+}
\ No newline at end of file
diff --git a/public/appmini/old/qq/pages/extraction-address/extraction-address.qml b/public/appmini/old/qq/pages/extraction-address/extraction-address.qml
new file mode 100644
index 000000000..7f1f2d648
--- /dev/null
+++ b/public/appmini/old/qq/pages/extraction-address/extraction-address.qml
@@ -0,0 +1,28 @@
+
+
+
+
+
+ {{item.alias}}
+ {{item.name}}
+ {{item.tel}}
+
+
+
+ {{item.province_name}}{{item.city_name}}{{item.county_name}}{{item.address}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/public/appmini/old/qq/pages/extraction-address/extraction-address.qss b/public/appmini/old/qq/pages/extraction-address/extraction-address.qss
new file mode 100644
index 000000000..1bad1b348
--- /dev/null
+++ b/public/appmini/old/qq/pages/extraction-address/extraction-address.qss
@@ -0,0 +1,24 @@
+.item {
+ padding: 10rpx 10rpx 0 10rpx;
+}
+.base, .address, .operation {
+ padding: 20rpx 0;
+}
+.address .item-icon {
+ width: 30rpx;
+ height: 35rpx !important;
+}
+.address-alias {
+ border: 1px solid #d2364c;
+ color: #d2364c;
+ padding: 2rpx 10rpx;
+ border-radius: 6rpx;
+ margin-right: 10rpx;
+}
+.address .text {
+ line-height: 44rpx;
+ width: calc(100% - 40rpx);
+}
+.operation .map-submit {
+ margin-left: 20rpx;
+}
\ No newline at end of file
diff --git a/public/appmini/old/qq/pages/goods-category/goods-category.qml b/public/appmini/old/qq/pages/goods-category/goods-category.qml
index f8b7c757a..d9273f144 100755
--- a/public/appmini/old/qq/pages/goods-category/goods-category.qml
+++ b/public/appmini/old/qq/pages/goods-category/goods-category.qml
@@ -17,7 +17,7 @@
-
+
\ No newline at end of file
diff --git a/public/appmini/old/qq/pages/goods-comment/goods-comment.qml b/public/appmini/old/qq/pages/goods-comment/goods-comment.qml
index 73247c217..4ce73e399 100644
--- a/public/appmini/old/qq/pages/goods-comment/goods-comment.qml
+++ b/public/appmini/old/qq/pages/goods-comment/goods-comment.qml
@@ -10,7 +10,7 @@
{{item.name}}
- 暂无评分
+ 暂无评分
@@ -41,10 +41,10 @@
-
+
-
+
\ No newline at end of file
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 06c6d0cb8..5b2c2272f 100755
--- a/public/appmini/old/qq/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/qq/pages/goods-detail/goods-detail.js
@@ -34,6 +34,7 @@ Page({
goods_video_is_autoplay: false,
common_app_is_use_mobile_detail: 1,
+ popup_share_status: false,
common_app_is_online_service: 0,
// 限时秒杀插件
@@ -44,6 +45,18 @@ 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,
@@ -56,6 +69,10 @@ Page({
// 站点模式
common_site_type: 0,
customer_service_tel: null,
+
+ // 优惠劵领取
+ temp_coupon_receive_index: null,
+ temp_coupon_receive_value: null,
},
onLoad(params) {
@@ -128,10 +145,21 @@ Page({
show_field_price_text: (data.goods.show_field_price_text == '销售价') ? null : (data.goods.show_field_price_text.replace(/<[^>]+>/g, "") || null),
common_app_is_use_mobile_detail: data.common_app_is_use_mobile_detail || 0,
+ //common_app_is_online_service: data.common_app_is_online_service || 0,
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,
});
@@ -264,76 +292,84 @@ Page({
// 收藏事件
goods_favor_event(e)
{
- var user = app.get_user_cache_info(this, 'goods_favor_event');
- // 用户未绑定用户则转到登录页面
- if (app.user_is_need_login(user)) {
- qq.navigateTo({
- url: "/pages/login/login?event_callback=init"
- });
- return false;
- } else {
- qq.showLoading({title: '处理中...'});
+ var user = app.get_user_info(this, 'goods_favor_event');
+ if (user != false) {
+ // 用户未绑定用户则转到登录页面
+ if (app.user_is_need_login(user)) {
+ qq.navigateTo({
+ url: "/pages/login/login?event_callback=goods_favor_event"
+ });
+ return false;
+ } else {
+ qq.showLoading({title: '处理中...'});
- qq.request({
- url: app.get_request_url('favor', 'goods'),
- method: 'POST',
- data: {"id": this.data.goods.id},
- dataType: 'json',
- success: (res) => {
- qq.hideLoading();
- if(res.data.code == 0)
- {
- this.setData({
- 'goods.is_favor': res.data.data.status,
- goods_favor_text: res.data.data.text,
- goods_favor_icon: '/images/goods-detail-favor-icon-'+res.data.data.status+'.png'
- });
- app.showToast(res.data.msg, "success");
- } else {
- app.showToast(res.data.msg);
+ qq.request({
+ url: app.get_request_url('favor', 'goods'),
+ method: 'POST',
+ data: {"id": this.data.goods.id},
+ dataType: 'json',
+ success: (res) => {
+ qq.hideLoading();
+ if(res.data.code == 0)
+ {
+ this.setData({
+ 'goods.is_favor': res.data.data.status,
+ goods_favor_text: res.data.data.text,
+ goods_favor_icon: '/images/goods-detail-favor-icon-'+res.data.data.status+'.png'
+ });
+ app.showToast(res.data.msg, "success");
+ } else {
+ if (app.is_login_check(res.data, this, 'goods_favor_event')) {
+ app.showToast(res.data.msg);
+ }
+ }
+ },
+ fail: () => {
+ qq.hideLoading();
+
+ app.showToast('服务器请求出错');
}
- },
- fail: () => {
- qq.hideLoading();
-
- app.showToast('服务器请求出错');
- }
- });
+ });
+ }
}
},
// 加入购物车事件
- goods_cart_event(e, spec) {
- var user = app.get_user_cache_info(this, 'goods_buy_confirm_event');
- // 用户未绑定用户则转到登录页面
- if (app.user_is_need_login(user)) {
- qq.navigateTo({
- url: "/pages/login/login?event_callback=init"
- });
- return false;
- } else {
- qq.showLoading({title: '处理中...' });
- qq.request({
- url: app.get_request_url('save', 'cart'),
- method: 'POST',
- data: { "goods_id": this.data.goods.id, "stock": this.data.temp_buy_number, "spec": JSON.stringify(spec) },
- dataType: 'json',
- success: (res) => {
- qq.hideLoading();
- if (res.data.code == 0) {
- this.setData({ quick_nav_cart_count: res.data.data});
- this.popup_close_event();
- app.showToast(res.data.msg, "success");
- } else {
- app.showToast(res.data.msg);
- }
- },
- fail: () => {
- qq.hideLoading();
+ goods_cart_event(spec) {
+ var user = app.get_user_info(this, 'goods_buy_confirm_event');
+ if (user != false) {
+ // 用户未绑定用户则转到登录页面
+ if (app.user_is_need_login(user)) {
+ qq.navigateTo({
+ url: "/pages/login/login?event_callback=goods_buy_confirm_event"
+ });
+ return false;
+ } else {
+ qq.showLoading({title: '处理中...' });
+ qq.request({
+ url: app.get_request_url('save', 'cart'),
+ method: 'POST',
+ data: { "goods_id": this.data.goods.id, "stock": this.data.temp_buy_number, "spec": JSON.stringify(spec) },
+ dataType: 'json',
+ success: (res) => {
+ qq.hideLoading();
+ if (res.data.code == 0) {
+ this.setData({ quick_nav_cart_count: res.data.data});
+ this.popup_close_event();
+ app.showToast(res.data.msg, "success");
+ } else {
+ if (app.is_login_check(res.data, this, 'goods_buy_confirm_event')) {
+ app.showToast(res.data.msg);
+ }
+ }
+ },
+ fail: () => {
+ qq.hideLoading();
- app.showToast('服务器请求出错');
- }
- });
+ app.showToast('服务器请求出错');
+ }
+ });
+ }
}
},
@@ -565,62 +601,64 @@ Page({
// 确认
goods_buy_confirm_event(e) {
- var user = app.get_user_cache_info(this, 'goods_buy_confirm_event');
- // 用户未绑定用户则转到登录页面
- if (app.user_is_need_login(user)) {
- qq.navigateTo({
- url: "/pages/login/login?event_callback=init"
- });
- return false;
- } else {
- // 属性
- var temp_data = this.data.goods_specifications_choose;
- var sku_count = temp_data.length;
- var active_count = 0;
- var spec = [];
- if(sku_count > 0)
- {
- for(var i in temp_data)
+ var user = app.get_user_info(this, 'goods_buy_confirm_event');
+ if (user != false) {
+ // 用户未绑定用户则转到登录页面
+ if (app.user_is_need_login(user)) {
+ qq.navigateTo({
+ url: "/pages/login/login?event_callback=goods_buy_confirm_event"
+ });
+ return false;
+ } else {
+ // 属性
+ var temp_data = this.data.goods_specifications_choose;
+ var sku_count = temp_data.length;
+ var active_count = 0;
+ var spec = [];
+ if(sku_count > 0)
{
- for(var k in temp_data[i]['value'])
+ for(var i in temp_data)
{
- if((temp_data[i]['value'][k]['is_active'] || null) != null)
+ for(var k in temp_data[i]['value'])
{
- active_count++;
- spec.push({"type": temp_data[i]['name'], "value": temp_data[i]['value'][k]['name']});
+ if((temp_data[i]['value'][k]['is_active'] || null) != null)
+ {
+ active_count++;
+ spec.push({"type": temp_data[i]['name'], "value": temp_data[i]['value'][k]['name']});
+ }
}
}
+ if(active_count < sku_count)
+ {
+ app.showToast('请选择属性');
+ return false;
+ }
}
- if(active_count < sku_count)
- {
- app.showToast('请选择属性');
- return false;
+
+ // 操作类型
+ switch (this.data.buy_event_type) {
+ case 'buy' :
+ // 进入订单确认页面
+ var data = {
+ "buy_type": "goods",
+ "goods_id": this.data.goods.id,
+ "stock": this.data.temp_buy_number,
+ "spec": JSON.stringify(spec)
+ };
+ qq.navigateTo({
+ url: '/pages/buy/buy?data=' + JSON.stringify(data)
+ });
+ this.popup_close_event();
+ break;
+
+ case 'cart' :
+ this.goods_cart_event(spec);
+ break;
+
+ default :
+ app.showToast("操作事件类型有误");
}
}
-
- // 操作类型
- switch (this.data.buy_event_type) {
- case 'buy' :
- // 进入订单确认页面
- var data = {
- "buy_type": "goods",
- "goods_id": this.data.goods.id,
- "stock": this.data.temp_buy_number,
- "spec": JSON.stringify(spec)
- };
- qq.navigateTo({
- url: '/pages/buy/buy?data=' + JSON.stringify(data)
- });
- this.popup_close_event();
- break;
-
- case 'cart' :
- this.goods_cart_event(e, spec);
- break;
-
- default :
- app.showToast("操作事件类型有误");
- }
}
},
@@ -659,6 +697,16 @@ 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() {
// 销毁之前的任务
@@ -739,72 +787,32 @@ Page({
// 商品海报分享
poster_event() {
- var user = app.get_user_cache_info(this, 'poster_event');
- // 用户未绑定用户则转到登录页面
- if (app.user_is_need_login(user)) {
- qq.navigateTo({
- url: "/pages/login/login?event_callback=init"
- });
- return false;
- } else {
- qq.showLoading({ title: '生成中...' });
- qq.request({
- url: app.get_request_url('poster', 'goods'),
- method: 'POST',
- data: { "goods_id": this.data.goods.id },
- dataType: 'json',
- success: (res) => {
- qq.hideLoading();
- if (res.data.code == 0) {
- qq.previewImage({
- current: res.data.data,
- urls: [res.data.data]
- });
- } else {
- app.showToast(res.data.msg);
- }
- },
- fail: () => {
- qq.hideLoading();
- app.showToast("服务器请求出错");
- }
- });
- }
- },
-
- // 优惠劵领取事件
- coupon_receive_event(e) {
- var user = app.get_user_cache_info(this, "coupon_receive_event");
- // 用户未绑定用户则转到登录页面
- if (app.user_is_need_login(user)) {
- qq.redirectTo({
- url: "/pages/login/login?event_callback=coupon_receive_event"
- });
- return false;
- } else {
- var self = this;
- var index = e.currentTarget.dataset.index;
- var value = e.currentTarget.dataset.value;
- var temp_list = this.data.plugins_coupon_data.data;
- if (temp_list[index]['is_operable'] != 0) {
- qq.showLoading({ title: "处理中..." });
+ var user = app.get_user_info(this, 'poster_event');
+ if (user != false) {
+ // 用户未绑定用户则转到登录页面
+ if (app.user_is_need_login(user)) {
+ qq.navigateTo({
+ url: "/pages/login/login?event_callback=poster_event"
+ });
+ return false;
+ } else {
+ qq.showLoading({ title: '生成中...' });
qq.request({
- url: app.get_request_url("receive", "coupon"),
- method: "POST",
- data: { "coupon_id": value },
- dataType: "json",
- header: { 'content-type': 'application/x-www-form-urlencoded' },
- success: res => {
+ url: app.get_request_url('poster', 'goods'),
+ method: 'POST',
+ data: { "goods_id": this.data.goods.id },
+ dataType: 'json',
+ success: (res) => {
qq.hideLoading();
if (res.data.code == 0) {
- app.showToast(res.data.msg, "success");
- if (self.data.plugins_coupon_data.base != null && self.data.plugins_coupon_data.base.is_repeat_receive != 1) {
- temp_list[index]['is_operable'] = 0;
- temp_list[index]['is_operable_name'] = '已领取';
- self.setData({ 'plugins_coupon_data.data': temp_list });
- }
+ qq.previewImage({
+ current: res.data.data,
+ urls: [res.data.data]
+ });
} else {
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data, this, 'poster_event')) {
+ app.showToast(res.data.msg);
+ }
}
},
fail: () => {
@@ -816,6 +824,64 @@ Page({
}
},
+ // 优惠劵领取事件
+ coupon_receive_event(e) {
+ // 参数处理
+ if((e || null) == null)
+ {
+ var index = this.data.temp_coupon_receive_index;
+ var value = this.data.temp_coupon_receive_value;
+ } else {
+ var index = e.currentTarget.dataset.index;
+ var value = e.currentTarget.dataset.value;
+ this.setData({temp_coupon_receive_index: index, temp_coupon_receive_value: value});
+ }
+
+ // 登录校验
+ var user = app.get_user_info(this, 'coupon_receive_event');
+ if (user != false) {
+ // 用户未绑定用户则转到登录页面
+ if (app.user_is_need_login(user)) {
+ qq.navigateTo({
+ url: "/pages/login/login?event_callback=coupon_receive_event"
+ });
+ return false;
+ } else {
+ var self = this;
+ var temp_list = this.data.plugins_coupon_data.data;
+ if (temp_list[index]['is_operable'] != 0) {
+ qq.showLoading({ title: "处理中..." });
+ qq.request({
+ url: app.get_request_url("receive", "coupon"),
+ method: "POST",
+ data: { "coupon_id": value },
+ dataType: "json",
+ header: { 'content-type': 'application/x-www-form-urlencoded' },
+ success: res => {
+ qq.hideLoading();
+ if (res.data.code == 0) {
+ app.showToast(res.data.msg, "success");
+ if (self.data.plugins_coupon_data.base != null && self.data.plugins_coupon_data.base.is_repeat_receive != 1) {
+ temp_list[index]['is_operable'] = 0;
+ temp_list[index]['is_operable_name'] = '已领取';
+ self.setData({ 'plugins_coupon_data.data': temp_list });
+ }
+ } else {
+ if (app.is_login_check(res.data, self, 'coupon_receive_event')) {
+ app.showToast(res.data.msg);
+ }
+ }
+ },
+ fail: () => {
+ qq.hideLoading();
+ app.showToast("服务器请求出错");
+ }
+ });
+ }
+ }
+ }
+ },
+
// 展示型事件
exhibition_submit_event(e) {
app.call_tel(this.data.customer_service_tel);
@@ -823,7 +889,7 @@ Page({
// 自定义分享
onShareAppMessage() {
- var user = app.get_user_cache_info(this, 'goods_favor_event') || null;
+ var user = app.get_user_cache_info() || null;
var user_id = (user != null && (user.id || null) != null) ? user.id : 0;
return {
title: app.data.application_title +'-'+ this.data.goods.title,
@@ -831,5 +897,4 @@ Page({
path: '/pages/goods-detail/goods-detail?goods_id=' + this.data.goods.id +'&referrer='+user_id
};
},
-
});
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 c0d25d525..742cd8175 100755
--- a/public/appmini/old/qq/pages/goods-detail/goods-detail.qml
+++ b/public/appmini/old/qq/pages/goods-detail/goods-detail.qml
@@ -31,7 +31,7 @@
-
+
@@ -42,7 +42,7 @@
+
{{show_field_price_text}}
￥{{goods.price}}
@@ -118,7 +118,7 @@
-
+
@@ -132,7 +132,7 @@
{{goods_favor_text}}
-
+
@@ -201,13 +201,13 @@
-
+
-
+
diff --git a/public/appmini/old/qq/pages/goods-search/goods-search.qml b/public/appmini/old/qq/pages/goods-search/goods-search.qml
index 8cccd1232..bcdfaf1a6 100755
--- a/public/appmini/old/qq/pages/goods-search/goods-search.qml
+++ b/public/appmini/old/qq/pages/goods-search/goods-search.qml
@@ -28,11 +28,11 @@
-
+
-
+
diff --git a/public/appmini/old/qq/pages/index/index.qml b/public/appmini/old/qq/pages/index/index.qml
index c873c47c9..213d29f23 100755
--- a/public/appmini/old/qq/pages/index/index.qml
+++ b/public/appmini/old/qq/pages/index/index.qml
@@ -20,7 +20,7 @@
-
+
@@ -60,7 +60,7 @@
-
+
@@ -72,17 +72,17 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/public/appmini/old/qq/pages/login/login.js b/public/appmini/old/qq/pages/login/login.js
index 94ea069fa..f36783ffd 100755
--- a/public/appmini/old/qq/pages/login/login.js
+++ b/public/appmini/old/qq/pages/login/login.js
@@ -24,9 +24,6 @@ Page({
// 标题设置
qq.setNavigationBarTitle({ title: (this.data.user == null) ? '授权用户信息' : '手机绑定' });
-
- // 用户授权
- app.user_login();
},
/**
diff --git a/public/appmini/old/qq/pages/message/message.js b/public/appmini/old/qq/pages/message/message.js
index 2413edd14..977fd4758 100755
--- a/public/appmini/old/qq/pages/message/message.js
+++ b/public/appmini/old/qq/pages/message/message.js
@@ -14,16 +14,23 @@ Page({
},
init() {
- var user = app.get_user_cache_info(this, "init");
- // 用户未绑定用户则转到登录页面
- if (app.user_is_need_login(user)) {
- qq.redirectTo({
- url: "/pages/login/login?event_callback=init"
- });
- return false;
+ var user = app.get_user_info(this, "init");
+ if (user != false) {
+ // 用户未绑定用户则转到登录页面
+ if (app.user_is_need_login(user)) {
+ qq.redirectTo({
+ url: "/pages/login/login?event_callback=init"
+ });
+ return false;
+ } else {
+ // 获取数据
+ this.get_data_list();
+ }
} else {
- // 获取数据
- this.get_data_list();
+ this.setData({
+ data_list_loding_status: 0,
+ data_bottom_line_status: false,
+ });
}
},
@@ -91,8 +98,9 @@ Page({
this.setData({
data_list_loding_status: 0
});
-
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data, this, 'get_data_list')) {
+ app.showToast(res.data.msg);
+ }
}
},
fail: () => {
diff --git a/public/appmini/old/qq/pages/message/message.qml b/public/appmini/old/qq/pages/message/message.qml
index e090d1953..bb922f652 100755
--- a/public/appmini/old/qq/pages/message/message.qml
+++ b/public/appmini/old/qq/pages/message/message.qml
@@ -8,16 +8,16 @@
{{item.detail}}
-
+
-
+
-
+
\ No newline at end of file
diff --git a/public/appmini/old/qq/pages/paytips/paytips.qml b/public/appmini/old/qq/pages/paytips/paytips.qml
index a30cec58b..ca920237b 100755
--- a/public/appmini/old/qq/pages/paytips/paytips.qml
+++ b/public/appmini/old/qq/pages/paytips/paytips.qml
@@ -1,6 +1,6 @@
-
+
{{params.msg}}
￥{{params.total_price}}
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 945e405e0..a3445546f 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
@@ -37,26 +37,37 @@ Page({
},
init() {
- var user = app.get_user_cache_info(this, "init");
- // 用户未绑定用户则转到登录页面
- if (app.user_is_need_login(user)) {
- qq.redirectTo({
- url: "/pages/login/login?event_callback=init"
- });
- return false;
- } else {
- // 获取地址数据
- if((this.data.params.id || null) != null)
- {
- this.get_user_address();
- }
+ var user = app.get_user_info(this, "init");
+ if (user != false) {
+ // 用户未绑定用户则转到登录页面
+ if (app.user_is_need_login(user)) {
+ qq.redirectTo({
+ url: "/pages/login/login?event_callback=init"
+ });
+ this.setData({
+ data_list_loding_status: 2,
+ data_list_loding_msg: '请先绑定手机号码',
+ });
+ return false;
+ } else {
+ // 获取地址数据
+ if((this.data.params.id || null) != null)
+ {
+ this.get_user_address();
+ }
- // 获取省
- this.get_province_list();
+ // 获取省
+ this.get_province_list();
+ }
+ } else {
+ this.setData({
+ data_list_loding_status: 2,
+ data_list_loding_msg: '请先授权用户信息',
+ });
}
},
- // 获取用户地址
+ // 获取用户地址
get_user_address() {
var self = this;
// 加载loding
@@ -89,7 +100,9 @@ Page({
self.init_value();
}, 500);
} else {
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data)) {
+ app.showToast(res.data.msg);
+ }
}
},
fail: () => {
@@ -289,7 +302,11 @@ Page({
qq.navigateBack();
}, 1000);
} else {
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data)) {
+ app.showToast(res.data.msg);
+ } else {
+ app.showToast('提交失败，请重试！');
+ }
}
},
fail: () => {
diff --git a/public/appmini/old/qq/pages/user-address/user-address.js b/public/appmini/old/qq/pages/user-address/user-address.js
index b3abae294..46b915d2f 100755
--- a/public/appmini/old/qq/pages/user-address/user-address.js
+++ b/public/appmini/old/qq/pages/user-address/user-address.js
@@ -19,16 +19,23 @@ Page({
// 初始化
init() {
- var user = app.get_user_cache_info(this, "init");
- // 用户未绑定用户则转到登录页面
- if (app.user_is_need_login(user)) {
- qq.redirectTo({
- url: "/pages/login/login?event_callback=init"
- });
- return false;
+ var user = app.get_user_info(this, "init");
+ if (user != false) {
+ // 用户未绑定用户则转到登录页面
+ if (app.user_is_need_login(user)) {
+ qq.redirectTo({
+ url: "/pages/login/login?event_callback=init"
+ });
+ return false;
+ } else {
+ // 获取数据
+ this.get_data_list();
+ }
} else {
- // 获取数据
- this.get_data_list();
+ this.setData({
+ data_list_loding_status: 0,
+ data_bottom_line_status: false,
+ });
}
},
@@ -77,8 +84,9 @@ Page({
this.setData({
data_list_loding_status: 0
});
-
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data, this, 'get_data_list')) {
+ app.showToast(res.data.msg);
+ }
}
},
fail: () => {
@@ -149,7 +157,11 @@ Page({
}
} else {
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data)) {
+ app.showToast(res.data.msg);
+ } else {
+ app.showToast('提交失败，请重试！');
+ }
}
},
fail: () => {
@@ -196,7 +208,11 @@ Page({
app.showToast(res.data.msg, "success");
} else {
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data)) {
+ app.showToast(res.data.msg);
+ } else {
+ app.showToast('提交失败，请重试！');
+ }
}
},
fail: () => {
diff --git a/public/appmini/old/qq/pages/user-address/user-address.qml b/public/appmini/old/qq/pages/user-address/user-address.qml
index de7501b65..598ac7870 100755
--- a/public/appmini/old/qq/pages/user-address/user-address.qml
+++ b/public/appmini/old/qq/pages/user-address/user-address.qml
@@ -14,7 +14,7 @@
-
+
设为默认地址
@@ -26,11 +26,11 @@
-
+
-
+
diff --git a/public/appmini/old/qq/pages/user-answer-list/user-answer-list.js b/public/appmini/old/qq/pages/user-answer-list/user-answer-list.js
index 219923baa..c932c8eb8 100755
--- a/public/appmini/old/qq/pages/user-answer-list/user-answer-list.js
+++ b/public/appmini/old/qq/pages/user-answer-list/user-answer-list.js
@@ -16,16 +16,23 @@ Page({
},
init() {
- var user = app.get_user_cache_info(this, "init");
- // 用户未绑定用户则转到登录页面
- if (app.user_is_need_login(user)) {
- qq.redirectTo({
- url: "/pages/login/login?event_callback=init"
- });
- return false;
+ var user = app.get_user_info(this, "init");
+ if (user != false) {
+ // 用户未绑定用户则转到登录页面
+ if (app.user_is_need_login(user)) {
+ qq.redirectTo({
+ url: "/pages/login/login?event_callback=init"
+ });
+ return false;
+ } else {
+ // 获取数据
+ this.get_data_list();
+ }
} else {
- // 获取数据
- this.get_data_list();
+ this.setData({
+ data_list_loding_status: 0,
+ data_bottom_line_status: false,
+ });
}
},
@@ -91,8 +98,9 @@ Page({
this.setData({
data_list_loding_status: 0
});
-
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data, this, 'get_data_list')) {
+ app.showToast(res.data.msg);
+ }
}
},
fail: () => {
diff --git a/public/appmini/old/qq/pages/user-answer-list/user-answer-list.qml b/public/appmini/old/qq/pages/user-answer-list/user-answer-list.qml
index e7b1d4b75..8e379cc97 100755
--- a/public/appmini/old/qq/pages/user-answer-list/user-answer-list.qml
+++ b/public/appmini/old/qq/pages/user-answer-list/user-answer-list.qml
@@ -13,10 +13,10 @@
-
+
-
+
\ No newline at end of file
diff --git a/public/appmini/old/qq/pages/user-coupon/user-coupon.js b/public/appmini/old/qq/pages/user-coupon/user-coupon.js
index b237932d1..80c43e409 100644
--- a/public/appmini/old/qq/pages/user-coupon/user-coupon.js
+++ b/public/appmini/old/qq/pages/user-coupon/user-coupon.js
@@ -23,16 +23,23 @@ Page({
},
init() {
- var user = app.get_user_cache_info(this, "init");
- // 用户未绑定用户则转到登录页面
- if (app.user_is_need_login(user)) {
- qq.redirectTo({
- url: "/pages/login/login?event_callback=init"
- });
- return false;
+ var user = app.get_user_info(this, "init");
+ if (user != false) {
+ // 用户未绑定用户则转到登录页面
+ if (app.user_is_need_login(user)) {
+ qq.redirectTo({
+ url: "/pages/login/login?event_callback=init"
+ });
+ return false;
+ } else {
+ // 获取数据
+ this.get_data_list();
+ }
} else {
- // 获取数据
- this.get_data_list();
+ this.setData({
+ data_list_loding_status: 0,
+ data_bottom_line_status: false,
+ });
}
},
@@ -66,7 +73,9 @@ Page({
data_list_loding_status: 2,
data_list_loding_msg: res.data.msg,
});
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data, self, 'get_data_list')) {
+ app.showToast(res.data.msg);
+ }
}
},
fail: () => {
diff --git a/public/appmini/old/qq/pages/user-coupon/user-coupon.qml b/public/appmini/old/qq/pages/user-coupon/user-coupon.qml
index 72cf0898c..71119d0f0 100644
--- a/public/appmini/old/qq/pages/user-coupon/user-coupon.qml
+++ b/public/appmini/old/qq/pages/user-coupon/user-coupon.qml
@@ -78,10 +78,10 @@
-
+
-
+
\ No newline at end of file
diff --git a/public/appmini/old/qq/pages/user-faovr/user-faovr.js b/public/appmini/old/qq/pages/user-faovr/user-faovr.js
index d80b9a1bf..3df103386 100755
--- a/public/appmini/old/qq/pages/user-faovr/user-faovr.js
+++ b/public/appmini/old/qq/pages/user-faovr/user-faovr.js
@@ -14,16 +14,23 @@ Page({
},
init() {
- var user = app.get_user_cache_info(this, "init");
- // 用户未绑定用户则转到登录页面
- if (app.user_is_need_login(user)) {
- qq.redirectTo({
- url: "/pages/login/login?event_callback=init"
- });
- return false;
+ var user = app.get_user_info(this, "init");
+ if (user != false) {
+ // 用户未绑定用户则转到登录页面
+ if (app.user_is_need_login(user)) {
+ qq.redirectTo({
+ url: "/pages/login/login?event_callback=init"
+ });
+ return false;
+ } else {
+ // 获取数据
+ this.get_data_list();
+ }
} else {
- // 获取数据
- this.get_data_list();
+ this.setData({
+ data_list_loding_status: 0,
+ data_bottom_line_status: false,
+ });
}
},
@@ -89,8 +96,9 @@ Page({
this.setData({
data_list_loding_status: 0
});
-
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data, this, 'get_data_list')) {
+ app.showToast(res.data.msg);
+ }
}
},
fail: () => {
@@ -156,7 +164,11 @@ Page({
app.showToast(res.data.msg, "success");
} else {
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data)) {
+ app.showToast(res.data.msg);
+ } else {
+ app.showToast('提交失败，请重试！');
+ }
}
},
fail: () => {
diff --git a/public/appmini/old/qq/pages/user-faovr/user-faovr.qml b/public/appmini/old/qq/pages/user-faovr/user-faovr.qml
index d35a82e9f..b151f8102 100755
--- a/public/appmini/old/qq/pages/user-faovr/user-faovr.qml
+++ b/public/appmini/old/qq/pages/user-faovr/user-faovr.qml
@@ -15,9 +15,9 @@
-
+
-
+
\ No newline at end of file
diff --git a/public/appmini/old/qq/pages/user-goods-browse/user-goods-browse.js b/public/appmini/old/qq/pages/user-goods-browse/user-goods-browse.js
index e6168cb11..a7c245c46 100755
--- a/public/appmini/old/qq/pages/user-goods-browse/user-goods-browse.js
+++ b/public/appmini/old/qq/pages/user-goods-browse/user-goods-browse.js
@@ -14,16 +14,23 @@ Page({
},
init() {
- var user = app.get_user_cache_info(this, "init");
- // 用户未绑定用户则转到登录页面
- if (app.user_is_need_login(user)) {
- qq.redirectTo({
- url: "/pages/login/login?event_callback=init"
- });
- return false;
+ var user = app.get_user_info(this, "init");
+ if (user != false) {
+ // 用户未绑定用户则转到登录页面
+ if (app.user_is_need_login(user)) {
+ qq.redirectTo({
+ url: "/pages/login/login?event_callback=init"
+ });
+ return false;
+ } else {
+ // 获取数据
+ this.get_data_list();
+ }
} else {
- // 获取数据
- this.get_data_list();
+ this.setData({
+ data_list_loding_status: 0,
+ data_bottom_line_status: false,
+ });
}
},
@@ -88,8 +95,9 @@ Page({
this.setData({
data_list_loding_status: 0
});
-
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data, this, 'get_data_list')) {
+ app.showToast(res.data.msg);
+ }
}
},
fail: () => {
@@ -154,7 +162,11 @@ Page({
app.showToast(res.data.msg, "success");
} else {
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data)) {
+ app.showToast(res.data.msg);
+ } else {
+ app.showToast('提交失败，请重试！');
+ }
}
},
fail: () => {
diff --git a/public/appmini/old/qq/pages/user-goods-browse/user-goods-browse.qml b/public/appmini/old/qq/pages/user-goods-browse/user-goods-browse.qml
index 651ea4d75..7cd6888a1 100755
--- a/public/appmini/old/qq/pages/user-goods-browse/user-goods-browse.qml
+++ b/public/appmini/old/qq/pages/user-goods-browse/user-goods-browse.qml
@@ -15,9 +15,9 @@
-
+
-
+
\ No newline at end of file
diff --git a/public/appmini/old/qq/pages/user-integral/user-integral.js b/public/appmini/old/qq/pages/user-integral/user-integral.js
index 05077e855..f5a7626f8 100755
--- a/public/appmini/old/qq/pages/user-integral/user-integral.js
+++ b/public/appmini/old/qq/pages/user-integral/user-integral.js
@@ -14,16 +14,23 @@ Page({
},
init() {
- var user = app.get_user_cache_info(this, "init");
- // 用户未绑定用户则转到登录页面
- if (app.user_is_need_login(user)) {
- qq.redirectTo({
- url: "/pages/login/login?event_callback=init"
- });
- return false;
+ var user = app.get_user_info(this, "init");
+ if (user != false) {
+ // 用户未绑定用户则转到登录页面
+ if (app.user_is_need_login(user)) {
+ qq.redirectTo({
+ url: "/pages/login/login?event_callback=init"
+ });
+ return false;
+ } else {
+ // 获取数据
+ this.get_data_list();
+ }
} else {
- // 获取数据
- this.get_data_list();
+ this.setData({
+ data_list_loding_status: 0,
+ data_bottom_line_status: false,
+ });
}
},
@@ -91,8 +98,9 @@ Page({
this.setData({
data_list_loding_status: 0
});
-
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data, this, 'get_data_list')) {
+ app.showToast(res.data.msg);
+ }
}
},
fail: () => {
diff --git a/public/appmini/old/qq/pages/user-integral/user-integral.qml b/public/appmini/old/qq/pages/user-integral/user-integral.qml
index 690c25674..3d08b5faa 100755
--- a/public/appmini/old/qq/pages/user-integral/user-integral.qml
+++ b/public/appmini/old/qq/pages/user-integral/user-integral.qml
@@ -2,7 +2,7 @@
-
+
{{item.type_name}}
{{item.add_time_time}}
@@ -13,16 +13,16 @@
{{item.msg}}
-
+
-
+
-
+
\ No newline at end of file
diff --git a/public/appmini/old/qq/pages/user-order-comments/user-order-comments.qml b/public/appmini/old/qq/pages/user-order-comments/user-order-comments.qml
index 70171a8cf..c4c40904b 100644
--- a/public/appmini/old/qq/pages/user-order-comments/user-order-comments.qml
+++ b/public/appmini/old/qq/pages/user-order-comments/user-order-comments.qml
@@ -41,6 +41,6 @@
-
+
\ No newline at end of file
diff --git a/public/appmini/old/qq/pages/user-order-detail/user-order-detail.js b/public/appmini/old/qq/pages/user-order-detail/user-order-detail.js
index dc749d32e..13650e392 100755
--- a/public/appmini/old/qq/pages/user-order-detail/user-order-detail.js
+++ b/public/appmini/old/qq/pages/user-order-detail/user-order-detail.js
@@ -9,9 +9,11 @@ Page({
detail: null,
detail_list: [],
extension_data: [],
+ site_fictitious: null,
},
onLoad(params) {
+ //params['id'] = 5;
this.setData({params: params});
this.init();
},
@@ -40,29 +42,31 @@ Page({
if (res.data.code == 0) {
var data = res.data.data;
self.setData({
- detail: data,
+ detail: data.data,
detail_list:[
- {name: "订单号", value: data.order_no || ''},
- {name: "状态", value: data.status_name || ''},
- {name: "支付状态", value: data.pay_status_name || ''},
- {name: "单价", value: data.price || ''},
- {name: "总价", value: data.total_price || ''},
- {name: "优惠金额", value: data.preferential_price || ''},
- {name: "增加金额", value: data.increase_price || '' },
- {name: "支付金额", value: data.pay_price || ''},
- {name: "支付方式", value: data.payment_name || ''},
- {name: "快递公司", value: data.express_name || ''},
- {name: "快递单号", value: data.express_number || ''},
- {name: "用户留言", value: data.user_note || ''},
- {name: "创建时间", value: data.add_time || ''},
- {name: "确认时间", value: data.confirm_time || ''},
- {name: "支付时间", value: data.pay_time || ''},
- {name: "发货时间", value: data.delivery_time || ''},
- {name: "收货时间", value: data.collect_time || ''},
- {name: "取消时间", value: data.close_time || ''},
- {name: "关闭时间", value: data.close_time || ''},
+ {name: "订单号", value: data.data.order_no || ''},
+ {name: "订单模式", value: data.data.order_model_name || '' },
+ {name: "状态", value: data.data.status_name || ''},
+ {name: "支付状态", value: data.data.pay_status_name || ''},
+ {name: "单价", value: data.data.price || ''},
+ {name: "总价", value: data.data.total_price || ''},
+ {name: "优惠金额", value: data.data.preferential_price || ''},
+ {name: "增加金额", value: data.data.increase_price || '' },
+ {name: "支付金额", value: data.data.pay_price || ''},
+ {name: "支付方式", value: data.data.payment_name || ''},
+ {name: "快递公司", value: data.data.express_name || ''},
+ {name: "快递单号", value: data.data.express_number || ''},
+ {name: "用户留言", value: data.data.user_note || ''},
+ {name: "创建时间", value: data.data.add_time || ''},
+ {name: "确认时间", value: data.data.confirm_time || ''},
+ {name: "支付时间", value: data.data.pay_time || ''},
+ {name: "发货时间", value: data.data.delivery_time || ''},
+ {name: "收货时间", value: data.data.collect_time || ''},
+ {name: "取消时间", value: data.data.close_time || ''},
+ {name: "关闭时间", value: data.data.close_time || ''},
],
- extension_data: data.extension_data || [],
+ extension_data: data.data.extension_data || [],
+ site_fictitious: data.site_fictitious || null,
data_list_loding_status: 3,
data_bottom_line_status: true,
data_list_loding_msg: '',
@@ -73,7 +77,9 @@ Page({
data_bottom_line_status: false,
data_list_loding_msg: res.data.msg,
});
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data, self, 'init')) {
+ app.showToast(res.data.msg);
+ }
}
},
fail: () => {
@@ -90,6 +96,31 @@ Page({
});
},
+ // 地图查看
+ address_map_event(e) {
+ if ((this.data.detail.address_data || null) == null)
+ {
+ app.showToast("地址有误");
+ return false;
+ }
+
+ var ads = this.data.detail.address_data;
+ var lng = parseFloat(ads.lng || 0);
+ var lat = parseFloat(ads.lat || 0);
+ if (lng <= 0 || lat <= 0) {
+ app.showToast("坐标有误");
+ return false;
+ }
+
+ qq.openLocation({
+ latitude: lat,
+ longitude: lng,
+ scale: 18,
+ name: ads.alias || '',
+ address: (ads.province_name || '') + (ads.city_name || '') + (ads.county_name || '') + (ads.address || ''),
+ });
+ },
+
// 下拉刷新
onPullDownRefresh() {
this.init();
diff --git a/public/appmini/old/qq/pages/user-order-detail/user-order-detail.qml b/public/appmini/old/qq/pages/user-order-detail/user-order-detail.qml
index 581c2c4d8..9ad3e81d8 100755
--- a/public/appmini/old/qq/pages/user-order-detail/user-order-detail.qml
+++ b/public/appmini/old/qq/pages/user-order-detail/user-order-detail.qml
@@ -1,17 +1,23 @@
-
+
+
- {{detail.receive_name}}
- {{detail.receive_tel}}
+ {{detail.address_data.alias}}
+ {{detail.address_data.name}}
+ {{detail.address_data.tel}}
- {{detail.receive_province_name}}{{detail.receive_city_name}}{{detail.receive_county_name}}{{detail.receive_address}}
+
+ {{detail.address_data.province_name}}{{detail.address_data.city_name}}{{detail.address_data.county_name}}{{detail.address_data.address}}
+ 查看位置
+
+
-
+
@@ -29,30 +35,66 @@
+ {{detail.describe}}
+
+
+
+
+ {{site_fictitious.title || '密钥信息'}}
+
+
+
+
+
+
+
+
+ 未配置数据
+
+
+
+
+
+
+
-
-
- {{item.name}}
- {{item.value}}
+
+ 基础数据
+
+
+ {{item.name}}
+ {{item.value}}
+
-
-
+
+ 扩展数据
+
+
{{item.name}}
{{item.tips}}
+
-
+
-
+
diff --git a/public/appmini/old/qq/pages/user-order-detail/user-order-detail.qss b/public/appmini/old/qq/pages/user-order-detail/user-order-detail.qss
index a847a2bbe..f1c1c6453 100755
--- a/public/appmini/old/qq/pages/user-order-detail/user-order-detail.qss
+++ b/public/appmini/old/qq/pages/user-order-detail/user-order-detail.qss
@@ -1,3 +1,6 @@
+/*
+ * 地址信息
+ */
.address {
padding: 10rpx;
}
@@ -5,7 +8,7 @@
padding: 10rpx 35rpx 10rpx 10rpx;
}
.address-detail .icon {
- width: 35rpx;
+ width: 30rpx;
height: 35rpx !important;
}
.address-detail .text {
@@ -23,13 +26,23 @@
height: 85rpx;
line-height: 85rpx;
}
+.address-alias {
+ border: 1px solid #d2364c;
+ color: #d2364c;
+ padding: 2rpx 10rpx;
+ border-radius: 6rpx;
+ margin-right: 10rpx;
+}
+/*
+ * 商品信息
+ */
.goods-base {
min-height: 160rpx;
margin-left: 180rpx;
}
-.goods .goods-item:not(:last-child) {
- border-bottom: 1px dashed #efefef;
+.goods .goods-item:last-child {
+ border-bottom: 0;
}
.goods-item {
padding: 20rpx 10rpx;
@@ -50,26 +63,36 @@
right: 0;
bottom: 0;
}
+.order-describe {
+ padding: 20rpx 10rpx;
+}
/*
- * 基础信息
+ * 面板信息
*/
-.detail-list {
- padding: 0 10rpx;
+.panel-item .panel-title {
+ background: #fff;
+ font-weight: bold;
+ padding: 15rpx;
+ border-bottom: 2px solid #eee;
+ font-size: 34rpx;
}
-.detail-list .item {
+.panel-item .panel-content .item {
padding: 20rpx 0;
}
-.detail-list .item .title {
+.panel-item .panel-content .item:last-child {
+ border: 0;
+}
+.panel-item .panel-content .item .title {
width: 25%;
padding-left: 20rpx;
}
-.detail-list .item .content {
+.panel-item .panel-content .item .content {
width: calc(75% - 50rpx);
padding-left: 20rpx;
min-height: 46rpx;
}
-.detail-list .item view {
+.panel-item .panel-content .item view {
line-height: 46rpx;
}
@@ -84,4 +107,50 @@
}
.extension-list .item .content {
padding-left: 20rpx;
+}
+
+/*
+ * 虚拟销售信息
+ */
+.site-fictitious .panel-content {
+ padding: 0 20rpx;
+}
+.site-fictitious .panel-content .tips-value {
+ color: #f37b1d;
+ background-color: #fff2e9;
+ border-color: #ffebdb;
+ padding: 10rpx;
+ margin-top: 20rpx;
+}
+.site-fictitious .panel-content .left-image {
+ width: 80rpx;
+ height: 80rpx;
+}
+.site-fictitious .panel-content .right-value {
+ width: calc(100% - 100rpx);
+}
+
+/*
+ * 自提信息
+ */
+.site-extraction .panel-content {
+ padding: 20rpx;
+}
+.site-extraction .panel-content .code {
+ background: #5eb95e;
+ color: #fff;
+}
+.site-extraction .panel-content .code,
+.address-map-submit {
+ padding: 1rpx 16rpx;
+ border-radius: 6rpx;
+}
+.site-extraction .panel-content .qrcode {
+ margin-top: 15rpx;
+ width: 300rpx;
+ height: 300rpx;
+}
+.address-map-submit {
+ margin-left: 20rpx;
+ background: #f5f5f5;
}
\ No newline at end of file
diff --git a/public/appmini/old/qq/pages/user-order/user-order.js b/public/appmini/old/qq/pages/user-order/user-order.js
index 4d1824e68..cfb61f2da 100755
--- a/public/appmini/old/qq/pages/user-order/user-order.js
+++ b/public/appmini/old/qq/pages/user-order/user-order.js
@@ -49,16 +49,23 @@ Page({
},
init() {
- var user = app.get_user_cache_info(this, "init");
- // 用户未绑定用户则转到登录页面
- if (app.user_is_need_login(user)) {
- qq.redirectTo({
- url: "/pages/login/login?event_callback=init"
- });
- return false;
+ var user = app.get_user_info(this, 'init');
+ if (user != false) {
+ // 用户未绑定用户则转到登录页面
+ if (app.user_is_need_login(user)) {
+ qq.redirectTo({
+ url: "/pages/login/login?event_callback=init"
+ });
+ return false;
+ } else {
+ // 获取数据
+ this.get_data_list();
+ }
} else {
- // 获取数据
- this.get_data_list();
+ this.setData({
+ data_list_loding_status: 0,
+ data_bottom_line_status: false,
+ });
}
},
@@ -156,8 +163,9 @@ Page({
data_list_loding_status: 0,
load_status: 1,
});
-
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data, this, 'get_data_list')) {
+ app.showToast(res.data.msg);
+ }
}
},
fail: () => {
@@ -227,21 +235,20 @@ Page({
if (res.data.code == 0) {
// 是否在线支付,非在线支付则支付成功
if (res.data.data.is_online_pay == 0) {
- var temp_data_list = this.data.data_list;
- temp_data_list[index]['status'] = 2;
- temp_data_list[index]['status_name'] = '待发货';
- this.setData({ data_list: temp_data_list });
+ // 数据设置
+ self.order_item_pay_success_handle(index);
app.showToast("支付成功", "success");
} else {
qq.requestPayment({
- package: res.data.data.data,
+ timeStamp: res.data.data.data.timeStamp,
+ nonceStr: res.data.data.data.nonceStr,
+ package: res.data.data.data.package,
+ signType: res.data.data.data.signType,
+ paySign: res.data.data.data.paySign,
success: function(res) {
// 数据设置
- var temp_data_list = self.data.data_list;
- temp_data_list[index]['status'] = 2;
- temp_data_list[index]['status_name'] = '待发货';
- self.setData({ data_list: temp_data_list });
+ self.order_item_pay_success_handle(index);
// 跳转支付页面
qq.navigateTo({
@@ -265,6 +272,32 @@ Page({
});
},
+ // 支付成功数据设置
+ order_item_pay_success_handle(index) {
+ // 数据设置
+ var temp_data_list = this.data.data_list;
+ switch (parseInt(temp_data_list[index]['order_model'])) {
+ // 销售模式
+ case 0:
+ temp_data_list[index]['status'] = 2;
+ temp_data_list[index]['status_name'] = '待发货';
+ break;
+
+ // 自提模式
+ case 2:
+ temp_data_list[index]['status'] = 2;
+ temp_data_list[index]['status_name'] = '待取货';
+ break;
+
+ // 虚拟模式
+ case 3:
+ temp_data_list[index]['status'] = 3;
+ temp_data_list[index]['status_name'] = '待收货';
+ break;
+ }
+ this.setData({ data_list: temp_data_list });
+ },
+
// 取消
cancel_event(e) {
qq.showModal({
diff --git a/public/appmini/old/qq/pages/user-order/user-order.qml b/public/appmini/old/qq/pages/user-order/user-order.qml
index 666246f8b..1beff6ddb 100755
--- a/public/appmini/old/qq/pages/user-order/user-order.qml
+++ b/public/appmini/old/qq/pages/user-order/user-order.qml
@@ -2,7 +2,7 @@
{{item.name}}
- {{item.name}}
+ {{item.name}}
@@ -14,7 +14,7 @@
{{item.add_time}}
{{item.status_name}}
-
+
@@ -34,22 +34,22 @@
{{item.describe}}
-
+
-
+
-
+
-
+
@@ -65,5 +65,5 @@
- 没有支付方式
+ 没有支付方式
\ No newline at end of file
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 07c66c80a..68dcfaa47 100755
--- a/public/appmini/old/qq/pages/user-order/user-order.qss
+++ b/public/appmini/old/qq/pages/user-order/user-order.qss
@@ -24,8 +24,8 @@
.goods-title {
line-height: 36rpx;
}
-.list-item .goods-item:not(:last-child) {
- border-bottom: 1px dashed #efefef;
+.list-item .goods-item:last-child {
+ border-bottom: 0;
}
.goods-item {
padding: 20rpx 10rpx;
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 b2fc86853..c158faf50 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
@@ -165,8 +165,8 @@
-
+
-
+
\ No newline at end of file
diff --git a/public/appmini/old/qq/pages/user-orderaftersale/user-orderaftersale.js b/public/appmini/old/qq/pages/user-orderaftersale/user-orderaftersale.js
index bc2631abd..a26668e24 100644
--- a/public/appmini/old/qq/pages/user-orderaftersale/user-orderaftersale.js
+++ b/public/appmini/old/qq/pages/user-orderaftersale/user-orderaftersale.js
@@ -51,16 +51,23 @@ Page({
},
init() {
- var user = app.get_user_cache_info(this, "init");
- // 用户未绑定用户则转到登录页面
- if (app.user_is_need_login(user)) {
- qq.redirectTo({
- url: "/pages/login/login?event_callback=init"
- });
- return false;
+ var user = app.get_user_info(this, "init");
+ if (user != false) {
+ // 用户未绑定用户则转到登录页面
+ if (app.user_is_need_login(user)) {
+ qq.redirectTo({
+ url: "/pages/login/login?event_callback=init"
+ });
+ return false;
+ } else {
+ // 获取数据
+ this.get_data_list();
+ }
} else {
- // 获取数据
- this.get_data_list();
+ this.setData({
+ data_list_loding_status: 0,
+ data_bottom_line_status: false,
+ });
}
},
@@ -134,8 +141,9 @@ Page({
data_list_loding_status: 0,
data_list_loding_msg: res.data.msg,
});
-
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data, this, 'get_data_list')) {
+ app.showToast(res.data.msg);
+ }
}
},
fail: () => {
@@ -209,7 +217,11 @@ Page({
app.showToast(res.data.msg, "success");
} else {
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data)) {
+ app.showToast(res.data.msg);
+ } else {
+ app.showToast('提交失败，请重试！');
+ }
}
},
fail: () => {
diff --git a/public/appmini/old/qq/pages/user-orderaftersale/user-orderaftersale.qml b/public/appmini/old/qq/pages/user-orderaftersale/user-orderaftersale.qml
index 1ad507a4b..5efb25a7f 100644
--- a/public/appmini/old/qq/pages/user-orderaftersale/user-orderaftersale.qml
+++ b/public/appmini/old/qq/pages/user-orderaftersale/user-orderaftersale.qml
@@ -2,7 +2,7 @@
{{item.name}}
- {{item.name}}
+ {{item.name}}
@@ -49,12 +49,12 @@
-
+
-
+
\ No newline at end of file
diff --git a/public/appmini/old/qq/pages/user/user.js b/public/appmini/old/qq/pages/user/user.js
index 28534f99f..0c7b37601 100755
--- a/public/appmini/old/qq/pages/user/user.js
+++ b/public/appmini/old/qq/pages/user/user.js
@@ -107,7 +107,10 @@ Page({
common_app_is_head_vice_nav: data.common_app_is_head_vice_nav || 0,
});
} else {
- app.showToast(res.data.msg);
+ if(app.is_login_check(res.data, this, 'get_data'))
+ {
+ app.showToast(res.data.msg);
+ }
}
},
fail: () => {
diff --git a/public/appmini/old/qq/pages/user/user.qml b/public/appmini/old/qq/pages/user/user.qml
index f74bc806f..dbc19538b 100755
--- a/public/appmini/old/qq/pages/user/user.qml
+++ b/public/appmini/old/qq/pages/user/user.qml
@@ -74,10 +74,10 @@
-
+
-
+
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 abfedee49..dd43f9fb2 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
@@ -889,7 +889,7 @@ Page({
// 自定义分享
onShareAppMessage() {
- var user = app.get_user_cache_info(this, 'goods_favor_event') || null;
+ var user = app.get_user_cache_info() || null;
var user_id = (user != null && (user.id || null) != null) ? user.id : 0;
return {
title: app.data.application_title +'-'+ this.data.goods.title,
diff --git a/public/appmini/old/weixin/pages/user-address/user-address.js b/public/appmini/old/weixin/pages/user-address/user-address.js
index c151851a7..4f3c8635d 100755
--- a/public/appmini/old/weixin/pages/user-address/user-address.js
+++ b/public/appmini/old/weixin/pages/user-address/user-address.js
@@ -157,7 +157,11 @@ Page({
}
} else {
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data)) {
+ app.showToast(res.data.msg);
+ } else {
+ app.showToast('提交失败，请重试！');
+ }
}
},
fail: () => {
@@ -204,7 +208,11 @@ Page({
app.showToast(res.data.msg, "success");
} else {
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data)) {
+ app.showToast(res.data.msg);
+ } else {
+ app.showToast('提交失败，请重试！');
+ }
}
},
fail: () => {
diff --git a/public/appmini/old/weixin/pages/user-faovr/user-faovr.js b/public/appmini/old/weixin/pages/user-faovr/user-faovr.js
index ca88a315a..6b0996ff7 100755
--- a/public/appmini/old/weixin/pages/user-faovr/user-faovr.js
+++ b/public/appmini/old/weixin/pages/user-faovr/user-faovr.js
@@ -164,7 +164,11 @@ Page({
app.showToast(res.data.msg, "success");
} else {
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data)) {
+ app.showToast(res.data.msg);
+ } else {
+ app.showToast('提交失败，请重试！');
+ }
}
},
fail: () => {
diff --git a/public/appmini/old/weixin/pages/user-goods-browse/user-goods-browse.js b/public/appmini/old/weixin/pages/user-goods-browse/user-goods-browse.js
index e693f4efa..766fc2ca5 100755
--- a/public/appmini/old/weixin/pages/user-goods-browse/user-goods-browse.js
+++ b/public/appmini/old/weixin/pages/user-goods-browse/user-goods-browse.js
@@ -162,7 +162,11 @@ Page({
app.showToast(res.data.msg, "success");
} else {
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data)) {
+ app.showToast(res.data.msg);
+ } else {
+ app.showToast('提交失败，请重试！');
+ }
}
},
fail: () => {
diff --git a/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.js b/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.js
index ae40aa77f..76bf37f9b 100644
--- a/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.js
+++ b/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.js
@@ -217,7 +217,11 @@ Page({
app.showToast(res.data.msg, "success");
} else {
- app.showToast(res.data.msg);
+ if (app.is_login_check(res.data)) {
+ app.showToast(res.data.msg);
+ } else {
+ app.showToast('提交失败，请重试！');
+ }
}
},
fail: () => {