From 0bff1ef2db4f28d3153b609d809581d4779a5275 Mon Sep 17 00:00:00 2001
From: Gao xiaosong <704041637@qq.com>
Date: Sat, 19 Dec 2020 15:19:36 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4dev?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/shop/GoodsCon/index.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 01db14f..1b41e3d 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -1094,3 +1094,4 @@ export default {
overflow: hidden;
}
+
From 0225154ffdbcef878b27d63972fa9f306c4bc327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E8=80=98=E7=A8=B7?= <18026623439@163.com>
Date: Sun, 20 Dec 2020 16:23:02 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=AC=E4=BC=97?=
=?UTF-8?q?=E5=8F=B7=E7=AB=AF=E8=B0=83=E8=AF=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 9 ++++++++-
package.json | 1 +
utils/vconsole.min.js | 10 ++++++++++
3 files changed, 19 insertions(+), 1 deletion(-)
create mode 100644 utils/vconsole.min.js
diff --git a/App.vue b/App.vue
index 6591b55..c5f3d4a 100644
--- a/App.vue
+++ b/App.vue
@@ -1,5 +1,8 @@
+
diff --git a/pages/orderAdmin/AdminOrderList/index.vue b/pages/orderAdmin/AdminOrderList/index.vue
index ad161ba..3e2a3b6 100644
--- a/pages/orderAdmin/AdminOrderList/index.vue
+++ b/pages/orderAdmin/AdminOrderList/index.vue
@@ -31,7 +31,7 @@
￥{{ val.productInfo.price }}
x{{ val.cartNum }}
- ￥{{ val.productInfo.otPrice }}
+ ￥{{ val.productInfo.otPrice }}
@@ -54,7 +54,9 @@
一键改价
立即退款
确认付款
- 去发货
+ 去发货
+ 快速核销
+ 立即核销
@@ -75,6 +77,7 @@
setOfflinePay,
setOrderRefund
} from "@/api/admin";
+ import {orderVerific} from "@/api/order";
import {
required,
num
@@ -119,7 +122,7 @@
this.getIndex();
}
},
- mounted: function() {
+ onShow: function() {
let that = this;
that.where.status = that.$yroute.query.types;
that.current = "";
@@ -318,10 +321,64 @@
});
}
);
- }
+ },
+ storeCancellation(index,verifyCode) {
+ const that = this;
+ that.check = true;
+ if (index == 0) {
+ uni.showModal({
+ title: "确定核销订单?",
+ content: "注意:请务必核对核销码的与客户正确性",
+ success(res) {
+ if (res.confirm) {
+ uni.showLoading({
+ title: "查询中"
+ });
+ orderVerific(verifyCode, 1)
+ .then(res => {
+ console.log(res)
+ uni.hideLoading();
+ that.iShidden = false;
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 1000
+ });
+ //最后就是返回上一个页面。
+ setTimeout(function() {
+ uni.navigateBack({
+ delta: 1, // 返回上一级页面。
+ success: function() {
+ console.log('成功！')
+ }
+ })
+ }, 1000);
+ })
+ .catch((err) => {
+ console.log(err)
+ uni.hideLoading();
+ uni.showToast({
+ title: err.data.msg,
+ icon: "none",
+ duration: 2000
+ });
+ });
+ }
+ }
+ });
+
+ } else {
+ that.$yrouter.push({
+ path: '/pages/orderAdmin/OrderCancellation/index'
+ })
+ }
+ }
}
};
diff --git a/utils/index.js b/utils/index.js
index 692a9c4..4eefecf 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -215,6 +215,9 @@ export const login = () => {
console.log(redirect)
if (redirect) {
redirect = redirect.split('/pages')[1]
+ if(!redirect){
+ redirect="/Loading/index";
+ }
reLaunch({
path: '/pages' + redirect,
});
From 87864d675132583e496f01bb5d5d4a273b8d48cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E8=80=98=E7=A8=B7?= <18026623439@163.com>
Date: Sat, 26 Dec 2020 16:01:33 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=8E=B7=E5=8F=96?=
=?UTF-8?q?=E6=A8=A1=E6=9D=BFID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/order.js | 8 ++++++++
libs/order.js | 31 +++++++++++++++++--------------
2 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/api/order.js b/api/order.js
index e7f2348..7d17603 100644
--- a/api/order.js
+++ b/api/order.js
@@ -140,3 +140,11 @@ export function payOrder(uni, paytype, from) {
export function orderVerific(verifyCode, isConfirm) {
return request.post("order/order_verific", { verifyCode, isConfirm });
}
+/**
+ * 获取订阅消息ID
+ * @param price
+ * @returns {*}
+ */
+export function getSubscribeTemplate() {
+ return request.get("/order/getSubscribeTemplate");
+}
diff --git a/libs/order.js b/libs/order.js
index dde6d5c..511f25a 100644
--- a/libs/order.js
+++ b/libs/order.js
@@ -2,7 +2,8 @@ import {
cancelOrder,
takeOrder,
delOrder,
- payOrder
+ payOrder,
+ getSubscribeTemplate
} from "@/api/order";
import dialog from "@/utils/dialog";
import {
@@ -194,19 +195,21 @@ export function handleOrderPayResults(data, type, payType) {
}
export function subscribeMessage() {
- // 调用订阅
- console.log('调用订阅')
- uni.requestSubscribeMessage({
- tmplIds: ['W5r2c2kzhbq8uxStkPAVx_sk-5aapMFCqe7b7KU5jXI', '2CB_1UyQrbnlyjJa5syraqJ3cfztPPDOAHe3DEXpMjg',
- 'vuztugw9VbKbKJDAAVePkjqPpT5mdoREpd4Aq7EGPRU'
- ],
- success(res) {
- console.log(res)
- },
- fail(error) {
- console.log(error)
- }
- })
+ // 调用订阅
+ console.log('调用订阅')
+ getSubscribeTemplate()
+ .then(res => {
+ uni.requestSubscribeMessage({
+ tmplIds: res.data,
+ success(res) {
+ console.log(res)
+ },
+ fail(error) {
+ console.log(error)
+ }
+ })
+ })
+ .catch(err => {});
}
From 1a9d9bcb1db0921c8699a8e444e8d1737091b946 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E8=80=98=E7=A8=B7?= <18026623439@163.com>
Date: Wed, 6 Jan 2021 20:29:35 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A7=AF=E5=88=86?=
=?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/order/OrderSubmission/index.vue | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue
index dbeeaa0..1d58d8f 100644
--- a/pages/order/OrderSubmission/index.vue
+++ b/pages/order/OrderSubmission/index.vue
@@ -125,6 +125,12 @@
可用余额：{{ userInfo.nowMoney || 0 }}
+
+
+ 积分支付
+
+ 可用积分：{{ userInfo.integral || 0 }}
+