Authored by TaoHuang

fix by huangtao

@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 <slot name="price"> 8 <slot name="price">
9 <div class="price-info"> 9 <div class="price-info">
10 <div class="desc">{{desc}}</div> 10 <div class="desc">{{desc}}</div>
11 - <div class="price">{{price }}</div> 11 + <div class="price">{{price }}</div>
12 </div> 12 </div>
13 </slot> 13 </slot>
14 <slot name="content"> 14 <slot name="content">
@@ -128,39 +128,39 @@ export default { @@ -128,39 +128,39 @@ export default {
128 this.hide(); 128 this.hide();
129 this.$emit('paySuccess'); 129 this.$emit('paySuccess');
130 130
131 - // this.$router.replace({  
132 - // name: 'OrderPay',  
133 - // query: {  
134 - // orderCode: this.orderCode,  
135 - // payParams: result.data.payParams,  
136 - // extra: this.extra  
137 - // }  
138 - // });  
139 -  
140 - if (this.$xianyu.isAliApp) {  
141 - const page = JSON.parse(this.extra || '{}'); 131 + this.$router.replace({
  132 + name: 'OrderPay',
  133 + query: {
  134 + orderCode: this.orderCode,
  135 + payParams: result.data.payParams,
  136 + extra: this.extra
  137 + }
  138 + });
142 139
143 - this.$xianyu.setXianyuPay({  
144 - payURL: result.data.payParams  
145 - }, () => {  
146 - if (page.forward) {  
147 - this.$router.replace(page.forward);  
148 - }  
149 - }, () => {  
150 - if (page.back) {  
151 - this.$router.replace(page.back);  
152 - }  
153 - });  
154 - } else {  
155 - this.$router.replace({  
156 - name: 'OrderPay',  
157 - query: {  
158 - orderCode: this.orderCode,  
159 - payParams: result.data.payParams,  
160 - extra: this.extra  
161 - }  
162 - });  
163 - } 140 + // if (this.$xianyu.isAliApp) {
  141 + // const page = JSON.parse(this.extra || '{}');
  142 + //
  143 + // this.$xianyu.setXianyuPay({
  144 + // payURL: result.data.payParams
  145 + // }, () => {
  146 + // if (page.forward) {
  147 + // this.$router.replace(page.forward);
  148 + // }
  149 + // }, () => {
  150 + // if (page.back) {
  151 + // this.$router.replace(page.back);
  152 + // }
  153 + // });
  154 + // } else {
  155 + // this.$router.replace({
  156 + // name: 'OrderPay',
  157 + // query: {
  158 + // orderCode: this.orderCode,
  159 + // payParams: result.data.payParams,
  160 + // extra: this.extra
  161 + // }
  162 + // });
  163 + // }
164 } 164 }
165 } 165 }
166 }; 166 };
@@ -57,11 +57,25 @@ export default { @@ -57,11 +57,25 @@ export default {
57 methods: { 57 methods: {
58 ...mapOrderAction(['fetchOrderStatus']), 58 ...mapOrderAction(['fetchOrderStatus']),
59 openPay() { 59 openPay() {
60 - const url = config.alipayUrl + '?' + this.payParams; 60 + if (this.$xianyu.isAliApp) {
  61 + this.$xianyu.setXianyuPay({
  62 + payURL: this.payParams
  63 + }, () => {
  64 + if (this.page.forward) {
  65 + this.$router.replace(this.page.forward);
  66 + }
  67 + }, () => {
  68 + if (this.page.back) {
  69 + this.$router.replace(this.page.back);
  70 + }
  71 + });
  72 + } else {
  73 + const url = config.alipayUrl + '?' + this.payParams;
61 74
62 - this.$xianyu.goXianyuNewPage({  
63 - url  
64 - }); 75 + this.$xianyu.goXianyuNewPage({
  76 + url
  77 + });
  78 + }
65 }, 79 },
66 backAction() { 80 backAction() {
67 const page = JSON.parse(this.extra || '{}'); 81 const page = JSON.parse(this.extra || '{}');
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 @on-num-change="onNumChange" 9 @on-num-change="onNumChange"
10 > 10 >
11 </InputPrice> 11 </InputPrice>
12 - <OrderMargin class="order-item order-margin" :data="fee" :super-sell="superSell"></OrderMargin> 12 + <OrderMargin class="order-item order-margin" :data="fee" :super-sell="superSell" :url="tipUrl"></OrderMargin>
13 <OrderFee class="order-item" :data="fee"></OrderFee> 13 <OrderFee class="order-item" :data="fee"></OrderFee>
14 <AddressInfo :data="address" class="order-item"></AddressInfo> 14 <AddressInfo :data="address" class="order-item"></AddressInfo>
15 </Scroll> 15 </Scroll>
@@ -63,7 +63,8 @@ export default { @@ -63,7 +63,8 @@ export default {
63 addNumError: false, 63 addNumError: false,
64 scrollOption: { 64 scrollOption: {
65 bounce: false 65 bounce: false
66 - } 66 + },
  67 + tipUrl: 'https://activity.yoho.cn/feature/6773.html?share_id=9479&title=%E9%97%B2%E9%B1%BC%E6%BD%AE%E5%8D%96%E5%AE%B6%E5%8D%8F%E8%AE%AE'
67 }; 68 };
68 }, 69 },
69 activated() { 70 activated() {