半完成

components/order/commodity/index.js

@@ -5,13 +5,22 @@ Component({
         cprice: String,
         freight: String,
         goods: Array,
-        gid: String
+        gid: String,
+        type:String
     },
     data: {},
     methods: {
-        todetail() {
-            wx.navigateTo({
-                url: "/pages/undetermined/undetermined"
+        shouhuo(){
+            bin.getuserid().then((id)=>{
+                bin.request({
+                    url:"User/orderConfirm",
+                    urldata:{
+                        user_id:id,
+                        order_id:this.data.gid
+                    }
+                }).then((res)=>{
+                    console.log(res)
+                })
             })
         },
         cancel() {

components/order/commodity/index.wxml

@@ -1,12 +1,16 @@
-<view class="commodity" bindtap="todetail">
+<view class="commodity">
     <message wx:for="{{goods}}" title="{{item.goods_name}}" spec="{{item.spec_key_name}}" price="{{item.goods_price}}" num="{{item.goods_num}}" image="{{item.image}}"></message>
     <view class="aggregate">
         共计{{num}}件商品  合计:
         <text>￥{{cprice}}</text>
         (含运费￥{{freight}})
     </view>
-    <view class="operation">
+    <view class="operation" wx:if="{{type == 1}}">
         <view class="button" catch:tap="cancel">取消订单</view>
         <view class="button hlight" catch:tap="pay">立即付款</view>
     </view>
+       <view class="operation" wx:if="{{type == 3}}">
+        <!-- <view class="button" catch:tap="cancel">取消订单</view> -->
+        <view class="button hlight" catch:tap="shouhuo">确认收货</view>
+    </view>
 </view>

components/order/tab/index.js

@@ -5,6 +5,25 @@ Component({
     data: {
     },
     methods: {
+        receivingw(a){
+            // receiving
+            wx.navigateTo({
+                url: "/pages/receiving/receiving?id=" + a.target.dataset.id
+            })
+        },
+        receivings(a){
+             console.log(a)
+            wx.navigateTo({
+                url: "/pages/undetermined/undetermined?id=" + a.target.dataset.id
+            })
+        },
+        todetail(a) {
+            console.log(a)
+            // return ;
+            wx.navigateTo({
+                url: "/pages/particulars/particulars?id=" + a.target.dataset.id
+            })
+        },
         getorder(res){
             bin.request({
                 url:"User/getOrderList",
@@ -76,7 +95,10 @@ Component({
             bin.getuserid().then((res)=>{
               this.getorder(res)
             })
-        }    
+        }   ,
+        receiving(){
+
+        }
         
     },
     ready(){

components/order/tab/index.wxml

@@ -1,17 +1,17 @@
 <van-tabs class="tab" swipe-threshold="5">
-    <van-tab title="待付款">
-        <commodity wx:for="{{WAITPAY}}" wx:for-index="j" wx:key="{{j}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}" freight="{{item.integral_money}}" goods="{{item.goods_list}}" gid="{{item.order_id}}"></commodity>
+    <van-tab title="待付款" bind:tap="todetail">
+        <commodity wx:for="{{WAITPAY}}" wx:for-index="j" wx:key="{{j}}" data-id="{{item.order_id}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}" freight="{{item.integral_money}}" goods="{{item.goods_list}}" gid="{{item.order_id}}" type="1"></commodity>
     </van-tab>
-    <van-tab title="代发货">
-        <commodity wx:for="{{WAITSEND}}" wx:for-index="j" wx:key="{{j}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}" freight="{{item.integral_money}}" goods="{{item.goods_list}}"></commodity>
+    <van-tab title="待发货" bind:tap="receivings">
+        <commodity wx:for="{{WAITSEND}}" wx:for-index="j" wx:key="{{j}}" data-id="{{item.order_id}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}" freight="{{item.integral_money}}" goods="{{item.goods_list}}"></commodity>
     </van-tab>
-    <van-tab title="待收货">
-        <commodity wx:for="{{WAITRECEIVE}}" wx:for-index="j" wx:key="{{j}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}" freight="{{item.integral_money}}" goods="{{item.goods_list}}"></commodity>
+    <van-tab title="待收货" bind:tap="receivingw">
+        <commodity wx:for="{{WAITRECEIVE}}" wx:for-index="j" wx:key="{{j}}" type="3" data-id="{{item.order_id}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}" gid="{{item.order_id}}" freight="{{item.integral_money}}" goods="{{item.goods_list}}"></commodity>
     </van-tab>
-    <van-tab title="已完成">
-        <commodity wx:for="{{FINISH}}" wx:for-index="j" wx:key="{{j}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}" freight="{{item.integral_money}}" goods="{{item.goods_list}}"></commodity>
+    <van-tab title="已完成" bind:tap="receivingw">
+        <commodity wx:for="{{FINISH}}" wx:for-index="j" wx:key="{{j}}"  data-id="{{item.order_id}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}" freight="{{item.integral_money}}" goods="{{item.goods_list}}"></commodity>
     </van-tab>
     <van-tab title="售后">
-        <commodity wx:for="{{AFTERSALE}}" wx:for-index="j" wx:key="{{j}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}" freight="{{item.integral_money}}" goods="{{item.goods_list}}"></commodity>
+        <commodity wx:for="{{AFTERSALE}}" wx:for-index="j" wx:key="{{j}}"  data-id="{{item.order_id}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}" freight="{{item.integral_money}}" goods="{{item.goods_list}}"></commodity>
     </van-tab>
 </van-tabs>

components/particulars/content/index.js

@@ -1,5 +1,12 @@
 Component({
     properties: {
+        num:String,
+        price:String,
+        cprice:String,
+        number:String,
+        time:String,
+        text:String,
+        goods:Array
     },
     data: {
     },

components/particulars/content/index.wxml

@@ -1,24 +1,24 @@
 <view class="content">
-    <message></message>
+    <message wx:for="{{goods}}" wx:for-index="j" wx:key="{{j}}" image="{{item.image}}" title="{{item.goods_name}}" spec="{{item.spec_ley_name}}" price="{{item.goods_price}}"  num="{{item.goods_price}}"></message>
     <view class="aggregate">
-        共计1件商品  合计:
-        <text>￥29.80</text>
-        (含运费￥0.00)
+        共计{{num}}件商品  合计:
+        <text>￥{{price}}</text>
+        (含运费￥{{cprice}})
     </view>
     <view class="message">
         <text>订单编号</text>
-        <text>123456789123456789</text>
+        <text>{{number}}</text>
     </view>
     <view class="message">
         <text>下单时间</text>
-        <text>2018-10-01  18:00:06</text>
+        <text>{{time}}</text>
     </view>
     <view class="message">
         <text>配送方式</text>
-        <text>快递  免邮</text>
+        <text>快递 </text>
     </view>
     <view class="leave">
         <text>备注：</text>
-        <input type="text" placeholder="填写你需要对我们说的" />
+        <input type="text" placeholder="{{text}}" />
     </view>
 </view>

components/particulars/orderchooseaddr/index.js

@@ -1,5 +1,8 @@
 Component({
     properties: {
+        name:String,
+        phone:String,
+        addr:String
     },
     data: {
     },

components/particulars/orderchooseaddr/index.wxml

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

pages/particulars/particulars.js

@@ -1,18 +1,32 @@
 // pages/particulars/particulars.js
+import bin from "../../utils/bin"
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    list:{}
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    bin.getuserid().then((id)=>{
+      bin.request({
+          url:"User/getOrderDetail",
+          data:{
+              user_id:id,
+              id:options.id      
+          }
+      }).then((res)=>{
+          console.log(res)
+          this.setData({
+              list:res.data.result
+          })
+      })
+  })
   },
 
   /**

pages/particulars/particulars.wxml

@@ -1,5 +1,5 @@
 <view class="box">
-    <orderchooseaddr></orderchooseaddr>
-    <content></content>
+   <orderchooseaddr name="{{list.consignee}}" addr="{{list.address}}" phone="{{list.mobile}}"></orderchooseaddr>
+    <content num="{{list.num}}" price="{{list.goods_price}}" cprice="{{list.integral_money}}" number="{{list.order_sn}}" time="{{list.add_time}}" goods="{{list.goods_list}}" text="{{list.user_note}}"></content>
     <submit></submit>
 </view>

pages/receiving/receiving.js

@@ -1,18 +1,32 @@
 // pages/receiving/receiving.js
+import bin from "../../utils/bin"
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    
+    list:{}
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    bin.getuserid().then((id)=>{
+      bin.request({
+          url:"User/getOrderDetail",
+          data:{
+              user_id:id,
+              id:options.id      
+          }
+      }).then((res)=>{
+          console.log(res)
+          this.setData({
+              list:res.data.result
+          })
+      })
+  })
   },
 
   /**

pages/receiving/receiving.wxml

@@ -1,4 +1,4 @@
 <view class="box">
-    <orderchooseaddr></orderchooseaddr>
-    <content></content>
+    <orderchooseaddr name="{{list.consignee}}" addr="{{list.address}}" phone="{{list.mobile}}"></orderchooseaddr>
+    <content num="{{list.num}}" price="{{list.goods_price}}" cprice="{{list.integral_money}}" number="{{list.order_sn}}" time="{{list.add_time}}" goods="{{list.goods_list}}" text="{{list.user_note}}"></content>
 </view>

pages/undetermined/undetermined.js

@@ -1,18 +1,34 @@
 // pages/undetermined/undetermined.js
+import bin from "../../utils/bin"
 Page({
 
     /**
      * 页面的初始数据
      */
     data: {
-
+        list:{}
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad: function(options) {
-
+        
+        bin.getuserid().then((id)=>{
+            bin.request({
+                url:"User/getOrderDetail",
+                data:{
+                    user_id:id,
+                    id:options.id      
+                }
+            }).then((res)=>{
+                console.log(res)
+                this.setData({
+                    list:res.data.result
+                })
+            })
+        })
+        
     },
     chooseaddr() {
         wx.navigateTo({

pages/undetermined/undetermined.wxml

@@ -1,4 +1,4 @@
 <view class="box">
-    <orderchooseaddr bindtap="chooseaddr"></orderchooseaddr>
-    <content bindtap="todetail"></content>
+    <orderchooseaddr name="{{list.consignee}}" addr="{{list.address}}" phone="{{list.mobile}}"></orderchooseaddr>
+    <content num="{{list.num}}" price="{{list.goods_price}}" cprice="{{list.integral_money}}" number="{{list.order_sn}}" time="{{list.add_time}}" goods="{{list.goods_list}}" text="{{list.user_note}}"></content>
 </view>

utils/bin.js

@@ -11,7 +11,7 @@ let request = function (obj){
         name,
         urldata
     } = obj
-    url="http://daigou.sdbairui.com/index.php/WXAPI/" + url
+    url="https://daigou.sdbairui.com/index.php/WXAPI/" + url
     let text = ""
     for(let i in urldata){
         if(urldata[i] === ''){