Merge branch 'pplok' of pplokijuhyg/deguodaigou into master

README.md

@@ -45,6 +45,27 @@
 
 - pages/addaddress/addaddress 添加地址 <br>
     - addaddress/shuru  添加地址的输入的每一项
+-  pages/particulars/particulars 待付款 <br>
+    - particulars/orderchooseaddr 地址
+    - particulars/content 中间所有
+    - particulars/submit 支付
+- pages/undetermined/undetermined 代发货 <br>
+    - particulars/orderchooseaddr 地址
+    - particulars/content 中间所有
+- pages/receiving/receiving 待收货 <br>
+    - particulars/orderchooseaddr 地址
+    - particulars/content 中间所有
+- pages/status/status 物流信息 <br>
+    - order/message 商品信息
+    - particulars/logistics 物流信息
+- pages/receiving/receiving 已完成 <br>
+    - particulars/orderchooseaddr 地址
+    - particulars/content 中间所有
+    - particulars/logistics 物流信息
+- pages/sales1/sales1 退货1 <br>
+    - sales/merchandises 商品信息
+- pages/sales2/sales2 退货3 <br>
+    - sales/merchandises 商品信息
 
 - pages/member/member 会员商品 <br>
     - member/membertop 会员商品顶部的字

app.json

@@ -1,28 +1,36 @@
 {
-    "pages": [
+  "pages": [
-        "pages/share/share",
+    "pages/index/index",
-        "pages/yongjin/yongjin",
+    "pages/search/search",
-        "pages/yue/yue",
+    "pages/shopping/shopping",
-        "pages/member/member",
+    "pages/classify/classify",
-        "pages/addaddress/addaddress",
+    "pages/product/product",
-        "pages/chooseaddr/chooseaddr",
+    "pages/personal/personal",
-        "pages/order/order",
+    "pages/message/message",
-        "pages/orderconfirm/orderconfirm",
+    "pages/orderconfirm/orderconfirm",
-        "pages/message/message",
+    "pages/order/order",
-        "pages/personal/personal",
+    "pages/chooseaddr/chooseaddr",
-        "pages/product/product",
+    "pages/addaddress/addaddress",
-        "pages/classify/classify",
+    "pages/particulars/particulars",
-        "pages/shopping/shopping",
+    "pages/undetermined/undetermined",
-        "pages/search/search",
+    "pages/receiving/receiving",
-        "pages/index/index"
+    "pages/status/status",
-
+    "pages/accomplish/accomplish",
-    ],
+    "pages/sales1/sales1",
-    "window": {
+    "pages/sales2/sales2",
-        "backgroundTextStyle": "light",
+    "pages/member/member",
-        "navigationBarBackgroundColor": "#fff",
+    "pages/yue/yue",
-        "navigationBarTitleText": "WeChat",
+    
-        "navigationBarTextStyle": "black"
+    "pages/yongjin/yongjin",
-    },
+    
-    "style": "v2",
+    "pages/share/share"
-    "sitemapLocation": "sitemap.json"
+  ],
+  "window": {
+    "backgroundTextStyle": "light",
+    "navigationBarBackgroundColor": "#fff",
+    "navigationBarTitleText": "WeChat",
+    "navigationBarTextStyle": "black"
+  },
+  "style": "v2",
+  "sitemapLocation": "sitemap.json"
 }

app.wxss

@@ -346,4 +346,8 @@ template {
 
 [hidden] {
   display: none;
+}
+image{
+  background-size: cover;
+  background-image: url('http://luyuan.tk/static/images/TIM%E5%9B%BE%E7%89%8720191214113605.jpg');
 }

components/member/membershop/membershop.wxml

@@ -1,5 +1,5 @@
 <view class="membershop">
-    <view class="pic"></view>
+    <image class="pic"></image>
     <view class="shopname">产品名产品名产品名
 产品名产品名</view>
 <view class="pri">$123</view>

components/orderconfirm/ordershopinfo/ordershopinfo.wxml

@@ -1,5 +1,5 @@
 <view class="shopinfo">
-    <view class="pic"></view>
+    <image class="pic"></image>
     <view class="right">
         <view class="shopname">产品产品产品产品产品产品产品产品产品产品产品产品产品</view>
         <view class="down">

components/particulars/content/index.js

@@ -0,0 +1,8 @@
+Component({
+    properties: {
+    },
+    data: {
+    },
+    methods: {
+    }
+})

components/particulars/content/index.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "message":"../../order/message/index"
+  }
+}

