miniprogram / hangpaiproject · 提交

转到一个项目

作者 刘朕
提交 2f02a307db458ba15d95950e590eaf983c7077ad 1 个父辈 860d4bfd

功能有哈

内嵌 并排对比
正在显示 12 个修改的文件 包含 61 行增加 和 226 行删除
@@ -61,7 +61,7 @@ App({ @@ -61,7 +61,7 @@ App({
61 //init 61 //init
62 let that = this; 62 let that = this;
63 let postData = data; 63 let postData = data;
64 - let baseUrl = 'https://airphoto.t.broteam.cn/api/'; 64 + let baseUrl = 'https://airphoto.brofirst.cn/api/';
65 //网络请求 65 //网络请求
66 let header = { 66 let header = {
67 // 'XX-Device-Type': 'wxapp', 67 // 'XX-Device-Type': 'wxapp',
@@ -112,7 +112,7 @@ App({ @@ -112,7 +112,7 @@ App({
112 wx.showLoading({ 112 wx.showLoading({
113 title: '上传中', 113 title: '上传中',
114 }) 114 })
115 - let url = 'https://airphoto.t.broteam.cn/api/common/upload'; 115 + let url = 'https://airphoto.brofirst.cn/api/common/upload';
116 let head = { 116 let head = {
117 'token': wx.getStorageSync('token'), 117 'token': wx.getStorageSync('token'),
118 'XX-Device-Type': '' 118 'XX-Device-Type': ''
@@ -150,6 +150,6 @@ App({ @@ -150,6 +150,6 @@ App({
150 }, 150 },
151 globalData: { 151 globalData: {
152 userInfo: null, 152 userInfo: null,
153 - baseUrl:'https://airphoto.t.broteam.cn' 153 + baseUrl:'https://airphoto.brofirst.cn'
154 } 154 }
155 }) 155 })
@@ -256,7 +256,7 @@ Page({ @@ -256,7 +256,7 @@ Page({
256 onShow: function() { 256 onShow: function() {
257 let that=this; 257 let that=this;
258 this.getmyinfo(); 258 this.getmyinfo();
259 - this.changenum() 259 + // this.changenum()
260 260
261 wx.getSystemInfo({ 261 wx.getSystemInfo({
262 success (res) { 262 success (res) {
1 <!-- <view class="qujingtop"> 1 <!-- <view class="qujingtop">
2 <image src="{{topimage}}"></image> 2 <image src="{{topimage}}"></image>
3 </view> --> 3 </view> -->
4 -<view class="search"> 4 +<!-- <view class="search">
5 <view class="searchright" bindtap="gosearch"> 5 <view class="searchright" bindtap="gosearch">
6 <view class="searchfightimg"> 6 <view class="searchfightimg">
7 <image src="/img/sousuo.png"></image> 7 <image src="/img/sousuo.png"></image>
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 <image src="/img/hand.png"></image> 15 <image src="/img/hand.png"></image>
16 </div> 16 </div>
17 </div> 17 </div>
18 -</view> 18 +</view> -->
19 <view class="qujinglist"> 19 <view class="qujinglist">
20 <view class="qujingimg" wx:for="{{qujinglist}}" :key="index" bindtap="qujingdetail" data-id="{{item.id}}"> 20 <view class="qujingimg" wx:for="{{qujinglist}}" :key="index" bindtap="qujingdetail" data-id="{{item.id}}">
21 <image src="{{item.image}}"></image> 21 <image src="{{item.image}}"></image>
@@ -40,8 +40,8 @@ Page({ @@ -40,8 +40,8 @@ Page({
40 let obj={ 40 let obj={
41 iconPath: "/img/map.png", 41 iconPath: "/img/map.png",
42 id: 0, 42 id: 0,
43 - latitude:res.lat,  
44 - longitude: res.lng, 43 + latitude:parseFloat(res.lat),
  44 + longitude: parseFloat(res.lng),
45 width: 30, 45 width: 30,
46 height: 30 46 height: 30
47 } 47 }
@@ -113,9 +113,10 @@ Page({ @@ -113,9 +113,10 @@ Page({
113 let that=this; 113 let that=this;
114 let latitude=e.currentTarget.dataset.lat; 114 let latitude=e.currentTarget.dataset.lat;
115 let longitude=e.currentTarget.dataset.lng 115 let longitude=e.currentTarget.dataset.lng
  116 + console.log(latitude,longitude,'49465465sdfsfsdfs');
116 wx.openLocation({ 117 wx.openLocation({
117 - latitude: Number(latitude),  
118 - longitude: Number(longitude), 118 + latitude: parseFloat(latitude),
  119 + longitude: parseFloat(longitude),
119 name:that.data.qujingdetail.address, 120 name:that.data.qujingdetail.address,
120 address:that.data.qujingdetail.address, 121 address:that.data.qujingdetail.address,
121 success: function() { 122 success: function() {
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 <rich-text nodes="{{qujingdetail.content}}"></rich-text> 14 <rich-text nodes="{{qujingdetail.content}}"></rich-text>
15 </view> 15 </view>
16 <view class="mapbox"> 16 <view class="mapbox">
17 - <map id="map" longitude="{{qujingdetail.lng}}" latitude="{{qujingdetail.lat}}" scale="14" bindcontroltap="controltap" markers="{{markers}}" bindmarkertap="markertap" data-lat="{{qujingdetail.lat}}" data-lng="{{qujingdetail.lng}}" polyline="{{polyline}}" bindregionchange="regionchange" show-location></map> 17 + <map id="map" longitude="{{qujingdetail.lng}}" latitude="{{qujingdetail.lat}}" scale="14" bindcontroltap="controltap" markers="{{markers}}" bindmarkertap="markertap" bindcalloutta="markertap" bindpoitap="markertap" data-lat="{{qujingdetail.lat}}" data-lng="{{qujingdetail.lng}}" polyline="{{polyline}}" bindregionchange="regionchange" show-location></map>
18 </view> 18 </view>
19 </view> 19 </view>
20 20
@@ -43,11 +43,6 @@ Page({ @@ -43,11 +43,6 @@ Page({
43 type_idk: Number(options.index) + 1 43 type_idk: Number(options.index) + 1
44 }) 44 })
45 } 45 }
46 - console.log('3443894839',this.data.indexk)  
47 -  
48 - console.log('38843',this.data.type_idk)  
49 -  
50 -  
51 this.getkeywordlist() 46 this.getkeywordlist()
52 }, 47 },
53 48
@@ -79,10 +74,6 @@ Page({ @@ -79,10 +74,6 @@ Page({
79 price: this.data.price, 74 price: this.data.price,
80 text: this.data.text 75 text: this.data.text
81 }) 76 })
82 - console.log(this.data.address)  
83 - console.log(this.data.price)  
84 - console.log(this.data.text)  
85 -  
86 }, 77 },
87 78
88 // 获取关键字列表 79 // 获取关键字列表
@@ -90,21 +81,12 @@ Page({ @@ -90,21 +81,12 @@ Page({
90 let that = this; 81 let that = this;
91 var url = 'index/search'; 82 var url = 'index/search';
92 var params = { 83 var params = {
93 -  
94 -  
95 } 84 }
96 app.post(url, params, "post").then((res) => { 85 app.post(url, params, "post").then((res) => {
97 console.log(res); 86 console.log(res);
98 - // let newwordlist=res;  
99 - // newwordlist.forEach(function(value,index,array){  
100 - // value.son.forEach(function(valuek,indexk,array){  
101 - // valuek.sel=false  
102 - // })  
103 - // })  
104 that.setData({ 87 that.setData({
105 wordlist:res 88 wordlist:res
106 }) 89 })
107 -  
108 }).catch((err) => { 90 }).catch((err) => {
109 91
110 }) 92 })
@@ -113,9 +95,11 @@ Page({ @@ -113,9 +95,11 @@ Page({
113 // 搜素地名关键字 95 // 搜素地名关键字
114 seladdress(e) { 96 seladdress(e) {
115 let that = this; 97 let that = this;
116 -  
117 let id = e.currentTarget.dataset.id; 98 let id = e.currentTarget.dataset.id;
118 let index = e.currentTarget.dataset.index; 99 let index = e.currentTarget.dataset.index;
  100 + let parent_id = e.currentTarget.dataset.parent_id;
  101 + let name = e.currentTarget.dataset.name;
  102 + console.log(id,index,parent_id,name);
119 that.data.address.forEach(function(value, indexk, array) { 103 that.data.address.forEach(function(value, indexk, array) {
120 if (id == value.id) { 104 if (id == value.id) {
121 value.sel = !value.sel; 105 value.sel = !value.sel;
@@ -130,33 +114,13 @@ Page({ @@ -130,33 +114,13 @@ Page({
130 } 114 }
131 } 115 }
132 }) 116 })
133 -  
134 that.setData({ 117 that.setData({
135 address: that.data.address, 118 address: that.data.address,
136 addressarr: that.data.addressarr 119 addressarr: that.data.addressarr
137 }) 120 })
138 -  
139 - // app.globalData.addressarr = this.data.addressarr;  
140 -  
141 - // app.globalData.textarr = this.data.textarr;  
142 - // app.globalData.pricearr = this.data.pricearr;  
143 - // app.globalData.keyword = this.data.keyword;  
144 - // app.globalData.type_id = this.data.type_id;  
145 - // app.globalData.index = this.data.index;  
146 -  
147 -  
148 wx.navigateTo({ 121 wx.navigateTo({
149 - url: '/pages/searchsecond/searchsecond?textarr='+this.data.textarr+'&pricearr='+this.data.pricearr+'&keyword='+this.data.keyword+'&type_id='+this.data.type_idk+'&index='+this.data.indexk+'&addressarr='+this.data.addressarr, 122 + url: '/pages/searchsecond/searchsecond?textarr='+this.data.textarr+'&pricearr='+this.data.pricearr+'&keyword='+this.data.keyword+'&type_id='+parent_id+'&index='+this.data.indexk+'&addressarr='+this.data.addressarr+'&sontype_id='+id,
150 }) 123 })
151 -  
152 -  
153 - // this.setData({  
154 - // page: 1,  
155 - // searcharr: [],  
156 - // sousuoword: false  
157 - // })  
158 -  
159 - // this.getsousuo();  
160 }, 124 },
161 125
162 // 搜索内容关键词 126 // 搜索内容关键词
@@ -183,28 +147,9 @@ Page({ @@ -183,28 +147,9 @@ Page({
183 text: that.data.text, 147 text: that.data.text,
184 textarr: that.data.textarr 148 textarr: that.data.textarr
185 }) 149 })
186 - // app.globalData.addressarr = this.data.addressarr;  
187 -  
188 - // app.globalData.textarr = this.data.textarr;  
189 - // app.globalData.pricearr = this.data.pricearr;  
190 - // app.globalData.keyword = this.data.keyword;  
191 - // app.globalData.type_id = this.data.type_id;  
192 - // app.globalData.index = this.data.index;  
193 wx.navigateTo({ 150 wx.navigateTo({
194 url: '/pages/searchsecond/searchsecond?textarr='+this.data.textarr+'&pricearr='+this.data.pricearr+'&keyword='+this.data.keyword+'&type_id='+this.data.type_idk+'&index='+this.data.indexk+'&addressarr='+this.data.addressarr, 151 url: '/pages/searchsecond/searchsecond?textarr='+this.data.textarr+'&pricearr='+this.data.pricearr+'&keyword='+this.data.keyword+'&type_id='+this.data.type_idk+'&index='+this.data.indexk+'&addressarr='+this.data.addressarr,
195 }) 152 })
196 -  
197 -  
198 - // this.setData({  
199 - // page: 1,  
200 - // searcharr: [],  
201 - // sousuoword: false  
202 - // })  
203 -  
204 - // this.getsousuo();  
205 -  
206 - console.log(that.data.text);  
207 - console.log(that.data.textarr)  
208 }, 153 },
209 154
210 // 搜索价格关键词 155 // 搜索价格关键词
@@ -215,7 +160,6 @@ Page({ @@ -215,7 +160,6 @@ Page({
215 console.log(price) 160 console.log(price)
216 let index = e.currentTarget.dataset.index; 161 let index = e.currentTarget.dataset.index;
217 that.data.price.forEach(function(value, indexk, array) { 162 that.data.price.forEach(function(value, indexk, array) {
218 -  
219 if (price == value.name) { 163 if (price == value.name) {
220 console.log(value.name) 164 console.log(value.name)
221 value.sel = !value.sel; 165 value.sel = !value.sel;
@@ -235,37 +179,18 @@ Page({ @@ -235,37 +179,18 @@ Page({
235 price: that.data.price, 179 price: that.data.price,
236 pricearr: that.data.pricearr 180 pricearr: that.data.pricearr
237 }) 181 })
238 - // app.globalData.addressarr = this.data.addressarr;  
239 -  
240 - // app.globalData.textarr = this.data.textarr;  
241 - // app.globalData.pricearr = this.data.pricearr;  
242 - // app.globalData.keyword = this.data.keyword;  
243 - // app.globalData.type_id = this.data.type_id;  
244 - // app.globalData.index = this.data.index;  
245 wx.navigateTo({ 182 wx.navigateTo({
246 url: '/pages/searchsecond/searchsecond?textarr='+this.data.textarr+'&pricearr='+this.data.pricearr+'&keyword='+this.data.keyword+'&type_id='+this.data.type_idk+'&index='+this.data.indexk+'&addressarr='+this.data.addressarr, 183 url: '/pages/searchsecond/searchsecond?textarr='+this.data.textarr+'&pricearr='+this.data.pricearr+'&keyword='+this.data.keyword+'&type_id='+this.data.type_idk+'&index='+this.data.indexk+'&addressarr='+this.data.addressarr,
247 }) 184 })
248 - // this.setData({  
249 - // page: 1,  
250 - // searcharr: [],  
251 - // sousuoword: false  
252 - // })  
253 -  
254 - // this.getsousuo();  
255 -  
256 }, 185 },
257 186
258 -  
259 -  
260 // 输入关键字搜索 187 // 输入关键字搜索
261 -  
262 enterword(e) { 188 enterword(e) {
263 console.log(e) 189 console.log(e)
264 this.setData({ 190 this.setData({
265 keyword: e.detail.value, 191 keyword: e.detail.value,
266 sousuoword: true 192 sousuoword: true
267 }) 193 })
268 -  
269 console.log(this.data.keyword) 194 console.log(this.data.keyword)
270 }, 195 },
271 196
@@ -276,13 +201,9 @@ Page({ @@ -276,13 +201,9 @@ Page({
276 keyword: e.detail.value, 201 keyword: e.detail.value,
277 sousuoword: true 202 sousuoword: true
278 }) 203 })
279 -  
280 - console.log('34874334899',this.data.type_id)  
281 -  
282 }, 204 },
283 sousuo() { 205 sousuo() {
284 app.globalData.addressarr = this.data.addressarr; 206 app.globalData.addressarr = this.data.addressarr;
285 -  
286 app.globalData.textarr = this.data.textarr; 207 app.globalData.textarr = this.data.textarr;
287 app.globalData.pricearr = this.data.pricearr; 208 app.globalData.pricearr = this.data.pricearr;
288 app.globalData.keyword = this.data.keyword; 209 app.globalData.keyword = this.data.keyword;
@@ -292,27 +213,8 @@ Page({ @@ -292,27 +213,8 @@ Page({
292 wx.navigateTo({ 213 wx.navigateTo({
293 url: '/pages/searchsecond/searchsecond?textarr='+this.data.textarr+'&pricearr='+this.data.pricearr+'&keyword='+this.data.keyword+'&type_id='+this.data.type_idk+'&index='+this.data.indexk+'&addressarr='+this.data.addressarr, 214 url: '/pages/searchsecond/searchsecond?textarr='+this.data.textarr+'&pricearr='+this.data.pricearr+'&keyword='+this.data.keyword+'&type_id='+this.data.type_idk+'&index='+this.data.indexk+'&addressarr='+this.data.addressarr,
294 }) 215 })
295 -  
296 - // if (this.data.keyword == '') {  
297 - // wx.showToast({  
298 - // title: '请输入搜索内容',  
299 - // icon: 'none'  
300 - // })  
301 - // } else {  
302 -  
303 -  
304 - // }  
305 - // this.setData({  
306 - // page: 1,  
307 - // searcharr: [],  
308 - // sousuoword: false  
309 - // })  
310 -  
311 - // this.getsousuo();  
312 }, 216 },
313 217
314 -  
315 -  
316 // 搜索列表 218 // 搜索列表
317 getsousuo() { 219 getsousuo() {
318 let that = this; 220 let that = this;
@@ -332,10 +234,6 @@ Page({ @@ -332,10 +234,6 @@ Page({
332 that.setData({ 234 that.setData({
333 searcharr: that.data.searcharr.concat(res) 235 searcharr: that.data.searcharr.concat(res)
334 }) 236 })
335 - // that.setData({  
336 - // sousuoword: true  
337 - // })  
338 -  
339 if (res.length != 0 && this.data.type_id == 1) { 237 if (res.length != 0 && this.data.type_id == 1) {
340 that.setData({ 238 that.setData({
341 showlist: 1, 239 showlist: 1,
@@ -361,8 +259,6 @@ Page({ @@ -361,8 +259,6 @@ Page({
361 }) 259 })
362 }, 260 },
363 261
364 -  
365 -  
366 // 播放视频 262 // 播放视频
367 govideo(e) { 263 govideo(e) {
368 console.log(e) 264 console.log(e)
@@ -371,10 +267,6 @@ Page({ @@ -371,10 +267,6 @@ Page({
371 wx.navigateTo({ 267 wx.navigateTo({
372 url: '/pages/videodetail/videodetail?id=' + id, 268 url: '/pages/videodetail/videodetail?id=' + id,
373 }) 269 })
374 - // wx.navigateTo({  
375 - // url: '/pages/videoplay/videoplay?url=' + url,  
376 - // })  
377 -  
378 }, 270 },
379 271
380 govideomei(e) { 272 govideomei(e) {
@@ -2,7 +2,6 @@ @@ -2,7 +2,6 @@
2 <view class="search"> 2 <view class="search">
3 <!-- <picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}"> 3 <!-- <picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}">
4 <view class="searchleft"> 4 <view class="searchleft">
5 -  
6 <view class="searchleftname">{{array[indexk]}}</view> 5 <view class="searchleftname">{{array[indexk]}}</view>
7 <view class="searchsanjiao"> 6 <view class="searchsanjiao">
8 <image src='/img/sanjiaodown.png'></image> 7 <image src='/img/sanjiaodown.png'></image>
@@ -11,7 +10,6 @@ @@ -11,7 +10,6 @@
11 </view> 10 </view>
12 </picker> --> 11 </picker> -->
13 <view class="searchright"> 12 <view class="searchright">
14 -  
15 <view class="searchfightimg" bindtap="sousuo" wx:if="{{sousuoword}}"> 13 <view class="searchfightimg" bindtap="sousuo" wx:if="{{sousuoword}}">
16 <image src="/img/sousuo.png"></image> 14 <image src="/img/sousuo.png"></image>
17 </view> 15 </view>
@@ -27,14 +25,11 @@ @@ -27,14 +25,11 @@
27 <view class="sousuoname" wx:else>搜索</view> 25 <view class="sousuoname" wx:else>搜索</view>
28 </view> 26 </view>
29 27
30 -  
31 -  
32 <view class="showitem" wx:if="{{show}}"> 28 <view class="showitem" wx:if="{{show}}">
33 -  
34 - <view class="keyworditem" wx:for="{{wordlist}}" wx:key="index">  
35 - <view class="history">{{item.typename}}</view> 29 + <view class="keyworditem" wx:for="{{wordlist}}" wx:for-item="word_item" wx:key="index">
  30 + <view class="history">{{word_item.typename}}</view>
36 <view class="searchjilu"> 31 <view class="searchjilu">
37 - <view class="searchjiluitem {{item.sel==true?'selactive':''}}" wx:for="{{item.son}}" data-id="{{item.id}}" wx:key='' bindtap="seladdress" data-index="{{index}}"> 32 + <view class="searchjiluitem {{word_item.sel==true?'selactive':''}}" wx:for="{{word_item.son}}" data-parent_id="{{word_item.id}}" data-id="{{item.id}}" bindtap="seladdress" wx:key="child_index" data-index="{{index}}" data-name="{{item.name}}">
38 {{item.name}} 33 {{item.name}}
39 </view> 34 </view>
40 </view> 35 </view>
@@ -56,79 +51,49 @@ @@ -56,79 +51,49 @@
56 </view> --> 51 </view> -->
57 52
58 </view> 53 </view>
59 -  
60 -  
61 <view wx:else> 54 <view wx:else>
62 -  
63 <view class="nodata" wx:if="{{searcharr.length==0}}">暂无数据</view> 55 <view class="nodata" wx:if="{{searcharr.length==0}}">暂无数据</view>
64 -  
65 <view wx:else> 56 <view wx:else>
66 <!-- 搜索视频 --> 57 <!-- 搜索视频 -->
67 <view class="searchlist" wx:if="{{showlist==1}}"> 58 <view class="searchlist" wx:if="{{showlist==1}}">
68 -  
69 <view class="searchlistbox"> 59 <view class="searchlistbox">
70 -  
71 <view wx:for="{{searcharr}}" wx:key='' bindtap="govideo" data-url="{{item.video}}" data-id="{{item.id}}"> 60 <view wx:for="{{searcharr}}" wx:key='' bindtap="govideo" data-url="{{item.video}}" data-id="{{item.id}}">
72 <view class="searchboximg"> 61 <view class="searchboximg">
73 <image src="{{item.thumbnail}}"></image> 62 <image src="{{item.thumbnail}}"></image>
74 -  
75 <view class="anniu"> 63 <view class="anniu">
76 <image src="/img/anniu.png"></image> 64 <image src="/img/anniu.png"></image>
77 </view> 65 </view>
78 -  
79 -  
80 </view> 66 </view>
81 <view class="picboxname">{{item.title}}</view> 67 <view class="picboxname">{{item.title}}</view>
82 </view> 68 </view>
83 -  
84 -  
85 -  
86 -  
87 </view> 69 </view>
88 -  
89 -  
90 </view> 70 </view>
91 -  
92 -  
93 -  
94 <!-- 搜素图片 --> 71 <!-- 搜素图片 -->
95 <view class="searchimglist" wx:if="{{showlist==2}}"> 72 <view class="searchimglist" wx:if="{{showlist==2}}">
96 -  
97 <view wx:for="{{searcharr}}" wx:key='' bindtap="gopic" data-id="{{item.id}}"> 73 <view wx:for="{{searcharr}}" wx:key='' bindtap="gopic" data-id="{{item.id}}">
98 <view class="searchimgitem"> 74 <view class="searchimgitem">
99 <image src="{{item.thumbnail}}"></image> 75 <image src="{{item.thumbnail}}"></image>
100 -  
101 </view> 76 </view>
102 <view class="picboxname">{{item.title}}</view> 77 <view class="picboxname">{{item.title}}</view>
103 </view> 78 </view>
104 -  
105 -  
106 </view> 79 </view>
107 <!-- 搜素精美大片 --> 80 <!-- 搜素精美大片 -->
108 <view class="searchlist" wx:if="{{showlist==3}}"> 81 <view class="searchlist" wx:if="{{showlist==3}}">
109 -  
110 <view class="searchlistbox"> 82 <view class="searchlistbox">
111 <view class="searchboximg" wx:for="{{searcharr}}" wx:key='' bindtap="govideomei" data-url="{{item.video}}"> 83 <view class="searchboximg" wx:for="{{searcharr}}" wx:key='' bindtap="govideomei" data-url="{{item.video}}">
112 <image src="{{item.thumbnail}}"></image> 84 <image src="{{item.thumbnail}}"></image>
113 -  
114 <view class="anniu"> 85 <view class="anniu">
115 <image src="/img/anniu.png"></image> 86 <image src="/img/anniu.png"></image>
116 </view> 87 </view>
117 -  
118 </view> 88 </view>
119 <view class="picboxname">{{item.title}}</view> 89 <view class="picboxname">{{item.title}}</view>
120 -  
121 </view> 90 </view>
122 -  
123 <!-- <view class="moreshuju" bindtap="jiazai"> 91 <!-- <view class="moreshuju" bindtap="jiazai">
124 <view class="moreshujuleft"> 92 <view class="moreshujuleft">
125 <image src="/img/more.png"></image> 93 <image src="/img/more.png"></image>
126 </view> 94 </view>
127 -  
128 <view class="moredata">点击加载更多</view> 95 <view class="moredata">点击加载更多</view>
129 </view> --> 96 </view> -->
130 </view> 97 </view>
131 </view> 98 </view>
132 -  
133 -  
134 </view> 99 </view>
@@ -25,11 +25,10 @@ Page({ @@ -25,11 +25,10 @@ Page({
25 selad: -1, 25 selad: -1,
26 selte: -1, 26 selte: -1,
27 selword: -1, 27 selword: -1,
28 - home_type_id:'' 28 + home_type_id:'',
  29 + sontype_id: '',
29 }, 30 },
30 31
31 -  
32 -  
33 /** 32 /**
34 * 生命周期函数--监听页面加载 33 * 生命周期函数--监听页面加载
35 */ 34 */
@@ -37,6 +36,7 @@ Page({ @@ -37,6 +36,7 @@ Page({
37 console.log(options,'888899999') 36 console.log(options,'888899999')
38 if (options.index != undefined) { 37 if (options.index != undefined) {
39 this.setData({ 38 this.setData({
  39 + sontype_id: options.sontype_id,
40 type_id: options.type_id, 40 type_id: options.type_id,
41 addressarr: options.addressarr, 41 addressarr: options.addressarr,
42 textarr:options.textarr, 42 textarr:options.textarr,
@@ -54,23 +54,9 @@ Page({ @@ -54,23 +54,9 @@ Page({
54 // index: app.globalData.index 54 // index: app.globalData.index
55 // }) 55 // })
56 this.getsousuo() 56 this.getsousuo()
57 -  
58 -  
59 -  
60 }, 57 },
61 58
62 -  
63 -  
64 -  
65 -  
66 -  
67 -  
68 -  
69 -  
70 -  
71 -  
72 // 输入关键字搜索 59 // 输入关键字搜索
73 -  
74 enterword(e) { 60 enterword(e) {
75 console.log(e) 61 console.log(e)
76 this.setData({ 62 this.setData({
@@ -80,7 +66,6 @@ Page({ @@ -80,7 +66,6 @@ Page({
80 // pricearr:[], 66 // pricearr:[],
81 // textarr:[] 67 // textarr:[]
82 }) 68 })
83 -  
84 console.log(this.data.keyword) 69 console.log(this.data.keyword)
85 }, 70 },
86 71
@@ -91,30 +76,23 @@ Page({ @@ -91,30 +76,23 @@ Page({
91 keyword: e.detail.value, 76 keyword: e.detail.value,
92 sousuoword: true 77 sousuoword: true
93 }) 78 })
94 -  
95 }, 79 },
96 sousuo() { 80 sousuo() {
97 -  
98 // if (this.data.keyword == '') { 81 // if (this.data.keyword == '') {
99 // wx.showToast({ 82 // wx.showToast({
100 // title: '请输入搜索内容', 83 // title: '请输入搜索内容',
101 // icon: 'none' 84 // icon: 'none'
102 // }) 85 // })
103 // } else { 86 // } else {
104 -  
105 -  
106 // } 87 // }
107 this.setData({ 88 this.setData({
108 page: 1, 89 page: 1,
109 searcharr: [], 90 searcharr: [],
110 sousuoword: false 91 sousuoword: false
111 }) 92 })
112 -  
113 this.getsousuo(); 93 this.getsousuo();
114 }, 94 },
115 95
116 -  
117 -  
118 // 搜索列表 96 // 搜索列表
119 getsousuo() { 97 getsousuo() {
120 let that = this; 98 let that = this;
@@ -122,11 +100,9 @@ Page({ @@ -122,11 +100,9 @@ Page({
122 let url = 'index/video'; 100 let url = 'index/video';
123 let param = { 101 let param = {
124 home_type_id:that.data.home_type_id, 102 home_type_id:that.data.home_type_id,
125 - sontype_id: that.data.type_id, 103 + type_id: that.data.type_id,
  104 + sontype_id: that.data.sontype_id,
126 keyword: that.data.keyword, 105 keyword: that.data.keyword,
127 -  
128 -  
129 -  
130 page: that.data.page, 106 page: that.data.page,
131 pageNum: 10 107 pageNum: 10
132 } 108 }
@@ -138,34 +114,35 @@ Page({ @@ -138,34 +114,35 @@ Page({
138 // that.setData({ 114 // that.setData({
139 // sousuoword: true 115 // sousuoword: true
140 // }) 116 // })
141 -  
142 - if (res.length != 0 && this.data.type_id == 1) {  
143 that.setData({ 117 that.setData({
144 showlist: 1, 118 showlist: 1,
145 show: false 119 show: false
146 }) 120 })
147 - } else if (res.length != 0 && this.data.type_id == 2) {  
148 - that.setData({  
149 - showlist: 2,  
150 - show: false  
151 - })  
152 - } else if (res.length != 0 && this.data.type_id == 3) {  
153 - that.setData({  
154 - showlist: 3,  
155 - show: false  
156 - })  
157 - } else {  
158 - that.setData({  
159 - show: false  
160 - })  
161 - } 121 + // if (res.length != 0 && this.data.type_id == 1) {
  122 + // that.setData({
  123 + // showlist: 1,
  124 + // show: false
  125 + // })
  126 + // } else if (res.length != 0 && this.data.type_id == 2) {
  127 + // that.setData({
  128 + // showlist: 2,
  129 + // show: false
  130 + // })
  131 + // } else if (res.length != 0 && this.data.type_id == 3) {
  132 + // that.setData({
  133 + // showlist: 3,
  134 + // show: false
  135 + // })
  136 + // } else {
  137 + // that.setData({
  138 + // show: false
  139 + // })
  140 + // }
162 }).catch((err) => { 141 }).catch((err) => {
163 142
164 }) 143 })
165 }, 144 },
166 145
167 -  
168 -  
169 // 播放视频 146 // 播放视频
170 govideo(e) { 147 govideo(e) {
171 console.log(e) 148 console.log(e)
@@ -177,7 +154,6 @@ Page({ @@ -177,7 +154,6 @@ Page({
177 // wx.navigateTo({ 154 // wx.navigateTo({
178 // url: '/pages/videoplay/videoplay?url=' + url, 155 // url: '/pages/videoplay/videoplay?url=' + url,
179 // }) 156 // })
180 -  
181 }, 157 },
182 158
183 govideomei(e) { 159 govideomei(e) {
@@ -248,17 +224,12 @@ Page({ @@ -248,17 +224,12 @@ Page({
248 224
249 this.getsousuo() 225 this.getsousuo()
250 } 226 }
251 -  
252 -  
253 }, 227 },
254 228
255 /** 229 /**
256 * 用户点击右上角分享 230 * 用户点击右上角分享
257 */ 231 */
258 onShareAppMessage: function () { 232 onShareAppMessage: function () {
259 -  
260 -  
261 -  
262 let that=this; 233 let that=this;
263 wx.setStorageSync('userid', that.data.user_id) 234 wx.setStorageSync('userid', that.data.user_id)
264 return { 235 return {
@@ -268,7 +239,6 @@ Page({ @@ -268,7 +239,6 @@ Page({
268 // path:'', 239 // path:'',
269 success: (res)=>{ // 成功后要做的事情 240 success: (res)=>{ // 成功后要做的事情
270 console.log(res) 241 console.log(res)
271 -  
272 }, 242 },
273 fail: function (res) { 243 fail: function (res) {
274 // 分享失败 244 // 分享失败
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 </view> 20 </view>
21 </view> 21 </view>
22 <view class="xiazaiitem"> 22 <view class="xiazaiitem">
23 - <view class="xizaileft">影视剧上映日期:</view> 23 + <view class="xizaileft">影视剧预计上映日期:</view>
24 <picker mode="date" value="{{date}}" bindchange="bindDateChange"> 24 <picker mode="date" value="{{date}}" bindchange="bindDateChange">
25 <view class="xiazairight"> 25 <view class="xiazairight">
26 {{yingdate}} 26 {{yingdate}}
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <image src="/img/noselect.png" wx:else></image> 11 <image src="/img/noselect.png" wx:else></image>
12 </view> 12 </view>
13 13
14 - <view class="gouxuanright">我已阅读该协议内容，并且同意素材售出概不退换</view> 14 + <view class="gouxuanright">我已阅读该协议内容，并且接受同意该协议内容的相关条款</view>
15 </view> 15 </view>
16 16
17 <view class="quebtn" bindtap="quezhifu">确定</view> 17 <view class="quebtn" bindtap="quezhifu">确定</view>
@@ -27,6 +27,8 @@ @@ -27,6 +27,8 @@
27 align-items: center; 27 align-items: center;
28 justify-content: center; 28 justify-content: center;
29 margin-top: 20rpx; 29 margin-top: 20rpx;
  30 + margin-left: 32rpx;
  31 + margin-right: 32rpx;
30 } 32 }
31 33
32 .quebtn { 34 .quebtn {
@@ -20,15 +20,25 @@ @@ -20,15 +20,25 @@
20 "checkInvalidKey": true, 20 "checkInvalidKey": true,
21 "checkSiteMap": true, 21 "checkSiteMap": true,
22 "uploadWithSourceMap": true, 22 "uploadWithSourceMap": true,
  23 + "compileHotReLoad": false,
  24 + "lazyloadPlaceholderEnable": false,
  25 + "useMultiFrameRuntime": true,
  26 + "useApiHook": true,
  27 + "useApiHostProcess": true,
23 "babelSetting": { 28 "babelSetting": {
24 "ignore": [], 29 "ignore": [],
25 "disablePlugins": [], 30 "disablePlugins": [],
26 "outputPath": "" 31 "outputPath": ""
27 }, 32 },
28 - "compileHotReLoad": false, 33 + "enableEngineNative": false,
29 "useIsolateContext": true, 34 "useIsolateContext": true,
30 - "useCompilerModule": false,  
31 - "userConfirmedUseCompilerModuleSwitch": false 35 + "userConfirmedBundleSwitch": false,
  36 + "packNpmManually": false,
  37 + "packNpmRelationList": [],
  38 + "minifyWXSS": true,
  39 + "disableUseStrict": false,
  40 + "showES6CompileOption": false,
  41 + "useCompilerPlugins": false
32 }, 42 },
33 "compileType": "miniprogram", 43 "compileType": "miniprogram",
34 "libVersion": "2.9.2", 44 "libVersion": "2.9.2",
@@ -42,15 +52,12 @@ @@ -42,15 +52,12 @@
42 "simulatorPluginLibVersion": {}, 52 "simulatorPluginLibVersion": {},
43 "condition": { 53 "condition": {
44 "search": { 54 "search": {
45 - "current": -1,  
46 "list": [] 55 "list": []
47 }, 56 },
48 "conversation": { 57 "conversation": {
49 - "current": -1,  
50 "list": [] 58 "list": []
51 }, 59 },
52 "plugin": { 60 "plugin": {
53 - "current": -1,  
54 "list": [] 61 "list": []
55 }, 62 },
56 "game": { 63 "game": {
@@ -58,11 +65,9 @@ @@ -58,11 +65,9 @@
58 "list": [] 65 "list": []
59 }, 66 },
60 "gamePlugin": { 67 "gamePlugin": {
61 - "current": -1,  
62 "list": [] 68 "list": []
63 }, 69 },
64 "miniprogram": { 70 "miniprogram": {
65 - "current": 8,  
66 "list": [ 71 "list": [
67 { 72 {
68 "id": -1, 73 "id": -1,