From 88013381a0688550bbf0b06166cadc9d6f80c7a4 Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Wed, 21 Jul 2021 13:35:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=9B=B4=E6=96=B0=E3=80=81=E7=9B=B8=E5=86=8C?=
 =?UTF-8?q?=E9=93=BA=E6=BB=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alipay/default/pages/goods-detail/goods-detail.acss  | 2 +-
 .../alipay/default/pages/goods-detail/goods-detail.axml  | 8 ++++----
 .../alipay/default/pages/goods-detail/goods-detail.js    | 9 ++++++++-
 .../baidu/default/pages/goods-detail/goods-detail.css    | 2 +-
 .../baidu/default/pages/goods-detail/goods-detail.js     | 9 ++++++++-
 .../baidu/default/pages/goods-detail/goods-detail.swan   | 8 ++++----
 sourcecode/qq/default/pages/goods-detail/goods-detail.js | 9 ++++++++-
 .../qq/default/pages/goods-detail/goods-detail.qml       | 8 ++++----
 .../qq/default/pages/goods-detail/goods-detail.qss       | 2 +-
 .../toutiao/default/pages/goods-detail/goods-detail.js   | 9 ++++++++-
 .../toutiao/default/pages/goods-detail/goods-detail.ttml | 8 ++++----
 .../toutiao/default/pages/goods-detail/goods-detail.ttss | 2 +-
 sourcecode/weixin/default/app.js                         | 2 +-
 .../weixin/default/pages/goods-detail/goods-detail.js    | 9 ++++++++-
 .../weixin/default/pages/goods-detail/goods-detail.wxml  | 8 ++++----
 .../weixin/default/pages/goods-detail/goods-detail.wxss  | 2 +-
 16 files changed, 66 insertions(+), 31 deletions(-)

