diff --git a/app.json b/app.json
index 067292b..e017ce1 100644
--- a/app.json
+++ b/app.json
@@ -3,7 +3,6 @@
"pages/index/index/index",
"pages/goods/categoryList/categoryList",
"pages/cart/cart/cart",
- "pages/cart/cart4/cart4",
"pages/goods/goodsInfo/goodsInfo",
"pages/goods/goodsList/goodsList",
"pages/user/index/index",
diff --git a/pages/cart/cart4/cart4.js b/pages/cart/cart4/cart4.js
deleted file mode 100644
index eb40940..0000000
--- a/pages/cart/cart4/cart4.js
+++ /dev/null
@@ -1,102 +0,0 @@
-var r = getApp(), e = r.request,rq=e,oo=r.globalData,os=oo.setting, t = require("../../../utils/pay.js");
-require("../../../utils/util.js");
-
-Page({
- data: {
- url: r.globalData.setting.url,
- resourceUrl: r.globalData.setting.resourceUrl,
- imgUrl: r.globalData.setting.imghost,
- order: {},
- type:2,
- is_pt:0,
- pt_order_sn:"",
- },
- onLoad: function(r) {
- console.log("onLoad");
- var t = this,th=t, data = null, order_m=0;
- //----正常单1 和 组合单2---
- if(r.type==1){
- data = { order_sn: r.order_sn, store_id: os.stoid, order_status:0};
- t.setData({ type:1});
- }else{
- data = { parent_sn: r.order_sn, store_id: os.stoid, order_status: 0};
- }
-
- /*-----读取订单信息-----*/
- rq.get("/api/weshop/order/page",{
- data:data,
- success:function(rs){
-
- if(rs.data.code==0 && rs.data.data && rs.data.data.pageData && rs.data.data.pageData.length>0){
- //支付的金额
- rs.data.data.pageData.forEach(function(ie,ind){
- order_m+=ie.order_amount;
- })
- t.setData({
- order: {
- order_sn: r.order_sn, order_amount: order_m,
- }
- });
-
- //如果是拼单就不做处理
- if(rs.data.data.pageData[0].pt_prom_id>0) {
- th.data.pt_order_sn=rs.data.data.pageData[0].order_sn; th.data.is_pt=1;
- t.setData({ type:1});
- return false;
- }
- //如果是只有一单的情况下，就是单号=组合单号
- if(rs.data.data.pageData[0]['order_sn']==rs.data.data.pageData[0]['parent_sn']){
- t.setData({ type:2});
- }
- }
- }
- })
-
- /*-------
- r.order_sn ? e.get("/api/weshop/order/get/{store_id}/{order_id}", {
- data: {
- order_sn: r.order_sn
- },
- failRollback: !0,
- success: function(e) {
- var a = e.data.result.order_amount;
- parseFloat(a) < .01 && t.jumpSuccess(), t.setData({
- order: {
- order_sn: r.order_sn,
- order_amount: a
- }
- });
- }
- }) : (parseFloat(r.order_amount) < .01 && this.jumpSuccess(), this.setData({
- order: r
- }));--------*/
- },
- payment: function() {
- var r = this,th=r;
- this.data.order && parseFloat(this.data.order.order_amount) < .01 ? this.jumpSuccess() : t.pay(this.data.order.order_sn, function() {
- r.jumpPaymentPage();
- },null,os.stoid,th.data.type);
- },
- jumpSuccess: function() {
- r.showSuccess("下单成功", function() {
- var r = getCurrentPages();
- "pages/cart/cart/cart" == r[r.length - 2].route ? wx.redirectTo({
- url: "/pages/user/order_list/order_list?type=2"
- }) : (wx.setStorageSync("order:order_list:update", !0), wx.setStorageSync("order:order_detail:update", !0),
- wx.navigateBack());
- });
- },
- jumpPaymentPage: function() {
- wx.setStorageSync("order:order_list:update", !0);
- if(this.data.is_pt==1){
- wx.redirectTo({
- url: "/packageG/pages/team/team_success/team_success?ordersn=" + this.data.pt_order_sn,
- });
-
- }else {
- wx.redirectTo({
- url: "/packageG/pages/payment/payment/payment?order_sn=" + this.data.order.order_sn + "&order_amount=" + this.data.order.order_amount
- });
- }
- }
-});
diff --git a/pages/cart/cart4/cart4.json b/pages/cart/cart4/cart4.json
deleted file mode 100644
index 3100f9f..0000000
--- a/pages/cart/cart4/cart4.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "navigationBarTitleText": "支付",
- "usingComponents": {
- "warn": "/components/long_warn/long_warn"
- }
-}
\ No newline at end of file
diff --git a/pages/cart/cart4/cart4.wxml b/pages/cart/cart4/cart4.wxml
deleted file mode 100644
index 7558884..0000000
--- a/pages/cart/cart4/cart4.wxml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
- 订单号
- {{order.order_sn}}
-
-
- 订单金额
- {{order.order_amount}}元
-
-
-
- 支付方式
-
-
-
-
- 微信支付
-
- 立即支付
-
-
-
-
diff --git a/pages/cart/cart4/cart4.wxss b/pages/cart/cart4/cart4.wxss
deleted file mode 100644
index 401667c..0000000
--- a/pages/cart/cart4/cart4.wxss
+++ /dev/null
@@ -1,49 +0,0 @@
-.order-list {
- margin-bottom: 20rpx;
-}
-
-.order-list>view {
- display: flex;
- justify-content: space-between;
- align-items: center;
- height: 96rpx;
- font-size: 32rpx;
- color: #444;
-}
-
-.title {
- height: 70rpx;
- line-height: 70rpx;
- font-size: 32rpx;
- color: #444;
-}
-
-.pay-way {
- padding-bottom: 150rpx;
-}
-
-.pay-item {
- display: flex;
- height: 100rpx;
- align-items: center;
- border-bottom: 1px solid #f5f5f5;
- font-size: 28rpx;
- color: #444;
-}
-
-.pay-img {
- width: 60rpx;
- height: 52rpx;
- margin: 0 20rpx;
-}
-
-.pay-now {
- width: 680rpx;
- height: 88rpx;
- line-height: 88rpx;
- text-align: center;
- margin: 150rpx auto 0;
- background-color: #f23030;
- color: #fff;
- border-radius: 10rpx;
-}
\ No newline at end of file