Merge commit '9c360d20' into dev
Showing
4 changed files
with
14 additions
and
7 deletions
| ... | @@ -84,7 +84,7 @@ const payment = reactive({ | ... | @@ -84,7 +84,7 @@ const payment = reactive({ |
| 84 | contactPhone: payment.form.phone, | 84 | contactPhone: payment.form.phone, |
| 85 | customerIds: payment.form.viewers, | 85 | customerIds: payment.form.viewers, |
| 86 | orderToken: order.data?.orderToken, | 86 | orderToken: order.data?.orderToken, |
| 87 | payType: 1, | 87 | payType: language.value == 0 ? 1 : 2, |
| 88 | paymentAmount: order.data?.paymentAmount, | 88 | paymentAmount: order.data?.paymentAmount, |
| 89 | }).then((res) => { | 89 | }).then((res) => { |
| 90 | if (res.data.language == "zh-cn") { | 90 | if (res.data.language == "zh-cn") { | ... | ... |
| ... | @@ -254,7 +254,9 @@ onMounted(() => { | ... | @@ -254,7 +254,9 @@ onMounted(() => { |
| 254 | class="tag" | 254 | class="tag" |
| 255 | > | 255 | > |
| 256 | {{ | 256 | {{ |
| 257 | language == 0 ? status[it.state].txt : status[it.state].text_en | 257 | language == 0 |
| 258 | ? status[it.state].txt | ||
| 259 | : status[it.state].text_en | ||
| 258 | }} | 260 | }} |
| 259 | </div> | 261 | </div> |
| 260 | <div v-if="it.state == 0" class="tip"> | 262 | <div v-if="it.state == 0" class="tip"> |
| ... | @@ -272,9 +274,11 @@ onMounted(() => { | ... | @@ -272,9 +274,11 @@ onMounted(() => { |
| 272 | </div> | 274 | </div> |
| 273 | </div> | 275 | </div> |
| 274 | <div v-if="it.state == 0" class="btn_box"> | 276 | <div v-if="it.state == 0" class="btn_box"> |
| 275 | <div class="pay">立即支付</div> | 277 | <div class="pay"> |
| 278 | {{ languageFormat(language, "立即支付", "Pay Now") }} | ||
| 279 | </div> | ||
| 276 | <div class="can_pay" @click.stop="order.cancelPayment(it)"> | 280 | <div class="can_pay" @click.stop="order.cancelPayment(it)"> |
| 277 | 取消支付 | 281 | {{ languageFormat(language, "取消支付", "Cancel the payment") }} |
| 278 | </div> | 282 | </div> |
| 279 | </div> | 283 | </div> |
| 280 | </div> | 284 | </div> | ... | ... |
| ... | @@ -385,7 +385,9 @@ watch( | ... | @@ -385,7 +385,9 @@ watch( |
| 385 | ]" | 385 | ]" |
| 386 | @click="select_form.onClickPrice(it)" | 386 | @click="select_form.onClickPrice(it)" |
| 387 | > | 387 | > |
| 388 | {{ it.price }}元 | 388 | <span v-if="language == 1">€</span> |
| 389 | {{ it.price }} | ||
| 390 | <span v-if="language == 0">元</span> | ||
| 389 | </div> | 391 | </div> |
| 390 | </div> | 392 | </div> |
| 391 | </div> | 393 | </div> | ... | ... |
| 1 | // http.js | 1 | // http.js |
| 2 | 2 | ||
| 3 | // import axios from "axios"; | 3 | // import axios from "axios"; |
| 4 | import axios from 'axios/dist/axios' | 4 | import axios from "axios/dist/axios"; |
| 5 | import { getToken } from "./local-store"; | 5 | import { getToken } from "./local-store"; |
| 6 | import { ElMessage } from "element-plus"; | 6 | import { ElMessage } from "element-plus"; |
| 7 | 7 | ||
| ... | @@ -16,7 +16,8 @@ const http = axios.create({ | ... | @@ -16,7 +16,8 @@ const http = axios.create({ |
| 16 | timeout, | 16 | timeout, |
| 17 | headers: { | 17 | headers: { |
| 18 | "Content-Type": "application/json", | 18 | "Content-Type": "application/json", |
| 19 | Language: 'zh-cn' | 19 | Language: "zh-cn", |
| 20 | client: "browser", | ||
| 20 | }, | 21 | }, |
| 21 | }); | 22 | }); |
| 22 | 23 | ... | ... |
-
Please register or sign in to post a comment