diff --git a/package.json b/package.json index 5a268c0..c10d614 100644 --- a/package.json +++ b/package.json @@ -3,15 +3,18 @@ "version": "0.1.0", "private": true, "scripts": { - "serve": "node env.config.js & npm run dev:h5", - "serve:bate": "node env.config.js --ENV:beta & npm run dev:h5", - "serve:prod": "node env.config.js --ENV:prod & npm run dev:h5", - "build": "npm run build:h5", + "serve": "npm run dev:h5", + "serve:test": "npm run dev:h5-test", + "serve:bate": "npm run dev:h5-bate", + "serve:prod": "npm run dev:h5-prod", + "build:test": "npm run build:h5-test", + "build:bate": "npm run build:h5-bate", + "build:prod": "npm run build:h5-prod", "build:app-plus": "cross-env NODE_ENV=production UNI_PLATFORM=app-plus vue-cli-service uni-build", "build:custom": "cross-env NODE_ENV=production uniapp-cli custom", - "build:h5": "node env.config.js --ENV:test & cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build", - "build:h5:bate": "node env.config.js --ENV:beta & cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build", - "build:h5:prod": "node env.config.js --ENV:prod & cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build", + "build:h5-test": "cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build --mode test", + "build:h5:bate": "cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build --mode bate", + "build:h5:prod": "cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build --mode prod", "build:mp-360": "cross-env NODE_ENV=production UNI_PLATFORM=mp-360 vue-cli-service uni-build", "build:mp-alipay": "cross-env NODE_ENV=production UNI_PLATFORM=mp-alipay vue-cli-service uni-build", "build:mp-baidu": "cross-env NODE_ENV=production UNI_PLATFORM=mp-baidu vue-cli-service uni-build", @@ -29,6 +32,9 @@ "dev:app-plus": "cross-env NODE_ENV=development UNI_PLATFORM=app-plus vue-cli-service uni-build --watch", "dev:custom": "cross-env NODE_ENV=development uniapp-cli custom", "dev:h5": "cross-env NODE_ENV=development UNI_PLATFORM=h5 vue-cli-service uni-serve", + "dev:h5-test": "cross-env NODE_ENV=development UNI_PLATFORM=h5 vue-cli-service uni-serve --mode test", + "dev:h5-bate": "cross-env NODE_ENV=development UNI_PLATFORM=h5 vue-cli-service uni-serve --mode bate", + "dev:h5-prod": "cross-env NODE_ENV=development UNI_PLATFORM=h5 vue-cli-service uni-serve --mode prod", "dev:mp-360": "cross-env NODE_ENV=development UNI_PLATFORM=mp-360 vue-cli-service uni-build --watch", "dev:mp-alipay": "cross-env NODE_ENV=development UNI_PLATFORM=mp-alipay vue-cli-service uni-build --watch", "dev:mp-baidu": "cross-env NODE_ENV=development UNI_PLATFORM=mp-baidu vue-cli-service uni-build --watch", diff --git a/src/common/api/pay.js b/src/common/api/pay.js index 87e97af..f344ee4 100644 --- a/src/common/api/pay.js +++ b/src/common/api/pay.js @@ -2,7 +2,7 @@ * @Author: ch * @Date: 2022-04-28 16:30:54 * @LastEditors: ch - * @LastEditTime: 2022-06-29 17:15:57 + * @LastEditTime: 2022-07-09 10:16:00 * @Description: file content */ @@ -10,6 +10,10 @@ import {ToAsyncAwait, MsbRequest, MsbRequestTk} from '@/common/utils'; const BASE_URL = '/mall/trade'; + + +export const ApiPostCashierPrepay = (data) => + ToAsyncAwait(MsbRequestTk.post(`${BASE_URL}/payCenter/cashierPrepay`, data)); /** * 微信h5支付,获取支付URL * @param {*} data diff --git a/src/pages.json b/src/pages.json index 78ec3b5..9862ef8 100644 --- a/src/pages.json +++ b/src/pages.json @@ -10,6 +10,13 @@ "backgroundColor" : "#69ADE5" } }, + { + "path": "pages/webView", + "aliasPath" : "/webView", + "style": { + "navigationBarTitleText": "马士兵严选" + } + }, { "path": "pages/login", "aliasPath" : "/login", diff --git a/src/pages/order/submit.vue b/src/pages/order/submit.vue index f82e883..59da8bb 100644 --- a/src/pages/order/submit.vue +++ b/src/pages/order/submit.vue @@ -2,7 +2,7 @@ * @Author: ch * @Date: 2022-03-20 14:14:53 * @LastEditors: ch - * @LastEditTime: 2022-06-29 17:23:04 + * @LastEditTime: 2022-07-12 17:29:00 * @Description: file content -->