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

修改登录

Browse Source
msb_beta
ch 2 years ago
parent 3e8bbdcdd2
commit 47423491ed
33 changed files with 91 additions and 51 deletions
Show Stats Download Patch File Download Diff File

4
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-21 20:43:35
* @LastEditTime: 2022-04-22 11:12:36
* @Description: 项目接口请求统一处理器，返回一个需要token和不需要token的请求封装方法
*/
@ -11,7 +11,7 @@ import $store from '@/common/store';
const ENV = 'test';
const BASE_URL = {
'test' : 'http://k8s-horse-gateway.mashibing.cn',
'test' : 'https://k8s-horse-gateway.mashibing.cn',
// 'test' : '',
'release' : '',
'prod' : ''

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.29641dd5.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.59b54823.js></script></body></html>

BIN
h5/static/index/tag1.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
h5/static/index/tag2.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
h5/static/index/tag3.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 795 B

2
h5/static/js/index.29641dd5.js → h5/static/js/index.59b54823.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-account-address-create~pages-account-address-edit~pages-account-setting-setUserInfo~pages-orde~bbb2dfdd.4df64c2a.js → h5/static/js/pages-account-address-create~pages-account-address-edit~pages-account-setting-setUserInfo~pages-orde~bbb2dfdd.4a76150d.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-account-address-edit.40908420.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-account-address-edit.becba5f2.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-account-address-list~pages-cart-cart~pages-cart-tabBarCart~pages-goods-category~pages-goods-li~44ded30c.e431ed9e.js → h5/static/js/pages-account-address-list~pages-cart-cart~pages-cart-tabBarCart~pages-goods-category~pages-goods-li~44ded30c.bed21cc8.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-account-index.1ea3bcde.js → h5/static/js/pages-account-index.9cd08c7d.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-account-setting-setName.2af906f3.js → h5/static/js/pages-account-setting-setName.6476f990.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-goods-detail-index.7d341c56.js → h5/static/js/pages-goods-detail-index.e740140b.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-goods-search.68742121.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-goods-search.dce747f1.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-index-index.35cdd1e7.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-index-index.831a4e01.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-login.5a1c273e.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-login.f391beda.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-detail-index.037fc1b4.js → h5/static/js/pages-order-detail-index.e15813ac.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-logisitcsInfo.1c0a6f4a.js → h5/static/js/pages-order-logisitcsInfo.07ff3e3b.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-saleAfter-saleAfterApply.d26c3072.js → h5/static/js/pages-order-saleAfter-saleAfterApply.4c5e9fc8.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-saleAfter-saleAfterEdit.3ecb6312.js → h5/static/js/pages-order-saleAfter-saleAfterEdit.d2683828.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-saleAfter-saleAfterSelect.5d680a99.js → h5/static/js/pages-order-saleAfter-saleAfterSelect.6ab37fcd.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-submit.cfb950bc.js → h5/static/js/pages-order-submit.ea0393fc.js
View File

File diff suppressed because one or more lines are too long

4
pages/account/address/edit.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-22 14:12:18
* @LastEditors: ch
* @LastEditTime: 2022-04-21 21:12:19
* @LastEditTime: 2022-04-21 21:14:45
* @Description: file content
-->
<template>
@ -103,7 +103,7 @@ export default {
uni.$u.toast(error.message);
return false;
}
this.$Router.back();\
this.$Router.back();
}
})
}

9
pages/goods/search.vue
Unescape View File

