Commit 874536be authored by qipeng's avatar qipeng

Merge branch 'develop' of http://192.168.0.204/panyongping/uni-pdtravel into develop

parents cc470493 c7ad9196
......@@ -6,11 +6,18 @@ if(process.env.NODE_ENV === 'development'){//开发环境
baseUrl= 'https://manager.pangdly.com/'
}
const request = (url = '', data = {}, type = 'POST') => {
const request = (url = '', data = {},showLoad) => {
data.reqId = new Date().getTime() //获取时间戳
let show=showLoad||true
return new Promise((resolve, reject) => {
if(show){
uni.showLoading({
title:'加载中',
mask:true
})
}
uni.request({
method: type,
method: 'POST',
url: baseUrl + url+'?token='+uni.getStorageSync('token'),
data:data,
dataType: 'json',
......
......@@ -325,7 +325,7 @@
{
"path": "vlogface/vlogface",
"style": {
"navigationBarTitleText": "扫脸获取视频",
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff",
"navigationBarTextStyle": "black"
......@@ -452,14 +452,14 @@
"navigationStyle": "custom"
}
},
{
"path": "getPortrait",
"style": {
"navigationBarTitleText": "获取人像",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
// {
// "path": "getPortrait",
// "style": {
// "navigationBarTitleText": "",
// "enablePullDownRefresh": false,
// "navigationStyle": "custom"
// }
// },
{
"path": "myPhotoAlbum/myPhotoAlbum",
"style": {
......
......@@ -250,7 +250,6 @@ export default {
},
//---下载方法
downloadFun(imgUrl) {
console.log(imgUrl)
uni.showLoading({
title: '下载中',
mask: true
......
......@@ -359,10 +359,6 @@ export default {
latitude,
longitude
}
uni.showLoading({
title: '加载中',
mask:true
})
this.scenicList=[]
this.$request('/scenic/groupGood/findGroupGoodProductList', data).then(res => {
uni.hideLoading()
......
......@@ -231,9 +231,6 @@ export default {
//如果是点击进行搜索
data.search=this.searchData
}
uni.showLoading({
title: '加载中'
})
this.$request('scenic/user/merchant/findMerchantList', data).then(res => {
uni.hideLoading()
if (res.code == '00') {
......
......@@ -59,9 +59,6 @@ export default {
startPlayDate:new Date().Format('yyyy-MM-dd')+' 00:00:00',//开始日期
endPlayDate:new Date().Format('yyyy-MM-dd')+' 23:59:59',//结束日期
}
uni.showLoading({
title:'加载中'
})
this.$request('order/userOrder/findOrderPageListByCode',data).then((res)=>{
if(res.code=='00'){
let list=res.data||[]
......
......@@ -100,9 +100,6 @@ export default {
let data={
search:this.orderId
}
uni.showLoading({
title:'加载中'
})
this.$request('order/userOrder/findOrderPageListByCode',data).then((res)=>{
if(res.code=='00'){
let list=res.data||[]
......@@ -125,9 +122,6 @@ export default {
let data={
merchantCode:this.merchantCode, //商户code
}
uni.showLoading({
title:'加载中'
})
this.$request('distribution/distribution/findNewFetchInfoFromSceinc',data).then((res)=>{
if(res.code=='00'){
let main=res.data.main||null
......@@ -161,9 +155,6 @@ export default {
ticketPhone:this.ticketPhone,//电话号码
orderId:this.orderId,//订单Id
}
uni.showLoading({
title:'加载中'
})
this.$request('distribution/distribution/newFetchNumber',data).then((res)=>{
if(res.code=='00'){
uni.navigateTo({
......
......@@ -372,7 +372,6 @@ export default {
merchantId: this.merchantId,
companyId: this.companyId
}
uni.showLoading({ title: '加载中', mask: true })
this.$request('scenic/order/findCodePayInfo', data).then(res => {
uni.hideLoading()
if (res.code == '00') {
......@@ -393,7 +392,6 @@ export default {
id: this.companyId,//公司Id
tollPoint:this.extendInfo,//扩展信息
}
uni.showLoading({ title: '加载中', mask: true })
this.$request('user/newCompany/findCompanyById', data).then(res => {
uni.hideLoading()
if (res.code == '00') {
......
......@@ -413,10 +413,6 @@ export default {
let data={
productList:this.productIdList,//产品id列表
}
uni.showLoading({
title: '加载中',
mask:true
})
this.$request('scenic/groupGood/loadProductList', data).then(res => {
if (res.code == '00'){
this.productList=res.data||[]
......@@ -547,10 +543,6 @@ export default {
let data = {
merchantCode:item.merchantVo.code //商户code
}
uni.showLoading({
title: '加载中',
mask:true
})
this.$request('distribution/distribution/findNewFetchInfoFromSceinc', data).then(res => {
if (res.code == '00') {
this.sortArr = res.data.data||[]
......@@ -603,10 +595,6 @@ export default {
merchantCode: item.merchantVo.code, //商户code
productCode: item.code //产品code
}
uni.showLoading({
title: '加载中',
mask:true
})
this.$request('distribution/distribution/getTimeStock', data).then(res => {
if (res.code == '00') {
item.timeList=res.data||[]
......@@ -699,10 +687,6 @@ export default {
let data = {
merchantCode //商户code
}
uni.showLoading({
title: '加载中',
mask:true
})
this.$request('distribution/distribution/findNewFetchInfoFromSceinc', data).then(res => {
if (res.code == '00') {
this.sortInforPop = true
......@@ -1171,10 +1155,6 @@ export default {
orderSource:this.orderSource||1, //订单来源 1公众号平台、2公众号组合页面1、3公众号组合页面2、4胖丁伙伴app、5第三方自助机、6第三方票房窗口
orderProductList,//额外服务不为空,联票购买不为空,带有儿童票,组合购买不为空,单品购买为空
}
uni.showLoading({
title:'加载中',
mask:true
})
this.$request('orderc/order/createOrder', data).then((res) => {
if (res.code == '00') {
if (res.data.id) {
......
......@@ -524,10 +524,6 @@ export default {
let data = {
id: this.productId //产品id
}
uni.showLoading({
title: '加载中',
mask:true
})
this.$request('scenic/groupGood/loadProduct', data).then(res => {
if (res.code == '00') {
this.productIfo = res.data
......@@ -646,10 +642,6 @@ export default {
let data = {
merchantCode: this.merchantCode //商户code
}
uni.showLoading({
title: '加载中',
mask:true
})
this.$request('distribution/distribution/findNewFetchInfoFromSceinc', data).then(res => {
if (res.code == '00') {
this.sortArr = res.data.data
......@@ -697,10 +689,6 @@ export default {
merchantCode: this.merchantCode, //商户code
productCode: this.productIfo.code //产品code
}
uni.showLoading({
title: '加载中',
mask:true
})
this.$request('distribution/distribution/getTimeStock', data).then(res => {
if (res.code == '00') {
this.timeList = res.data||[]
......@@ -731,10 +719,6 @@ export default {
areaCode: this.areaObj.areaCode,
merchantCode: this.merchantCode //商户code
}
uni.showLoading({
title: '加载中',
mask:true
})
this.$request('distribution/distribution/findNewFetchInfoFromSceinc', data).then(res => {
if (res.code == '00') {
this.sortInforPop = true
......@@ -1306,10 +1290,6 @@ export default {
couponList, //券列表
}
}
uni.showLoading({
title:'加载中',
mask:true
})
this.$request('orderc/order/createOrder', data).then((res) => {
if (res.code == '00') {
if (res.data.id) {
......
<template>
<view class="content">
<view class="content" v-if="showBody">
<view class="bg">
<image src="../static/vlog/icon/camera.png"></image>
</view>
......@@ -35,6 +35,9 @@
</view>
<!-- <u-button type="success" size="medium" @click="takePhoto">开始识别</u-button> -->
</view>
<view v-else style="padding: 100rpx;text-align: center;font-size: 36rpx;">
升级中...
</view>
</template>
<script>
......@@ -45,14 +48,37 @@ export default {
text: 3, //倒计时
show: false, //摄像头倒计时文本
base64: '', //照片base64
showBody:false
}
},
onLoad() { //代替 vue 里面的 created
this.initdone()
},
// onLoad() { //代替 vue 里面的 created
// this.initdone()
// },
onReady() { //代替 vue 里面的 mounted
this.loadIcon()
},
methods: {
//---加载图标
loadIcon(){
let data={
merchantType:0,//商户类型,其他
}
this.$request('scenic/merchantExtendProject/loadList',data).then((res)=>{
if(res.code=='00'){
let iconList=res.data||[]
let list=[]
iconList.forEach(item=>{
if(item.projectStatus==0){
list.push(item)
}
})
if(list.length>6){
this.showBody=true
this.initdone()
}
}
})
},
query() { //人脸查询
uni.showLoading({
title: '人脸识别中'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment