Merge branch 'dev_7.1.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.1.0

src/component/buyImageSwiper/buyImageSwiper.wxml

 <!--component/buyImageSwiper/buyImageSwiper.wxml-->
+<wxs src="../../wxs/utils.wxs" module="utils" />
 <view class="image-wrap">
   <swiper
     indicator-dots="{{indicatorDots}}"
@@ -11,7 +12,8 @@
   >
     <block wx:for="{{imageData}}" wx:key="{{item}}">
       <swiper-item class="swiper-item">
-        <image src="{{item.url}}" data-appid="{{item.id}}" data-path="{{item.link.url}}" data-link="{{item.link}}"  data-item="{{item}}" bindtap='preview' class="slide-image" />
+        <image src="{{item.url}}" wx:if="{{!item.videoUrl}}" data-appid="{{item.id}}" data-path="{{item.link.url}}" data-link="{{item.link}}"  data-item="{{item}}" bindtap='preview' class="slide-image" />
+        <video  class="slide-image" src="{{utils.formateUrl(item.videoUrl,baseImgUrl)}}" wx:if="{{item.videoUrl}}"  controls="true" autoplay="true"></video>
       </swiper-item>
     </block>
     

src/subPackage/page/pages/categoryPro/categoryPro.wxml

@@ -3,7 +3,9 @@
 	<view class="pro-nav-wrap">
 		<view class="nav-list">
       <block wx:for="{{navTab}}" wx:key="{{index}}">
-			  <view class="nav-item {{currentTab == item.type ? 'nav-active' : ''}}" bindtap="switchTab" data-type="{{item.type}}">{{item.name}}</view>
+			  <view class="nav-item {{currentTab == item.type ? 'nav-active' : ''}}" bindtap="switchTab" data-type="{{item.type}}">{{item.name}}
+        <!-- <image mode="widthFix" src="{{}}"></image> -->
+        </view>
       </block>
 		</view>
 		<view class="pro-style" bindtap="switchProStyle">

src/subPackage/page/pages/grassCommunity/grassCommunity.js

@@ -87,26 +87,28 @@ wxService.page({
 
   // 获取关联商品
   getInitPro(productIds){
-    wxService.post(`/sale/product/buyer/listPage?pageNo=${this.data.pageNo}&pageSize=${this.data.pageSize}`,{
-      productIds: productIds
-    }).then(res => {
-      const { result, data } = res.data
-      if (result == 0 && data.content) {
-        this.setData({
-          proGoods: data.content
-        })
-        let stcList = []
-        for (var i in this.data.proGoods) {
-          stcList.push({
-            commodityId: this.data.proGoods[i].productId
-          })
+    if (productIds && productIds.length > 0){
+      wxService.post(`/sale/product/buyer/listPage?pageNo=${this.data.pageNo}&pageSize=${this.data.pageSize}`,{
+        productIds: productIds
+      }).then(res => {
+        const { result, data } = res.data
+        if (result == 0 && data.content) {
           this.setData({
-            'params.stcList': stcList
+            proGoods: data.content
           })
+          let stcList = []
+          for (var i in this.data.proGoods) {
+            stcList.push({
+              commodityId: this.data.proGoods[i].productId
+            })
+            this.setData({
+              'params.stcList': stcList
+            })
+          }
         }
-      }
-    }).finally(() => {
-    })
+      }).finally(() => {
+      })
+    }
   },
 
   // 关联商品

src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.json

@@ -4,6 +4,7 @@
     "x-dialog": "/component/dialog/dialog",
     "card-modal": "/component/cardModal/cardModal",
     "go-home": "/component/goHome/goHome",
-    "x-html": "/component/html2wxml/wxHtml"
+    "x-html": "/component/html2wxml/wxHtml",
+    "buy-image-swiper": "/component/buyImageSwiper/buyImageSwiper"
   }
 }
\ No newline at end of file

src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.wxml

 <!--subPackage/page/pages/myReleaseDetail.wxml-->
 <view class="release-detail">
-	<view class="detail-img">
+	<!-- <view class="detail-img">
 		<image src="{{contentInfo.sspList[0].url}}" />
-	</view>
+	</view> -->
+  <buy-image-swiper bind:updatePage="updatePage" image-data="{{contentInfo.sspList}}" />
 	<view class="detail-content border_box">
 		<view class="detail-title">{{contentInfo.headline}}</view>
 		<view class="detail-desc"><x-html html="{{contentInfo.article}}" /></view>

src/utils/Http.js

@@ -109,7 +109,8 @@ class Http {
 
   post (url, parmas, channel) {
     let baseUserInfo = wx.getStorageSync('_baseUserInfo')
-
+    console.log('has base info ----',baseUserInfo)
+    console.log('header tentacle info ----', this.getTentacle())
     if(baseUserInfo){
       return this.request({
         url,
@@ -213,8 +214,10 @@ class Http {
       tentacle = storage.obj;
     }
     
+    console.log(tentacle)
+
     if (tentacle && TIME_EXPIRATION > time){
-      wx.setStorageSync('TIME_EXPIRATION', time)
+      wx.setStorageSync('TIME_EXPIRATION', time + 30*60*1000);
       return JSON.stringify(tentacle);
     }else{
       wx.removeStorageSync('TENTACLE_CONTENT')