Compare commits
No commits in common. 'main' and 'feature/comment-0620-ch' have entirely different histories.
main
...
feature/co
@ -1,3 +1,4 @@
|
|||||||
VUE_APP_BASE_URL = https://k8s-horse-gateway.mashibing.cn
|
VUE_APP_BASE_URL = https://k8s-horse-gateway.mashibing.cn
|
||||||
VUE_APP_STATIC_URL = https://k8s-shop-app.mashibing.cn
|
VUE_APP_STATIC_URL = https://k8s-shop-app.mashibing.cn
|
||||||
|
#VUE_APP_IM_URL = ws://192.168.10.94:8090
|
||||||
VUE_APP_IM_URL = wss://k8s-horse-gateway.mashibing.cn
|
VUE_APP_IM_URL = wss://k8s-horse-gateway.mashibing.cn
|
@ -1,3 +1,3 @@
|
|||||||
VUE_APP_BASE_URL = https://you-gateway.mashibing.com
|
VUE_APP_BASE_URL = https://you-gateway.mashibing.com
|
||||||
VUE_APP_STATIC_URL = https://you-app.mashibing.com
|
VUE_APP_STATIC_URL = https://you-gateway.mashibing.com
|
||||||
VUE_APP_IM_URL = wss://you-gateway.mashibing.com
|
VUE_APP_IM_URL = wss://you-gateway.mashibing.com
|
@ -1,3 +1,3 @@
|
|||||||
VUE_APP_BASE_URL = https://you-gateway.mashibing.com
|
VUE_APP_BASE_URL = https://you-gateway.mashibing.com
|
||||||
VUE_APP_STATIC_URL = https://you-app.mashibing.com
|
VUE_APP_STATIC_URL = https://you-gateway.mashibing.com
|
||||||
VUE_APP_IM_URL = wss://you-gateway.mashibing.com
|
VUE_APP_IM_URL = wss://you-gateway.mashibing.com
|
File diff suppressed because it is too large
Load Diff
@ -1,50 +0,0 @@
|
|||||||
/*
|
|
||||||
* @Author: ch
|
|
||||||
* @Date: 2022-04-29 14:26:10
|
|
||||||
* @LastEditors: ch
|
|
||||||
* @LastEditTime: 2022-07-13 10:37:21
|
|
||||||
* @Description: file content
|
|
||||||
*/
|
|
||||||
|
|
||||||
import { ApiPostAliH5Pay, ApiPostAliAppPay } from '@/common/api/pay';
|
|
||||||
const ENV = process.env;
|
|
||||||
export const Alipay = async ({orderId})=>{
|
|
||||||
|
|
||||||
// #ifdef APP-PLUS
|
|
||||||
const {error, result} = await ApiPostAliAppPay({orderId});
|
|
||||||
if(error){
|
|
||||||
uni.$u.toast(error.message);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
const par = result.payDataInfo;
|
|
||||||
uni.requestPayment({
|
|
||||||
provider: 'alipay',
|
|
||||||
orderInfo :par.payData,
|
|
||||||
success(res) {
|
|
||||||
uni.navigateTo({
|
|
||||||
url : `/payResult?orderId=${orderId}&payType=appWx`
|
|
||||||
});
|
|
||||||
},
|
|
||||||
fail(e) {
|
|
||||||
uni.navigateTo({
|
|
||||||
url : `/payResult?orderId=${orderId}&payType=appWx`
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}).then(res => {
|
|
||||||
console.log('res',res);
|
|
||||||
})
|
|
||||||
// #endif
|
|
||||||
|
|
||||||
// #ifdef H5
|
|
||||||
const { error, result } = await ApiPostAliH5Pay({
|
|
||||||
orderId,
|
|
||||||
returnUrl : decodeURIComponent(`${ENV.VUE_APP_STATIC_URL}/payResult?orderId=${orderId}&payType=alih5`)
|
|
||||||
});
|
|
||||||
if(error){
|
|
||||||
uni.$u.toast(error.message);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
window.location.href = result.payDataInfo.payUrl;
|
|
||||||
// #endif
|
|
||||||
|
|
||||||
}
|
|
@ -1,83 +0,0 @@
|
|||||||
<!--
|
|
||||||
* @Author: ch
|
|
||||||
* @Date: 2022-03-28 17:16:44
|
|
||||||
* @LastEditors: ch
|
|
||||||
* @LastEditTime: 2022-07-13 20:05:42
|
|
||||||
* @Description: file content
|
|
||||||
-->
|
|
||||||
<template>
|
|
||||||
<view>
|
|
||||||
<UiWhiteBox class="main">
|
|
||||||
<image class="icon" src="@/static/goods/cart.png"/>
|
|
||||||
<view class="title">商品已下架</view>
|
|
||||||
<view class="btns">
|
|
||||||
<UiButton class="btn" @click="$Router.pushTab('/')">返回首页</UiButton>
|
|
||||||
</view>
|
|
||||||
</UiWhiteBox>
|
|
||||||
|
|
||||||
<view class="recommend-title">为您推荐</view>
|
|
||||||
<BsChoiceGoods/>
|
|
||||||
</view>
|
|
||||||
</template>
|
|
||||||
<script>
|
|
||||||
import UiButton from '@/components/UiButton.vue'
|
|
||||||
import BsChoiceGoods from '../../components/BsChoiceGoods.vue'
|
|
||||||
import UiWhiteBox from '../../components/UiWhiteBox.vue'
|
|
||||||
export default {
|
|
||||||
components: { UiButton, BsChoiceGoods, UiWhiteBox }
|
|
||||||
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
<style lang="scss">
|
|
||||||
page {
|
|
||||||
background: $color-grey1;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
<style lang="scss" scoped>
|
|
||||||
.main{
|
|
||||||
padding-bottom: 40rpx;
|
|
||||||
}
|
|
||||||
.icon{
|
|
||||||
width: 400rpx;
|
|
||||||
height: 256rpx;
|
|
||||||
margin: 169rpx auto 42rpx;
|
|
||||||
}
|
|
||||||
.title{
|
|
||||||
font-size: $font-size-lg;
|
|
||||||
line-height: 44rpx;
|
|
||||||
color: $color-grey6;
|
|
||||||
}
|
|
||||||
.desc{
|
|
||||||
font-size: $font-size-sm;
|
|
||||||
line-height: 34rpx;
|
|
||||||
color: $color-grey4;
|
|
||||||
}
|
|
||||||
.btns{
|
|
||||||
margin: 74rpx 105rpx 0;
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
}
|
|
||||||
|
|
||||||
.recommend-title{
|
|
||||||
font-size: $font-size-lg;
|
|
||||||
text-align: center;
|
|
||||||
margin: 51rpx auto 30rpx auto;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: space-between;
|
|
||||||
width: 500rpx;
|
|
||||||
&::after,&::before{
|
|
||||||
display: inline-block;
|
|
||||||
content: '';
|
|
||||||
width: 160rpx;
|
|
||||||
height: 2rpx;
|
|
||||||
background: linear-gradient(90deg, $color-grey3 0%, rgba(204, 204, 204, 0) 100%);
|
|
||||||
|
|
||||||
}
|
|
||||||
&::before{
|
|
||||||
|
|
||||||
background: linear-gradient(270deg, $color-grey3 0%, rgba(204, 204, 204, 0) 100%);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
Before Width: | Height: | Size: 4.4 KiB |
Before Width: | Height: | Size: 6.1 KiB |
Before Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 2.8 KiB |
Loading…
Reference in new issue