From e98ad660608fd930f37543b6f92f6535a7861ff1 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 31 Aug 2020 15:37:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E8=AF=95=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/api/shop.js       |  8 ++++++++
 pageB/tipsinfo/index.vue | 28 ++++++++++++++++++++++++++++
 pages.json               | 11 +++++++++++
 pages/shop/index.vue     | 23 ++++++++++++++++++++++-
 4 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 pageB/tipsinfo/index.vue

diff --git a/common/api/shop.js b/common/api/shop.js
index ab442b0..369489e 100644
--- a/common/api/shop.js
+++ b/common/api/shop.js
@@ -365,6 +365,14 @@ export default {
 			addrefundall({order_id,reason_info}) {
 				return vm.$u.post('order/add_refund_all',{order_id,reason_info})
 			},
+			//提示文字
+			tips(){
+				return vm.$u.post('Shop/tips')
+			},
+			//内容
+			tipsinfo({document_code}){
+				return vm.$u.post('Shop/tipInfo',{document_code})
+			}
         }
     }
     
diff --git a/pageB/tipsinfo/index.vue b/pageB/tipsinfo/index.vue
new file mode 100644
index 0000000..7f6eb25
--- /dev/null
+++ b/pageB/tipsinfo/index.vue
@@ -0,0 +1,28 @@
+<template>
+    <view class="u-content">
+        <u-parse :html="info"></u-parse>
+
+    </view>
+</template>
+<style lang="scss" scoped>
+
+</style>
+<script>
+export default {
+    data(){
+        return {
+            info:""
+        }
+    },
+    onLoad(o){
+        console.log(o.id)
+        this.$u.api.tipsinfo({document_code:o.id}).then((res)=>{
+            console.log(JSON.stringify(res))
+            uni.setNavigationBarTitle({
+                title: res.data.document_title
+            });
+            this.info = res.data.document_content
+        })
+    }
+}
+</script>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 144ff1c..d89b4c9 100644
--- a/pages.json
+++ b/pages.json
@@ -80,6 +80,17 @@
 		{
 			"root": "pageB",
 			"pages": [
+				{
+					"path": "tipsinfo/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"app-plus":{
+							"titleNView":{
+								"backgroundColor":"#ffffff"
+							}
+						}
+					}
+				},
 				{
 					"path": "playVideo/index",
 					"style": {
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
index 0058543..28f6882 100644
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -17,7 +17,7 @@
 				<u-swiper :list="list" mode="dot" @click="clickImage"></u-swiper>
 			</view>
 			<view class="chengnuo">
-				<view>
+				<!-- <view>
 					<image src="/static/image/shop/4.png"></image>
 					<text>免费洗衣</text>
 				</view>
@@ -32,6 +32,10 @@
 				<view>
 					<image src="/static/image/shop/7.png"></image>
 					<text>上门取件</text>
+				</view> -->
+				<view v-for="(item,index) in tips" :key="index" @click="totips(item.document_code)">
+					<image :src="item.file_name"></image>
+					<text>{{item.document_title}}</text>
 				</view>
 			</view>
 			<view class="fenlei">
@@ -95,12 +99,14 @@
 				pinTuanPush: {}, // 拼团推荐
 				activityInfo: {},
 				areaList: [], // 位置信息
+				tips:[]
 			}
 		},
 		onLoad() {
 			this.getShopTopList();
 			this.getLocation(); // 获取定位
 			this.getStoreActivity();
+			this.gettips()
 			// this.area = uni.getStorageSync("address") || "请选择";
 		},
 		onShow() {
@@ -110,6 +116,21 @@
 			this.getAllLoaction(); // 获取位置
 		},
 		methods: {
+			totips(id){
+				this.$u.route({
+					type:"to",
+					url:"/pageB/tipsinfo/index",
+					params:{
+						id
+					}
+				})
+			},
+			gettips(){
+				this.$u.api.tips().then((res)=>{
+					console.log(res)
+					this.tips = res.data
+				})
+			},
 			sousuo() {
 				// console.log(123)
 				this.$u.route({

From 6039328f54323a10fcfc2fb2aa6c268b4e20fa04 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 31 Aug 2020 17:04:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E9=94=80?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageB/sdetails/index.vue | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pageB/sdetails/index.vue b/pageB/sdetails/index.vue
index 8822890..75d9f4c 100644
--- a/pageB/sdetails/index.vue
+++ b/pageB/sdetails/index.vue
@@ -37,6 +37,10 @@
 					<text>{{ goodsInfo.is_collect == 1 ? '已收藏' : '收藏' }}</text>
 				</view>
 			</view>
+			<view class="shuliang">
+				<text>历史销售数量：{{goodsInfo.goods_salenum}}</text>
+				<text>库存仅剩数量：{{goodsInfo.goods_storage}}</text>
+			</view>
         </view>
         <view class="hr"></view>
 		<!-- <navs :value="领券"></navs> -->
@@ -776,7 +780,15 @@ export default {
 			.goods-name {
 				line-height: 1.5;
 			}
+			
         }
+		.shuliang{
+				padding-top: 33rpx;
+				font-size: 24rpx;
+				color:#656565;
+				display: flex;
+				justify-content: space-between;
+			}
 		.price-collect {
 			display: flex;
 			align-items: center;
@@ -1252,6 +1264,7 @@ export default {
 					font-size: 30rpx;
 					color: #ff3131;
 				}
+			
 			}
 		}
 		.num {