调试完成 #311

Merged
theluyuan merged 2 commits from xbx into master 2020-08-31 09:04:38 +00:00
5 changed files with 82 additions and 1 deletions

View File

@ -365,6 +365,14 @@ export default {
addrefundall({order_id,reason_info}) { addrefundall({order_id,reason_info}) {
return vm.$u.post('order/add_refund_all',{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})
}
} }
} }

View File

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

28
pageB/tipsinfo/index.vue Normal file
View File

@ -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>

View File

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

View File

@ -17,7 +17,7 @@
<u-swiper :list="list" mode="dot" @click="clickImage"></u-swiper> <u-swiper :list="list" mode="dot" @click="clickImage"></u-swiper>
</view> </view>
<view class="chengnuo"> <view class="chengnuo">
<view> <!-- <view>
<image src="/static/image/shop/4.png"></image> <image src="/static/image/shop/4.png"></image>
<text>免费洗衣</text> <text>免费洗衣</text>
</view> </view>
@ -32,6 +32,10 @@
<view> <view>
<image src="/static/image/shop/7.png"></image> <image src="/static/image/shop/7.png"></image>
<text>上门取件</text> <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> </view>
<view class="fenlei"> <view class="fenlei">
@ -95,12 +99,14 @@
pinTuanPush: {}, // pinTuanPush: {}, //
activityInfo: {}, activityInfo: {},
areaList: [], // areaList: [], //
tips:[]
} }
}, },
onLoad() { onLoad() {
this.getShopTopList(); this.getShopTopList();
this.getLocation(); // this.getLocation(); //
this.getStoreActivity(); this.getStoreActivity();
this.gettips()
// this.area = uni.getStorageSync("address") || ""; // this.area = uni.getStorageSync("address") || "";
}, },
onShow() { onShow() {
@ -110,6 +116,21 @@
this.getAllLoaction(); // this.getAllLoaction(); //
}, },
methods: { 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() { sousuo() {
// console.log(123) // console.log(123)
this.$u.route({ this.$u.route({