components/particulars/content/index.scss

@@ -0,0 +1,38 @@
+.content {
+  background-color: #fff;
+  width: 750rpx;
+  // height: ;
+  padding-bottom: 33rpx;
+
+  .aggregate {
+    display: flex;
+    box-sizing: border-box;
+    padding: 30rpx;
+    justify-content: flex-end;
+    font-size: 22rpx;
+    color: #999;
+    height: 78rpx;
+    border-bottom: 1rpx solid #f2f2f2;
+
+    > text {
+      color: #333;
+      margin: 0 5rpx;
+    }
+  }
+  .message {
+    display: flex;
+    padding: 0 30rpx;
+    justify-content: space-between;
+    font-size: 26rpx;
+    color: #333;
+    align-items: center;
+    height: 77rpx;
+    border-bottom: 1rpx solid #f2f2f2;
+  }
+  .leave {
+    display: flex;
+    height: 77rpx;
+    padding: 0 30rpx;
+    align-items: center;
+  }
+}

components/particulars/content/index.wxml

@@ -0,0 +1,24 @@
+<view class="content">
+    <message></message>
+    <view class="aggregate">
+        共计1件商品  合计:
+        <text>￥29.80</text>
+        (含运费￥0.00)
+    </view>
+    <view class="message">
+        <text>订单编号</text>
+        <text>123456789123456789</text>
+    </view>
+    <view class="message">
+        <text>下单时间</text>
+        <text>2018-10-01  18:00:06</text>
+    </view>
+    <view class="message">
+        <text>配送方式</text>
+        <text>快递  免邮</text>
+    </view>
+    <view class="leave">
+        <text>备注：</text>
+        <input type="text" placeholder="填写你需要对我们说的" />
+    </view>
+</view>

components/particulars/content/index.wxss

@@ -0,0 +1 @@
+.content{background-color:#fff;width:750rpx;padding-bottom:33rpx}.content .aggregate{display:flex;box-sizing:border-box;padding:30rpx;justify-content:flex-end;font-size:22rpx;color:#999;height:78rpx;border-bottom:1rpx solid #f2f2f2}.content .aggregate>text{color:#333;margin:0 5rpx}.content .message{display:flex;padding:0 30rpx;justify-content:space-between;font-size:26rpx;color:#333;align-items:center;height:77rpx;border-bottom:1rpx solid #f2f2f2}.content .leave{display:flex;height:77rpx;padding:0 30rpx;align-items:center}

components/particulars/logistics/index.js

@@ -0,0 +1,26 @@
+Component({
+    properties: {
+    },
+    data: {
+        steps: [
+            {
+              text: '步骤一',
+              desc: '描述信息'
+            },
+            {
+              text: '步骤二',
+              desc: '描述信息'
+            },
+            {
+              text: '步骤三',
+              desc: '描述信息'
+            },
+            {
+              text: '步骤四',
+              desc: '描述信息'
+            }
+          ]
+    },
+    methods: {
+    }
+})

components/particulars/logistics/index.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-steps": "../utils/dist/steps/index"
+  }
+}

components/particulars/logistics/index.scss

@@ -0,0 +1,17 @@
+.logistics{
+  margin-top: 20rpx;
+  background-color: #fff;
+  .title{
+    height: 84rpx;
+    font-size: 28rpx;
+    color: #333;
+    line-height: 84rpx;
+    border-bottom: 2rpx solid #e5e5e5;
+    padding-left: 29rpx;
+    box-sizing: border-box;
+  }
+  .schedule{
+    width: 650rpx;
+    margin-left: 50rpx;
+  }
+}

components/particulars/logistics/index.wxml

