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 e7f7063eff da1e497b3a
commit 27ed866454
26 changed files with 89 additions and 26 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape View File

@ -1,5 +1,6 @@
.hbuilderx/
.history/
env.js
node_moudel/
package-lock.json
unpackage/dist/build/.automator/

0
build/build.js
Unescape View File

45
build/env.config.js
Unescape View File

@ -0,0 +1,45 @@
/*
* @Author: ch
* @Date: 2022-05-05 14:40:00
* @LastEditors: ch
* @LastEditTime: 2022-05-05 18:07:18
* @Description: 根据git分支生成对应环境的环境变量
* 开发时如果环境变量换了，可以不用重启服务，直接运行node env.config.js即可
*/
const fs = require('fs');
const path = require('path');
const getRepoInfo = require('git-repo-info');
const envConfig = {
dev : {
base_url: 'dev'
},
test : {
base_url: 'xxx'
},
reslese : {
base_url: 'xxx'
},
prod : {
base_url: 'xxx'
}
}
const branch = getRepoInfo().branch; // 调用获取git信息
let curEnvConfig = {};
switch (branch){
case 'msb_test':
curEnvConfig = envConfig.test;
break;
case 'msb_beta':
curEnvConfig = envConfig.release;
break;
case 'msb_prod':
curEnvConfig = envConfig.prod;
break;
default:
curEnvConfig = envConfig.dev;
break;
}
fs.writeFileSync(`${path.resolve(__dirname, '../common/config')}/env.js`,
`const ENV = ${JSON.stringify(curEnvConfig)}; export default ENV;`);

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-05-05 16:22:30
* @LastEditTime: 2022-05-05 19:00:38
* @Description: 项目接口请求统一处理器，返回一个需要token和不需要token的请求封装方法
*/

6
common/utils/wxpay.js
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-04-29 14:26:10
* @LastEditors: ch
* @LastEditTime: 2022-05-05 11:26:35
* @LastEditTime: 2022-05-05 19:16:29
* @Description: file content
*/
@ -35,7 +35,7 @@ export const Wxpay = async ({orderId,openId})=>{
}, res => {
if(res.err_msg !== 'get_brand_wcpay_request:cancel'){
uni.navigateTo({
url : `/payResult?orderId=${orderId}`
url : `/payResult?orderId=${orderId}&payType=wxjsapi`
});
}
})
@ -46,7 +46,7 @@ export const Wxpay = async ({orderId,openId})=>{
uni.$u.toast(error.message);
return false;
}
const redirect_url = decodeURIComponent(`https://you-app.mashibing.com/payResult?orderId=${orderId}`);
const redirect_url = decodeURIComponent(`https://you-app.mashibing.com/payResult?orderId=${orderId}&payType=wxh5`);
window.location.href = `${result.dataInfo.payUrl}&redirect_url=${redirect_url}`;
}
}

8
index.html
Unescape View File

@ -1,3 +1,10 @@
<!--
* @Author: ch
* @Date: 2022-05-05 10:57:05
* @LastEditors: ch
* @LastEditTime: 2022-05-05 16:53:23
* @Description: file content
-->
<!DOCTYPE html>
<html lang="en">
<head>
@ -14,7 +21,6 @@
<!--app-context-->
</head>
<body>
<div>sdfadsfasd</div>
<div id="app"><!--app-html--></div>
<script type="module" src="/main.js"></script>
</body>

3
package.json
Unescape View File

@ -21,6 +21,7 @@
"vuex": "^3.6.2"
},
"devDependencies": {
"@dcloudio/uni-helper-json": "^1.0.13"
"@dcloudio/uni-helper-json": "^1.0.13",
"git-repo-info": "^2.1.1"
}
}

