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

src/component/sharePoster/sharePoster.wxml

-<view class="commodity_screen2" bindtap='closePoste'  style='opacity: 0.5;' wx:if="{{showpost}}"></view>
+<view class="commodity_screen2" bindtap='closePoste'  style='opacity: 0.5;' wx:if="{{showpost}}" catchtouchmove='false'></view>
 <view class='poste_box'  bindlongpress='saveShareImg' hidden='{{!showpost}}'>
   <view class='poste_content' id='canvas-container'>
     <canvas canvas-id="myCanvas" style="width:100%;height:{{imgHeight}}px;" />

src/component/sharePoster/sharePoster.wxss

@@ -152,7 +152,7 @@
   overflow: hidden;
   margin-top: 153rpx;
   background-color: #fff;
-  position: absolute;
+  position: fixed;
   top: 0;
   z-index: 9999;
   border-radius: 5rpx;
@@ -179,13 +179,13 @@
   border-radius: 50%;
 }*/
 .showImages{ 
-  position: absolute;
+  position: fixed;
   top: 0;
   width: 56rpx;
   height: 56rpx;
 }
 .save-poster{
-  position: absolute;
+  position: fixed;
   top: 909rpx;
   z-index: 9999;
   text-align: center;

src/pages/orderDetail/orderDetail.wxml

@@ -29,19 +29,19 @@
 			</view>
 		</view>
 	</view>
-	<view class="address-info">
+	<view class="address-info" wx:if="{{detail.member}}">
 		<view class="address-name">
-			<text>用户名称</text>
-			<text class="user-phone">83832578475</text>
+			<text>{{detail.member.name}}</text>
+			<text class="user-phone">{{detail.member.mobile}}</text>
 		</view>
 		<view class="address-detail">
-			上海市浦东新区碧波路690号
+			{{detail.member.address}}
 		</view>
-		<view class="edit-address">
+		<!-- <view class="edit-address">
 			<navigator url="/pages/addAddress/addAddress?id=1" hover-class="none">
 				<button class="btn btn-default btn-sm">修改地址</button>
 			</navigator>
-		</view>
+		</view> -->
 	</view>
 
 	<view class="pro-wrap">

src/pages/refundDetail/refundDetail.wxml

@@ -31,11 +31,11 @@
 		<view class="logistics-info">
 			<view class="logistics-item">
 				<text>物流公司</text>
-				<text class="company">xxxxxxx</text>
+				<text class="company">{{refundDetail.refundLogistic.supplierCode}}</text>
 			</view>
 			<view class="logistics-item">
 				<text>快递单号</text>
-				<text class="company">456575687686786</text>
+				<text class="company">{{refundDetail.refundLogistic.code}}</text>
 			</view>
 			<view class="write-logistics" bindtap="tapWriteLogis">
 				<button class="btn btn-primary btn-outline write-btn">填写物流信息</button>
@@ -87,16 +87,16 @@
 		</view>
 		<view class="refund-item">
 			<text class="refund-label">寄回信息</text>
-			<text class="refund-desc" selectable="true">物流原因物流原因物流原因物流原因物流原因物流原因物流原因物流原因物流原因物流原因</text>
-			<view class="copy" bindtap="copy" data-content="物流原因物流原因物流原因物流原因物流原因物流原因物流原因物流原因物流原因物流原因">复制</view>
+			<text class="refund-desc" selectable="true">{{refundDetail.refundLogistic.receiverAddress}}</text>
+			<view class="copy" bindtap="copy" data-content="{{refundDetail.refundLogistic.receiverAddress}}">复制</view>
 		</view>
 		<view class="refund-item">
 			<text class="refund-label">退货凭证</text>
 			<view class="refund-certificate">
-				<view class="refund-img">
-					<image src="/assets/imgs/7_1_0/address-line.png" />
+				<view class="refund-img" wx:for="{{refundDetail.proofImgUrls}}" wx:key="{{index}}">
+					<image src="{{item}}" />
 				</view>
-				<view class="refund-img">
+				<!-- <view class="refund-img">
 					<image src="/assets/imgs/7_1_0/address-line.png" />
 				</view>
 				<view class="refund-img">
@@ -107,7 +107,7 @@
 				</view>
 				<view class="refund-img">
 					<image src="/assets/imgs/7_1_0/address-line.png" />
-				</view>
+				</view> -->
 			</view>
 		</view>
 

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

@@ -261,6 +261,13 @@ wxService.page({
       })
       return;
     }
+    if (this.data.params.sspList && !this.data.params.sspList[0].url) {
+      wx.showToast({
+        title: '请上传至少一张图片',
+        icon: 'none'
+      })
+      return;
+    }
     if (!e.detail.value.headline){
       wx.showToast({
         title: '请添加标题',
@@ -274,7 +281,7 @@ wxService.page({
       'params.article': e.detail.value.article
     })
     this.data.params.sspList.forEach((item,index) => {
-      if(index == 0){
+      if (index == 0){
         item.cover = 1;
       }
     });

src/subPackage/page/pages/myInvite/myInvite.wxml

@@ -49,7 +49,7 @@
         </view>
       </view> -->
     </view>
-    <view class="empty">
+    <view class="empty" wx:if="{{!inviteMemberList || inviteMemberList.length < 1}}">
       暂无邀请记录~
     </view>
   </view>

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

 {
   "navigationBarTitleText": "种草详情",
   "usingComponents": {
-    "x-dialog": "/component/dialog/dialog",
+    "x-dialog": "/component/dialogGrass/dialog",
     "card-modal": "/component/cardModal/cardModal",
     "go-home": "/component/goHome/goHome",
     "x-html": "/component/html2wxml/wxHtml",