diff --git a/sourcecode/alipay/pages/goods-detail/goods-detail.acss b/sourcecode/alipay/pages/goods-detail/goods-detail.acss
index 1764c7686..8241a08bc 100644
--- a/sourcecode/alipay/pages/goods-detail/goods-detail.acss
+++ b/sourcecode/alipay/pages/goods-detail/goods-detail.acss
@@ -154,13 +154,19 @@
{
height: 100rpx;
}
-.goods-buy-nav .collect { border-left: 1px solid #e1e1e1; }
-.goods-buy-nav .fl image { width: 25px; height: 25px; margin: 0 auto; }
+.goods-buy-nav .collect {
+ border-left: 1px solid #e1e1e1;
+}
+.goods-buy-nav .fl image {
+ width: 25px;
+ height: 25px;
+ margin: 0 auto;
+}
.goods-title {
font-size: 32rpx;
- line-height: 44rpx;
+ line-height: 48rpx;
font-weight: 500;
- padding: 8rpx 10rpx;
+ padding: 5rpx 10rpx;
}
.goods-base {
padding: 15rpx 10rpx;
diff --git a/sourcecode/alipay/pages/goods-search/goods-search.acss b/sourcecode/alipay/pages/goods-search/goods-search.acss
index 9caa480a3..04e3a4408 100644
--- a/sourcecode/alipay/pages/goods-search/goods-search.acss
+++ b/sourcecode/alipay/pages/goods-search/goods-search.acss
@@ -70,11 +70,10 @@
border-radius: 6rpx;
}
.screening-price input {
- width: calc(50% - 45rpx);
+ width: calc(50% - 20px);
}
.screening-price .separator {
- margin-top: 20rpx;
- width: 30rpx;
+ line-height: 50rpx;
}
.popup-form .item {
width: 480rpx;
diff --git a/sourcecode/alipay/pages/goods-search/goods-search.axml b/sourcecode/alipay/pages/goods-search/goods-search.axml
index 4d3569474..d7ac670e7 100755
--- a/sourcecode/alipay/pages/goods-search/goods-search.axml
+++ b/sourcecode/alipay/pages/goods-search/goods-search.axml
@@ -41,12 +41,12 @@
+
+
+
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/index/index.js b/sourcecode/baidu/pages/index/index.js
index f3e4e9d7d..23d2ca124 100755
--- a/sourcecode/baidu/pages/index/index.js
+++ b/sourcecode/baidu/pages/index/index.js
@@ -1,16 +1,18 @@
const app = getApp();
Page({
data: {
- currency_symbol: app.data.currency_symbol,
load_status: 0,
data_list_loding_status: 1,
data_bottom_line_status: false,
data_list: [],
banner_list: [],
navigation: [],
+
+ // 基础配置
+ currency_symbol: app.data.currency_symbol,
common_shop_notice: null,
- common_app_is_enable_search: 1,
- common_app_is_enable_answer: 1,
+ common_app_is_enable_search: 0,
+ common_app_is_enable_answer: 0,
common_app_is_header_nav_fixed: 0,
common_app_is_online_service: 0,
@@ -23,10 +25,30 @@ Page({
},
onShow() {
+ // 数据加载
this.init();
+
+ // 初始化配置
+ this.init_config();
},
- // 获取数据列表
+ // 初始化配置
+ init_config(status) {
+ if((status || false) == true) {
+ this.setData({
+ currency_symbol: app.get_config('currency_symbol'),
+ common_shop_notice: app.get_config('config.common_shop_notice'),
+ common_app_is_enable_search: app.get_config('config.common_app_is_enable_search'),
+ common_app_is_enable_answer: app.get_config('config.common_app_is_enable_answer'),
+ common_app_is_header_nav_fixed: app.get_config('config.common_app_is_header_nav_fixed'),
+ common_app_is_online_service: app.get_config('config.common_app_is_online_service'),
+ });
+ } else {
+ app.is_config(this, 'init_config');
+ }
+ },
+
+ // 获取数据
init() {
var self = this;
@@ -52,12 +74,7 @@ Page({
banner_list: data.banner_list || [],
navigation: data.navigation || [],
data_list: data.data_list,
- common_shop_notice: data.common_shop_notice || null,
- common_app_is_enable_search: data.common_app_is_enable_search,
- common_app_is_enable_answer: data.common_app_is_enable_answer,
- common_app_is_header_nav_fixed: data.common_app_is_header_nav_fixed,
data_list_loding_status: data.data_list.length == 0 ? 0 : 3,
- common_app_is_online_service: data.common_app_is_online_service || 0,
plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null,
plugins_limitedtimediscount_is_valid: ((data.plugins_limitedtimediscount_data || null) != null && (data.plugins_limitedtimediscount_data.is_valid || 0) == 1) ? 1 : 0,
});
diff --git a/sourcecode/baidu/pages/index/index.json b/sourcecode/baidu/pages/index/index.json
index facc6d737..73eb10b00 100755
--- a/sourcecode/baidu/pages/index/index.json
+++ b/sourcecode/baidu/pages/index/index.json
@@ -3,6 +3,7 @@
"navigationBarBackgroundColor": "#d2364c",
"backgroundColorTop": "#d2364c",
"usingComponents": {
+ "component-quick-nav": "/components/quick-nav/quick-nav",
"component-icon-nav": "/components/icon-nav/icon-nav",
"component-banner": "/components/slider/slider"
}
diff --git a/sourcecode/baidu/pages/index/index.swan b/sourcecode/baidu/pages/index/index.swan
index 9465a1140..3961fe4c7 100755
--- a/sourcecode/baidu/pages/index/index.swan
+++ b/sourcecode/baidu/pages/index/index.swan
@@ -8,7 +8,7 @@
-
+
{{common_shop_notice}}
@@ -81,6 +81,9 @@
+
+
+
diff --git a/sourcecode/baidu/pages/plugins/coupon/index/index.js b/sourcecode/baidu/pages/plugins/coupon/index/index.js
index 4de0d86cf..d3475c5ea 100644
--- a/sourcecode/baidu/pages/plugins/coupon/index/index.js
+++ b/sourcecode/baidu/pages/plugins/coupon/index/index.js
@@ -1,7 +1,6 @@
const app = getApp();
Page({
data: {
- currency_symbol: app.data.currency_symbol,
data_bottom_line_status: false,
data_list_loding_status: 1,
data_list_loding_msg: '',
@@ -10,19 +9,33 @@ Page({
// 优惠劵领取
temp_coupon_receive_index: null,
- temp_coupon_receive_value: null
- },
+ temp_coupon_receive_value: null,
- onLoad(params) {
- this.init();
+ // 基础配置
+ currency_symbol: app.data.currency_symbol,
},
onShow() {
- swan.setNavigationBarTitle({ title: app.data.common_pages_title.coupon });
+ // 数据加载
+ this.init();
+
+ // 初始化配置
+ this.init_config();
},
+ // 初始化配置
+ init_config(status) {
+ if((status || false) == true) {
+ this.setData({
+ currency_symbol: app.get_config('currency_symbol'),
+ });
+ } else {
+ app.is_config(this, 'init_config');
+ }
+ },
+
+ // 获取数据
init() {
- // 获取数据
this.get_data_list();
},
diff --git a/sourcecode/baidu/pages/plugins/coupon/index/index.json b/sourcecode/baidu/pages/plugins/coupon/index/index.json
index 331ad4f3d..2ba4ed159 100644
--- a/sourcecode/baidu/pages/plugins/coupon/index/index.json
+++ b/sourcecode/baidu/pages/plugins/coupon/index/index.json
@@ -1,3 +1,4 @@
{
- "enablePullDownRefresh": true
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": "领劵中心"
}
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/plugins/coupon/user/user.js b/sourcecode/baidu/pages/plugins/coupon/user/user.js
index 320353d26..e4bd25670 100644
--- a/sourcecode/baidu/pages/plugins/coupon/user/user.js
+++ b/sourcecode/baidu/pages/plugins/coupon/user/user.js
@@ -1,24 +1,42 @@
const app = getApp();
Page({
data: {
- currency_symbol: app.data.currency_symbol,
data_bottom_line_status: false,
data_list_loding_status: 1,
data_list_loding_msg: '',
data_list: null,
- nav_tabs_list: [{ name: "未使用", value: "not_use" }, { name: "已使用", value: "already_use" }, { name: "已过期", value: "already_expire" }],
- nav_tabs_value: 'not_use'
- },
+ nav_tabs_list: [
+ { name: "未使用", value: "not_use" },
+ { name: "已使用", value: "already_use" },
+ { name: "已过期", value: "already_expire" },
+ ],
+ nav_tabs_value: 'not_use',
- onLoad(params) {
- this.init();
+ // 基础配置
+ currency_symbol: app.data.currency_symbol,
},
onShow() {
- swan.setNavigationBarTitle({ title: app.data.common_pages_title.user_coupon });
+ // 数据加载
+ this.init();
+
+ // 初始化配置
+ this.init_config();
},
+ // 初始化配置
+ init_config(status) {
+ if((status || false) == true) {
+ this.setData({
+ currency_symbol: app.get_config('currency_symbol'),
+ });
+ } else {
+ app.is_config(this, 'init_config');
+ }
+ },
+
+ // 获取数据
init() {
var user = app.get_user_info(this, "init");
if (user != false) {
diff --git a/sourcecode/baidu/pages/plugins/coupon/user/user.json b/sourcecode/baidu/pages/plugins/coupon/user/user.json
index 331ad4f3d..2a5d55f78 100644
--- a/sourcecode/baidu/pages/plugins/coupon/user/user.json
+++ b/sourcecode/baidu/pages/plugins/coupon/user/user.json
@@ -1,3 +1,4 @@
{
- "enablePullDownRefresh": true
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": "优惠券"
}
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/plugins/distribution/extraction/extraction.js b/sourcecode/baidu/pages/plugins/distribution/extraction/extraction.js
index 92ffc8a2b..547dd467c 100644
--- a/sourcecode/baidu/pages/plugins/distribution/extraction/extraction.js
+++ b/sourcecode/baidu/pages/plugins/distribution/extraction/extraction.js
@@ -91,17 +91,12 @@ Page({
if ((this.data.extraction || null) == null) {
return false;
}
+ var data = this.data.extraction;
- var ads = this.data.extraction;
- var lng = parseFloat(ads.lng || 0);
- var lat = parseFloat(ads.lat || 0);
- swan.openLocation({
- latitude: lat,
- longitude: lng,
- scale: 18,
- name: ads.alias || '',
- address: (ads.province_name || '') + (ads.city_name || '') + (ads.county_name || '') + (ads.address || '')
- });
+ // 打开地图
+ var name = data.name || data.alias || '';
+ var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || '');
+ app.open_location(data.lng, data.lat, name, address);
},
// 进入取货订单管理
diff --git a/sourcecode/baidu/pages/plugins/distribution/introduce/introduce.swan b/sourcecode/baidu/pages/plugins/distribution/introduce/introduce.swan
index d1c2d7d9a..1e33b24d3 100644
--- a/sourcecode/baidu/pages/plugins/distribution/introduce/introduce.swan
+++ b/sourcecode/baidu/pages/plugins/distribution/introduce/introduce.swan
@@ -12,7 +12,7 @@
返佣比例
-
+
一级 {{item.level_rate_one}}%
二级 {{item.level_rate_two}}%
三级 {{item.level_rate_three}}%
@@ -20,7 +20,7 @@
消费金额
- {{item.rules_msg}}
+ {{item.rules_msg}}
diff --git a/sourcecode/baidu/pages/plugins/distribution/order-detail/order-detail.swan b/sourcecode/baidu/pages/plugins/distribution/order-detail/order-detail.swan
index b71620fc8..95eaf0c00 100644
--- a/sourcecode/baidu/pages/plugins/distribution/order-detail/order-detail.swan
+++ b/sourcecode/baidu/pages/plugins/distribution/order-detail/order-detail.swan
@@ -3,14 +3,14 @@
用户头像
-
+
{{item.name}}
- {{item.value}}
+ {{item.value}}
diff --git a/sourcecode/baidu/pages/plugins/distribution/profit-detail/profit-detail.swan b/sourcecode/baidu/pages/plugins/distribution/profit-detail/profit-detail.swan
index 21d918c40..826754bdb 100644
--- a/sourcecode/baidu/pages/plugins/distribution/profit-detail/profit-detail.swan
+++ b/sourcecode/baidu/pages/plugins/distribution/profit-detail/profit-detail.swan
@@ -3,7 +3,7 @@
{{item.name}}
- {{item.value}}
+ {{item.value}}
diff --git a/sourcecode/baidu/pages/plugins/distribution/statistics/statistics.js b/sourcecode/baidu/pages/plugins/distribution/statistics/statistics.js
index 39143b047..b69695d0c 100644
--- a/sourcecode/baidu/pages/plugins/distribution/statistics/statistics.js
+++ b/sourcecode/baidu/pages/plugins/distribution/statistics/statistics.js
@@ -1,7 +1,6 @@
const app = getApp();
Page({
data: {
- currency_symbol: app.data.currency_symbol,
data_list_loding_status: 1,
data_list_loding_msg: '加载中...',
data_bottom_line_status: false,
@@ -16,13 +15,32 @@ Page({
// 图表
profit_chart: {},
- user_chart: {}
+ user_chart: {},
+
+ // 基础配置
+ currency_symbol: app.data.currency_symbol,
},
onShow() {
+ // 数据加载
this.init();
+
+ // 初始化配置
+ this.init_config();
},
+ // 初始化配置
+ init_config(status) {
+ if((status || false) == true) {
+ this.setData({
+ currency_symbol: app.get_config('currency_symbol'),
+ });
+ } else {
+ app.is_config(this, 'init_config');
+ }
+ },
+
+ // 获取数据
init() {
var self = this;
swan.showLoading({ title: "加载中..." });
diff --git a/sourcecode/baidu/pages/plugins/exchangerate/currency/currency.css b/sourcecode/baidu/pages/plugins/exchangerate/currency/currency.css
new file mode 100644
index 000000000..b0fc4eb85
--- /dev/null
+++ b/sourcecode/baidu/pages/plugins/exchangerate/currency/currency.css
@@ -0,0 +1,14 @@
+.exchangerate-container .item {
+ padding: 20rpx 10rpx;
+ font-size: 36rpx;
+}
+.exchangerate-container .item .icon image {
+ width: 50rpx;
+ height: 50rpx !important;
+ margin: 0 10rpx;
+ vertical-align: middle;
+}
+.exchangerate-container .item .single-text {
+ width: calc(100% - 80rpx);
+ line-height: 50rpx;
+}
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/plugins/exchangerate/currency/currency.js b/sourcecode/baidu/pages/plugins/exchangerate/currency/currency.js
new file mode 100644
index 000000000..8def9fd7a
--- /dev/null
+++ b/sourcecode/baidu/pages/plugins/exchangerate/currency/currency.js
@@ -0,0 +1,126 @@
+const app = getApp();
+Page({
+ data: {
+ data_bottom_line_status: false,
+ data_list_loding_status: 1,
+ data_list_loding_msg: '',
+ data_list: [],
+ data_default: null,
+ data_base: null,
+ },
+
+ onShow() {
+ // 数据加载
+ this.init();
+ },
+
+ // 获取数据
+ init() {
+ this.get_data_list();
+ },
+
+ // 获取数据
+ get_data_list() {
+ var self = this;
+ swan.showLoading({ title: "加载中..." });
+ if (self.data.data_list.length <= 0)
+ {
+ self.setData({
+ data_list_loding_status: 1
+ });
+ }
+
+ swan.request({
+ url: app.get_request_url("index", "index", "exchangerate"),
+ method: "POST",
+ data: {},
+ dataType: "json",
+ success: res => {
+ swan.hideLoading();
+ swan.stopPullDownRefresh();
+ if (res.data.code == 0) {
+ var data = res.data.data;
+ var status = ((data.data.data || []).length > 0);
+ this.setData({
+ data_base: data.base || null,
+ data_default: data.data.default || null,
+ data_list: data.data.data || [],
+ data_list_loding_msg: '',
+ data_list_loding_status: status ? 3 : 0,
+ data_bottom_line_status: status,
+ });
+ } else {
+ self.setData({
+ data_bottom_line_status: false,
+ data_list_loding_status: 2,
+ data_list_loding_msg: res.data.msg,
+ });
+ app.showToast(res.data.msg);
+ }
+ },
+ fail: () => {
+ swan.hideLoading();
+ swan.stopPullDownRefresh();
+ self.setData({
+ data_bottom_line_status: false,
+ data_list_loding_status: 2,
+ data_list_loding_msg: '服务器请求出错',
+ });
+ app.showToast("服务器请求出错");
+ }
+ });
+ },
+
+ // 选择事件
+ selected_event(e) {
+ // 参数处理
+ var index = e.currentTarget.dataset.index;
+ var temp_list = this.data.data_list;
+ var data = temp_list[index] || null;
+ if(data == null)
+ {
+ app.showToast('数据有误');
+ return false;
+ }
+
+ // id与当前默认一致则不处理
+ if (data.id != this.data.data_default.id)
+ {
+ var self = this;
+ swan.showLoading({ title: "处理中..." });
+ swan.request({
+ url: app.get_request_url("setcurrency", "index", "exchangerate"),
+ method: "POST",
+ data: { "currency": data.id },
+ dataType: "json",
+ header: { 'content-type': 'application/x-www-form-urlencoded' },
+ success: res => {
+ swan.hideLoading();
+ if (res.data.code == 0) {
+ app.showToast(res.data.msg, "success");
+ self.setData({ data_default: data });
+ // 重新初始化配置
+ app.init_config();
+
+ // 返回上一页
+ setTimeout(function () {
+ swan.navigateBack();
+ }, 1500);
+ } else {
+ app.showToast(res.data.msg);
+ }
+ },
+ fail: () => {
+ swan.hideLoading();
+ app.showToast("服务器请求出错");
+ }
+ });
+ }
+ },
+
+ // 下拉刷新
+ onPullDownRefresh() {
+ this.get_data_list();
+ },
+
+});
diff --git a/sourcecode/baidu/pages/plugins/exchangerate/currency/currency.json b/sourcecode/baidu/pages/plugins/exchangerate/currency/currency.json
new file mode 100644
index 000000000..eac1d0379
--- /dev/null
+++ b/sourcecode/baidu/pages/plugins/exchangerate/currency/currency.json
@@ -0,0 +1,4 @@
+{
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": "货币切换"
+}
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/plugins/exchangerate/currency/currency.swan b/sourcecode/baidu/pages/plugins/exchangerate/currency/currency.swan
new file mode 100644
index 000000000..b0186886b
--- /dev/null
+++ b/sourcecode/baidu/pages/plugins/exchangerate/currency/currency.swan
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+ {{item.name}} / {{item.symbol}}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/user-faovr/user-faovr.js b/sourcecode/baidu/pages/user-faovr/user-faovr.js
index 51c275f6a..872447458 100755
--- a/sourcecode/baidu/pages/user-faovr/user-faovr.js
+++ b/sourcecode/baidu/pages/user-faovr/user-faovr.js
@@ -1,19 +1,38 @@
const app = getApp();
Page({
data: {
- currency_symbol: app.data.currency_symbol,
data_list: [],
data_page_total: 0,
data_page: 1,
data_list_loding_status: 1,
- data_bottom_line_status: false
+ data_bottom_line_status: false,
+
+ // 基础配置
+ currency_symbol: app.data.currency_symbol,
},
onShow() {
swan.setNavigationBarTitle({ title: app.data.common_pages_title.user_favor });
+
+ // 数据加载
this.init();
+
+ // 初始化配置
+ this.init_config();
},
+ // 初始化配置
+ init_config(status) {
+ if((status || false) == true) {
+ this.setData({
+ currency_symbol: app.get_config('currency_symbol'),
+ });
+ } else {
+ app.is_config(this, 'init_config');
+ }
+ },
+
+ // 获取数据
init() {
var user = app.get_user_info(this, "init");
if (user != false) {
diff --git a/sourcecode/baidu/pages/user-goods-browse/user-goods-browse.js b/sourcecode/baidu/pages/user-goods-browse/user-goods-browse.js
index 51435a50a..29dec34e7 100755
--- a/sourcecode/baidu/pages/user-goods-browse/user-goods-browse.js
+++ b/sourcecode/baidu/pages/user-goods-browse/user-goods-browse.js
@@ -1,19 +1,38 @@
const app = getApp();
Page({
data: {
- currency_symbol: app.data.currency_symbol,
data_list: [],
data_page_total: 0,
data_page: 1,
data_list_loding_status: 1,
- data_bottom_line_status: false
+ data_bottom_line_status: false,
+
+ // 基础配置
+ currency_symbol: app.data.currency_symbol,
},
onShow() {
swan.setNavigationBarTitle({ title: app.data.common_pages_title.user_goods_browse });
+
+ // 数据加载
this.init();
+
+ // 初始化配置
+ this.init_config();
},
+ // 初始化配置
+ init_config(status) {
+ if((status || false) == true) {
+ this.setData({
+ currency_symbol: app.get_config('currency_symbol'),
+ });
+ } else {
+ app.is_config(this, 'init_config');
+ }
+ },
+
+ // 获取数据
init() {
var user = app.get_user_info(this, "init");
if (user != false) {
diff --git a/sourcecode/baidu/pages/user-order-detail/user-order-detail.js b/sourcecode/baidu/pages/user-order-detail/user-order-detail.js
index 6668172aa..9072c7411 100755
--- a/sourcecode/baidu/pages/user-order-detail/user-order-detail.js
+++ b/sourcecode/baidu/pages/user-order-detail/user-order-detail.js
@@ -1,7 +1,6 @@
const app = getApp();
Page({
data: {
- currency_symbol: app.data.currency_symbol,
params: null,
data_list_loding_status: 1,
data_list_loding_msg: '',
@@ -15,13 +14,16 @@ Page({
onLoad(params) {
this.setData({ params: params });
- this.init();
},
onShow() {
swan.setNavigationBarTitle({ title: app.data.common_pages_title.user_order_detail });
+
+ // 数据加载
+ this.init();
},
+ // 获取数据
init() {
var self = this;
swan.showLoading({ title: "加载中..." });
@@ -103,17 +105,12 @@ Page({
app.showToast("地址有误");
return false;
}
+ var data = this.data.detail.address_data;
- var ads = this.data.detail.address_data;
- var lng = parseFloat(ads.lng || 0);
- var lat = parseFloat(ads.lat || 0);
- swan.openLocation({
- latitude: lat,
- longitude: lng,
- scale: 18,
- name: ads.alias || '',
- address: (ads.province_name || '') + (ads.city_name || '') + (ads.county_name || '') + (ads.address || '')
- });
+ // 打开地图
+ var name = data.name || data.alias || '';
+ var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || '');
+ app.open_location(data.lng, data.lat, name, address);
},
// 下拉刷新
diff --git a/sourcecode/baidu/pages/user-order-detail/user-order-detail.swan b/sourcecode/baidu/pages/user-order-detail/user-order-detail.swan
index dd2f8ea8b..f4ad1ff34 100755
--- a/sourcecode/baidu/pages/user-order-detail/user-order-detail.swan
+++ b/sourcecode/baidu/pages/user-order-detail/user-order-detail.swan
@@ -29,8 +29,8 @@
- {{currency_symbol}}{{item.price}}
- {{currency_symbol}}{{item.original_price}}
+ {{detail.currency_data.currency_symbol}}{{item.price}}
+ {{detail.currency_data.currency_symbol}}{{item.original_price}}
x{{item.buy_number}}
@@ -75,7 +75,7 @@
{{item.name}}
- {{item.value}}
+ {{item.value}}
@@ -86,7 +86,7 @@
{{item.name}}
- {{item.tips}}
+ {{item.tips}}
diff --git a/sourcecode/baidu/pages/user-order/user-order.js b/sourcecode/baidu/pages/user-order/user-order.js
index fd7281f22..b7cee92c8 100755
--- a/sourcecode/baidu/pages/user-order/user-order.js
+++ b/sourcecode/baidu/pages/user-order/user-order.js
@@ -1,7 +1,6 @@
const app = getApp();
Page({
data: {
- currency_symbol: app.data.currency_symbol,
data_list: [],
data_page_total: 0,
data_page: 1,
@@ -14,7 +13,14 @@ Page({
payment_list: [],
payment_id: 0,
temp_pay_value: '',
- nav_status_list: [{ name: "全部", value: "-1" }, { name: "待付款", value: "1" }, { name: "待发货", value: "2" }, { name: "待收货", value: "3" }, { name: "已完成", value: "4" }, { name: "已失效", value: "5,6" }],
+ nav_status_list: [
+ { name: "全部", value: "-1" },
+ { name: "待付款", value: "1" },
+ { name: "待发货", value: "2" },
+ { name: "待收货", value: "3" },
+ { name: "已完成", value: "4" },
+ { name: "已失效", value: "5,6" },
+ ],
nav_status_index: 0,
order_select_ids: []
},
@@ -35,13 +41,16 @@ Page({
params: params,
nav_status_index: nav_status_index
});
- this.init();
},
onShow() {
swan.setNavigationBarTitle({ title: app.data.common_pages_title.user_order });
+
+ // 数据加载
+ this.init();
},
+ // 获取数据
init() {
var user = app.get_user_info(this, 'init');
if (user != false) {
diff --git a/sourcecode/baidu/pages/user-order/user-order.swan b/sourcecode/baidu/pages/user-order/user-order.swan
index d4dbec0a3..ee1dd43ca 100755
--- a/sourcecode/baidu/pages/user-order/user-order.swan
+++ b/sourcecode/baidu/pages/user-order/user-order.swan
@@ -33,8 +33,8 @@
{{detail.orderaftersale_btn_text}}
- {{currency_symbol}}{{detail.price}}
- {{currency_symbol}}{{detail.original_price}}
+ {{item.currency_data.currency_symbol}}{{detail.price}}
+ {{item.currency_data.currency_symbol}}{{detail.original_price}}
x{{detail.buy_number}}
diff --git a/sourcecode/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.js b/sourcecode/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
index ee00990f8..a2d0ce065 100644
--- a/sourcecode/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
+++ b/sourcecode/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
@@ -1,7 +1,6 @@
const app = getApp();
Page({
data: {
- currency_symbol: app.data.currency_symbol,
params: null,
data_list_loding_status: 1,
data_list_loding_msg: '',
@@ -97,13 +96,16 @@ Page({
params: params,
popup_delivery_status: (params.is_delivery_popup || 0) == 1
});
- this.init();
},
onShow() {
swan.setNavigationBarTitle({ title: app.data.common_pages_title.user_orderaftersale_detail });
+
+ // 数据加载
+ this.init();
},
+ // 获取数据
init() {
var self = this;
swan.showLoading({ title: "加载中..." });
diff --git a/sourcecode/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.swan b/sourcecode/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.swan
index d2802bd7a..08f44aeac 100644
--- a/sourcecode/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.swan
+++ b/sourcecode/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.swan
@@ -13,8 +13,8 @@
- {{currency_symbol}}{{order_data.items.price}}
- {{currency_symbol}}{{order_data.items.original_price}}
+ {{order_data.currency_data.currency_symbol}}{{order_data.items.price}}
+ {{order_data.currency_data.currency_symbol}}{{order_data.items.original_price}}
x{{order_data.items.buy_number}}
@@ -54,7 +54,7 @@
{{item.name}}
- {{new_aftersale_data[item.field] || ''}}
+ {{new_aftersale_data[item.field] || ''}}
@@ -65,7 +65,7 @@
{{item.name}}
- {{new_aftersale_data[item.field] || ''}}
+ {{new_aftersale_data[item.field] || ''}}
diff --git a/sourcecode/baidu/pages/user-orderaftersale/user-orderaftersale.js b/sourcecode/baidu/pages/user-orderaftersale/user-orderaftersale.js
index 604487ac3..9fa502244 100644
--- a/sourcecode/baidu/pages/user-orderaftersale/user-orderaftersale.js
+++ b/sourcecode/baidu/pages/user-orderaftersale/user-orderaftersale.js
@@ -1,7 +1,6 @@
const app = getApp();
Page({
data: {
- currency_symbol: app.data.currency_symbol,
params: null,
data_list_loding_status: 1,
data_list_loding_msg: '',
@@ -15,7 +14,15 @@ Page({
// 导航
// 状态(0待确认, 1待退货, 2待审核, 3已完成, 4已拒绝, 5已取消)
- nav_status_list: [{ name: "全部", value: "-1" }, { name: "待确认", value: "0" }, { name: "待退货", value: "1" }, { name: "待审核", value: "2" }, { name: "已完成", value: "3" }, { name: "已拒绝", value: "4" }, { name: "已取消", value: "5" }],
+ nav_status_list: [
+ { name: "全部", value: "-1" },
+ { name: "待确认", value: "0" },
+ { name: "待退货", value: "1" },
+ { name: "待审核", value: "2" },
+ { name: "已完成", value: "3" },
+ { name: "已拒绝", value: "4" },
+ { name: "已取消", value: "5" },
+ ],
nav_status_index: 0
},
@@ -36,13 +43,16 @@ Page({
form_keyword_value: params.keywords || '',
nav_status_index: nav_status_index
});
- this.init();
},
onShow() {
swan.setNavigationBarTitle({ title: app.data.common_pages_title.user_orderaftersale });
+
+ // 数据加载
+ this.init();
},
+ // 获取数据
init() {
var user = app.get_user_info(this, "init");
if (user != false) {
diff --git a/sourcecode/baidu/pages/user-orderaftersale/user-orderaftersale.swan b/sourcecode/baidu/pages/user-orderaftersale/user-orderaftersale.swan
index 067892560..03e74a625 100644
--- a/sourcecode/baidu/pages/user-orderaftersale/user-orderaftersale.swan
+++ b/sourcecode/baidu/pages/user-orderaftersale/user-orderaftersale.swan
@@ -27,8 +27,8 @@
{{item.order_data.items.orderaftersale_btn_text}}
- {{currency_symbol}}{{item.order_data.items.price}}
- {{currency_symbol}}{{item.order_data.items.original_price}}
+ {{item.order_data.currency_data.currency_symbol}}{{item.order_data.items.price}}
+ {{item.order_data.currency_data.currency_symbol}}{{item.order_data.items.original_price}}
x{{item.order_data.items.buy_number}}
@@ -38,7 +38,7 @@
/
{{item.reason}}
/
- {{currency_symbol}}{{item.price}}
+ {{item.order_data.currency_data.currency_symbol}}{{item.price}}
x{{item.number}}
diff --git a/sourcecode/baidu/pages/user/user.js b/sourcecode/baidu/pages/user/user.js
index 2624377c4..b1bfa4da7 100755
--- a/sourcecode/baidu/pages/user/user.js
+++ b/sourcecode/baidu/pages/user/user.js
@@ -3,8 +3,6 @@ Page({
data: {
avatar: app.data.default_user_head_src,
nickname: "用户名",
- customer_service_tel: null,
- common_user_center_notice: null,
message_total: 0,
head_nav_list: [
{ name: "订单总数", url: "user-order", count: 0 },
@@ -28,15 +26,38 @@ Page({
// 远程自定义导航
navigation: [],
+ // 基础配置
+ common_app_customer_service_tel: null,
+ common_user_center_notice: null,
common_app_is_online_service: 0,
common_app_is_head_vice_nav: 0,
},
onShow() {
swan.setNavigationBarTitle({ title: app.data.common_pages_title.user });
+
+ // 数据加载
this.init();
+
+ // 初始化配置
+ this.init_config();
},
+ // 初始化配置
+ init_config(status) {
+ if((status || false) == true) {
+ this.setData({
+ common_app_customer_service_tel: app.get_config('config.common_app_customer_service_tel'),
+ common_user_center_notice: app.get_config('config.common_user_center_notice'),
+ common_app_is_online_service: app.get_config('config.common_app_is_online_service'),
+ common_app_is_head_vice_nav: app.get_config('config.common_app_is_head_vice_nav'),
+ });
+ } else {
+ app.is_config(this, 'init_config');
+ }
+ },
+
+ // 获取数据
init(e) {
var user = app.get_user_info(this, "init"),
self = this;
@@ -66,7 +87,7 @@ Page({
avatar: user.avatar || app.data.default_user_head_src,
nickname: user.nickname || '用户名',
});
-
+
self.get_data();
}
}
@@ -107,15 +128,11 @@ Page({
this.setData({
user_order_status_list: temp_user_order_status_list,
- customer_service_tel: data.customer_service_tel || null,
- common_user_center_notice: data.common_user_center_notice || null,
avatar: (data.avatar || null) != null ? data.avatar : (this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar,
nickname: data.nickname != null ? data.nickname : this.data.nickname,
message_total: (data.common_message_total || 0) == 0 ? 0 : data.common_message_total,
head_nav_list: temp_head_nav_list,
navigation: data.navigation || [],
- common_app_is_online_service: data.common_app_is_online_service || 0,
- common_app_is_head_vice_nav: data.common_app_is_head_vice_nav || 0,
});
// 导航购物车处理
@@ -141,16 +158,28 @@ Page({
// 清除缓存
clear_storage(e) {
+ // 获取uuid重新存储缓存,一定情况下确保用户的uuid不改变
+ var uuid = swan.getStorageSync(this.data.cache_user_uuid_key) || null;
+
+ // 清除所有缓存
swan.clearStorage();
app.showToast("清除缓存成功", "success");
+
+ // 重新存储用户uuid缓存
+ if(uuid != null) {
+ swan.setStorage({
+ key: app.data.cache_user_uuid_key,
+ data: uuid
+ });
+ }
},
// 客服电话
call_event() {
- if (this.data.customer_service_tel == null) {
+ if (this.data.common_app_customer_service_tel == null) {
app.showToast("客服电话有误");
} else {
- app.call_tel(this.data.customer_service_tel);
+ app.call_tel(this.data.common_app_customer_service_tel);
}
},
diff --git a/sourcecode/baidu/pages/user/user.json b/sourcecode/baidu/pages/user/user.json
index daa19778d..ef54e254e 100755
--- a/sourcecode/baidu/pages/user/user.json
+++ b/sourcecode/baidu/pages/user/user.json
@@ -3,6 +3,7 @@
"navigationBarBackgroundColor": "#d2364c",
"backgroundColorTop": "#d2364c",
"usingComponents": {
+ "component-quick-nav": "/components/quick-nav/quick-nav",
"component-badge": "/components/badge/badge"
}
}
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/user/user.swan b/sourcecode/baidu/pages/user/user.swan
index 4bdef1aa8..ab83633c0 100755
--- a/sourcecode/baidu/pages/user/user.swan
+++ b/sourcecode/baidu/pages/user/user.swan
@@ -69,7 +69,7 @@
-
+
{{common_user_center_notice}}
@@ -79,5 +79,8 @@
+
+
+
diff --git a/sourcecode/qq/pages/goods-detail/goods-detail.qss b/sourcecode/qq/pages/goods-detail/goods-detail.qss
index c107937df..3e049bda1 100755
--- a/sourcecode/qq/pages/goods-detail/goods-detail.qss
+++ b/sourcecode/qq/pages/goods-detail/goods-detail.qss
@@ -164,9 +164,9 @@
}
.goods-title {
font-size: 32rpx;
- line-height: 44rpx;
+ line-height: 48rpx;
font-weight: 500;
- padding: 8rpx 10rpx;
+ padding: 5rpx 10rpx;
}
.goods-base {
padding: 15rpx 10rpx;
diff --git a/sourcecode/qq/pages/goods-search/goods-search.qml b/sourcecode/qq/pages/goods-search/goods-search.qml
index ae899374a..003a7373a 100755
--- a/sourcecode/qq/pages/goods-search/goods-search.qml
+++ b/sourcecode/qq/pages/goods-search/goods-search.qml
@@ -40,12 +40,12 @@