diff --git a/package-lock.json b/package-lock.json index 5bbe9e0..0e75b92 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,6 +36,7 @@ "moment": "^2.29.3", "mp-html": "^2.5.2", "node-sass": "4.14.1", + "regenerator-runtime": "^0.14.1", "sass": "1.26.2", "sass-loader": "8.0.2", "sass-resources-loader": "^2.2.4", @@ -22589,7 +22590,7 @@ }, "node_modules/regenerator-runtime": { "version": "0.14.1", - "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==" }, "node_modules/regenerator-transform": { @@ -44878,7 +44879,7 @@ }, "regenerator-runtime": { "version": "0.14.1", - "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==" }, "regenerator-transform": { diff --git a/package.json b/package.json index ae57c3e..6667db1 100644 --- a/package.json +++ b/package.json @@ -76,6 +76,7 @@ "moment": "^2.29.3", "mp-html": "^2.5.2", "node-sass": "4.14.1", + "regenerator-runtime": "^0.14.1", "sass": "1.26.2", "sass-loader": "8.0.2", "sass-resources-loader": "^2.2.4", diff --git a/src/api/shop.js b/src/api/shop.js index 807a450..0175a42 100644 --- a/src/api/shop.js +++ b/src/api/shop.js @@ -156,7 +156,7 @@ export const createOrder = ({ }); }; -// 创建购物车订单 +// 创建抖音订单 export const createCartOrder = ({ product_pic= "", }) => { @@ -164,7 +164,7 @@ export const createCartOrder = ({ url: CREATE_CART_ORDER, method: "post", data: { - product_pic + orderId }, }); }; diff --git a/src/api/url.js b/src/api/url.js index 8d698a2..a33528e 100644 --- a/src/api/url.js +++ b/src/api/url.js @@ -232,8 +232,8 @@ export const DELETE_CART = "/product/cart/delete"; // 创建订单 export const CREATE_ORDER_NEW = "/product/order/create"; -// 创建购物车订单 -export const CREATE_CART_ORDER = "/product/order/create"; +// 创建订单 +export const CREATE_CART_ORDER = "/douyin/goods/order/create"; // 订单支付 export const PAY_ORDER_NEW = "/ttpay/jsapi"; // 订单列表 diff --git a/src/components/RefundButton.vue b/src/components/RefundButton.vue new file mode 100644 index 0000000..f2765dd --- /dev/null +++ b/src/components/RefundButton.vue @@ -0,0 +1,187 @@ + + + + + diff --git a/src/constants/app.config.js b/src/constants/app.config.js index 4546295..8c2f940 100644 --- a/src/constants/app.config.js +++ b/src/constants/app.config.js @@ -3,8 +3,8 @@ export default { appName: "Wagoo", appShareName: "Wagoo", appId: "wx00e2dcdc7c02b23a", - // apiBaseUrl: "https://api.wagoo.me/api/v1", // 服务端测试地址 - apiBaseUrl: "https://api.wagoo.pet/api/v1", // 服务端生产地址 + apiBaseUrl: "https://api.wagoo.me/api/v1", // 服务端测试地址 + // apiBaseUrl: "https://api.wagoo.pet/api/v1", // 服务端生产地址 // apiBaseUrl: "http:192.168.30.79", //本地接口 tencentMapKey: "WSBBZ-7OXK4-46QUC-KFB7B-4N3W7-M2BXM", tencentSecret: "vb7D0PGj7xUvmOLuJz2Jd7ykTMpjiWRJ", diff --git a/src/manifest.json b/src/manifest.json index c11e524..c275d81 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,29 +1,25 @@ { - "name" : "Wagoo", - "appid" : "__UNI__F0AB43B", - "description" : "init", - "versionName" : "1.0.0", - "versionCode" : "100", - "transformPx" : false, - "app-plus" : { - /* 5+App特有相关 */ - "compatible" : { - "ignoreVersion" : true + "name": "Wagoo", + "appid": "tte57093cd7a7fbf2401", + "description": "init", + "versionName": "1.0.0", + "versionCode": "100", + "transformPx": false, + "app-plus": { + "compatible": { + "ignoreVersion": true }, - "usingComponents" : true, - "splashscreen" : { - "alwaysShowBeforeRender" : true, - "waiting" : true, - "autoclose" : true, - "delay" : 0 + "usingComponents": true, + "splashscreen": { + "alwaysShowBeforeRender": true, + "waiting": true, + "autoclose": true, + "delay": 0 }, - "modules" : {}, - /* 模块配置 */ - "distribute" : { - /* 应用发布信息 */ - "android" : { - /* android打包配置 */ - "permissions" : [ + "modules": {}, + "distribute": { + "android": { + "permissions": [ "", "", "", @@ -48,48 +44,61 @@ "" ] }, - "ios" : {}, - /* ios打包配置 */ - "sdkConfigs" : {}, - "splashscreen" : { - "useOriginalMsgbox" : true + "ios": {}, + "sdkConfigs": {}, + "splashscreen": { + "useOriginalMsgbox": true } } }, - /* SDK配置 */ - "quickapp" : {}, - /* 快应用特有相关 */ - "mp-weixin" : { - "appid" : "wx00e2dcdc7c02b23a", - "setting" : { - "urlCheck" : false, - "minified" : true, - "postcss" : true, - "es6" : true, - "minifyJS" : true, - "minifyWXML" : true, - "minifyWXSS" : true + "quickapp": {}, + "mp-weixin": { + "appid": "wx00e2dcdc7c02b23a", + "setting": { + "urlCheck": false, + "minified": true, + "postcss": true, + "es6": true, + "minifyJS": true, + "minifyWXML": true, + "minifyWXSS": true }, - "usingComponents" : true, - "lazyCodeLoading" : "requiredComponents", - "optimization" : { - "subPackages" : true + "libVersion": "2.0.0", + "usingComponents": true, + "lazyCodeLoading": "requiredComponents", + "optimization": { + "subPackages": true }, - "requiredPrivateInfos" : [], - "permission" : {}, - "plugins" : {} + "requiredPrivateInfos": [], + "permission": {} }, - "mp-alipay" : { - "usingComponents" : true + "mp-alipay": { + "usingComponents": true }, - "mp-baidu" : { - "usingComponents" : true + "mp-baidu": { + "usingComponents": true }, - "mp-toutiao" : { - "usingComponents" : true, - "appid" : "tte57093cd7a7fbf2401" - }, - "mp-qq" : { - "usingComponents" : true + "mp-toutiao": { + "usingComponents": true, + "appid": "tte57093cd7a7fbf2401", + "libVersion": "2.0.0", + "setting": { + "urlCheck": false, + "minified": true, + "postcss": true, + "es6": true, + "minifyJS": true, + "minifyWXML": true, + "minifyWXSS": true + }, + "plugins": { + "myTradePlugin": { + "version": "*", + "provider": "tta5a3d31e3aecfb9b11" } -} + } +}, + "mp-qq": { + "usingComponents": true + } +} \ No newline at end of file diff --git a/src/pages.json b/src/pages.json index e002133..530d9f3 100644 --- a/src/pages.json +++ b/src/pages.json @@ -297,7 +297,11 @@ { "path": "details", "style": { - "navigationBarTitleText": "订单详情" + "navigationBarTitleText": "订单详情", + "usingComponents": { + "refund-button": "plugin://myTradePlugin/pay-button", + "pay-button-sdk": "plugin://myTradePlugin/pay-button" + } } }, { @@ -309,7 +313,10 @@ { "path": "list", "style": { - "navigationBarTitleText": "商城订单" + "navigationBarTitleText": "商城订单", + "usingComponents": { + "pay-button-sdk": "plugin://myTradePlugin/pay-button" + } } }, { @@ -527,7 +534,6 @@ { "path": "coupon-package", "style": { - "navigationBarTitleText": "", "navigationStyle": "custom" } }, @@ -552,14 +558,12 @@ { "path": "member-inter", "style": { - "navigationBarTitleText": "", "navigationStyle": "custom" } }, { "path": "member-interests", "style": { - "navigationBarTitleText": "", "navigationStyle": "custom" } } diff --git a/src/pages/client/order/components/OrderItem.vue b/src/pages/client/order/components/OrderItem.vue index 592624b..09cb226 100644 --- a/src/pages/client/order/components/OrderItem.vue +++ b/src/pages/client/order/components/OrderItem.vue @@ -77,10 +77,21 @@ > 申请售后 --> - + + + 立即预约 @@ -92,6 +103,7 @@ + 申请售后 @@ -143,6 +155,7 @@