czg_team/cashier_weapp
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'wwz_x' of e.coding.net:g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_d

Browse Source
This commit is contained in:
duan
2024-05-09 11:01:33 +08:00
parent 9ab09c375f e1498a50f6
commit e11d6ffd76
11 changed files with 99 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

180
pages/index/hotlist.vue
View File

@@ -20,7 +20,8 @@
</view> </view>
</view> </view>
<view class="towcontentlistxitembt flex-start"> <view class="towcontentlistxitembt flex-start">
<view class="towcontentlistxitembtitem" :class="index==xitembtitemindex?'towcontentlistxitembtitemaktev':''" <view class="towcontentlistxitembtitem"
:class="index==xitembtitemindex?'towcontentlistxitembtitemaktev':''"
v-for="(item,index) in xitembtitem" :key="index" @click="clickxitembtitemindex(index)"> v-for="(item,index) in xitembtitem" :key="index" @click="clickxitembtitemindex(index)">
{{item.name}} {{item.name}}
</view> </view>
@@ -35,46 +36,13 @@
<view class="fivecontent_item_boxitem flex-between"> <view class="fivecontent_item_boxitem flex-between">
<image :src="item.image" mode=""></image> <image :src="item.image" mode=""></image>
<view class="fivecontent_item_boxitemleft flex-colum-start"> <view class="fivecontent_item_boxitemleft flex-colum-start">
<view class="fivecontent_item_boxitemleftone flex-between"> <view class="fivecontent_item_boxitemleftone">
<view class="fivecontent_item_boxitemleftone_t"><text class="fivecontent_item_boxitemleftone_o">热销TOP.{{index + 1}}</text>热销热销热销热销热销热销热销热销热销热销热销热销热销已抢{{item.realSalesNumber}}份</view>
</view>
<view class="fivecontent_item_boxitemlefttow flex-between">
<view>{{item.productName}}</view> <view>{{item.productName}}</view>
<text>已抢{{item.realSalesNumber}}份</text> <text>已抢{{item.realSalesNumber}}份</text>
</view> </view>
<view class="flex-start flexstartboxfttow">
<view class="fivecontent_item_boxitemlefttow flex-start"
v-for="(c,index2) in item.proTag" :key="index2"
:style="{'background':c.backColor,'color':c.backColor}">
<image class="fivecontent_item_boxitemlefttowimage" v-if="c.shareImg"
:src="c.shareImg" mode="aspectFill"></image>
<text class="fivecontent_item_boxitemlefttowtext">{{c.name}}</text>
</view>
</view>
<view class="indexboxitemleftthere flex-colum-start">
<view class="indexboxitemleftthereabsolute">
马上抢
</view>
<view class="indexboxitemlefttheretext flex-start">
<view class="indexboxitemlefttheretextone">
<text>¥</text>
<text>{{item.salePrice}}</text>
</view>
<view class="indexboxitemlefttheretexttow">
¥{{item.discount}}
</view>
</view>
<view class="indexboxitemleftthere_countdown flex-between">
<text class="indexboxitemleftthere_countdowntext">共省{{item.save}}元</text>
<view class="indexboxitemleftthere_countdowntexts">
<!-- <uni-countdown @timeup="updateCity" :show-day="false" :day="item.end_times.d"
:hour="item.end_times.h" :minute="item.end_times.m"
:second="item.end_times.s" :indexs='index' color="#FFFFFF"
border-color="#00B26A" splitorColor="#FFFFFF"
:font-size="7"></uni-countdown> -->
</view>
</view>
</view>
</view> </view>
</view> </view>
@@ -433,131 +401,37 @@
.fivecontent_item_boxitemleft { .fivecontent_item_boxitemleft {
margin-left: 24rpx; margin-left: 24rpx;
flex: auto; flex: 1;
justify-content: flex-start;
height: 192rpx;
.fivecontent_item_boxitemleftone { .fivecontent_item_boxitemleftone {
width: 100%; width: 100%;
.fivecontent_item_boxitemleftone_t{
text { .fivecontent_item_boxitemleftone_o{
margin-right:10rpx ;
display: inline-block;
font-family: Roboto, Roboto;
font-weight: 500;
font-size: 16rpx;
color: #FFFFFF;
padding: 2rpx 6rpx ;
text-align: center;
background: linear-gradient( 116deg, #FF9D2B 0%, #FF4805 100%);
border-radius: 4rpx 4rpx 4rpx 4rpx;
}
font-family: Source Han Sans CN, Source Han Sans CN; font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400; font-weight: 400;
font-size: 24rpx;
color: #999999;
}
view {
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 500;
font-size: 28rpx; font-size: 28rpx;
color: #333333; color: #333333;
overflow:hidden;
text-overflow:ellipsis;
display:-webkit-box;
-webkit-box-orient:vertical;
-webkit-line-clamp:2;
} }
} }
.flexstartboxfttow {
.fivecontent_item_boxitemlefttow{ .fivecontent_item_boxitemlefttow{
margin-left: 16rpx;
margin-top: 8rpx;
width: max-content;
padding: 4rpx 10rpx;
background: #FFF9E1;
border-radius: 4rpx 4rpx 4rpx 4rpx;
.fivecontent_item_boxitemlefttowtext {
margin-left: 6rpx;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 16rpx;
color: #F9A511;
}
.fivecontent_item_boxitemlefttowimage {
width: 10.82rpx;
height: 14.06rpx;
}
}
.fivecontent_item_boxitemlefttow:nth-child(1) {
margin-left: 0;
background: #FFD6D7;
border-radius: 4rpx 4rpx 4rpx 4rpx;
}
}
.fivecontent_item_boxitemlefttow:nth-child(2) {
margin-left: 12rpx;
background: #FFD6D7;
border-radius: 4rpx 4rpx 4rpx 4rpx;
}
.indexboxitemleftthere {
position: relative;
margin-top: 30rpx;
padding-left: 16rpx;
width: 100%;
height: 88rpx;
background: url(https://czg-qr-order.oss-cn-beijing.aliyuncs.com/index/qinggou.png) no-repeat;
background-size: 100% 100%;
.indexboxitemleftthereabsolute {
position: absolute;
top: 14rpx;
right: 12rpx;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: bold;
font-size: 24rpx;
color: #FFFFFF;
}
.indexboxitemlefttheretext {
.indexboxitemlefttheretextone {
text {
font-family: SourceHanSansCN-Bold, SourceHanSansCN-Bold;
font-weight: normal;
color: #FF5053;
}
text:nth-child(2) {
font-weight: bold;
font-size: 34rpx;
}
text:nth-child(1) {
font-size: 24rpx;
}
}
.indexboxitemlefttheretexttow {
margin-left: 12rpx;
font-size: 20rpx;
font-family: SourceHanSansCN-Regular, SourceHanSansCN-Regular;
font-weight: normal;
color: #999999;
text-decoration: line-through;
}
}
.indexboxitemleftthere_countdown {
width: 100%;
padding-right: 7rpx;
.indexboxitemleftthere_countdowntext {
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 24rpx;
color: #999999;
}
.indexboxitemleftthere_countdowntexts {
font-family: Roboto, Roboto;
font-weight: 400;
color: #333333;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: bold;
font-size: 16rpx;
color: #FFFFFF;
}
}
} }
} }
} }

