diff --git a/sourcecode/alipay/default/pages/goods-detail/goods-detail.acss b/sourcecode/alipay/default/pages/goods-detail/goods-detail.acss
index ae045113335a5b6687a786afe915001edf1300c3..432ba406bb20493dbc47428bcfbeb17eca7a60ad 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 88eee6c408c1d6c0f7be926d39a292308bcf46bf..6dbc4d1b376f08f6d80b146ff3817c7a1d757300 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 c3c79616c568dbe0cc5935022206eb9aad7b5fdd..8fb8c8089e8e65409b9afaf50bf74ef46238bfda 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 96f98e4960f90b3687a536ac7a0e40ebdfb9350e..b129094de1dba099bad55fe970358bf40ce35c28 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 b78c6ff1bf5cde96233fea0ac2f83c8cfb0930b0..2093ce1812fb20ae30cc6a6d88eb440b3932c0f9 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 7668d74800ab9a499b5bf4e6b0cd629d08c43f5c..8cb15245ad12cd38a93fa132f6243b5f4510f6fb 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 de53c9f1956a3b0d4c9cb4b21ec4a29b7cbf80ec..f1c2fcbcb6a4ad622d0903c9fe6e02d83a012026 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 01a3bb1b703959599082084c9bedf156cd4dbec8..ce665e3f80ca9d9e7ef153da5ae06ef213743faa 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 133d5052e9b92f185515e271f93e72927943262c..05c582225bdda531da5c353dac814966f7267adb 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 7e68ddbeb92ca21b8882e2dbce50e4a5962efb5b..aff54679bfe07866544904164b2de18a73863b54 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 c945a9c89b65146e8c4ab4b8c97f2dad9dc7be20..70b3cc4e7789c259eeb90bc32043d0f63f24e658 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 133d5052e9b92f185515e271f93e72927943262c..05c582225bdda531da5c353dac814966f7267adb 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 53025842aa4a9aa899be97678f3ab2c465ae192d..0f96f19c25f086797602167ad6c80c0622775d1a 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 2572aed80e7387c002ab08e7793d109b7bf86e5a..bf5d40ee4980eff209a0f054d929a5e6eb9bb103 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 169d64c4221b71208fbf1890dd9b81f7f6cbd616..08855565d124aadaee4115d0f11b2140823a4da5 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 0ce0f82605be3d608e67f191fe362286548b7ec0..8d3ba71bc9f2e59e1d2b50eec17002cc7ecc2e52 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;
 }