From 0dc5d1d30ce324e430e671f4d2df2ad8356502f9 Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Sat, 21 Nov 2020 20:17:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=94=AF=E6=8C=81=E6=94=BE=E5=A4=A7=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog.txt                                    | 16 ++++++++++++++++
 .../default/pages/goods-detail/goods-detail.axml |  2 +-
 .../default/pages/goods-detail/goods-detail.js   |  6 +++---
 .../default/pages/goods-detail/goods-detail.js   |  6 +++---
 .../default/pages/goods-detail/goods-detail.swan |  2 +-
 .../default/pages/goods-detail/goods-detail.js   |  6 +++---
 .../default/pages/goods-detail/goods-detail.qml  |  2 +-
 .../default/pages/goods-detail/goods-detail.js   |  6 +++---
 .../default/pages/goods-detail/goods-detail.ttml |  2 +-
 sourcecode/weixin/default/app.js                 |  2 +-
 .../default/pages/goods-detail/goods-detail.js   |  6 +++---
 .../default/pages/goods-detail/goods-detail.wxml |  2 +-
 12 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 7db8eefad..c9d4d2f7e 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 17ca76fe0..0a633274e 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 @@
       </view>
       <!-- 规格基础信息 -->
       <view class="goods-popup-base oh br-b">
-        <image src="{{goods_spec_base_images}}" mode="scaleToFill" class="br" />
+        <image src="{{goods_spec_base_images}}" mode="scaleToFill" class="br" onTap="goods_detail_images_view_event" data-value="{{goods_spec_base_images}}" />
         <view class="goods-popup-base-content">
           <view class="goods-price">
             <view class="sales-price">{{currency_symbol}}{{goods_spec_base_price}}</view>
diff --git a/sourcecode/alipay/default/pages/goods-detail/goods-detail.js b/sourcecode/alipay/default/pages/goods-detail/goods-detail.js
index 88c8e3987..004778162 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 df861a4ea..623dd6d9a 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 4cd8cd4bb..54717059e 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 @@
       </view>
       <!-- 规格基础信息 -->
       <view class="goods-popup-base oh br-b">
-        <image src="{{goods_spec_base_images}}" mode="scaleToFill" class="br" />
+        <image src="{{goods_spec_base_images}}" mode="scaleToFill" class="br" bindtap="goods_detail_images_view_event" data-value="{{goods_spec_base_images}}" />
         <view class="goods-popup-base-content">
           <view class="goods-price">
             <view class="sales-price">{{currency_symbol}}{{goods_spec_base_price}}</view>
diff --git a/sourcecode/qq/default/pages/goods-detail/goods-detail.js b/sourcecode/qq/default/pages/goods-detail/goods-detail.js
index fd571ac89..2a6d6e3be 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 0c51fe065..e341512b4 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 @@
       </view>
       <!-- 规格基础信息 -->
       <view class="goods-popup-base oh br-b">
-        <image src="{{goods_spec_base_images}}" mode="scaleToFill" class="br" />
+        <image src="{{goods_spec_base_images}}" mode="scaleToFill" class="br" bindtap="goods_detail_images_view_event" data-value="{{goods_spec_base_images}}" />
         <view class="goods-popup-base-content">
           <view class="goods-price">
             <view class="sales-price">{{currency_symbol}}{{goods_spec_base_price}}</view>
diff --git a/sourcecode/toutiao/default/pages/goods-detail/goods-detail.js b/sourcecode/toutiao/default/pages/goods-detail/goods-detail.js
index f5810ca15..5b061165a 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 e68ceeaab..d7b78f3ba 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 @@
       </view>
       <!-- 规格基础信息 -->
       <view class="goods-popup-base oh br-b">
-        <image src="{{goods_spec_base_images}}" mode="scaleToFill" class="br" />
+        <image src="{{goods_spec_base_images}}" mode="scaleToFill" class="br" bindtap="goods_detail_images_view_event" data-value="{{goods_spec_base_images}}" />
         <view class="goods-popup-base-content">
           <view class="goods-price">
             <view class="sales-price">{{currency_symbol}}{{goods_spec_base_price}}</view>
diff --git a/sourcecode/weixin/default/app.js b/sourcecode/weixin/default/app.js
index 3cad11051..c6ce0a03e 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 23fa4cfb8..ab210e1d2 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 173b76593..98dfbdf64 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 @@
       </view>
       <!-- 规格基础信息 -->
       <view class="goods-popup-base oh br-b">
-        <image src="{{goods_spec_base_images}}" mode="scaleToFill" class="br" />
+        <image src="{{goods_spec_base_images}}" mode="scaleToFill" class="br" bindtap="goods_detail_images_view_event" data-value="{{goods_spec_base_images}}" />
         <view class="goods-popup-base-content">
           <view class="goods-price">
             <view class="sales-price">{{currency_symbol}}{{goods_spec_base_price}}</view>
-- 
GitLab