.env

@@ -1,3 +1,4 @@
 VUE_APP_BASE_URL = https://k8s-horse-gateway.mashibing.cn
 VUE_APP_STATIC_URL =  https://k8s-shop-app.mashibing.cn
+#VUE_APP_IM_URL = ws://192.168.10.94:8090
 VUE_APP_IM_URL = wss://k8s-horse-gateway.mashibing.cn

.env.bate

@@ -1,3 +1,3 @@
 VUE_APP_BASE_URL = https://you-gateway.mashibing.com
-VUE_APP_STATIC_URL = https://you-app.mashibing.com
+VUE_APP_STATIC_URL =  https://you-gateway.mashibing.com
 VUE_APP_IM_URL = wss://you-gateway.mashibing.com

.env.prod

@@ -1,3 +1,3 @@
 VUE_APP_BASE_URL = https://you-gateway.mashibing.com
-VUE_APP_STATIC_URL =  https://you-app.mashibing.com
+VUE_APP_STATIC_URL =  https://you-gateway.mashibing.com
 VUE_APP_IM_URL = wss://you-gateway.mashibing.com

README.md

@@ -5,28 +5,18 @@
  * @LastEditTime: 2022-05-23 21:18:34
  * @Description: file content
 -->
-
 # shopping-app
 
 严选移动端
 
-## 前置环境
-
-由于项目依赖问题，开发 `node` 版本必须是 `14` or `16`。
-
-如果想安装多个版本，可以通过使用 `nvm` 进行版本管理。然具体安装可以参考下面教程
 