@@ -0,0 +1,4 @@
+  <view class="logistics">
+        <view class="title">物流追踪</view>
+        <van-steps steps="{{ steps }}" active="{{ 1 }}" direction="vertical" active-color="#47C877" class="schedule"  />
+    </view>

components/particulars/logistics/index.wxss

@@ -0,0 +1 @@
+.logistics{margin-top:20rpx;background-color:#fff}.logistics .title{height:84rpx;font-size:28rpx;color:#333;line-height:84rpx;border-bottom:2rpx solid #e5e5e5;padding-left:29rpx;box-sizing:border-box}.logistics .schedule{width:650rpx;margin-left:50rpx}

components/particulars/orderchooseaddr/index.js

@@ -0,0 +1,8 @@
+Component({
+    properties: {
+    },
+    data: {
+    },
+    methods: {
+    }
+})

components/particulars/orderchooseaddr/index.json

@@ -0,0 +1,3 @@
+{
+  "component": true
+}

components/particulars/orderchooseaddr/index.scss

@@ -0,0 +1,35 @@
+.orderchooseaddr {
+  background-color: #fff;
+  width: 750rpx;
+  height: 148rpx;
+  margin: 0 auto;
+  border-bottom: 20rpx solid #fbfbfb;
+  display: flex;
+  justify-content: space-between;
+  .left {
+    width: 572rpx;
+    height: 80rpx;
+    .userinfo {
+      color: #333333;
+      font-size: 26rpx;
+      text-indent: 30rpx;
+      margin-top: 41rpx;
+      display: flex;
+      justify-content: space-between;
+    }
+    .addr {
+      color: #999999;
+      font-size: 24rpx;
+      text-indent: 30rpx;
+      margin-top: 32rpx;
+    }
+  }
+  .right {
+    width: 17rpx;
+    height: 30rpx;
+    background-color: #d3d3d3;
+    margin: auto 0;
+    margin-right: 19rpx;
+  }
+}
+

components/particulars/orderchooseaddr/index.wxml

@@ -0,0 +1,10 @@
+<view class="orderchooseaddr">
+        <view class="left">
+            <view class="userinfo">
+                <text class="username">于于宇  15698857895</text>
+                <text></text>
+            </view>
+            <view class="addr">中国大陆 山东省 青岛市 即墨区 纯阳路 某某某小区</view>
+        </view>
+        <view class="right"></view>
+    </view>

components/particulars/orderchooseaddr/index.wxss

@@ -0,0 +1 @@
+.orderchooseaddr{background-color:#fff;width:750rpx;height:148rpx;margin:0 auto;border-bottom:20rpx solid #fbfbfb;display:flex;justify-content:space-between}.orderchooseaddr .left{width:572rpx;height:80rpx}.orderchooseaddr .left .userinfo{color:#333333;font-size:26rpx;text-indent:30rpx;margin-top:41rpx;display:flex;justify-content:space-between}.orderchooseaddr .left .addr{color:#999999;font-size:24rpx;text-indent:30rpx;margin-top:32rpx}.orderchooseaddr .right{width:17rpx;height:30rpx;background-color:#d3d3d3;margin:auto 0;margin-right:19rpx}

components/particulars/submit/index.js

@@ -0,0 +1,8 @@
+Component({
+    properties: {
+    },
+    data: {
+    },
+    methods: {
+    }
+})

components/particulars/submit/index.json

@@ -0,0 +1,3 @@
+{
+  "component": true
+}

components/particulars/submit/index.scss

@@ -0,0 +1,29 @@
+.payment {
+  width: 750rpx;
+  height: 98rpx;
+  position: fixed;
+  bottom: 0;
+  display: flex;
+  justify-content: space-between;
+  background-color: #fff;
+  align-items: center;
+  .price {
+    font-size: 34rpx;
+    margin-left: 74rpx;
+    .title {
+      color: #333;
+    }
+    .counts{
+      color: #ff3838;
+    }
+  }
+  .submit {
+    width: 250rpx;
+    height: 98rpx;
+    background-color: #47c877;
+    font-size: 30rpx;
+    color: #fff;
+    line-height: 98rpx;
+    text-align: center;
+  }
+}

components/particulars/submit/index.wxml

@@ -0,0 +1,7 @@
+ <view class="payment">
+        <view class="price">
+            <text class="title">总付款：</text>
+            <text class="counts">￥29</text>
+        </view>
+        <view class="submit">立即支付</view>
+    </view>

components/particulars/submit/index.wxss

@@ -0,0 +1 @@
+.payment{width:750rpx;height:98rpx;position:fixed;bottom:0;display:flex;justify-content:space-between;background-color:#fff;align-items:center}.payment .price{font-size:34rpx;margin-left:74rpx}.payment .price .title{color:#333}.payment .price .counts{color:#ff3838}.payment .submit{width:250rpx;height:98rpx;background-color:#47c877;font-size:30rpx;color:#fff;line-height:98rpx;text-align:center}

components/seles/merchandises/index.js

@@ -0,0 +1,8 @@
+Component({
+    properties: {
+    },
+    data: {
+    },
+    methods: {
+    }
+})

components/seles/merchandises/index.json

@@ -0,0 +1,5 @@
+{
+  "component": true,
+  "usingComponents": {
+  }
+}

components/seles/merchandises/index.scss

@@ -0,0 +1,28 @@
+.merchandise {
+  padding: 46rpx 32rpx;
+  display: flex;
+  border-bottom: 20rpx solid #fbfbfb;
+  .image {
+    width: 171rpx;
+    height: 168rpx;
+    background-color: #000;
+  }
+  .message {
+    margin-left: 24rpx;
+    .title {
+      font-size: 26rpx;
+      color: #333;
+      width: 491rpx;
+      margin-bottom: 9rpx;
+    }
+    .brief {
+      font-size: 22rpx;
+      color: #999;
+      margin-bottom: 26rpx;
+    }
+    .price {
+      font-size: 28rpx;
+      color: #ff4e6c;
+    }
+  }
+}

components/seles/merchandises/index.wxml

@@ -0,0 +1,8 @@
+<view class="merchandise">
+        <image class="image"></image>
+        <view class="message">
+            <view class="title">雅诗兰黛肌透修护密集精华眼膜 4对棕色瓶修护 真空眼膜</view>
+            <view class="brief">肌透眼膜4片</view>
+            <view class="price">￥820.00</view>
+        </view>
+    </view>

components/seles/merchandises/index.wxss

@@ -0,0 +1 @@
+.merchandise{padding:46rpx 32rpx;display:flex;border-bottom:20rpx solid #fbfbfb}.merchandise .image{width:171rpx;height:168rpx;background-color:#000}.merchandise .message{margin-left:24rpx}.merchandise .message .title{font-size:26rpx;color:#333;width:491rpx;margin-bottom:9rpx}.merchandise .message .brief{font-size:22rpx;color:#999;margin-bottom:26rpx}.merchandise .message .price{font-size:28rpx;color:#ff4e6c}

components/yue/share/share.wxml

@@ -1,7 +1,7 @@
 <view class="box">
     <view class="img"></view>
     <view class="yongjintop">
-        <view class="photo"></view>
+        <image class="photo"></image>
         <view class="tel">
             <view>156***578</view>
             <view class="mingpian">我的名片</view>

components/yue/yongjintop/yongjintop.wxml

@@ -1,6 +1,6 @@
 <view class="box">
     <view class="yongjintop">
-        <view class="photo"></view>
+        <image class="photo"></image>
         <view class="tel">156***578</view>
     </view>
 </view>

pages/accomplish/accomplish.js

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

pages/accomplish/accomplish.json

@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "content":"../components/particulars/content/index",
+    "orderchooseaddr":"../components/particulars/orderchooseaddr/index",
+    "logistics": "../components/particulars/logistics/index"
+  }
+}

pages/accomplish/accomplish.scss

@@ -0,0 +1,4 @@
+.box{}
+page{
+    background-color: #fbfbfb;
+}

pages/accomplish/accomplish.wxml

@@ -0,0 +1,5 @@
+<view class="box">
+    <orderchooseaddr></orderchooseaddr>
+    <content></content>
+    <logistics></logistics>
+</view>

pages/accomplish/accomplish.wxss

@@ -0,0 +1 @@
+page{background-color:#fbfbfb}

pages/particulars/particulars.js

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

pages/particulars/particulars.json

@@ -0,0 +1,8 @@
+{
+  "usingComponents": {
+    "content":"../components/particulars/content/index",
+    "orderchooseaddr":"../components/particulars/orderchooseaddr/index",
+    "submit":"../components/particulars/submit/index"
+
+  }
+}

pages/particulars/particulars.scss

@@ -0,0 +1,7 @@
+.box {
+  
+  
+}
+page {
+  background-color: #fbfbfb;
+}

pages/particulars/particulars.wxml

@@ -0,0 +1,5 @@
+<view class="box">
+    <orderchooseaddr></orderchooseaddr>
+    <content></content>
+    <submit></submit>
+</view>

pages/particulars/particulars.wxss

@@ -0,0 +1 @@
+page{background-color:#fbfbfb}

pages/receiving/receiving.js

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

pages/receiving/receiving.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "content":"../components/particulars/content/index",
+    "orderchooseaddr":"../components/particulars/orderchooseaddr/index"
+  }
+}

pages/receiving/receiving.scss

@@ -0,0 +1,7 @@
+.box {
+
+  
+}
+page {
+  background-color: #fbfbfb;
+}

pages/receiving/receiving.wxml

@@ -0,0 +1,4 @@
+<view class="box">
+    <orderchooseaddr></orderchooseaddr>
+    <content></content>
+</view>

pages/receiving/receiving.wxss

@@ -0,0 +1 @@
+page{background-color:#fbfbfb}

pages/sales1/sales1.js

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

pages/sales1/sales1.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "merchandise":"../components/seles/merchandises/index"
+  }
+}

pages/sales1/sales1.scss

@@ -0,0 +1,48 @@
+.box {
+  border-top: 1rpx solid #eee;
+  
+  .fill {
+    padding: 42rpx 30rpx;
+    box-sizing: border-box;
+    .cause {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: 45rpx;
+      .title {
+        font-size: 26rpx;
+        color: #333;
+      }
+      .select {
+        font-size: 26rpx;
+        color: #999;
+      }
+    }
+    .upload {
+      .title {
+        font-size: 26rpx;
+        color: #333;
+        margin-bottom: 45rpx;
+      }
+      .img {
+        width: 187rpx;
+        height: 187rpx;
+        border: 1rpx solid rgba(229, 229, 229, 1);
+        border-radius: 6rpx;
+      }
+    }
+   
+  }
+  .submit{
+    width: 650rpx;
+    height: 98rpx;
+    border-radius: 49rpx;
+    background-color: #47C877;
+    line-height: 98rpx;
+    text-align: center;
+    color: #fff;
+    font-size:36rpx;
+    margin-top: 67rpx;
+    margin-left: 50rpx;
+}
+}

pages/sales1/sales1.wxml

@@ -0,0 +1,16 @@
+<view class="box">
+    <merchandise></merchandise>
+    <view class="fill">
+        <view class="cause">
+            <view class="title">退货原因</view>
+            <view class="select">请选择 ></view>
+        </view>
+        <view class="upload">
+            <view class="title">添加照片（选填）</view>
+            <view class="img">
+
+            </view>
+        </view>
+    </view>
+    <view class="submit">提交</view>
+</view>

pages/sales1/sales1.wxss

@@ -0,0 +1 @@
+.box{border-top:1rpx solid #eee}.box .fill{padding:42rpx 30rpx;box-sizing:border-box}.box .fill .cause{display:flex;justify-content:space-between;align-items:center;margin-bottom:45rpx}.box .fill .cause .title{font-size:26rpx;color:#333}.box .fill .cause .select{font-size:26rpx;color:#999}.box .fill .upload .title{font-size:26rpx;color:#333;margin-bottom:45rpx}.box .fill .upload .img{width:187rpx;height:187rpx;border:1rpx solid #e5e5e5;border-radius:6rpx}.box .submit{width:650rpx;height:98rpx;border-radius:49rpx;background-color:#47C877;line-height:98rpx;text-align:center;color:#fff;font-size:36rpx;margin-top:67rpx;margin-left:50rpx}

pages/sales2/sales2.js

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

pages/sales2/sales2.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": { "merchandise":"../components/seles/merchandises/index"}
+}

pages/sales2/sales2.scss

@@ -0,0 +1,34 @@
+.box{
+    border-top: 1rpx solid #efefef;
+    .info{
+        border-bottom: 1rpx solid #efefef;
+        padding: 29rpx;
+        box-sizing: border-box;
+        .title{
+            font-size: 26rpx;
+            color: #333;
+            margin-bottom: 22rpx;
+        }
+        .msg{
+            font-size: 24rpx;
+            color: #999;
+        }
+    }
+    .submit{
+        display: flex;
+        margin-top: 36rpx;
+        padding: 0 30rpx;
+        justify-content: flex-end;
+        .button{
+            width: 133rpx;
+            height: 51rpx;
+            border: 1rpx solid #47C877;
+            border-radius: 25rpx;
+            color: #47C877;
+            font-size: 22rpx;
+            line-height: 51rpx;
+            text-align: center;
+            margin-left: 8rpx;
+        }
+    }
+}

pages/sales2/sales2.wxml

@@ -0,0 +1,15 @@
+<view class="box">
+    <view class="info">
+        <view class="title">等待商家处理</view>
+        <view class="msg">请耐心等待</view>
+    </view>
+    <merchandise></merchandise>
+    <view class="info">
+        <view class="title">退货原因:  拍多/多拍/不想要</view>
+        <view class="title">申请时间：2019-07-21  11:23:21</view>
+    </view>
+    <view class="submit">
+        <view class="button">修改申请</view>
+        <view class="button">取消申请</view>
+    </view>
+</view>

pages/sales2/sales2.wxss

@@ -0,0 +1 @@
+.box{border-top:1rpx solid #efefef}.box .info{border-bottom:1rpx solid #efefef;padding:29rpx;box-sizing:border-box}.box .info .title{font-size:26rpx;color:#333;margin-bottom:22rpx}.box .info .msg{font-size:24rpx;color:#999}.box .submit{display:flex;margin-top:36rpx;padding:0 30rpx;justify-content:flex-end}.box .submit .button{width:133rpx;height:51rpx;border:1rpx solid #47C877;border-radius:25rpx;color:#47C877;font-size:22rpx;line-height:51rpx;text-align:center;margin-left:8rpx}

pages/status/status.js

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

pages/status/status.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "logistics": "../components/particulars/logistics/index",
+    "message":"../components/order/message/index"
+  }
+}