6
pages/order/order.vue
View File

@@ -25,7 +25,7 @@
</view> </view>
</view> </view>
</u-sticky> </u-sticky>
<view class="list-wrap"> <view class="list-wrap" v-if="navtabindex == 1">
<view class="item" v-for="(item,index) in list" :key="index" @click="orderinfo(item)"> <view class="item" v-for="(item,index) in list" :key="index" @click="orderinfo(item)">
<view class="header-wrap"> <view class="header-wrap">
<text v-if="item.sendType == 'post'">快递</text> <text v-if="item.sendType == 'post'">快递</text>
@@ -86,6 +86,10 @@
</view> </view>
</view> </view>
</view> </view>
</view>
<!-- 新订单 -->
<view class="" v-if="navtabindex == 0">
</view> </view>
<image style="margin:32rpx auto;" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/nomore.png" <image style="margin:32rpx auto;" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/nomore.png"
v-if="is_end" mode="aspectFill"></image> v-if="is_end" mode="aspectFill"></image>

4
pages/product/index.vue
View File

@@ -800,8 +800,8 @@
.fivecontent_item_boxitem { .fivecontent_item_boxitem {
image { image {
width: 192rpx; width: 208rpx;
height: 192rpx; height: 208rpx;
border-radius: 12rpx; border-radius: 12rpx;
} }

BIN
static/user/user_icon1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.5 KiB

BIN
static/user/user_icon2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.2 KiB

BIN
static/user/user_icon3.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.4 KiB

BIN
static/user/user_icon4.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.8 KiB

BIN
static/user/user_icon5.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.0 KiB

BIN
static/user/user_icon6.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.5 KiB

BIN
static/user/user_icon7.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.8 KiB

BIN
static/user/user_icon8.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB