diff --git a/application/lang/zh-cn.php b/application/lang/zh-cn.php
index 2ec094bee..a3db85568 100755
--- a/application/lang/zh-cn.php
+++ b/application/lang/zh-cn.php
@@ -28,6 +28,7 @@ return array(
'1.7.0' => array('value' => '1.7.0', 'name' => 'v1.7.0'),
'1.8.0' => array('value' => '1.8.0', 'name' => 'v1.8.0'),
'1.8.1' => array('value' => '1.8.1', 'name' => 'v1.8.1'),
+ '1.9.0' => array('value' => '1.9.0', 'name' => 'v1.9.0'),
),
// 用户注册类型列表
diff --git a/public/core.php b/public/core.php
index e0ce1a47c..079e7b30e 100755
--- a/public/core.php
+++ b/public/core.php
@@ -13,7 +13,7 @@
if(version_compare(PHP_VERSION,'5.6.0','<')) die('PHP版本最低 5.6.0');
// 系统版本
-define('APPLICATION_VERSION', 'v1.8.1');
+define('APPLICATION_VERSION', 'v1.9.0');
// 定义系统目录分隔符
define('DS', '/');
diff --git a/sourcecode/alipay/pages/common/copyright.axml b/sourcecode/alipay/pages/common/copyright.axml
index 25385f46c..d0cf6d000 100644
--- a/sourcecode/alipay/pages/common/copyright.axml
+++ b/sourcecode/alipay/pages/common/copyright.axml
@@ -1,5 +1,5 @@
- Powered by ShopXO v1.8.1
+ Powered by ShopXO v1.9.0
\ No newline at end of file
diff --git a/sourcecode/alipay/pages/goods-search/goods-search.js b/sourcecode/alipay/pages/goods-search/goods-search.js
index e4ce1914a..ed6334b53 100755
--- a/sourcecode/alipay/pages/goods-search/goods-search.js
+++ b/sourcecode/alipay/pages/goods-search/goods-search.js
@@ -194,11 +194,12 @@ Page({
onShareAppMessage() {
var user = app.get_user_cache_info() || null;
var user_id = (user != null && (user.id || null) != null) ? user.id : 0;
+ var category_id = this.data.params['category_id'] || 0;
+ var keywords = this.data.params['keywords'] || '';
return {
title: app.data.application_title,
desc: app.data.application_describe,
- path: '/pages/goods-search/goods-search?referrer=' + user_id
+ path: '/pages/goods-search/goods-search?referrer=' + user_id+'&category_id='+category_id+'&keywords='+keywords
};
},
-
});
diff --git a/sourcecode/baidu/pages/common/copyright.swan b/sourcecode/baidu/pages/common/copyright.swan
index 25385f46c..d0cf6d000 100755
--- a/sourcecode/baidu/pages/common/copyright.swan
+++ b/sourcecode/baidu/pages/common/copyright.swan
@@ -1,5 +1,5 @@
- Powered by ShopXO v1.8.1
+ Powered by ShopXO v1.9.0
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/goods-search/goods-search.js b/sourcecode/baidu/pages/goods-search/goods-search.js
index fed031166..5aec140ee 100755
--- a/sourcecode/baidu/pages/goods-search/goods-search.js
+++ b/sourcecode/baidu/pages/goods-search/goods-search.js
@@ -205,10 +205,12 @@ Page({
onShareAppMessage() {
var user = app.get_user_cache_info() || null;
var user_id = (user != null && (user.id || null) != null) ? user.id : 0;
+ var category_id = this.data.params['category_id'] || 0;
+ var keywords = this.data.params['keywords'] || '';
return {
title: app.data.application_title,
desc: app.data.application_describe,
- path: '/pages/goods-search/goods-search?referrer=' + user_id
+ path: '/pages/goods-search/goods-search?referrer=' + user_id+'&category_id='+category_id+'&keywords='+keywords
};
},
diff --git a/sourcecode/qq/pages/common/copyright.qml b/sourcecode/qq/pages/common/copyright.qml
index 25385f46c..d0cf6d000 100755
--- a/sourcecode/qq/pages/common/copyright.qml
+++ b/sourcecode/qq/pages/common/copyright.qml
@@ -1,5 +1,5 @@
- Powered by ShopXO v1.8.1
+ Powered by ShopXO v1.9.0
\ No newline at end of file
diff --git a/sourcecode/qq/pages/goods-search/goods-search.js b/sourcecode/qq/pages/goods-search/goods-search.js
index f633b80a3..f882c8175 100755
--- a/sourcecode/qq/pages/goods-search/goods-search.js
+++ b/sourcecode/qq/pages/goods-search/goods-search.js
@@ -195,11 +195,12 @@ Page({
onShareAppMessage() {
var user = app.get_user_cache_info() || null;
var user_id = (user != null && (user.id || null) != null) ? user.id : 0;
+ var category_id = this.data.params['category_id'] || 0;
+ var keywords = this.data.params['keywords'] || '';
return {
title: app.data.application_title,
desc: app.data.application_describe,
- path: '/pages/goods-search/goods-search?referrer=' + user_id
+ path: '/pages/goods-search/goods-search?referrer=' + user_id+'&category_id='+category_id+'&keywords='+keywords
};
},
-
});
diff --git a/sourcecode/toutiao/pages/common/copyright.ttml b/sourcecode/toutiao/pages/common/copyright.ttml
index 25385f46c..d0cf6d000 100755
--- a/sourcecode/toutiao/pages/common/copyright.ttml
+++ b/sourcecode/toutiao/pages/common/copyright.ttml
@@ -1,5 +1,5 @@
- Powered by ShopXO v1.8.1
+ Powered by ShopXO v1.9.0
\ No newline at end of file
diff --git a/sourcecode/toutiao/pages/goods-search/goods-search.js b/sourcecode/toutiao/pages/goods-search/goods-search.js
index d232fd55f..22358f349 100755
--- a/sourcecode/toutiao/pages/goods-search/goods-search.js
+++ b/sourcecode/toutiao/pages/goods-search/goods-search.js
@@ -195,11 +195,12 @@ Page({
onShareAppMessage() {
var user = app.get_user_cache_info() || null;
var user_id = (user != null && (user.id || null) != null) ? user.id : 0;
+ var category_id = this.data.params['category_id'] || 0;
+ var keywords = this.data.params['keywords'] || '';
return {
title: app.data.application_title,
desc: app.data.application_describe,
- path: '/pages/goods-search/goods-search?referrer=' + user_id
+ path: '/pages/goods-search/goods-search?referrer=' + user_id+'&category_id='+category_id+'&keywords='+keywords
};
},
-
});
diff --git a/sourcecode/weixin/pages/common/copyright.wxml b/sourcecode/weixin/pages/common/copyright.wxml
index 25385f46c..d0cf6d000 100755
--- a/sourcecode/weixin/pages/common/copyright.wxml
+++ b/sourcecode/weixin/pages/common/copyright.wxml
@@ -1,5 +1,5 @@
- Powered by ShopXO v1.8.1
+ Powered by ShopXO v1.9.0
\ No newline at end of file
diff --git a/sourcecode/weixin/pages/goods-search/goods-search.js b/sourcecode/weixin/pages/goods-search/goods-search.js
index 18d656af5..b6d62f234 100755
--- a/sourcecode/weixin/pages/goods-search/goods-search.js
+++ b/sourcecode/weixin/pages/goods-search/goods-search.js
@@ -195,10 +195,12 @@ Page({
onShareAppMessage() {
var user = app.get_user_cache_info() || null;
var user_id = (user != null && (user.id || null) != null) ? user.id : 0;
+ var category_id = this.data.params['category_id'] || 0;
+ var keywords = this.data.params['keywords'] || '';
return {
title: app.data.application_title,
desc: app.data.application_describe,
- path: '/pages/goods-search/goods-search?referrer=' + user_id
+ path: '/pages/goods-search/goods-search?referrer=' + user_id+'&category_id='+category_id+'&keywords='+keywords
};
},
});