Merge pull request '调试完成' (#311) from xbx into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/311

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})
+			}
         }
     }
     

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 {

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>

pages.json

@@ -80,6 +80,17 @@
 		{
 			"root": "pageB",
 			"pages": [
+				{
+					"path": "tipsinfo/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"app-plus":{
+							"titleNView":{
+								"backgroundColor":"#ffffff"
+							}
+						}
+					}
+				},
 				{
 					"path": "playVideo/index",
 					"style": {

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({