From 1fad28b7b07931d913dff06339bfd4c3a40383e8 Mon Sep 17 00:00:00 2001
From: Gdpao <1341331954@qq.com>
Date: Tue, 1 Sep 2020 08:39:08 +0800
Subject: [PATCH 1/2] gdpao

---
 manifest.json            |  8 +++++---
 pageC/classify/goods.vue | 10 +++++++++-
 pages.json               | 10 +++++-----
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/manifest.json b/manifest.json
index 702cb2d..6b29ba8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -16,9 +16,11 @@
             "autoclose" : true,
             "delay" : 0
         },
-        "safearea": { //安全区域配置，仅iOS平台生效
-            "bottom": { // 底部安全区域配置
-                "offset": "none" // 底部安全区域偏移，"none"表示不空出安全区域，"auto"自动计算空出安全区域，默认值为"none"
+        "safearea" : {
+            //安全区域配置，仅iOS平台生效
+            "bottom" : {
+                // 底部安全区域配置
+                "offset" : "none" // 底部安全区域偏移，"none"表示不空出安全区域，"auto"自动计算空出安全区域，默认值为"none"
             }
         },
         /* 模块配置 */
diff --git a/pageC/classify/goods.vue b/pageC/classify/goods.vue
index 97c6bee..4ed15c4 100644
--- a/pageC/classify/goods.vue
+++ b/pageC/classify/goods.vue
@@ -1,6 +1,6 @@
 <template>
 	<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="salenum" :class="{ 'current' : current == 0 }" @click="switchCurrent(0)">销量</view>
 			<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="price">￥{{ goods.goods_price }}</view> -->
 					<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="origin">￥{{ goods.goods_marketprice }}</view>
 					</view>
@@ -209,6 +210,13 @@ export default {
 				.price {
 					display: flex;
 					align-items: center;
+                    .type-tag {
+                        padding: 4rpx 10rpx;
+                        color: #fff;
+                        font-size: 22rpx;
+                        border-radius: 10rpx;
+                        background-color: #FF7810;
+                    }
 					.present {
 						font-size: 26rpx;
 						color: rgba(255,49,49,1);
diff --git a/pages.json b/pages.json
index a7488a7..c1024c0 100644
--- a/pages.json
+++ b/pages.json
@@ -125,9 +125,9 @@
 								"buttons": [
 									{
 										// "type":"none",
-										"text":"\ue636",
+										"text":"\ue503",
 										"float":"right",
-										"fontSize":"18",
+										"fontSize":"20",
 										"fontSrc": "/static/fonts/cart.ttf"
 									}
 								]
@@ -156,9 +156,9 @@
 								"buttons": [
 									{
 										"type":"none",
-										"text":"\ue636",
+										"text":"\ue503",
 										"float":"right",
-										"fontSize":"18",
+										"fontSize":"20",
 										"fontSrc": "/static/fonts/cart.ttf"
 									}
 								]
@@ -367,7 +367,7 @@
 									// },
 									{
 										"type":"none",
-										"text":"\ue636",
+										"text":"\ue503",
 										"float":"right",
 										"fontSize":"22",
 										"fontSrc": "/static/fonts/cart.ttf",

From ccca4992abdfaa98db74420fa589fa9526927e51 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 1 Sep 2020 10:34:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93=E5=92=8C=E7=BC=96=E5=89=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageB/tipsinfo/index.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pageB/tipsinfo/index.vue b/pageB/tipsinfo/index.vue
index 7f6eb25..69638b6 100644
--- a/pageB/tipsinfo/index.vue
+++ b/pageB/tipsinfo/index.vue
@@ -5,7 +5,12 @@
     </view>
 </template>
 <style lang="scss" scoped>
-
+    .u-content{
+        line-height: 46rpx;
+        font-size: 30rpx;
+        color: #333;
+        padding: 30rpx;
+    }
 </style>
 <script>
 export default {