From 874340f948a701b458bfb9847f9560c24b95993a Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Wed, 13 Jul 2022 17:20:36 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                 | 4 ++--
 src/pages/order/detail/modules/Operation.vue | 4 ++--
 src/pages/order/list.vue                     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index c10d614..578acc5 100644
--- a/package.json
+++ b/package.json
@@ -13,8 +13,8 @@
     "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-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",
diff --git a/src/pages/order/detail/modules/Operation.vue b/src/pages/order/detail/modules/Operation.vue
index 4b78d53..e9108ac 100644
--- a/src/pages/order/detail/modules/Operation.vue
+++ b/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 14:13:24
+ * @LastEditTime: 2022-07-13 17:18:01
  * @Description: file content
 -->
 <template>
@@ -138,7 +138,7 @@ export default {
 			
 
 			// #ifdef H5
-				window.location.replace(result.wapCashierUrl)
+				window.location.href = result.wapCashierUrl;
 			// #endif
 
 			// #ifndef H5
diff --git a/src/pages/order/list.vue b/src/pages/order/list.vue
index ab9eba6..6828431 100644
--- a/src/pages/order/list.vue
+++ b/src/pages/order/list.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-22 10:58:24
  * @LastEditors: ch
- * @LastEditTime: 2022-07-13 14:12:17
+ * @LastEditTime: 2022-07-13 17:17:38
  * @Description: file content
 -->
 <template>
@@ -143,7 +143,7 @@ export default {
 			
 
 			// #ifdef H5
-				window.location.replace(result.wapCashierUrl)
+				window.location.href = result.wapCashierUrl
 			// #endif
 
 			// #ifndef H5

From d1f0e5fbd49e6acf33bda6e99d41b393093af937 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Wed, 13 Jul 2022 18:21:40 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/order/detail/modules/Operation.vue | 12 ++++++++++--
 src/pages/order/list.vue                     | 15 ++++++++++-----
 src/pages/order/submit.vue                   | 12 ++++++++++--
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/pages/order/detail/modules/Operation.vue b/src/pages/order/detail/modules/Operation.vue
index e9108ac..aeb3776 100644
--- a/src/pages/order/detail/modules/Operation.vue
+++ b/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 17:18:01
+ * @LastEditTime: 2022-07-13 18:20:38
  * @Description: file content
 -->
 <template>
@@ -59,6 +59,7 @@ import {ApiPutCancelOrder,ApiPutOrderReceive} from '@/common/api/order';
 import {ApiPostCashierPrepay} from '@/common/api/pay';
 import BsPay from '../../../../components/BsPay.vue';
 import ORDER from '@/common/dicts/order';
+const ENV = process.env;
 export default {
 	components: { UiButton, UiCell, BsPay },
 	props : {
@@ -130,7 +131,14 @@ export default {
 		},
 		async handlePay(){
 
-			const {error, result} = await ApiPostCashierPrepay({orderId:this.orderInfo.orderId});
+			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;
diff --git a/src/pages/order/list.vue b/src/pages/order/list.vue
index 6828431..ff1c2a7 100644
--- a/src/pages/order/list.vue
+++ b/src/pages/order/list.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-22 10:58:24
  * @LastEditors: ch
- * @LastEditTime: 2022-07-13 17:17:38
+ * @LastEditTime: 2022-07-13 18:21:13
  * @Description: file content
 -->
 <template>
@@ -62,6 +62,7 @@ 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 },
@@ -135,11 +136,15 @@ export default {
 		 * 立即支付
 		 */
 		async handlePay(item){
-			const {error, result} = await ApiPostCashierPrepay({orderId:item.orderId});
-			if(error){
-				uni.$u.toast(error.message);
-				return false;
+
+			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
diff --git a/src/pages/order/submit.vue b/src/pages/order/submit.vue
index 646f2eb..99424e1 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-07-13 14:08:54
+ * @LastEditTime: 2022-07-13 18:18:18
  * @Description: file content
 -->
 <template>
@@ -62,6 +62,7 @@ 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(){
@@ -174,7 +175,14 @@ export default {
 				uni.$u.toast(error.message);
 				return false;
 			}
-			const {error:er, result:res} = await ApiPostCashierPrepay({orderId:result.orderId});
+			let payType = 'wxjsapi'
+			if(!this.$store.state.openId){
+				payType = 'h5'
+			}
+			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;

From 2a42d55fb60c7d8abdde1a0fafec5b48498cb248 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Wed, 13 Jul 2022 18:46:04 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix:static=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.bate                     |  2 +-
 .env.prod                     |  2 +-
 src/pages/order/payResult.vue | 10 ++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.env.bate b/.env.bate
index b223a6f..a7a1073 100644
--- a/.env.bate
+++ b/.env.bate
@@ -1,3 +1,3 @@
 VUE_APP_BASE_URL = https://you-gateway.mashibing.com
-VUE_APP_STATIC_URL =  https://you-gateway.mashibing.com
+VUE_APP_STATIC_URL = https://you-app.mashibing.com
 VUE_APP_IM_URL = wss://you-gateway.mashibing.com
\ No newline at end of file
diff --git a/.env.prod b/.env.prod
index b223a6f..df8e146 100644
--- a/.env.prod
+++ b/.env.prod
@@ -1,3 +1,3 @@
 VUE_APP_BASE_URL = https://you-gateway.mashibing.com
-VUE_APP_STATIC_URL =  https://you-gateway.mashibing.com
+VUE_APP_STATIC_URL =  https://you-app.mashibing.com
 VUE_APP_IM_URL = wss://you-gateway.mashibing.com
\ No newline at end of file
diff --git a/src/pages/order/payResult.vue b/src/pages/order/payResult.vue
index 8c1d38b..7fdd0b5 100644
--- a/src/pages/order/payResult.vue
+++ b/src/pages/order/payResult.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-28 15:01:41
  * @LastEditors: ch
- * @LastEditTime: 2022-06-30 17:31:15
+ * @LastEditTime: 2022-07-13 18:41:57
  * @Description: file content
 -->
 
@@ -69,9 +69,11 @@ export default {
 		},
 		back(){
 			const payType = this.$Route.query.payType;
-			if(payType !== 'wxjsapi'){
-				this.$Router.back(2);
-			}else{
+			if(payType === 'wxjsapi'){
+				this.$Router.back();
+			}else if(payType === 'h5'){
+				history.back(2);
+			}else if(payType === 'appWx'){
 				this.$Router.back();
 			}
 		}

From 041e15495dccf652f72053e9afad02b56b0ea600 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Wed, 13 Jul 2022 20:20:29 +0800
Subject: [PATCH 4/7] =?UTF-8?q?fix:=E4=B8=8B=E6=9E=B6=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/goods/enable.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/goods/enable.vue b/src/pages/goods/enable.vue
index f58b94c..4badb58 100644
--- a/src/pages/goods/enable.vue
+++ b/src/pages/goods/enable.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-28 17:16:44
  * @LastEditors: ch
- * @LastEditTime: 2022-07-04 10:42:12
+ * @LastEditTime: 2022-07-13 20:05:42
  * @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.back()">返回首页</UiButton>
+				<UiButton class="btn" @click="$Router.pushTab('/')">返回首页</UiButton>
 			</view>
 		</UiWhiteBox>
 		

From 0508a6d9df7eaadd9a92bacbcd4e6427ad6b60aa Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Thu, 14 Jul 2022 16:56:49 +0800
Subject: [PATCH 5/7] =?UTF-8?q?pref:=E5=9B=BA=E5=AE=9A=E7=AB=AF=E5=8F=A3?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/manifest.json     | 16 +---------------
 src/pages/webView.vue | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/manifest.json b/src/manifest.json
index 0c4b672..1e18c2d 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -121,21 +121,7 @@
             "base" : ""
         },
         "devServer" : {
-            "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"
-                }
-            }
+            "port" : 8080
         },
         "optimization" : {
             "treeShaking" : {
diff --git a/src/pages/webView.vue b/src/pages/webView.vue
index 3402710..cb381d3 100644
--- a/src/pages/webView.vue
+++ b/src/pages/webView.vue
@@ -17,8 +17,19 @@ export default {
 		}
 	},
 	onLoad(){
-		this.url = decodeURIComponent(this.$Route.query.url)
-		console.log();
+		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>
\ No newline at end of file

From fad9ff6ccb137ff7d47eb1615f28da30a3a73716 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Fri, 15 Jul 2022 20:19:54 +0800
Subject: [PATCH 6/7] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 578acc5..723f70b 100644
--- a/package.json
+++ b/package.json
@@ -3,10 +3,10 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "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",
+    "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",

From 6974dc5568749a94c6b9be56773651294eb16f06 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Tue, 19 Jul 2022 11:14:12 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.test b/.env.test
index 16b6a5e..04b10c7 100644
--- a/.env.test
+++ b/.env.test
@@ -1,3 +1,3 @@
-VUE_APP_BASE_URL = https://k8s-horse-gateway.mashibing.com
-VUE_APP_STATIC_URL =  https://k8s-shop-app.mashibing.com
+VUE_APP_BASE_URL = https://k8s-horse-gateway.mashibing.cn
+VUE_APP_STATIC_URL =  https://k8s-shop-app.mashibing.cn
 VUE_APP_IM_URL = wss://k8s-horse-gateway.mashibing.cn
\ No newline at end of file