小程序开发

public/appmini/old/alipay/pages/user-order-detail/user-order-detail.js

@@ -64,7 +64,7 @@ Page({
               {name: "支付时间", value: data.data.pay_time || ''},
               {name: "发货时间", value: data.data.delivery_time || ''},
               {name: "收货时间", value: data.data.collect_time || ''},
-              {name: "取消时间", value: data.data.close_time || ''},
+              {name: "取消时间", value: data.data.cancel_time || ''},
               {name: "关闭时间", value: data.data.close_time || ''},
             ],
             extension_data: data.data.extension_data || [],

public/appmini/old/baidu/pages/user-order-detail/user-order-detail.js

@@ -61,7 +61,7 @@ Page({
               {name: "支付时间", value: data.data.pay_time || ''},
               {name: "发货时间", value: data.data.delivery_time || ''},
               {name: "收货时间", value: data.data.collect_time || ''},
-              {name: "取消时间", value: data.data.close_time || ''},
+              {name: "取消时间", value: data.data.cancel_time || ''},
               {name: "关闭时间", value: data.data.close_time || ''},
             ],
             extension_data: data.data.extension_data || [],

public/appmini/old/qq/pages/user-order-detail/user-order-detail.js

@@ -62,7 +62,7 @@ Page({
               {name: "支付时间", value: data.data.pay_time || ''},
               {name: "发货时间", value: data.data.delivery_time || ''},
               {name: "收货时间", value: data.data.collect_time || ''},
-              {name: "取消时间", value: data.data.close_time || ''},
+              {name: "取消时间", value: data.data.cancel_time || ''},
               {name: "关闭时间", value: data.data.close_time || ''},
             ],
             extension_data: data.data.extension_data || [],

public/appmini/old/toutiao/pages/user-order-detail/user-order-detail.js

@@ -62,7 +62,7 @@ Page({
               {name: "支付时间", value: data.data.pay_time || ''},
               {name: "发货时间", value: data.data.delivery_time || ''},
               {name: "收货时间", value: data.data.collect_time || ''},
-              {name: "取消时间", value: data.data.close_time || ''},
+              {name: "取消时间", value: data.data.cancel_time || ''},
               {name: "关闭时间", value: data.data.close_time || ''},
             ],
             extension_data: data.data.extension_data || [],

public/appmini/old/weixin/app.js

@@ -66,12 +66,13 @@ App({
       "membervip": "会员VIP",
       "membervip_buy": "开通时长",
       "membervip_order": "开通订单",
+      "membervip_order_detail": "订单详情",
     },
 
     // 请求地址
     request_url: "{{request_url}}",
      request_url: 'http://shopxo.com/',
-     request_url: 'https://dev.shopxo.net/',
+    // request_url: 'https://dev.shopxo.net/',
 
     // 基础信息
     application_title: "{{application_title}}",

public/appmini/old/weixin/app.json

 {
-  "pages": [
-    
+  "pages": ["pages/plugins/membershiplevelvip/user/user",
     "pages/index/index",
     "pages/goods-category/goods-category",
     "pages/cart/cart",
@@ -32,7 +31,9 @@
     "pages/plugins/coupon/user/user",
     "pages/plugins/membershiplevelvip/index/index",
     "pages/plugins/membershiplevelvip/buy/buy",
-    "pages/plugins/membershiplevelvip/user/user"
+    
+    "pages/plugins/membershiplevelvip/order/order",
+    "pages/plugins/membershiplevelvip/order-detail/order-detail"
   ],
   "window": {
     "navigationBarTitleText": "{{application_title}}",

public/appmini/old/weixin/pages/index/index.json

@@ -2,6 +2,7 @@
     "enablePullDownRefresh": true,
     "navigationBarBackgroundColor": "#d2364c",
     "backgroundColorTop": "#d2364c",
+    "backgroundColorBottom": "#f5f5f5",
     "usingComponents": {
         "component-icon-nav": "/components/icon-nav/icon-nav",
         "component-banner": "/components/slider/slider"

public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.json

 {
   "enablePullDownRefresh": true,
   "navigationBarBackgroundColor": "#1d1611",
-  "backgroundColor": "#1d1611"
+  "backgroundColorTop": "#1d1611",
+  "backgroundColorBottom": "#f5f5f5"
 }
\ No newline at end of file

public/appmini/old/weixin/pages/plugins/membershiplevelvip/order-detail/order-detail.js

+const app = getApp();
+Page({
+  data: {
+    params: null,
+    data_list_loding_status: 1,
+    data_list_loding_msg: '',
+    data_bottom_line_status: false,
+
+    detail: null,
+    detail_list: [],
+  },
+
+  onLoad(params) {
+    //params['id'] = 1;
+    this.setData({ params: params });
+    this.init();
+  },
+
+  onShow() {
+    wx.setNavigationBarTitle({ title: app.data.common_pages_title.membervip_order_detail });
+  },
+
+  init() {
+    var self = this;
+    wx.showLoading({ title: "加载中..." });
+    this.setData({
+      data_list_loding_status: 1
+    });
+
+    wx.request({
+      url: app.get_request_url("detail", "order", "membershiplevelvip"),
+      method: "POST",
+      data: {
+        id: this.data.params.id
+      },
+      dataType: "json",
+      success: res => {
+        wx.hideLoading();
+        wx.stopPullDownRefresh();
+        if (res.data.code == 0) {
+          var data = res.data.data;
+          self.setData({
+            detail: data.data,
+            detail_list: [
+              { name: "订单号", value: data.data.payment_user_order_no || '' },
+              { name: "开通时长", value: data.data.period_value+' '+data.data.period_unit },
+              { name: "订单状态", value: data.data.status_name || '' },
+              { name: "结算状态", value: data.data.settlement_status_name || '' },
+              { name: "类型", value: data.data.type_name || '' },
+              { name: "订单金额", value: data.data.price || '' },
+              { name: "支付金额", value: (data.data.pay_price <= 0) ? '' : (data.data.pay_price || '') },
+              { name: "支付方式", value: data.data.payment_name || '' },
+              { name: "创建时间", value: data.data.add_time_time || '' },
+              { name: "更新时间", value: data.data.upd_time || '' },
+            ],
+
+            data_list_loding_status: 3,
+            data_bottom_line_status: true,
+            data_list_loding_msg: '',
+          });
+        } else {
+          self.setData({
+            data_list_loding_status: 2,
+            data_bottom_line_status: false,
+            data_list_loding_msg: res.data.msg,
+          });
+          if (app.is_login_check(res.data, self, 'init')) {
+            app.showToast(res.data.msg);
+          }
+        }
+      },
+      fail: () => {
+        wx.hideLoading();
+        wx.stopPullDownRefresh();
+        self.setData({
+          data_list_loding_status: 2,
+          data_bottom_line_status: false,
+          data_list_loding_msg: '服务器请求出错',
+        });
+
+        app.showToast("服务器请求出错");
+      }
+    });
+  },
+
+  // 下拉刷新
+  onPullDownRefresh() {
+    this.init();
+  },
+
+});
\ No newline at end of file

public/appmini/old/weixin/pages/plugins/membershiplevelvip/order-detail/order-detail.json

+{
+  "enablePullDownRefresh": true,
+  "navigationBarBackgroundColor": "#1d1611"
+}
\ No newline at end of file

public/appmini/old/weixin/pages/plugins/membershiplevelvip/order-detail/order-detail.wxml

+<view wx:if="{{detail != null}}">
+  <view wx:if="{{detail_list.length > 0}}" class="panel-item">
+    <view class="panel-content bg-white">
+      <view wx:for="{{detail_list}}" wx:key="item" class="item br-b oh">
+        <view class="title fl">{{item.name}}</view>
+        <view class="content cr-888 fl br-l">{{item.value}}</view>
+      </view>
+    </view>
+  </view>
+
+  <import src="/pages/common/bottom_line.wxml" />
+  <template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
+</view>
+
+<view wx:if="{{detail == null}}">
+  <import src="/pages/common/nodata.wxml" />
+  <template is="nodata" data="{{status: data_list_loding_status, msg: data_list_loding_msg}}"></template>
+
+  <view class="nav-back tc wh-auto">
+    <navigator url="/pages/plugins/membershiplevelvip/order/order" open-type="navigateBack" hover-class="none">
+      <button type="default" size="mini" class="cr-888 br" hover-class="none">返回</button>
+    </navigator>
+  </view>
+</view>
\ No newline at end of file

public/appmini/old/weixin/pages/plugins/membershiplevelvip/order-detail/order-detail.wxss

+.panel-item .panel-title {
+  background: #fff;
+  font-weight: bold;
+  padding: 15rpx;
+  border-bottom: 2px solid #eee;
+  font-size: 34rpx;
+}
+.panel-item .panel-content .item {
+    padding: 20rpx 0;
+}
+.panel-item .panel-content .item:last-child {
+  border: 0;
+}
+.panel-item .panel-content .item .title {
+    width: 25%;
+    padding-left: 20rpx;
+}
+.panel-item .panel-content .item .content {
+    width: calc(75% - 50rpx);
+    padding-left: 20rpx;
+    min-height: 46rpx;
+}
+.panel-item .panel-content .item view {
+    line-height: 46rpx;
+}
\ No newline at end of file

public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.js

@@ -92,6 +92,7 @@ Page({
       data: {
         page: this.data.data_page,
         status: order_status,
+        is_more: 1,
       },
       dataType: "json",
       success: res => {
@@ -209,7 +210,7 @@ Page({
     wx.showLoading({ title: "请求中..." });
 
     wx.request({
-      url: app.get_request_url("pay", "order"),
+      url: app.get_request_url("pay", "buy", "membershiplevelvip"),
       method: "POST",
       data: {
         id: order_id,
@@ -262,25 +263,8 @@ Page({
   order_item_pay_success_handle(index) {
     // 数据设置
     var temp_data_list = this.data.data_list;
-    switch (parseInt(temp_data_list[index]['order_model'])) {
-      // 销售模式
-      case 0:
-        temp_data_list[index]['status'] = 2;
-        temp_data_list[index]['status_name'] = '待发货';
-        break;
-
-      // 自提模式
-      case 2:
-        temp_data_list[index]['status'] = 2;
-        temp_data_list[index]['status_name'] = '待取货';
-        break;
-
-      // 虚拟模式
-      case 3:
-        temp_data_list[index]['status'] = 3;
-        temp_data_list[index]['status_name'] = '待收货';
-        break;
-    }
+    temp_data_list[index]['status'] = 1;
+    temp_data_list[index]['status_name'] = '已支付';
     this.setData({ data_list: temp_data_list });
   },
 
@@ -301,7 +285,7 @@ Page({
           wx.showLoading({ title: "处理中..." });
 
           wx.request({
-            url: app.get_request_url("cancel", "order"),
+            url: app.get_request_url("cancel", "order", "membershiplevelvip"),
             method: "POST",
             data: { id: id },
             dataType: "json",
@@ -309,7 +293,7 @@ Page({
               wx.hideLoading();
               if (res.data.code == 0) {
                 var temp_data_list = this.data.data_list;
-                temp_data_list[index]['status'] = 5;
+                temp_data_list[index]['status'] = 2;
                 temp_data_list[index]['status_name'] = '已取消';
                 this.setData({ data_list: temp_data_list });
 
@@ -328,11 +312,11 @@ Page({
     });
   },
 
-  // 收货
-  collect_event(e) {
+  // 删除
+  delete_event(e) {
     wx.showModal({
       title: "温馨提示",
-      content: "请确认已收到货物或已完成，操作后不可恢复，确定继续吗?",
+      content: "删除后不可恢复，确定继续吗?",
       confirmText: "确认",
       cancelText: "不了",
       success: result => {
@@ -345,7 +329,7 @@ Page({
           wx.showLoading({ title: "处理中..." });
 
           wx.request({
-            url: app.get_request_url("collect", "order"),
+            url: app.get_request_url("delete", "order", "membershiplevelvip"),
             method: "POST",
             data: { id: id },
             dataType: "json",
@@ -353,9 +337,14 @@ Page({
               wx.hideLoading();
               if (res.data.code == 0) {
                 var temp_data_list = this.data.data_list;
-                temp_data_list[index]['status'] = 4;
-                temp_data_list[index]['status_name'] = '已完成';
+                temp_data_list.splice(index, 1);
                 this.setData({ data_list: temp_data_list });
+                if (temp_data_list.length == 0) {
+                  this.setData({
+                    data_list_loding_status: 0,
+                    data_bottom_line_status: false,
+                  });
+                }
 
                 app.showToast(res.data.msg, "success");
               } else {
@@ -372,11 +361,6 @@ Page({
     });
   },
 
-  // 催催
-  rush_event(e) {
-    app.showToast("催促成功", "success");
-  },
-
   // 导航事件
   nav_event(e) {
     this.setData({
@@ -385,26 +369,4 @@ Page({
     });
     this.get_data_list(1);
   },
-
-  // 售后订单事件
-  orderaftersale_event(e) {
-    var oid = e.currentTarget.dataset.oid || 0;
-    var did = e.currentTarget.dataset.did || 0;
-    if (oid == 0 || did == 0) {
-      app.showToast("参数有误");
-      return false;
-    }
-
-    // 进入售后页面
-    wx.navigateTo({
-      url: "/pages/user-orderaftersale-detail/user-orderaftersale-detail?oid=" + oid + "&did=" + did
-    });
-  },
-
-  // 订单评论
-  comments_event(e) {
-    wx.navigateTo({
-      url: "/pages/user-order-comments/user-order-comments?id=" + e.currentTarget.dataset.value
-    });
-  },
-});
+});
\ No newline at end of file

public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.json

 {
   "enablePullDownRefresh": true,
+  "navigationBarBackgroundColor": "#1d1611",
   "usingComponents": {
     "component-popup": "/components/popup/popup"
   }

public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxml

 <!-- 导航 -->
 <view class="nav">
   <block wx:for="{{nav_status_list}}" wx:key="key">
-    <view wx:if="{{nav_status_index == index}}" class="item fl tc cr-main" data-index="{{index}}" bindtap="nav_event">{{item.name}}</view>
-    <view wx:else class="item fl tc" data-index="{{index}}" bindtap="nav_event">{{item.name}}</view>
+    <view class="item fl tc cr-888 {{nav_status_index == index ? 'active' : ''}}" data-index="{{index}}" bindtap="nav_event">{{item.name}}</view>
   </block>
 </view>
 
@@ -36,15 +35,15 @@
             <text class="unit cr-888">元</text>
           </view>
           <view class="multi-text">
-            <text class="title cr-666">结算状态：</text>
+            <text class="title cr-666">结算状态</text>
             <text class="value">{{item.settlement_status_name}}</text>
           </view>
         </view>
       </navigator>
       <view wx:if="{{item.status == 0 || item.status == 2 || item.status == 3}}" class="operation tr br-t-dashed">
-        <button wx:if="{{item.status == 0}}" class="submit-cancel" type="default" size="mini" bindtap="cancel_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">取消</button>
-        <button wx:if="{{item.status == 1}}" class="submit-pay cr-666 br" type="default" size="mini" bindtap="pay_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">支付</button>
-        <button wx:if="{{item.status == 2 || item.status == 3}}" class="submit-success cr-666 br" type="default" size="mini" bindtap="collect_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">删除</button>
+        <button wx:if="{{item.status == 0}}" class="submit-cancel cr-666 br" type="default" size="mini" bindtap="cancel_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">取消</button>
+        <button wx:if="{{item.status == 0}}" class="submit-pay cr-666 br" type="default" size="mini" bindtap="pay_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">支付</button>
+        <button wx:if="{{item.status == 2 || item.status == 3}}" class="submit-delete cr-666 br" type="default" size="mini" bindtap="delete_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">删除</button>
       </view>
     </view>
 

public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxss

@@ -9,15 +9,15 @@
 .nav .item {
   width: 20%;
 }
+.nav .active {
+  color: #1d1611;
+}
 
 /*
  * 列表
  */
 .scroll-box {
-    height: calc(100vh - 80rpx);
-}
-.data-list {
-
+  height: calc(100vh - 80rpx);
 }
 .data-list .item .base,
 .data-list .item .content {
@@ -27,7 +27,7 @@
   line-height: 50rpx;
 }
 .data-list .item .content .multi-text .title {
-  margin-right: 20rpx;
+  margin-right: 30rpx;
 }
 .data-list .item .content .multi-text .value {
   font-weight: 500;
@@ -38,6 +38,17 @@
 .data-list .item .operation {
   padding: 20rpx 10rpx;
 }
+.data-list .item .submit-cancel {
+  border: 1px solid #f7c3b3;
+  color: #f7c3b3 !important;
+}
+.data-list .item .submit-delete {
+  border: 1px solid #dc7f7f;
+  color: #dc7f7f !important;
+}
+.data-list .item .operation button:not(:first-child) {
+  margin-left: 30rpx;
+}
 
 /**
  * 支付方式

public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.json

 {
   "enablePullDownRefresh": true,
   "navigationBarBackgroundColor": "#1d1611",
-  "backgroundColorTop": "#1d1611"
+  "backgroundColorTop": "#1d1611",
+  "backgroundColorBottom": "#f5f5f5"
 }
\ No newline at end of file

public/appmini/old/weixin/pages/user-order-detail/user-order-detail.js

@@ -62,7 +62,7 @@ Page({
               {name: "支付时间", value: data.data.pay_time || ''},
               {name: "发货时间", value: data.data.delivery_time || ''},
               {name: "收货时间", value: data.data.collect_time || ''},
-              {name: "取消时间", value: data.data.close_time || ''},
+              {name: "取消时间", value: data.data.cancel_time || ''},
               {name: "关闭时间", value: data.data.close_time || ''},
             ],
             extension_data: data.data.extension_data || [],

public/appmini/old/weixin/pages/user/user.json

 {
   "enablePullDownRefresh": true,
   "navigationBarBackgroundColor": "#d2364c",
-  "backgroundColor": "#d2364c",
+  "backgroundColorTop": "#d2364c",
+  "backgroundColorBottom": "#f5f5f5",
   "usingComponents": {
     "component-badge": "/components/badge/badge"
   }