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 b3c81c9c4c fea35b72d1
commit ff5762a890
13 changed files with 56 additions and 34 deletions
Show Stats Download Patch File Download Diff File

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.0d8f94da.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.6ab2a97e.js></script></body></html>

2
h5/static/js/index.0d8f94da.js → h5/static/js/index.6ab2a97e.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-login.65be14f8.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-login.6ebf71b1.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-saleAfter-saleAfterDetail-index.4f1466e2.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-saleAfter-saleAfterDetail-index.6b2e6f4b.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-seckill.320390aa.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-seckill.55cd4fce.js
View File

File diff suppressed because one or more lines are too long

5
pages/login.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-22 15:36:46
* @LastEditors: ch
* @LastEditTime: 2022-04-22 11:28:03
* @LastEditTime: 2022-04-24 10:19:42
* @Description: file content
-->
<template>
@ -94,7 +94,8 @@ export default {
const {error, result} = await ApiPostLogin({
phone : this.phone,
verificationCode : this.code,
source : 1
clientId : 1,
systemId : 1
});
if(error){
uni.$u.toast(error.message);

4
pages/order/saleAfter/saleAfterDetail/components/StatusTips.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-31 17:53:43
* @LastEditors: ch
* @LastEditTime: 2022-04-19 18:12:04
* @LastEditTime: 2022-04-24 11:09:37
* @Description: file content
-->
<template>
@ -28,7 +28,7 @@ export default {
"2" : {name:'退款关闭' , tips:'', icon: require('@/static/order/qx.png')},
"3" : {name:'请寄回商品，并填写物流信息', tips:'', icon: require('@/static/order/cg.png')},
"4" : {name:'快递已发出，等待商家收货', tips:'您的包裹正在退回的路上', icon: require('@/static/order/cg.png')},
"5" : {name:'快递已收货，等待商家退款', tips:'',icon: require('@/static/order/cg.png')},
"5" : {name:'等待商家退款', tips:'',icon: require('@/static/order/cg.png')},
"6" : {name:'退款成功', tips: '退款将于7个工作日内原路返回，注意查收',icon: require('@/static/order/cg.png')},
"7" : {name:'退款关闭', tips: '', icon: require('@/static/order/qx.png')},
},

5
pages/order/saleAfter/saleAfterDetail/components/SubmitLogistics.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-04-14 13:44:30
* @LastEditors: ch
* @LastEditTime: 2022-04-22 18:53:55
* @LastEditTime: 2022-04-24 11:02:34
* @Description: file content
-->
<template>
@ -88,7 +88,7 @@ export default {
companyCode : '',
companyName : '',
logisticsImages : [],
refundId : this.$Route.query.id,
refundId : '',
remark : '',
trackingNo : ''
}
@ -157,6 +157,7 @@ export default {
},
async submit(){
this.params.logisticsImages = this.fileList.map(i => i.url);
this.params.refundId = this.data.refundId;
const {error, result} = await ApiPutLogisticsInfo(this.params);
if(error){
uni.$u.toast(error.message);

4
pages/order/saleAfter/saleAfterDetail/index.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-31 14:26:09
* @LastEditors: ch
* @LastEditTime: 2022-04-18 11:01:25
* @LastEditTime: 2022-04-24 11:06:05
* @Description: file content
-->
<template>
@ -17,7 +17,7 @@
<SubmitLogistics :data="orderInfo" v-if="orderInfo.refundStatus == 3" :company="logisticsCompany" @reload="getOrderInfo" />
<!-- 退款完成时显示 -->
<LogisticsInfo :data="orderInfo.refundLogistics" v-if="[4,5,6].includes(orderInfo.refundStatus)"/>
<LogisticsInfo :data="orderInfo.refundLogistics" v-if="[4,5,6].includes(orderInfo.refundStatus) && orderInfo.refundLogistics"/>
<!-- 退款订单信息 -->
<GoodsInfo :data="orderInfo"/>

62
pages/seckill.vue
Unescape View File

@ -2,43 +2,42 @@
* @Author: ch
* @Date: 2022-03-21 18:08:07
* @LastEditors: ch
* @LastEditTime: 2022-04-19 18:08:48
* @LastEditTime: 2022-04-24 11:46:48
* @Description: file content
-->
<template>
<view>
<image class="back" src="@/static/common/back_white.png" @click="$Router.back()"/>
<image class="banner" src="@/static/seckill/banner.png"/>
<view class="tab">
<view class="tab--item" :class="{'tab--item__active' : item.id === activityTime.id}"
v-for="item in timeList" :key="item.id" @click="changeTime(item)">
<text class="tab--time">{{item.timeName}}</text>
<text>{{item.isInProgress ? '已开抢' : '即将开抢'}}</text>
<text>{{item.isInProgress ? '抢购中' : '即将开抢'}}</text>
</view>
</view>
<view class="goods">
<view class="goodsItem" v-for="item in goodsList" :key="item.productId">
<image class="goodsItem--image" :src="item.productMainPicture"/>
<view class="goodsItem--con">
<text>{{item.productName}}</text>
<view class="goodsItem--progBox">
<u-line-progress class="goodsItem--prog" :percentage="30" :showText="false" height="11rpx" activeColor="#FE0A16" inactiveColor="#FF8E8F" />
<view class="goods-item" v-for="item in goodsList" :key="item.productId"
@click="$Router.push(`/goodsDetail?id=${item.productId}`)">
<image class="goods-item--image" :src="item.productMainPicture"/>
<view class="goods-item--con">
<text class="goods-item--title">{{item.productName}}</text>
<view class="goods-item--prog-box">
<u-line-progress class="goods-item--prog" :percentage="30" :showText="false" height="11rpx" activeColor="#FE0A16" inactiveColor="#FF8E8F" />
<text>仅剩{{item.stock}}件</text>
</view>
<view class="goodsItem--operation">
<view class="goods-item--operation">
<view>
<view class="goodsItem--price">￥{{item.activityPrice}}</view>
<text class="goodsItem--orgPrice">￥{{item.originalPrice}}</text>
<view class="goods-item--price">￥{{item.activityPrice}}</view>
<text class="goods-item--orgPrice">￥{{item.originalPrice}}</text>
</view>
<template v-if="activityTime.isInProgress">
<button v-if="item.stock > 0" class="goodsItem--btn"
@click="$Router.push(`/goodsDetail?id=${item.productId}`)">立即抢购
<button v-if="item.stock > 0" class="goods-item--btn" >立即抢购
</button>
<button v-else class="goodsItem--btn goodsItem--btn__disable"
@click="$Router.push(`/goodsDetail?id=${item.productId}`)">已售罄
<button v-else class="goods-item--btn goods-item--btn__disable">已售罄
</button>
</template>
<button v-else class="goodsItem--btn"
@click="$Router.push(`/goodsDetail?id=${item.productId}`)">即将开抢
<button v-else class="goods-item--btn">即将开抢
</button>
</view>
</view>
@ -80,7 +79,7 @@ export default {
return false
}
this.timeList = result;
this.activityTime = result[0];
this.activityTime = result.find( i => i.isInProgress) || result[0];
this.getGoodsList()
},
async getGoodsList(){
@ -112,6 +111,14 @@ export default {
page{
background: #F53739;
}
.back{
width: 14rpx;
height: 28rpx;
position: absolute;
top: 118rpx;
left: 40rpx;
z-index: 999;
}
.banner{
height: 678rpx;
width: 750rpx;
@ -151,6 +158,9 @@ page{
&__active text{
color: #F53739;
}
&__active .tab--time{
font-weight: bold;
}
}
&--time{
display: block;
@ -165,7 +175,7 @@ page{
background: #DF1F21;
box-shadow: 0 10rpx 20rpx rgba($color: #000000, $alpha: .1) inset;
}
.goodsItem{
.goods-item{
width: 650rpx;
height: 258rpx;
margin: 30rpx auto;
@ -185,13 +195,23 @@ page{
width: 378rpx;
padding-top: 10rpx;
}
&--progBox{
&--title{
font-weight: bold;
line-height: 32rpx;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 378rpx;
display: block;
}
&--prog-box{
margin-top: 24rpx;
display: flex;
justify-content: start;
align-items: center;
text{
font-size: 22rpx;
font-size: $font-size-sm;
line-height: $font-size-sm;
color: #F31F07;
}
}

Write Preview
Loading…
Cancel
Save