Skip to content

Commit fe3c84e

Browse files
gookinggooking
committed
1
1 parent 00da712 commit fe3c84e

9 files changed

Lines changed: 54 additions & 20 deletions

File tree

‎App.vue‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,5 +124,20 @@
124124
color:#aaa;
125125
text-decoration:line-through
126126
}
127+
.score-icon {
128+
width: 28rpx;
129+
height: 28rpx;
130+
}
131+
}
132+
.goods-title-tag {
133+
display: inline-flex !important;
134+
margin-right: 24rpx;
135+
}
136+
.goods-title {
137+
color: #333;
138+
font-size: 28rpx;
139+
}
140+
.pt16 {
141+
padding-top: 16rpx !important;
127142
}
128143
</style>

‎pages/category/category.vue‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,14 @@
2929
<u--image showLoading lazyLoad :src="item.pic" radius="16rpx" width="240rpx" height="240rpx"
3030
@click="goDetail(item)"></u--image>
3131
<view class="goods-info">
32-
<u--text class="t" :lines="3" :text="item.name" @click="goDetail(item)"></u--text>
32+
<view class="goods-title u-line-3 pt16" @click="goDetail(item)">
33+
<u-tag v-if="item.supplyType == 'vop_jd' || item.supplyType == 'jdJoycityPoints'" text="京东自营" bgColor="#e64340" borderColor="#e64340" size="mini" class="goods-title-tag"></u-tag>
34+
<text class="goods-title">{{ item.name }}</text>
35+
</view>
3336
<view v-if="item.numberSells" class="t2">已售:{{ item.numberSells }}</view>
3437
<view class="price-score">
3538
<view v-if="item.minPrice" class="item"><text>¥</text>{{item.minPrice}}</view>
36-
<view v-if="item.minScore" class="item"><text>∮</text>{{item.minScore}}</view>
39+
<view v-if="item.minScore" class="item"><text><image class="score-icon" src="/static/images/score.png"></image></text>{{item.minScore}}</view>
3740
</view>
3841
<view v-if="item.supplyType != 'jdJoycityPoints'" class="addCar">
3942
<u-icon v-if="item.propertyIds || item.hasAddition" name="plus-circle" color="#e64340"

‎pages/goods/detail.vue‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<view v-if="goodsDetail.basicInfo.minPrice" class="item">
1212
<text>¥</text>{{goodsDetail.basicInfo.minPrice}}</view>
1313
<view v-if="goodsDetail.basicInfo.minScore" class="item">
14-
<text>∮</text>{{goodsDetail.basicInfo.minScore}}</view>
14+
<text><image class="score-icon" src="/static/images/score.png"></image></text>{{goodsDetail.basicInfo.minScore}}</view>
1515
</view>
1616
<!-- #ifdef MP -->
1717
<view class="btns">
@@ -26,8 +26,9 @@
2626
</view>
2727
<!-- #endif -->
2828
</view>
29-
<view class="title">
30-
{{ goodsDetail.basicInfo.name }}
29+
<view class="goods-title u-line-3 pt16">
30+
<u-tag v-if="goodsDetail.basicInfo.supplyType == 'vop_jd' || goodsDetail.basicInfo.supplyType == 'jdJoycityPoints'" text="京东自营" bgColor="#e64340" borderColor="#e64340" size="mini" class="goods-title-tag"></u-tag>
31+
<text class="goods-title">{{ goodsDetail.basicInfo.name }}</text>
3132
</view>
3233
<view v-if="goodsDetail.basicInfo.characteristic" class="title-sub">
3334
{{ goodsDetail.basicInfo.characteristic }}

‎pages/goods/list-vop.vue‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,15 @@
1717
<view v-for="(item, index) in goods" :key="index" class="list" @click="toDetailsTap">
1818
<image :src="item.pic" class="image" mode="aspectFill" lazy-load="true" @click="goDetail(item)" />
1919
<view class="r">
20-
<view class="goods-title" @click="goDetail(item)">{{item.name}}</view>
20+
<view class="goods-title u-line-3 pt16" @click="goDetail(item)">
21+
<u-tag v-if="item.supplyType == 'vop_jd' || item.supplyType == 'jdJoycityPoints'" text="京东自营" bgColor="#e64340" borderColor="#e64340" size="mini" class="goods-title-tag"></u-tag>
22+
<text class="goods-title">{{ item.name }}</text>
23+
</view>
2124
<u--text v-if="item.characteristic" class="goods-title" :text="item.characteristic" size="28rpx"
2225
color="#c95060"></u--text>
2326
<view class="price-score">
2427
<view v-if="item.minPrice" class="item"><text>¥</text>{{item.minPrice}}</view>
25-
<view v-if="item.minScore" class="item"><text>∮</text>{{item.minScore}}</view>
28+
<view v-if="item.minScore" class="item"><text><image class="score-icon" src="/static/images/score.png"></image></text>{{item.minScore}}</view>
2629
</view>
2730
</view>
2831

