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 2 years ago
parent 633451f173 37899319b8
commit 548fe5a02c
21 changed files with 46 additions and 25 deletions
Show Stats Download Patch File Download Diff File

4
components/UiGoodsInfoMax.vue
Unescape View File

@ -2,11 +2,11 @@
* @Author: ch * @Author: ch
* @Date: 2022-04-22 16:48:11 * @Date: 2022-04-22 16:48:11
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-04-22 17:03:48 * @LastEditTime: 2022-04-22 20:52:22
* @Description: file content * @Description: file content
--> -->
<template> <template>
<view class="goods-item"> <view class="goods-item" @click="$emit('click')">
<image class="goods-item--image" mode="aspectFit" :src="data.productImageUrl" /> <image class="goods-item--image" mode="aspectFit" :src="data.productImageUrl" />
<view class="goods-item--con"> <view class="goods-item--con">
<view class="goods-item--title-box"> <view class="goods-item--title-box">

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)')) <!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.27db4afe.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.e8312dde.js></script></body></html>

BIN
h5/static/goods/seckill.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
h5/static/img/seckill.b74bac11.png → h5/static/goods/seckill_start.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

BIN
h5/static/img/seckill.d9f37c24.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
h5/static/img/seckill_start.b74bac11.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.0 KiB

2
h5/static/js/index.27db4afe.js → h5/static/js/index.e8312dde.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-account-address-list.316cbf37.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-account-address-list.ed1ce608.js
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-detail-index.4b664f9b.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-detail-index.7abaa2a5.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-list.d2796a28.js → h5/static/js/pages-order-list.8dd4b22d.js
View File

File diff suppressed because one or more lines are too long

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

@ -2,7 +2,7 @@
* @Author: ch * @Author: ch
* @Date: 2022-03-22 13:54:15 * @Date: 2022-03-22 13:54:15
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-04-22 18:58:37 * @LastEditTime: 2022-04-22 21:08:34
* @Description: file content * @Description: file content
--> -->
<template> <template>
@ -55,7 +55,7 @@ export default {
selectedId :{ selectedId :{
get(){ get(){
const queryId = this.query.id, const queryId = this.query.id,
defaultAddress = this.addresList.find(i => i.isDefault); defaultAddress = this.addresList.find(i => i.isDefault) || {};
return queryId || defaultAddress.id; return queryId || defaultAddress.id;
}, },
set(val){ set(val){

29
pages/goods/detail/components/SeckillPrice.vue
Unescape View File

@ -2,12 +2,16 @@
* @Author: ch * @Author: ch
* @Date: 2022-04-12 17:33:42 * @Date: 2022-04-12 17:33:42
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-04-13 13:47:07 * @LastEditTime: 2022-04-22 21:02:11
* @Description: file content * @Description: file content
--> -->
<template> <template>
<view class="seckill"> <view class="seckill" :class="activityStatus === 'startActivity' && 'seckill__start'">
<view class="seckill--price-box"> <view class="seckill--price-box" v-if="activityStatus === 'noStartActivity'">
<text class="seckill--price-icon">￥</text>
<text class="seckill--price">{{data.originalPrice}}</text>
</view>
<view class="seckill--price-box " v-else>
<text class="seckill--price-icon">￥</text> <text class="seckill--price-icon">￥</text>
<text class="seckill--price">{{data.activityPrice}}</text> <text class="seckill--price">{{data.activityPrice}}</text>
<text class="seckill--price-org">￥{{data.originalPrice}}</text> <text class="seckill--price-org">￥{{data.originalPrice}}</text>
@ -27,6 +31,10 @@ export default {
data : { data : {
type : Object, type : Object,
default : () => ({}) default : () => ({})
},
activityStatus : {
type : String,
default : 'noStartActivity'
} }
}, },
data(){ data(){
@ -113,17 +121,26 @@ export default {
position: relative; position: relative;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding: 0 20rpx 0 234rpx; padding: 0 20rpx 0 260rpx;
&::after{ &::after{
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
display: block; display: block;
content: ''; content: '';
width: 266rpx; width: 367rpx;
height: 100rpx; height: 100rpx;
background: url('@/static/goods/seckill.png') no-repeat -8rpx -16rpx; background: url('@/static/goods/seckill.png') no-repeat -8rpx -16rpx;
background-size: 290rpx; background-size: 327rpx;
}
&__start{
padding: 0 20rpx 0 234rpx;
&::after{
width: 327rpx;
background: url('@/static/goods/seckill_start.png') no-repeat -8rpx -16rpx;
background-size: 290rpx;
}
} }
&--price-box{ &--price-box{
padding-top: 30rpx; padding-top: 30rpx;

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

@ -2,7 +2,7 @@
* @Author: ch * @Author: ch
* @Date: 2022-03-23 17:27:21 * @Date: 2022-03-23 17:27:21
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-04-22 20:09:27 * @LastEditTime: 2022-04-22 21:04:17
* @Description: file content * @Description: file content
--> -->
<template> <template>
@ -11,7 +11,8 @@
<image class="back--icon" src="@/static/goods/back.png"/> <image class="back--icon" src="@/static/goods/back.png"/>
</view> </view>
<SlideImage :images="goods.pictureList"></SlideImage> <SlideImage :images="goods.pictureList"></SlideImage>
<SeckillPrice :data.sync="productActivityVO" v-if="productActivityVO.isActivity" @change="getGoodsDetail"></SeckillPrice> <SeckillPrice :data.sync="productActivityVO" :activityStatus="activityStatus"
v-if="productActivityVO.isActivity" @change="getGoodsDetail"></SeckillPrice>
<view class="goods-info"> <view class="goods-info">
<view class="pirce" v-if="!productActivityVO.isActivity"> <view class="pirce" v-if="!productActivityVO.isActivity">
<text>￥</text> <text>￥</text>
@ -36,9 +37,8 @@
<view class="icon cart" @click="$Router.push('/cart')">购物车</view> <view class="icon cart" @click="$Router.push('/cart')">购物车</view>
</view> </view>
<view class="footer--btns"> <view class="footer--btns">
<UiButton class="btn" :disable="stock == 0" v-if="activityStatus !== 'startActivity' " @click="onShowSkuPopup(2)">加入购物车</UiButton> <UiButton class="btn" :disable="stock == 0 || activityStatus == startActivity" @click="onShowSkuPopup(2)">加入购物车</UiButton>
<UiButton class="btn btn--buy" :disable="stock == 0" v-if="activityStatus === 'noStartActivity'" @click="onShowSkuPopup(3)">原价购买</UiButton> <UiButton class="btn btn--buy" :disable="stock == 0" @click="onShowSkuPopup(3)"> 立即购买</UiButton>
<UiButton class="btn btn--buy" :disable="stock == 0" v-else @click="onShowSkuPopup(3)"> 立即购买</UiButton>
</view> </view>
</view> </view>
</view> </view>

8
pages/order/detail/components/LogisitcsInfo.vue
Unescape View File

@ -2,13 +2,13 @@
* @Author: ch * @Author: ch
* @Date: 2022-04-15 16:36:02 * @Date: 2022-04-15 16:36:02
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-04-22 18:28:23 * @LastEditTime: 2022-04-22 21:10:56
* @Description: file content * @Description: file content
--> -->
<template> <template>
<UiWhiteBox> <UiWhiteBox>
<u-cell class="address" isLink v-if="lastLogisitcs" <u-cell class="address" isLink v-if="lastLogisitcs"
@click="$Router.push(`/logisitcsInfo?orderId=${orderInfo.orderId}`)"> @click="$Router.push(`/logisitcsInfo?orderId=${orderId}`)">
<view slot="title" class="address--title">{{lastLogisitcs.context}}</view> <view slot="title" class="address--title">{{lastLogisitcs.context}}</view>
<image class="address--icon" slot="icon" src="@/static/order/fj.png" /> <image class="address--icon" slot="icon" src="@/static/order/fj.png" />
<view slot="label" class="address--label"> <view slot="label" class="address--label">
@ -36,6 +36,10 @@ export default {
logisitcsInfo : { logisitcsInfo : {
type : Object, type : Object,
defalut : () => ({}) defalut : () => ({})
},
orderId: {
type : Number | null,
defalut : null
} }
}, },
computed : { computed : {

4
pages/order/detail/index.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch * @Author: ch
* @Date: 2022-03-31 14:26:09 * @Date: 2022-03-31 14:26:09
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-04-22 18:48:28 * @LastEditTime: 2022-04-22 21:11:38
* @Description: file content * @Description: file content
--> -->
<template> <template>
@ -29,7 +29,7 @@
</template> </template>
</UiGoodsInfo> </UiGoodsInfo>
</UiWhiteBox> </UiWhiteBox>
<LogisitcsInfo :logisitcsInfo="orderInfo.logistics" /> <LogisitcsInfo :logisitcsInfo="orderInfo.logistics" :orderId="orderInfo.orderId"/>
<OrderInfo :orderInfo="orderInfo" /> <OrderInfo :orderInfo="orderInfo" />
<Operation :orderInfo="orderInfo" v-if="orderInfo.orderStatus !== 3"></Operation> <Operation :orderInfo="orderInfo" v-if="orderInfo.orderStatus !== 3"></Operation>
</view> </view>

BIN
static/goods/seckill.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
static/goods/seckill_start.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.0 KiB

Write Preview
Loading…
Cancel
Save