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

src/component/uploadVideo/uploadVideo.wxml

@@ -14,6 +14,7 @@
 
 	<view class="upload-wrap" wx:if="{{!video}}" bindtap="chooseVideo">
 		<view class="upload-text">+视频</view>
+    <image class="video-img" mode="widthFix" src="/assets/imgs/7_1_0/video.png"></image>
 	</view>
 </view>
 

src/component/uploadVideo/uploadVideo.wxss

@@ -10,6 +10,7 @@
   border: 1px solid rgba(216, 216, 216, 1);
   line-height: 160rpx;
   text-align: center;
+  position: relative;
 }
 .upload-text{
   color: #aaaaaa;
@@ -40,4 +41,10 @@
   background: #ffffff;
   border-radius: 50%; 
   z-index: 99;
-  }
\ No newline at end of file
+  }
+.video-img{
+  width: 34rpx;
+  position: absolute;
+  bottom: 12rpx;
+  right: 12rpx;
+}
\ No newline at end of file

src/pages/extendProduct/extendProduct.wxml

@@ -6,7 +6,7 @@
 			推广商品
 			<view class="line" wx-if="{{currentTab==0}}" />
 		</view>
-		<view class="swiper-tab-item {{currentTab==1 ? 'active' : ''}}" data-current="1" bindtap="clickTab">我的推广
+		<view class="swiper-tab-item {{currentTab==1 ? 'active' : ''}}" data-current="1" bindtap="clickTab">我的分享
 			<view class="line" wx-if="{{currentTab==1}}" />
 		</view>
 	</view>
@@ -15,7 +15,7 @@
 			<swiper-item > -->
 	<scroll-view scroll-y wx:if="{{currentTab==0}}">
 		<view class="extend-img">
-			<image mode="widthFix" src="{{extendProBanner}}" />
+			<image mode="widthFix" src="{{extendProBanner ? extendProBanner : '/assets/imgs/7_1_0/coming-soon.jpg'}}" />
 		</view>
 		<view class="pro-nav-wrap">
 			<view class="nav-list">

src/subPackage/page/pages/grassCommunity/grassCommunity.wxml

@@ -18,7 +18,7 @@
       </view>
     </view>
 
-    <view class="upload-tip">*只支持.jpg格式图片/ .mp4格式视频，最长60s</view>
+    <view class="upload-tip">*只支持.jpg、png、gif、kpge格式图片/ .mp4、m3u8格式视频，最长60s</view>
     <view class="title-border">
       <input placeholder="添加标题" name="headline" value="{{params.headline}}" />
     </view>
@@ -26,7 +26,10 @@
       <input placeholder="这一刻想说什么..." name="article" value="{{params.article}}" />
     </view>
 
-    <view class="related-goods" bindtap="handleRelatedGoods">关联商品</view>
+    <view class="related-goods" bindtap="handleRelatedGoods">
+      <image class="relate-img" mode="widthFix" src="/assets/imgs/7_1_0/relation.png"></image>
+      <text class="relate-text">关联商品</text> 
+      </view>
     <view class="gress-list">
       <grass-item pro-goods="{{proGoods}}"/>
     </view>

src/subPackage/page/pages/grassCommunity/grassCommunity.wxss

@@ -28,18 +28,20 @@ page{
 }
 .title-border {
   height: 66rpx;
+  line-height: 66rpx;
   border-bottom: 1px solid rgba(151, 151, 151, 0.3);
 }
+.title-border input{
+  height: 66rpx;
+}
 .related-goods {
   width: 189rpx;
   height: 54rpx;
-  line-height: 54rpx;
+  line-height: 50rpx;
   text-align: center;
   border-radius: 31rpx;
   background-color: rgba(216, 216, 216, 1);
-  color: rgba(0, 0, 0, 1);
-  font-size: 26rpx;
-  font-family: PingFangSC-Medium;
+  
   margin-top: 97rpx;
 }
 .gress-list {
@@ -95,4 +97,14 @@ page{
   background: #ffffff;
   border-radius: 50%; }
 
-
+.relate-img{
+  width: 23rpx;
+  margin-right: 10rpx;
+  vertical-align: middle;
+}
+.relate-text{
+  color: rgba(0, 0, 0, 1);
+  font-size: 26rpx;
+  font-family: PingFangSC-Medium;
+  vertical-align: middle;
+}

src/subPackage/page/pages/share/share.wxml

@@ -9,6 +9,7 @@
       <swiper-item class="swiper-item">
         <image class="slide-image {{swiperCurrent == index ? 'active' : ''}}" src="{{item}}" 
   id="{{index}}"></image>
+        <view class=""></view>
         <image wx:if="{{swiperCurrent == index}}" class="code-img" src="{{codeImg}}"></image>
       </swiper-item>
       </block>