@@ -39,7 +42,7 @@
3942
color="#c95060"></u--text>
4043
<view class="price-score">
4144
<view v-if="item.minPrice" class="item"><text>¥</text>{{item.minPrice}}</view>
42-
<view v-if="item.minScore" class="item"><text>∮</text>{{item.minScore}}</view>
45+
<view v-if="item.minScore" class="item"><text><image class="score-icon" src="/static/images/score.png"></image></text>{{item.minScore}}</view>
4346
</view>
4447
</view>
4548
</view>

‎pages/goods/list.vue‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,15 @@
1717
<view v-for="(item, index) in goods" :key="index" class="list" @click="toDetailsTap">
1818
<image :src="item.pic" class="image" mode="aspectFill" lazy-load="true" @click="goDetail(item)" />
1919
<view class="r">
20-
<view class="goods-title" @click="goDetail(item)">{{item.name}}</view>
20+
<view class="goods-title u-line-3 pt16" @click="goDetail(item)">
21+
<u-tag v-if="item.supplyType == 'vop_jd' || item.supplyType == 'jdJoycityPoints'" text="京东自营" bgColor="#e64340" borderColor="#e64340" size="mini" class="goods-title-tag"></u-tag>
22+
<text class="goods-title">{{ item.name }}</text>
23+
</view>
2124
<u--text v-if="item.characteristic" class="goods-title" :text="item.characteristic" size="28rpx"
2225
color="#c95060"></u--text>
2326
<view class="price-score">
2427
<view v-if="item.minPrice" class="item"><text>¥</text>{{item.minPrice}}</view>
25-
<view v-if="item.minScore" class="item"><text>∮</text>{{item.minScore}}</view>
28+
<view v-if="item.minScore" class="item"><text><image class="score-icon" src="/static/images/score.png"></image></text>{{item.minScore}}</view>
2629
</view>
2730
</view>
2831

@@ -34,12 +37,15 @@
3437
<view class="img-box">
3538
<image :src="item.pic" class="image" mode="aspectFill" lazy-load="true" @click="goDetail(item)" />
3639
</view>
37-
<u--text class="goods-title" :text="item.name" :lines="3" size="28rpx" color="#333" @click="goDetail(item)"></u--text>
40+
<view class="goods-title u-line-3 pt16" @click="goDetail(item)">
41+
<u-tag v-if="item.supplyType == 'vop_jd' || item.supplyType == 'jdJoycityPoints'" text="京东自营" bgColor="#e64340" borderColor="#e64340" size="mini" class="goods-title-tag"></u-tag>
42+
<text class="goods-title">{{ item.name }}</text>
43+
</view>
3844
<u--text v-if="item.characteristic" class="goods-title" :text="item.characteristic" size="28rpx"
3945
color="#c95060"></u--text>
4046
<view class="price-score">
4147
<view v-if="item.minPrice" class="item"><text>¥</text>{{item.minPrice}}</view>
42-
<view v-if="item.minScore" class="item"><text>∮</text>{{item.minScore}}</view>
48+
<view v-if="item.minScore" class="item"><text><image class="score-icon" src="/static/images/score.png"></image></text>{{item.minScore}}</view>
4349
</view>
4450
</view>
4551
</view>

