From 603084ae3aa6c32f78bccdfb2ecd37b9fc90c663 Mon Sep 17 00:00:00 2001 From: YWQ HK IX <568170040@qq.com> Date: Sat, 3 Dec 2022 20:50:41 +0800 Subject: [PATCH] upload --- .vscode/settings.json | 77 +---------------------- pages/coupon/confirmation/confirmation.js | 6 +- 2 files changed, 4 insertions(+), 79 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 0d4d636..9e26dfe 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,76 +1 @@ -{ - "editor.tokenColorCustomizations": { - "keywords": { - "foreground": "#FF0000", - "fontStyle": "italic bold" - }, - "variables": { - "foreground": "#ffffff", - "fontStyle": "italic bold", - }, - //字符串 - "strings": { - "foreground": "#fbff00", - "fontStyle": "italic" - }, - //函数 - "functions": "#00ffff", - //注释 - "comments": "#969696", - "types": "#00ff95" - }, - "editor.formatOnSave": true, - "editor.wordWrap": "on", - // 开启原生括号着色 - "editor.bracketPairColorization.enabled": true, - // 开启代码块边缘导轨线着色 - "editor.guides.bracketPairs": "active", - //覆盖当前所选颜色主题的颜色 - "workbench.colorCustomizations": { - //光标颜色 - "editorCursor.foreground": "#00ff00", - //编辑器背景色 - "editor.background": "#00000025", - //光标所在行边框颜色 - //光标所在行背景颜色 - "editor.lineHighlightBorder": "#ffffffa1", - "editor.lineHighlightBackground": "#ffffff1e", - //光标选中文本的背景颜色 - //光标选中文本时匹配同类型的值的背景颜色 - "editor.selectionBackground": "#ff0000c2", - "editor.selectionHighlightBackground": "#00ffff80", - //缩进参考线的颜色 - "editorIndentGuide.activeBackground": "#f92672", - //方括号出现意外的前景色 - "editorBracketHighlight.unexpectedBracket.foreground": "#ff0000", - //括号的前景色,需要启用括号对着色 - "editorBracketHighlight.foreground1": "#ffff00", - "editorBracketPairGuide.activeBackground1": "#ffff00", - "editorBracketHighlight.foreground2": "#f92672", - "editorBracketPairGuide.activeBackground2": "#f92672", - "editorBracketHighlight.foreground3": "#00ffff", - "editorBracketPairGuide.activeBackground3": "#00ffff", - "editorBracketHighlight.foreground4": "#00ff00", - "editorBracketPairGuide.activeBackground4": "#00ff00", - "workbench.colorTheme": "Sublime VSCode Theme", - "[Sublime VSCode Theme]": { - "activityBar.activeBackground": "#ffffff1e", - "activityBar.background": "#292b27", - "activityBar.foreground": "#ffffff", - "activityBar.activeBorder": "#ff0000", - "activityBar.activeFocusBorder": "#ff0000", - "breadcrumb.foreground": "#ffffff", - "breadcrumb.background": "#1a1b18", - "sideBar.background": "#1e1f1c", - "sideBarSectionHeader.background": "#343532", - "sideBarSectionHeader.foreground": "#fff", - "sideBar.border": "#777777", - "sideBar.foreground": "#fff", - "list.hoverBackground": "#8a8a8a", - "list.inactiveSelectionBackground": "#75715e", - "editor.selectionBackground": "#ff0000", - "editorGroupHeader.tabsBackground": "#141415" - }, - }, - "editor.cursorBlinking": "smooth", -} \ No newline at end of file +{} \ No newline at end of file diff --git a/pages/coupon/confirmation/confirmation.js b/pages/coupon/confirmation/confirmation.js index a8fc660..97ce928 100644 --- a/pages/coupon/confirmation/confirmation.js +++ b/pages/coupon/confirmation/confirmation.js @@ -305,7 +305,7 @@ Page({ */ payOrderUpdate(orderId, payOrderId, status, reason, type, _this, composeOrderType) { let that = this; - + console.log(orderId, 'orderId'); // 支付成功 Http.post({ url: config.api.payOrderUpdate, @@ -325,11 +325,11 @@ Page({ let url = "" if (_this.data.orderFlag) { tt.redirectTo({ - url: `/pages/order/detail/index?orderId=${orderId}&dingdan=order}&mallTenantId=${that.data.mallTenantId}` + url: `/pages/order/detail/index?orderId=${orderId}&dingdan=order&mallTenantId=${that.data.mallTenantId}` }); } else { tt.redirectTo({ - url: `/pages/order/detail/index?orderId=${orderId}}&mallTenantId=${that.data.mallTenantId}` + url: `/pages/order/detail/index?orderId=${orderId}&mallTenantId=${that.data.mallTenantId}` }); }