theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'gdpao' (#313) from gyh into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/313
This commit is contained in:
gyh 2020-09-01 08:40:15 +08:00
commit 704fb038df
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifest.json
View File

@ -16,9 +16,11 @@
"autoclose" : true, "autoclose" : true,
"delay" : 0 "delay" : 0
}, },
"safearea": { //安全区域配置，仅iOS平台生效 "safearea" : {
"bottom": { // 底部安全区域配置 //安全区域配置，仅iOS平台生效
"offset": "none" // 底部安全区域偏移，"none"表示不空出安全区域，"auto"自动计算空出安全区域，默认值为"none" "bottom" : {
// 底部安全区域配置
"offset" : "none" // 底部安全区域偏移，"none"表示不空出安全区域，"auto"自动计算空出安全区域，默认值为"none"
} }
}, },
/* 模块配置 */ /* 模块配置 */

10
pageC/classify/goods.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="classify-goods"> <view class="classify-goods">
<u-search style="padding: 0 30rpx" placeholder="日照香炉生紫烟" v-model="keyword" @search="select" @custom="select"></u-search> <u-search style="padding: 0 30rpx" placeholder="请搜索商品" v-model="keyword" @search="select" @custom="select"></u-search>
<view class="tab-container"> <view class="tab-container">
<view class="salenum" :class="{ 'current' : current == 0 }" @click="switchCurrent(0)">销量</view> <view class="salenum" :class="{ 'current' : current == 0 }" @click="switchCurrent(0)">销量</view>
<view class="price" :class="{ 'current' : current == 1 }" @click="switchCurrent(1)"> <view class="price" :class="{ 'current' : current == 1 }" @click="switchCurrent(1)">
@ -20,6 +20,7 @@
<view class="briefing u-line-1">{{ goods.goods_advword }}</view> <view class="briefing u-line-1">{{ goods.goods_advword }}</view>
<!-- <view class="price">￥{{ goods.goods_price }}</view> --> <!-- <view class="price">￥{{ goods.goods_price }}</view> -->
<view class="price"> <view class="price">
<view class="type-tag" v-show="goods.goods_type != 1">{{ goods.goods_type == 2 ? "秒杀" : "拼团" }}</view>
<view class="present">￥{{ goods.goods_price }}</view> <view class="present">￥{{ goods.goods_price }}</view>
<view class="origin">￥{{ goods.goods_marketprice }}</view> <view class="origin">￥{{ goods.goods_marketprice }}</view>
</view> </view>
@ -209,6 +210,13 @@ export default {
.price { .price {
display: flex; display: flex;
align-items: center; align-items: center;
.type-tag {
padding: 4rpx 10rpx;
color: #fff;
font-size: 22rpx;
border-radius: 10rpx;
background-color: #FF7810;
}
.present { .present {
font-size: 26rpx; font-size: 26rpx;
color: rgba(255,49,49,1); color: rgba(255,49,49,1);

10
pages.json
View File

@ -136,9 +136,9 @@
"buttons": [ "buttons": [
{ {
// "type":"none", // "type":"none",
"text":"\ue636", "text":"\ue503",
"float":"right", "float":"right",
"fontSize":"18", "fontSize":"20",
"fontSrc": "/static/fonts/cart.ttf" "fontSrc": "/static/fonts/cart.ttf"
} }
] ]
@ -167,9 +167,9 @@
"buttons": [ "buttons": [
{ {
"type":"none", "type":"none",
"text":"\ue636", "text":"\ue503",
"float":"right", "float":"right",
"fontSize":"18", "fontSize":"20",
"fontSrc": "/static/fonts/cart.ttf" "fontSrc": "/static/fonts/cart.ttf"
} }
] ]
@ -378,7 +378,7 @@
// }, // },
{ {
"type":"none", "type":"none",
"text":"\ue636", "text":"\ue503",
"float":"right", "float":"right",
"fontSize":"22", "fontSize":"22",
"fontSrc": "/static/fonts/cart.ttf", "fontSrc": "/static/fonts/cart.ttf",