14
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-05-05 16:14:29
* @LastEditTime: 2022-05-05 17:19:09
* @Description: file content
-->
<template>
@ -205,8 +205,10 @@ page {
padding: 20rpx;
}
.footer{
height: 206rpx;
padding: 0 30rpx 68rpx 30rpx;
padding: 30rpx;
padding-bottom: calc(constant(safe-area-inset-bottom) + 50rpx) ;
padding-bottom: calc(env(safe-area-inset-bottom) + 50rpx);
// box-sizing: border-box;
display: flex;
justify-content: space-between;
align-items: center;
@ -214,8 +216,6 @@ page {
bottom: 0;
left: 0;
right: 0;
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
border-top-left-radius: 24rpx;
border-top-right-radius: 24rpx;
background: $color-grey0;
@ -228,7 +228,9 @@ page {
color: $color-grey0;
text-align: center;
position: fixed;
bottom: 206rpx;
z-index: 9;
bottom: calc(180rpx + constant(safe-area-inset-bottom)) ;
bottom: calc(180rpx + env(safe-area-inset-bottom));
}
&--left{
display: flex;

4
pages/index/components/Banner.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-23 10:31:12
* @LastEditors: ch
* @LastEditTime: 2022-04-30 19:30:49
* @LastEditTime: 2022-05-05 18:37:20
* @Description: file content
-->
<template>
@ -63,7 +63,7 @@ export default {
top:-2rpx;
height: 231rpx;
width: 110vw;
background: $color-blue5;
background: #F3574D;
border-bottom-left-radius: 100%;
border-bottom-right-radius: 100%;
}

10
pages/index/index.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2019-08-22 19:41:20
* @LastEditors: ch
* @LastEditTime: 2022-05-05 10:52:47
* @LastEditTime: 2022-05-05 18:42:34
* @Description: file content
-->
<template>
@ -33,10 +33,10 @@
</view>
<Seckill :data="seckillData" v-if="seckillData.activityTimeVO"></Seckill>
<view class="title">为您甄选</view>
<view class="title">甄选推荐</view>
<Pick :data="recommendedGoodsList"></Pick>
<view class="title">为您推荐</view>
<view class="title">为您精选</view>
<BsChoiceGoods ref="goodsGroup" ></BsChoiceGoods>
@ -142,7 +142,7 @@ page {
display: flex;
align-items: center;
justify-content: space-between;
background: $color-blue5;
background: #F3574D;
}
.logo{
width: 265rpx;
@ -170,7 +170,7 @@ page {
}
.search{
padding: 5rpx 30rpx 0;
background: $color-blue5;
background: #F3574D;
&__min{
width: 548rpx;
padding: 0;

12
pages/order/payResult.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-04-28 15:01:41
* @LastEditors: ch
* @LastEditTime: 2022-05-05 11:34:39
* @LastEditTime: 2022-05-05 19:18:30
* @Description: file content
-->
@ -29,7 +29,7 @@
<view class="title">支付失败</view>
<view class="desc">请重新试试</view>
<view class="btns">
<UiButton class="btn" @click="$Router.back()">返回商品详情</UiButton>
<UiButton class="btn" @click="back">返 回</UiButton>
</view>
</template>
</template>
@ -66,6 +66,14 @@ export default {
}
this.orderInfo = result;
uni.setNavigationBarTitle({title:result.isSuccess ? '支付成功' : '支付失败'});
},
back(){
const payType = this.$Route.query.payType;
if(payType === 'wxh5'){
this.$Router.back(2);
}else{
this.$Router.back();
}
}
}

BIN
static/index/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

0
unpackage/dist/build/h5/static/img/logo.c66e030d.png → static/index/logo3.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

2
unpackage/dist/build/h5/index.html vendored
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.bc92b924.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.d753a032.js></script></body></html>

BIN
unpackage/dist/build/h5/static/.DS_Store vendored
View File

Binary file not shown.

BIN
unpackage/dist/build/h5/static/img/logo.187a7a64.png vendored
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
unpackage/dist/build/h5/static/index/.DS_Store vendored
View File

Binary file not shown.

BIN
unpackage/dist/build/h5/static/index/logo.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
unpackage/dist/build/h5/static/index/logo3.png vendored
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

2
unpackage/dist/build/h5/static/js/index.bc92b924.js → unpackage/dist/build/h5/static/js/index.d753a032.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-goods-detail-index.57dbdbaa.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-goods-detail-index.6ad00af4.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-index-index.47d9d6e3.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-index-index.5402f9f3.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-order-payResult.8a44d5b0.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-order-payResult.fb3f1b81.js vendored
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save