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

# Conflicts:
#	src/project.config.json

src/app.json

@@ -39,7 +39,8 @@
       "root": "subPackage/page",
       "pages": [
         "pages/subPage/subPage",
-        "pages/h5/h5page"
+        "pages/h5/h5page",
+        "pages/myRelease/myRelease"
       ]
     }
   ],

src/project.config.json

@@ -220,6 +220,14 @@
 					"id": -1,
 					"name": "推广商品",
 					"pathName": "pages/extendProduct/extendProduct",
+          "query": "",
+					"scene": null
+        },
+        {
+          "id": -1,
+					"name": "我的发布",
+					"pathName": "subPackage/page/pages/myRelease/myRelease",
+					"query": "",
 					"scene": null
 				}
 			]

src/subPackage/page/pages/myRelease/myRelease.js

+// subPackage/page/pages/myRelease/myRelease.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/myRelease/myRelease.json

+{
+  "navigationBarTitleText": "我的发布",
+  "usingComponents": {}
+}
\ No newline at end of file

src/subPackage/page/pages/myRelease/myRelease.wxml

+<!--subPackage/page/pages/myRelease/myRelease.wxml-->
+<text>subPackage/page/pages/myRelease/myRelease.wxml</text>

src/subPackage/page/pages/myRelease/myRelease.wxss

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