diff --git a/changelog.txt b/changelog.txt index 7db8eefadd1ff007bae8efa69d49fb1eb5879b17..c9d4d2f7e25c0e5f470b87cd20d2d5a0f21dca0e 100755 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,19 @@ ++=========================================================+ + ShopXO 1.9.2 Release --- http://shopxo.net ++=========================================================+ +全局 + 1. + +web端 + 1. 后台管理小程序列表新增主题管理 + +小程序 + 1. 支付订单0金额错误修复 + +插件 + 1. + + +=========================================================+ ShopXO 1.9.1 Release 20201103 http://shopxo.net +=========================================================+ diff --git a/sourcecode/alipay/default/pages/goods-detail/goods-detail.axml b/sourcecode/alipay/default/pages/goods-detail/goods-detail.axml index 17ca76fe01ce2491690e7c5795168f3609653885..0a633274e7bc8376427e20e220eb81928237b37f 100644 --- a/sourcecode/alipay/default/pages/goods-detail/goods-detail.axml +++ b/sourcecode/alipay/default/pages/goods-detail/goods-detail.axml @@ -191,7 +191,7 @@ - + {{currency_symbol}}{{goods_spec_base_price}} diff --git a/sourcecode/alipay/default/pages/goods-detail/goods-detail.js b/sourcecode/alipay/default/pages/goods-detail/goods-detail.js index 88c8e3987ffa05990213ce56ef9d6f3d8d5bc422..0047781627e46d95fb6518648a62f958ecb8764b 100644 --- a/sourcecode/alipay/default/pages/goods-detail/goods-detail.js +++ b/sourcecode/alipay/default/pages/goods-detail/goods-detail.js @@ -68,14 +68,14 @@ Page({ //params['goods_id']=2; this.setData({params: params}); + + // 数据加载 + this.init(); }, onShow() { my.setNavigationBar({title: (this.data.goods == null) ? app.data.common_pages_title.goods_detail : this.data.goods.title}); - // 数据加载 - this.init(); - // 初始化配置 this.init_config(); }, diff --git a/sourcecode/baidu/default/pages/goods-detail/goods-detail.js b/sourcecode/baidu/default/pages/goods-detail/goods-detail.js index df861a4eaa83ebfe5cf99290984f6674c1956804..623dd6d9a9a976a56a005eb74369332397c12d31 100755 --- a/sourcecode/baidu/default/pages/goods-detail/goods-detail.js +++ b/sourcecode/baidu/default/pages/goods-detail/goods-detail.js @@ -65,14 +65,14 @@ Page({ // 参数赋值,初始化 //params['goods_id']=12; this.setData({params: params}); + + // 数据加载 + this.init(); }, onShow() { swan.setNavigationBarTitle({ title: this.data.goods == null ? app.data.common_pages_title.goods_detail : this.data.goods.title }); - // 数据加载 - this.init(); - // 初始化配置 this.init_config(); }, diff --git a/sourcecode/baidu/default/pages/goods-detail/goods-detail.swan b/sourcecode/baidu/default/pages/goods-detail/goods-detail.swan index 4cd8cd4bbc2d1026b6b186e3a4f3ed6c031fe82a..54717059e68179eebf2cb5fd3d085af0b138d712 100755 --- a/sourcecode/baidu/default/pages/goods-detail/goods-detail.swan +++ b/sourcecode/baidu/default/pages/goods-detail/goods-detail.swan @@ -177,7 +177,7 @@ - + {{currency_symbol}}{{goods_spec_base_price}} diff --git a/sourcecode/qq/default/pages/goods-detail/goods-detail.js b/sourcecode/qq/default/pages/goods-detail/goods-detail.js index fd571ac89d7e50e605dab0d5bdb658225c494004..2a6d6e3be6405c993b50cc164ffd5075bac35bd2 100755 --- a/sourcecode/qq/default/pages/goods-detail/goods-detail.js +++ b/sourcecode/qq/default/pages/goods-detail/goods-detail.js @@ -65,13 +65,13 @@ Page({ // 参数赋值,初始化 //params['goods_id']=2; this.setData({params: params}); + + // 数据加载 + this.init(); }, onShow() { qq.setNavigationBarTitle({title: (this.data.goods == null) ? app.data.common_pages_title.goods_detail : this.data.goods.title}); - - // 数据加载 - this.init(); // 初始化配置 this.init_config(); diff --git a/sourcecode/qq/default/pages/goods-detail/goods-detail.qml b/sourcecode/qq/default/pages/goods-detail/goods-detail.qml index 0c51fe065efbc10bd227f9556227cc949feebc51..e341512b43b2afd7b0a5462fe0651d70b876a3e6 100755 --- a/sourcecode/qq/default/pages/goods-detail/goods-detail.qml +++ b/sourcecode/qq/default/pages/goods-detail/goods-detail.qml @@ -184,7 +184,7 @@ - + {{currency_symbol}}{{goods_spec_base_price}} diff --git a/sourcecode/toutiao/default/pages/goods-detail/goods-detail.js b/sourcecode/toutiao/default/pages/goods-detail/goods-detail.js index f5810ca15c7a52b4e09c273f392852be216d2a68..5b061165a44a0357d790be3b52c5cf04293a212b 100755 --- a/sourcecode/toutiao/default/pages/goods-detail/goods-detail.js +++ b/sourcecode/toutiao/default/pages/goods-detail/goods-detail.js @@ -65,14 +65,14 @@ Page({ // 参数赋值,初始化 //params['goods_id']=12; this.setData({params: params}); + + // 数据加载 + this.init(); }, onShow() { tt.setNavigationBarTitle({title: (this.data.goods == null) ? app.data.common_pages_title.goods_detail : this.data.goods.title}); - // 数据加载 - this.init(); - // 初始化配置 this.init_config(); diff --git a/sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttml b/sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttml index e68ceeaab739dcb669b4e5c2fc1788bfbac2a04c..d7b78f3bab1465ca443aeeab1f4f67812974275a 100755 --- a/sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttml +++ b/sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttml @@ -184,7 +184,7 @@ - + {{currency_symbol}}{{goods_spec_base_price}} diff --git a/sourcecode/weixin/default/app.js b/sourcecode/weixin/default/app.js index 3cad1105125858a92e9ec936462de8c033e465e6..c6ce0a03e2a07118ed2b35eb81cf033573106c48 100755 --- a/sourcecode/weixin/default/app.js +++ b/sourcecode/weixin/default/app.js @@ -74,7 +74,7 @@ App({ // 请求地址 request_url: "{{request_url}}", request_url: 'http://shopxo.com/', - // request_url: 'https://dev.shopxo.net/', + request_url: 'https://dev.shopxo.net/', // 基础信息 application_title: "{{application_title}}", diff --git a/sourcecode/weixin/default/pages/goods-detail/goods-detail.js b/sourcecode/weixin/default/pages/goods-detail/goods-detail.js index 23fa4cfb8fc83a9e573894e3e4b5932eec9eaa3b..ab210e1d25ad7eb592aa9954195ee616f026872b 100755 --- a/sourcecode/weixin/default/pages/goods-detail/goods-detail.js +++ b/sourcecode/weixin/default/pages/goods-detail/goods-detail.js @@ -78,14 +78,14 @@ Page({ // 参数赋值,初始化 //params['goods_id']=12; this.setData({params: params}); + + // 数据加载 + this.init(); }, onShow() { wx.setNavigationBarTitle({title: (this.data.goods == null) ? app.data.common_pages_title.goods_detail : this.data.goods.title}); - // 数据加载 - this.init(); - // 初始化配置 this.init_config(); diff --git a/sourcecode/weixin/default/pages/goods-detail/goods-detail.wxml b/sourcecode/weixin/default/pages/goods-detail/goods-detail.wxml index 173b765933c11858340d70f111fb743fd02bb3f0..98dfbdf6440eb6d71aa80e78bd9bb201736caeeb 100755 --- a/sourcecode/weixin/default/pages/goods-detail/goods-detail.wxml +++ b/sourcecode/weixin/default/pages/goods-detail/goods-detail.wxml @@ -182,7 +182,7 @@ - + {{currency_symbol}}{{goods_spec_base_price}}