miniprogram / meiweiriben · 提交

转到一个项目

作者 lihongjuan
提交 e5d9ce2d870589db7d8f6ad42e49d0cbacf19c65 1 个父辈 ac78554f

1

内嵌 并排对比
正在显示 33 个修改的文件 包含 482 行增加 和 212 行删除
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 App({ 2 App({
3 onLaunch: function () { 3 onLaunch: function () {
4 // 展示本地存储能力 4 // 展示本地存储能力
  5 + wx.hideTabBar()
5 var logs = wx.getStorageSync('logs') || [] 6 var logs = wx.getStorageSync('logs') || []
6 logs.unshift(Date.now()) 7 logs.unshift(Date.now())
7 wx.setStorageSync('logs', logs) 8 wx.setStorageSync('logs', logs)
1 { 1 {
2 - "pages": [  
3 - "pages/homepage/homepage",  
4 - "pages/pubu/pubu",  
5 -  
6 - "pages/examine/examine",  
7 - "pages/index/index",  
8 - "pages/personziliao/personziliao",  
9 - "pages/comment/comment",  
10 - "pages/passPhotos/passPhotos",  
11 - "pages/collectlist/collectlist",  
12 - "pages/commentdetail/commentdetail",  
13 - "pages/usecenter/usecenter",  
14 - "pages/shopdetail/shopdetail",  
15 - "pages/morephoto/morephoto",  
16 - "pages/morecomment/morecomment",  
17 - "pages/searchresult/searchresult",  
18 - "pages/searchcity/searchcity",  
19 - "pages/logs/logs",  
20 - "pages/login/login",  
21 - "pages/recommond/recommond",  
22 - "pages/canting/canting",  
23 - "pages/mycomment/mycomment",  
24 - "pages/personpage/personpage",  
25 - "pages/rank/rankpage",  
26 - "pages/morepic/morepic"  
27 -  
28 - ],  
29 - "window": {  
30 - "backgroundTextStyle": "light",  
31 - "navigationBarBackgroundColor": "#fff",  
32 - "navigationBarTitleText": "WeChat",  
33 - "navigationBarTextStyle": "black"  
34 - },  
35 -  
36 - "style": "v2",  
37 - "sitemapLocation": "sitemap.json" 2 + "pages": [
  3 + "pages/homepage/homepage",
  4 + "pages/pubu/pubu",
  5 + "pages/examine/examine",
  6 + "pages/index/index",
  7 + "pages/personziliao/personziliao",
  8 + "pages/comment/comment",
  9 + "pages/passPhotos/passPhotos",
  10 + "pages/collectlist/collectlist",
  11 + "pages/commentdetail/commentdetail",
  12 + "pages/usecenter/usecenter",
  13 + "pages/shopdetail/shopdetail",
  14 + "pages/morephoto/morephoto",
  15 + "pages/morecomment/morecomment",
  16 + "pages/searchresult/searchresult",
  17 + "pages/searchcity/searchcity",
  18 + "pages/logs/logs",
  19 + "pages/login/login",
  20 + "pages/recommond/recommond",
  21 + "pages/canting/canting",
  22 + "pages/mycomment/mycomment",
  23 + "pages/personpage/personpage",
  24 + "pages/rank/rankpage",
  25 + "pages/morepic/morepic",
  26 + "custom-tab-bar/custom-tab-bar"
  27 + ],
  28 + "window": {
  29 + "backgroundTextStyle": "light",
  30 + "navigationBarBackgroundColor": "#fff",
  31 + "navigationBarTitleText": "WeChat",
  32 + "navigationBarTextStyle": "black"
  33 + },
  34 + "tabBar": {
  35 + "custom": true,
  36 + "color": "#666666",
  37 + "selectedColor": "#FCB952",
  38 + "borderStyle": "black",
  39 + "backgroundColor": "#fff",
  40 + "list": [
  41 + {
  42 + "pagePath": "pages/homepage/homepage",
  43 + "text": "首页",
  44 + "iconPath": "img/index.png",
  45 + "selectedIconPath": "img/indexactive.png"
  46 + },
  47 + {
  48 + "pagePath": "pages/usecenter/usecenter",
  49 + "text": "关于",
  50 + "iconPath": "img/person.png",
  51 + "selectedIconPath": "img/personactive.png"
  52 + }
  53 + ]
  54 + },
  55 + "sitemapLocation": "sitemap.json"
38 } 56 }
  1 +Component({
  2 + data: {
  3 + selected: 0,
  4 + color: "#7A7E83",
  5 + selectedColor: "#FCB952",
  6 + list: [{
  7 + pagePath: "/pages/homepage/homepage",
  8 + iconPath: "/img/index.png",
  9 + selectedIconPath: "/img/indexactive.png",
  10 + text: "首页"
  11 + },
  12 + {
  13 + pagePath: "",
  14 + iconPath: "/img/kefu.png",
  15 + selectedIconPath: "/img/kefu.png",
  16 + text: "美味君"
  17 + },
  18 + {
  19 + pagePath: "/pages/usecenter/usecenter",
  20 + iconPath: "/img/person.png",
  21 + selectedIconPath: "/img/personactive.png",
  22 + text: "我的"
  23 + }]
  24 + },
  25 + properties: {
  26 + selected: {
  27 + type: Number, // 接收父组件传过来的值
  28 + value: ''
  29 + }
  30 + },
  31 + attached() {
  32 + },
  33 + methods: {
  34 + switchTab(e) {
  35 + console.log(e)
  36 + const data = e.currentTarget.dataset
  37 + const url = data.path
  38 + wx.switchTab({url})
  39 + }
  40 + }
  41 +})
  42 +
  1 +{
  2 + "component": true
  3 +}
  1 +<view class="tab-bar">
  2 + <view class="tab-bar-border"></view>
  3 + <view wx:for="{{list}}" wx:key="index" class="tab-bar-item" data-path="{{item.pagePath}}" data-index="{{index}}" bindtap="switchTab">
  4 + <image src="{{selected === index ? item.selectedIconPath : item.iconPath}}"></image>
  5 + <view style="color: {{selected === index ? selectedColor : color}}">{{item.text}}</view>
  6 + <button open-type="contact" class="connect" wx:if="{{index==1}}"></button>
  7 + </view>
  8 +</view>
  1 +.tab-bar {
  2 + position: fixed;
  3 + bottom: 0;
  4 + left: 0;
  5 + right: 0;
  6 + height: 48px;
  7 + background: white;
  8 + display: flex;
  9 + padding-bottom: env(safe-area-inset-bottom);
  10 +}
  11 +
  12 +.tab-bar-border {
  13 + background-color: rgba(0, 0, 0, 0.33);
  14 + position: absolute;
  15 + left: 0;
  16 + top: 0;
  17 + width: 100%;
  18 + height: 1px;
  19 + transform: scaleY(0.5);
  20 +}
  21 +
  22 +.tab-bar-item {
  23 + flex: 1;
  24 + text-align: center;
  25 + display: flex;
  26 + justify-content: center;
  27 + align-items: center;
  28 + flex-direction: column;
  29 + position: relative;
  30 +}
  31 +
  32 +.tab-bar-item image {
  33 + width: 27px;
  34 + height: 27px;
  35 +}
  36 +
  37 +.tab-bar-item view {
  38 + font-size: 10px;
  39 +}
  40 +.connect{
  41 + width:240rpx!important;
  42 + height:100rpx;
  43 + position: absolute;
  44 + top:0;
  45 + left:0;
  46 + background: transparent;
  47 + padding: none!important;
  48 +
  49 +}
@@ -142,27 +142,27 @@ Page({ @@ -142,27 +142,27 @@ Page({
142 }) 142 })
143 return false 143 return false
144 } 144 }
145 - if (that.data.servicestar == 0) {  
146 - wx.showToast({  
147 - title: '请选择服务评分',  
148 - icon: "none"  
149 - })  
150 - return false  
151 - }  
152 - if (that.data.taststar == 0) {  
153 - wx.showToast({  
154 - title: '请选择口味评分',  
155 - icon: "none"  
156 - })  
157 - return false  
158 - }  
159 - if (that.data.environmentstar == 0) {  
160 - wx.showToast({  
161 - title: '请选择环境评分',  
162 - icon: "none"  
163 - })  
164 - return false  
165 - } 145 + // if (that.data.servicestar == 0) {
  146 + // wx.showToast({
  147 + // title: '请选择服务评分',
  148 + // icon: "none"
  149 + // })
  150 + // return false
  151 + // }
  152 + // if (that.data.taststar == 0) {
  153 + // wx.showToast({
  154 + // title: '请选择口味评分',
  155 + // icon: "none"
  156 + // })
  157 + // return false
  158 + // }
  159 + // if (that.data.environmentstar == 0) {
  160 + // wx.showToast({
  161 + // title: '请选择环境评分',
  162 + // icon: "none"
  163 + // })
  164 + // return false
  165 + // }
166 if (that.data.mark == '') { 166 if (that.data.mark == '') {
167 wx.showToast({ 167 wx.showToast({
168 title: '请输入评论内容', 168 title: '请输入评论内容',
@@ -195,10 +195,10 @@ Page({ @@ -195,10 +195,10 @@ Page({
195 content:that.data.mark, 195 content:that.data.mark,
196 images:that.data.image.join(","), 196 images:that.data.image.join(","),
197 score1:that.data.totalstar, 197 score1:that.data.totalstar,
198 - score2:that.data.servicestar,  
199 - score3:that.data.taststar,  
200 - score4:that.data.environmentstar,  
201 - score5:that.data.foodstar, 198 + // score2:that.data.servicestar,
  199 + // score3:that.data.taststar,
  200 + // score4:that.data.environmentstar,
  201 + // score5:that.data.foodstar,
202 type:1 202 type:1
203 203
204 } 204 }
1 { 1 {
2 - "navigationBarTitleText": "写点评" 2 + "navigationBarTitleText": "评价"
3 } 3 }
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 27
28 </view> 28 </view>
29 </view> 29 </view>
30 - <view class="evaluateItem"> 30 + <!-- <view class="evaluateItem">
31 <view class="tltle">服务</view> 31 <view class="tltle">服务</view>
32 <view class="starbox" bindtap="service" data-id="1"> 32 <view class="starbox" bindtap="service" data-id="1">
33 <image class="starItem" src="/img/pingfenshi.png" wx:if="{{servicestar>=1}}" /> 33 <image class="starItem" src="/img/pingfenshi.png" wx:if="{{servicestar>=1}}" />
@@ -102,7 +102,6 @@ @@ -102,7 +102,6 @@
102 102
103 </view> 103 </view>
104 </view> 104 </view>
105 -  
106 <view class="evaluateItem"> 105 <view class="evaluateItem">
107 <view class="tltle">食材</view> 106 <view class="tltle">食材</view>
108 <view class="starbox" bindtap="food" data-id="1"> 107 <view class="starbox" bindtap="food" data-id="1">
@@ -127,9 +126,9 @@ @@ -127,9 +126,9 @@
127 <image class="starItem" src="/img/lingfen_icon.png" wx:else/> 126 <image class="starItem" src="/img/lingfen_icon.png" wx:else/>
128 127
129 </view> 128 </view>
130 - </view> 129 + </view> -->
131 </view> 130 </view>
132 - <textarea placeholder="说说此刻的感受吧…" class="wordArea" bindinput="entermark" /> 131 + <textarea placeholder="说说您的用餐体验…" class="wordArea" bindinput="entermark" placeholder-class="word"/>
133 <!-- <view class="labelbox"> 132 <!-- <view class="labelbox">
134 <view class="labelItem"> 133 <view class="labelItem">
135 <text>+</text>标题 134 <text>+</text>标题
@@ -44,9 +44,12 @@ page { @@ -44,9 +44,12 @@ page {
44 font-family: PingFang SC; 44 font-family: PingFang SC;
45 font-weight: 400; 45 font-weight: 400;
46 line-height: 40rpx; 46 line-height: 40rpx;
47 - color: rgba(189, 196, 206, 1); 47 + color: rgba(0, 0, 0, 1);
48 margin-top: 32rpx; 48 margin-top: 32rpx;
49 } 49 }
  50 +.word{
  51 + color: rgba(0, 0, 0, 1);
  52 +}
50 53
51 .labelbox { 54 .labelbox {
52 margin-top: 32rpx; 55 margin-top: 32rpx;
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 14
15 <view wx:else> 15 <view wx:else>
16 <view class="photo"> 16 <view class="photo">
17 - <view class="photobox"> 17 + <view class="commentbox">
18 <view class="comtop flextwo"> 18 <view class="comtop flextwo">
19 <view class="comleft"> 19 <view class="comleft">
20 <image src="{{commentdetail.avatar}}"></image> 20 <image src="{{commentdetail.avatar}}"></image>
@@ -119,4 +119,8 @@ @@ -119,4 +119,8 @@
119 } 119 }
120 .commentleftactive{ 120 .commentleftactive{
121 width:560rpx; 121 width:560rpx;
122 -}  
  122 +}
  123 +.commentbox{
  124 + padding: 40rpx;
  125 + box-sizing: border-box;
  126 +}
@@ -7,6 +7,7 @@ Page({ @@ -7,6 +7,7 @@ Page({
7 * 页面的初始数据 7 * 页面的初始数据
8 */ 8 */
9 data: { 9 data: {
  10 + selected: 0,
10 imgUrls: [], 11 imgUrls: [],
11 indicatorDots: false, 12 indicatorDots: false,
12 autoplay: true, 13 autoplay: true,
@@ -33,7 +34,8 @@ Page({ @@ -33,7 +34,8 @@ Page({
33 grade_id: '', 34 grade_id: '',
34 composite_id: '', 35 composite_id: '',
35 city_id:'', 36 city_id:'',
36 - footersel:1 37 + footersel:1,
  38 + show:false
37 }, 39 },
38 40
39 /** 41 /**
@@ -51,11 +53,11 @@ Page({ @@ -51,11 +53,11 @@ Page({
51 console.log(e) 53 console.log(e)
52 let id = e.currentTarget.dataset.id; 54 let id = e.currentTarget.dataset.id;
53 if(id==1){ 55 if(id==1){
54 - wx.navigateTo({ 56 + wx.redirectTo({
55 url: '/pages/homepage/homepage', 57 url: '/pages/homepage/homepage',
56 }) 58 })
57 }else if(id==2){ 59 }else if(id==2){
58 - wx.navigateTo({ 60 + wx.redirectTo({
59 url: '/pages/usecenter/usecenter', 61 url: '/pages/usecenter/usecenter',
60 }) 62 })
61 } 63 }
@@ -378,6 +380,11 @@ Page({ @@ -378,6 +380,11 @@ Page({
378 that.setData({ 380 that.setData({
379 goodlist:newArr 381 goodlist:newArr
380 }) 382 })
  383 + if(that.data.goodlist.lenfth==0){
  384 + that.setData({
  385 + show:true
  386 + })
  387 + }
381 console.log('2222',that.data.goodlist) 388 console.log('2222',that.data.goodlist)
382 389
383 } 390 }
1 { 1 {
2 - "navigationBarTitleText": "美味星球" 2 + "navigationBarTitleText": "美味星球",
  3 + "usingComponents": {
  4 + "v-tab-bar": "/custom-tab-bar/custom-tab-bar"
  5 + }
3 } 6 }
@@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
47 </view> 47 </view>
48 </view> 48 </view>
49 49
50 -<view class="nodata" wx:if="{{goodlist.length==0}}">暂无数据</view> 50 +<view class="nodata" wx:if="{{show}}">暂无数据</view>
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'>
@@ -57,28 +57,38 @@ @@ -57,28 +57,38 @@
57 </view> 57 </view>
58 <view class="goodbot"> 58 <view class="goodbot">
59 <view class="goodname">{{item.name}}</view> 59 <view class="goodname">{{item.name}}</view>
  60 + <view class="goodname riname" wx:if="{{item.name_jap!=null}}">{{item.name_jap}}</view>
60 <view class="intro flextwo"> 61 <view class="intro flextwo">
  62 + <!-- <view class="space"></view> -->
61 <view class="introleft"> 63 <view class="introleft">
62 {{item.series_name}} 64 {{item.series_name}}
63 </view> 65 </view>
64 <view class="introright"> 66 <view class="introright">
65 - <view class="ping flexone">  
66 - <view class="pingleft">  
67 - <image src='/img/kuaizi.png'></image> 67 + <view class="hualist flexone" wx:if="{{item.score!=false}}">
  68 + <view class="huaitem" wx:if="{{item.score>=1}}">
  69 + <image src="/img/flower.png"></image>
68 </view> 70 </view>
69 - <view class="pingfen">{{item.synthetical_score}}</view>  
70 - </view>  
71 - <view class="hualist flexone">  
72 - <view class="huaitem"> 71 + <view class="huaitem" wx:if="{{item.score>=2}}">
  72 + <image src="/img/flower.png"></image>
  73 + </view>
  74 + <view class="huaitem" wx:if="{{item.score>=3}}">
73 <image src="/img/flower.png"></image> 75 <image src="/img/flower.png"></image>
74 </view> 76 </view>
75 - <view class="huaitem"> 77 + <view class="huaitem" wx:if="{{item.score>=4}}">
76 <image src="/img/flower.png"></image> 78 <image src="/img/flower.png"></image>
77 </view> 79 </view>
78 - <view class="huaitem"> 80 + <view class="huaitem" wx:if="{{item.score>=5}}">
79 <image src="/img/flower.png"></image> 81 <image src="/img/flower.png"></image>
80 </view> 82 </view>
  83 + <!-- <view class="pingfen" wx:if="{{item.score!=false}}">{{item.score}}</view> -->
81 </view> 84 </view>
  85 + <view class="ping flexone">
  86 + <view class="pingleft">
  87 + <image src='/img/kuaizi.png'></image>
  88 + </view>
  89 + <view class="pingfen">{{item.synthetical_score}}</view>
  90 + </view>
  91 +
82 </view> 92 </view>
83 </view> 93 </view>
84 <view class="shou"> 94 <view class="shou">
@@ -289,7 +299,8 @@ @@ -289,7 +299,8 @@
289 </view> 299 </view>
290 </view> 300 </view>
291 <!-- 底部导航 --> 301 <!-- 底部导航 -->
292 -<view class="teacherfooter"> 302 +<v-tab-bar selected="{{selected}}" ></v-tab-bar>
  303 +<!-- <view class="teacherfooter">
293 <view class="teacherfootitem" bindtap="footersel" data-id="1"> 304 <view class="teacherfootitem" bindtap="footersel" data-id="1">
294 <view class="teacherfootitemtop"> 305 <view class="teacherfootitemtop">
295 <image src="{{footersel==1?'/img/indexactive.png':'/img/index.png'}}"></image> 306 <image src="{{footersel==1?'/img/indexactive.png':'/img/index.png'}}"></image>
@@ -309,7 +320,7 @@ @@ -309,7 +320,7 @@
309 </view> 320 </view>
310 <view class="teacherfootname {{footersel==2?'selactive':''}}">我的</view> 321 <view class="teacherfootname {{footersel==2?'selactive':''}}">我的</view>
311 </view> 322 </view>
312 -</view> 323 +</view> -->
313 <view class="register" wx:if="{{wrap}}" bindtap="hidewrap"> 324 <view class="register" wx:if="{{wrap}}" bindtap="hidewrap">
314 <view class="topwrap" catchtap="go"> 325 <view class="topwrap" catchtap="go">
315 <view class="flextwo"> 326 <view class="flextwo">
@@ -9,15 +9,15 @@ image { @@ -9,15 +9,15 @@ image {
9 } 9 }
10 /* 轮播图 */ 10 /* 轮播图 */
11 .swiper_image { 11 .swiper_image {
12 - width: 686rpx; 12 + width: 750rpx;
13 height: 308rpx; 13 height: 308rpx;
14 font-size: 0; 14 font-size: 0;
15 - margin: 32rpx auto 0; 15 + margin: 0 auto;
16 position: relative; 16 position: relative;
17 } 17 }
18 18
19 swiper { 19 swiper {
20 - width: 686rpx; 20 + width:750rpx;
21 height: 308rpx; 21 height: 308rpx;
22 } 22 }
23 23
@@ -27,7 +27,7 @@ swiper { @@ -27,7 +27,7 @@ swiper {
27 } 27 }
28 28
29 .swiper_item_img swiper-item { 29 .swiper_item_img swiper-item {
30 - width: 686rpx; 30 + width: 750rpx;
31 height: 308rpx; 31 height: 308rpx;
32 } 32 }
33 33
@@ -173,6 +173,10 @@ swiper-item { @@ -173,6 +173,10 @@ swiper-item {
173 width: 296rpx; 173 width: 296rpx;
174 margin-bottom:10rpx; 174 margin-bottom:10rpx;
175 } 175 }
  176 +.riname{
  177 + font-size: 24rpx;
  178 + margin-top:0
  179 +}
176 180
177 .hualist { 181 .hualist {
178 margin-top: 4rpx; 182 margin-top: 4rpx;
@@ -180,15 +184,15 @@ swiper-item { @@ -180,15 +184,15 @@ swiper-item {
180 } 184 }
181 185
182 .huaitem { 186 .huaitem {
183 - width: 20rpx;  
184 - height: 20rpx; 187 + width: 24rpx;
  188 + height: 24rpx;
185 font-size: 0; 189 font-size: 0;
186 margin-right: 6rpx; 190 margin-right: 6rpx;
187 } 191 }
188 192
189 .pingleft { 193 .pingleft {
190 - width: 28rpx;  
191 - height: 28rpx; 194 + width: 36rpx;
  195 + height:40rpx;
192 font-size: 0; 196 font-size: 0;
193 } 197 }
194 198
@@ -209,7 +213,7 @@ swiper-item { @@ -209,7 +213,7 @@ swiper-item {
209 box-sizing: border-box; 213 box-sizing: border-box;
210 height: 42rpx; 214 height: 42rpx;
211 background: rgba(255, 255, 255, 1); 215 background: rgba(255, 255, 255, 1);
212 - border: 1rpx solid rgba(112, 112, 112, 1); 216 + border:1px solid rgba(112, 112, 112, 1);
213 opacity: 1; 217 opacity: 1;
214 border-radius: 180rpx; 218 border-radius: 180rpx;
215 color: #3d444d; 219 color: #3d444d;
@@ -288,3 +292,8 @@ page { @@ -288,3 +292,8 @@ page {
288 .wrapactive{ 292 .wrapactive{
289 color:#FDAA2A; 293 color:#FDAA2A;
290 } 294 }
  295 +.space{
  296 + width: 1rpx;
  297 + height: 100%;
  298 + float: left;
  299 +}
@@ -32,6 +32,7 @@ Page({ @@ -32,6 +32,7 @@ Page({
32 page:1, 32 page:1,
33 commentlist:[] 33 commentlist:[]
34 }) 34 })
  35 + console.log(this.data.coment)
35 this.getmorecomment() 36 this.getmorecomment()
36 37
37 }, 38 },
@@ -44,7 +45,7 @@ Page({ @@ -44,7 +45,7 @@ Page({
44 page: that.data.page, 45 page: that.data.page,
45 shop_id:that.data.shopid, 46 shop_id:that.data.shopid,
46 limit:15, 47 limit:15,
47 - type:that.data.comment 48 + type:that.data.coment
48 49
49 } 50 }
50 app.post(url, params,"post").then((res) => { 51 app.post(url, params,"post").then((res) => {
1 <view class="commenttop flexone"> 1 <view class="commenttop flexone">
2 <view class="commenttopitem {{coment==index?'comactive':''}}" wx:for="{{comentarr}}" wx:key="" bindtap="selitem" data-index="{{index}}">{{item}}</view> 2 <view class="commenttopitem {{coment==index?'comactive':''}}" wx:for="{{comentarr}}" wx:key="" bindtap="selitem" data-index="{{index}}">{{item}}</view>
3 </view> 3 </view>
4 -<view class="bodybox"> 4 +<view class="nodata" wx:if="{{commentlist.length==0}}">暂无评论</view>
  5 +<view class="bodybox" wx:else>
5 <view class="photo" wx:for="{{commentlist}}" wx:key=""> 6 <view class="photo" wx:for="{{commentlist}}" wx:key="">
6 - <view class="jianintro photobox" bindtap="comentdetail" data-id="{{item.id}}"> 7 + <view class="jianintro commentbox" bindtap="comentdetail" data-id="{{item.id}}">
7 <view class="comtop flextwo"> 8 <view class="comtop flextwo">
8 <view class="comleft"> 9 <view class="comleft">
9 <image src="{{item.avatar}}"></image> 10 <image src="{{item.avatar}}"></image>
@@ -21,3 +21,6 @@ @@ -21,3 +21,6 @@
21 font-size: #FDAA2A; 21 font-size: #FDAA2A;
22 border:1rpx solid #FDAA2A; 22 border:1rpx solid #FDAA2A;
23 } 23 }
  24 +.commentbox{
  25 + margin-top:0
  26 +}
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
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="">
16 - <view class="jianintro photobox" 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">
19 <image src="{{item.avatar}}"></image> 19 <image src="{{item.avatar}}"></image>
@@ -26,14 +26,12 @@ @@ -26,14 +26,12 @@
26 </view> 26 </view>
27 27
28 <view class="flexone"> 28 <view class="flexone">
29 - <view class="shenstatus" wx:if="{{item.status==1}}">审核中</view>  
30 - <view class="shenstatus" wx:if="{{item.status==3}}">审核未通过</view> 29 + <!-- <view class="shenstatus" wx:if="{{item.status==1}}">审核中</view>
  30 + <view class="shenstatus" wx:if="{{item.status==3}}">审核未通过</view> -->
31 <view class="delimg" catchtap="delcomment" data-id="{{item.id}}"> 31 <view class="delimg" catchtap="delcomment" data-id="{{item.id}}">
32 <image src="/img/delimg.png"></image> 32 <image src="/img/delimg.png"></image>
33 </view> 33 </view>
34 </view> 34 </view>
35 -  
36 -  
37 </view> 35 </view>
38 <view class="comdate">{{item.createtime}}</view> 36 <view class="comdate">{{item.createtime}}</view>
39 37
@@ -145,4 +145,7 @@ @@ -145,4 +145,7 @@
145 font-size: 22rpx; 145 font-size: 22rpx;
146 text-align: center; 146 text-align: center;
147 margin-right:26rpx; 147 margin-right:26rpx;
  148 +}
  149 +.commentitem{
  150 + margin-top:0
148 } 151 }
@@ -32,7 +32,8 @@ @@ -32,7 +32,8 @@
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"/> 35 +
  36 + <input placeholder='这个人什么都没写…' value="{{brief}}" bindinput="entermark" maxlength="50"/>
36 37
37 38
38 </view> 39 </view>
@@ -51,7 +51,7 @@ page { @@ -51,7 +51,7 @@ page {
51 51
52 .textarea { 52 .textarea {
53 color: #bdc4ce; 53 color: #bdc4ce;
54 - font-size: 24rpx; 54 + font-size:30rpx;
55 margin-top: 16rpx; 55 margin-top: 16rpx;
56 } 56 }
57 57
@@ -60,7 +60,7 @@ page { @@ -60,7 +60,7 @@ page {
60 padding: 32rpx; 60 padding: 32rpx;
61 box-sizing: border-box; 61 box-sizing: border-box;
62 margin-top: 16rpx; 62 margin-top: 16rpx;
63 - height: 316rpx; 63 + /* height: 316rpx; */
64 } 64 }
65 65
66 .headitemleft input { 66 .headitemleft input {
@@ -8,15 +8,15 @@ Page({ @@ -8,15 +8,15 @@ Page({
8 data: { 8 data: {
9 word: '', 9 word: '',
10 recommend: [], 10 recommend: [],
11 - search:true,  
12 - goodlist:[]  
13 - 11 + search: true,
  12 + goodlist: [],
  13 + historylist:[]
14 }, 14 },
15 15
16 /** 16 /**
17 * 生命周期函数--监听页面加载 17 * 生命周期函数--监听页面加载
18 */ 18 */
19 - onLoad: function(options) { 19 + onLoad: function (options) {
20 this.getrecommend() 20 this.getrecommend()
21 }, 21 },
22 enterword(e) { 22 enterword(e) {
@@ -24,21 +24,42 @@ Page({ @@ -24,21 +24,42 @@ Page({
24 this.setData({ 24 this.setData({
25 word: e.detail.value 25 word: e.detail.value
26 }) 26 })
27 -  
28 console.log(this.data.word) 27 console.log(this.data.word)
29 -  
30 -  
31 }, 28 },
32 - // 获取历史搜索 29 + // 获取搜索内容
33 searchtext() { 30 searchtext() {
34 let that = this; 31 let that = this;
35 - if(that.data.word==''){ 32 + if (that.data.word == '') {
36 wx.showToast({ 33 wx.showToast({
37 title: '请输入关键字', 34 title: '请输入关键字',
  35 + icon: "none"
  36 + })
  37 + return false
  38 + }
  39 +
  40 + that.searchlist()
  41 + },
  42 + searchtextk(){
  43 + if(this.data.word==''){
  44 + wx.showToast({
  45 + title:'请输入搜索内容',
38 icon:"none" 46 icon:"none"
39 }) 47 })
40 return false 48 return false
41 } 49 }
  50 + this.searchlist()
  51 + },
  52 + // 点击搜索
  53 + searchtext(e){
  54 + this.setData({
  55 + word:e.currentTarget.dataset.name
  56 + })
  57 + this.searchlist()
  58 + },
  59 +
  60 + searchlist(){
  61 + let that=this;
  62 + console.log(that.data.word)
42 var url = 'index/searchShopList'; 63 var url = 'index/searchShopList';
43 var params = { 64 var params = {
44 keyword: that.data.word, 65 keyword: that.data.word,
@@ -51,71 +72,107 @@ Page({ @@ -51,71 +72,107 @@ Page({
51 } 72 }
52 app.post(url, params).then((res) => { 73 app.post(url, params).then((res) => {
53 console.log(res); 74 console.log(res);
54 - if(res.data.length!=0){ 75 + if (res.data.length != 0) {
55 that.setData({ 76 that.setData({
56 - search:false,  
57 - page:1,  
58 - goodlist:[],  
59 - 77 + search: false,
  78 + page: 1,
  79 + goodlist: [],
  80 +
60 }) 81 })
61 82
62 that.setData({ 83 that.setData({
63 goodlist: that.data.goodlist.concat(res.data) 84 goodlist: that.data.goodlist.concat(res.data)
64 }) 85 })
65 var arr = that.data.goodlist; 86 var arr = that.data.goodlist;
66 - console.log('666',arr) 87 + console.log('666', arr)
67 let one = []; 88 let one = [];
68 let two = []; 89 let two = [];
69 let newArr = []; 90 let newArr = [];
70 - arr.forEach((el,i)=>{ 91 + arr.forEach((el, i) => {
71 console.log(i) 92 console.log(i)
72 - if(i%2 == 0){  
73 - one.push(el)  
74 - }else{  
75 - two.push(el)  
76 - } 93 + if (i % 2 == 0) {
  94 + one.push(el)
  95 + } else {
  96 + two.push(el)
  97 + }
77 }) 98 })
78 - newArr = [...newArr,...one,...two]; 99 + newArr = [...newArr, ...one, ...two];
79 that.setData({ 100 that.setData({
80 - goodlist:newArr 101 + goodlist: newArr
81 }) 102 })
82 - console.log('2222',that.data.goodlist)  
83 - 103 + console.log('2222', that.data.goodlist)
84 } 104 }
85 -  
86 -  
87 -  
88 }).catch((err) => { 105 }).catch((err) => {
89 -  
90 }) 106 })
  107 + },
  108 + // 获取历史搜索
  109 + gethistory(){
  110 + let that = this;
  111 + var url = 'sundry/get_keyword_log';
  112 + var params = {
  113 +
  114 + }
  115 + app.post(url, params).then((res) => {
  116 + console.log(res);
  117 + that.setData({
  118 + historylist:res
  119 + })
  120 + }).catch((err) => {
  121 +
  122 + })
  123 + },
91 124
  125 + // 删除历史搜索
  126 + delete(){
  127 + let that = this;
  128 + wx.showModal({
  129 + title: '提示',
  130 + content: '是否要删除历史搜索',
  131 + success (res) {
  132 + if (res.confirm) {
  133 + var url = 'sundry/delete_keyword_log';
  134 + var params = {
  135 +
  136 + }
  137 + app.post(url, params).then((res) => {
  138 + console.log(res);
  139 + wx.showToast({
  140 + title: '删除成功',
  141 + icon:"none"
  142 + })
  143 + that.setData({
  144 + historylist:[]
  145 + })
  146 +
  147 + console.log(that.data.historylist)
  148 + }).catch((err) => {
  149 + console.log(err)
  150 +
  151 + })
  152 + } else if (res.cancel) {
  153 + console.log('用户点击取消')
  154 + }
  155 + }})
92 }, 156 },
93 goodtail(e) { 157 goodtail(e) {
94 let id = e.currentTarget.dataset.id; 158 let id = e.currentTarget.dataset.id;
95 wx.navigateTo({ 159 wx.navigateTo({
96 url: '/pages/shopdetail/shopdetail?id=' + id, 160 url: '/pages/shopdetail/shopdetail?id=' + id,
97 }) 161 })
98 -  
99 }, 162 },
100 // 获取推荐店铺 163 // 获取推荐店铺
101 getrecommend() { 164 getrecommend() {
102 - let that = this;  
103 - var url = 'shop/selectShopRecommend';  
104 - var params = {  
105 - limit: 10  
106 -  
107 - }  
108 - app.post(url, params).then((res) => {  
109 - console.log(res);  
110 - that.setData({  
111 - recommend: res  
112 - })  
113 -  
114 -  
115 -  
116 - }).catch((err) => {  
117 -  
118 - }) 165 + let that = this;
  166 + var url = 'shop/selectShopRecommend';
  167 + var params = {
  168 + limit: 10
  169 + }
  170 + app.post(url, params).then((res) => {
  171 + console.log(res);
  172 + that.setData({
  173 + recommend: res
  174 + })
  175 + }).catch((err) => {})
119 }, 176 },
120 177
121 goodtail(e) { 178 goodtail(e) {
@@ -128,49 +185,49 @@ Page({ @@ -128,49 +185,49 @@ Page({
128 /** 185 /**
129 * 生命周期函数--监听页面初次渲染完成 186 * 生命周期函数--监听页面初次渲染完成
130 */ 187 */
131 - onReady: function() { 188 + onReady: function () {
132 189
133 }, 190 },
134 191
135 /** 192 /**
136 * 生命周期函数--监听页面显示 193 * 生命周期函数--监听页面显示
137 */ 194 */
138 - onShow: function() {  
139 - 195 + onShow: function () {
  196 + this.gethistory()
140 }, 197 },
141 198
142 /** 199 /**
143 * 生命周期函数--监听页面隐藏 200 * 生命周期函数--监听页面隐藏
144 */ 201 */
145 - onHide: function() { 202 + onHide: function () {
146 203
147 }, 204 },
148 205
149 /** 206 /**
150 * 生命周期函数--监听页面卸载 207 * 生命周期函数--监听页面卸载
151 */ 208 */
152 - onUnload: function() { 209 + onUnload: function () {
153 210
154 }, 211 },
155 212
156 /** 213 /**
157 * 页面相关事件处理函数--监听用户下拉动作 214 * 页面相关事件处理函数--监听用户下拉动作
158 */ 215 */
159 - onPullDownRefresh: function() { 216 + onPullDownRefresh: function () {
160 217
161 }, 218 },
162 219
163 /** 220 /**
164 * 页面上拉触底事件的处理函数 221 * 页面上拉触底事件的处理函数
165 */ 222 */
166 - onReachBottom: function() { 223 + onReachBottom: function () {
167 224
168 }, 225 },
169 226
170 /** 227 /**
171 * 用户点击右上角分享 228 * 用户点击右上角分享
172 */ 229 */
173 - onShareAppMessage: function() { 230 + onShareAppMessage: function () {
174 231
175 } 232 }
176 }) 233 })
@@ -9,41 +9,42 @@ @@ -9,41 +9,42 @@
9 <input type="text" placeholder="请输入搜索内容" placeholder-class="shuru" bindinput="enterword" /> 9 <input type="text" placeholder="请输入搜索内容" placeholder-class="shuru" bindinput="enterword" />
10 </view> 10 </view>
11 </view> 11 </view>
12 - <view class="search" bindtap="searchtext">搜索</view> 12 + <view class="search" bindtap="searchtextk">搜索</view>
13 </view> 13 </view>
14 </view> 14 </view>
15 <view wx:if="{{search}}"> 15 <view wx:if="{{search}}">
16 <!-- 店推推荐 --> 16 <!-- 店推推荐 -->
17 <view class="city"> 17 <view class="city">
18 <view class="citytop">店铺推荐</view> 18 <view class="citytop">店铺推荐</view>
19 - <view class="citybox flexone"> 19 +
  20 + <view class="nodata" wx:if="{{recommend.length==0}}"></view>
  21 + <view class="citybox flexone" wx:else>
20 <view class="tuiitem flexone" wx:for="{{recommend}}" wx:key="" bindtap="goodtail" data-id="{{item.id}}"> 22 <view class="tuiitem flexone" wx:for="{{recommend}}" wx:key="" bindtap="goodtail" data-id="{{item.id}}">
21 <view class="tuimg" wx:if="{{index<=2}}"> 23 <view class="tuimg" wx:if="{{index<=2}}">
22 <image src="/img/huori.png"></image> 24 <image src="/img/huori.png"></image>
23 </view> 25 </view>
24 {{item.name}} 26 {{item.name}}
25 </view> 27 </view>
26 -  
27 -  
28 </view> 28 </view>
29 </view> 29 </view>
30 30
31 <!-- 店推推荐 --> 31 <!-- 店推推荐 -->
32 <view class="city"> 32 <view class="city">
33 - <view class="citytop">历史搜索</view>  
34 - <view class="citybox flexone">  
35 -  
36 - <view class="tuiitem flexone" wx:for='{{shoplist}}' wx:key="" bindtap="goodtail" data-id="{{item.id}}">  
37 - {{item.name}} 33 + <view class="flextwo">
  34 + <view class="citytop">历史搜索</view>
  35 + <view class="deleteimg" bindtap="delete">
  36 + <image src="/img/delete.png"></image>
  37 + </view>
  38 + </view>
  39 + <view class="nodata" wx:if="{{historylist.length==0}}">暂无数据</view>
  40 + <view class="citybox flexone" wx:else>
  41 + <view class="tuiitem flexone" wx:for='{{historylist}}' wx:key="" bindtap="searchtext" data-name="{{item.content}}">
  42 + {{item.content}}
38 </view> 43 </view>
39 -  
40 -  
41 </view> 44 </view>
42 </view> 45 </view>
43 </view> 46 </view>
44 -  
45 <!--搜索结果 --> 47 <!--搜索结果 -->
46 -  
47 <view class="search" wx:else> 48 <view class="search" wx:else>
48 <view class="nodata" wx:if="{{goodlist.length==0}}">暂无数据</view> 49 <view class="nodata" wx:if="{{goodlist.length==0}}">暂无数据</view>
49 50
1 @import '../searchcity/searchcity.wxss'; 1 @import '../searchcity/searchcity.wxss';
2 @import '../homepage/homepage.wxss'; 2 @import '../homepage/homepage.wxss';
3 .tuiitem{ 3 .tuiitem{
4 - padding: 12rpx 22rpx;  
5 - box-sizing: border-box;  
6 - background: #eee;  
7 - color:#06121E;  
8 - font-size: 24rpx;  
9 - text-align: center;  
10 - margin-bottom:24rpx;  
11 - margin-right:22rpx; 4 + padding: 12rpx 22rpx;
  5 + box-sizing: border-box;
  6 + background: #eee;
  7 + color:#06121E;
  8 + font-size: 24rpx;
  9 + text-align: center;
  10 + margin-bottom:24rpx;
  11 + margin-right:22rpx;
12 12
13 } 13 }
14 .tuimg{ 14 .tuimg{
15 - width:26rpx;  
16 - height:26rpx;  
17 - font-size: 0;  
18 - margin-right:10rpx;  
19 - 15 + width:26rpx;
  16 + height:26rpx;
  17 + font-size: 0;
  18 + margin-right:10rpx;
  19 +}
  20 +.deleteimg{
  21 + width:32rpx;
  22 + height:32rpx;
  23 + font-size:0;
  24 + margin-top:44rpx;
20 } 25 }
@@ -24,6 +24,30 @@ Page({ @@ -24,6 +24,30 @@ Page({
24 this.setData({ 24 this.setData({
25 currentSwiper: e.detail.current 25 currentSwiper: e.detail.current
26 }) 26 })
  27 + wx.previewImage({
  28 + current: that.data.explain_pic[index],
  29 + urls: that.data.explain_pic,
  30 + success: function (res) { },
  31 + fail: function (res) { },
  32 + complete: function (res) { },
  33 + })
  34 + // wx.previewImage({
  35 + // urls: [],
  36 + // })
  37 + },
  38 + // 评论图片预览
  39 + previewimgk(e){
  40 + console.log(e)
  41 + let pindex=e.currentTarget.dataset.pindex;
  42 + let index=e.currentTarget.dataset.index;
  43 + wx.previewImage({
  44 + current: this.data.shopdetail.remarks[pindex].images[index],
  45 + urls:this.data.shopdetail.remarks[pindex].images,
  46 + success: function (res) { },
  47 + fail: function (res) { },
  48 + complete: function (res) { },
  49 + })
  50 +
27 }, 51 },
28 morecomment() { 52 morecomment() {
29 53
@@ -32,6 +56,7 @@ Page({ @@ -32,6 +56,7 @@ Page({
32 }) 56 })
33 }, 57 },
34 xiangce() { 58 xiangce() {
  59 + console.log(33443)
35 wx.navigateTo({ 60 wx.navigateTo({
36 url: '/pages/morepic/morepic', 61 url: '/pages/morepic/morepic',
37 }) 62 })
@@ -46,23 +46,30 @@ @@ -46,23 +46,30 @@
46 </view> 46 </view>
47 <view class="cai flex"> 47 <view class="cai flex">
48 <view class="flower flexone"> 48 <view class="flower flexone">
49 - <view class="floweritem"> 49 + <view class="floweritem" wx:if="{{shopdetail.miqilin_score>=1}}">
50 <image src="/img/hua.png"></image> 50 <image src="/img/hua.png"></image>
51 </view> 51 </view>
52 - <view class="floweritem"> 52 + <view class="floweritem" wx:if="{{shopdetail.miqilin_score>=2}}">
53 <image src="/img/hua.png"></image> 53 <image src="/img/hua.png"></image>
54 </view> 54 </view>
55 - <view class="floweritem"> 55 + <view class="floweritem" wx:if="{{shopdetail.miqilin_score>=3}}">
  56 + <image src="/img/hua.png"></image>
  57 + </view>
  58 + <view class="floweritem" wx:if="{{shopdetail.miqilin_score>=4}}">
  59 + <image src="/img/hua.png"></image>
  60 + </view>
  61 + <view class="floweritem" wx:if="{{shopdetail.miqilin_score>=5}}">
56 <image src="/img/hua.png"></image> 62 <image src="/img/hua.png"></image>
57 </view> 63 </view>
58 </view> 64 </view>
  65 + <!-- <view class="fen" wx:if="{{shopdetail.miqilin_score!=false}}">{{shopdetail.miqilin_score}} 分</view> -->
59 <view class="huaname">{{shopdetail.series_name}}</view> 66 <view class="huaname">{{shopdetail.series_name}}</view>
60 </view> 67 </view>
61 <view class="comment flexone"> 68 <view class="comment flexone">
62 <view class="sanleft"> 69 <view class="sanleft">
63 <image src="/img/sanxing.png"></image> 70 <image src="/img/sanxing.png"></image>
64 </view> 71 </view>
65 - <view class="star flexone"> 72 + <!-- <view class="star flexone">
66 <view class="staritem"> 73 <view class="staritem">
67 74
68 <image src="/img/pingfenshi.png" wx:if="{{shopdetail.miqilin_score>=1}}"></image> 75 <image src="/img/pingfenshi.png" wx:if="{{shopdetail.miqilin_score>=1}}"></image>
@@ -91,15 +98,15 @@ @@ -91,15 +98,15 @@
91 </view> 98 </view>
92 99
93 100
94 - </view>  
95 - <view class="fen">{{shopdetail.miqilin_score}}分</view> 101 + </view> -->
  102 + <view class="fen">{{shopdetail.synthetical_score}}分</view>
96 <view class="tiao">({{shopdetail.remark_num}}条)</view> 103 <view class="tiao">({{shopdetail.remark_num}}条)</view>
97 </view> 104 </view>
98 <view class="commentone flexone"> 105 <view class="commentone flexone">
99 <view class="sanleft"> 106 <view class="sanleft">
100 <image src="/img/kuai.png"></image> 107 <image src="/img/kuai.png"></image>
101 </view> 108 </view>
102 - <view class="star flexone"> 109 + <!-- <view class="star flexone">
103 <view class="staritem"> 110 <view class="staritem">
104 <image src="/img/pingfenshi.png" wx:if="{{shopdetail.synthetical_score>=1}}"></image> 111 <image src="/img/pingfenshi.png" wx:if="{{shopdetail.synthetical_score>=1}}"></image>
105 <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.synthetical_score<0.5}}"></image> 112 <image src="/img/lingfen_icon.png" wx:if="{{shopdetail.synthetical_score<0.5}}"></image>
@@ -126,8 +133,8 @@ @@ -126,8 +133,8 @@
126 <image src="/img/banke.png" wx:if="{{shopdetail.synthetical_score>=4.5&&shopdetail.synthetical_score<5}}"></image> 133 <image src="/img/banke.png" wx:if="{{shopdetail.synthetical_score>=4.5&&shopdetail.synthetical_score<5}}"></image>
127 </view> 134 </view>
128 135
129 - </view>  
130 - <view class="fen">{{shopdetail.synthetical_score}}分</view> 136 + </view> -->
  137 + <view class="fen">{{shopdetail.tabelog}}分</view>
131 </view> 138 </view>
132 </view> 139 </view>
133 </view> 140 </view>
@@ -141,9 +148,9 @@ @@ -141,9 +148,9 @@
141 </view> 148 </view>
142 </view> 149 </view>
143 <view class="photo {{shopdetail.content==''?'photoact':''}}" wx:if="{{images[0]!=''}}"> 150 <view class="photo {{shopdetail.content==''?'photoact':''}}" wx:if="{{images[0]!=''}}">
144 - <view class="flextwo" bindtap="{{pic.length!=0?'xiangce':''}}"> 151 + <view class="flextwo">
145 <view class="xiang" >相册</view> 152 <view class="xiang" >相册</view>
146 - <view class="photoright flexone"> 153 + <view class="photoright flexone" bindtap="{{pic.length!=0?'xiangce':''}}" wx:if="{{pic.length!=0}}">
147 <view class="morename">更多</view> 154 <view class="morename">更多</view>
148 <view class="yourow"> 155 <view class="yourow">
149 <image src="/img/leftrow.png"></image> 156 <image src="/img/leftrow.png"></image>
@@ -174,7 +181,7 @@ @@ -174,7 +181,7 @@
174 181
175 <view class="dianbox"> 182 <view class="dianbox">
176 <!-- wx:for='{{shopdetail.remarks}}' wx:key="" --> 183 <!-- wx:for='{{shopdetail.remarks}}' wx:key="" -->
177 - <view class="jianintro photobox" bindtap="comentdetail" data-id="{{item.id}}" wx:for='{{shopdetail.remarks}}' wx:key=""> 184 + <view class="jianintro commentitem " bindtap="comentdetail" data-id="{{item.id}}" wx:for='{{shopdetail.remarks}}' wx:key="" wx:for-index="cellindex">
178 <view class="comtop flextwo" catchtap="personpage" data-userid="{{item.user_id}}"> 185 <view class="comtop flextwo" catchtap="personpage" data-userid="{{item.user_id}}">
179 <view class="comleft"> 186 <view class="comleft">
180 <image src="{{item.avatar}}"></image> 187 <image src="{{item.avatar}}"></image>
@@ -257,7 +264,7 @@ @@ -257,7 +264,7 @@
257 264
258 <view class="textboximg flexone"> 265 <view class="textboximg flexone">
259 <view class="boxitem" wx:for='{{item.images}}' wx:key=""> 266 <view class="boxitem" wx:for='{{item.images}}' wx:key="">
260 - <image src="{{item}}"></image> 267 + <image src="{{item}}" catchtap="previewimgk" data-index="{{index}}" data-pindex="{{cellindex}}"></image>
261 </view> 268 </view>
262 269
263 </view> 270 </view>
@@ -340,10 +347,10 @@ @@ -340,10 +347,10 @@
340 </view> 347 </view>
341 </view> 348 </view>
342 349
343 - <view class="yuyuelsit flexone" wx:if="{{shopdetail.label!=''}}"> 350 + <!-- <view class="yuyuelsit flexone" wx:if="{{shopdetail.label!=''}}">
344 <view class="yuyueitem" wx:for="{{shopdetail.label}}" wx:key="">{{item}}</view> 351 <view class="yuyueitem" wx:for="{{shopdetail.label}}" wx:key="">{{item}}</view>
345 352
346 - </view> 353 + </view> -->
347 354
348 </view> 355 </view>
349 356
@@ -22,7 +22,7 @@ page { @@ -22,7 +22,7 @@ page {
22 text-align: center; 22 text-align: center;
23 position: absolute; 23 position: absolute;
24 right: 32rpx; 24 right: 32rpx;
25 - bottom: 54rpx; 25 + bottom:120rpx;
26 } 26 }
27 27
28 /* 轮播图 */ 28 /* 轮播图 */
@@ -140,7 +140,7 @@ swiper { @@ -140,7 +140,7 @@ swiper {
140 140
141 .huaname { 141 .huaname {
142 height: 40rpx; 142 height: 40rpx;
143 - border: 1rpx solid rgba(140, 145, 152, 1); 143 + border:2rpx solid rgba(140, 145, 152, 1);
144 opacity: 1; 144 opacity: 1;
145 border-radius: 8rpx; 145 border-radius: 8rpx;
146 color: #8c9198; 146 color: #8c9198;
@@ -196,6 +196,9 @@ swiper { @@ -196,6 +196,9 @@ swiper {
196 padding: 40rpx; 196 padding: 40rpx;
197 box-sizing: border-box; 197 box-sizing: border-box;
198 } 198 }
  199 +.commentitem{
  200 + margin-top:0
  201 +}
199 202
200 page { 203 page {
201 background: #fbf8fb; 204 background: #fbf8fb;
@@ -209,7 +212,7 @@ page { @@ -209,7 +212,7 @@ page {
209 212
210 .jiantext { 213 .jiantext {
211 color: #707070; 214 color: #707070;
212 - font-size: 24rpx; 215 +
213 } 216 }
214 217
215 .bodybox { 218 .bodybox {
@@ -238,7 +241,7 @@ page { @@ -238,7 +241,7 @@ page {
238 } 241 }
239 242
240 .photoitem { 243 .photoitem {
241 - width: 188rpx; 244 + width: 223rpx;
242 height: 188rpx; 245 height: 188rpx;
243 font-size: 0; 246 font-size: 0;
244 padding-right: 42rpx; 247 padding-right: 42rpx;
@@ -551,4 +554,7 @@ button::after { @@ -551,4 +554,7 @@ button::after {
551 554
552 .yuyuelsit { 555 .yuyuelsit {
553 margin-top: 26rpx; 556 margin-top: 26rpx;
  557 +}
  558 +.dianbox{
  559 + margin-top:24rpx;
554 } 560 }
@@ -8,17 +8,18 @@ Page({ @@ -8,17 +8,18 @@ Page({
8 data: { 8 data: {
9 userinfo: '', 9 userinfo: '',
10 token: '', 10 token: '',
11 - footersel:2 11 + footersel:2,
  12 + selected: 2,
12 }, 13 },
13 footersel(e) { 14 footersel(e) {
14 console.log(e) 15 console.log(e)
15 let id = e.currentTarget.dataset.id; 16 let id = e.currentTarget.dataset.id;
16 if(id==1){ 17 if(id==1){
17 - wx.navigateTo({ 18 + wx.redirectTo({
18 url: '/pages/homepage/homepage', 19 url: '/pages/homepage/homepage',
19 }) 20 })
20 }else if(id==2){ 21 }else if(id==2){
21 - wx.navigateTo({ 22 + wx.redirectTo({
22 url: '/pages/usecenter/usecenter', 23 url: '/pages/usecenter/usecenter',
23 }) 24 })
24 } 25 }
1 { 1 {
2 "navigationBarTitleText": "我的", 2 "navigationBarTitleText": "我的",
3 "navigationBarBackgroundColor": "#FDAA2A", 3 "navigationBarBackgroundColor": "#FDAA2A",
4 - "navigationBarTextStyle": "white" 4 + "navigationBarTextStyle": "white",
  5 + "usingComponents": {
  6 + "v-tab-bar": "/custom-tab-bar/custom-tab-bar"
  7 + }
5 } 8 }
@@ -117,9 +117,10 @@ @@ -117,9 +117,10 @@
117 117
118 118
119 </view> 119 </view>
120 -  
121 <!-- 底部导航 --> 120 <!-- 底部导航 -->
122 -<view class="teacherfooter"> 121 +<v-tab-bar selected="{{selected}}" ></v-tab-bar>
  122 +<!-- 底部导航 -->
  123 +<!-- <view class="teacherfooter">
123 <view class="teacherfootitem" bindtap="footersel" data-id="1"> 124 <view class="teacherfootitem" bindtap="footersel" data-id="1">
124 <view class="teacherfootitemtop"> 125 <view class="teacherfootitemtop">
125 <image src="{{footersel==1?'/img/indexactive.png':'/img/index.png'}}"></image> 126 <image src="{{footersel==1?'/img/indexactive.png':'/img/index.png'}}"></image>
@@ -139,4 +140,4 @@ @@ -139,4 +140,4 @@
139 </view> 140 </view>
140 <view class="teacherfootname {{footersel==2?'selactive':''}}">我的</view> 141 <view class="teacherfootname {{footersel==2?'selactive':''}}">我的</view>
141 </view> 142 </view>
142 -</view>  
  143 +</view> -->