Merge branch 'master' of gitlab.ezijing.com:webapp/shop-h5

src/pages/buy/index.vue

@@ -131,7 +131,7 @@ export default {
       params.customer_id = this.user.id
       params.customer_phone = this.user.phone || ''
       params.buy_count = (params.buy_count).toString()
-      params.redirect_url = encodeURIComponent(this.order_details_url)
+      params.redirect_url = this.order_details_url
       this.payment_method = params.payment_method
       if (params.payment_method === '3') {
         params.open_id = this.openId

src/pages/order/index.vue

@@ -170,7 +170,7 @@ export default {
         customer_phone: item.customer_phone,
         payment_money: item.payment_money,
         app_button_text: item.app_button_text,
-        redirect_url: encodeURIComponent(this.order_details_url)
+        redirect_url: this.order_details_url
       }
       if (this.isWxBrowser) {
         if (this.openId) {
@@ -429,4 +429,4 @@ export default {
     padding:0.2rem;
   }
 }
-</style>
+</style>
\ No newline at end of file

src/pages/order/order-details.vue

@@ -104,7 +104,7 @@ export default {
         customer_phone: item.customer_phone,
         payment_money: item.payment_money,
         app_button_text: item.app_button_text,
-        redirect_url: encodeURIComponent(this.order_details_url)
+        redirect_url: this.order_details_url
       }
       if (this.isWxBrowser) {
         if (this.openId) {
@@ -294,4 +294,4 @@ export default {
     padding:0.2rem;
   }
 }
-</style>
+</style>
\ No newline at end of file