diff --git a/colorui/main.css b/colorui/main.css
index b64c335..f22fdef 100644
--- a/colorui/main.css
+++ b/colorui/main.css
@@ -2934,9 +2934,9 @@ scroll-view.cu-steps .cu-item {
}
.grid.grid-square>view {
- margin-right: 20upx;
- margin-bottom: 20upx;
- border-radius: 6upx;
+ margin-right: 18rpx;
+ /* margin-bottom: 18rpx; */
+ border-radius: 10rpx;
position: relative;
overflow: hidden;
}
@@ -3328,8 +3328,8 @@ scroll-view.cu-steps .cu-item {
}
.padding-lr {
- padding-left: 30upx;
- padding-right: 30upx;
+ padding-left: 32rpx;
+ padding-right: 32rpx;
}
.padding-lr-lg {
diff --git a/common/api.js b/common/api.js
index f35cd83..43a84dd 100644
--- a/common/api.js
+++ b/common/api.js
@@ -11,6 +11,9 @@ export const API_GOODS_LIST = '/api/goods/list'; // 首页-分类下商品列表
// 用户订单
export const API_USERORDER = '/api/order/list';
+// 商户订单
+export const API_SHOPORDER = '/api/order/listForStore';
+
//订单详情
export const API_ORDER_DETAILS = '/api/order/detail';
@@ -36,6 +39,9 @@ export const API_COLLECT_DEAL = '/api/collect/deal'; // 商品收藏
//订单预支付
export const API_PRPAID = '/api/order/deal'
+//订单直接支付
+export const API_PAYMENT_DIRECT = '/api/payment/direct'
+
/* 个人中心相关 */
export const API_USER_CENTER = '/api/user/center'; // 个人中心
export const API_COLLECT_LIST = '/api/collect/list'; // 我的收藏列表
diff --git a/components/self-line/self-line.vue b/components/self-line/self-line.vue
index 8149043..d40dc2b 100644
--- a/components/self-line/self-line.vue
+++ b/components/self-line/self-line.vue
@@ -7,10 +7,10 @@
diff --git a/pages.json b/pages.json
index 1f80e04..b7366cb 100644
--- a/pages.json
+++ b/pages.json
@@ -17,6 +17,13 @@
"enablePullDownRefresh": true
}
},
+ {
+ "path": "pages/shopOrder/index",
+ "style": {
+ "navigationBarTitleText": "商户订单",
+ "enablePullDownRefresh": true
+ }
+ },
{
"path": "pages/order/order-details",
"style": {
diff --git a/pages/order/apply-details.vue b/pages/order/apply-details.vue
index 6fab899..132fdaf 100644
--- a/pages/order/apply-details.vue
+++ b/pages/order/apply-details.vue
@@ -1,20 +1,19 @@
-
-
+
-
-
+
+
-
+
{{orderDetails.order.goods.name}}
- 数量 x {{orderDetails.order.number}}
+ 数量 x{{orderDetails.order.number}}
-
-
+
+
{{orderDetails.order.selling_price}}
@@ -62,37 +61,38 @@
订单编号
- {{orderDetails.order_sn}}
- 复制
+ {{orderDetails.order_sn}}
+
+
+
+
+
-
-
-
-
-
+
-
-
+
-
-
+
+
+
+
@@ -138,9 +138,9 @@
});
},
// 预览图片
- showImg() {
+ showImg(image) {
uni.previewImage({
- urls: ['../../static/tu.png']
+ urls: [image],
});
},
// 点击复制
diff --git a/pages/order/apply-refund.vue b/pages/order/apply-refund.vue
index f74aa57..d78d648 100644
--- a/pages/order/apply-refund.vue
+++ b/pages/order/apply-refund.vue
@@ -1,20 +1,19 @@
-
-
+
-
-
-
+
+
+
-
+
{{applyDetails.order.goods.name}}
- 数量 x{{applyDetails.order.number}}
+ 数量 x{{applyDetails.order.number}}
-
-
+
+
{{applyDetails.order.selling_price}}
@@ -74,27 +73,29 @@
-
-
-
- 退款说明
-
+
+
+
-
+
-
+
-
+
@@ -108,12 +109,16 @@
-->
-
-
@@ -338,5 +343,12 @@
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
+ .area-self {
+ width: 100%;
+ padding: 30rpx 0 0 30rpx;
+ color: #999999;
+ border: 1px solid #D0D0D0;
+ border-radius: 10rpx;
+ }
diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue
index 26430a9..9f96ece 100644
--- a/pages/order/confirm-order.vue
+++ b/pages/order/confirm-order.vue
@@ -187,7 +187,6 @@
},
fail: (err) => {
this.$url('/pages/order/pay-success?ifSuccess='+2,{type: 'redirect'})
-
},
})
@@ -211,11 +210,11 @@
signType: res.data.signType,
paySign: res.data.paySign,
success: (res) => {
- this.$routerGo('/pages/order/pay-success?ifSuccess='+1)
+ this.$url('/pages/order/pay-success?ifSuccess='+1,{type: 'redirect'})
},
fail: (err) => {
- this.$routerGo('/pages/order/pay-success?ifSuccess='+2)
- }
+ this.$url('/pages/order/pay-success?ifSuccess='+2,{type: 'redirect'})
+ },
})
})
},
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 7647b34..0e5f00a 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -1,7 +1,7 @@
-
+
@@ -13,8 +13,8 @@
{{item.state_text.text}}
- {{item.goods.name}}
-
+ 网红辣椒棒 魔鬼辣椒挑战全网第一辣 网红优惠季
+
数量
x {{item.number}}
@@ -28,12 +28,12 @@
-
+
-
+
{{item.created_at_text}}
-
+
{{item.comment_text}}
@@ -109,6 +109,14 @@
this.assetsType = e.type
this.getUserOrder()
},
+ onShow() {
+ let tab_item = this.tab_list[this.current];
+ tab_item.page = 1;
+ tab_item.isPage = true;
+ tab_item.loadingClass = true;
+ tab_item.loadingText = '正在加载中';
+ this.getUserOrder();
+ },
methods: {
// 切换tab
change(index) {
@@ -207,18 +215,18 @@
}
-
+ .tips {
+ margin: 16rpx 0;
+ overflow: hidden;
+
+ .u-line-progress {
+ width: 112rpx;
+ overflow: hidden;
+ margin-right: 20rpx;
+ }
+
+ .progress {
+ color: #777777;
+ font-size: 24rpx;
+ }
+
+ .bought {
+ color: #777777;
+ font-size: 24rpx;
+ margin-right: 20rpx;
+ }
+ }
+
+ .price {
+ overflow: hidden;
+ color: #FF0000;
+ margin-top: 10rpx;
+ button {
+ width: 176rpx;
+ height: 60rpx;
+ background: #FE9903;
+ border-radius: 15px;
+ font-size: 24rpx;
+ color: #FFFFFF;
+ margin: 0rpx 20rpx 0rpx 20rpx;
+ border: none;
+ }
+ }
+ }
+ }
+ }
+
\ No newline at end of file
diff --git a/pages/shopOrder/index.vue b/pages/shopOrder/index.vue
new file mode 100644
index 0000000..39aeb40
--- /dev/null
+++ b/pages/shopOrder/index.vue
@@ -0,0 +1,314 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.state_text.text}}
+
+
+ 网红辣椒棒 魔鬼辣椒挑战全网第一辣 网红优惠季
+
+ 数量
+ x {{item.number}}
+
+
+
+ ￥
+ {{item.selling_price}}
+
+
+
+
+
+
+
+
+
+ {{item.created_at_text}}
+
+
+ {{item.comment_text}}
+
+
+
+
+
+
+ {{ tab.loadingText }}
+
+
+
+
+
+
+
+
+
+
+