miniprogram / meiweiriben · 提交

转到一个项目

作者 lihongjuan
提交 0d756c4a5da81a22b7d61e12499163f8e75f4586 1 个父辈 e5d9ce2d

1

内嵌 并排对比
正在显示 16 个修改的文件 包含 764 行增加 和 154 行删除
@@ -80,27 +80,31 @@ Page({ @@ -80,27 +80,31 @@ Page({
80 chooseImage() { 80 chooseImage() {
81 let that = this; 81 let that = this;
82 wx.chooseImage({ 82 wx.chooseImage({
83 - count: 1, 83 + count: 9,
84 sizeType: ['original', 'compressed'], 84 sizeType: ['original', 'compressed'],
85 success: function (res) { 85 success: function (res) {
  86 + console.log(res.tempFilePaths)
86 console.log(res.tempFilePaths[0]) 87 console.log(res.tempFilePaths[0])
87 - app.upload('image', res.tempFilePaths[0], "post").then((res) => {  
88 - console.log('上传文件', res);  
89 - let url = app.globalData.baseurl+res.url;  
90 - that.data.image.push(url)  
91 - that.data.cimage.push(res.url)  
92 - that.setData({  
93 - image: that.data.image,  
94 - cimage: that.data.cimage 88 + res.tempFilePaths.forEach(function(value,index,array){
  89 + app.upload('image', value, "post").then((res) => {
  90 + console.log('上传文件', res);
  91 + let url = app.globalData.baseurl+res.url;
  92 + that.data.image.push(url)
  93 + that.data.cimage.push(res.url)
  94 + that.setData({
  95 + image: that.data.image,
  96 + cimage: that.data.cimage
  97 + })
  98 +
  99 + console.log(that.data.image);
  100 + console.log(that.data.cimage)
  101 +
  102 +
  103 + }).catch((err) => {
  104 + console.log(err)
95 }) 105 })
96 -  
97 - console.log(that.data.image);  
98 - console.log(that.data.cimage)  
99 -  
100 -  
101 - }).catch((err) => {  
102 - console.log(err)  
103 }) 106 })
  107 +
104 }, 108 },
105 fail: function (res) { } 109 fail: function (res) { }
106 }) 110 })
@@ -109,7 +113,9 @@ Page({ @@ -109,7 +113,9 @@ Page({
109 // 删除图片 113 // 删除图片
110 del(e){ 114 del(e){
111 let that=this; 115 let that=this;
  116 + console.log(e)
112 let url=e.currentTarget.dataset.url; 117 let url=e.currentTarget.dataset.url;
  118 + console.log(url)
113 that.data.image.forEach(function(value,index,array){ 119 that.data.image.forEach(function(value,index,array){
114 if(value==url){ 120 if(value==url){
115 that.data.image.splice(index,1); 121 that.data.image.splice(index,1);
1 <view class="infobox"> 1 <view class="infobox">
2 <view class="infoTitle">{{name}}</view> 2 <view class="infoTitle">{{name}}</view>
3 - <view class="infobox">  
4 - <view class="infoTitle">评分</view>  
5 - <view class="evaluateItem">  
6 - <view class="tltle">综合</view> 3 + <view class="infoboxk">
  4 +
  5 + <view class="evaluateItem flexone">
  6 + <view class="infoTitle">评分</view>
7 <view class="starbox" bindtap="total" data-id="1"> 7 <view class="starbox" bindtap="total" data-id="1">
8 <image class="starItem" src="/img/pingfenshi.png" wx:if="{{totalstar>=1}}" /> 8 <image class="starItem" src="/img/pingfenshi.png" wx:if="{{totalstar>=1}}" />
9 <image class="starItem" src="/img/lingfen_icon.png" wx:else/> 9 <image class="starItem" src="/img/lingfen_icon.png" wx:else/>
@@ -142,11 +142,12 @@ @@ -142,11 +142,12 @@
142 <image src="/img/chahao.png"></image> 142 <image src="/img/chahao.png"></image>
143 </view> 143 </view>
144 </view> 144 </view>
145 - </view>  
146 -  
147 - <view class="imgItem" bindtap="chooseImage"> 145 + <view class="imgItem" bindtap="chooseImage">
148 <image mode="aspectFill" src="/img/jiang.png" /> 146 <image mode="aspectFill" src="/img/jiang.png" />
149 </view> 147 </view>
  148 + </view>
  149 +
  150 +
150 </view> 151 </view>
151 152
152 153
@@ -11,6 +11,9 @@ page { @@ -11,6 +11,9 @@ page {
11 padding: 38rpx 32rpx 26rpx; 11 padding: 38rpx 32rpx 26rpx;
12 box-sizing: border-box; 12 box-sizing: border-box;
13 } 13 }
  14 +.infoboxk{
  15 + margin-top:38rpx;
  16 +}
14 17
15 .imgarr { 18 .imgarr {
16 width: 100%; 19 width: 100%;
@@ -74,7 +77,7 @@ page { @@ -74,7 +77,7 @@ page {
74 font-weight: 400; 77 font-weight: 400;
75 line-height: 44rpx; 78 line-height: 44rpx;
76 color: rgba(0, 0, 0, 1); 79 color: rgba(0, 0, 0, 1);
77 - margin-bottom: 20rpx; 80 + /* margin-bottom: 20rpx; */
78 } 81 }
79 82
80 .evaluateItem { 83 .evaluateItem {
@@ -176,4 +179,7 @@ page { @@ -176,4 +179,7 @@ page {
176 align-items: center; 179 align-items: center;
177 width:600rpx; 180 width:600rpx;
178 flex-wrap: wrap 181 flex-wrap: wrap
  182 +}
  183 +.picbox {
  184 + flex-wrap: wrap;
179 } 185 }
@@ -19,8 +19,8 @@ Page({ @@ -19,8 +19,8 @@ Page({
19 sel: 0, 19 sel: 0,
20 selk: 0, 20 selk: 0,
21 index: 0, 21 index: 0,
22 - selarray: ['全部', '银座', '金座'],  
23 - toparr: ['商圈', '菜系', '评级', '综合'], 22 + selarray: [],
  23 + toparr: [],
24 topindex: 0, 24 topindex: 0,
25 wrap: false, 25 wrap: false,
26 // 国家 26 // 国家
@@ -42,7 +42,6 @@ Page({ @@ -42,7 +42,6 @@ Page({
42 * 生命周期函数--监听页面加载 42 * 生命周期函数--监听页面加载
43 */ 43 */
44 onLoad: function(options) { 44 onLoad: function(options) {
45 -  
46 this.getcountry(); 45 this.getcountry();
47 // 获取banner 46 // 获取banner
48 this.getbanner() 47 this.getbanner()
@@ -68,7 +67,6 @@ Page({ @@ -68,7 +67,6 @@ Page({
68 let that = this; 67 let that = this;
69 var url = 'sundry/get_slide'; 68 var url = 'sundry/get_slide';
70 var params = { 69 var params = {
71 -  
72 } 70 }
73 app.post(url, params).then((res) => { 71 app.post(url, params).then((res) => {
74 console.log(res); 72 console.log(res);
@@ -110,16 +108,17 @@ Page({ @@ -110,16 +108,17 @@ Page({
110 108
111 selt: 0, 109 selt: 0,
112 selk: '', 110 selk: '',
113 - goodlist: [] 111 + goodlist: [],
  112 + page:1
114 }) 113 })
115 this.getshanguqan(); 114 this.getshanguqan();
116 this.gethomelist() 115 this.gethomelist()
117 } else if (this.data.sel == 1) { 116 } else if (this.data.sel == 1) {
118 this.setData({ 117 this.setData({
119 -  
120 selt: 1, 118 selt: 1,
121 selk: '', 119 selk: '',
122 - goodlist: [] 120 + goodlist: [],
  121 + page:1
123 }) 122 })
124 this.getcai(); 123 this.getcai();
125 this.gethomelist() 124 this.gethomelist()
@@ -127,7 +126,8 @@ Page({ @@ -127,7 +126,8 @@ Page({
127 this.setData({ 126 this.setData({
128 selt: 2, 127 selt: 2,
129 selk: '', 128 selk: '',
130 - goodlist: [] 129 + goodlist: [],
  130 + page:1
131 }) 131 })
132 132
133 this.getrank(); 133 this.getrank();
@@ -136,7 +136,8 @@ Page({ @@ -136,7 +136,8 @@ Page({
136 this.setData({ 136 this.setData({
137 selt: 3, 137 selt: 3,
138 selk: '', 138 selk: '',
139 - goodlist: [] 139 + goodlist: [],
  140 + page:1
140 }) 141 })
141 142
142 this.gettotal(); 143 this.gettotal();
@@ -426,6 +427,11 @@ Page({ @@ -426,6 +427,11 @@ Page({
426 } 427 }
427 app.post(url, params, "post").then((res) => { 428 app.post(url, params, "post").then((res) => {
428 console.log(res); 429 console.log(res);
  430 + let obj={
  431 + id:'',
  432 + name:'全部'
  433 + }
  434 + res.unshift(obj)
429 that.setData({ 435 that.setData({
430 selarray: res, 436 selarray: res,
431 }) 437 })
@@ -453,6 +459,11 @@ Page({ @@ -453,6 +459,11 @@ Page({
453 } 459 }
454 app.post(url, params, "post").then((res) => { 460 app.post(url, params, "post").then((res) => {
455 console.log(res); 461 console.log(res);
  462 + let obj={
  463 + id:'',
  464 + name:'全部'
  465 + }
  466 + res.unshift(obj)
456 that.setData({ 467 that.setData({
457 selarray: res, 468 selarray: res,
458 469
@@ -481,6 +492,11 @@ Page({ @@ -481,6 +492,11 @@ Page({
481 } 492 }
482 app.post(url, params, "post").then((res) => { 493 app.post(url, params, "post").then((res) => {
483 console.log(res); 494 console.log(res);
  495 + let obj={
  496 + id:'',
  497 + name:'全部'
  498 + }
  499 + res.unshift(obj)
484 that.setData({ 500 that.setData({
485 selarray: res, 501 selarray: res,
486 502
@@ -51,10 +51,11 @@ @@ -51,10 +51,11 @@
51 51
52 <view class='case-page' wx:else> 52 <view class='case-page' wx:else>
53 <view class='list-masonry'> 53 <view class='list-masonry'>
54 - <view class='item-masonry' bindtap="goodtail" data-id="{{item.id}}" wx:for="{{goodlist}}" wx:key=""> 54 + <view class='item-masonry {{shoplist.length==1?"noitem":""}}' bindtap="goodtail" data-id="{{item.id}}" wx:for="{{goodlist}}" wx:key="">
55 <view class="goodimg"> 55 <view class="goodimg">
56 <image src='{{item.image}}' mode='widthFix'></image> 56 <image src='{{item.image}}' mode='widthFix'></image>
57 </view> 57 </view>
  58 +
58 <view class="goodbot"> 59 <view class="goodbot">
59 <view class="goodname">{{item.name}}</view> 60 <view class="goodname">{{item.name}}</view>
60 <view class="goodname riname" wx:if="{{item.name_jap!=null}}">{{item.name_jap}}</view> 61 <view class="goodname riname" wx:if="{{item.name_jap!=null}}">{{item.name_jap}}</view>
@@ -63,35 +64,37 @@ @@ -63,35 +64,37 @@
63 <view class="introleft"> 64 <view class="introleft">
64 {{item.series_name}} 65 {{item.series_name}}
65 </view> 66 </view>
66 - <view class="introright"> 67 + <view class="introright ">
  68 +
67 <view class="hualist flexone" wx:if="{{item.score!=false}}"> 69 <view class="hualist flexone" wx:if="{{item.score!=false}}">
68 - <view class="huaitem" wx:if="{{item.score>=1}}"> 70 + <view class="flowername">米其林</view>
  71 + <!-- wx:if="{{item.score>=1}}" -->
  72 + <!-- <view class="huaitem">
69 <image src="/img/flower.png"></image> 73 <image src="/img/flower.png"></image>
70 - </view>  
71 - <view class="huaitem" wx:if="{{item.score>=2}}"> 74 + </view> -->
  75 + <!-- wx:if="{{item.score>=2}}" -->
  76 + <!-- <view class="huaitem" >
72 <image src="/img/flower.png"></image> 77 <image src="/img/flower.png"></image>
73 - </view>  
74 - <view class="huaitem" wx:if="{{item.score>=3}}"> 78 + </view> -->
  79 + <!-- wx:if="{{item.score>=3}}" -->
  80 + <!-- <view class="huaitem" >
75 <image src="/img/flower.png"></image> 81 <image src="/img/flower.png"></image>
76 - </view>  
77 - <view class="huaitem" wx:if="{{item.score>=4}}">  
78 - <image src="/img/flower.png"></image>  
79 - </view>  
80 - <view class="huaitem" wx:if="{{item.score>=5}}">  
81 - <image src="/img/flower.png"></image>  
82 - </view>  
83 - <!-- <view class="pingfen" wx:if="{{item.score!=false}}">{{item.score}}</view> --> 82 + </view> -->
  83 +
  84 + <view class="pingfen" wx:if="{{item.score!=false}}">{{item.score}}分</view>
84 </view> 85 </view>
85 <view class="ping flexone"> 86 <view class="ping flexone">
86 - <view class="pingleft"> 87 + <view class="kuaizifen">Tabelog</view>
  88 + <!-- <view class="pingleft">
87 <image src='/img/kuaizi.png'></image> 89 <image src='/img/kuaizi.png'></image>
88 - </view>  
89 - <view class="pingfen">{{item.synthetical_score}}</view> 90 + </view> -->
  91 + <view class="pingfen">{{item.tabelog}}分</view>
90 </view> 92 </view>
91 93
92 </view> 94 </view>
93 </view> 95 </view>
94 - <view class="shou"> 96 + <view class="flextwo pricetwo" >
  97 + <view class="shou">
95 <text class="shoumoney">￥{{item.price}}</text> 98 <text class="shoumoney">￥{{item.price}}</text>
96 <text class="shouren">/人</text> 99 <text class="shouren">/人</text>
97 </view> 100 </view>
@@ -101,10 +104,13 @@ @@ -101,10 +104,13 @@
101 </view> 104 </view>
102 <view class="dizhi commnameone">{{item.business_name}}</view> 105 <view class="dizhi commnameone">{{item.business_name}}</view>
103 </view> 106 </view>
  107 + </view>
  108 +
104 </view> 109 </view>
105 110
106 111
107 </view> 112 </view>
  113 +
108 <!-- <view class='item-masonry'> 114 <!-- <view class='item-masonry'>
109 <image src='/img/deng.png' mode='widthFix'></image> 115 <image src='/img/deng.png' mode='widthFix'></image>
110 <view class="goodname">基值支义们京候么眼革下使叫南石很少去构。</view> 116 <view class="goodname">基值支义们京候么眼革下使叫南石很少去构。</view>
@@ -142,7 +142,7 @@ swiper-item { @@ -142,7 +142,7 @@ swiper-item {
142 .item-masonry { 142 .item-masonry {
143 background-color: #fff; 143 background-color: #fff;
144 break-inside: avoid; 144 break-inside: avoid;
145 - padding: 20rpx 0; 145 + padding: 0rpx 0 20rpx;
146 box-sizing: border-box; 146 box-sizing: border-box;
147 margin-bottom: 28rpx; 147 margin-bottom: 28rpx;
148 box-shadow: 0rpx 8rpx 16rpx rgba(0, 0, 0, 0.08); 148 box-shadow: 0rpx 8rpx 16rpx rgba(0, 0, 0, 0.08);
@@ -195,13 +195,17 @@ swiper-item { @@ -195,13 +195,17 @@ swiper-item {
195 height:40rpx; 195 height:40rpx;
196 font-size: 0; 196 font-size: 0;
197 } 197 }
198 - 198 +.kuaizifen{
  199 + color: #fca052;
  200 + font-size: 18rpx;
  201 + margin-right:10rpx;
  202 +}
199 .pingfen { 203 .pingfen {
200 204
201 overflow: hidden; 205 overflow: hidden;
202 text-overflow: ellipsis; 206 text-overflow: ellipsis;
203 color: #fca052; 207 color: #fca052;
204 - font-size: 22rpx; 208 + font-size: 18rpx;
205 margin-left: 6rpx; 209 margin-left: 6rpx;
206 text-align: right; 210 text-align: right;
207 margin-right:8rpx; 211 margin-right:8rpx;
@@ -227,7 +231,10 @@ swiper-item { @@ -227,7 +231,10 @@ swiper-item {
227 } 231 }
228 232
229 .shou { 233 .shou {
230 - margin-top: 16rpx; 234 + /* margin-top: 16rpx; */
  235 +}
  236 +.pricetwo{
  237 + margin-top:16rpx;
231 } 238 }
232 239
233 .shoumoney { 240 .shoumoney {
@@ -296,4 +303,12 @@ page { @@ -296,4 +303,12 @@ page {
296 width: 1rpx; 303 width: 1rpx;
297 height: 100%; 304 height: 100%;
298 float: left; 305 float: left;
  306 +}
  307 +.flowername{
  308 + color:#F0ABA5;
  309 + font-size:20rpx;
  310 + margin-right:10rpx;
  311 +}
  312 +.noitem{
  313 + box-shadow: none;
299 } 314 }
@@ -100,7 +100,8 @@ Page({ @@ -100,7 +100,8 @@ Page({
100 url: '/pages/shopdetail/shopdetail?id='+that.data.shopid, 100 url: '/pages/shopdetail/shopdetail?id='+that.data.shopid,
101 }) 101 })
102 }else{ 102 }else{
103 - wx.navigateTo({ 103 + wx.switchTab({
  104 +
104 url: '/pages/homepage/homepage', 105 url: '/pages/homepage/homepage',
105 }) 106 })
106 } 107 }
@@ -83,6 +83,21 @@ Page({ @@ -83,6 +83,21 @@ Page({
83 83
84 }, 84 },
85 85
  86 + // 评论图片预览
  87 + previewimgk(e){
  88 + console.log(e)
  89 + let pindex=e.currentTarget.dataset.pindex;
  90 + let index=e.currentTarget.dataset.index;
  91 + wx.previewImage({
  92 + current: this.data.commentlist[pindex].images[index],
  93 + urls:this.data.commentlist[pindex].images,
  94 + success: function (res) { },
  95 + fail: function (res) { },
  96 + complete: function (res) { },
  97 + })
  98 +
  99 + },
  100 +
86 // 店铺收藏 101 // 店铺收藏
87 collect(e){ 102 collect(e){
88 let id=e.currentTarget.dataset.id; 103 let id=e.currentTarget.dataset.id;
@@ -134,6 +149,27 @@ Page({ @@ -134,6 +149,27 @@ Page({
134 }) 149 })
135 }, 150 },
136 151
  152 + // goodtail(e) {
  153 + // let token = wx.getStorageSync("token");
  154 + // if (token == '') {
  155 + // wx.showToast({
  156 + // title: '请先登录',
  157 + // icon: "none"
  158 + // })
  159 + // setTimeout(function() {
  160 + // wx.navigateTo({
  161 + // url: '/pages/index/index',
  162 + // })
  163 + // }, 1500)
  164 + // } else {
  165 + // let id = e.currentTarget.dataset.id;
  166 + // wx.navigateTo({
  167 + // url: '/pages/shopdetail/shopdetail?id=' + id,
  168 + // })
  169 + // }
  170 +
  171 + // },
  172 +
137 // 删除点评 173 // 删除点评
138 delcomment(e){ 174 delcomment(e){
139 let that = this 175 let that = this
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 12
13 13
14 <view class="bodybox" wx:else> 14 <view class="bodybox" wx:else>
15 - <view class="photo" wx:for="{{commentlist}}" wx:key=""> 15 + <view class="photo" wx:for="{{commentlist}}" wx:key="" wx:for-index="cellindex">
16 <view class="jianintro commentitem" bindtap="comentdetail" data-id="{{item.id}}" data-shopid="{{item.shop_id}}"> 16 <view class="jianintro commentitem" bindtap="comentdetail" data-id="{{item.id}}" data-shopid="{{item.shop_id}}">
17 <view class="comtop flextwo"> 17 <view class="comtop flextwo">
18 <view class="comleft"> 18 <view class="comleft">
@@ -71,19 +71,19 @@ @@ -71,19 +71,19 @@
71 </view> 71 </view>
72 <view class="shouprice">￥{{item.price}}/人</view> 72 <view class="shouprice">￥{{item.price}}/人</view>
73 </view> 73 </view>
74 - <view class="fuwu flexone"> 74 + <!-- <view class="fuwu flexone">
75 <view class="fuwuitem">服务：{{item.score2}}</view> 75 <view class="fuwuitem">服务：{{item.score2}}</view>
76 <view class="fuwuitem">口味：{{item.score3}}</view> 76 <view class="fuwuitem">口味：{{item.score3}}</view>
77 <view class="fuwuitem">环境：{{item.score4}}</view> 77 <view class="fuwuitem">环境：{{item.score4}}</view>
78 <view class="fuwuitem">食材：{{itme.score5}}</view> 78 <view class="fuwuitem">食材：{{itme.score5}}</view>
79 - </view>  
80 - <view class="text"> 79 + </view> -->
  80 + <text class="text">
81 {{item.content}} 81 {{item.content}}
82 - </view> 82 + </text>
83 <!-- <view class="all">全部</view> --> 83 <!-- <view class="all">全部</view> -->
84 <view class="textboximg flexone" wx:if="{{item.images.length!=0}}"> 84 <view class="textboximg flexone" wx:if="{{item.images.length!=0}}">
85 <view class="boxitem" wx:for="{{item.images}}" wx:key=""> 85 <view class="boxitem" wx:for="{{item.images}}" wx:key="">
86 - <image src="{{item}}"></image> 86 + <image src="{{item}}" catchtap="previewimgk" data-index="{{index}}" data-pindex="{{cellindex}}" mode="aspectFit"></image>
87 </view> 87 </view>
88 88
89 </view> 89 </view>
@@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
92 92
93 </view> 93 </view>
94 </view> 94 </view>
95 - <view class="jianbot flextwo"> 95 + <view class="jianbot flextwo" bindtap="goodtail" data-id="{{item.shop_id}}">
96 <view class="jianleft flex"> 96 <view class="jianleft flex">
97 <view class="collectbitemleft"> 97 <view class="collectbitemleft">
98 <image src="{{item.image}}"></image> 98 <image src="{{item.image}}"></image>
@@ -109,7 +109,7 @@ @@ -109,7 +109,7 @@
109 </view> 109 </view>
110 </view> 110 </view>
111 111
112 - <view class="jianright" bindtap="collect" data-id="{{item.shop_id}}" data-index="{{index}}"> 112 + <view class="jianright" catchtap="collect" data-id="{{item.shop_id}}" data-index="{{index}}">
113 <image src="/img/graycollect.png" wx:if="{{item.is_collect==0}}"></image> 113 <image src="/img/graycollect.png" wx:if="{{item.is_collect==0}}"></image>
114 <image src="/img/yellowcollect.png" wx:if="{{item.is_collect==1}}"></image> 114 <image src="/img/yellowcollect.png" wx:if="{{item.is_collect==1}}"></image>
115 </view> 115 </view>
@@ -130,9 +130,6 @@ @@ -130,9 +130,6 @@
130 </view> 130 </view>
131 </view> 131 </view>
132 </view> 132 </view>
133 -  
134 -  
135 -  
136 </view> 133 </view>
137 134
138 <!-- <view class="nomoer">没有更多了哦～</view> --> 135 <!-- <view class="nomoer">没有更多了哦～</view> -->
@@ -148,4 +148,7 @@ @@ -148,4 +148,7 @@
148 } 148 }
149 .commentitem{ 149 .commentitem{
150 margin-top:0 150 margin-top:0
  151 +}
  152 +.textboximg{
  153 + flex-wrap: wrap;
151 } 154 }
@@ -32,8 +32,11 @@ @@ -32,8 +32,11 @@
32 <view class="entertext"> 32 <view class="entertext">
33 <view class="textyop">用户简介</view> 33 <view class="textyop">用户简介</view>
34 <view class="textarea"> 34 <view class="textarea">
  35 + <textarea placeholder='这个人什么都没写…' value="{{brief}}" bindinput="entermark" maxlength="50"></textarea>
  36 +
  37 + <view class="textlen">{{brief.length}}/50</view>
35 38
36 - <input placeholder='这个人什么都没写…' value="{{brief}}" bindinput="entermark" maxlength="50"/> 39 + <!-- <input placeholder='这个人什么都没写…' value="{{brief}}" bindinput="entermark" maxlength="50"/> -->
37 40
38 41
39 </view> 42 </view>
@@ -53,6 +53,17 @@ page { @@ -53,6 +53,17 @@ page {
53 color: #bdc4ce; 53 color: #bdc4ce;
54 font-size:30rpx; 54 font-size:30rpx;
55 margin-top: 16rpx; 55 margin-top: 16rpx;
  56 + position: relative;
  57 +}
  58 +.textarea textarea{
  59 + width:100%;
  60 +}
  61 +.textlen{
  62 + color: #bdc4ce;
  63 + font-size:30rpx;
  64 + position: absolute;
  65 + right:0;
  66 + bottom:0;
56 } 67 }
57 68
58 .entertext { 69 .entertext {
@@ -17,7 +17,10 @@ Page({ @@ -17,7 +17,10 @@ Page({
17 shopid: '', 17 shopid: '',
18 shopdetail: '', 18 shopdetail: '',
19 images:[], 19 images:[],
20 - pic:[] 20 + pic:[],
  21 + shoplist:[],
  22 + posterurl:'',
  23 + postershow:false
21 }, 24 },
22 25
23 swiperChange: function(e) { 26 swiperChange: function(e) {
@@ -35,6 +38,62 @@ Page({ @@ -35,6 +38,62 @@ Page({
35 // urls: [], 38 // urls: [],
36 // }) 39 // })
37 }, 40 },
  41 + // 获取推荐店铺
  42 + getrecomondshop(){
  43 + let that = this;
  44 + var url = 'shop/infoShopRecommend';
  45 + var params = {
  46 + id: that.data.shopid,
  47 + limit:6,
  48 +
  49 + }
  50 + app.post(url, params).then((res) => {
  51 + console.log(res);
  52 + that.setData({
  53 + shoplist:res
  54 + })
  55 + }).catch((err) => {
  56 +
  57 + })
  58 + },
  59 + goodtail(e) {
  60 + let id = e.currentTarget.dataset.id;
  61 + wx.navigateTo({
  62 + url: '/pages/shopdetail/shopdetail?id=' + id,
  63 + })
  64 +
  65 + },
  66 +
  67 +share(){
  68 + this.setData({
  69 + postershow:true
  70 + })
  71 +
  72 + this.getcode()
  73 +},
  74 + // 获取海报
  75 + getcode(){
  76 + let that = this;
  77 + var url = 'common/getCode';
  78 + var params = {
  79 + shop_id: that.data.shopid,
  80 + url:'pages/shopdetail/shopdetail',
  81 +
  82 + }
  83 + app.post(url, params).then((res) => {
  84 + console.log(res);
  85 + that.setData({
  86 + posterurl:res
  87 + })
  88 +
  89 + that.savefilecode()
  90 +
  91 +
  92 +
  93 + }).catch((err) => {
  94 +
  95 + })
  96 + },
38 // 评论图片预览 97 // 评论图片预览
39 previewimgk(e){ 98 previewimgk(e){
40 console.log(e) 99 console.log(e)
@@ -50,16 +109,23 @@ Page({ @@ -50,16 +109,23 @@ Page({
50 109
51 }, 110 },
52 morecomment() { 111 morecomment() {
53 -  
54 wx.navigateTo({ 112 wx.navigateTo({
55 url: '/pages/morecomment/morecomment?shopid='+this.data.shopid, 113 url: '/pages/morecomment/morecomment?shopid='+this.data.shopid,
56 }) 114 })
57 }, 115 },
58 xiangce() { 116 xiangce() {
59 console.log(33443) 117 console.log(33443)
60 - wx.navigateTo({  
61 - url: '/pages/morepic/morepic',  
62 - }) 118 + if(this.data.pic.length!=0){
  119 + wx.navigateTo({
  120 + url: '/pages/morepic/morepic',
  121 + })
  122 + }else{
  123 + wx.showToast({
  124 + title: '没有更多图片了~',
  125 + icon:'none'
  126 + })
  127 + }
  128 +
63 }, 129 },
64 // 隐藏遮罩层 130 // 隐藏遮罩层
65 sure() { 131 sure() {
@@ -105,9 +171,6 @@ Page({ @@ -105,9 +171,6 @@ Page({
105 }) 171 })
106 } 172 }
107 173
108 -  
109 -  
110 -  
111 }).catch((err) => { 174 }).catch((err) => {
112 175
113 }) 176 })
@@ -156,9 +219,6 @@ Page({ @@ -156,9 +219,6 @@ Page({
156 }) 219 })
157 } 220 }
158 221
159 -  
160 -  
161 -  
162 }).catch((err) => { 222 }).catch((err) => {
163 223
164 }) 224 })
@@ -224,9 +284,6 @@ Page({ @@ -224,9 +284,6 @@ Page({
224 * 生命周期函数--监听页面加载 284 * 生命周期函数--监听页面加载
225 */ 285 */
226 onLoad: function(options) { 286 onLoad: function(options) {
227 -  
228 -  
229 -  
230 this.setData({ 287 this.setData({
231 shopid: options.id 288 shopid: options.id
232 }) 289 })
@@ -235,8 +292,9 @@ Page({ @@ -235,8 +292,9 @@ Page({
235 shopid: app.globalData.shopid 292 shopid: app.globalData.shopid
236 }) 293 })
237 } 294 }
238 -  
239 - console.log('3333', app.globalData.shopid) 295 +// 获取推荐店铺
  296 + this.getrecomondshop();
  297 + this.getcode()
240 298
241 }, 299 },
242 300
@@ -276,9 +334,17 @@ Page({ @@ -276,9 +334,17 @@ Page({
276 images: res.images 334 images: res.images
277 }) 335 })
278 } 336 }
  337 + // 只保留两条评论
  338 + let newremarks=[];
  339 + console.log('784889439',res.remarks)
  340 + for(var i=0;i<res.remarks.length;i++){
  341 + if(i<2){
  342 + newremarks.push(res.remarks[i])
  343 + }
  344 + }
  345 + console.log(newremarks)
  346 + res.remarks=newremarks;
279 347
280 - console.log(that.data.images);  
281 - console.log('8877665',that.data.pic)  
282 that.setData({ 348 that.setData({
283 shopdetail: res 349 shopdetail: res
284 }) 350 })
@@ -294,18 +360,163 @@ Page({ @@ -294,18 +360,163 @@ Page({
294 }) 360 })
295 },1500) 361 },1500)
296 } 362 }
297 -  
298 console.log(that.data.shopdetail) 363 console.log(that.data.shopdetail)
299 -  
300 -  
301 -  
302 -  
303 }).catch((err) => { 364 }).catch((err) => {
304 365
305 }) 366 })
306 367
307 }, 368 },
308 369
  370 + //点击保存到相册
  371 + baocun: function () {
  372 + console.log(999)
  373 + var that = this
  374 + wx.getSetting({
  375 + success(res) {
  376 + if (!res.authSetting['scope.writePhotosAlbum']) {
  377 + wx.authorize({
  378 + scope: 'scope.writePhotosAlbum',
  379 + success() { //这里是用户同意授权后的回调
  380 +
  381 +
  382 + wx.saveImageToPhotosAlbum({
  383 + filePath: that.data.posterurl,
  384 + success(res) {
  385 + wx.showModal({
  386 + content: '图片已保存到相册',
  387 + showCancel: false,
  388 + confirmText: '好的',
  389 + confirmColor: '#333',
  390 + success: function (res) {
  391 + if (res.confirm) {
  392 + console.log('用户点击确定');
  393 + /* 该隐藏的隐藏 */
  394 + that.setData({
  395 + maskHidden: false
  396 + })
  397 + }
  398 + },
  399 + fail: function (res) {
  400 +
  401 + }
  402 + })
  403 + }
  404 + })
  405 +
  406 +
  407 +
  408 + },
  409 + fail() { //这里是用户拒绝授权后的回调
  410 +
  411 +
  412 + // wx.openSetting({
  413 + // success: function (data) {
  414 + // console.log(data)
  415 + // if (data.authSetting["scope.writePhotosAlbum"] === true) {
  416 + // console.log("是否授权成功")
  417 + // } else {
  418 + // applyApi.toast("授权失败");
  419 + // }
  420 + // }
  421 + // })
  422 + wx.showModal({
  423 + title: '提示',
  424 + content: '您取消授权，无法保存图片，点击确定打开权限',
  425 + success(res) {
  426 + if (res.confirm) {
  427 + console.log('用户点击确定')
  428 + wx.openSetting({
  429 + success(res) {
  430 + console.log(res.authSetting)
  431 + // res.authSetting = {
  432 + // "scope.userInfo": true,
  433 + // "scope.userLocation": true
  434 + // }
  435 + }
  436 + })
  437 + } else if (res.cancel) {
  438 + console.log('用户点击取消')
  439 + }
  440 + }
  441 + })
  442 +
  443 + }
  444 + })
  445 + } else { //用户已经授权过了
  446 +
  447 + console.log(that.data.codeurl)
  448 + wx.saveImageToPhotosAlbum({
  449 + filePath: that.data.posterurl,
  450 + success(res) {
  451 + wx.showModal({
  452 + content: '图片已保存到相册',
  453 + showCancel: false,
  454 + confirmText: '好的',
  455 + confirmColor: '#333',
  456 + success: function (res) {
  457 + if (res.confirm) {
  458 + console.log('用户点击确定');
  459 + /* 该隐藏的隐藏 */
  460 + that.setData({
  461 + maskHidden: false
  462 + })
  463 + }
  464 + },
  465 + fail: function (res) {
  466 +
  467 + }
  468 + })
  469 + }
  470 + })
  471 + }
  472 + }
  473 + })
  474 +
  475 + },
  476 + hideposter(){
  477 + this.setData({
  478 + postershow:false
  479 + })
  480 + },
  481 +
  482 + savefilecode() {
  483 + let that = this;
  484 + console.log(that.data.codeurl)
  485 + wx.downloadFile({
  486 + url: that.data.posterurl,
  487 + header: {},
  488 + success: function (res) {
  489 + console.log('下载图片下载图片下载图片', res)
  490 + var tempFilePath = res.tempFilePath
  491 + //console.log('临时文件地址是：' + tempFilePath)
  492 + wx.saveFile({
  493 + tempFilePath: tempFilePath,
  494 + success: function (res) {
  495 + console.log(res)
  496 + var saveFilePath = res.savedFilePath;
  497 + that.setData({
  498 + posterurl: res.savedFilePath
  499 + })
  500 +
  501 + console.log('123456855555555', that.data.qrcode)
  502 +
  503 + }, //可以将saveFilePath写入到页面数据中
  504 + fail: function (res) { },
  505 + complete: function (res) {
  506 + console.log('complete后的res数据：')
  507 + },
  508 + }) //,
  509 + },
  510 + // fail: function (res) {
  511 + // wx.showModal({
  512 + // title: '下载失败',
  513 + // content: '请联系管理员',
  514 + // })
  515 + // },
  516 + complete: function (res) { },
  517 + })
  518 + },
  519 +
309 /** 520 /**
310 * 生命周期函数--监听页面初次渲染完成 521 * 生命周期函数--监听页面初次渲染完成
311 */ 522 */
@@ -4,9 +4,9 @@ @@ -4,9 +4,9 @@
4 <block wx:for="{{shopdetail.banner_image}}" wx:key="doct"> 4 <block wx:for="{{shopdetail.banner_image}}" wx:key="doct">
5 <swiper-item> 5 <swiper-item>
6 <image src="{{item}}" class="slide-image" /> 6 <image src="{{item}}" class="slide-image" />
7 - <view class="taildot"> 7 + <!-- <view class="taildot">
8 {{index+1}}/{{shopdetail.banner_image.length}} 8 {{index+1}}/{{shopdetail.banner_image.length}}
9 - </view> 9 + </view> -->
10 </swiper-item> 10 </swiper-item>
11 11
12 </block> 12 </block>
@@ -34,18 +34,19 @@ @@ -34,18 +34,19 @@
34 </view> 34 </view>
35 <view class="tailname {{shopdetail.is_collect==1?'recommend':''}}">收藏</view> 35 <view class="tailname {{shopdetail.is_collect==1?'recommend':''}}">收藏</view>
36 </view> 36 </view>
37 - <view class="tailitem shareitem"> 37 + <view class="tailitem shareitem" bindtap="share">
38 <view class="tailtopimg"> 38 <view class="tailtopimg">
39 <image src="/img/share.png"></image> 39 <image src="/img/share.png"></image>
40 </view> 40 </view>
41 <view class="tailname">分享</view> 41 <view class="tailname">分享</view>
42 42
43 - <button open-type="share" class="share"></button> 43 + <!-- <button open-type="share" class="share"></button> -->
44 </view> 44 </view>
45 </view> 45 </view>
46 </view> 46 </view>
47 <view class="cai flex"> 47 <view class="cai flex">
48 - <view class="flower flexone"> 48 + <view class="flower flexone" wx:if="{{shopdetail.miqilin_score!=false}}">
  49 + <view class="flowername">米其林</view>
49 <view class="floweritem" wx:if="{{shopdetail.miqilin_score>=1}}"> 50 <view class="floweritem" wx:if="{{shopdetail.miqilin_score>=1}}">
50 <image src="/img/hua.png"></image> 51 <image src="/img/hua.png"></image>
51 </view> 52 </view>
@@ -69,72 +70,73 @@ @@ -69,72 +70,73 @@
69 <view class="sanleft"> 70 <view class="sanleft">
70 <image src="/img/sanxing.png"></image> 71 <image src="/img/sanxing.png"></image>
71 </view> 72 </view>
72 - <!-- <view class="star flexone"> 73 + <view class="star flexone">
73 <view class="staritem"> 74 <view class="staritem">
74 -  
75 - <image src="/img/pingfenshi.png" wx:if="{{shopdetail.miqilin_score>=1}}"></image>  
76 - <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.miqilin_score<0.5}}"></image>  
77 - <image src="/img/banke.png" wx:if="{{shopdetail.miqilin_score>=0.5&&shopdetail.miqilin_score<1}}"></image> 75 + <image src="/img/pingfenshi.png" wx:if="{{shopdetail.synthetical_score>=1}}"></image>
  76 + <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.synthetical_score<0.5}}"></image>
  77 + <image src="/img/banke.png" wx:if="{{shopdetail.synthetical_score>=0.5&&shopdetail.synthetical_score<1}}"></image>
78 </view> 78 </view>
79 <view class="staritem"> 79 <view class="staritem">
80 - <image src="/img/pingfenshi.png" wx:if="{{shopdetail.miqilin_score>=2}}"></image>  
81 - <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.miqilin_score<1.5}}"></image>  
82 - <image src="/img/banke.png" wx:if="{{shopdetail.miqilin_score>=1.5&&shopdetail.miqilin_score<2}}"></image> 80 + <image src="/img/pingfenshi.png" wx:if="{{shopdetail.synthetical_score>=2}}"></image>
  81 + <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.synthetical_score<1.5}}"></image>
  82 + <image src="/img/banke.png" wx:if="{{shopdetail.synthetical_score>=1.5&&shopdetail.synthetical_score<2}}"></image>
83 </view> 83 </view>
84 <view class="staritem"> 84 <view class="staritem">
85 - <image src="/img/pingfenshi.png" wx:if="{{shopdetail.miqilin_score>=3}}"></image>  
86 - <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.miqilin_score<2.5}}"></image>  
87 - <image src="/img/banke.png" wx:if="{{shopdetail.miqilin_score>=2.5&&shopdetail.miqilin_score<3}}"></image> 85 + <image src="/img/pingfenshi.png" wx:if="{{shopdetail.synthetical_score>=3}}"></image>
  86 + <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.synthetical_score<2.5}}"></image>
  87 + <image src="/img/banke.png" wx:if="{{shopdetail.synthetical_score>=2.5&&shopdetail.synthetical_score<3}}"></image>
88 </view> 88 </view>
89 <view class="staritem"> 89 <view class="staritem">
90 - <image src="/img/pingfenshi.png" wx:if="{{shopdetail.miqilin_score>=4}}"></image>  
91 - <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.miqilin_score<3.5}}"></image>  
92 - <image src="/img/banke.png" wx:if="{{shopdetail.miqilin_score>=3.5&&shopdetail.miqilin_score<4}}"></image> 90 + <image src="/img/pingfenshi.png" wx:if="{{shopdetail.synthetical_score>=4}}"></image>
  91 + <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.synthetical_score<3.5}}"></image>
  92 + <image src="/img/banke.png" wx:if="{{shopdetail.synthetical_score>=3.5&&shopdetail.synthetical_score<4}}"></image>
93 </view> 93 </view>
94 <view class="staritem"> 94 <view class="staritem">
95 - <image src="/img/pingfenshi.png" wx:if="{{shopdetail.miqilin_score>=5}}"></image>  
96 - <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.miqilin_score<4.5}}"></image>  
97 - <image src="/img/banke.png" wx:if="{{shopdetail.miqilin_score>=4.5&&shopdetail.miqilin_score<5}}"></image> 95 + <image src="/img/pingfenshi.png" wx:if="{{shopdetail.synthetical_score>=5}}"></image>
  96 + <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.synthetical_score<4.5}}"></image>
  97 + <image src="/img/banke.png" wx:if="{{shopdetail.synthetical_score>=4.5&&shopdetail.synthetical_score<5}}"></image>
98 </view> 98 </view>
99 99
100 100
101 - </view> -->  
102 - <view class="fen">{{shopdetail.synthetical_score}}分</view> 101 + </view>
  102 + <view class="fen" wx:if="{{shopdetail.synthetical_score!=0}}">{{shopdetail.synthetical_score}}分</view>
  103 + <view class="fen" wx:else>无评论</view>
103 <view class="tiao">({{shopdetail.remark_num}}条)</view> 104 <view class="tiao">({{shopdetail.remark_num}}条)</view>
104 </view> 105 </view>
105 <view class="commentone flexone"> 106 <view class="commentone flexone">
106 <view class="sanleft"> 107 <view class="sanleft">
107 <image src="/img/kuai.png"></image> 108 <image src="/img/kuai.png"></image>
108 </view> 109 </view>
109 - <!-- <view class="star flexone"> 110 + <view class="star flexone">
110 <view class="staritem"> 111 <view class="staritem">
111 - <image src="/img/pingfenshi.png" wx:if="{{shopdetail.synthetical_score>=1}}"></image>  
112 - <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.synthetical_score<0.5}}"></image>  
113 - <image src="/img/banke.png" wx:if="{{shopdetail.synthetical_score>=0.5&&shopdetail.synthetical_score<1}}"></image> 112 + <image src="/img/pingfenshi.png" wx:if="{{shopdetail.tabelog>=1}}"></image>
  113 + <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.tabelog<0.5}}"></image>
  114 + <image src="/img/banke.png" wx:if="{{shopdetail.tabelog>=0.5&&shopdetail.tabelog<1}}"></image>
114 </view> 115 </view>
115 <view class="staritem"> 116 <view class="staritem">
116 - <image src="/img/pingfenshi.png" wx:if="{{shopdetail.synthetical_score>=2}}"></image>  
117 - <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.synthetical_score<1.5}}"></image>  
118 - <image src="/img/banke.png" wx:if="{{shopdetail.synthetical_score>=1.5&&shopdetail.synthetical_score<2}}"></image> 117 + <image src="/img/pingfenshi.png" wx:if="{{shopdetail.tabelog>=2}}"></image>
  118 + <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.tabelog<1.5}}"></image>
  119 + <image src="/img/banke.png" wx:if="{{shopdetail.tabelog>=1.5&&shopdetail.tabelog<2}}"></image>
119 </view> 120 </view>
120 <view class="staritem"> 121 <view class="staritem">
121 - <image src="/img/pingfenshi.png" wx:if="{{shopdetail.synthetical_score>=3}}"></image>  
122 - <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.synthetical_score<2.5}}"></image>  
123 - <image src="/img/banke.png" wx:if="{{shopdetail.synthetical_score>=2.5&&shopdetail.synthetical_score<3}}"></image> 122 + <image src="/img/pingfenshi.png" wx:if="{{shopdetail.tabelog>=3}}"></image>
  123 + <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.tabelog<2.5}}"></image>
  124 + <image src="/img/banke.png" wx:if="{{shopdetail.tabelog>=2.5&&shopdetail.tabelog<3}}"></image>
124 </view> 125 </view>
125 <view class="staritem"> 126 <view class="staritem">
126 - <image src="/img/pingfenshi.png" wx:if="{{shopdetail.synthetical_score>=4}}"></image>  
127 - <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.synthetical_score<3.5}}"></image>  
128 - <image src="/img/banke.png" wx:if="{{shopdetail.synthetical_score>=3.5&&shopdetail.synthetical_score<4}}"></image> 127 + <image src="/img/pingfenshi.png" wx:if="{{shopdetail.tabelog>=4}}"></image>
  128 + <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.tabelog<3.5}}"></image>
  129 + <image src="/img/banke.png" wx:if="{{shopdetail.tabelog>=3.5&&shopdetail.tabelog<4}}"></image>
129 </view> 130 </view>
130 <view class="staritem"> 131 <view class="staritem">
131 - <image src="/img/pingfenshi.png" wx:if="{{shopdetail.synthetical_score>=5}}"></image>  
132 - <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.synthetical_score<4.5}}"></image>  
133 - <image src="/img/banke.png" wx:if="{{shopdetail.synthetical_score>=4.5&&shopdetail.synthetical_score<5}}"></image> 132 + <image src="/img/pingfenshi.png" wx:if="{{shopdetail.tabelog>=5}}"></image>
  133 + <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.tabelog<4.5}}"></image>
  134 + <image src="/img/banke.png" wx:if="{{shopdetail.tabelog>=4.5&&shopdetail.tabelog<5}}"></image>
134 </view> 135 </view>
135 136
136 - </view> -->  
137 - <view class="fen">{{shopdetail.tabelog}}分</view> 137 + </view>
  138 + <view class="fen" wx:if="{{shopdetail.tabelog!=0}}">{{shopdetail.tabelog}}分</view>
  139 + <view class="fen" wx:else>无评论</view>
138 </view> 140 </view>
139 </view> 141 </view>
140 </view> 142 </view>
@@ -150,7 +152,7 @@ @@ -150,7 +152,7 @@
150 <view class="photo {{shopdetail.content==''?'photoact':''}}" wx:if="{{images[0]!=''}}"> 152 <view class="photo {{shopdetail.content==''?'photoact':''}}" wx:if="{{images[0]!=''}}">
151 <view class="flextwo"> 153 <view class="flextwo">
152 <view class="xiang" >相册</view> 154 <view class="xiang" >相册</view>
153 - <view class="photoright flexone" bindtap="{{pic.length!=0?'xiangce':''}}" wx:if="{{pic.length!=0}}"> 155 + <view class="photoright flexone" bindtap="xiangce">
154 <view class="morename">更多</view> 156 <view class="morename">更多</view>
155 <view class="yourow"> 157 <view class="yourow">
156 <image src="/img/leftrow.png"></image> 158 <image src="/img/leftrow.png"></image>
@@ -167,7 +169,7 @@ @@ -167,7 +169,7 @@
167 <view class="photo {{shopdetail.images[0]==''&&shopdetail.content==''?'photoact':''}}" wx:if="{{shopdetail.remarks.length!=0}}"> 169 <view class="photo {{shopdetail.images[0]==''&&shopdetail.content==''?'photoact':''}}" wx:if="{{shopdetail.remarks.length!=0}}">
168 <view class="phototop flextwo"> 170 <view class="phototop flextwo">
169 <view class="phototopleft flexone"> 171 <view class="phototopleft flexone">
170 - <view class="xiang">点评 </view> 172 + <view class="xiang">评价 </view>
171 <view class="tiao">({{shopdetail.remarks.length}}条)</view> 173 <view class="tiao">({{shopdetail.remarks.length}}条)</view>
172 </view> 174 </view>
173 <view class="photoright flexone" bindtap="morecomment"> 175 <view class="photoright flexone" bindtap="morecomment">
@@ -257,24 +259,18 @@ @@ -257,24 +259,18 @@
257 </view> 259 </view>
258 <view class="fen">{{item.score}}分</view> 260 <view class="fen">{{item.score}}分</view>
259 </view> 261 </view>
260 - <view class="text"> 262 + <text class="text">
261 {{item.content}} 263 {{item.content}}
262 - </view> 264 + </text>
263 265
264 266
265 <view class="textboximg flexone"> 267 <view class="textboximg flexone">
266 <view class="boxitem" wx:for='{{item.images}}' wx:key=""> 268 <view class="boxitem" wx:for='{{item.images}}' wx:key="">
267 - <image src="{{item}}" catchtap="previewimgk" data-index="{{index}}" data-pindex="{{cellindex}}"></image> 269 + <image src="{{item}}" catchtap="previewimgk" data-index="{{index}}" data-pindex="{{cellindex}}" mode="aspectFit"></image>
268 </view> 270 </view>
269 -  
270 </view> 271 </view>
271 </view> 272 </view>
272 -  
273 -  
274 </view> 273 </view>
275 -  
276 -  
277 -  
278 </view> 274 </view>
279 </view> 275 </view>
280 276
@@ -343,7 +339,8 @@ @@ -343,7 +339,8 @@
343 <!-- <view class="canone pricepeopel">自助点餐：53000日元 （服务费800日元）</view> 339 <!-- <view class="canone pricepeopel">自助点餐：53000日元 （服务费800日元）</view>
344 <view class="cantwo pricepeopel">午餐套餐：53000日元 （服务费800日元、税费1600日元）</view> --> 340 <view class="cantwo pricepeopel">午餐套餐：53000日元 （服务费800日元、税费1600日元）</view> -->
345 <view class="cantext"> 341 <view class="cantext">
346 - {{shopdetail.combo}} 342 + <rich-text nodes="{{shopdetail.combo}}"></rich-text>
  343 +
347 </view> 344 </view>
348 </view> 345 </view>
349 346
@@ -357,6 +354,265 @@ @@ -357,6 +354,265 @@
357 354
358 </view> 355 </view>
359 356
  357 + <!-- 推荐店铺 -->
  358 + <view class="photo" wx:if="{{shoplist.length!=0}}">
  359 + <view class="xiang" bindtap="xiangce shopname">店铺推荐</view>
  360 + <view class='case-page'>
  361 + <view class='list-masonry'>
  362 + <view class='item-masonry {{shoplist.length==1?"noitem":""}}' bindtap="goodtail" data-id="{{item.id}}" wx:for="{{shoplist}}" wx:key="">
  363 + <view class="goodimg">
  364 + <image src='{{item.image}}' mode='widthFix'></image>
  365 + </view>
  366 + <view class="goodbot">
  367 + <view class="goodname">{{item.name}}</view>
  368 + <view class="goodname riname" wx:if="{{item.name_jap!=null}}">{{item.name_jap}}</view>
  369 + <view class="intro flextwo">
  370 + <!-- <view class="space"></view> -->
  371 + <view class="introleft">
  372 + {{item.series_name}}
  373 + </view>
  374 + <view class="introright ">
  375 +
  376 + <view class="hualist flexone" wx:if="{{item.score!=false}}">
  377 + <view class="flowername flowernamek">米其林</view>
  378 + <!-- wx:if="{{item.score>=1}}" -->
  379 + <!-- <view class="huaitem">
  380 + <image src="/img/flower.png"></image>
  381 + </view> -->
  382 + <!-- wx:if="{{item.score>=2}}" -->
  383 + <!-- <view class="huaitem" >
  384 + <image src="/img/flower.png"></image>
  385 + </view> -->
  386 + <!-- wx:if="{{item.score>=3}}" -->
  387 + <!-- <view class="huaitem" >
  388 + <image src="/img/flower.png"></image>
  389 + </view> -->
  390 +
  391 + <view class="pingfen" wx:if="{{item.score!=false}}">{{item.score}}分</view>
  392 + </view>
  393 + <view class="ping flexone">
  394 + <view class="kuaizifen">Tabelog</view>
  395 + <!-- <view class="pingleft">
  396 + <image src='/img/kuaizi.png'></image>
  397 + </view> -->
  398 + <view class="pingfen">{{item.tabelog}}分</view>
  399 + </view>
  400 +
  401 + </view>
  402 + </view>
  403 + <view class="flextwo pricetwo" >
  404 + <view class="shou">
  405 + <text class="shoumoney">￥{{item.price}}</text>
  406 + <text class="shouren">/人</text>
  407 + </view>
  408 + <view class="addname flexone">
  409 + <view class="addimg">
  410 + <image src="/img/huangweizhi.png"></image>
  411 + </view>
  412 + <view class="dizhi commnameone">{{item.business_name}}</view>
  413 + </view>
  414 + </view>
  415 +
  416 + </view>
  417 +
  418 +
  419 + </view>
  420 + <!-- <view class='item-masonry'>
  421 + <image src='/img/deng.png' mode='widthFix'></image>
  422 + <view class="goodname">基值支义们京候么眼革下使叫南石很少去构。</view>
  423 + <view class="intro flexone">
  424 + <view class="introleft">
  425 + 魚介?海鮮料理
  426 + </view>
  427 + <view class="introright">
  428 + <view class="ping flexone">
  429 + <view class="pingleft">
  430 + <image src='/img/kuaizi.png'></image>
  431 + </view>
  432 + <view class="pingfen">4.7</view>
  433 + </view>
  434 + <view class="hualist flexone">
  435 + <view class="huaitem">
  436 + <image src="/img/flower.png"></image>
  437 + </view>
  438 + <view class="huaitem">
  439 + <image src="/img/flower.png"></image>
  440 + </view>
  441 + <view class="huaitem">
  442 + <image src="/img/flower.png"></image>
  443 + </view>
  444 + </view>
  445 + </view>
  446 + </view>
  447 + <view class="shou">
  448 + <text class="shoumoney">￥50</text>
  449 + <text class="shouren">/人</text>
  450 + </view>
  451 + <view class="addname flexone">
  452 + <view class="addimg">
  453 + <image src="/img/huangweizhi.png"></image>
  454 + </view>
  455 + <view class="dizhi commnameone">银厦</view>
  456 + </view>
  457 + </view>
  458 + <view class='item-masonry'>
  459 + <image src='/img/juxia.png' mode='widthFix'></image>
  460 + <view class="goodname">基值支义们京候么眼革下使叫南石很少去构。</view>
  461 + <view class="intro flexone">
  462 + <view class="introleft">
  463 + 魚介?海鮮料理
  464 + </view>
  465 + <view class="introright">
  466 + <view class="ping flexone">
  467 + <view class="pingleft">
  468 + <image src='/img/kuaizi.png'></image>
  469 + </view>
  470 + <view class="pingfen">4.7</view>
  471 + </view>
  472 + <view class="hualist flexone">
  473 + <view class="huaitem">
  474 + <image src="/img/flower.png"></image>
  475 + </view>
  476 + <view class="huaitem">
  477 + <image src="/img/flower.png"></image>
  478 + </view>
  479 + <view class="huaitem">
  480 + <image src="/img/flower.png"></image>
  481 + </view>
  482 + </view>
  483 + </view>
  484 + </view>
  485 + <view class="shou">
  486 + <text class="shoumoney">￥50</text>
  487 + <text class="shouren">/人</text>
  488 + </view>
  489 + <view class="addname flexone">
  490 + <view class="addimg">
  491 + <image src="/img/huangweizhi.png"></image>
  492 + </view>
  493 + <view class="dizhi commnameone">银厦</view>
  494 + </view>
  495 + </view>
  496 + <view class='item-masonry'>
  497 + <image src='/img/fenxia.png' mode='widthFix'></image>
  498 + <view class="goodname">基值支义们京候么眼革下使叫南石很少去构。</view>
  499 + <view class="intro flexone">
  500 + <view class="introleft">
  501 + 魚介?海鮮料理
  502 + </view>
  503 + <view class="introright">
  504 + <view class="ping flexone">
  505 + <view class="pingleft">
  506 + <image src='/img/kuaizi.png'></image>
  507 + </view>
  508 + <view class="pingfen">4.7</view>
  509 + </view>
  510 + <view class="hualist flexone">
  511 + <view class="huaitem">
  512 + <image src="/img/flower.png"></image>
  513 + </view>
  514 + <view class="huaitem">
  515 + <image src="/img/flower.png"></image>
  516 + </view>
  517 + <view class="huaitem">
  518 + <image src="/img/flower.png"></image>
  519 + </view>
  520 + </view>
  521 + </view>
  522 + </view>
  523 + <view class="shou">
  524 + <text class="shoumoney">￥50</text>
  525 + <text class="shouren">/人</text>
  526 + </view>
  527 + <view class="addname flexone">
  528 + <view class="addimg">
  529 + <image src="/img/huangweizhi.png"></image>
  530 + </view>
  531 + <view class="dizhi commnameone">银厦</view>
  532 + </view>
  533 + </view>
  534 + <view class='item-masonry'>
  535 + <image src='/img/juxia.png' mode='widthFix'></image>
  536 + <view class="goodname">基值支义们京候么眼革下使叫南石很少去构。</view>
  537 + <view class="intro flexone">
  538 + <view class="introleft">
  539 + 魚介?海鮮料理
  540 + </view>
  541 + <view class="introright">
  542 + <view class="ping flexone">
  543 + <view class="pingleft">
  544 + <image src='/img/kuaizi.png'></image>
  545 + </view>
  546 + <view class="pingfen">4.7</view>
  547 + </view>
  548 + <view class="hualist flexone">
  549 + <view class="huaitem">
  550 + <image src="/img/flower.png"></image>
  551 + </view>
  552 + <view class="huaitem">
  553 + <image src="/img/flower.png"></image>
  554 + </view>
  555 + <view class="huaitem">
  556 + <image src="/img/flower.png"></image>
  557 + </view>
  558 + </view>
  559 + </view>
  560 + </view>
  561 + <view class="shou">
  562 + <text class="shoumoney">￥50</text>
  563 + <text class="shouren">/人</text>
  564 + </view>
  565 + <view class="addname flexone">
  566 + <view class="addimg">
  567 + <image src="/img/huangweizhi.png"></image>
  568 + </view>
  569 + <view class="dizhi commnameone">银厦</view>
  570 + </view>
  571 + </view>
  572 + <view class='item-masonry'>
  573 + <image src='/img/deng.png' mode='widthFix'></image>
  574 + <view class="goodname">基值支义们京候么眼革下使叫南石很少去构。</view>
  575 + <view class="intro flexone">
  576 + <view class="introleft">
  577 + 魚介?海鮮料理
  578 + </view>
  579 + <view class="introright">
  580 + <view class="ping flexone">
  581 + <view class="pingleft">
  582 + <image src='/img/kuaizi.png'></image>
  583 + </view>
  584 + <view class="pingfen">4.7</view>
  585 + </view>
  586 + <view class="hualist flexone">
  587 + <view class="huaitem">
  588 + <image src="/img/flower.png"></image>
  589 + </view>
  590 + <view class="huaitem">
  591 + <image src="/img/flower.png"></image>
  592 + </view>
  593 + <view class="huaitem">
  594 + <image src="/img/flower.png"></image>
  595 + </view>
  596 + </view>
  597 + </view>
  598 + </view>
  599 + <view class="shou">
  600 + <text class="shoumoney">￥50</text>
  601 + <text class="shouren">/人</text>
  602 + </view>
  603 + <view class="addname flexone">
  604 + <view class="addimg">
  605 + <image src="/img/huangweizhi.png"></image>
  606 + </view>
  607 + <view class="dizhi commnameone">银厦</view>
  608 + </view>
  609 + </view> -->
  610 +
  611 + </view>
  612 + </view>
  613 +
  614 +</view>
  615 +
360 </view> 616 </view>
361 617
362 <view class="botfix flextwo"> 618 <view class="botfix flextwo">
@@ -379,7 +635,7 @@ @@ -379,7 +635,7 @@
379 <view class="botname">拍视频</view> 635 <view class="botname">拍视频</view>
380 </view> --> 636 </view> -->
381 <view class="boitem" bindtap="write" data-id="4"> 637 <view class="boitem" bindtap="write" data-id="4">
382 - <view class="botitemtop" bindtap="write" data-id="4"> 638 + <view class="botitemtop" >
383 <image src="/img/writedian.png"></image> 639 <image src="/img/writedian.png"></image>
384 </view> 640 </view>
385 <view class="botname">评价</view> 641 <view class="botname">评价</view>
@@ -410,4 +666,11 @@ @@ -410,4 +666,11 @@
410 <view class="clocksure" bindtap="sure">确定</view> 666 <view class="clocksure" bindtap="sure">确定</view>
411 </view> 667 </view>
412 </view> 668 </view>
  669 +
  670 + <!-- 分享海报遮罩层 -->
  671 + <view class="register" wx:if="{{postershow}}" bindtap="hideposter">
  672 + <view class="posterwrap" catchlongpress="baocun">
  673 + <image src="{{posterurl}}"></image>
  674 + </view>
  675 + </view>
413 </view> 676 </view>
  1 +@import '../homepage/homepage.wxss';
1 image { 2 image {
2 width: 100%; 3 width: 100%;
3 height: 100%; 4 height: 100%;
@@ -144,7 +145,7 @@ swiper { @@ -144,7 +145,7 @@ swiper {
144 opacity: 1; 145 opacity: 1;
145 border-radius: 8rpx; 146 border-radius: 8rpx;
146 color: #8c9198; 147 color: #8c9198;
147 - font-size: 24rpx; 148 + font-size: 22rpx;
148 text-align: center; 149 text-align: center;
149 line-height: 40rpx; 150 line-height: 40rpx;
150 margin-left: 12rpx; 151 margin-left: 12rpx;
@@ -216,7 +217,7 @@ page { @@ -216,7 +217,7 @@ page {
216 } 217 }
217 218
218 .bodybox { 219 .bodybox {
219 - padding: 0 32rpx; 220 + padding: 0 24rpx;
220 box-sizing: border-box; 221 box-sizing: border-box;
221 } 222 }
222 223
@@ -241,10 +242,10 @@ page { @@ -241,10 +242,10 @@ page {
241 } 242 }
242 243
243 .photoitem { 244 .photoitem {
244 - width: 223rpx; 245 + width: 245rpx;
245 height: 188rpx; 246 height: 188rpx;
246 font-size: 0; 247 font-size: 0;
247 - padding-right: 42rpx; 248 + padding-right: 15rpx;
248 margin-bottom: 20rpx; 249 margin-bottom: 20rpx;
249 flex: 0 0 auto; 250 flex: 0 0 auto;
250 } 251 }
@@ -305,8 +306,8 @@ page { @@ -305,8 +306,8 @@ page {
305 } 306 }
306 307
307 .boxitem { 308 .boxitem {
308 - width: 160rpx;  
309 - height: 160rpx; 309 + width: 154rpx;
  310 + height: 154rpx;
310 font-size: 0; 311 font-size: 0;
311 margin-right: 18rpx; 312 margin-right: 18rpx;
312 } 313 }
@@ -477,7 +478,7 @@ page { @@ -477,7 +478,7 @@ page {
477 478
478 .cantext { 479 .cantext {
479 color: #707070; 480 color: #707070;
480 - font-size: 24rpx; 481 + font-size: 28rpx;
481 margin-top: 20rpx; 482 margin-top: 20rpx;
482 line-height: 1.5 483 line-height: 1.5
483 } 484 }
@@ -557,4 +558,38 @@ button::after { @@ -557,4 +558,38 @@ button::after {
557 } 558 }
558 .dianbox{ 559 .dianbox{
559 margin-top:24rpx; 560 margin-top:24rpx;
  561 +}
  562 +.flowername{
  563 + color:#F0ABA5;
  564 + font-size:26rpx;
  565 + margin-right:10rpx;
  566 +}
  567 +.case-page{
  568 + padding: 0;
  569 + margin-top:24rpx;
  570 +}
  571 +.flowernamek{
  572 + font-size:18rpx;
  573 +}
  574 +.introleft {
  575 + font-size: 19rpx;
  576 +}
  577 +.goodbot{
  578 + padding: 0 10rpx;
  579 +}
  580 +.noitem{
  581 + box-shadow: none;
  582 +}
  583 +
  584 +/* 海报图 */
  585 +.posterwrap{
  586 + width:648rpx;
  587 + height:646rpx;
  588 + font-size: 0;
  589 + background: #fff;
  590 + position: absolute;
  591 + top:50%;
  592 + left:50%;
  593 + transform: translate(-50%,-50%);
  594 +
560 } 595 }