Преглед на файлове

登录跳转正式地址和支付修改配置地址

xyh преди 5 месеца
родител
ревизия
8cf4232c4e
променени са 4 файла, в които са добавени 10 реда и са изтрити 5 реда
  1. 4 2
      src/common/config.js
  2. 2 1
      src/pages/identify/pay_order.vue
  3. 2 1
      src/pages/index/index.vue
  4. 2 1
      src/pages/my/pay.vue

+ 4 - 2
src/common/config.js

@@ -1,10 +1,12 @@
 // H5页面基础路径(各环境通用)
-const h5Url = '/nightFragrance/#';
+//const h5Url = '/nightFragrance/#';
 // 静态资源路径(各环境通用)
 const staticUrl = 'https://life.baoxianzhanggui.com/pro-img/nightFragrance';
 
 // 正式环境
-let baseUrl = 'https://test.baoxianzhanggui.com/nightFragrance';
+// let baseUrl = 'https://test.baoxianzhanggui.com/nightFragrance';
+let baseUrl = 'https://city.baoxianzhanggui.com/nightFragrance'
+let h5Url = 'https://city.baoxianzhanggui.com/fragrance'
 //let baseUrl = 'http://192.168.0.49:8087'
 // let baseUrl = 'https://8c55-171-118-90-51.ngrok-free.app'
 

+ 2 - 1
src/pages/identify/pay_order.vue

@@ -143,6 +143,7 @@
 
 <script>
 import wx from 'weixin-js-sdk';
+import { h5Url } from '@/common/config.js';
 import ServiceTimePicker from '@/components/picker/service-time.vue';
 import {
 	getInfo,
@@ -351,7 +352,7 @@ export default {
 				preferential: this.preferential, //优惠金额
 				totalPrice: this.totalPrice, //总金额
 			}
-			let url = 'https://test.baoxianzhanggui.com/fragrance/'
+      let url = `${h5Url}/`
 			payoff(params).then(res => {
 				let payConfig = JSON.parse(res.data.data)
 				getSignature(url).then(res => {

+ 2 - 1
src/pages/index/index.vue

@@ -148,6 +148,7 @@ import {
   netCouponReceive,
   getCityCode,
 } from '@/api/index'
+import { h5Url } from '@/common/config.js';
 export default {
   data() {
     return {
@@ -200,7 +201,7 @@ export default {
 
     // 2. 如果有code参数,就跳转到目标Hash路径并携带参数
     if (code && state) {
-      const targetUrl = `https://test.baoxianzhanggui.com/fragrance/#/?code=${code}&state=${
+      const targetUrl = `${h5Url}/#/?code=${code}&state=${
         state || 'STATE'
       }`
       // 替换当前页面,避免浏览器返回按钮出现重复授权

+ 2 - 1
src/pages/my/pay.vue

@@ -141,6 +141,7 @@
 </template>
 <script>
 	import wx from 'weixin-js-sdk'
+  import { h5Url } from '@/common/config.js';
 	import {
 		pay,
 		getSignature,
@@ -256,7 +257,7 @@
 					})
 					return
 				}
-				let url = 'https://test.baoxianzhanggui.com/fragrance/'
+				let url = `${h5Url}/`
 				pay(this.form).then(res => {
 					let payConfig = JSON.parse(res.data.data)
 					getSignature(url).then(res => {