diff --git a/sourcecode/alipay/default/pages/goods-detail/goods-detail.acss b/sourcecode/alipay/default/pages/goods-detail/goods-detail.acss
index ae0451133..432ba406b 100644
--- a/sourcecode/alipay/default/pages/goods-detail/goods-detail.acss
+++ b/sourcecode/alipay/default/pages/goods-detail/goods-detail.acss
@@ -1,4 +1,4 @@
-.goods-photo .swiper-item {
+.goods-photo, .goods-photo .swiper-item {
     height: 55vh !important;
     display: block;
 }
diff --git a/sourcecode/alipay/default/pages/goods-detail/goods-detail.axml b/sourcecode/alipay/default/pages/goods-detail/goods-detail.axml
index 88eee6c40..6dbc4d1b3 100644
--- a/sourcecode/alipay/default/pages/goods-detail/goods-detail.axml
+++ b/sourcecode/alipay/default/pages/goods-detail/goods-detail.axml
@@ -7,10 +7,10 @@
     autoplay="{{autoplay}}"
     circular="{{circular}}"
     class="goods-photo bg-white"
-    a:if="{{goods_photo.length > 0}}">
+    a:if="{{goods_photo.length > 0}}" style="height: {{photo_height}} !important;">
     <block a:for="{{goods_photo}}">
       <swiper-item>
-        <image class="swiper-item wh-auto" onTap="goods_photo_view_event" data-index="{{index}}" src="{{item.images}}" mode="aspectFit" />
+        <image class="swiper-item wh-auto" onTap="goods_photo_view_event" data-index="{{index}}" src="{{item.images}}" mode="scaleToFill" style="height: {{photo_height}} !important;" />
       </swiper-item>
     </block>
   </swiper>
@@ -18,9 +18,9 @@
   <!-- 视频 -->
   <block a:if="{{goods.video.length > 0}}">
     <view a:if="{{goods_video_is_autoplay}}" class="goods-video">
-      <video src="{{goods.video}}" autoplay="{{goods_video_is_autoplay}}" show-center-play-btn="{{true}}" controls="{{false}}" show-play-btn="{{false}}" enable-progress-gesture="{{false}}" show-fullscreen-btn="{{false}}"></video>
+      <video src="{{goods.video}}" autoplay="{{goods_video_is_autoplay}}" show-center-play-btn="{{true}}" controls="{{false}}" show-play-btn="{{false}}" enable-progress-gesture="{{false}}" show-fullscreen-btn="{{false}}" style="height: {{photo_height}} !important;"></video>
     </view>
-    <view class="goods-video-submit">
+    <view class="goods-video-submit" style="top: calc({{photo_height}} - 110rpx) !important;">
       <image a:if="{{!goods_video_is_autoplay}}" class="goods-video-play" onTap="goods_video_play_event" src="/images/goods-detail-video-play.png" mode="aspectFit"></image>
       <image a:if="{{goods_video_is_autoplay}}" class="goods-video-close"  onTap="goods_video_close_event" src="/images/goods-detail-video-close.png" mode="aspectFit"></image>
     </view>
diff --git a/sourcecode/alipay/default/pages/goods-detail/goods-detail.js b/sourcecode/alipay/default/pages/goods-detail/goods-detail.js
index c3c79616c..8fb8c8089 100644
--- a/sourcecode/alipay/default/pages/goods-detail/goods-detail.js
+++ b/sourcecode/alipay/default/pages/goods-detail/goods-detail.js
@@ -11,6 +11,8 @@ Page({
     data_list_loding_status: 1,
     data_list_loding_msg: '',
     params: null,
+    system_info: null,
+    photo_height: '55vh',
 
     goods: null,
     goods_photo: [],
@@ -85,7 +87,12 @@ Page({
     params = app.launch_params_handle(params);
 
     //params['goods_id']=2;
-    this.setData({params: params});
+    var system_info = app.get_system_info();
+    this.setData({
+      params: params,
+      system_info: system_info,
+      photo_height: ((system_info || null) == null || (system_info.screenWidth || null) == null) ? '55vh' : system_info.screenWidth+'px'
+    });
 
     // 数据加载
     this.init();
diff --git a/sourcecode/baidu/default/pages/goods-detail/goods-detail.css b/sourcecode/baidu/default/pages/goods-detail/goods-detail.css
index 96f98e496..b129094de 100755
--- a/sourcecode/baidu/default/pages/goods-detail/goods-detail.css
+++ b/sourcecode/baidu/default/pages/goods-detail/goods-detail.css
@@ -1,4 +1,4 @@
-.goods-photo .swiper-item, swiper {
+.goods-photo, .goods-photo .swiper-item {
     height: 55vh !important;
     display: block;
 }
diff --git a/sourcecode/baidu/default/pages/goods-detail/goods-detail.js b/sourcecode/baidu/default/pages/goods-detail/goods-detail.js
index b78c6ff1b..2093ce181 100755
--- a/sourcecode/baidu/default/pages/goods-detail/goods-detail.js
+++ b/sourcecode/baidu/default/pages/goods-detail/goods-detail.js
@@ -10,6 +10,8 @@ Page({
     data_list_loding_status: 1,
     data_list_loding_msg: '',
     params: null,
+    system_info: null,
+    photo_height: '55vh',
 
     goods: null,
     goods_photo: [],
@@ -80,7 +82,12 @@ Page({
 
     // 参数赋值,初始化
     //params['goods_id']=12;
-    this.setData({params: params});
+    var system_info = app.get_system_info();
+    this.setData({
+      params: params,
+      system_info: system_info,
+      photo_height: ((system_info || null) == null || (system_info.screenWidth || null) == null) ? '55vh' : system_info.screenWidth+'px'
+    });
 
     // 数据加载
     this.init();
diff --git a/sourcecode/baidu/default/pages/goods-detail/goods-detail.swan b/sourcecode/baidu/default/pages/goods-detail/goods-detail.swan
index 7668d7480..8cb15245a 100755
--- a/sourcecode/baidu/default/pages/goods-detail/goods-detail.swan
+++ b/sourcecode/baidu/default/pages/goods-detail/goods-detail.swan
@@ -1,9 +1,9 @@
 <view s-if="goods != null" class="page">
   <!-- 轮播图片 -->
-  <swiper indicator-dots="{{indicator_dots}}" indicator-color="{{indicator_color}}" indicator-active-color="{{indicator_active_color}}" autoplay="{{autoplay}}" circular="{{circular}}" class="goods-photo bg-white" s-if="goods_photo.length > 0">
+  <swiper indicator-dots="{{indicator_dots}}" indicator-color="{{indicator_color}}" indicator-active-color="{{indicator_active_color}}" autoplay="{{autoplay}}" circular="{{circular}}" class="goods-photo bg-white" s-if="goods_photo.length > 0" style="height: {{photo_height}} !important;">
     <block s-for="item, index in goods_photo" s-key="key">
       <swiper-item>
-        <image class="swiper-item wh-auto" bindtap="goods_photo_view_event" data-index="{{index}}" src="{{item.images}}" mode="aspectFit" />
+        <image class="swiper-item wh-auto" bindtap="goods_photo_view_event" data-index="{{index}}" src="{{item.images}}" mode="scaleToFill" style="height: {{photo_height}} !important;" />
       </swiper-item>
     </block>
   </swiper>
@@ -11,11 +11,11 @@
   <!-- 视频 -->
   <block s-if="goods.video.length > 0">
     <view s-if="goods_video_is_autoplay" class="goods-video">
-      <video src="{{goods.video}}" autoplay="{{goods_video_is_autoplay}}" show-center-play-btn="{{true}}" controls="{{false}}" show-play-btn="{{false}}" enable-progress-gesture="{{false}}" show-fullscreen-btn="{{false}}">
+      <video src="{{goods.video}}" autoplay="{{goods_video_is_autoplay}}" show-center-play-btn="{{true}}" controls="{{false}}" show-play-btn="{{false}}" enable-progress-gesture="{{false}}" show-fullscreen-btn="{{false}}" style="height: {{photo_height}} !important;">
         <cover-image s-if="goods_video_is_autoplay" class="cover-goods-video-close" bindtap="goods_video_close_event" src="/images/goods-detail-video-close.png" mode="aspectFit"></cover-image>
       </video>
     </view>
-    <view class="goods-video-submit">
+    <view class="goods-video-submit" style="top: calc({{photo_height}} - 110rpx) !important;">
       <image s-if="!goods_video_is_autoplay" class="goods-video-play" bindtap="goods_video_play_event" src="/images/goods-detail-video-play.png" mode="aspectFit"></image>
     </view>
   </block>
diff --git a/sourcecode/qq/default/pages/goods-detail/goods-detail.js b/sourcecode/qq/default/pages/goods-detail/goods-detail.js
index de53c9f19..f1c2fcbcb 100755
--- a/sourcecode/qq/default/pages/goods-detail/goods-detail.js
+++ b/sourcecode/qq/default/pages/goods-detail/goods-detail.js
@@ -10,6 +10,8 @@ Page({
     data_list_loding_status: 1,
     data_list_loding_msg: '',
     params: null,
+    system_info: null,
+    photo_height: '55vh',
 
     goods: null,
     goods_photo: [],
@@ -80,7 +82,12 @@ Page({
     
     // 参数赋值,初始化
     //params['goods_id']=2;
-    this.setData({params: params});
+    var system_info = app.get_system_info();
+    this.setData({
+      params: params,
+      system_info: system_info,
+      photo_height: ((system_info || null) == null || (system_info.screenWidth || null) == null) ? '55vh' : system_info.screenWidth+'px'
+    });
 
     // 数据加载
     this.init();
diff --git a/sourcecode/qq/default/pages/goods-detail/goods-detail.qml b/sourcecode/qq/default/pages/goods-detail/goods-detail.qml
index 01a3bb1b7..ce665e3f8 100755
--- a/sourcecode/qq/default/pages/goods-detail/goods-detail.qml
+++ b/sourcecode/qq/default/pages/goods-detail/goods-detail.qml
@@ -7,10 +7,10 @@
     autoplay="{{autoplay}}"
     circular="{{circular}}"
     class="goods-photo bg-white"
-    qq:if="{{goods_photo.length > 0}}">
+    qq:if="{{goods_photo.length > 0}}" style="height: {{photo_height}} !important;">
     <block qq:for="{{goods_photo}}" qq:key="key">
       <swiper-item>
-        <image class="swiper-item wh-auto" bindtap="goods_photo_view_event" data-index="{{index}}" src="{{item.images}}" mode="aspectFit" />
+        <image class="swiper-item wh-auto" bindtap="goods_photo_view_event" data-index="{{index}}" src="{{item.images}}" mode="scaleToFill" style="height: {{photo_height}} !important;" />
       </swiper-item>
     </block>
   </swiper>
@@ -18,9 +18,9 @@
   <!-- 视频 -->
   <block qq:if="{{goods.video.length > 0}}">
     <view qq:if="{{goods_video_is_autoplay}}" class="goods-video">
-      <video src="{{goods.video}}" autoplay="{{goods_video_is_autoplay}}" show-center-play-btn="{{true}}" controls="{{false}}" show-play-btn="{{false}}" enable-progress-gesture="{{false}}" show-fullscreen-btn="{{false}}"></video>
+      <video src="{{goods.video}}" autoplay="{{goods_video_is_autoplay}}" show-center-play-btn="{{true}}" controls="{{false}}" show-play-btn="{{false}}" enable-progress-gesture="{{false}}" show-fullscreen-btn="{{false}}" style="height: {{photo_height}} !important;"></video>
     </view>
-    <view class="goods-video-submit">
+    <view class="goods-video-submit" style="top: calc({{photo_height}} - 110rpx) !important;">
       <image qq:if="{{!goods_video_is_autoplay}}" class="goods-video-play" bindtap="goods_video_play_event" src="/images/goods-detail-video-play.png" mode="aspectFit"></image>
       <image qq:if="{{goods_video_is_autoplay}}" class="goods-video-close"  bindtap="goods_video_close_event" src="/images/goods-detail-video-close.png" mode="aspectFit"></image>
     </view>
diff --git a/sourcecode/qq/default/pages/goods-detail/goods-detail.qss b/sourcecode/qq/default/pages/goods-detail/goods-detail.qss
index 133d5052e..05c582225 100755
--- a/sourcecode/qq/default/pages/goods-detail/goods-detail.qss
+++ b/sourcecode/qq/default/pages/goods-detail/goods-detail.qss
@@ -1,4 +1,4 @@
-.goods-photo .swiper-item, swiper {
+.goods-photo, .goods-photo .swiper-item {
     height: 55vh !important;
     display: block;
 }
diff --git a/sourcecode/toutiao/default/pages/goods-detail/goods-detail.js b/sourcecode/toutiao/default/pages/goods-detail/goods-detail.js
index 7e68ddbeb..aff54679b 100755
--- a/sourcecode/toutiao/default/pages/goods-detail/goods-detail.js
+++ b/sourcecode/toutiao/default/pages/goods-detail/goods-detail.js
@@ -10,6 +10,8 @@ Page({
     data_list_loding_status: 1,
     data_list_loding_msg: '',
     params: null,
+    system_info: null,
+    photo_height: '55vh',
 
     goods: null,
     goods_photo: [],
@@ -80,7 +82,12 @@ Page({
     
     // 参数赋值,初始化
     //params['goods_id']=12;
-    this.setData({params: params});
+    var system_info = app.get_system_info();
+    this.setData({
+      params: params,
+      system_info: system_info,
+      photo_height: ((system_info || null) == null || (system_info.screenWidth || null) == null) ? '55vh' : system_info.screenWidth+'px'
+    });
 
     // 数据加载
     this.init();
diff --git a/sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttml b/sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttml
index c945a9c89..70b3cc4e7 100755
--- a/sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttml
+++ b/sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttml
@@ -7,10 +7,10 @@
     autoplay="{{autoplay}}"
     circular="{{circular}}"
     class="goods-photo bg-white"
-    tt:if="{{goods_photo.length > 0}}">
+    tt:if="{{goods_photo.length > 0}}" style="height: {{photo_height}} !important;">
     <block tt:for="{{goods_photo}}" tt:key="key">
       <swiper-item>
-        <image class="swiper-item wh-auto" bindtap="goods_photo_view_event" data-index="{{index}}" src="{{item.images}}" mode="aspectFit" />
+        <image class="swiper-item wh-auto" bindtap="goods_photo_view_event" data-index="{{index}}" src="{{item.images}}" mode="scaleToFill" style="height: {{photo_height}} !important;" />
       </swiper-item>
     </block>
   </swiper>
@@ -18,9 +18,9 @@
   <!-- 视频 -->
   <block tt:if="{{goods.video.length > 0}}">
     <view tt:if="{{goods_video_is_autoplay}}" class="goods-video">
-      <video src="{{goods.video}}" autoplay="{{goods_video_is_autoplay}}" show-center-play-btn="{{true}}" controls="{{false}}" show-play-btn="{{false}}" enable-progress-gesture="{{false}}" show-fullscreen-btn="{{false}}"></video>
+      <video src="{{goods.video}}" autoplay="{{goods_video_is_autoplay}}" show-center-play-btn="{{true}}" controls="{{false}}" show-play-btn="{{false}}" enable-progress-gesture="{{false}}" show-fullscreen-btn="{{false}}" style="height: {{photo_height}} !important;"></video>
     </view>
-    <view class="goods-video-submit">
+    <view class="goods-video-submit" style="top: calc({{photo_height}} - 110rpx) !important;">
       <image tt:if="{{!goods_video_is_autoplay}}" class="goods-video-play" bindtap="goods_video_play_event" src="/images/goods-detail-video-play.png" mode="aspectFit"></image>
       <image tt:if="{{goods_video_is_autoplay}}" class="goods-video-close"  bindtap="goods_video_close_event" src="/images/goods-detail-video-close.png" mode="aspectFit"></image>
     </view>
diff --git a/sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttss b/sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttss
index 133d5052e..05c582225 100755
--- a/sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttss
+++ b/sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttss
@@ -1,4 +1,4 @@
-.goods-photo .swiper-item, swiper {
+.goods-photo, .goods-photo .swiper-item {
     height: 55vh !important;
     display: block;
 }
diff --git a/sourcecode/weixin/default/app.js b/sourcecode/weixin/default/app.js
index 53025842a..0f96f19c2 100755
--- a/sourcecode/weixin/default/app.js
+++ b/sourcecode/weixin/default/app.js
@@ -73,7 +73,7 @@ App({
 
     // 请求地址
     request_url: "{{request_url}}",
-     request_url: 'http://shopxo.com/',
+    // request_url: 'http://shopxo.com/',
     // request_url: 'https://dev.shopxo.net/',
 
     // 基础信息
diff --git a/sourcecode/weixin/default/pages/goods-detail/goods-detail.js b/sourcecode/weixin/default/pages/goods-detail/goods-detail.js
index 2572aed80..bf5d40ee4 100755
--- a/sourcecode/weixin/default/pages/goods-detail/goods-detail.js
+++ b/sourcecode/weixin/default/pages/goods-detail/goods-detail.js
@@ -10,6 +10,8 @@ Page({
     data_list_loding_status: 1,
     data_list_loding_msg: '',
     params: null,
+    system_info: null,
+    photo_height: '55vh',
 
     goods: null,
     goods_photo: [],
@@ -93,7 +95,12 @@ Page({
     
     // 参数赋值,初始化
     //params['goods_id']=12;
-    this.setData({params: params});
+    var system_info = app.get_system_info();
+    this.setData({
+      params: params,
+      system_info: system_info,
+      photo_height: ((system_info || null) == null || (system_info.screenWidth || null) == null) ? '55vh' : system_info.screenWidth+'px'
+    });
 
     // 数据加载
     this.init();
diff --git a/sourcecode/weixin/default/pages/goods-detail/goods-detail.wxml b/sourcecode/weixin/default/pages/goods-detail/goods-detail.wxml
index 169d64c42..08855565d 100755
--- a/sourcecode/weixin/default/pages/goods-detail/goods-detail.wxml
+++ b/sourcecode/weixin/default/pages/goods-detail/goods-detail.wxml
@@ -7,10 +7,10 @@
     autoplay="{{autoplay}}"
     circular="{{circular}}"
     class="goods-photo bg-white"
-    wx:if="{{goods_photo.length > 0}}">
+    wx:if="{{goods_photo.length > 0}}" style="height: {{photo_height}} !important;">
     <block wx:for="{{goods_photo}}" wx:key="key">
       <swiper-item>
-        <image class="swiper-item wh-auto" bindtap="goods_photo_view_event" data-index="{{index}}" src="{{item.images}}" mode="aspectFit" />
+        <image class="swiper-item wh-auto" bindtap="goods_photo_view_event" data-index="{{index}}" src="{{item.images}}" mode="scaleToFill" style="height: {{photo_height}} !important;" />
       </swiper-item>
     </block>
   </swiper>
@@ -18,9 +18,9 @@
   <!-- 视频 -->
   <block wx:if="{{goods.video.length > 0}}">
     <view wx:if="{{goods_video_is_autoplay}}" class="goods-video">
-      <video src="{{goods.video}}" autoplay="{{goods_video_is_autoplay}}" show-center-play-btn="{{true}}" controls="{{false}}" show-play-btn="{{false}}" enable-progress-gesture="{{false}}" show-fullscreen-btn="{{false}}"></video>
+      <video src="{{goods.video}}" autoplay="{{goods_video_is_autoplay}}" show-center-play-btn="{{true}}" controls="{{false}}" show-play-btn="{{false}}" enable-progress-gesture="{{false}}" show-fullscreen-btn="{{false}}" style="height: {{photo_height}} !important;"></video>
     </view>
-    <view class="goods-video-submit">
+    <view class="goods-video-submit" style="top: calc({{photo_height}} - 110rpx) !important;">
       <image wx:if="{{!goods_video_is_autoplay}}" class="goods-video-play" bindtap="goods_video_play_event" src="/images/goods-detail-video-play.png" mode="aspectFit"></image>
       <image wx:if="{{goods_video_is_autoplay}}" class="goods-video-close"  bindtap="goods_video_close_event" src="/images/goods-detail-video-close.png" mode="aspectFit"></image>
     </view>
diff --git a/sourcecode/weixin/default/pages/goods-detail/goods-detail.wxss b/sourcecode/weixin/default/pages/goods-detail/goods-detail.wxss
index 0ce0f8260..8d3ba71bc 100755
--- a/sourcecode/weixin/default/pages/goods-detail/goods-detail.wxss
+++ b/sourcecode/weixin/default/pages/goods-detail/goods-detail.wxss
@@ -1,4 +1,4 @@
-.goods-photo .swiper-item, swiper {
+.goods-photo, .goods-photo .swiper-item {
     height: 55vh !important;
     display: block;
 }