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

Feature zyw sc

See merge request !64

src/app.json

@@ -41,6 +41,7 @@
         "pages/subPage/subPage",
         "pages/h5/h5page",
         "pages/myRelease/myRelease",
+        "pages/orderBenefit/orderBenefit",
         "pages/myReleaseDetail/myReleaseDetail"
       ]
     }

src/pages/extendProduct/extendProduct.wxml

@@ -90,27 +90,27 @@
           </view>
         </view>
          <view class="order-content">
-
-      <view class="order-list">
-        <view class="order-header">
-          <view class="order-number">
-            <text>时间</text>
+          <view class="order-list">
+            <view class="order-header">
+              <view class="order-number">
+                <text>时间</text>
+              </view>
+              <text class="order-status">查看收益</text>
+            </view>
+            <view class="pro-list">
+              <image class="pro-img"></image>
+              <image class="pro-img"></image>
+              <image class="pro-img"></image>
+              <image class="pro-img"></image>
+              <text class="pro-img-dot">...</text>
+            </view>
+            <view class="pro-number">
+              <text class="total-pro">促成订单 <text class="help-order">5</text> 笔</text>
+            </view>
+            
           </view>
-          <text class="order-status">查看收益</text>
-        </view>
-        <view class="pro-list">
-          <image class="pro-img"></image>
-          <image class="pro-img"></image>
-          <image class="pro-img"></image>
-          <image class="pro-img"></image>
-          <text class="pro-img-dot">...</text>
         </view>
-        <view class="pro-number">
-          <text class="total-pro">促成订单 <text class="help-order">5</text> 笔</text>
-        </view>
-        
-      </view>
-    </view>
+        <view class="loading-complete">已经到底啦！</view>
       </swiper-item>
 	</swiper>
 </view>

src/pages/extendProduct/extendProduct.wxss

@@ -229,6 +229,13 @@ swiper {
 .help-order{
   color: #cb3c3c;
 }
+.loading-complete{
+  font-size: 20rpx;
+  color: #AAAAAA;
+  position: fixed;
+  bottom: 11rpx;
+  left: 313rpx;
+}
 
 
 

src/subPackage/page/pages/orderBenefit/orderBenefit.js

+// subPackage/page/pages/orderBenefit/orderBenefit.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file

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>

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

+/* subPackage/page/pages/orderBenefit/orderBenefit.wxss */
\ No newline at end of file