Compare commits
44 Commits
feature/co
...
main
Author | SHA1 | Date |
---|---|---|
|
550ea9ddf9 | 2 months ago |
|
a83f41c883 | 1 year ago |
|
0237f70511 | 1 year ago |
|
24df19af14 | 2 years ago |
|
fad9ff6ccb | 2 years ago |
|
f360233caa | 2 years ago |
|
0508a6d9df | 2 years ago |
|
041e15495d | 2 years ago |
|
2a42d55fb6 | 2 years ago |
|
d1f0e5fbd4 | 2 years ago |
|
874340f948 | 2 years ago |
|
39f379875b | 2 years ago |
|
5d8a42f48c | 2 years ago |
|
b59d0698ae | 2 years ago |
|
194587ba1b | 2 years ago |
|
9f195f09b7 | 2 years ago |
|
a35cb72501 | 2 years ago |
|
c010790f96 | 2 years ago |
|
03dab5bd96 | 2 years ago |
|
24ba55fa25 | 2 years ago |
|
5832a43169 | 2 years ago |
|
0ce97eb86b | 2 years ago |
|
325bee7e80 | 2 years ago |
|
0ce7d20886 | 2 years ago |
|
774b4f4064 | 2 years ago |
|
251d091312 | 2 years ago |
|
987566558d | 2 years ago |
|
ffdb3e549f | 2 years ago |
|
1e6de755bd | 2 years ago |
|
d4a93fed3d | 2 years ago |
|
6cc4720315 | 2 years ago |
|
df1a27323d | 2 years ago |
|
0391e24745 | 2 years ago |
|
907bcabad2 | 2 years ago |
|
5dc332c05f | 2 years ago |
|
410a721436 | 2 years ago |
|
03e27975b4 | 2 years ago |
|
b2d1f2d9c0 | 2 years ago |
|
e5634eeacb | 2 years ago |
|
d1ba4b1842 | 2 years ago |
|
46a6767afb | 2 years ago |
|
96def57eaa | 2 years ago |
|
2f1332b05d | 2 years ago |
|
ec932a429b | 2 years ago |
@ -1,4 +1,3 @@
|
|||||||
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-gateway.mashibing.com
|
VUE_APP_STATIC_URL = https://you-app.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-gateway.mashibing.com
|
VUE_APP_STATIC_URL = https://you-app.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
@ -0,0 +1,50 @@
|
|||||||
|
/*
|
||||||
|
* @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
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,83 @@
|
|||||||
|
<!--
|
||||||
|
* @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>
|
After Width: | Height: | Size: 4.4 KiB |
After Width: | Height: | Size: 6.1 KiB |
After Width: | Height: | Size: 2.0 KiB |
After Width: | Height: | Size: 2.8 KiB |
Loading…
Reference in new issue