miniprogram / hangpaiproject · 提交

转到一个项目

作者 lihongjuan
提交 2f3633c8b7aaf74e22b1c5918d004cb4331e3ad4 1 个父辈 6921b87a

1

内嵌 并排对比
正在显示 29 个修改的文件 包含 772 行增加 和 269 行删除
@@ -2,7 +2,8 @@ @@ -2,7 +2,8 @@
2 "pages": [ 2 "pages": [
3 "pages/startindex/startindex", 3 "pages/startindex/startindex",
4 "pages/homepage/homepage", 4 "pages/homepage/homepage",
5 - 5 + "pages/mine/mine",
  6 + "pages/kind/kind",
6 "pages/goumaixuzhi/goumaixuzhi", 7 "pages/goumaixuzhi/goumaixuzhi",
7 "pages/kaifapiao/kaifapiao", 8 "pages/kaifapiao/kaifapiao",
8 "pages/lianjie/lianjie", 9 "pages/lianjie/lianjie",
@@ -18,12 +19,10 @@ @@ -18,12 +19,10 @@
18 "pages/picbox/picbox", 19 "pages/picbox/picbox",
19 "pages/huiyuanknow/huiyuanknow", 20 "pages/huiyuanknow/huiyuanknow",
20 "pages/chongzhi/chongzhi", 21 "pages/chongzhi/chongzhi",
21 - "pages/mine/mine",  
22 "pages/orderbox/orderbox", 22 "pages/orderbox/orderbox",
23 "pages/search/search", 23 "pages/search/search",
24 "pages/searchresult/searcgresult", 24 "pages/searchresult/searcgresult",
25 "pages/cart/cart", 25 "pages/cart/cart",
26 - "pages/kind/kind",  
27 "pages/logs/logs", 26 "pages/logs/logs",
28 "pages/videoplay/videoplay", 27 "pages/videoplay/videoplay",
29 "pages/jingmei/jingmei", 28 "pages/jingmei/jingmei",
@@ -31,8 +30,8 @@ @@ -31,8 +30,8 @@
31 "pages/pichezi/pichezi", 30 "pages/pichezi/pichezi",
32 "pages/tupianbox/tupianbox", 31 "pages/tupianbox/tupianbox",
33 "pages/yulanfapiao/yulanfapiao", 32 "pages/yulanfapiao/yulanfapiao",
34 - "pages/tousujianyi/tousujianyi"  
35 - 33 + "pages/tousujianyi/tousujianyi",
  34 + "pages/searchsecond/searchsecond"
36 ], 35 ],
37 "window": { 36 "window": {
38 "backgroundTextStyle": "light", 37 "backgroundTextStyle": "light",
@@ -40,38 +39,5 @@ @@ -40,38 +39,5 @@
40 "navigationBarTitleText": "", 39 "navigationBarTitleText": "",
41 "navigationBarTextStyle": "black" 40 "navigationBarTextStyle": "black"
42 }, 41 },
43 - "sitemapLocation": "sitemap.json",  
44 - "tabBar": {  
45 - "selectedColor": "#FB6324",  
46 - "list": [  
47 - {  
48 - "pagePath": "pages/homepage/homepage",  
49 - "text": "首页",  
50 - "selectedColor": "#FB6324",  
51 - "iconPath": "img/shouye.png",  
52 - "selectedIconPath": "img/shouyeactive.png"  
53 - },  
54 - {  
55 - "pagePath": "pages/kind/kind",  
56 - "text": "分类",  
57 - "selectedColor": "#FB6324",  
58 - "iconPath": "img/kind.png",  
59 - "selectedIconPath": "img/kindactive.png"  
60 - },  
61 - {  
62 - "pagePath": "pages/cart/cart",  
63 - "text": "购物车",  
64 - "selectedColor": "#FB6324",  
65 - "iconPath": "img/cart.png",  
66 - "selectedIconPath": "img/cartactive.png"  
67 - },  
68 - {  
69 - "pagePath": "pages/mine/mine",  
70 - "text": "我的",  
71 - "selectedColor": "#FB6324",  
72 - "iconPath": "img/mine.png",  
73 - "selectedIconPath": "img/mineactive.png"  
74 - }  
75 - ]  
76 - } 42 + "sitemapLocation": "sitemap.json"
77 } 43 }
1 /**app.wxss**/ 1 /**app.wxss**/
2 -page{ 2 +
  3 +page {
3 background: #fff; 4 background: #fff;
4 } 5 }
  6 +