pages/status/status.scss

@@ -0,0 +1,11 @@
+.box {
+  .reference {
+    font-size: 24rpx;
+    color: #999;
+    padding: 32rpx 20rpx;
+    background-color: #fff;
+  }
+}
+page {
+  background-color: #fbfbfb;
+}

pages/status/status.wxml

@@ -0,0 +1,7 @@
+<view class="box">
+    <view class="reference">
+        订单编号：1234567812345789
+        <message></message>
+    </view>
+    <logistics></logistics>
+</view>

pages/status/status.wxss

@@ -0,0 +1 @@
+.box .reference{font-size:24rpx;color:#999;padding:32rpx 20rpx;background-color:#fff}page{background-color:#fbfbfb}

pages/undetermined/undetermined.js

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

pages/undetermined/undetermined.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "content":"../components/particulars/content/index",
+    "orderchooseaddr":"../components/particulars/orderchooseaddr/index"
+  }
+}

pages/undetermined/undetermined.scss

@@ -0,0 +1,6 @@
+page{
+    background-color: #FBFBFB;
+}
+.box{
+    
+}

pages/undetermined/undetermined.wxml

@@ -0,0 +1,4 @@
+<view class="box">
+    <orderchooseaddr></orderchooseaddr>
+    <content></content>
+</view>

pages/undetermined/undetermined.wxss

@@ -0,0 +1 @@
+page{background-color:#FBFBFB}