diff --git a/pages/comment/comment.js b/pages/comment/comment.js
index 7cbee35..4eba08d 100644
--- a/pages/comment/comment.js
+++ b/pages/comment/comment.js
@@ -80,27 +80,31 @@ Page({
chooseImage() {
let that = this;
wx.chooseImage({
- count: 1,
+ count: 9,
sizeType: ['original', 'compressed'],
success: function (res) {
+ console.log(res.tempFilePaths)
console.log(res.tempFilePaths[0])
- app.upload('image', res.tempFilePaths[0], "post").then((res) => {
- console.log('上传文件', res);
- let url = app.globalData.baseurl+res.url;
- that.data.image.push(url)
- that.data.cimage.push(res.url)
- that.setData({
- image: that.data.image,
- cimage: that.data.cimage
+ res.tempFilePaths.forEach(function(value,index,array){
+ app.upload('image', value, "post").then((res) => {
+ console.log('上传文件', res);
+ let url = app.globalData.baseurl+res.url;
+ that.data.image.push(url)
+ that.data.cimage.push(res.url)
+ that.setData({
+ image: that.data.image,
+ cimage: that.data.cimage
+ })
+
+ console.log(that.data.image);
+ console.log(that.data.cimage)
+
+
+ }).catch((err) => {
+ console.log(err)
})
-
- console.log(that.data.image);
- console.log(that.data.cimage)
-
-
- }).catch((err) => {
- console.log(err)
})
+
},
fail: function (res) { }
})
@@ -109,7 +113,9 @@ Page({
// 删除图片
del(e){
let that=this;
+ console.log(e)
let url=e.currentTarget.dataset.url;
+ console.log(url)
that.data.image.forEach(function(value,index,array){
if(value==url){
that.data.image.splice(index,1);
diff --git a/pages/comment/comment.wxml b/pages/comment/comment.wxml
index 5dc186e..372996e 100644
--- a/pages/comment/comment.wxml
+++ b/pages/comment/comment.wxml
@@ -1,9 +1,9 @@
<view class="infobox">
<view class="infoTitle">{{name}}</view>
- <view class="infobox">
- <view class="infoTitle">评分</view>
- <view class="evaluateItem">
- <view class="tltle">综合</view>
+ <view class="infoboxk">
+
+ <view class="evaluateItem flexone">
+ <view class="infoTitle">评分</view>
<view class="starbox" bindtap="total" data-id="1">
<image class="starItem" src="/img/pingfenshi.png" wx:if="{{totalstar>=1}}" />
<image class="starItem" src="/img/lingfen_icon.png" wx:else/>
@@ -142,11 +142,12 @@
<image src="/img/chahao.png"></image>
</view>
</view>
- </view>
-
- <view class="imgItem" bindtap="chooseImage">
+ <view class="imgItem" bindtap="chooseImage">
<image mode="aspectFill" src="/img/jiang.png" />
</view>
+ </view>
+
+
</view>
diff --git a/pages/comment/comment.wxss b/pages/comment/comment.wxss
index aac4793..b81c552 100644
--- a/pages/comment/comment.wxss
+++ b/pages/comment/comment.wxss
@@ -11,6 +11,9 @@ page {
padding: 38rpx 32rpx 26rpx;
box-sizing: border-box;
}
+.infoboxk{
+ margin-top:38rpx;
+}
.imgarr {
width: 100%;
@@ -74,7 +77,7 @@ page {
font-weight: 400;
line-height: 44rpx;
color: rgba(0, 0, 0, 1);
- margin-bottom: 20rpx;
+ /* margin-bottom: 20rpx; */
}
.evaluateItem {
@@ -176,4 +179,7 @@ page {
align-items: center;
width:600rpx;
flex-wrap: wrap
+}
+.picbox {
+ flex-wrap: wrap;
}
\ No newline at end of file
diff --git a/pages/custom-tab-bar b/pages/custom-tab-bar
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/pages/custom-tab-bar
diff --git a/pages/homepage/homepage.js b/pages/homepage/homepage.js
index d14727e..b866eb3 100644
--- a/pages/homepage/homepage.js
+++ b/pages/homepage/homepage.js
@@ -19,8 +19,8 @@ Page({
sel: 0,
selk: 0,
index: 0,
- selarray: ['全部', '银座', '金座'],
- toparr: ['商圈', '菜系', '评级', '综合'],
+ selarray: [],
+ toparr: [],
topindex: 0,
wrap: false,
// 国家
@@ -42,7 +42,6 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
-
this.getcountry();
// 获取banner
this.getbanner()
@@ -68,7 +67,6 @@ Page({
let that = this;
var url = 'sundry/get_slide';
var params = {
-
}
app.post(url, params).then((res) => {
console.log(res);
@@ -110,16 +108,17 @@ Page({
selt: 0,
selk: '',
- goodlist: []
+ goodlist: [],
+ page:1
})
this.getshanguqan();
this.gethomelist()
} else if (this.data.sel == 1) {
this.setData({
-
selt: 1,
selk: '',
- goodlist: []
+ goodlist: [],
+ page:1
})
this.getcai();
this.gethomelist()
@@ -127,7 +126,8 @@ Page({
this.setData({
selt: 2,
selk: '',
- goodlist: []
+ goodlist: [],
+ page:1
})
this.getrank();
@@ -136,7 +136,8 @@ Page({
this.setData({
selt: 3,
selk: '',
- goodlist: []
+ goodlist: [],
+ page:1
})
this.gettotal();
@@ -426,6 +427,11 @@ Page({
}
app.post(url, params, "post").then((res) => {
console.log(res);
+ let obj={
+ id:'',
+ name:'全部'
+ }
+ res.unshift(obj)
that.setData({
selarray: res,
})
@@ -453,6 +459,11 @@ Page({
}
app.post(url, params, "post").then((res) => {
console.log(res);
+ let obj={
+ id:'',
+ name:'全部'
+ }
+ res.unshift(obj)
that.setData({
selarray: res,
@@ -481,6 +492,11 @@ Page({
}
app.post(url, params, "post").then((res) => {
console.log(res);
+ let obj={
+ id:'',
+ name:'全部'
+ }
+ res.unshift(obj)
that.setData({
selarray: res,
diff --git a/pages/homepage/homepage.wxml b/pages/homepage/homepage.wxml
index 6a954dc..d670ee3 100644
--- a/pages/homepage/homepage.wxml
+++ b/pages/homepage/homepage.wxml
@@ -51,10 +51,11 @@
<view class='case-page' wx:else>
<view class='list-masonry'>
- <view class='item-masonry' bindtap="goodtail" data-id="{{item.id}}" wx:for="{{goodlist}}" wx:key="">
+ <view class='item-masonry {{shoplist.length==1?"noitem":""}}' bindtap="goodtail" data-id="{{item.id}}" wx:for="{{goodlist}}" wx:key="">
<view class="goodimg">
<image src='{{item.image}}' mode='widthFix'></image>
</view>
+
<view class="goodbot">
<view class="goodname">{{item.name}}</view>
<view class="goodname riname" wx:if="{{item.name_jap!=null}}">{{item.name_jap}}</view>
@@ -63,35 +64,37 @@
<view class="introleft">
{{item.series_name}}
</view>
- <view class="introright">
+ <view class="introright ">
+
<view class="hualist flexone" wx:if="{{item.score!=false}}">
- <view class="huaitem" wx:if="{{item.score>=1}}">
+ <view class="flowername">米其林</view>
+ <!-- wx:if="{{item.score>=1}}" -->
+ <!-- <view class="huaitem">
<image src="/img/flower.png"></image>
- </view>
- <view class="huaitem" wx:if="{{item.score>=2}}">
+ </view> -->
+ <!-- wx:if="{{item.score>=2}}" -->
+ <!-- <view class="huaitem" >
<image src="/img/flower.png"></image>
- </view>
- <view class="huaitem" wx:if="{{item.score>=3}}">
+ </view> -->
+ <!-- wx:if="{{item.score>=3}}" -->
+ <!-- <view class="huaitem" >
<image src="/img/flower.png"></image>
- </view>
- <view class="huaitem" wx:if="{{item.score>=4}}">
- <image src="/img/flower.png"></image>
- </view>
- <view class="huaitem" wx:if="{{item.score>=5}}">
- <image src="/img/flower.png"></image>
- </view>
- <!-- <view class="pingfen" wx:if="{{item.score!=false}}">{{item.score}}</view> -->
+ </view> -->
+
+ <view class="pingfen" wx:if="{{item.score!=false}}">{{item.score}}分</view>
</view>
<view class="ping flexone">
- <view class="pingleft">
+ <view class="kuaizifen">Tabelog</view>
+ <!-- <view class="pingleft">
<image src='/img/kuaizi.png'></image>
- </view>
- <view class="pingfen">{{item.synthetical_score}}</view>
+ </view> -->
+ <view class="pingfen">{{item.tabelog}}分</view>
</view>
</view>
</view>
- <view class="shou">
+ <view class="flextwo pricetwo" >
+ <view class="shou">
<text class="shoumoney">￥{{item.price}}</text>
<text class="shouren">/人</text>
</view>
@@ -101,10 +104,13 @@
</view>
<view class="dizhi commnameone">{{item.business_name}}</view>
</view>
+ </view>
+
</view>
</view>
+
<!-- <view class='item-masonry'>
<image src='/img/deng.png' mode='widthFix'></image>
<view class="goodname">基值支义们京候么眼革下使叫南石很少去构。</view>
diff --git a/pages/homepage/homepage.wxss b/pages/homepage/homepage.wxss
index 334d653..a2e2f34 100644
--- a/pages/homepage/homepage.wxss
+++ b/pages/homepage/homepage.wxss
@@ -142,7 +142,7 @@ swiper-item {
.item-masonry {
background-color: #fff;
break-inside: avoid;
- padding: 20rpx 0;
+ padding: 0rpx 0 20rpx;
box-sizing: border-box;
margin-bottom: 28rpx;
box-shadow: 0rpx 8rpx 16rpx rgba(0, 0, 0, 0.08);
@@ -195,13 +195,17 @@ swiper-item {
height:40rpx;
font-size: 0;
}
-
+.kuaizifen{
+ color: #fca052;
+ font-size: 18rpx;
+ margin-right:10rpx;
+}
.pingfen {
overflow: hidden;
text-overflow: ellipsis;
color: #fca052;
- font-size: 22rpx;
+ font-size: 18rpx;
margin-left: 6rpx;
text-align: right;
margin-right:8rpx;
@@ -227,7 +231,10 @@ swiper-item {
}
.shou {
- margin-top: 16rpx;
+ /* margin-top: 16rpx; */
+}
+.pricetwo{
+ margin-top:16rpx;
}
.shoumoney {
@@ -296,4 +303,12 @@ page {
width: 1rpx;
height: 100%;
float: left;
+}
+.flowername{
+ color:#F0ABA5;
+ font-size:20rpx;
+ margin-right:10rpx;
+}
+.noitem{
+ box-shadow: none;
}
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index 11c557a..52d7524 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -100,7 +100,8 @@ Page({
url: '/pages/shopdetail/shopdetail?id='+that.data.shopid,
})
}else{
- wx.navigateTo({
+ wx.switchTab({
+
url: '/pages/homepage/homepage',
})
}
diff --git a/pages/mycomment/mycomment.js b/pages/mycomment/mycomment.js
index 8ca7a0f..3b46a80 100644
--- a/pages/mycomment/mycomment.js
+++ b/pages/mycomment/mycomment.js
@@ -83,6 +83,21 @@ Page({
},
+ // 评论图片预览
+ previewimgk(e){
+ console.log(e)
+ let pindex=e.currentTarget.dataset.pindex;
+ let index=e.currentTarget.dataset.index;
+ wx.previewImage({
+ current: this.data.commentlist[pindex].images[index],
+ urls:this.data.commentlist[pindex].images,
+ success: function (res) { },
+ fail: function (res) { },
+ complete: function (res) { },
+ })
+
+ },
+
// 店铺收藏
collect(e){
let id=e.currentTarget.dataset.id;
@@ -134,6 +149,27 @@ Page({
})
},
+ // goodtail(e) {
+ // let token = wx.getStorageSync("token");
+ // if (token == '') {
+ // wx.showToast({
+ // title: '请先登录',
+ // icon: "none"
+ // })
+ // setTimeout(function() {
+ // wx.navigateTo({
+ // url: '/pages/index/index',
+ // })
+ // }, 1500)
+ // } else {
+ // let id = e.currentTarget.dataset.id;
+ // wx.navigateTo({
+ // url: '/pages/shopdetail/shopdetail?id=' + id,
+ // })
+ // }
+
+ // },
+
// 删除点评
delcomment(e){
let that = this
diff --git a/pages/mycomment/mycomment.wxml b/pages/mycomment/mycomment.wxml
index df345c0..24ec84e 100644
--- a/pages/mycomment/mycomment.wxml
+++ b/pages/mycomment/mycomment.wxml
@@ -12,7 +12,7 @@
<view class="bodybox" wx:else>
- <view class="photo" wx:for="{{commentlist}}" wx:key="">
+ <view class="photo" wx:for="{{commentlist}}" wx:key="" wx:for-index="cellindex">
<view class="jianintro commentitem" bindtap="comentdetail" data-id="{{item.id}}" data-shopid="{{item.shop_id}}">
<view class="comtop flextwo">
<view class="comleft">
@@ -71,19 +71,19 @@
</view>
<view class="shouprice">￥{{item.price}}/人</view>
</view>
- <view class="fuwu flexone">
+ <!-- <view class="fuwu flexone">
<view class="fuwuitem">服务：{{item.score2}}</view>
<view class="fuwuitem">口味：{{item.score3}}</view>
<view class="fuwuitem">环境：{{item.score4}}</view>
<view class="fuwuitem">食材：{{itme.score5}}</view>
- </view>
- <view class="text">
+ </view> -->
+ <text class="text">
{{item.content}}
- </view>
+ </text>
<!-- <view class="all">全部</view> -->
<view class="textboximg flexone" wx:if="{{item.images.length!=0}}">
<view class="boxitem" wx:for="{{item.images}}" wx:key="">
- <image src="{{item}}"></image>
+ <image src="{{item}}" catchtap="previewimgk" data-index="{{index}}" data-pindex="{{cellindex}}" mode="aspectFit"></image>
</view>
</view>
@@ -92,7 +92,7 @@
</view>
</view>
- <view class="jianbot flextwo">
+ <view class="jianbot flextwo" bindtap="goodtail" data-id="{{item.shop_id}}">
<view class="jianleft flex">
<view class="collectbitemleft">
<image src="{{item.image}}"></image>
@@ -109,7 +109,7 @@
</view>
</view>
- <view class="jianright" bindtap="collect" data-id="{{item.shop_id}}" data-index="{{index}}">
+ <view class="jianright" catchtap="collect" data-id="{{item.shop_id}}" data-index="{{index}}">
<image src="/img/graycollect.png" wx:if="{{item.is_collect==0}}"></image>
<image src="/img/yellowcollect.png" wx:if="{{item.is_collect==1}}"></image>
</view>
@@ -130,9 +130,6 @@
</view>
</view>
</view>
-
-
-
</view>
<!-- <view class="nomoer">没有更多了哦～</view> -->
\ No newline at end of file
diff --git a/pages/mycomment/mycomment.wxss b/pages/mycomment/mycomment.wxss
index baddf79..d43fd2f 100644
--- a/pages/mycomment/mycomment.wxss
+++ b/pages/mycomment/mycomment.wxss
@@ -148,4 +148,7 @@
}
.commentitem{
margin-top:0
+}
+.textboximg{
+ flex-wrap: wrap;
}
\ No newline at end of file
diff --git a/pages/personziliao/personziliao.wxml b/pages/personziliao/personziliao.wxml
index 2a291bb..4d5b837 100644
--- a/pages/personziliao/personziliao.wxml
+++ b/pages/personziliao/personziliao.wxml
@@ -32,8 +32,11 @@
<view class="entertext">
<view class="textyop">用户简介</view>
<view class="textarea">
+ <textarea placeholder='这个人什么都没写…' value="{{brief}}" bindinput="entermark" maxlength="50"></textarea>
+
+ <view class="textlen">{{brief.length}}/50</view>
- <input placeholder='这个人什么都没写…' value="{{brief}}" bindinput="entermark" maxlength="50"/>
+ <!-- <input placeholder='这个人什么都没写…' value="{{brief}}" bindinput="entermark" maxlength="50"/> -->
</view>
diff --git a/pages/personziliao/personziliao.wxss b/pages/personziliao/personziliao.wxss
index 96e1ff3..c5d7df1 100644
--- a/pages/personziliao/personziliao.wxss
+++ b/pages/personziliao/personziliao.wxss
@@ -53,6 +53,17 @@ page {
color: #bdc4ce;
font-size:30rpx;
margin-top: 16rpx;
+ position: relative;
+}
+.textarea textarea{
+ width:100%;
+}
+.textlen{
+ color: #bdc4ce;
+ font-size:30rpx;
+ position: absolute;
+ right:0;
+ bottom:0;
}
.entertext {
diff --git a/pages/shopdetail/shopdetail.js b/pages/shopdetail/shopdetail.js
index 8c9d381..754ebe7 100644
--- a/pages/shopdetail/shopdetail.js
+++ b/pages/shopdetail/shopdetail.js
@@ -17,7 +17,10 @@ Page({
shopid: '',
shopdetail: '',
images:[],
- pic:[]
+ pic:[],
+ shoplist:[],
+ posterurl:'',
+ postershow:false
},
swiperChange: function(e) {
@@ -35,6 +38,62 @@ Page({
// urls: [],
// })
},
+ // 获取推荐店铺
+ getrecomondshop(){
+ let that = this;
+ var url = 'shop/infoShopRecommend';
+ var params = {
+ id: that.data.shopid,
+ limit:6,
+
+ }
+ app.post(url, params).then((res) => {
+ console.log(res);
+ that.setData({
+ shoplist:res
+ })
+ }).catch((err) => {
+
+ })
+ },
+ goodtail(e) {
+ let id = e.currentTarget.dataset.id;
+ wx.navigateTo({
+ url: '/pages/shopdetail/shopdetail?id=' + id,
+ })
+
+ },
+
+share(){
+ this.setData({
+ postershow:true
+ })
+
+ this.getcode()
+},
+ // 获取海报
+ getcode(){
+ let that = this;
+ var url = 'common/getCode';
+ var params = {
+ shop_id: that.data.shopid,
+ url:'pages/shopdetail/shopdetail',
+
+ }
+ app.post(url, params).then((res) => {
+ console.log(res);
+ that.setData({
+ posterurl:res
+ })
+
+ that.savefilecode()
+
+
+
+ }).catch((err) => {
+
+ })
+ },
// 评论图片预览
previewimgk(e){
console.log(e)
@@ -50,16 +109,23 @@ Page({
},
morecomment() {
-
wx.navigateTo({
url: '/pages/morecomment/morecomment?shopid='+this.data.shopid,
})
},
xiangce() {
console.log(33443)
- wx.navigateTo({
- url: '/pages/morepic/morepic',
- })
+ if(this.data.pic.length!=0){
+ wx.navigateTo({
+ url: '/pages/morepic/morepic',
+ })
+ }else{
+ wx.showToast({
+ title: '没有更多图片了~',
+ icon:'none'
+ })
+ }
+
},
// 隐藏遮罩层
sure() {
@@ -105,9 +171,6 @@ Page({
})
}
-
-
-
}).catch((err) => {
})
@@ -156,9 +219,6 @@ Page({
})
}
-
-
-
}).catch((err) => {
})
@@ -224,9 +284,6 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
-
-
-
this.setData({
shopid: options.id
})
@@ -235,8 +292,9 @@ Page({
shopid: app.globalData.shopid
})
}
-
- console.log('3333', app.globalData.shopid)
+// 获取推荐店铺
+ this.getrecomondshop();
+ this.getcode()
},
@@ -276,9 +334,17 @@ Page({
images: res.images
})
}
+ // 只保留两条评论
+ let newremarks=[];
+ console.log('784889439',res.remarks)
+ for(var i=0;i<res.remarks.length;i++){
+ if(i<2){
+ newremarks.push(res.remarks[i])
+ }
+ }
+ console.log(newremarks)
+ res.remarks=newremarks;
- console.log(that.data.images);
- console.log('8877665',that.data.pic)
that.setData({
shopdetail: res
})
@@ -294,18 +360,163 @@ Page({
})
},1500)
}
-
console.log(that.data.shopdetail)
-
-
-
-
}).catch((err) => {
})
},
+ //点击保存到相册
+ baocun: function () {
+ console.log(999)
+ var that = this
+ wx.getSetting({
+ success(res) {
+ if (!res.authSetting['scope.writePhotosAlbum']) {
+ wx.authorize({
+ scope: 'scope.writePhotosAlbum',
+ success() { //这里是用户同意授权后的回调
+
+
+ wx.saveImageToPhotosAlbum({
+ filePath: that.data.posterurl,
+ success(res) {
+ wx.showModal({
+ content: '图片已保存到相册',
+ showCancel: false,
+ confirmText: '好的',
+ confirmColor: '#333',
+ success: function (res) {
+ if (res.confirm) {
+ console.log('用户点击确定');
+ /* 该隐藏的隐藏 */
+ that.setData({
+ maskHidden: false
+ })
+ }
+ },
+ fail: function (res) {
+
+ }
+ })
+ }
+ })
+
+
+
+ },
+ fail() { //这里是用户拒绝授权后的回调
+
+
+ // wx.openSetting({
+ // success: function (data) {
+ // console.log(data)
+ // if (data.authSetting["scope.writePhotosAlbum"] === true) {
+ // console.log("是否授权成功")
+ // } else {
+ // applyApi.toast("授权失败");
+ // }
+ // }
+ // })
+ wx.showModal({
+ title: '提示',
+ content: '您取消授权，无法保存图片，点击确定打开权限',
+ success(res) {
+ if (res.confirm) {
+ console.log('用户点击确定')
+ wx.openSetting({
+ success(res) {
+ console.log(res.authSetting)
+ // res.authSetting = {
+ // "scope.userInfo": true,
+ // "scope.userLocation": true
+ // }
+ }
+ })
+ } else if (res.cancel) {
+ console.log('用户点击取消')
+ }
+ }
+ })
+
+ }
+ })
+ } else { //用户已经授权过了
+
+ console.log(that.data.codeurl)
+ wx.saveImageToPhotosAlbum({
+ filePath: that.data.posterurl,
+ success(res) {
+ wx.showModal({
+ content: '图片已保存到相册',
+ showCancel: false,
+ confirmText: '好的',
+ confirmColor: '#333',
+ success: function (res) {
+ if (res.confirm) {
+ console.log('用户点击确定');
+ /* 该隐藏的隐藏 */
+ that.setData({
+ maskHidden: false
+ })
+ }
+ },
+ fail: function (res) {
+
+ }
+ })
+ }
+ })
+ }
+ }
+ })
+
+ },
+ hideposter(){
+ this.setData({
+ postershow:false
+ })
+ },
+
+ savefilecode() {
+ let that = this;
+ console.log(that.data.codeurl)
+ wx.downloadFile({
+ url: that.data.posterurl,
+ header: {},
+ success: function (res) {
+ console.log('下载图片下载图片下载图片', res)
+ var tempFilePath = res.tempFilePath
+ //console.log('临时文件地址是：' + tempFilePath)
+ wx.saveFile({
+ tempFilePath: tempFilePath,
+ success: function (res) {
+ console.log(res)
+ var saveFilePath = res.savedFilePath;
+ that.setData({
+ posterurl: res.savedFilePath
+ })
+
+ console.log('123456855555555', that.data.qrcode)
+
+ }, //可以将saveFilePath写入到页面数据中
+ fail: function (res) { },
+ complete: function (res) {
+ console.log('complete后的res数据：')
+ },
+ }) //,
+ },
+ // fail: function (res) {
+ // wx.showModal({
+ // title: '下载失败',
+ // content: '请联系管理员',
+ // })
+ // },
+ complete: function (res) { },
+ })
+ },
+
/**
* 生命周期函数--监听页面初次渲染完成
*/
diff --git a/pages/shopdetail/shopdetail.wxml b/pages/shopdetail/shopdetail.wxml
index 3a0e650..44cc8a8 100644
--- a/pages/shopdetail/shopdetail.wxml
+++ b/pages/shopdetail/shopdetail.wxml
@@ -4,9 +4,9 @@
<block wx:for="{{shopdetail.banner_image}}" wx:key="doct">
<swiper-item>
<image src="{{item}}" class="slide-image" />
- <view class="taildot">
+ <!-- <view class="taildot">
{{index+1}}/{{shopdetail.banner_image.length}}
- </view>
+ </view> -->
</swiper-item>
</block>
@@ -34,18 +34,19 @@
</view>
<view class="tailname {{shopdetail.is_collect==1?'recommend':''}}">收藏</view>
</view>
- <view class="tailitem shareitem">
+ <view class="tailitem shareitem" bindtap="share">
<view class="tailtopimg">
<image src="/img/share.png"></image>
</view>
<view class="tailname">分享</view>
- <button open-type="share" class="share"></button>
+ <!-- <button open-type="share" class="share"></button> -->
</view>
</view>
</view>
<view class="cai flex">
- <view class="flower flexone">
+ <view class="flower flexone" wx:if="{{shopdetail.miqilin_score!=false}}">
+ <view class="flowername">米其林</view>
<view class="floweritem" wx:if="{{shopdetail.miqilin_score>=1}}">
<image src="/img/hua.png"></image>
</view>
@@ -69,72 +70,73 @@
<view class="sanleft">
<image src="/img/sanxing.png"></image>
</view>
- <!-- <view class="star flexone">
+ <view class="star flexone">
<view class="staritem">
-
- <image src="/img/pingfenshi.png" wx:if="{{shopdetail.miqilin_score>=1}}"></image>
- <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.miqilin_score<0.5}}"></image>
- <image src="/img/banke.png" wx:if="{{shopdetail.miqilin_score>=0.5&&shopdetail.miqilin_score<1}}"></image>
+ <image src="/img/pingfenshi.png" wx:if="{{shopdetail.synthetical_score>=1}}"></image>
+ <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.synthetical_score<0.5}}"></image>
+ <image src="/img/banke.png" wx:if="{{shopdetail.synthetical_score>=0.5&&shopdetail.synthetical_score<1}}"></image>
</view>
<view class="staritem">
- <image src="/img/pingfenshi.png" wx:if="{{shopdetail.miqilin_score>=2}}"></image>
- <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.miqilin_score<1.5}}"></image>
- <image src="/img/banke.png" wx:if="{{shopdetail.miqilin_score>=1.5&&shopdetail.miqilin_score<2}}"></image>
+ <image src="/img/pingfenshi.png" wx:if="{{shopdetail.synthetical_score>=2}}"></image>
+ <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.synthetical_score<1.5}}"></image>
+ <image src="/img/banke.png" wx:if="{{shopdetail.synthetical_score>=1.5&&shopdetail.synthetical_score<2}}"></image>
</view>
<view class="staritem">
- <image src="/img/pingfenshi.png" wx:if="{{shopdetail.miqilin_score>=3}}"></image>
- <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.miqilin_score<2.5}}"></image>
- <image src="/img/banke.png" wx:if="{{shopdetail.miqilin_score>=2.5&&shopdetail.miqilin_score<3}}"></image>
+ <image src="/img/pingfenshi.png" wx:if="{{shopdetail.synthetical_score>=3}}"></image>
+ <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.synthetical_score<2.5}}"></image>
+ <image src="/img/banke.png" wx:if="{{shopdetail.synthetical_score>=2.5&&shopdetail.synthetical_score<3}}"></image>
</view>
<view class="staritem">
- <image src="/img/pingfenshi.png" wx:if="{{shopdetail.miqilin_score>=4}}"></image>
- <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.miqilin_score<3.5}}"></image>
- <image src="/img/banke.png" wx:if="{{shopdetail.miqilin_score>=3.5&&shopdetail.miqilin_score<4}}"></image>
+ <image src="/img/pingfenshi.png" wx:if="{{shopdetail.synthetical_score>=4}}"></image>
+ <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.synthetical_score<3.5}}"></image>
+ <image src="/img/banke.png" wx:if="{{shopdetail.synthetical_score>=3.5&&shopdetail.synthetical_score<4}}"></image>
</view>
<view class="staritem">
- <image src="/img/pingfenshi.png" wx:if="{{shopdetail.miqilin_score>=5}}"></image>
- <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.miqilin_score<4.5}}"></image>
- <image src="/img/banke.png" wx:if="{{shopdetail.miqilin_score>=4.5&&shopdetail.miqilin_score<5}}"></image>
+ <image src="/img/pingfenshi.png" wx:if="{{shopdetail.synthetical_score>=5}}"></image>
+ <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.synthetical_score<4.5}}"></image>
+ <image src="/img/banke.png" wx:if="{{shopdetail.synthetical_score>=4.5&&shopdetail.synthetical_score<5}}"></image>
</view>
- </view> -->
- <view class="fen">{{shopdetail.synthetical_score}}分</view>
+ </view>
+ <view class="fen" wx:if="{{shopdetail.synthetical_score!=0}}">{{shopdetail.synthetical_score}}分</view>
+ <view class="fen" wx:else>无评论</view>
<view class="tiao">({{shopdetail.remark_num}}条)</view>
</view>
<view class="commentone flexone">
<view class="sanleft">
<image src="/img/kuai.png"></image>
</view>
- <!-- <view class="star flexone">
+ <view class="star flexone">
<view class="staritem">
- <image src="/img/pingfenshi.png" wx:if="{{shopdetail.synthetical_score>=1}}"></image>
- <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.synthetical_score<0.5}}"></image>
- <image src="/img/banke.png" wx:if="{{shopdetail.synthetical_score>=0.5&&shopdetail.synthetical_score<1}}"></image>
+ <image src="/img/pingfenshi.png" wx:if="{{shopdetail.tabelog>=1}}"></image>
+ <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.tabelog<0.5}}"></image>
+ <image src="/img/banke.png" wx:if="{{shopdetail.tabelog>=0.5&&shopdetail.tabelog<1}}"></image>
</view>
<view class="staritem">
- <image src="/img/pingfenshi.png" wx:if="{{shopdetail.synthetical_score>=2}}"></image>
- <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.synthetical_score<1.5}}"></image>
- <image src="/img/banke.png" wx:if="{{shopdetail.synthetical_score>=1.5&&shopdetail.synthetical_score<2}}"></image>
+ <image src="/img/pingfenshi.png" wx:if="{{shopdetail.tabelog>=2}}"></image>
+ <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.tabelog<1.5}}"></image>
+ <image src="/img/banke.png" wx:if="{{shopdetail.tabelog>=1.5&&shopdetail.tabelog<2}}"></image>
</view>
<view class="staritem">
- <image src="/img/pingfenshi.png" wx:if="{{shopdetail.synthetical_score>=3}}"></image>
- <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.synthetical_score<2.5}}"></image>
- <image src="/img/banke.png" wx:if="{{shopdetail.synthetical_score>=2.5&&shopdetail.synthetical_score<3}}"></image>
+ <image src="/img/pingfenshi.png" wx:if="{{shopdetail.tabelog>=3}}"></image>
+ <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.tabelog<2.5}}"></image>
+ <image src="/img/banke.png" wx:if="{{shopdetail.tabelog>=2.5&&shopdetail.tabelog<3}}"></image>
</view>
<view class="staritem">
- <image src="/img/pingfenshi.png" wx:if="{{shopdetail.synthetical_score>=4}}"></image>
- <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.synthetical_score<3.5}}"></image>
- <image src="/img/banke.png" wx:if="{{shopdetail.synthetical_score>=3.5&&shopdetail.synthetical_score<4}}"></image>
+ <image src="/img/pingfenshi.png" wx:if="{{shopdetail.tabelog>=4}}"></image>
+ <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.tabelog<3.5}}"></image>
+ <image src="/img/banke.png" wx:if="{{shopdetail.tabelog>=3.5&&shopdetail.tabelog<4}}"></image>
</view>
<view class="staritem">
- <image src="/img/pingfenshi.png" wx:if="{{shopdetail.synthetical_score>=5}}"></image>
- <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.synthetical_score<4.5}}"></image>
- <image src="/img/banke.png" wx:if="{{shopdetail.synthetical_score>=4.5&&shopdetail.synthetical_score<5}}"></image>
+ <image src="/img/pingfenshi.png" wx:if="{{shopdetail.tabelog>=5}}"></image>
+ <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.tabelog<4.5}}"></image>
+ <image src="/img/banke.png" wx:if="{{shopdetail.tabelog>=4.5&&shopdetail.tabelog<5}}"></image>
</view>
- </view> -->
- <view class="fen">{{shopdetail.tabelog}}分</view>
+ </view>
+ <view class="fen" wx:if="{{shopdetail.tabelog!=0}}">{{shopdetail.tabelog}}分</view>
+ <view class="fen" wx:else>无评论</view>
</view>
</view>
</view>
@@ -150,7 +152,7 @@
<view class="photo {{shopdetail.content==''?'photoact':''}}" wx:if="{{images[0]!=''}}">
<view class="flextwo">
<view class="xiang" >相册</view>
- <view class="photoright flexone" bindtap="{{pic.length!=0?'xiangce':''}}" wx:if="{{pic.length!=0}}">
+ <view class="photoright flexone" bindtap="xiangce">
<view class="morename">更多</view>
<view class="yourow">
<image src="/img/leftrow.png"></image>
@@ -167,7 +169,7 @@
<view class="photo {{shopdetail.images[0]==''&&shopdetail.content==''?'photoact':''}}" wx:if="{{shopdetail.remarks.length!=0}}">
<view class="phototop flextwo">
<view class="phototopleft flexone">
- <view class="xiang">点评 </view>
+ <view class="xiang">评价 </view>
<view class="tiao">({{shopdetail.remarks.length}}条)</view>
</view>
<view class="photoright flexone" bindtap="morecomment">
@@ -257,24 +259,18 @@
</view>
<view class="fen">{{item.score}}分</view>
</view>
- <view class="text">
+ <text class="text">
{{item.content}}
- </view>
+ </text>
<view class="textboximg flexone">
<view class="boxitem" wx:for='{{item.images}}' wx:key="">
- <image src="{{item}}" catchtap="previewimgk" data-index="{{index}}" data-pindex="{{cellindex}}"></image>
+ <image src="{{item}}" catchtap="previewimgk" data-index="{{index}}" data-pindex="{{cellindex}}" mode="aspectFit"></image>
</view>
-
</view>
</view>
-
-
</view>
-
-
-
</view>
</view>
@@ -343,7 +339,8 @@
<!-- <view class="canone pricepeopel">自助点餐：53000日元 （服务费800日元）</view>
<view class="cantwo pricepeopel">午餐套餐：53000日元 （服务费800日元、税费1600日元）</view> -->
<view class="cantext">
- {{shopdetail.combo}}
+ <rich-text nodes="{{shopdetail.combo}}"></rich-text>
+
</view>
</view>
@@ -357,6 +354,265 @@
</view>
+ <!-- 推荐店铺 -->
+ <view class="photo" wx:if="{{shoplist.length!=0}}">
+ <view class="xiang" bindtap="xiangce shopname">店铺推荐</view>
+ <view class='case-page'>
+ <view class='list-masonry'>
+ <view class='item-masonry {{shoplist.length==1?"noitem":""}}' bindtap="goodtail" data-id="{{item.id}}" wx:for="{{shoplist}}" wx:key="">
+ <view class="goodimg">
+ <image src='{{item.image}}' mode='widthFix'></image>
+ </view>
+ <view class="goodbot">
+ <view class="goodname">{{item.name}}</view>
+ <view class="goodname riname" wx:if="{{item.name_jap!=null}}">{{item.name_jap}}</view>
+ <view class="intro flextwo">
+ <!-- <view class="space"></view> -->
+ <view class="introleft">
+ {{item.series_name}}
+ </view>
+ <view class="introright ">
+
+ <view class="hualist flexone" wx:if="{{item.score!=false}}">
+ <view class="flowername flowernamek">米其林</view>
+ <!-- wx:if="{{item.score>=1}}" -->
+ <!-- <view class="huaitem">
+ <image src="/img/flower.png"></image>
+ </view> -->
+ <!-- wx:if="{{item.score>=2}}" -->
+ <!-- <view class="huaitem" >
+ <image src="/img/flower.png"></image>
+ </view> -->
+ <!-- wx:if="{{item.score>=3}}" -->
+ <!-- <view class="huaitem" >
+ <image src="/img/flower.png"></image>
+ </view> -->
+
+ <view class="pingfen" wx:if="{{item.score!=false}}">{{item.score}}分</view>
+ </view>
+ <view class="ping flexone">
+ <view class="kuaizifen">Tabelog</view>
+ <!-- <view class="pingleft">
+ <image src='/img/kuaizi.png'></image>
+ </view> -->
+ <view class="pingfen">{{item.tabelog}}分</view>
+ </view>
+
+ </view>
+ </view>
+ <view class="flextwo pricetwo" >
+ <view class="shou">
+ <text class="shoumoney">￥{{item.price}}</text>
+ <text class="shouren">/人</text>
+ </view>
+ <view class="addname flexone">
+ <view class="addimg">
+ <image src="/img/huangweizhi.png"></image>
+ </view>
+ <view class="dizhi commnameone">{{item.business_name}}</view>
+ </view>
+ </view>
+
+ </view>
+
+
+ </view>
+ <!-- <view class='item-masonry'>
+ <image src='/img/deng.png' mode='widthFix'></image>
+ <view class="goodname">基值支义们京候么眼革下使叫南石很少去构。</view>
+ <view class="intro flexone">
+ <view class="introleft">
+ 魚介?海鮮料理
+ </view>
+ <view class="introright">
+ <view class="ping flexone">
+ <view class="pingleft">
+ <image src='/img/kuaizi.png'></image>
+ </view>
+ <view class="pingfen">4.7</view>
+ </view>
+ <view class="hualist flexone">
+ <view class="huaitem">
+ <image src="/img/flower.png"></image>
+ </view>
+ <view class="huaitem">
+ <image src="/img/flower.png"></image>
+ </view>
+ <view class="huaitem">
+ <image src="/img/flower.png"></image>
+ </view>
+ </view>
+ </view>
+ </view>
+ <view class="shou">
+ <text class="shoumoney">￥50</text>
+ <text class="shouren">/人</text>
+ </view>
+ <view class="addname flexone">
+ <view class="addimg">
+ <image src="/img/huangweizhi.png"></image>
+ </view>
+ <view class="dizhi commnameone">银厦</view>
+ </view>
+ </view>
+ <view class='item-masonry'>
+ <image src='/img/juxia.png' mode='widthFix'></image>
+ <view class="goodname">基值支义们京候么眼革下使叫南石很少去构。</view>
+ <view class="intro flexone">
+ <view class="introleft">
+ 魚介?海鮮料理
+ </view>
+ <view class="introright">
+ <view class="ping flexone">
+ <view class="pingleft">
+ <image src='/img/kuaizi.png'></image>
+ </view>
+ <view class="pingfen">4.7</view>
+ </view>
+ <view class="hualist flexone">
+ <view class="huaitem">
+ <image src="/img/flower.png"></image>
+ </view>
+ <view class="huaitem">
+ <image src="/img/flower.png"></image>
+ </view>
+ <view class="huaitem">
+ <image src="/img/flower.png"></image>
+ </view>
+ </view>
+ </view>
+ </view>
+ <view class="shou">
+ <text class="shoumoney">￥50</text>
+ <text class="shouren">/人</text>
+ </view>
+ <view class="addname flexone">
+ <view class="addimg">
+ <image src="/img/huangweizhi.png"></image>
+ </view>
+ <view class="dizhi commnameone">银厦</view>
+ </view>
+ </view>
+ <view class='item-masonry'>
+ <image src='/img/fenxia.png' mode='widthFix'></image>
+ <view class="goodname">基值支义们京候么眼革下使叫南石很少去构。</view>
+ <view class="intro flexone">
+ <view class="introleft">
+ 魚介?海鮮料理
+ </view>
+ <view class="introright">
+ <view class="ping flexone">
+ <view class="pingleft">
+ <image src='/img/kuaizi.png'></image>
+ </view>
+ <view class="pingfen">4.7</view>
+ </view>
+ <view class="hualist flexone">
+ <view class="huaitem">
+ <image src="/img/flower.png"></image>
+ </view>
+ <view class="huaitem">
+ <image src="/img/flower.png"></image>
+ </view>
+ <view class="huaitem">
+ <image src="/img/flower.png"></image>
+ </view>
+ </view>
+ </view>
+ </view>
+ <view class="shou">
+ <text class="shoumoney">￥50</text>
+ <text class="shouren">/人</text>
+ </view>
+ <view class="addname flexone">
+ <view class="addimg">
+ <image src="/img/huangweizhi.png"></image>
+ </view>
+ <view class="dizhi commnameone">银厦</view>
+ </view>
+ </view>
+ <view class='item-masonry'>
+ <image src='/img/juxia.png' mode='widthFix'></image>
+ <view class="goodname">基值支义们京候么眼革下使叫南石很少去构。</view>
+ <view class="intro flexone">
+ <view class="introleft">
+ 魚介?海鮮料理
+ </view>
+ <view class="introright">
+ <view class="ping flexone">
+ <view class="pingleft">
+ <image src='/img/kuaizi.png'></image>
+ </view>
+ <view class="pingfen">4.7</view>
+ </view>
+ <view class="hualist flexone">
+ <view class="huaitem">
+ <image src="/img/flower.png"></image>
+ </view>
+ <view class="huaitem">
+ <image src="/img/flower.png"></image>
+ </view>
+ <view class="huaitem">
+ <image src="/img/flower.png"></image>
+ </view>
+ </view>
+ </view>
+ </view>
+ <view class="shou">
+ <text class="shoumoney">￥50</text>
+ <text class="shouren">/人</text>
+ </view>
+ <view class="addname flexone">
+ <view class="addimg">
+ <image src="/img/huangweizhi.png"></image>
+ </view>
+ <view class="dizhi commnameone">银厦</view>
+ </view>
+ </view>
+ <view class='item-masonry'>
+ <image src='/img/deng.png' mode='widthFix'></image>
+ <view class="goodname">基值支义们京候么眼革下使叫南石很少去构。</view>
+ <view class="intro flexone">
+ <view class="introleft">
+ 魚介?海鮮料理
+ </view>
+ <view class="introright">
+ <view class="ping flexone">
+ <view class="pingleft">
+ <image src='/img/kuaizi.png'></image>
+ </view>
+ <view class="pingfen">4.7</view>
+ </view>
+ <view class="hualist flexone">
+ <view class="huaitem">
+ <image src="/img/flower.png"></image>
+ </view>
+ <view class="huaitem">
+ <image src="/img/flower.png"></image>
+ </view>
+ <view class="huaitem">
+ <image src="/img/flower.png"></image>
+ </view>
+ </view>
+ </view>
+ </view>
+ <view class="shou">
+ <text class="shoumoney">￥50</text>
+ <text class="shouren">/人</text>
+ </view>
+ <view class="addname flexone">
+ <view class="addimg">
+ <image src="/img/huangweizhi.png"></image>
+ </view>
+ <view class="dizhi commnameone">银厦</view>
+ </view>
+ </view> -->
+
+ </view>
+ </view>
+
+</view>
+
</view>
<view class="botfix flextwo">
@@ -379,7 +635,7 @@
<view class="botname">拍视频</view>
</view> -->
<view class="boitem" bindtap="write" data-id="4">
- <view class="botitemtop" bindtap="write" data-id="4">
+ <view class="botitemtop" >
<image src="/img/writedian.png"></image>
</view>
<view class="botname">评价</view>
@@ -410,4 +666,11 @@
<view class="clocksure" bindtap="sure">确定</view>
</view>
</view>
+
+ <!-- 分享海报遮罩层 -->
+ <view class="register" wx:if="{{postershow}}" bindtap="hideposter">
+ <view class="posterwrap" catchlongpress="baocun">
+ <image src="{{posterurl}}"></image>
+ </view>
+ </view>
</view>
\ No newline at end of file
diff --git a/pages/shopdetail/shopdetail.wxss b/pages/shopdetail/shopdetail.wxss
index 7799db5..d043213 100644
--- a/pages/shopdetail/shopdetail.wxss
+++ b/pages/shopdetail/shopdetail.wxss
@@ -1,3 +1,4 @@
+@import '../homepage/homepage.wxss';
image {
width: 100%;
height: 100%;
@@ -144,7 +145,7 @@ swiper {
opacity: 1;
border-radius: 8rpx;
color: #8c9198;
- font-size: 24rpx;
+ font-size: 22rpx;
text-align: center;
line-height: 40rpx;
margin-left: 12rpx;
@@ -216,7 +217,7 @@ page {
}
.bodybox {
- padding: 0 32rpx;
+ padding: 0 24rpx;
box-sizing: border-box;
}
@@ -241,10 +242,10 @@ page {
}
.photoitem {
- width: 223rpx;
+ width: 245rpx;
height: 188rpx;
font-size: 0;
- padding-right: 42rpx;
+ padding-right: 15rpx;
margin-bottom: 20rpx;
flex: 0 0 auto;
}
@@ -305,8 +306,8 @@ page {
}
.boxitem {
- width: 160rpx;
- height: 160rpx;
+ width: 154rpx;
+ height: 154rpx;
font-size: 0;
margin-right: 18rpx;
}
@@ -477,7 +478,7 @@ page {
.cantext {
color: #707070;
- font-size: 24rpx;
+ font-size: 28rpx;
margin-top: 20rpx;
line-height: 1.5
}
@@ -557,4 +558,38 @@ button::after {
}
.dianbox{
margin-top:24rpx;
+}
+.flowername{
+ color:#F0ABA5;
+ font-size:26rpx;
+ margin-right:10rpx;
+}
+.case-page{
+ padding: 0;
+ margin-top:24rpx;
+}
+.flowernamek{
+ font-size:18rpx;
+}
+.introleft {
+ font-size: 19rpx;
+}
+.goodbot{
+ padding: 0 10rpx;
+}
+.noitem{
+ box-shadow: none;
+}
+
+/* 海报图 */
+.posterwrap{
+ width:648rpx;
+ height:646rpx;
+ font-size: 0;
+ background: #fff;
+ position: absolute;
+ top:50%;
+ left:50%;
+ transform: translate(-50%,-50%);
+
}
\ No newline at end of file