updata

pages/index/index.js

@@ -17,7 +17,6 @@ Page({
       act: 'index',
       op: 'tabs'
     }, function (res) {
-      console.log(res);
       if (res.code == 200) {
         self.getDatas(res.datas.tabs[0].special_id);
         self.setData({

pages/orderPaySn/orderPaySn.js

@@ -6,12 +6,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    goods_id: '',
-    ifcart: '',
-    num: '',
-    datas: {},
-    goods_list: [],
-    firstLoad: true,
+    order_info:{},
     defaultAddress: null
   },
 
@@ -19,47 +14,31 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    let goods_id = options.goods_id || ''
-    let iscart = options.iscart || ''
-    let num = options.num || ''
-    let cart_id = options.cart_id || ''
-    this.setData({
-      goods_id,
-      ifcart: iscart,
-      num
-    })
-    this.getDatas(goods_id, iscart, num, cart_id)
+    let pay_sn = options.pay_sn;
+    this.getDatas(pay_sn);
   },
-  getDatas(goods_id, ifcart, num, cart_id) {
+  getDatas(pay_sn) {
+    let self = this;
     wx.showLoading({
       title: '加载中',
     })
-    var self = this
-    let goods_datas = '';
-    if (ifcart == 0) {
-      goods_datas = goods_id + '|' + num;
-    }
-    else {
-      goods_datas = cart_id;
-    }
     getReq({
-      act: 'member_buy',
-      op: 'step_first',
-      curpage: 1,
-      cart_id: goods_datas,
-      ifcart,
+      act: 'member_order',
+      op: 'pay_info',
+      pay_sn: pay_sn
     }, function (res) {
-      wx.hideLoading()
+      wx.hideLoading();
       if (res.code == 200) {
-        let datas = res.datas
-        let goods_list = self.getGoodsList(datas.summary, datas.goods_list)
-        self.setData({
-          datas,
-          goods_list,
-          firstLoad: false,
-          defaultAddress: datas.address
-        })
-
+       console.log(res);
+       self.setData({
+         defaultAddress:{
+           mob_phone: res.datas.order.reciver_info.mob_phone,
+           true_name: res.datas.order.reciver_info.reciver_name,
+           area_info: res.datas.order.reciver_info.area,
+           address: res.datas.order.reciver_info.street
+         },
+         order_info: res.datas.order.order_info
+       });
       }
       else {
         wx.showToast({

pages/orderPaySn/orderPaySn.wxml

@@ -29,27 +29,13 @@
     </view>
   </view>
 
-  <view class="mt20 bacfff" wx:for="{{goods_list}}" wx:for-index="idx" wx:key="idx">
-    <view class="order_goods_content vux-1px-b">
-      <image class="order_content_img" src="{{item.goods_image_url}}"></image>
-      <view class="order_content_middle">
-        <view>{{item.goods_mobile_name}}</view>
-        <view class="order_letter_pro">{{item.goods_spec}}</view>
-        <view>
-          <text class="f30 coleb4e4f">¥{{item.act_type == 0?item.bonus_price:item.goods_promotion_price}}</text>
-          <text decode="{{true}}" class="cola7">&nbsp;&nbsp;天猫价{{item.goods_price}}</text>
-        </view>
-      </view>
-      <view class="order_content_nums">x{{item.goods_num}}</view>
-    </view>
-  </view>
   <view class="packet_price-tips bacfff" wx:if="{{datas.payinfo.gap_desc}}">{{datas.payinfo.gap_desc}}～</view>
   <view class="order_entry mt20">
     <view class="expenses_info">
       <view>商品总价</view>
-      <view class="coleb4e4f">¥ {{datas.payinfo['goods_amount']}}</view>
+      <view class="coleb4e4f">¥ {{order_info['goods_amount']}}</view>
     </view>
-    <view class="expenses_info" wx:for="{{datas.payinfo['bonus_rates']}}" wx:for-index="idx" wx:key="idx">
+    <view class="expenses_info" wx:for="{{order_info['bonus_rates']}}" wx:for-index="idx" wx:key="idx">
       <view>
         <text class="bonus_bg"><text class="bonus_rate">{{item.rate}}%</text></text>
         <text>红包抵扣</text>
@@ -58,16 +44,15 @@
     </view>
     <view class="expenses_info">
       <view>运费</view>
-      <view class="coleb4e4f">+ ¥ {{datas.payinfo['freight']}}</view>
+      <view class="coleb4e4f">+ ¥ {{order_info['shipping_fee']}}</view>
     </view>
   </view>
 
   <view class="order_pay">
-    <view class="default_address" wx:if="{{datas.address}}">配送至：{{datas.address.area_info}}{{datas.address.address}}</view>
     <view class="just_buy">
       <view class="just_buy_left">
         <text>应付: </text>
-        <text class="coleb4e4f">¥ {{datas.payinfo['pay_cash_pred']}}</text>
+        <text class="coleb4e4f">¥ {{order_info['pay_cash']}}</text>
       </view>
       <view class="just_buy_right">去付款</view>
     </view>

pages/order_tabs/orderTabs.js

@@ -333,7 +333,7 @@ Page({
       }
       case "if_payment": {
         wx.navigateTo({
-          url: `/pages/order_/confirmOrder?pay_sn=${pay_sn}`
+          url: `/pages/orderPaySn/orderPaySn?pay_sn=${pay_sn}`
         })
       }
 

pages/person/person.js

@@ -97,7 +97,7 @@ Page({
   },
   skip_all_order(){
     wx.navigateTo({
-      url: '/pages/order_tabs/orderTabs?state_type=""'
+      url: '/pages/order_tabs/orderTabs'
     })
   }
 })