5 .container { 7 .container {
6 height: 100%; 8 height: 100%;
7 display: flex; 9 display: flex;
@@ -10,36 +12,38 @@ page{ @@ -10,36 +12,38 @@ page{
10 justify-content: space-between; 12 justify-content: space-between;
11 padding: 200rpx 0; 13 padding: 200rpx 0;
12 box-sizing: border-box; 14 box-sizing: border-box;
13 -}  
14 -image{  
15 - width:100%;  
16 - height:100%;  
17 } 15 }
18 16
19 -.anniu{  
20 - width:80rpx;  
21 - height:80rpx; 17 +image {
  18 + width: 100%;
  19 + height: 100%;
  20 +}
  21 +
  22 +.anniu {
  23 + width: 80rpx;
  24 + height: 80rpx;
22 font-size: 0; 25 font-size: 0;
23 position: absolute; 26 position: absolute;
24 - left:50%;  
25 - top:50%;  
26 - transform: translate(-50%,-50%) 27 + left: 50%;
  28 + top: 50%;
  29 + transform: translate(-50%, -50%);
27 } 30 }
28 -.anniux{  
29 - width:40rpx;  
30 - height:40rpx; 31 +
  32 +.anniux {
  33 + width: 40rpx;
  34 + height: 40rpx;
31 font-size: 0; 35 font-size: 0;
32 position: absolute; 36 position: absolute;
33 - left:50%;  
34 - top:50%;  
35 - transform: translate(-50%,-50%) 37 + left: 50%;
  38 + top: 50%;
  39 + transform: translate(-50%, -50%);
36 } 40 }
37 -.searchsanjiao{  
38 - width:21rpx;  
39 - height:27rpx; 41 +
  42 +.searchsanjiao {
  43 + width: 21rpx;
  44 + height: 27rpx;
40 font-size: 0; 45 font-size: 0;
41 - margin-left:8rpx;  
42 - 46 + margin-left: 8rpx;
43 } 47 }
44 48
45 .xiazairegister { 49 .xiazairegister {
@@ -60,32 +64,32 @@ image{ @@ -60,32 +64,32 @@ image{
60 margin-left: 18rpx; 64 margin-left: 18rpx;
61 } 65 }
62 66
63 -.nodata{  
64 - color:#999; 67 +.nodata {
  68 + color: #999;
65 font-size: 30rpx; 69 font-size: 30rpx;
66 text-align: center; 70 text-align: center;
67 - margin-top:260rpx; 71 + margin-top: 260rpx;
68 } 72 }
69 -.fangdaimg{  
70 - width:32rpx;  
71 - height:32rpx; 73 +
  74 +.fangdaimg {
  75 + width: 32rpx;
  76 + height: 32rpx;
72 font-size: 0; 77 font-size: 0;
73 position: absolute; 78 position: absolute;
74 - bottom:0;  
75 - right:0 79 + bottom: 0;
  80 + right: 0;
76 } 81 }
77 -.xuantype{  
78 - display:flex; 82 +
  83 +.xuantype {
  84 + display: flex;
79 align-items: center; 85 align-items: center;
80 - height:60rpx;  
81 - background: #F9F9F9;  
82 - padding-right:24rpx; 86 + height: 60rpx;
  87 + background: #f9f9f9;
  88 + padding-right: 24rpx;
83 border-radius: 4rpx; 89 border-radius: 4rpx;
84 - margin-left:30rpx;  
85 - 90 + margin-left: 30rpx;
86 } 91 }
87 92
88 -  
89 /* 购买须知 */ 93 /* 购买须知 */
90 94
91 .buybox { 95 .buybox {
@@ -100,36 +104,41 @@ image{ @@ -100,36 +104,41 @@ image{
100 color: #8c9198; 104 color: #8c9198;
101 font-size: 32rpx; 105 font-size: 32rpx;
102 text-align: center; 106 text-align: center;
103 - margin-top:20rpx; 107 + margin-top: 20rpx;
104 } 108 }
105 109
106 .goumiatext { 110 .goumiatext {
107 text-indent: 60rpx; 111 text-indent: 60rpx;
108 - margin-top:20rpx; 112 + margin-top: 20rpx;
109 } 113 }
110 -.text{  
111 - line-height: 1.5 114 +
  115 +.text {
  116 + line-height: 1.5;
112 } 117 }
113 -.gouxuanleft{  
114 - width:36rpx;  
115 - height:36rpx;  
116 - font-size: 0 118 +
  119 +.gouxuanleft {
  120 + width: 36rpx;
  121 + height: 36rpx;
  122 + font-size: 0;
117 } 123 }
118 -.gouxuanleft image{  
119 - width:100%;  
120 - height:100%; 124 +
  125 +.gouxuanleft image {
  126 + width: 100%;
  127 + height: 100%;
121 } 128 }
122 -.gouxuanright{  
123 - color:#5B5E63; 129 +
  130 +.gouxuanright {
  131 + color: #5b5e63;
124 font-size: 28rpx; 132 font-size: 28rpx;
125 - margin-left:20rpx; 133 + margin-left: 20rpx;
126 font-weight: bold; 134 font-weight: bold;
127 } 135 }
128 -.gouxuan{  
129 - display:flex; 136 +
  137 +.gouxuan {
  138 + display: flex;
130 align-items: center; 139 align-items: center;
131 justify-content: center; 140 justify-content: center;
132 - margin-top:20rpx; 141 + margin-top: 20rpx;
133 } 142 }
134 143
135 .quebtn { 144 .quebtn {
@@ -142,8 +151,9 @@ image{ @@ -142,8 +151,9 @@ image{
142 font-size: 32rpx; 151 font-size: 32rpx;
143 text-align: center; 152 text-align: center;
144 line-height: 88rpx; 153 line-height: 88rpx;
145 - margin:40rpx auto 0; 154 + margin: 40rpx auto 0;
146 } 155 }
  156 +
147 .register { 157 .register {
148 width: 100%; 158 width: 100%;
149 height: 100%; 159 height: 100%;
@@ -153,4 +163,74 @@ image{ @@ -153,4 +163,74 @@ image{
153 left: 0; 163 left: 0;
154 right: 0; 164 right: 0;
155 z-index: 999; 165 z-index: 999;
  166 +}
  167 +
  168 +.teacherfooter {
  169 + width: 750rpx;
  170 + display: flex;
  171 + align-items: center;
  172 + justify-content: space-between;
  173 + padding: 18rpx 82rpx;
  174 + box-sizing: border-box;
  175 + position: fixed;
  176 + bottom: 0;
  177 + left: 0;
  178 + background: #fff;
  179 + border-top: 1rpx solid #f5f5f5;
  180 +}
  181 +
  182 +.teacherfootitem {
  183 + display: felx;
  184 + flex-direction: column;
  185 + align-items: center;
  186 + justify-content: center;
  187 +}
  188 +
  189 +.teacherfootitemtop {
  190 + width: 40rpx;
  191 + height: 40rpx;
  192 + font-size: 0;
  193 + margin: 0 auto;
  194 +}
  195 +
  196 +.teacherfootname {
  197 + color: #bdc4ce;
  198 + font-size: 22rpx;
  199 +}
  200 +
  201 +.selactive {
  202 + color: #fb6324;
  203 +}
  204 +
  205 +/* 预约拍摄 */
  206 +
  207 +.crema {
  208 + width: 95rpx;
  209 + height: 95rpx;
  210 + border-radius: 50%;
  211 + background: #fb6324;
  212 + position: fixed;
  213 + bottom: 4rpx;
  214 + left: 50%;
  215 + transform: translateX(-50%);
  216 + display: flex;
  217 + flex-direction: column;
  218 + align-items: center;
  219 + justify-content: center;
  220 + z-index: 999;
  221 +}
  222 +
  223 +.cremaimg {
  224 + width: 42rpx;
  225 + height: 42rpx;
  226 + font-size: 0;
  227 +}
  228 +
  229 +.yuyeu {
  230 + font-size: 20rpx;
  231 + color: #fff;
  232 + margin-top: 2rpx;
  233 +}
  234 +.cremaimgox{
  235 + width:52rpx;
156 } 236 }
@@ -19,7 +19,8 @@ Page({ @@ -19,7 +19,8 @@ Page({
19 hebing: [], 19 hebing: [],
20 delshow: false, 20 delshow: false,
21 video_attr: [], 21 video_attr: [],
22 - goucartid: [] 22 + goucartid: [],
  23 + footersel:3
23 }, 24 },
24 25
25 /** 26 /**
@@ -545,6 +546,28 @@ Page({ @@ -545,6 +546,28 @@ Page({
545 546
546 }, 547 },
547 548
  549 + // 底部导航跳转
  550 + footersel(e) {
  551 + let id = e.currentTarget.dataset.id;
  552 + if (id == 1) {
  553 + wx.navigateTo({
  554 + url: '/pages/homepage/homepage',
  555 + })
  556 + } else if (id == 2) {
  557 + wx.navigateTo({
  558 + url: '/pages/kind/kind',
  559 + })
  560 + } else if (id == 3) {
  561 + wx.navigateTo({
  562 + url: '/pages/cart/cart',
  563 + })
  564 + } else if (id == 4) {
  565 + wx.navigateTo({
  566 + url: '/pages/mine/mine',
  567 + })
  568 + }
  569 + },
  570 +
548 /** 571 /**
549 * 生命周期函数--监听页面初次渲染完成 572 * 生命周期函数--监听页面初次渲染完成
550 */ 573 */
@@ -113,4 +113,39 @@ @@ -113,4 +113,39 @@
113 </view> 113 </view>
114 114
115 <view class="cartfootright" bindtap="hejisuan">合并计算({{totalcartarr.length}})</view> 115 <view class="cartfootright" bindtap="hejisuan">合并计算({{totalcartarr.length}})</view>
  116 +</view>
  117 +
  118 +<!-- 底部导航 -->
  119 +<view class="teacherfooter">
  120 + <view class="teacherfootitem" bindtap="footersel" data-id="1">
  121 + <view class="teacherfootitemtop shou">
  122 + <image src="{{footersel==1?'/img/shouyeactive.png':'/img/shouye.png'}}"></image>
  123 + </view>
  124 + <view class="teacherfootname {{footersel==1?'selactive':''}}">首页</view>
  125 + </view>
  126 +
  127 +
  128 + <view class="teacherfootitem" bindtap="footersel" data-id="2">
  129 + <view class="teacherfootitemtop order">
  130 + <image src="{{footersel==2?'/img/kindactive.png':'/img/kind.png'}}"></image>
  131 + </view>
  132 + <view class="teacherfootname {{footersel==2?'selactive':''}}">分类</view>
  133 + </view>
  134 +
  135 +
  136 + <view class="teacherfootitem" bindtap="footersel" data-id="3">
  137 + <view class="teacherfootitemtop rili">
  138 + <image src=" {{footersel==3?'/img/cartactive.png':'/img/cart.png'}}"></image>
  139 + </view>
  140 + <view class="teacherfootname {{footersel==3?'selactive':''}}">购物车</view>
  141 + </view>
  142 +
  143 +
  144 + <view class="teacherfootitem" bindtap="footersel" data-id="4">
  145 + <view class="teacherfootitemtop show">
  146 + <image src="{{footersel==4?'/img/mineactive.png':'/img/mine.png'}}"></image>
  147 + </view>
  148 + <view class="teacherfootname {{footersel==4?'selactive':''}}">我的</view>
  149 + </view>
  150 +
116 </view> 151 </view>
@@ -196,7 +196,8 @@ Page({ @@ -196,7 +196,8 @@ Page({
196 paySign: res.paySign, 196 paySign: res.paySign,
197 success: function (res) { 197 success: function (res) {
198 console.log(res) 198 console.log(res)
199 - wx.switchTab({ 199 + wx.navigateTo({
  200 +
200 url: '/pages/mine/mine', 201 url: '/pages/mine/mine',
201 }) 202 })
202 203
@@ -66,7 +66,8 @@ Page({ @@ -66,7 +66,8 @@ Page({
66 that.setData({ 66 that.setData({
67 phone:res.tel 67 phone:res.tel
68 }) 68 })
69 - wx.switchTab({ 69 + wx.navigateTo({
  70 +
70 url: '/pages/homepage/homepage', 71 url: '/pages/homepage/homepage',
71 }) 72 })
72 that.bangdingshouji() 73 that.bangdingshouji()
@@ -26,7 +26,8 @@ Page({ @@ -26,7 +26,8 @@ Page({
26 pic:'', 26 pic:'',
27 image:'', 27 image:'',
28 phoneshow:false, 28 phoneshow:false,
29 - phonenum:'' 29 + phonenum:'',
  30 + footersel:1
30 }, 31 },
31 bindPickerChange: function(e) { 32 bindPickerChange: function(e) {
32 console.log('picker发送选择改变，携带值为', e.detail.value) 33 console.log('picker发送选择改变，携带值为', e.detail.value)
@@ -73,7 +74,8 @@ Page({ @@ -73,7 +74,8 @@ Page({
73 // wx.navigateTo({ 74 // wx.navigateTo({
74 // url: '/pages/videobox/videobox', 75 // url: '/pages/videobox/videobox',
75 // }) 76 // })
76 - wx.switchTab({ 77 + wx.navigateTo({
  78 +
77 url: '/pages/kind/kind', 79 url: '/pages/kind/kind',
78 }) 80 })
79 } 81 }
@@ -236,6 +238,30 @@ Page({ @@ -236,6 +238,30 @@ Page({
236 }) 238 })
237 }, 239 },
238 240
  241 + // 底部导航跳转
  242 + footersel(e){
  243 + console.log(34343489)
  244 + let id=e.currentTarget.dataset.id;
  245 + console.log(id)
  246 + if(id==1){
  247 + wx.navigateTo({
  248 + url: '/pages/homepage/homepage',
  249 + })
  250 + }else if(id==2){
  251 + wx.navigateTo({
  252 + url: '/pages/kind/kind',
  253 + })
  254 + }else if(id==3){
  255 + wx.navigateTo({
  256 + url: '/pages/cart/cart',
  257 + })
  258 + }else if(id==4){
  259 + wx.navigateTo({
  260 + url: '/pages/mine/mine',
  261 + })
  262 + }
  263 + },
  264 +
239 265
240 266
241 267
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 </view> 7 </view>
8 </view> 8 </view>
9 9
10 - <view class="search"> 10 + <view class="search" bindtap="gosearch">
11 <picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}"> 11 <picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}">
12 <!-- <view class="picker"> 12 <!-- <view class="picker">
13 当前选择：{{array[index]}} 13 当前选择：{{array[index]}}
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 23
24 <view class="picxian"></view> 24 <view class="picxian"></view>
25 25
26 - <view class="searchright" bindtap="gosearch"> 26 + <view class="searchright" >
27 <view class="searchfightimg"> 27 <view class="searchfightimg">
28 <image src="/img/sousuo.png"></image> 28 <image src="/img/sousuo.png"></image>
29 </view> 29 </view>
@@ -33,10 +33,10 @@ @@ -33,10 +33,10 @@
33 </view> 33 </view>
34 34
35 <div class="wrapper"> 35 <div class="wrapper">
36 - <div class="circle"> 36 + <div class="circle">
37 <image src="/img/hand.png"></image> 37 <image src="/img/hand.png"></image>
38 - </div>  
39 - <!-- <div class="finger"> 38 + </div>
  39 + <!-- <div class="finger">
40 <image src="/img/shou2.png"></image> 40 <image src="/img/shou2.png"></image>
41 </div> --> 41 </div> -->
42 </div> 42 </div>
@@ -67,24 +67,62 @@ @@ -67,24 +67,62 @@
67 67
68 </view> 68 </view>
69 69
70 -<view class="crema" bindtap="yuyue">  
71 - <view class="cremaimg">  
72 - <image src="/img/crema.png"></image>  
73 - </view>  
74 70
75 - <view class='yuyeu'>预约</view>  
76 - <view class='yuyeu'>拍摄素材</view>  
77 -</view>  
78 71
79 <!-- 预留电话 --> 72 <!-- 预留电话 -->
80 <view class="register" wx:if="{{phoneshow}}" bindtap="hidewrap"> 73 <view class="register" wx:if="{{phoneshow}}" bindtap="hidewrap">
81 74
82 - <view class="phonewrap" catchtap='enter'>  
83 - <view class="phonename">请输入您的手机号</view>  
84 - <view class="phoneenter">  
85 - <input placeholder='请输入手机号' bindinput="enterphone" type="number"/>  
86 - </view> 75 + <view class="phonewrap" catchtap='enter'>
  76 + <view class="phonename">请输入您的手机号</view>
  77 + <view class="phoneenter">
  78 + <input placeholder='请输入手机号' bindinput="enterphone" type="number" />
  79 + </view>
  80 +
  81 + <view class="surebtn" bindtap="surebtn">确定</view>
  82 + </view>
  83 +</view>
  84 +
  85 + <view class="crema" bindtap="yuyue">
  86 + <view class="cremaimg">
  87 + <image src="/img/crema.png"></image>
  88 + </view>
  89 +
  90 +
  91 + <!-- <view class='yuyeu'>预约</view> -->
  92 + <view class='yuyeu'>预约拍摄</view>
  93 + </view>
87 94
88 - <view class="surebtn" bindtap="surebtn">确定</view> 95 +<!-- 底部导航 -->
  96 +<view class="teacherfooter">
  97 + <view class="teacherfootitem" bindtap="footersel" data-id="1">
  98 + <view class="teacherfootitemtop shou">
  99 + <image src="{{footersel==1?'/img/shouyeactive.png':'/img/shouye.png'}}"></image>
89 </view> 100 </view>
  101 + <view class="teacherfootname {{footersel==1?'selactive':''}}">首页</view>
  102 + </view>
  103 +
  104 +
  105 + <view class="teacherfootitem" bindtap="footersel" data-id="2">
  106 + <view class="teacherfootitemtop order">
  107 + <image src="{{footersel==2?'/img/kindactive.png':'/img/kind.png'}}"></image>
  108 + </view>
  109 + <view class="teacherfootname {{footersel==2?'selactive':''}}">分类</view>
  110 + </view>
  111 +<view class="cremaimgox"></view>
  112 +
  113 + <view class="teacherfootitem" bindtap="footersel" data-id="3">
  114 + <view class="teacherfootitemtop rili">
  115 + <image src=" {{footersel==3?'/img/cartactive.png':'/img/cart.png'}}"></image>
  116 + </view>
  117 + <view class="teacherfootname {{footersel==3?'selactive':''}}">购物车</view>
  118 + </view>
  119 +
  120 +
  121 + <view class="teacherfootitem" bindtap="footersel" data-id="4">
  122 + <view class="teacherfootitemtop show">
  123 + <image src="{{footersel==4?'/img/mineactive.png':'/img/mine.png'}}"></image>
  124 + </view>
  125 + <view class="teacherfootname {{footersel==4?'selactive':''}}">我的</view>
  126 + </view>
  127 +
90 </view> 128 </view>
@@ -35,7 +35,7 @@ page { @@ -35,7 +35,7 @@ page {
35 } 35 }
36 36
37 .searchright { 37 .searchright {
38 - width:440rpx; 38 + width:369rpx;
39 display: flex; 39 display: flex;
40 align-items: center; 40 align-items: center;
41 margin-left: 36rpx; 41 margin-left: 36rpx;
@@ -55,17 +55,17 @@ page { @@ -55,17 +55,17 @@ page {
55 } 55 }
56 56
57 .searchrightname { 57 .searchrightname {
58 - width:378rpx; 58 + width:285rpx;
59 margin-left: 22rpx; 59 margin-left: 22rpx;
60 color: #8c9198; 60 color: #8c9198;
61 - font-size: 28rpx; 61 + font-size: 30rpx;
62 } 62 }
63 .searchrightname input{ 63 .searchrightname input{
64 width:100%; 64 width:100%;
65 } 65 }
66 .searchleftname { 66 .searchleftname {
67 color: #8c9198; 67 color: #8c9198;
68 - font-size: 28rpx; 68 + font-size: 32rpx;
69 } 69 }
70 70
71 .searchimg { 71 .searchimg {
@@ -82,7 +82,7 @@ page { @@ -82,7 +82,7 @@ page {
82 82
83 .searchbox { 83 .searchbox {
84 margin-top: 48rpx; 84 margin-top: 48rpx;
85 - padding-bottom: 80rpx; 85 + padding-bottom: 120rpx;
86 } 86 }
87 87
88 .searchvideoimg { 88 .searchvideoimg {
@@ -99,23 +99,24 @@ page { @@ -99,23 +99,24 @@ page {
99 } 99 }
100 100
101 .crema { 101 .crema {
102 - width: 145rpx;  
103 - height: 145rpx; 102 + width: 95rpx;
  103 + height: 95rpx;
104 border-radius: 50%; 104 border-radius: 50%;
105 background: #fb6324; 105 background: #fb6324;
106 position: fixed; 106 position: fixed;
107 - bottom: 20rpx; 107 + bottom: 4rpx;
108 left: 50%; 108 left: 50%;
109 transform: translateX(-50%); 109 transform: translateX(-50%);
110 display: flex; 110 display: flex;
111 flex-direction: column; 111 flex-direction: column;
112 align-items: center; 112 align-items: center;
113 justify-content: center; 113 justify-content: center;
  114 + z-index:999
114 } 115 }
115 116
116 .cremaimg { 117 .cremaimg {
117 - width: 60rpx;  
118 - height: 60rpx; 118 + width: 42rpx;
  119 + height: 42rpx;
119 font-size: 0; 120 font-size: 0;
120 } 121 }
121 122
@@ -199,8 +200,8 @@ page { @@ -199,8 +200,8 @@ page {
199 top: 8rpx; 200 top: 8rpx;
200 /* transform: translate(-50%,-50%); */ 201 /* transform: translate(-50%,-50%); */
201 /* background: url("https://areial.w.broing.cn/uploads/20191120/hand.png") center center no-repeat; */ 202 /* background: url("https://areial.w.broing.cn/uploads/20191120/hand.png") center center no-repeat; */
202 - width: 40rpx;  
203 - height: 42rpx; 203 + width: 50rpx;
  204 + height: 48rpx;
204 font-size: 0; 205 font-size: 0;
205 animation: circleHide 1s ease infinite both; 206 animation: circleHide 1s ease infinite both;
206 } 207 }
@@ -78,7 +78,8 @@ Page({ @@ -78,7 +78,8 @@ Page({
78 78
79 }).catch((errMsg) => { 79 }).catch((errMsg) => {
80 console.log(errMsg) 80 console.log(errMsg)
81 - wx.switchTab({ 81 + wx.navigateTo({
  82 +
82 url: '/pages/homepage/homepage', 83 url: '/pages/homepage/homepage',
83 }) 84 })
84 }) 85 })
@@ -87,7 +88,8 @@ Page({ @@ -87,7 +88,8 @@ Page({
87 }); 88 });
88 } else { 89 } else {
89 console.log("未授权=====") 90 console.log("未授权=====")
90 - wx.switchTab({ 91 + wx.navigateTo({
  92 +
91 url: '/pages/homepage/homepage', 93 url: '/pages/homepage/homepage',
92 }) 94 })
93 } 95 }
@@ -7,7 +7,8 @@ Page({ @@ -7,7 +7,8 @@ Page({
7 * 页面的初始数据 7 * 页面的初始数据
8 */ 8 */
9 data: { 9 data: {
10 - zonelist: [] 10 + zonelist: [],
  11 + footersel:2
11 }, 12 },
12 13
13 /** 14 /**
@@ -87,6 +88,28 @@ Page({ @@ -87,6 +88,28 @@ Page({
87 88
88 }, 89 },
89 90
  91 + // 底部导航跳转
  92 + footersel(e) {
  93 + let id = e.currentTarget.dataset.id;
  94 + if (id == 1) {
  95 + wx.navigateTo({
  96 + url: '/pages/homepage/homepage',
  97 + })
  98 + } else if (id == 2) {
  99 + wx.navigateTo({
  100 + url: '/pages/kind/kind',
  101 + })
  102 + } else if (id == 3) {
  103 + wx.navigateTo({
  104 + url: '/pages/cart/cart',
  105 + })
  106 + } else if (id == 4) {
  107 + wx.navigateTo({
  108 + url: '/pages/mine/mine',
  109 + })
  110 + }
  111 + },
  112 +
90 /** 113 /**
91 * 生命周期函数--监听页面卸载 114 * 生命周期函数--监听页面卸载
92 */ 115 */
1 -<view class="kindbox" > 1 +<view class="kindbox">
2 <view class="kinditem" wx:for="{{zonelist}}" wx:key="" bindtap="gopic" data-index="{{index}}" data-id="{{item.id}}" data-areaname="{{item.area_name}}"> 2 <view class="kinditem" wx:for="{{zonelist}}" wx:key="" bindtap="gopic" data-index="{{index}}" data-id="{{item.id}}" data-areaname="{{item.area_name}}">
3 - <view class="kindtopimg">  
4 - <image src="{{item.thumbnail}}"></image> 3 + <view class="kindtopimg">
  4 + <image src="{{item.thumbnail}}"></image>
5 5
6 - <!-- <view class="anniu"> 6 + <!-- <view class="anniu">
7 <image src="/img/anniu.png"></image> 7 <image src="/img/anniu.png"></image>
8 </view> --> 8 </view> -->
9 - </view>  
10 - <view class="kindname">{{item.area_name}}</view> 9 + </view>
  10 + <view class="kindname">{{item.area_name}}</view>
11 </view> 11 </view>
12 </view> 12 </view>
  13 +<!-- 预约拍摄 -->
  14 +<view class="crema" bindtap="yuyue">
  15 + <view class="cremaimg">
  16 + <image src="/img/crema.png"></image>
  17 + </view>
  18 +
  19 +
  20 + <!-- <view class='yuyeu'>预约</view> -->
  21 + <view class='yuyeu'>预约拍摄</view>
  22 + </view>
  23 +
  24 +<!-- 底部导航 -->
  25 +<view class="teacherfooter">
  26 + <view class="teacherfootitem" bindtap="footersel" data-id="1">
  27 + <view class="teacherfootitemtop shou">
  28 + <image src="{{footersel==1?'/img/shouyeactive.png':'/img/shouye.png'}}"></image>
  29 + </view>
  30 + <view class="teacherfootname {{footersel==1?'selactive':''}}">首页</view>
  31 + </view>
  32 +
  33 +
  34 + <view class="teacherfootitem" bindtap="footersel" data-id="2">
  35 + <view class="teacherfootitemtop order">
  36 + <image src="{{footersel==2?'/img/kindactive.png':'/img/kind.png'}}"></image>
  37 + </view>
  38 + <view class="teacherfootname {{footersel==2?'selactive':''}}">分类</view>
  39 + </view>
  40 +
  41 +<view class="cremaimgox"></view>
  42 + <view class="teacherfootitem" bindtap="footersel" data-id="3">
  43 + <view class="teacherfootitemtop rili">
  44 + <image src=" {{footersel==3?'/img/cartactive.png':'/img/cart.png'}}"></image>
  45 + </view>
  46 + <view class="teacherfootname {{footersel==3?'selactive':''}}">购物车</view>
  47 + </view>
  48 +
  49 +
  50 + <view class="teacherfootitem" bindtap="footersel" data-id="4">
  51 + <view class="teacherfootitemtop show">
  52 + <image src="{{footersel==4?'/img/mineactive.png':'/img/mine.png'}}"></image>
  53 + </view>
  54 + <view class="teacherfootname {{footersel==4?'selactive':''}}">我的</view>
  55 + </view>
  56 +
  57 +</view>
@@ -9,7 +9,8 @@ Page({ @@ -9,7 +9,8 @@ Page({
9 myinfo: '', 9 myinfo: '',
10 type:'', 10 type:'',
11 cancelorder:false, 11 cancelorder:false,
12 - kai: 1 12 + kai: 1,
  13 + footersel:4
13 14
14 }, 15 },
15 16
@@ -19,6 +20,28 @@ Page({ @@ -19,6 +20,28 @@ Page({
19 onLoad: function(options) { 20 onLoad: function(options) {
20 21
21 }, 22 },
  23 +
  24 + // 底部导航跳转
  25 + footersel(e) {
  26 + let id = e.currentTarget.dataset.id;
  27 + if (id == 1) {
  28 + wx.navigateTo({
  29 + url: '/pages/homepage/homepage',
  30 + })
  31 + } else if (id == 2) {
  32 + wx.navigateTo({
  33 + url: '/pages/kind/kind',
  34 + })
  35 + } else if (id == 3) {
  36 + wx.navigateTo({
  37 + url: '/pages/cart/cart',
  38 + })
  39 + } else if (id == 4) {
  40 + wx.navigateTo({
  41 + url: '/pages/mine/mine',
  42 + })
  43 + }
  44 + },
22 // 申请开发票 45 // 申请开发票
23 applayfapiao(){ 46 applayfapiao(){
24 this.setData({ 47 this.setData({
@@ -132,4 +132,39 @@ @@ -132,4 +132,39 @@
132 <image src="/img/yourow.png"></image> 132 <image src="/img/yourow.png"></image>
133 </view> 133 </view>
134 </view> --> 134 </view> -->
  135 +</view>
  136 +
  137 +<!-- 底部导航 -->
  138 +<view class="teacherfooter">
  139 + <view class="teacherfootitem" bindtap="footersel" data-id="1">
  140 + <view class="teacherfootitemtop shou">
  141 + <image src="{{footersel==1?'/img/shouyeactive.png':'/img/shouye.png'}}"></image>
  142 + </view>
  143 + <view class="teacherfootname {{footersel==1?'selactive':''}}">首页</view>
  144 + </view>
  145 +
  146 +
  147 + <view class="teacherfootitem" bindtap="footersel" data-id="2">
  148 + <view class="teacherfootitemtop order">
  149 + <image src="{{footersel==2?'/img/kindactive.png':'/img/kind.png'}}"></image>
  150 + </view>
  151 + <view class="teacherfootname {{footersel==2?'selactive':''}}">分类</view>
  152 + </view>
  153 +
  154 +
  155 + <view class="teacherfootitem" bindtap="footersel" data-id="3">
  156 + <view class="teacherfootitemtop rili">
  157 + <image src=" {{footersel==3?'/img/cartactive.png':'/img/cart.png'}}"></image>
  158 + </view>
  159 + <view class="teacherfootname {{footersel==3?'selactive':''}}">购物车</view>
  160 + </view>
  161 +
  162 +
  163 + <view class="teacherfootitem" bindtap="footersel" data-id="4">
  164 + <view class="teacherfootitemtop show">
  165 + <image src="{{footersel==4?'/img/mineactive.png':'/img/mine.png'}}"></image>
  166 + </view>
  167 + <view class="teacherfootname {{footersel==4?'selactive':''}}">我的</view>
  168 + </view>
  169 +
135 </view> 170 </view>
@@ -997,7 +997,8 @@ Page({ @@ -997,7 +997,8 @@ Page({
997 onUnload: function() { 997 onUnload: function() {
998 998
999 if (this.data.jump == 1) { 999 if (this.data.jump == 1) {
1000 - wx.switchTab({ 1000 + wx.navigateTo({
  1001 +
1001 url: '/pages/homepage/homepage', 1002 url: '/pages/homepage/homepage',
1002 }) 1003 })
1003 } 1004 }
@@ -311,8 +311,6 @@ Page({ @@ -311,8 +311,6 @@ Page({
311 let that = this; 311 let that = this;
312 wx.downloadFile({ 312 wx.downloadFile({
313 url: that.data.picdetail.water_url, 313 url: that.data.picdetail.water_url,
314 -  
315 -  
316 success: function(res) { 314 success: function(res) {
317 console.log('下载图片下载图片下载图片', res) 315 console.log('下载图片下载图片下载图片', res)
318 var tempFilePath = res.tempFilePath 316 var tempFilePath = res.tempFilePath
@@ -325,9 +323,7 @@ Page({ @@ -325,9 +323,7 @@ Page({
325 that.setData({ 323 that.setData({
326 water_url: res.savedFilePath 324 water_url: res.savedFilePath
327 }) 325 })
328 -  
329 console.log('123456855555555', that.data.water_url) 326 console.log('123456855555555', that.data.water_url)
330 -  
331 }, //可以将saveFilePath写入到页面数据中 327 }, //可以将saveFilePath写入到页面数据中
332 fail: function(res) { 328 fail: function(res) {
333 console.log('失败', res) 329 console.log('失败', res)
@@ -661,7 +657,8 @@ Page({ @@ -661,7 +657,8 @@ Page({
661 657
662 // 加入购物车 658 // 加入购物车
663 cart() { 659 cart() {
664 - wx.switchTab({ 660 + wx.navigateTo({
  661 +
665 url: '/pages/cart/cart', 662 url: '/pages/cart/cart',
666 }) 663 })
667 }, 664 },
@@ -85,10 +85,13 @@ @@ -85,10 +85,13 @@
85 </view> 85 </view>
86 <!-- 搜素图片 --> 86 <!-- 搜素图片 -->
87 <view class="searchimglist" wx:if="{{searchresult}}"> 87 <view class="searchimglist" wx:if="{{searchresult}}">
88 -  
89 - <view class="searchimgitem" wx:for="{{searcharr}}" wx:key='' bindtap="gopic" data-id="{{item.id}}">  
90 - <image src="{{item.thumbnail}}"></image> 88 + <view wx:for="{{searcharr}}" wx:key='' bindtap="gopic" data-id="{{item.id}}">
  89 + <view class="searchimgitem">
  90 + <image src="{{item.thumbnail}}"></image>
  91 + </view>
  92 + <view class="title">{{item.title}}</view>
91 </view> 93 </view>
  94 +
92 </view> 95 </view>
93 <view wx:else> 96 <view wx:else>
94 <view class="picdetailbox" wx:if="{{xuzhi==false}}"> 97 <view class="picdetailbox" wx:if="{{xuzhi==false}}">
@@ -362,4 +362,21 @@ @@ -362,4 +362,21 @@
362 } 362 }
363 .searchimglist{ 363 .searchimglist{
364 margin-bottom:50rpx; 364 margin-bottom:50rpx;
  365 +}
  366 +
  367 +.title {
  368 + width: 702rpx;
  369 + height: 74rpx;
  370 + background: #fff;
  371 + line-height: 74rpx;
  372 + border-bottom-left-radius: 4rpx;
  373 + border-bottom-right-radius: 4rpx;
  374 + text-align: center;
  375 + color: #3d444d;
  376 + font-size: 28rpx;
  377 + overflow: hidden;
  378 + text-overflow: ellipsis;
  379 + white-space: nowrap;
  380 + margin-bottom: 24rpx;
  381 + margin-right: 12rpx;
365 } 382 }
@@ -22,9 +22,9 @@ Page({ @@ -22,9 +22,9 @@ Page({
22 addressarr: [], 22 addressarr: [],
23 textarr: [], 23 textarr: [],
24 pricearr: [], 24 pricearr: [],
25 - selad:-1,  
26 - selte:-1,  
27 - selword:-1 25 + selad: -1,
  26 + selte: -1,
  27 + selword: -1
28 }, 28 },
29 29
30 30
@@ -34,14 +34,14 @@ Page({ @@ -34,14 +34,14 @@ Page({
34 */ 34 */
35 onLoad: function(options) { 35 onLoad: function(options) {
36 console.log(options) 36 console.log(options)
37 - if (options.index!=undefined){ 37 + if (options.index != undefined) {
38 this.setData({ 38 this.setData({
39 index: options.index, 39 index: options.index,
40 type_id: Number(options.index) + 1 40 type_id: Number(options.index) + 1
41 }) 41 })
42 } 42 }
43 43
44 - 44 +
45 this.getkeywordlist() 45 this.getkeywordlist()
46 }, 46 },
47 47
@@ -54,8 +54,29 @@ Page({ @@ -54,8 +54,29 @@ Page({
54 page: 1, 54 page: 1,
55 searcharr: [], 55 searcharr: [],
56 show: true, 56 show: true,
57 - sousuoword: true 57 + sousuoword: true,
  58 + addressarr: [],
  59 + textarr: [],
  60 + pricearr: [],
  61 + })
  62 + this.data.address.forEach(function(value,index,array){
  63 + value.sel=false
  64 + })
  65 + this.data.text.forEach(function (value, index, array) {
  66 + value.sel = false
58 }) 67 })
  68 + this.data.price.forEach(function (value, index, array) {
  69 + value.sel = false
  70 + })
  71 + this.setData({
  72 + address: this.data.address,
  73 + price: this.data.price,
  74 + text: this.data.text
  75 + })
  76 + console.log(this.data.address)
  77 + console.log(this.data.price)
  78 + console.log(this.data.text)
  79 +
59 }, 80 },
60 81
61 // 获取关键字列表 82 // 获取关键字列表
@@ -89,12 +110,12 @@ Page({ @@ -89,12 +110,12 @@ Page({
89 newarr.push(obj) 110 newarr.push(obj)
90 }) 111 })
91 that.setData({ 112 that.setData({
92 - address:that.data.address,  
93 - text:that.data.text,  
94 - price:newarr 113 + address: that.data.address,
  114 + text: that.data.text,
  115 + price: newarr
95 }) 116 })
96 117
97 - console.log(that.data.address,that.data.text,that.data.price) 118 + console.log(that.data.address, that.data.text, that.data.price)
98 119
99 }).catch((err) => { 120 }).catch((err) => {
100 121
@@ -103,19 +124,19 @@ Page({ @@ -103,19 +124,19 @@ Page({
103 124
104 // 搜素地名关键字 125 // 搜素地名关键字
105 seladdress(e) { 126 seladdress(e) {
106 - let that=this;  
107 -  
108 - let id=e.currentTarget.dataset.id;  
109 - let index=e.currentTarget.dataset.index;  
110 - that.data.address.forEach(function(value,indexk,array){  
111 - if(id==value.id){  
112 - value.sel=!value.sel;  
113 - if(value.sel==true){ 127 + let that = this;
  128 +
  129 + let id = e.currentTarget.dataset.id;
  130 + let index = e.currentTarget.dataset.index;
  131 + that.data.address.forEach(function(value, indexk, array) {
  132 + if (id == value.id) {
  133 + value.sel = !value.sel;
  134 + if (value.sel == true) {
114 that.data.addressarr.push(value.id) 135 that.data.addressarr.push(value.id)
115 - }else{  
116 - that.data.addressarr.forEach(function(value,indexl,array){  
117 - if(id==value){  
118 - that.data.addressarr.splice(indexl,1) 136 + } else {
  137 + that.data.addressarr.forEach(function(value, indexl, array) {
  138 + if (id == value) {
  139 + that.data.addressarr.splice(indexl, 1)
119 } 140 }
120 }) 141 })
121 } 142 }
@@ -123,23 +144,43 @@ Page({ @@ -123,23 +144,43 @@ Page({
123 }) 144 })
124 145
125 that.setData({ 146 that.setData({
126 - address:that.data.address,  
127 - addressarr:that.data.addressarr 147 + address: that.data.address,
  148 + addressarr: that.data.addressarr
  149 + })
  150 +
  151 + app.globalData.addressarr = this.data.addressarr;
  152 +
  153 + app.globalData.textarr = this.data.textarr;
  154 + app.globalData.pricearr = this.data.pricearr;
  155 + app.globalData.keyword = this.data.keyword;
  156 + app.globalData.type_id = this.data.type_id;
  157 + app.globalData.index = this.data.index;
  158 + wx.navigateTo({
  159 + url: '/pages/searchsecond/searchsecond',
128 }) 160 })
  161 +
  162 +
  163 + // this.setData({
  164 + // page: 1,
  165 + // searcharr: [],
  166 + // sousuoword: false
  167 + // })
  168 +
  169 + // this.getsousuo();
129 }, 170 },
130 171
131 // 搜索内容关键词 172 // 搜索内容关键词
132 - seltext(e){ 173 + seltext(e) {
133 let that = this; 174 let that = this;
134 let id = e.currentTarget.dataset.id; 175 let id = e.currentTarget.dataset.id;
135 let index = e.currentTarget.dataset.index; 176 let index = e.currentTarget.dataset.index;
136 - that.data.text.forEach(function (value, indexk, array) { 177 + that.data.text.forEach(function(value, indexk, array) {
137 if (id == value.id) { 178 if (id == value.id) {
138 value.sel = !value.sel; 179 value.sel = !value.sel;
139 if (value.sel == true) { 180 if (value.sel == true) {
140 that.data.textarr.push(value.id) 181 that.data.textarr.push(value.id)
141 } else { 182 } else {
142 - that.data.textarr.forEach(function (value, indexl, array) { 183 + that.data.textarr.forEach(function(value, indexl, array) {
143 if (id == value) { 184 if (id == value) {
144 that.data.textarr.splice(indexl, 1) 185 that.data.textarr.splice(indexl, 1)
145 } 186 }
@@ -152,27 +193,46 @@ Page({ @@ -152,27 +193,46 @@ Page({
152 text: that.data.text, 193 text: that.data.text,
153 textarr: that.data.textarr 194 textarr: that.data.textarr
154 }) 195 })
  196 + app.globalData.addressarr = this.data.addressarr;
  197 +
  198 + app.globalData.textarr = this.data.textarr;
  199 + app.globalData.pricearr = this.data.pricearr;
  200 + app.globalData.keyword = this.data.keyword;
  201 + app.globalData.type_id = this.data.type_id;
  202 + app.globalData.index = this.data.index;
  203 + wx.navigateTo({
  204 + url: '/pages/searchsecond/searchsecond',
  205 + })
  206 +
  207 +
  208 + // this.setData({
  209 + // page: 1,
  210 + // searcharr: [],
  211 + // sousuoword: false
  212 + // })
  213 +
  214 + // this.getsousuo();
155 215
156 console.log(that.data.text); 216 console.log(that.data.text);
157 console.log(that.data.textarr) 217 console.log(that.data.textarr)
158 }, 218 },
159 219
160 // 搜索价格关键词 220 // 搜索价格关键词
161 - selprice(e){ 221 + selprice(e) {
162 let that = this; 222 let that = this;
163 console.log(that.data.price) 223 console.log(that.data.price)
164 - let price=e.currentTarget.dataset.price; 224 + let price = e.currentTarget.dataset.price;
165 console.log(price) 225 console.log(price)
166 let index = e.currentTarget.dataset.index; 226 let index = e.currentTarget.dataset.index;
167 - that.data.price.forEach(function (value, indexk, array) {  
168 - 227 + that.data.price.forEach(function(value, indexk, array) {
  228 +
169 if (price == value.name) { 229 if (price == value.name) {
170 console.log(value.name) 230 console.log(value.name)
171 value.sel = !value.sel; 231 value.sel = !value.sel;
172 if (value.sel == true) { 232 if (value.sel == true) {
173 that.data.pricearr.push(value.name) 233 that.data.pricearr.push(value.name)
174 } else { 234 } else {
175 - that.data.pricearr.forEach(function (value, indexl, array) { 235 + that.data.pricearr.forEach(function(value, indexl, array) {
176 if (price == value) { 236 if (price == value) {
177 that.data.pricearr.splice(indexl, 1) 237 that.data.pricearr.splice(indexl, 1)
178 } 238 }
@@ -185,8 +245,25 @@ Page({ @@ -185,8 +245,25 @@ Page({
185 price: that.data.price, 245 price: that.data.price,
186 pricearr: that.data.pricearr 246 pricearr: that.data.pricearr
187 }) 247 })
  248 + app.globalData.addressarr = this.data.addressarr;
  249 +
  250 + app.globalData.textarr = this.data.textarr;
  251 + app.globalData.pricearr = this.data.pricearr;
  252 + app.globalData.keyword = this.data.keyword;
  253 + app.globalData.type_id = this.data.type_id;
  254 + app.globalData.index = this.data.index;
  255 + wx.navigateTo({
  256 + url: '/pages/searchsecond/searchsecond',
  257 + })
  258 +
  259 + // this.setData({
  260 + // page: 1,
  261 + // searcharr: [],
  262 + // sousuoword: false
  263 + // })
  264 +
  265 + // this.getsousuo();
188 266
189 -  
190 }, 267 },
191 268
192 269
@@ -213,6 +290,17 @@ Page({ @@ -213,6 +290,17 @@ Page({
213 290
214 }, 291 },
215 sousuo() { 292 sousuo() {
  293 + app.globalData.addressarr = this.data.addressarr;
  294 +
  295 + app.globalData.textarr = this.data.textarr;
  296 + app.globalData.pricearr = this.data.pricearr;
  297 + app.globalData.keyword = this.data.keyword;
  298 + app.globalData.type_id = this.data.type_id;
  299 + app.globalData.index = this.data.index;
  300 + wx.navigateTo({
  301 + url: '/pages/searchsecond/searchsecond',
  302 + })
  303 +
216 304
217 // if (this.data.keyword == '') { 305 // if (this.data.keyword == '') {
218 // wx.showToast({ 306 // wx.showToast({
@@ -220,16 +308,16 @@ Page({ @@ -220,16 +308,16 @@ Page({
220 // icon: 'none' 308 // icon: 'none'
221 // }) 309 // })
222 // } else { 310 // } else {
223 - 311 +
224 312
225 // } 313 // }
226 - this.setData({  
227 - page: 1,  
228 - searcharr: [],  
229 - sousuoword: false  
230 - }) 314 + // this.setData({
  315 + // page: 1,
  316 + // searcharr: [],
  317 + // sousuoword: false
  318 + // })
231 319
232 - this.getsousuo(); 320 + // this.getsousuo();
233 }, 321 },
234 322
235 323
@@ -242,9 +330,9 @@ Page({ @@ -242,9 +330,9 @@ Page({
242 let param = { 330 let param = {
243 type_id: that.data.type_id, 331 type_id: that.data.type_id,
244 keyword: that.data.keyword, 332 keyword: that.data.keyword,
245 - address:that.data.addressarr,  
246 - price:that.data.pricearr,  
247 - text:that.data.textarr, 333 + address: that.data.addressarr,
  334 + price: that.data.pricearr,
  335 + text: that.data.textarr,
248 page: that.data.page, 336 page: that.data.page,
249 pageNum: 10 337 pageNum: 10
250 } 338 }
@@ -326,7 +414,26 @@ Page({ @@ -326,7 +414,26 @@ Page({
326 * 生命周期函数--监听页面显示 414 * 生命周期函数--监听页面显示
327 */ 415 */
328 onShow: function() { 416 onShow: function() {
329 - 417 + this.data.address.forEach(function (value, index, array) {
  418 + value.sel = false
  419 + })
  420 + this.data.text.forEach(function (value, index, array) {
  421 + value.sel = false
  422 + })
  423 + this.data.price.forEach(function (value, index, array) {
  424 + value.sel = false
  425 + })
  426 + this.setData({
  427 + address: this.data.address,
  428 + price: this.data.price,
  429 + text: this.data.text,
  430 + keyword:'',
  431 + textarr:[],
  432 + addressarr:[],
  433 + pricearr:[],
  434 + type_id:1,
  435 + index:0
  436 + })
330 }, 437 },
331 438
332 /** 439 /**
@@ -340,7 +447,10 @@ Page({ @@ -340,7 +447,10 @@ Page({
340 * 生命周期函数--监听页面卸载 447 * 生命周期函数--监听页面卸载
341 */ 448 */
342 onUnload: function() { 449 onUnload: function() {
343 - 450 + // wx.redirectTo({
  451 + // url: '/pages/search/search',
  452 + // })
  453 + // wx.navigateBack
344 }, 454 },
345 455
346 /** 456 /**
@@ -354,13 +464,16 @@ Page({ @@ -354,13 +464,16 @@ Page({
354 * 页面上拉触底事件的处理函数 464 * 页面上拉触底事件的处理函数
355 */ 465 */
356 onReachBottom: function() { 466 onReachBottom: function() {
357 - let newpage = this.data.page;  
358 - newpage++;  
359 - this.setData({  
360 - page: newpage  
361 - }) 467 + if (this.data.show == false) {
  468 + let newpage = this.data.page;
  469 + newpage++;
  470 + this.setData({
  471 + page: newpage
  472 + })
  473 +
  474 + this.getsousuo()
  475 + }
362 476
363 - this.getsousuo()  
364 477
365 }, 478 },
366 479
@@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
13 <view class="searchsanjiao"> 13 <view class="searchsanjiao">
14 <image src='/img/sanjiaodown.png'></image> 14 <image src='/img/sanjiaodown.png'></image>
15 </view> 15 </view>
  16 +
16 </view> 17 </view>
17 18
18 <!-- <view class="searchleft"> 19 <!-- <view class="searchleft">
@@ -31,7 +32,7 @@ @@ -31,7 +32,7 @@
31 <image src="/img/sousuo.png"></image> 32 <image src="/img/sousuo.png"></image>
32 </view> 33 </view>
33 <view class="searchrightname"> 34 <view class="searchrightname">
34 - <input placeholder='不同的搜索内容用空格隔开' bindinput='enterword' bindblur='shuru' /> 35 + <input placeholder='不同的搜索内容用空格隔开' bindinput='enterword' bindblur='shuru' value="{{keyword}}"/>
35 </view> 36 </view>
36 </view> 37 </view>
37 </view> 38 </view>
@@ -79,14 +80,23 @@ @@ -79,14 +80,23 @@
79 <view class="searchlist" wx:if="{{showlist==1}}"> 80 <view class="searchlist" wx:if="{{showlist==1}}">
80 81
81 <view class="searchlistbox"> 82 <view class="searchlistbox">
82 - <view class="searchboximg" wx:for="{{searcharr}}" wx:key='' bindtap="govideo" data-url="{{item.video}}" data-id="{{item.id}}">  
83 - <image src="{{item.thumbnail}}"></image>  
84 83
85 - <view class="anniu">  
86 - <image src="/img/anniu.png"></image> 84 + <view wx:for="{{searcharr}}" wx:key='' bindtap="govideo" data-url="{{item.video}}" data-id="{{item.id}}">
  85 + <view class="searchboximg">
  86 + <image src="{{item.thumbnail}}"></image>
  87 +
  88 + <view class="anniu">
  89 + <image src="/img/anniu.png"></image>
  90 + </view>
  91 +
  92 +
87 </view> 93 </view>
  94 + <view class="picboxname">{{item.title}}</view>
88 </view> 95 </view>
89 96
  97 +
  98 +
  99 +
90 </view> 100 </view>
91 101
92 102
@@ -97,9 +107,15 @@ @@ -97,9 +107,15 @@
97 <!-- 搜素图片 --> 107 <!-- 搜素图片 -->
98 <view class="searchimglist" wx:if="{{showlist==2}}"> 108 <view class="searchimglist" wx:if="{{showlist==2}}">
99 109
100 - <view class="searchimgitem" wx:for="{{searcharr}}" wx:key='' bindtap="gopic" data-id="{{item.id}}">  
101 - <image src="{{item.thumbnail}}"></image> 110 + <view wx:for="{{searcharr}}" wx:key='' bindtap="gopic" data-id="{{item.id}}">
  111 + <view class="searchimgitem">
  112 + <image src="{{item.thumbnail}}"></image>
  113 +
  114 + </view>
  115 + <view class="picboxname">{{item.title}}</view>
102 </view> 116 </view>
  117 +
  118 +
103 </view> 119 </view>
104 <!-- 搜素精美大片 --> 120 <!-- 搜素精美大片 -->
105 <view class="searchlist" wx:if="{{showlist==3}}"> 121 <view class="searchlist" wx:if="{{showlist==3}}">
@@ -111,7 +127,9 @@ @@ -111,7 +127,9 @@
111 <view class="anniu"> 127 <view class="anniu">
112 <image src="/img/anniu.png"></image> 128 <image src="/img/anniu.png"></image>
113 </view> 129 </view>
  130 +
114 </view> 131 </view>
  132 + <view class="picboxname">{{item.title}}</view>
115 133
116 </view> 134 </view>
117 135
  1 +page{
  2 + overflow-x: hidden
  3 +}
  4 +
1 .sousuo{ 5 .sousuo{
2 padding:0 20rpx; 6 padding:0 20rpx;
3 display:flex; 7 display:flex;
@@ -122,7 +126,7 @@ @@ -122,7 +126,7 @@
122 height:394rpx; 126 height:394rpx;
123 font-size: 0; 127 font-size: 0;
124 position: relative; 128 position: relative;
125 - margin-top:24rpx; 129 +
126 } 130 }
127 .moreshuju{ 131 .moreshuju{
128 display:flex; 132 display:flex;
@@ -158,4 +162,23 @@ @@ -158,4 +162,23 @@
158 background: #FB6324; 162 background: #FB6324;
159 color:#fff; 163 color:#fff;
160 164
  165 +}
  166 +
  167 +.picboxname{
  168 + width:750rpx;
  169 + height:74rpx;
  170 + line-height: 74rpx;
  171 + border-bottom-left-radius: 4rpx;
  172 + border-bottom-right-radius: 4rpx;
  173 + background: #fff;
  174 + text-align: center;
  175 + color:#3D444D;
  176 + font-size: 28rpx;
  177 + overflow: hidden;
  178 + text-overflow: ellipsis;
  179 + white-space: nowrap;
  180 +
  181 +
  182 + margin-right:12rpx;
  183 + font-weight: bold;
161 } 184 }
1 // pages/startindex/startindex.js 1 // pages/startindex/startindex.js
2 const app=getApp() 2 const app=getApp()
3 Page({ 3 Page({
4 -  
5 /** 4 /**
6 * 页面的初始数据 5 * 页面的初始数据
7 */ 6 */
8 data: { 7 data: {
9 thumbnail:'' 8 thumbnail:''
10 }, 9 },
11 -  
12 /** 10 /**
13 * 生命周期函数--监听页面加载 11 * 生命周期函数--监听页面加载
14 */ 12 */
15 onLoad: function (options) { 13 onLoad: function (options) {
16 - 14 + setTimeout(function(){
  15 + wx.redirectTo({
  16 + url: '/pages/homepage/homepage',
  17 + })
  18 + },3000)
17 }, 19 },
18 -  
19 getpic(){ 20 getpic(){
20 let that = this; 21 let that = this;
21 var url = 'user/cover'; 22 var url = 'user/cover';
@@ -27,9 +28,6 @@ Page({ @@ -27,9 +28,6 @@ Page({
27 that.setData({ 28 that.setData({
28 thumbnail: res.thumbnail 29 thumbnail: res.thumbnail
29 }) 30 })
30 -  
31 -  
32 -  
33 }).catch((err) => { 31 }).catch((err) => {
34 32
35 }) 33 })
@@ -48,12 +46,8 @@ Page({ @@ -48,12 +46,8 @@ Page({
48 */ 46 */
49 onShow: function () { 47 onShow: function () {
50 let that=this; 48 let that=this;
51 - that.getpic()  
52 - setTimeout(function(){  
53 - wx.switchTab({  
54 - url: '/pages/homepage/homepage',  
55 - })  
56 - },2500) 49 + that.getpic();
  50 +
57 }, 51 },
58 52
59 /** 53 /**
1 { 1 {
2 - "usingComponents": {} 2 + "usingComponents": {
  3 +
  4 + },
  5 + "navigationStyle": "custom"
3 } 6 }
@@ -126,7 +126,8 @@ Page({ @@ -126,7 +126,8 @@ Page({
126 // 图片详情 126 // 图片详情
127 picdetail(e) { 127 picdetail(e) {
128 console.log(e) 128 console.log(e)
129 - let id = e.currentTarget.dataset.id 129 + let id = e.currentTarget.dataset.id;
  130 + console.log(id)
130 wx.navigateTo({ 131 wx.navigateTo({
131 url: '/pages/picdetail/picdetail?id=' + id, 132 url: '/pages/picdetail/picdetail?id=' + id,
132 }) 133 })
@@ -156,7 +156,8 @@ Page({ @@ -156,7 +156,8 @@ Page({
156 156
157 // 进入购物车列表 157 // 进入购物车列表
158 gouwuche() { 158 gouwuche() {
159 - wx.switchTab({ 159 + wx.navigateTo({
  160 +
160 url: '/pages/cart/cart', 161 url: '/pages/cart/cart',
161 }) 162 })
162 }, 163 },
@@ -212,7 +213,7 @@ Page({ @@ -212,7 +213,7 @@ Page({
212 wei: false 213 wei: false
213 }) 214 })
214 } 215 }
215 - WxParse.wxParse('article', 'html', res.content, that, 5); 216 + // WxParse.wxParse('article', 'html', res.content, that, 5);
216 217
217 218
218 }).catch((err) => { 219 }).catch((err) => {
@@ -149,17 +149,19 @@ @@ -149,17 +149,19 @@
149 <view class="searchlist" wx:if="{{searchresult==true}}"> 149 <view class="searchlist" wx:if="{{searchresult==true}}">
150 150
151 <view class="searchlistbox"> 151 <view class="searchlistbox">
152 - <view class="searchboximg" wx:for="{{searcharr}}" wx:key='' bindtap="govideo" data-url="{{item.video}}" data-id="{{item.id}}">  
153 - <image src="{{item.thumbnail}}"></image> 152 + <view wx:for="{{searcharr}}" wx:key='' bindtap="govideo" data-url="{{item.video}}" data-id="{{item.id}}">
  153 + <view class="searchboximg">
  154 + <image src="{{item.thumbnail}}"></image>
154 155
155 - <view class="anniu">  
156 - <image src="/img/anniu.png"></image> 156 + <view class="anniu">
  157 + <image src="/img/anniu.png"></image>
  158 + </view>
157 </view> 159 </view>
  160 +
  161 + <view class="title">{{item.title}}</view>
158 </view> 162 </view>
159 163
160 </view> 164 </view>
161 -  
162 -  
163 </view> 165 </view>
164 166
165 <view wx:else> 167 <view wx:else>
@@ -241,9 +243,10 @@ @@ -241,9 +243,10 @@
241 <view class="yulanname" bindtap="shouyulan" data-url="{{videodetail.accredit}}">授权书预览</view> 243 <view class="yulanname" bindtap="shouyulan" data-url="{{videodetail.accredit}}">授权书预览</view>
242 </view> 244 </view>
243 245
244 - <view class="pictext"> 246 + <view class="pictext" wx:for="{{videodetail.content}}" wx:key="">
  247 + {{item}}
245 <!-- {{videodetail.content}} --> 248 <!-- {{videodetail.content}} -->
246 - <template is="wxParse" data="{{wxParseData:article.nodes}}" /> 249 + <!-- <template is="wxParse" data="{{wxParseData:article.nodes}}" /> -->
247 250
248 </view> 251 </view>
249 </view> 252 </view>
1 -  
2 @import "../search/search.wxss"; 1 @import "../search/search.wxss";
  2 +page{
  3 + overflow-x: hidden
  4 +}
  5 +
3 .picdetailbox { 6 .picdetailbox {
4 padding: 24rpx; 7 padding: 24rpx;
5 box-sizing: border-box; 8 box-sizing: border-box;
@@ -41,7 +44,7 @@ @@ -41,7 +44,7 @@
41 width: 175rpx; 44 width: 175rpx;
42 padding: 6rpx 12rpx; 45 padding: 6rpx 12rpx;
43 box-sizing: border-box; 46 box-sizing: border-box;
44 - background: #FB6324; 47 + background: #fb6324;
45 display: flex; 48 display: flex;
46 align-items: center; 49 align-items: center;
47 margin-top: 20rpx; 50 margin-top: 20rpx;
@@ -90,10 +93,9 @@ @@ -90,10 +93,9 @@
90 } 93 }
91 94
92 .picbotname { 95 .picbotname {
93 -  
94 font-size: 22rpx; 96 font-size: 22rpx;
95 margin-top: 6rpx; 97 margin-top: 6rpx;
96 - color:#FB6324; 98 + color: #fb6324;
97 } 99 }
98 100
99 .addcar { 101 .addcar {
@@ -386,50 +388,70 @@ @@ -386,50 +388,70 @@
386 display: flex; 388 display: flex;
387 align-items: center; 389 align-items: center;
388 } 390 }
389 -.feihuileft{  
390 - display:flex;  
391 - align-items: center 391 +
  392 +.feihuileft {
  393 + display: flex;
  394 + align-items: center;
392 } 395 }
393 -.feihuirl{  
394 - width:44rpx;  
395 - height:44rpx; 396 +
  397 +.feihuirl {
  398 + width: 44rpx;
  399 + height: 44rpx;
396 font-size: 0; 400 font-size: 0;
397 } 401 }
398 -.feihuirl image{  
399 - width:100%;  
400 - height:100%; 402 +
  403 +.feihuirl image {
  404 + width: 100%;
  405 + height: 100%;
401 } 406 }
402 -.feihuiright{  
403 - display:flex; 407 +
  408 +.feihuiright {
  409 + display: flex;
404 align-items: center; 410 align-items: center;
405 padding: 4rpx; 411 padding: 4rpx;
406 box-sizing: border-box; 412 box-sizing: border-box;
407 - background: #FB6324; 413 + background: #fb6324;
408 border-radius: 4rpx; 414 border-radius: 4rpx;
409 -  
410 -  
411 } 415 }
412 -.feihuill{  
413 - color:#fff; 416 +
  417 +.feihuill {
  418 + color: #fff;
414 font-size: 28rpx; 419 font-size: 28rpx;
415 } 420 }
416 -.feivip{  
417 - display:flex;  
418 - justify-content: space-between 421 +
  422 +.feivip {
  423 + display: flex;
  424 + justify-content: space-between;
419 } 425 }
420 426
421 -.wrodbox{  
422 - display:flex; 427 +.wrodbox {
  428 + display: flex;
423 flex-wrap: wrap; 429 flex-wrap: wrap;
424 } 430 }
425 -.worditem{  
426 - padding:12rpx 14rpx; 431 +
  432 +.worditem {
  433 + padding: 12rpx 14rpx;
427 box-sizing: border-box; 434 box-sizing: border-box;
428 - background: #F2F2F2;  
429 - color:#06121e; 435 + background: #f2f2f2;
  436 + color: #06121e;
430 font-size: 28rpx; 437 font-size: 28rpx;
431 - margin-right:20rpx;  
432 - margin-top:20rpx;  
433 - 438 + margin-right: 20rpx;
  439 + margin-top: 20rpx;
  440 +}
434 441
435 -}  
  442 +.title {
  443 + width: 702rpx;
  444 + height: 74rpx;
  445 + background: #fff;
  446 + line-height: 74rpx;
  447 + border-bottom-left-radius: 4rpx;
  448 + border-bottom-right-radius: 4rpx;
  449 + text-align: center;
  450 + color: #3d444d;
  451 + font-size: 28rpx;
  452 + overflow: hidden;
  453 + text-overflow: ellipsis;
  454 + white-space: nowrap;
  455 + margin-bottom: 24rpx;
  456 + margin-right: 12rpx;
  457 +}
@@ -43,7 +43,8 @@ Page({ @@ -43,7 +43,8 @@ Page({
43 icon: "none" 43 icon: "none"
44 }) 44 })
45 setTimeout(function() { 45 setTimeout(function() {
46 - wx.switchTab({ 46 + wx.navigateTo({
  47 +
47 url: '/pages/mine/mine', 48 url: '/pages/mine/mine',
48 }) 49 })
49 // wx.navigateBack({ 50 // wx.navigateBack({
@@ -4,13 +4,20 @@ @@ -4,13 +4,20 @@
4 "ignore": [] 4 "ignore": []
5 }, 5 },
6 "setting": { 6 "setting": {
7 - "urlCheck": false, 7 + "urlCheck": true,
8 "es6": true, 8 "es6": true,
9 "postcss": true, 9 "postcss": true,
10 "minified": true, 10 "minified": true,
11 "newFeature": true, 11 "newFeature": true,
12 "autoAudits": false, 12 "autoAudits": false,
13 - "checkInvalidKey": true 13 + "checkInvalidKey": true,
  14 + "checkSiteMap": true,
  15 + "uploadWithSourceMap": true,
  16 + "babelSetting": {
  17 + "ignore": [],
  18 + "disablePlugins": [],
  19 + "outputPath": ""
  20 + }
14 }, 21 },
15 "compileType": "miniprogram", 22 "compileType": "miniprogram",
16 "libVersion": "2.9.2", 23 "libVersion": "2.9.2",