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

Feature zyw sc

See merge request !52

src/app.json

@@ -39,7 +39,7 @@
     }
   ],
   "window": {
-    "backgroundTextStyle": "light",
+    "backgroundTextStyle": "dark",
     "navigationBarBackgroundColor": "#fff",
     "navigationBarTitleText": "WeChat",
     "navigationBarTextStyle": "black"

src/app.wxss

@@ -18,6 +18,8 @@ page {
   box-sizing: border-box;
 }
 
+/* 主题色 */
+
 .theme-color{
   background-color: #CB3C3C;
 }
@@ -26,6 +28,50 @@ page {
   color: #CB3C3C;
 }
 
+/* 按钮样式 */
+.btn{
+  width: 100%;
+  margin-left: 0;
+  margin-right: 0;
+  padding-left: 0;
+  padding-right: 0;
+
+}
+.btn:active{
+  opacity: 0.5;
+}
+.btn-default{
+  background: none;
+  color: #808080;
+  border: 1px solid #808080;
+}
+
+.btn-primary{
+  background-color: #CB3C3C;
+  color: #ffffff;
+  border: 1px solid #CB3C3C;
+}
+.btn-outline{
+  background: none;
+  color: #CB3C3C;
+}
+
+/* 按钮大小 */
+.btn-xs{
+  height: 39rpx;
+  line-height: 39rpx;
+}
+.btn-sm{
+  height: 46rpx;
+  line-height: 46rpx;
+
+}
+.btn-lg{
+  height: 88rpx;
+  line-height: 88rpx;
+
+}
+
 
 
 

src/pages/order/order.js

@@ -5,7 +5,29 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    swiperItem:[
+      {
+        type:'1',
+        name:'全部'
+      },
+      {
+        type: '2',
+        name: '待付款'
+      },
+      {
+        type: '3',
+        name: '待发货'
+      },
+      {
+        type: '4',
+        name: '待收货'
+      },
+      {
+        type: '5',
+        name: '退款/售后'
+      }
+    ],
+    currentIndex:1
   },
 
   /**
@@ -16,32 +38,19 @@ Page({
   },
 
   /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
 
   },
 
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
+  //点击切换tab
+  switchTab(e){
+    this.setData({
+      currentIndex: e.currentTarget.dataset.type
+    })
   },
 
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
 
   /**
    * 页面相关事件处理函数--监听用户下拉动作

src/pages/order/order.json

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

src/pages/order/order.wxml

 <!--pages/order/order.wxml-->
-<view class="order">
-  <view>
+
+<view class='page-order'>
+  <view class="swiper-tab">
+    <view class="swiper-tab-item {{currentIndex == item.type ? 'active' : ''}}" wx:for="{{swiperItem}}" wx:key="{{index}}" bindtap="switchTab" data-type="{{item.type}}">
+      {{item.name}}
+    </view>
   </view>
+  <scroll-view scroll-y="true">
+    <view class="order-content">
+
+      <view class="order-list">
+        <view class="order-header">
+          <view class="order-number">
+            <text>订单号</text>
+            <text class="number">784658743657</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>共5件商品</text>
+          <view>
+           实付 <text>￥480</text>
+          </view>
+        </view>
+        <view class="btn-group">
+          <button class="btn btn-sm btn-primary btn-outline ">立即支付</button>
+          <button class="btn btn-sm btn-default ">查看物流</button>
+          <button class="btn btn-sm btn-default ">确认收货</button>
+          <button class="btn btn-sm btn-primary btn-outline ">再来一单</button>
+          <button class="btn btn-sm btn-default ">删除订单</button>
+        </view>
+      </view>
+    </view>
+  </scroll-view>
 </view>

src/pages/order/order.wxss

-/* pages/order/order.wxss */
\ No newline at end of file
+/* pages/order/order.wxss */
+@import './../../base/base.wxss';
+page{
+  background: #f9f9f9;
+}
+scroll-view{
+  height: 100%;
+}
+
+.swiper-tab{
+  width: 580rpx;
+  display: flex;
+  background-color: #ffffff;
+  color: #000000;
+  position:fixed;
+  z-index:1;
+  justify-content: space-between;
+  padding: 24rpx 85rpx 0;
+}
+.swiper-tab-item{
+  padding: 14rpx 0; 
+  text-align: center;
+  font-size: 24rpx;
+  color: #787878;
+}
+.active{
+  color: #C09A74;
+}
+.order-content{
+  margin-top: 100rpx;
+  padding: 0 20rpx;
+}
+.order-list{
+  border-radius: 5rpx;
+  background-color: rgba(255, 255, 255, 1);
+  box-shadow: 0px 0px 8rpx 5rpx rgba(0, 0, 0, 0.05), 0px 0px 2rpx 0px rgba(0, 0, 0, 0.1);
+  padding: 24rpx 26rpx 30rpx 32rpx;  
+  margin-bottom: 20rpx;
+}
+.order-header{
+  border-bottom: 1px solid rgba(151,151,151,0.3);
+  display: flex;
+  padding: 0 0 14rpx 2rpx;
+  justify-content: space-between;
+}
+.order-number{
+  color: #808080;
+  font-size: 25rpx;
+}
+.order-number .number{
+  margin-left: 32rpx;
+}
+.order-status{
+  font-size: 26rpx;
+  color: #333333;
+}
+.pro-list{
+  margin-top: 14rpx;
+  display: flex;
+  justify-content: space-between;
+}
+.pro-img{
+  width: 140rpx;
+  height: 140rpx;
+  border:1px solid red;
+  vertical-align: middle;
+}
+.pro-img-dot{
+  display: inline-block;
+  vertical-align: middle;
+  line-height: 144rpx;
+}
+.pro-number{
+  margin-top: 25rpx;
+  display: flex;
+  justify-content: space-between;
+  padding-bottom: 12rpx;
+  border-bottom: 1px solid rgba(151,151,151,0.3);
+}
+.btn-group{
+  margin-top: 24rpx;
+  display: flex;
+  justify-content:flex-end;
+}
+.btn-group button{
+  width: 140rpx;
+  border-radius: 8rpx;
+  font-size: 24rpx; 
+  margin-left: 25rpx;
+}
+
+
+
+
+
+
+
+
+