‎pages/index/index.vue‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,15 @@
8080
<view class="img-box">
8181
<image :src="item.pic" class="image" mode="aspectFill" lazy-load="true" @click="goDetail(item)" />
8282
</view>
83-
<u--text class="goods-title" :text="item.name" :lines="3" size="28rpx" color="#333" @click="goDetail(item)"></u--text>
83+
<view class="goods-title u-line-3 pt16" @click="goDetail(item)">
84+
<u-tag v-if="item.supplyType == 'vop_jd' || item.supplyType == 'jdJoycityPoints'" text="京东自营" bgColor="#e64340" borderColor="#e64340" size="mini" class="goods-title-tag"></u-tag>
85+
<text class="goods-title">{{ item.name }}</text>
86+
</view>
8487
<u--text v-if="item.characteristic" class="goods-title" :text="item.characteristic" size="28rpx"
8588
color="#c95060"></u--text>
8689
<view class="price-score">
8790
<view v-if="item.minPrice" class="item"><text>¥</text>{{item.minPrice}}</view>
88-
<view v-if="item.minScore" class="item"><text>∮</text>{{item.minScore}}</view>
91+
<view v-if="item.minScore" class="item"><text><image class="score-icon" src="/static/images/score.png"></image></text>{{item.minScore}}</view>
8992
</view>
9093
</view>
9194
</view>
@@ -149,12 +152,15 @@
149152
<view class="img-box">
150153
<image :src="item.pic" class="image" mode="aspectFill" lazy-load="true" @click="goDetail(item)" />
151154
</view>
152-
<u--text class="goods-title" :text="item.name" :lines="3" size="28rpx" color="#333" @click="goDetail(item)"></u--text>
155+
<view class="goods-title u-line-3 pt16" @click="goDetail(item)">
156+
<u-tag v-if="item.supplyType == 'vop_jd' || item.supplyType == 'jdJoycityPoints'" text="京东自营" bgColor="#e64340" borderColor="#e64340" size="mini" class="goods-title-tag"></u-tag>
157+
<text class="goods-title">{{ item.name }}</text>
158+
</view>
153159
<u--text v-if="item.characteristic" class="goods-title" :text="item.characteristic" size="28rpx"
154160
color="#c95060"></u--text>
155161
<view class="price-score">
156162
<view v-if="item.minPrice" class="item"><text>¥</text>{{item.minPrice}}</view>
157-
<view v-if="item.minScore" class="item"><text>∮</text>{{item.minScore}}</view>
163+
<view v-if="item.minScore" class="item"><text><image class="score-icon" src="/static/images/score.png"></image></text>{{item.minScore}}</view>
158164
</view>
159165
</view>
160166
</view>

‎pages/order/index.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<view class="right">
2525
<view class="price-score">
2626
<view v-if="item2.amountSingle" class="item"><text>¥</text>{{item2.amountSingle}}</view>
27-
<view v-if="item2.score" class="item"><text>∮</text>{{item2.score}}</view>
27+
<view v-if="item2.score" class="item"><text><image class="score-icon" src="/static/images/score.png"></image></text>{{item2.score}}</view>
2828
</view>
2929
<view class="number">x{{ item2.number }}</view>
3030
</view>
@@ -33,7 +33,7 @@
3333
共{{ item.goodsNumber }}件商品 合计:
3434
<view class="price-score" style="display: inline-flex;">
3535
<view v-if="item.amountReal" class="item"><text>¥</text>{{item.amountReal}}</view>
36-
<view v-if="item.score" class="item"><text>∮</text>{{item.score}}</view>
36+
<view v-if="item.score" class="item"><text><image class="score-icon" src="/static/images/score.png"></image></text>{{item.score}}</view>
3737
</view>
3838
</view>
3939
<view v-if="item.status == 0" class="bottom">

‎pages/pay/order.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<view class="right">
1919
<view class="price-score">
2020
<view v-if="item.price" class="item"><text>¥</text>{{item.price}}</view>
21-
<view v-if="item.score" class="item"><text>∮</text>{{item.score}}</view>
21+
<view v-if="item.score" class="item"><text><image class="score-icon" src="/static/images/score.png"></image></text>{{item.score}}</view>
2222
</view>
2323
<view class="number">x{{ item.number }}</view>
2424
</view>
@@ -27,7 +27,7 @@
2727
<text>共 {{ goodsNumber }} 件商品 合计:</text>
2828
<view class="price-score" style="display: inline-flex;">
2929
<view v-if="goodsPrice" class="item"><text>¥</text>{{ goodsPrice }}</view>
30-
<view v-if="goodsScore" class="item"><text>∮</text>{{ goodsScore }}</view>
30+
<view v-if="goodsScore" class="item"><text><image class="score-icon" src="/static/images/score.png"></image></text>{{ goodsScore }}</view>
3131
</view>
3232
</view>
3333
</view>

‎static/images/score.png‎

9.07 KB
Loading

0 commit comments

Comments
 (0)