miniprogram / hangpaiproject · 提交

转到一个项目

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

功能有哈

内嵌 并排对比
正在显示 12 个修改的文件 包含 61 行增加 和 226 行删除
... ... @@ -61,7 +61,7 @@ App({
//init
let that = this;
let postData = data;
let baseUrl = 'https://airphoto.t.broteam.cn/api/';
let baseUrl = 'https://airphoto.brofirst.cn/api/';
//网络请求
let header = {
// 'XX-Device-Type': 'wxapp',
... ... @@ -112,7 +112,7 @@ App({
wx.showLoading({
title: '上传中',
})
let url = 'https://airphoto.t.broteam.cn/api/common/upload';
let url = 'https://airphoto.brofirst.cn/api/common/upload';
let head = {
'token': wx.getStorageSync('token'),
'XX-Device-Type': ''
... ... @@ -150,6 +150,6 @@ App({
},
globalData: {
userInfo: null,
baseUrl:'https://airphoto.t.broteam.cn'
baseUrl:'https://airphoto.brofirst.cn'
}
})
\ No newline at end of file
... ...
... ... @@ -256,7 +256,7 @@ Page({
onShow: function() {
let that=this;
this.getmyinfo();
this.changenum()
// this.changenum()
wx.getSystemInfo({
success (res) {
... ...
<!-- <view class="qujingtop">
<image src="{{topimage}}"></image>
</view> -->
<view class="search">
<!-- <view class="search">
<view class="searchright" bindtap="gosearch">
<view class="searchfightimg">
<image src="/img/sousuo.png"></image>
... ... @@ -15,7 +15,7 @@
<image src="/img/hand.png"></image>
</div>
</div>
</view>
</view> -->
<view class="qujinglist">
<view class="qujingimg" wx:for="{{qujinglist}}" :key="index" bindtap="qujingdetail" data-id="{{item.id}}">
<image src="{{item.image}}"></image>
... ...
... ... @@ -40,8 +40,8 @@ Page({
let obj={
iconPath: "/img/map.png",
id: 0,
latitude:res.lat,
longitude: res.lng,
latitude:parseFloat(res.lat),
longitude: parseFloat(res.lng),
width: 30,
height: 30
}
... ... @@ -113,9 +113,10 @@ Page({
let that=this;
let latitude=e.currentTarget.dataset.lat;
let longitude=e.currentTarget.dataset.lng
console.log(latitude,longitude,'49465465sdfsfsdfs');
wx.openLocation({
latitude: Number(latitude),
longitude: Number(longitude),
latitude: parseFloat(latitude),
longitude: parseFloat(longitude),
name:that.data.qujingdetail.address,
address:that.data.qujingdetail.address,
success: function() {
... ...
... ... @@ -14,7 +14,7 @@
<rich-text nodes="{{qujingdetail.content}}"></rich-text>
</view>
<view class="mapbox">
<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>
<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>
</view>
</view>
... ...
... ... @@ -43,11 +43,6 @@ Page({
type_idk: Number(options.index) + 1
})
}
console.log('3443894839',this.data.indexk)
console.log('38843',this.data.type_idk)
this.getkeywordlist()
},
... ... @@ -79,10 +74,6 @@ Page({
price: this.data.price,
text: this.data.text
})
console.log(this.data.address)
console.log(this.data.price)
console.log(this.data.text)
},
// 获取关键字列表
... ... @@ -90,21 +81,12 @@ Page({
let that = this;
var url = 'index/search';
var params = {
}
app.post(url, params, "post").then((res) => {
console.log(res);
// let newwordlist=res;
// newwordlist.forEach(function(value,index,array){
// value.son.forEach(function(valuek,indexk,array){
// valuek.sel=false
// })
// })
that.setData({
wordlist:res
})
}).catch((err) => {
})
... ... @@ -113,9 +95,11 @@ Page({
// 搜素地名关键字
seladdress(e) {
let that = this;
let id = e.currentTarget.dataset.id;
let index = e.currentTarget.dataset.index;
let parent_id = e.currentTarget.dataset.parent_id;
let name = e.currentTarget.dataset.name;
console.log(id,index,parent_id,name);
that.data.address.forEach(function(value, indexk, array) {
if (id == value.id) {
value.sel = !value.sel;
... ... @@ -130,33 +114,13 @@ Page({
}
}
})
that.setData({
address: that.data.address,
addressarr: that.data.addressarr
})
// app.globalData.addressarr = this.data.addressarr;
// app.globalData.textarr = this.data.textarr;
// app.globalData.pricearr = this.data.pricearr;
// app.globalData.keyword = this.data.keyword;
// app.globalData.type_id = this.data.type_id;
// app.globalData.index = this.data.index;
wx.navigateTo({
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,
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,
})
// this.setData({
// page: 1,
// searcharr: [],
// sousuoword: false
// })
// this.getsousuo();
},
// 搜索内容关键词
... ... @@ -183,28 +147,9 @@ Page({
text: that.data.text,
textarr: that.data.textarr
})
// app.globalData.addressarr = this.data.addressarr;
// app.globalData.textarr = this.data.textarr;
// app.globalData.pricearr = this.data.pricearr;
// app.globalData.keyword = this.data.keyword;
// app.globalData.type_id = this.data.type_id;
// app.globalData.index = this.data.index;
wx.navigateTo({
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,
})
// this.setData({
// page: 1,
// searcharr: [],
// sousuoword: false
// })
// this.getsousuo();
console.log(that.data.text);
console.log(that.data.textarr)
},
// 搜索价格关键词
... ... @@ -215,7 +160,6 @@ Page({
console.log(price)
let index = e.currentTarget.dataset.index;
that.data.price.forEach(function(value, indexk, array) {
if (price == value.name) {
console.log(value.name)
value.sel = !value.sel;
... ... @@ -235,37 +179,18 @@ Page({
price: that.data.price,
pricearr: that.data.pricearr
})
// app.globalData.addressarr = this.data.addressarr;
// app.globalData.textarr = this.data.textarr;
// app.globalData.pricearr = this.data.pricearr;
// app.globalData.keyword = this.data.keyword;
// app.globalData.type_id = this.data.type_id;
// app.globalData.index = this.data.index;
wx.navigateTo({
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,
})
// this.setData({
// page: 1,
// searcharr: [],
// sousuoword: false
// })
// this.getsousuo();
},
// 输入关键字搜索
enterword(e) {
console.log(e)
this.setData({
keyword: e.detail.value,
sousuoword: true
})
console.log(this.data.keyword)
},
... ... @@ -276,13 +201,9 @@ Page({
keyword: e.detail.value,
sousuoword: true
})
console.log('34874334899',this.data.type_id)
},
sousuo() {
app.globalData.addressarr = this.data.addressarr;
app.globalData.textarr = this.data.textarr;
app.globalData.pricearr = this.data.pricearr;
app.globalData.keyword = this.data.keyword;
... ... @@ -292,27 +213,8 @@ Page({
wx.navigateTo({
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,
})
// if (this.data.keyword == '') {
// wx.showToast({
// title: '请输入搜索内容',
// icon: 'none'
// })
// } else {
// }
// this.setData({
// page: 1,
// searcharr: [],
// sousuoword: false
// })
// this.getsousuo();
},
// 搜索列表
getsousuo() {
let that = this;
... ... @@ -332,10 +234,6 @@ Page({
that.setData({
searcharr: that.data.searcharr.concat(res)
})
// that.setData({
// sousuoword: true
// })
if (res.length != 0 && this.data.type_id == 1) {
that.setData({
showlist: 1,
... ... @@ -361,8 +259,6 @@ Page({
})
},
// 播放视频
govideo(e) {
console.log(e)
... ... @@ -371,10 +267,6 @@ Page({
wx.navigateTo({
url: '/pages/videodetail/videodetail?id=' + id,
})
// wx.navigateTo({
// url: '/pages/videoplay/videoplay?url=' + url,
// })
},
govideomei(e) {
... ...
... ... @@ -2,7 +2,6 @@
<view class="search">
<!-- <picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}">
<view class="searchleft">
<view class="searchleftname">{{array[indexk]}}</view>
<view class="searchsanjiao">
<image src='/img/sanjiaodown.png'></image>
... ... @@ -11,7 +10,6 @@
</view>
</picker> -->
<view class="searchright">
<view class="searchfightimg" bindtap="sousuo" wx:if="{{sousuoword}}">
<image src="/img/sousuo.png"></image>
</view>
... ... @@ -27,14 +25,11 @@
<view class="sousuoname" wx:else>搜索</view>
</view>
<view class="showitem" wx:if="{{show}}">
<view class="keyworditem" wx:for="{{wordlist}}" wx:key="index">
<view class="history">{{item.typename}}</view>
<view class="keyworditem" wx:for="{{wordlist}}" wx:for-item="word_item" wx:key="index">
<view class="history">{{word_item.typename}}</view>
<view class="searchjilu">
<view class="searchjiluitem {{item.sel==true?'selactive':''}}" wx:for="{{item.son}}" data-id="{{item.id}}" wx:key='' bindtap="seladdress" data-index="{{index}}">
<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}}">
{{item.name}}
</view>
</view>
... ... @@ -56,79 +51,49 @@
</view> -->
</view>
<view wx:else>
<view class="nodata" wx:if="{{searcharr.length==0}}">暂无数据</view>
<view wx:else>
<!-- 搜索视频 -->
<view class="searchlist" wx:if="{{showlist==1}}">
<view class="searchlistbox">
<view wx:for="{{searcharr}}" wx:key='' bindtap="govideo" data-url="{{item.video}}" data-id="{{item.id}}">
<view class="searchboximg">
<image src="{{item.thumbnail}}"></image>
<view class="anniu">
<image src="/img/anniu.png"></image>
</view>
</view>
<view class="picboxname">{{item.title}}</view>
</view>
</view>
</view>
<!-- 搜素图片 -->
<view class="searchimglist" wx:if="{{showlist==2}}">
<view wx:for="{{searcharr}}" wx:key='' bindtap="gopic" data-id="{{item.id}}">
<view class="searchimgitem">
<image src="{{item.thumbnail}}"></image>
</view>
<view class="picboxname">{{item.title}}</view>
</view>
</view>
<!-- 搜素精美大片 -->
<view class="searchlist" wx:if="{{showlist==3}}">
<view class="searchlistbox">
<view class="searchboximg" wx:for="{{searcharr}}" wx:key='' bindtap="govideomei" data-url="{{item.video}}">
<image src="{{item.thumbnail}}"></image>
<view class="anniu">
<image src="/img/anniu.png"></image>
</view>
</view>
<view class="picboxname">{{item.title}}</view>
</view>
<!-- <view class="moreshuju" bindtap="jiazai">
<view class="moreshujuleft">
<image src="/img/more.png"></image>
</view>
<view class="moredata">点击加载更多</view>
</view> -->
</view>
</view>
</view>
\ No newline at end of file
... ...
... ... @@ -25,11 +25,10 @@ Page({
selad: -1,
selte: -1,
selword: -1,
home_type_id:''
home_type_id:'',
sontype_id: '',
},
/**
* 生命周期函数--监听页面加载
*/
... ... @@ -37,6 +36,7 @@ Page({
console.log(options,'888899999')
if (options.index != undefined) {
this.setData({
sontype_id: options.sontype_id,
type_id: options.type_id,
addressarr: options.addressarr,
textarr:options.textarr,
... ... @@ -54,23 +54,9 @@ Page({
// index: app.globalData.index
// })
this.getsousuo()
},
// 输入关键字搜索
enterword(e) {
console.log(e)
this.setData({
... ... @@ -80,7 +66,6 @@ Page({
// pricearr:[],
// textarr:[]
})
console.log(this.data.keyword)
},
... ... @@ -91,30 +76,23 @@ Page({
keyword: e.detail.value,
sousuoword: true
})
},
sousuo() {
// if (this.data.keyword == '') {
// wx.showToast({
// title: '请输入搜索内容',
// icon: 'none'
// })
// } else {
// }
this.setData({
page: 1,
searcharr: [],
sousuoword: false
})
this.getsousuo();
},
// 搜索列表
getsousuo() {
let that = this;
... ... @@ -122,11 +100,9 @@ Page({
let url = 'index/video';
let param = {
home_type_id:that.data.home_type_id,
sontype_id: that.data.type_id,
type_id: that.data.type_id,
sontype_id: that.data.sontype_id,
keyword: that.data.keyword,
page: that.data.page,
pageNum: 10
}
... ... @@ -138,34 +114,35 @@ Page({
// that.setData({
// sousuoword: true
// })
if (res.length != 0 && this.data.type_id == 1) {
that.setData({
showlist: 1,
show: false
})
} else if (res.length != 0 && this.data.type_id == 2) {
that.setData({
showlist: 2,
show: false
})
} else if (res.length != 0 && this.data.type_id == 3) {
that.setData({
showlist: 3,
show: false
})
} else {
that.setData({
show: false
})
}
// if (res.length != 0 && this.data.type_id == 1) {
// that.setData({
// showlist: 1,
// show: false
// })
// } else if (res.length != 0 && this.data.type_id == 2) {
// that.setData({
// showlist: 2,
// show: false
// })
// } else if (res.length != 0 && this.data.type_id == 3) {
// that.setData({
// showlist: 3,
// show: false
// })
// } else {
// that.setData({
// show: false
// })
// }
}).catch((err) => {
})
},
// 播放视频
govideo(e) {
console.log(e)
... ... @@ -177,7 +154,6 @@ Page({
// wx.navigateTo({
// url: '/pages/videoplay/videoplay?url=' + url,
// })
},
govideomei(e) {
... ... @@ -248,17 +224,12 @@ Page({
this.getsousuo()
}
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
let that=this;
wx.setStorageSync('userid', that.data.user_id)
return {
... ... @@ -268,7 +239,6 @@ Page({
// path:'',
success: (res)=>{ // 成功后要做的事情
console.log(res)
},
fail: function (res) {
// 分享失败
... ...
... ... @@ -20,7 +20,7 @@
</view>
</view>
<view class="xiazaiitem">
<view class="xizaileft">影视剧上映日期:</view>
<view class="xizaileft">影视剧预计上映日期:</view>
<picker mode="date" value="{{date}}" bindchange="bindDateChange">
<view class="xiazairight">
{{yingdate}}
... ...
... ... @@ -11,7 +11,7 @@
<image src="/img/noselect.png" wx:else></image>
</view>
<view class="gouxuanright">我已阅读该协议内容，并且同意素材售出概不退换</view>
<view class="gouxuanright">我已阅读该协议内容，并且接受同意该协议内容的相关条款</view>
</view>
<view class="quebtn" bindtap="quezhifu">确定</view>
... ...
... ... @@ -27,6 +27,8 @@
align-items: center;
justify-content: center;
margin-top: 20rpx;
margin-left: 32rpx;
margin-right: 32rpx;
}
.quebtn {
... ...
... ... @@ -20,15 +20,25 @@
"checkInvalidKey": true,
"checkSiteMap": true,
"uploadWithSourceMap": true,
"compileHotReLoad": false,
"lazyloadPlaceholderEnable": false,
"useMultiFrameRuntime": true,
"useApiHook": true,
"useApiHostProcess": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"compileHotReLoad": false,
"enableEngineNative": false,
"useIsolateContext": true,
"useCompilerModule": false,
"userConfirmedUseCompilerModuleSwitch": false
"userConfirmedBundleSwitch": false,
"packNpmManually": false,
"packNpmRelationList": [],
"minifyWXSS": true,
"disableUseStrict": false,
"showES6CompileOption": false,
"useCompilerPlugins": false
},
"compileType": "miniprogram",
"libVersion": "2.9.2",
... ... @@ -42,15 +52,12 @@
"simulatorPluginLibVersion": {},
"condition": {
"search": {
"current": -1,
"list": []
},
"conversation": {
"current": -1,
"list": []
},
"plugin": {
"current": -1,
"list": []
},
"game": {
... ... @@ -58,11 +65,9 @@
"list": []
},
"gamePlugin": {
"current": -1,
"list": []
},
"miniprogram": {
"current": 8,
"list": [
{
"id": -1,
... ...