@ -2,13 +2,12 @@
* @Author: ch
* @Date: 2022-03-21 11:29:38
* @LastEditors: ch
* @LastEditTime: 2022-04-12 10:28:28
* @LastEditTime: 2022-04-22 11:01:26
* @Description: file content
-->
<template>
<view class="container">
<UiPageHeader>
<UiPageHeader class="header">
<view slot="custom" class="search">
<u--input class="search--input" focus placeholder="请输入您想搜索的商品名称"
prefixIcon="search" ref="search" clearable prefixIconStyle="font-size:48rpx;color:#ccc"
@ -114,7 +113,9 @@ export default {
page{
background: $color-grey0;
}
.header{
background: $color-grey0;
}
.search{
height: 88rpx;
flex: 1;

54
pages/index/components/Pick.vue
Unescape View File

@ -2,15 +2,20 @@
* @Author: ch
* @Date: 2022-03-23 10:29:07
* @LastEditors: ch
* @LastEditTime: 2022-04-21 19:11:01
* @LastEditTime: 2022-04-22 10:34:09
* @Description: file content
-->
<template>
<view class="pick">
<view class="max" @click="$Router.push(`/goodsDetail?id=${max.id}`)">
<view class="title">{{max.title}}</view>
<view class="desc">{{max.subTitle}}</view>
<!-- <view class="tag"></view> -->
<view class="desc">{{max.subtitle}}</view>
<view class="tag">
<image v-for="i in max.labelList" :key="i"
:src="i === '秒杀' ? require('@/static/index/tag1.png') :
i === '爆款' ? require('@/static/index/tag2.png') :
require('@/static/index/tag3.png')">
</view>
<!-- <view class="price">￥{{max.startingPrice}}</view> -->
<UiMoney class="price" :money="max.startingPrice" prefix></UiMoney>
<view class="img-box">
@ -21,9 +26,12 @@
<view class="title">{{minOne.title}}</view>
<view class="min--info-box">
<view class="min--info-box-right">
<view class="desc">{{minOne.subTitle}}</view>
<view class="desc">{{minOne.subtitle}}</view>
<view class="tag">
sss
<image v-for="i in minOne.labelList" :key="i"
:src="i === '秒杀' ? require('@/static/index/tag1.png') :
i === '爆款' ? require('@/static/index/tag2.png') :
require('@/static/index/tag3.png')">
</view>
<UiMoney class="price" :money="minOne.startingPrice" prefix></UiMoney>
</view>
@ -36,8 +44,13 @@
<view class="title">{{minTwo.title}}</view>
<view class="min--info-box">
<view class="min--info-box-right">
<view class="desc">{{minTwo.subTitle}}</view>
<view class="tag"></view>
<view class="desc">{{minTwo.subtitle}}</view>
<view class="tag">
<image v-for="i in minTwo.labelList" :key="i"
:src="i === '秒杀' ? require('@/static/index/tag1.png') :
i === '爆款' ? require('@/static/index/tag2.png') :
require('@/static/index/tag3.png')">
</view>
<UiMoney class="price" :money="minTwo.startingPrice" prefix></UiMoney>
</view>
<view class="img-box">
@ -63,6 +76,7 @@ export default {
},
computed:{
max (){
console.log(this.data);
return this.data[0] || {}
},
minOne (){
@ -83,21 +97,33 @@ export default {
flex-flow: column wrap;
justify-content: space-between;
.title,.desc{
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
margin: 10rpx 20rpx;
line-height: 24rpx;
padding: 10rpx 20rpx 0;
}
.title{
margin-top: 20rpx;
padding-top: 20rpx;
line-height: 28rpx;
font-weight: bold;
}
.tag{
padding-left: 20rpx;
padding-top: 20rpx;
image{
width: 60rpx;
height: 32rpx;
margin-right: 4rpx;
}
}
.desc{
color: $color-grey4;
font-size: 22rpx;
}
.price{
margin: 24rpx 0 10rpx 20rpx;
margin: 20rpx 0 10rpx 20rpx;
}
}
@ -108,12 +134,14 @@ export default {
border-radius: 8rpx;
.img-box{
display: flex;
justify-content: end;
overflow: hidden;
width: 100%;
}
.img{
width: 260rpx;
height: 260rpx;
margin-left: 66rpx;
float: right;
}
}
.min{
@ -142,10 +170,12 @@ export default {
text{
color: $color-yellow4;
font-size: $font-size-lg;
line-height: $font-size-lg;
font-weight: bold;
}
.ui-money--prefix{
font-size: $font-size-sm;
line-height: $font-size-sm;
}
}
</style>

9
pages/index/index.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2019-08-22 19:41:20
* @LastEditors: ch
* @LastEditTime: 2022-04-21 17:00:00
* @LastEditTime: 2022-04-21 22:01:41
* @Description: file content
-->
<template>
@ -95,12 +95,9 @@ export default {
},
async getRecommendedGoodsList(){
const {error, result} = await ApiGetRecommendedGoodsList({
pageIndex : 1,
length : 3
});
const {error, result} = await ApiGetRecommendedGoodsList();
if(result){
this.recommendedGoodsList = result.records
this.recommendedGoodsList = result
}
},

28
pages/login.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-22 15:36:46
* @LastEditors: ch
* @LastEditTime: 2022-04-20 19:36:46
* @LastEditTime: 2022-04-22 11:18:14
* @Description: file content
-->
<template>
@ -26,7 +26,7 @@
<UiButton class="login--btn" type="gradual" @click="login">登录</UiButton>
<label class="login--agreement">
<radio class="radio" :checked="checked" @click="checked = !checked" color="#FF875B"/>
同意<text class="link">《用户协议》</text><text class="link">《隐私协议》</text>首次登录自动注册
同意<text class="link">《用户协议》</text><text class="link">《隐私协议》</text>首次登录将自动注册
</label>
</view>
</template>
@ -144,6 +144,7 @@ export default {
font-size: 46rpx;
text-align: center;
margin: 25rpx 0 84rpx 0;
font-weight: bold;
}
.login{
width: 650rpx;
@ -175,17 +176,28 @@ export default {
&--agreement{
width: 650rpx;
padding: 0 50rpx;
text-align: center;
color: $color-grey4;
font-size: $font-size-sm;
.radio{
transform: scale(60%);
}
line-height: $font-size-sm;
display: flex;
align-items: center;
justify-content: center;
.link{
color: $color-grey6;
font-size: $font-size-sm;
line-height: $font-size-sm;
}
}
}
/deep/{
.input-placeholder{
color: $color-grey3;
}
.uni-radio-input{
width: 28rpx;
height: 28rpx;
}
}
</style>

BIN
static/index/tag1.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
static/index/tag2.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
static/index/tag3.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 795 B

Write Preview
Loading…
Cancel
Save