-[window install nvm](https://juejin.cn/post/7074108351524634655)
-[mac install nvm](https://juejin.cn/post/7206882855200047161)
 
-## 公共方法 utils
-
-- 公共方法统一放置 utils 文件夹内，可以按分类建方法文件 如：验证类 verify.js 请求类 request.js；
+## 公共方法utils
+- 公共方法统一放置utils文件夹内，可以按分类建方法文件 如：验证类verify.js 请求类request.js；
 - 所有公共方法采用大驼峰命名法
-- 所有的方法都从 index.js 输出，引入时统一引入 index，不允许直接引入方法文件
+- 所有的方法都从index.js输出，引入时统一引入index，不允许直接引入方法文件
 - 所有方法文件如果导出的是多个方法，不允许在定义方法时导出，必须在文件底部一一导出，并附上方法简单的注释
-
-```js
+``` js
 // 正确
 import {Req, IsPhone} from '@/common/utils';
 
@@ -49,20 +39,17 @@ export const IsPhone = (str) => {....}
 export const IsEmail = (str) => {....}
 
 ```
-
 ## 组件
+- 请务必使用easycom模式引入第三方组件
+- 根目录的components 只放置真正的组件，某个页面的业务模块应该在pages的相应目录下新建components目录放置
+- 所有的自定义组件文件名以大驼峰命名，且在templet中使用也用大驼峰形式使用
 
-- 请务必使用 easycom 模式引入第三方组件
-- 根目录的 components 只放置真正的组件，某个页面的业务模块应该在 pages 的相应目录下新建 components 目录放置
-- 所有的自定义组件文件名以大驼峰命名，且在 templet 中使用也用大驼峰形式使用
 
 ## 请求
-
 - 所有请求方法命名以（Api+请求类型+具体方） 法命名
-- 所有请求使用 ToAsyncAwait 包裹
-- 不允许使用 try catch 和 then 处理返回结果
-
-```js
+- 所有请求使用ToAsyncAwait 包裹
+- 不允许使用try catch 和 then 处理返回结果
+``` js
 // 使用示例
 	// xxapi.js
 	import {ToAsyncAwait, ReqestTk} from '@/common/utils'
@@ -73,7 +60,7 @@ export const IsEmail = (str) => {....}
 	}
 	// user.vue
 	improt {ApiGetUserInfo} from '@/common/api/xxapi.js';
-
+	
 	const getUserInfo = async () =>{
 		const {error, result} = await ApiGetUserInfo();
 		if(error){
@@ -84,8 +71,6 @@ export const IsEmail = (str) => {....}
 	}
 
 ```
-
 ## 图片
-
-- 按 pages 目录结果放置图片
-- 有公共使用的图片请放到 static/common 文件夹内
+- 按pages目录结果放置图片
+- 有公共使用的图片请放到static/common文件夹内

env.config.js

@@ -0,0 +1,49 @@
+/*
+ * @Author: ch
+ * @Date: 2022-05-05 14:40:00
+ * @LastEditors: ch
+ * @LastEditTime: 2022-06-28 10:59:13
+ * @Description: 根据git分支生成对应环境的环境变量
+ * 开发时如果环境变量换了，可以不用重启服务，直接运行node env.config.js即可
+ */
+const fs = require('fs');
+const path = require('path');
+
+const envConfig = {
+	dev : {
+		// baseUrl: 'https://you-gateway.mashibing.com',
+		baseUrl: 'https://k8s-horse-gateway.mashibing.cn',
+		// baseUrl: '',
+		staticUrl : 'https://k8s-shop-app.mashibing.cn',
+		// imUrl : 'ws://192.168.10.94:8090'
+		imUrl : 'wss://k8s-horse-gateway.mashibing.cn'
+	},
+	test : {
+		baseUrl: 'https://k8s-horse-gateway.mashibing.cn',
+		staticUrl : 'https://k8s-shop-app.mashibing.cn',
+		imUrl : 'wss://k8s-horse-gateway.mashibing.cn'
+	},
+	beta : {
+		baseUrl: 'https://you-gateway.mashibing.com',
+		staticUrl : 'https://you-app.mashibing.com',
+		imUrl : 'wss://you-gateway.mashibing.com'
+	},
+	prod : {
+		baseUrl: 'https://you-gateway.mashibing.com',
+		staticUrl : 'https://you-app.mashibing.com',
+		imUrl : 'wss://you-gateway.mashibing.com'
+	}
+}
+let curEnvConfig = null;
+const argv = global.process.argv;
+for(key in envConfig){
+	if(argv.includes(`--ENV:${key}`)){
+		curEnvConfig = envConfig[key];
+		break;
+	}
+}
+if(!curEnvConfig){
+	curEnvConfig = envConfig.dev;
+}
+fs.writeFileSync(`${path.resolve(__dirname, './src/common/config')}/env.js`, 
+	`const ENV = ${JSON.stringify(curEnvConfig)}; export default ENV;`);

package.json

@@ -3,18 +3,15 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "server": "npm run dev:h5",
-    "server:test": "npm run dev:h5-test",
-    "server:bate": "npm run dev:h5-bate",
-    "server: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",
+    "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",
     "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-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: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: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",
@@ -32,9 +29,6 @@
     "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",
@@ -77,36 +71,35 @@
     "@dcloudio/uni-quickapp-webview": "^2.0.1-34720220422002",
     "@dcloudio/uni-stat": "^2.0.1-34720220422002",
     "@vue/shared": "^3.0.0",
-    "caniuse-lite": "^1.0.30001640",
     "core-js": "^3.6.5",
     "flyio": "^0.6.2",
+    "regenerator-runtime": "^0.12.1",
+    "vue": "^2.6.11",
+    "vuex": "^3.2.0",
     "js-util-all": "^1.0.6",
     "mp-html": "^2.2.2",
-    "regenerator-runtime": "^0.12.1",
     "uni-read-pages": "^1.0.5",
     "uni-simple-router": "^2.0.7",
-    "uview-ui": "^2.0.29",
-    "vue": "^2.6.11",
-    "vuex": "^3.2.0"
+    "uview-ui": "^2.0.29"
   },
   "devDependencies": {
     "@babel/runtime": "~7.12.0",
     "@dcloudio/types": "^2.6.7",
-    "@dcloudio/uni-automator": "2.0.2-4010520240507001",
-    "@dcloudio/uni-cli-i18n": "2.0.2-4010520240507001",
-    "@dcloudio/uni-cli-shared": "2.0.2-4010520240507001",
-    "@dcloudio/uni-migration": "2.0.2-4010520240507001",
-    "@dcloudio/uni-template-compiler": "2.0.2-4010520240507001",
-    "@dcloudio/vue-cli-plugin-hbuilderx": "2.0.2-4010520240507001",
-    "@dcloudio/vue-cli-plugin-uni": "2.0.2-4010520240507001",
-    "@dcloudio/vue-cli-plugin-uni-optimize": "2.0.2-4010520240507001",
-    "@dcloudio/webpack-uni-mp-loader": "2.0.2-4010520240507001",
-    "@dcloudio/webpack-uni-pages-loader": "2.0.2-4010520240507001",
+    "@dcloudio/uni-automator": "^2.0.1-34720220422002",
+    "@dcloudio/uni-cli-i18n": "^2.0.1-34720220422002",
+    "@dcloudio/uni-cli-shared": "^2.0.1-34720220422002",
+    "@dcloudio/uni-migration": "^2.0.1-34720220422002",
+    "@dcloudio/uni-template-compiler": "^2.0.1-34720220422002",
+    "@dcloudio/vue-cli-plugin-hbuilderx": "^2.0.1-34720220422002",
+    "@dcloudio/vue-cli-plugin-uni": "^2.0.1-34720220422002",
+    "@dcloudio/vue-cli-plugin-uni-optimize": "^2.0.1-34720220422002",
+    "@dcloudio/webpack-uni-mp-loader": "^2.0.1-34720220422002",
+    "@dcloudio/webpack-uni-pages-loader": "^2.0.1-34720220422002",
     "@vue/cli-plugin-babel": "~4.5.15",
     "@vue/cli-service": "~4.5.15",
-    "babel-plugin-import": "1.13.8",
-    "cross-env": "7.0.3",
-    "jest": "25.5.4",
+    "babel-plugin-import": "^1.11.0",
+    "cross-env": "^7.0.2",
+    "jest": "^25.4.0",
     "mini-types": "*",
     "miniprogram-api-typings": "*",
     "postcss-comment": "^2.0.0",

src/common/api/pay.js

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-28 16:30:54
  * @LastEditors: ch
- * @LastEditTime: 2022-07-09 10:16:00
+ * @LastEditTime: 2022-06-29 17:15:57
  * @Description: file content
  */
 
@@ -10,10 +10,6 @@ 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 

src/common/router/index.js

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-18 11:11:05
  * @LastEditors: ch
- * @LastEditTime: 2022-07-12 18:31:15
+ * @LastEditTime: 2022-06-29 21:53:26
  * @Description: file content
  */
 import {RouterMount,createRouter} from 'uni-simple-router';
@@ -14,8 +14,7 @@ const router = createRouter({
 //全局路由前置守卫
 router.beforeEach((to, from, next) => {
 	// 兼容页面刷新body样式丢失问题
-	// console.log(document);
-	if (document) {
+	if (document.body) {
 		document.body.setAttribute('class', `uni-body ${to.path.replace('/', '').replace(/\//g, '-')}`)
 	}
 	next();

src/common/utils/alipay.js

@@ -2,12 +2,12 @@
  * @Author: ch
  * @Date: 2022-04-29 14:26:10
  * @LastEditors: ch
- * @LastEditTime: 2022-07-13 10:37:21
+ * @LastEditTime: 2022-06-30 16:03:35
  * @Description: file content
  */
 
 import { ApiPostAliH5Pay, ApiPostAliAppPay } from '@/common/api/pay';
-const ENV = process.env;
+import ENV from '@/common/config/env';
 export const Alipay = async ({orderId})=>{
 
 	// #ifdef APP-PLUS
@@ -38,7 +38,7 @@ export const Alipay = async ({orderId})=>{
 	// #ifdef H5
 	const { error, result } = await ApiPostAliH5Pay({
 		orderId,
-		returnUrl : decodeURIComponent(`${ENV.VUE_APP_STATIC_URL}/payResult?orderId=${orderId}&payType=alih5`)
+		returnUrl : decodeURIComponent(`${ENV.staticUrl}/payResult?orderId=${orderId}&payType=alih5`)
 	});
 	if(error){
 		uni.$u.toast(error.message);

src/common/utils/im.js

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-20 11:00:07
  * @LastEditors: ch
- * @LastEditTime: 2022-07-13 10:37:52
+ * @LastEditTime: 2022-06-13 10:11:33
  * @Description: file content
  */
 
@@ -11,7 +11,7 @@ import { ToAsyncAwait, FormatJsonSearch } from '@/common/utils';
 import { ApiGetCurrentUser } from '@/common/api/account';
 import { ApiGetSoketTicket } from '@/common/api/im';
 import $store from '@/common/store';
-const ENV = process.env;
+import ENV from '@/common/config/env';
 
 const Im = new MsbIm({
 	reconnect: true,
@@ -31,7 +31,7 @@ const ImInit = async () => {
 		avatar : $store.state.userInfo.avatar
 	})
 	await ToAsyncAwait(Im.init({
-		url: `${ENV.VUE_APP_IM_URL}/ws${par}`
+		url: `${ENV.imUrl}/ws${par}`
 	}))
 };
 

src/common/utils/pay.js

@@ -2,9 +2,10 @@
  * @Author: ch
  * @Date: 2022-05-06 15:33:55
  * @LastEditors: ch
- * @LastEditTime: 2022-07-13 10:38:34
+ * @LastEditTime: 2022-06-15 14:26:16
  * @Description: file content
  */
+import ENV from '@/common/config/env';
 import { Wxpay } from './wxpay';
 export const pay = ({orderId, openId, payType})=>{
 	if(payType === 'wxpay'){

src/common/utils/requset.js

@@ -2,14 +2,14 @@
  * @Author: ch
  * @Date: 2022-03-17 17:42:32
  * @LastEditors: ch
- * @LastEditTime: 2022-07-13 10:39:07
+ * @LastEditTime: 2022-06-29 17:43:49
  * @Description: 项目接口请求统一处理器，返回一个需要token和不需要token的请求封装方法
  */
 
 import MsbUniRequest from '@/common/plugins/msbUniRequest';
 import $store from '@/common/store';
+import ENV from '@/common/config/env';
 import { CreateUUID } from '@/common/utils';
-const ENV = process.env;
 
 // 获取已有的UUID没则创建一个并保存到locaStorage中下次使用
 let uuid = $store.state.uuid
@@ -82,7 +82,7 @@ const clearRepeat = (option) =>{
 
 // 不需要token的接口封装
 const MsbRequest = new MsbUniRequest();
-MsbRequest.baseUrl = ENV.VUE_APP_BASE_URL;
+MsbRequest.baseUrl = ENV.baseUrl;
 
 MsbRequest.use('request', (option) => {
 	if(option.header.repeat){
@@ -102,7 +102,7 @@ MsbRequest.use('error', errorIntercept);
 
 // 需要token的接口封装
 const MsbRequestTk = new MsbUniRequest();
-MsbRequestTk.baseUrl = ENV.VUE_APP_BASE_URL;
+MsbRequestTk.baseUrl = ENV.baseUrl;
 
 MsbRequestTk.use('request', (option) => {
 	const token = $store.state.token;

src/common/utils/utils.js

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-17 19:15:10
  * @LastEditors: ch
- * @LastEditTime: 2022-07-13 10:39:35
+ * @LastEditTime: 2022-06-22 10:39:15
  * @Description: 一些无法归类的公共方法容器
  */
 
@@ -15,6 +15,7 @@ import {
 	formatJsonSearch as FormatJsonSearch
 
 } from "js-util-all";
+import ENV from '@/common/config/env';
 import {AD_JUMP_TYPE} from '@/common/dicts/ad';
 
 /** 防抖函数

src/common/utils/wxpay.js

@@ -2,12 +2,12 @@
  * @Author: ch
  * @Date: 2022-04-29 14:26:10
  * @LastEditors: ch
- * @LastEditTime: 2022-07-13 10:40:10
+ * @LastEditTime: 2022-06-29 17:17:40
  * @Description: file content
  */
 
 import { ApiPostWxH5Pay, ApiPostWxJsApiPay, ApiPostWxAppPay } from '@/common/api/pay';
-const ENV = process.env;
+import ENV from '@/common/config/env';
 export const Wxpay = async ({orderId,openId})=>{
 
 	// #ifdef APP-PLUS
@@ -74,7 +74,7 @@ export const Wxpay = async ({orderId,openId})=>{
 			uni.$u.toast(error.message);
 			return false;
 		}
-		const redirect_url = decodeURIComponent(`${ENV.VUE_APP_STATIC_URL}/payResult?orderId=${orderId}&payType=wxh5`);
+		const redirect_url = decodeURIComponent(`${ENV.staticUrl}/payResult?orderId=${orderId}&payType=wxh5`);
 		window.location.href = `${result.payDataInfo.h5Url}&redirect_url=${redirect_url}`;
 	}
 	// #endif

src/manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "马士兵严选",
-    "appid" : "__UNI__5FEB250",
+    "appid" : "__UNI__3FB31B6",
     "description" : "",
     "versionName" : "1.0.1",
     "versionCode" : "100",
@@ -40,14 +40,10 @@
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
-                "minSdkVersion" : 21
+                ]
             },
             /* ios打包配置 */
-            "ios" : {
-                "dSYMs" : false
-            },
+            "ios" : {},
             /* SDK配置 */
             "sdkConfigs" : {
                 "ad" : {},
@@ -64,10 +60,34 @@
             },
             "icons" : {
                 "android" : {
-                    "hdpi" : "src/static/app-icon/72.png",
-                    "xhdpi" : "src/static/app-icon/96.png",
-                    "xxhdpi" : "src/static/app-icon/144.png",
-                    "xxxhdpi" : "src/static/app-icon/192.png"
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
                 }
             }
         }
@@ -101,7 +121,21 @@
             "base" : ""
         },
         "devServer" : {
-            "port" : 8080
+            "proxy" : {
+                "/uc/" : {
+                    // "target" : "https://k8s-horse-gateway.mashibing.cn"
+                    "target" : "http://192.168.10.118:8090"
+                },
+                "/mall/" : {
+                    "target" : "http://192.168.10.118:8090"
+                },
+                "/pay/" : {
+                    "target" : "https://k8s-horse-gateway.mashibing.cn"
+                },
+                "/oss/" : {
+                    "target" : "https://k8s-horse-gateway.mashibing.cn"
+                }
+            }
         },
         "optimization" : {
             "treeShaking" : {

src/pages.json

@@ -10,13 +10,6 @@
 				"backgroundColor" : "#69ADE5"
 			}
 		},
-		{
-			"path": "pages/webView",
-			"aliasPath" : "/webView",
-			"style": {
-				"navigationBarTitleText": "收银台"
-			}
-		},
 		{
 			"path": "pages/login",
 			"aliasPath" : "/login",

src/pages/goods/enable.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-28 17:16:44
  * @LastEditors: ch
- * @LastEditTime: 2022-07-13 20:05:42
+ * @LastEditTime: 2022-07-04 10:42:12
  * @Description: file content
 -->
 <template>
@@ -11,7 +11,7 @@
 			<image class="icon" src="@/static/goods/cart.png"/>
 			<view class="title">商品已下架</view>
 			<view class="btns">
-				<UiButton class="btn" @click="$Router.pushTab('/')">返回首页</UiButton>
+				<UiButton class="btn" @click="$Router.back()">返回首页</UiButton>
 			</view>
 		</UiWhiteBox>
 		

src/pages/order/detail/modules/Operation.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-15 17:46:10
  * @LastEditors: ch
- * @LastEditTime: 2022-07-13 18:20:38
+ * @LastEditTime: 2022-06-29 20:39:45
  * @Description: file content
 -->
 <template>
@@ -23,7 +23,7 @@
 			<!-- 待支付可以取消，支付订单 -->
 			<template v-if="orderInfo.orderStatus === 1">
 				<UiButton class="footer--btn" @click="cancelShow = true">取消订单</UiButton>
-				<UiButton class="footer--btn" type="gradual" @click="handlePay">去支付</UiButton>
+				<UiButton class="footer--btn" type="gradual" @click="payShow = true">去支付</UiButton>
 			</template>
 			<u-popup class="cancel" :show="cancelShow" @close="closeCancel" round="16rpx" closeable>
 				<view class="cancel--title">取消订单原因</view>
@@ -49,17 +49,15 @@
 					<UiButton type="gradual" :disabed="cancelValue == 0" @click="cancelOrder">确认取消</UiButton>
 				</view>
 			</u-popup>
-			<!-- <BsPay class="modal" :show.sync="payShow" :order="orderInfo"></BsPay> -->
+			<BsPay class="modal" :show.sync="payShow" :order="orderInfo"></BsPay>
 		</view>
 </template>
 <script>
 import UiButton from '@/components/UiButton.vue'
 import UiCell from '@/components/UiCell.vue'
-import {ApiPutCancelOrder,ApiPutOrderReceive} from '@/common/api/order';
-import {ApiPostCashierPrepay} from '@/common/api/pay';
+import {ApiPutCancelOrder,ApiPutOrderReceive} from '@/common/api/order'
 import BsPay from '../../../../components/BsPay.vue';
 import ORDER from '@/common/dicts/order';
-const ENV = process.env;
 export default {
 	components: { UiButton, UiCell, BsPay },
 	props : {
@@ -74,6 +72,8 @@ export default {
 			// 取消订单弹窗
 			cancelShow : false,
 			cancelValue : 0,
+			// 支付
+			payShow : false
 		}
 	},
 	methods : {
@@ -119,39 +119,29 @@ export default {
 					}
 				}
 			})
+			// this.$msb.confirm({
+			// 	content : '确认已经收到货了吗？',
+			// 	confirm : async ()=>{
+			// 		const {error} = await ApiPutOrderReceive({
+			// 			orderId : this.$Route.query.id
+			// 		});
+			// 		if(error){
+			// 			uni.$toast(error.message);
+			// 			return false;
+			// 		}
+			// 		this.$Router.push('/orderSuccess');
+			// 	}
+			// })
 			
 		},
 		service(){
+			// uni.$u.toast('客服休息中')
 			this.$Router.push({
 				path : '/messageChat',
 				query : {
 					orderId : this.orderInfo.orderId
 				}
 			})
-		},
-		async handlePay(){
-
-			let payType = 'wxjsapi'
-			if(!this.$store.state.openId){
-				payType = 'h5'
-			}
-			const {error, result} = await ApiPostCashierPrepay({
-				orderId:this.orderInfo.orderId,
-				returnUrl :  `${ENV.VUE_APP_STATIC_URL}/payResult?orderId=${this.orderInfo.orderId}&payType=${payType}`
-			});
-			if(error){
-				uni.$u.toast(error.message);
-				return false;
-			}
-			
-
-			// #ifdef H5
-				window.location.href = result.wapCashierUrl;
-			// #endif
-
-			// #ifndef H5
-				this.$Router.push(`/webView?url=${encodeURIComponent(result.wapCashierUrl)}`);
-			// #endif
 		}
 	}
 }

src/pages/order/list.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-22 10:58:24
  * @LastEditors: ch
- * @LastEditTime: 2022-07-13 18:21:13
+ * @LastEditTime: 2022-06-29 20:29:48
  * @Description: file content
 -->
 <template>
@@ -32,7 +32,7 @@
 
 			<view class="orders--footer">
 				<UiButton size="min" type="gradual"
-					v-if="item.orderStatus === ORDER.STATUS.AWAIT_PAY" @click="handlePay(item)">去支付</UiButton>
+					v-if="item.orderStatus === ORDER.STATUS.AWAIT_PAY" @click="pay(item)">去支付</UiButton>
 				<UiButton size="min" v-if="[ORDER.STATUS.CLOSE,ORDER.STATUS.AWAIT_PAY].includes(item.orderStatus)" 
 					@click="$Router.push(`/orderDetail?id=${item.orderId}`)">查看详情</UiButton>
 				<UiButton size="min" v-if="item.orderStatus >= ORDER.STATUS.FINISH_SEND_GOODS" 
@@ -49,20 +49,18 @@
 		</view>
 		<u-loadmore :status="loadingStatus" v-if="loadingStatus !== 'nomore'"/>
 
-		<!-- <BsPay :show.sync="payShow" :order="payOrder"></BsPay> -->
+		<BsPay :show.sync="payShow" :order="payOrder"></BsPay>
 	</view>
 </template>
 <script>
 import BsEmpty from '@/components/BsEmpty.vue';
 import UiButton from '@/components/UiButton.vue';
 import { ApiGetOrderList, ApiPutOrderReceive } from '@/common/api/order';
-import {ApiPostCashierPrepay} from '@/common/api/pay';
 import BsPay from '../../components/BsPay.vue';
 import UiGoodsInfo from '../../components/UiGoodsInfo.vue';
 import UiGoodsInfoMax from '../../components/UiGoodsInfoMax.vue';
 import UiMoney from '../../components/UiMoney.vue';
 import ORDER from '@/common/dicts/order';
-const ENV = process.env;
 
 export default {
 	components: { BsEmpty, UiButton, BsPay, UiGoodsInfo, UiGoodsInfoMax, UiMoney },
@@ -82,6 +80,7 @@ export default {
 			pageIndex : 1,
 			pageSize : 10,
 
+			payShow : false,
 			payOrder : null
 		}
 	},
@@ -135,25 +134,9 @@ export default {
 		/**
 		 * 立即支付
 		 */
-		async handlePay(item){
-
-			let payType = 'wxjsapi'
-			if(!this.$store.state.openId){
-				payType = 'h5'
-			}
-			const {error, result} = await ApiPostCashierPrepay({
-				orderId:item.orderId,
-				returnUrl :  `${ENV.VUE_APP_STATIC_URL}/payResult?orderId=${item.orderId}&payType=${payType}`
-			});
-			
-
-			// #ifdef H5
-				window.location.href = result.wapCashierUrl
-			// #endif
-
-			// #ifndef H5
-				this.$Router.push(`/webView?url=${encodeURIComponent(result.wapCashierUrl)}`);
-			// #endif
+		pay(item){
+			this.payShow = true;
+			this.payOrder = item;
 		},
 
 		/**

src/pages/order/payResult.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-28 15:01:41
  * @LastEditors: ch
- * @LastEditTime: 2022-07-13 18:41:57
+ * @LastEditTime: 2022-06-30 17:31:15
  * @Description: file content
 -->
 
@@ -69,11 +69,9 @@ export default {
 		},
 		back(){
 			const payType = this.$Route.query.payType;
-			if(payType === 'wxjsapi'){
-				this.$Router.back();
-			}else if(payType === 'h5'){
-				history.back(2);
-			}else if(payType === 'appWx'){
+			if(payType !== 'wxjsapi'){
+				this.$Router.back(2);
+			}else{
 				this.$Router.back();
 			}
 		}

src/pages/order/submit.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-20 14:14:53
  * @LastEditors: ch
- * @LastEditTime: 2022-07-13 18:18:18
+ * @LastEditTime: 2022-06-29 17:23:04
  * @Description: file content
 -->
 <template>
@@ -34,6 +34,22 @@
 					maxlength="50" placeholder="填写您想要备注的信息，50字以内" />
 			</UiCell>
 		</UiWhiteBox>
+		<UiWhiteBox>
+			<text class="play--title">支付方式</text>
+			<radio-group>
+				<u-cell v-for="item in payData" :title="item.label" :key="item.val"
+					:border="false" @click="payType = item.val">
+					<image class="play--icon" slot="icon" :src="item.icon"/>
+					<radio class="play--radio" slot="right-icon" color="#FF875B"
+					 	:checked="payType == item.val"	></radio>
+				</u-cell>
+				<!-- <u-cell title="支付宝支付" :border="false" @click="payType = 'alipay'">
+					<image class="play--icon" slot="icon" src="@/static/order/zfb.png"/>
+					<radio class="play--radio" slot="right-icon" color="#FF875B" 
+						:checked="payType == 'alipay'"></radio>
+				</u-cell> -->
+			</radio-group>
+		</UiWhiteBox>
 
 		<UiWhiteBox class="amount">
 			<u-cell title="商品总额" :value="`￥${orderInfo.productAmount}`" :border="false"></u-cell>
@@ -56,13 +72,11 @@
 import {GOODS_TYPE} from '@/common/dicts/goods';
 import UiCell from '@/components/UiCell';
 import {ApiPostSubmitOrder, ApiGetBeforeOrder, ApiGetBeforeCartOrder} from '@/common/api/order';
-import {ApiPostCashierPrepay} from '@/common/api/pay';
 import {ApiGetAddress } from '@/common/api/base';
 import {Wxpay, Alipay} from '@/common/utils';
 import UiButton from '@/components/UiButton.vue';
 import UiWhiteBox from '../../components/UiWhiteBox.vue';
 import UiGoodsInfo from '../../components/UiGoodsInfo.vue';
-const ENV = process.env;
 export default {
 	components : {UiCell, UiButton, UiWhiteBox, UiGoodsInfo },
 	data(){
@@ -71,6 +85,15 @@ export default {
 			address : {},
 			userMessage : '',
 			orderInfo : {},
+			payType : 'wxpay',
+			payData : [
+				{
+					label : '微信支付',
+					icon : require('@/static/order/wx.png'),
+					val : 'wxpay'
+				}
+
+			],
 			productType : this.$Route.query.productType,
 		}
 	},
@@ -79,6 +102,14 @@ export default {
 		uni.$on('changeAddress',(item)=>{
 			this.address = item;
 		});
+		// 非微信APP则添加支付宝支付
+		if(!this.$store.state.openId){
+			this.payData.push({
+				label : '支付宝支付',
+				icon : require('@/static/order/zfb.png'),
+				val : 'alipay'
+			})
+		}
 	},
 	onShow(){
 		// 默认选择设为默认的地址
@@ -175,28 +206,11 @@ export default {
 				uni.$u.toast(error.message);
 				return false;
 			}
-			let payType = 'wxjsapi'
-			if(!this.$store.state.openId){
-				payType = 'h5'
+			if(this.payType === 'wxpay'){
+				Wxpay({orderId : result.orderId, openId : this.$store.state.openId});
+			}else{
+				Alipay({orderId : result.orderId});
 			}
-			const {error:er, result:res} = await ApiPostCashierPrepay({
-				orderId:result.orderId,
-				returnUrl :  `${ENV.VUE_APP_STATIC_URL}/payResult?orderId=${result.orderId}&payType=${payType}`
-			});
-			if(er){
-				uni.$u.toast(er.message);
-				return false;
-			}
-			
-
-			// #ifdef H5
-				window.location.replace(res.wapCashierUrl)
-			// #endif
-
-			// #ifndef H5
-				this.$Router.push(`/webView?url=${encodeURIComponent(res.wapCashierUrl)}`);
-			// #endif
-			
 		}
 	}
 }

src/pages/webView.vue

@@ -1,35 +0,0 @@
-<!--
- * @Author: ch
- * @Date: 2022-07-12 17:19:59
- * @LastEditors: ch
- * @LastEditTime: 2022-07-12 18:35:24
- * @Description: file content
--->
-<template><view>
-		<web-view :src="url"></web-view>
-	</view>
-</template>
-<script>
-export default {
-	data (){
-		return {
-			url : ''
-		}
-	},
-	onLoad(){
-		this.url = decodeURIComponent(this.$Route.query.url);
-	},
-	onReady() {
-		var currentWebview = this.$scope.$getAppWebview() //此对象相当于html5plus里的plus.webview.currentWebview()。在uni-app里vue页面直接使用plus.webview.currentWebview()无效
-		setTimeout(function() {
-			let wv = currentWebview.children()[0];
-			
-			wv.addEventListener('loaded',function() {
-				console.log('xxxxx',wv.getURL())
-				console.log(wv.getURL()) //获取url
-				console.log(wv.getTitle()) //获取标题
-			}, false);
-		}, 1000); //如果是页面初始化调用时，需要延时一下
-	}
-}
-</script>