Merge branch 'feature-zyw-sc' into 'dev_7.1.0'

Feature zyw sc

See merge request !65

src/project.config.json

@@ -39,7 +39,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 29,
+			"current": 30,
 			"list": [
 				{
 					"id": -1,
@@ -236,6 +236,12 @@
 					"pathName": "subPackage/page/pages/myReleaseDetail/myReleaseDetail",
 					"query": "",
 					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "订单收益",
+					"pathName": "subPackage/page/pages/orderBenefit/orderBenefit",
+					"scene": null
 				}
 			]
 		}

src/subPackage/page/pages/orderBenefit/orderBenefit.json

 {
   "navigationBarTitleText": "订单收益",
-  
   "usingComponents": {}
 }
\ No newline at end of file

src/subPackage/page/pages/orderBenefit/orderBenefit.wxml

 <!--subPackage/page/pages/orderBenefit/orderBenefit.wxml-->
-<text>subPackage/page/pages/orderBenefit/orderBenefit.wxml</text>
+<view class="page-order-benefit">
+  <view class="order-benefit-wrap">
+    <view class="order-benefit-list">
+      <view class="top-info">
+        <view class="order-num">订单号：334444444</view>
+        <view class="order-date">2019-03-24 至 2019-06-23</view>
+      </view>
+      <view class="bottom-info">
+        <view>
+          <image src="/assets/imgs/7_1_0/integral-icon.png" class="integral-icon" mode="widthFix"></image>
+          <text class="benefit-num">100</text>
+        </view>
+         <view>
+          <image src="/assets/imgs/7_1_0/coupon-icon.png" class="coupon-icon" mode="widthFix"></image>
+          <text class="benefit-num">100</text>
+        </view>
+         <view>
+          <image src="/assets/imgs/7_1_0/experience.png" class="experience-icon" mode="widthFix"></image>
+          <text class="benefit-num">100</text>
+        </view>
+         <view>
+          <image src="/assets/imgs/7_1_0/share-value.png" class="share-value" mode="widthFix"></image>
+          <text class="benefit-num">100</text>
+        </view>
+      </view>
+    </view>
+    <view class="order-benefit-list">
+      <view class="top-info">
+        <view class="order-num">订单号：334444444</view>
+        <view class="order-date">2019-03-24 至 2019-06-23</view>
+      </view>
+      <view class="bottom-info">
+        <view>
+          <image src="/assets/imgs/7_1_0/integral-icon.png" class="integral-icon" mode="widthFix"></image>
+          <text class="benefit-num">100</text>
+        </view>
+         <view>
+          <image src="/assets/imgs/7_1_0/coupon-icon.png" class="coupon-icon" mode="widthFix"></image>
+          <text class="benefit-num">100</text>
+        </view>
+         <view>
+          <image src="/assets/imgs/7_1_0/experience.png" class="experience-icon" mode="widthFix"></image>
+          <text class="benefit-num">100</text>
+        </view>
+         <view>
+          <image src="/assets/imgs/7_1_0/share-value.png" class="share-value" mode="widthFix"></image>
+          <text class="benefit-num">100</text>
+        </view>
+      </view>
+    </view>
+  </view>
+  <view class="benefit-tips">
+    <text>邀请好友只显示前50名</text>
+  </view>
+</view>

src/subPackage/page/pages/orderBenefit/orderBenefit.wxss

-/* subPackage/page/pages/orderBenefit/orderBenefit.wxss */
+/* subPackage/page/pages/orderBenefit/orderBenefit.wxss */
\ No newline at end of file
+.order-benefit-wrap{
+  margin-top: 8rpx;
+  padding: 0 20rpx;
+}
+.order-benefit-list{
+  border-radius: 10rpx;
+  background-color: rgba(255, 255, 255, 1);
+  box-shadow: 0px 0px 10rpx 0px rgba(0, 0, 0, 0.1);
+  padding: 33rpx 20rpx 36rpx;
+  margin-top: 20rpx;
+}
+.top-info{
+  border-bottom: 1px solid rgba(151,151,151,0.3);
+  padding: 0 0 15rpx 29rpx;
+}
+.order-num{
+  color: #666666;
+  font-size: 22rpx;
+}
+.order-date{
+  color: #aaaaaa;
+  font-size: 20rpx;
+  margin-top: 5rpx;
+}
+.bottom-info{
+  padding: 16rpx 60rpx 0 29rpx;
+  display: flex;
+  justify-content: space-between;
+}
+.integral-icon{
+  width: 36rpx;
+  vertical-align: middle;
+}
+.coupon-icon{
+  width: 29rpx;
+  height: 29rpx;
+  vertical-align: middle;
+}
+.experience-icon{
+  width: 51rpx;
+  vertical-align: middle;
+}
+.share-value{
+  width: 40rpx;
+  vertical-align: middle;
+}
+.benefit-num{
+  color: #333333;
+  font-size: 18rpx;
+  vertical-align: middle;
+  margin-left: 15rpx;
+}
+.benefit-tips{
+  width: 750rpx;
+  height: 53rpx;
+  background-color: rgba(0, 0, 0, 0.25);
+  position: fixed;
+  bottom: 0;
+  line-height: 53rpx;
+  color: #ffffff;
+  font-size: 20rpx;
+  text-align: center;
+}
\ No newline at end of file