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

Feature zyw sc

See merge request !51

src/app.json

@@ -26,7 +26,8 @@
     "pages/productDetail/productDetail",
     "pages/confirmOrder/confirmOrder",
     "pages/myAddress/myAddress",
-    "pages/addAddress/addAddress"
+    "pages/addAddress/addAddress",
+    "pages/order/order"
   ],
   "subPackages": [
     {

src/app.wxss

@@ -22,6 +22,10 @@ page {
   background-color: #CB3C3C;
 }
 
+.theme-text-color{
+  color: #CB3C3C;
+}
+
 
 
 

src/pages/addAddress/addAddress.js

+
 // pages/addAddress/addAddress.js
 Page({
 

src/pages/category/category.wxml

@@ -17,7 +17,7 @@
 
     <block wx:for="{{navData}}" wx:key="{{i}}" wx:for-index="i" wx:for-item="menuFir">
       <view wx:for="{{menuFir.children}}" wx:key="{{j}}" wx:for-index="j" wx:for-item="menuSec" class="menu-item{{i == curMenu[0] && j == curMenu[1] ? ' active' : ''}}">
-        <view class="menu-name{{i == curMenu[0] && j == curMenu[1] ? ' active-text' : ''}}" data-i="{{i}}" data-j="{{j}}"
+        <view class="menu-name{{i == curMenu[0] && j == curMenu[1] ? ' theme-text-color' : ''}}" data-i="{{i}}" data-j="{{j}}"
         data-name1="{{menuFir.name}}" data-id1="{{menuFir.id}}" data-id2="{{menuSec.id}}"
         data-name2="{{menuSec.name}}" data-id="{{menuSec.id}}" bindtap="selectMenu">{{menuSec.name}}</view>
       </view>

src/pages/category/category.wxss

@@ -42,9 +42,6 @@ page {
   text-overflow: ellipsis;
   font-size: 26rpx; }
 
-.active-text{
-  color: #cB3C3C;
-}
 .nav-contents {
   flex: 1;
   width: 75%; }

src/pages/order/order.js

+// pages/order/order.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/pages/order/order.json

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

src/pages/order/order.wxml

+<!--pages/order/order.wxml-->
+<view class="order">
+  <view>
+  </view>
+</view>

src/pages/order/order.wxss

+/* pages/order/order.wxss */
\ No newline at end of file

src/project.config.json

@@ -39,7 +39,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 20,
+			"current": 21,
 			"list": [
 				{
 					"id": -1,
@@ -171,6 +171,13 @@
 					"id": -1,
 					"name": "我的地址",
 					"pathName": "pages/myAddress/myAddress",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "我的订单",
+					"pathName": "pages/order/order",
 					"scene": null
 				}
 			]