msb-mca
/
shop-app
2.1k
2
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev1.0.0' into develop

Browse Source
msb_beta
ch 3 years ago
parent 83f69dd5e2 d663e6d9da
commit 3543ccd5ba
11 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File

2
common/utils/requset.js
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-17 17:42:32
* @LastEditors: ch
* @LastEditTime: 2022-04-29 15:58:12
* @LastEditTime: 2022-04-29 17:06:35
* @Description: 项目接口请求统一处理器，返回一个需要token和不需要token的请求封装方法
*/

4
common/utils/wxpay.js
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-04-29 14:26:10
* @LastEditors: ch
* @LastEditTime: 2022-04-29 14:54:16
* @LastEditTime: 2022-04-29 16:55:57
* @Description: file content
*/
@ -50,7 +50,7 @@ export const Wxpay = async ({orderId,openId})=>{
uni.$u.toast(error.message);
return false;
}
const redirect_url = decodeURIComponent(`https://like-app.mashibing.com/payResult?orderId=${orderId}`);
const redirect_url = decodeURIComponent(`https://you-app.mashibing.com/payResult?orderId=${orderId}`);
window.location.href = `${result.dataInfo.payUrl}&redirect_url=${redirect_url}`;
}
}

2
h5/index.html
Unescape View File

@ -1,2 +1,2 @@
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>马士兵严选</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.ef44eb10.js></script></body></html>
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.4c73f1a7.js></script></body></html>

2
h5/static/js/index.ef44eb10.js → h5/static/js/index.4c73f1a7.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-goods-detail-index.04258da9.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-goods-detail-index.cb111de3.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-submit.8784e2d6.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-submit.bb6eea15.js
View File

File diff suppressed because one or more lines are too long

3
pages/goods/detail/components/SkuPopup.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-24 11:30:55
* @LastEditors: ch
* @LastEditTime: 2022-04-29 00:13:38
* @LastEditTime: 2022-04-29 17:05:26
* @Description: file content
-->
<template>
@ -50,7 +50,6 @@
<UiButton v-else class="btn__confirm" type="gradual" size="max" @click="confirm">确认</UiButton>
</view>
</view>
</u-popup>
</template>

15
pages/goods/detail/index.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-23 17:27:21
* @LastEditors: ch
* @LastEditTime: 2022-04-29 15:48:48
* @LastEditTime: 2022-04-29 17:01:20
* @Description: file content
-->
<template>
@ -24,7 +24,7 @@
</view>
<view class="select">
<Service></Service>
<u-cell label="选择" :value="curSku.name || '请选择规格'" :border="false" isLink @click="onShowSkuPopup(1)"></u-cell>
<u-cell v-if="stock > 0" label="选择" :value="curSku.name || '请选择规格'" :border="false" isLink @click="onShowSkuPopup(1)"></u-cell>
<SkuPopup v-model="curSku" :visible.sync="showSkuPopup" :mode="skuMode"
:goodsInfo="goods" :skuInfo="skuInfoData" :activityStatus="activityStatus">
</SkuPopup>
@ -32,6 +32,7 @@
<view class="goods-desc">
<mp-html :content="goods.detail"/>
</view>
<view class="footer--not-stock" v-if="stock == 0">商品无库存啦~看看其他的吧</view>
<view class="footer">
<view class="footer--left">
<view class="icon service">客服</view>
@ -212,6 +213,16 @@ page{
border-top-right-radius: 24rpx;
background: $color-grey0;
box-shadow: 0 8rpx 80rpx 1px rgba(0, 0, 0, 0.1);
&--not-stock{
width: 100%;
height: 80rpx;
line-height: 80rpx;
background: rgba($color: #2E354E, $alpha: .5);
color: $color-grey0;
text-align: center;
position: fixed;
bottom: 206rpx;
}
&--left{
display: flex;
}

4
pages/order/submit.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-20 14:14:53
* @LastEditors: ch
* @LastEditTime: 2022-04-29 14:56:02
* @LastEditTime: 2022-04-29 16:58:05
* @Description: file content
-->
<template>
@ -164,7 +164,7 @@ export default {
return false;
}
if(this.payType === 'wxpay'){
Wxpay(result.orderId, this.$store.state.openId);
Wxpay({orderId : result.orderId, openId : this.$store.state.openId});
}else{
uni.$u.toast('暂不支持支付宝支付');
}

Write Preview
Loading…
Cancel
Save