Commit 881999b9 by 严立

请求接口函数替换

parent 1bcc5169
......@@ -36,7 +36,6 @@ App({
iMui(this) // m-ui 相关函数引入
iLogin(this) // 全局登录,根据 token 的情况执行相关操作
this.setUnitProportion()
console.log('wx.env', wx.env)
},
onShow: function () {
......@@ -251,29 +250,6 @@ App({
},
/**
* 注册
* @function
* @param {number} - funcAmountValue 金额,单位分
* @returns
*/
registUserInfo: function (obj) {
this.wxRequest({
url: 'v1/login/getDecryptData',
data: obj.param,
success: (res) => {
if (obj.success) {
obj.success(res)
}
},
fail: (err) => {
if (obj.fail) {
obj.fail(err)
}
}
})
},
/**
* 查询用户认证状态
* 仅在用户已经注册的前提下会查询此函数
* @function
......
@import '/wxss/reset.wxss';
@import './component/theme/layout.wxss';
@import './component/theme/theme.wxss';
@import './wxss/reset.wxss';
@import './wxss/layout.wxss';
@import './wxss/theme.wxss';
page {
display: flex;
......@@ -26,8 +26,6 @@ page {
height: 100%;
}
.bg-gradient {
background: linear-gradient(180deg, #FFFFFF 0%, #F3F4F6 20%, #F3F4F6 100%);
}
......
......@@ -18,21 +18,20 @@ Page({
// 查询门店评分
getOfficeAppraise: function() {
let that = this
let officeId = wx.getStorageSync('shopInfoBuffer').id
App.wxRequest({
App.request({
url: 'v1/appraise/getOfficeAppraise',
data: {
params: {
'officeId': '8a3e59c57f564c569b3d7bb278ea50b3'
},
success: function(response) {
}
})
.then((response) => {
let funcData = response.data
that.setData({
this.setData({
officeServiceText: funcData.serviceEvaluation.toFixed(1),
officeProductText: funcData.productEvaluatio.toFixed(1),
officeEnvironmentalText: funcData.environmentalEvaluation.toFixed(1),
})
}
})
},
......@@ -43,14 +42,15 @@ Page({
* @returns
*/
getAppraise: function () {
App.wxRequest({
App.request({
url: 'v1/appraise/getList',
data: {
params: {
'pageNo': '1',
'pageSize': '-1',
'officeId': '8a3e59c57f564c569b3d7bb278ea50b3'
},
success: (response) => {
})
.then((response) => {
let funcResponse = response.data
let funcList = []
......@@ -100,7 +100,6 @@ Page({
detailEvaluate: funcEvaluate
})
})
}
})
},
......
......@@ -69,27 +69,25 @@ Page({
// 获取活动信息
queryActivity: function () {
let that = this
let shopInfo = wx.getStorageSync('shopInfoBuffer')
App.wxRequest({
App.request({
url: 'v1/activity/getList',
data: {
params: {
'listType': '1',
'pageSize': '5',
'pageNo': '1',
'officeId': shopInfo.id
},
success: function(res) {
let funcData = res.data.list
that.setData({
})
.then((response) => {
let funcData = response.data.list
this.setData({
childActivity: funcData
})
}
})
},
queryEvaluate: function () {
let that = this
let shopInfo = wx.getStorageSync('shopInfoBuffer')
App.request({
url: 'v1/appraise/getOfficeAppraise',
......
......@@ -69,27 +69,25 @@ Page({
// 获取活动信息
queryActivity: function () {
let that = this
let shopInfo = wx.getStorageSync('shopInfoBuffer')
App.wxRequest({
App.request({
url: 'v1/activity/getList',
data: {
params: {
'listType': '1',
'pageSize': '5',
'pageNo': '1',
'officeId': shopInfo.id
},
success: function(res) {
let funcData = res.data.list
that.setData({
})
.then((response) => {
let funcData = response.data.list
this.setData({
childActivity: funcData
})
}
})
},
queryEvaluate: function () {
let that = this
let shopInfo = wx.getStorageSync('shopInfoBuffer')
App.request({
url: 'v1/appraise/getOfficeAppraise',
......
......@@ -149,13 +149,12 @@ Page({
} else {
funcBanner[funcIndex] = ''
}
This.setData({
this.setData({
banner: funcBanner
})
})
}
let This = this
// 0 首页,1 所有服务,2 儿童营地,3 海错图,4 元养水韵,5 儿童营地接待,6 拾光花坊, 7 商品
let funcShopList = [2, 3, 4, 5, 6]
for (let i = 0, l = funcShopList.length; i < l; i++) {
......@@ -200,16 +199,17 @@ Page({
}
// 顶部第一商店推荐
App.wxRequest({
App.request({
url: 'v1/commodity/recommend',
data: {
params: {
'officeId': funcShopInfo[0].shopId,
'genre': 5,
'tag': '202',
'pageNo': 1,
'pageSize': 4
},
success: (response) => {
}
})
.then((response) => {
let funcResponse = response.data
let funcList = []
for (let i = 0, l = funcResponse.length; i < l; i++) {
......@@ -225,20 +225,20 @@ Page({
this.setData({
shopRecommendA: funcList
})
}
})
// 顶部第二商店推荐
App.wxRequest({
App.request({
url: 'v1/commodity/recommend',
data: {
params: {
'officeId': funcShopInfo[1].shopId,
'genre': 5,
'tag': '202',
'pageNo': 1,
'pageSize': 4
},
success: (response) => {
})
.then((response) => {
let funcResponse = response.data
let funcList = []
for (let i = 0, l = funcResponse.length; i < l; i++) {
......@@ -254,20 +254,20 @@ Page({
this.setData({
shopRecommendB: funcList
})
}
})
// 底部第一商店推荐
App.wxRequest({
App.request({
url: 'v1/commodity/recommend',
data: {
params: {
'officeId': funcShopInfo[2].shopId,
'genre': 4,
'tag': '202',
'pageNo': 1,
'pageSize': 4
},
success: (response) => {
})
.then((response) => {
let funcResponse = response.data
let funcList = []
for (let i = 0, l = funcResponse.length; i < l; i++) {
......@@ -283,20 +283,20 @@ Page({
this.setData({
shopRecommendC: funcList
})
}
})
// 底部第二商店推荐
App.wxRequest({
App.request({
url: 'v1/commodity/recommend',
data: {
params: {
'officeId': funcShopInfo[3].shopId,
'genre': 4,
'tag': '202',
'pageNo': 1,
'pageSize': 4
},
success: (response) => {
})
.then((response) => {
let funcResponse = response.data
let funcList = []
for (let i = 0, l = funcResponse.length; i < l; i++) {
......@@ -312,7 +312,6 @@ Page({
this.setData({
shopRecommendD: funcList
})
}
})
},
......
......@@ -149,13 +149,14 @@ Page({
* @returns
*/
querySideBar: function () {
App.wxRequest({
App.request({
url: 'v1/commodity/getClassifys',
data: {
params: {
'officeId': this.data.shopInfo.id,
'genre': this.data.shopInfo.shopType,
},
success: (response) => {
})
.then((response) => {
let funcSideBar = []
let funcResponse = response.data
for (let i = 0, l = funcResponse.length; i < l; i++) {
......@@ -183,7 +184,6 @@ Page({
})
this.queryCommodity()
}
})
},
......@@ -422,14 +422,15 @@ Page({
onCommodityDetail: function (event) {
let funcItem = event.currentTarget.dataset.item
App.wxRequest({
App.request({
url: 'v1/commodity/getCommodityParticulars',
data: {
params: {
'commodityId': funcItem.id,
'classifyId': funcItem.typeId,
'genre': this.data.shopInfo.shopType,
},
success: (response) => {
})
.then((response) => {
let funcResponse = response.data
funcItem.banner = funcResponse.imgs.split('|')
funcItem.banner.pop()
......@@ -439,7 +440,6 @@ Page({
commodityDetail: funcItem,
winCommodityDetail: true
})
}
})
},
......
......@@ -68,13 +68,14 @@ Page({
shopInfo: wx.getStorageSync('shopInfoBuffer')
})
App.wxRequest({
App.request({
url: 'v1/commodity/getCommoditys',
data: {
params: {
'officeId': this.data.shopInfo.id,
'genre': this.data.shopInfo.shopType,
},
success: (response) => {
})
.then((response) => {
let funcCommodityList = []
let funcResponse = response.data
......@@ -168,9 +169,6 @@ Page({
winLoading: false,
commodityList: this.data.commodityList.concat(funcCommodityList),
})
console.log(this.data.commodityList)
},
})
},
......@@ -179,13 +177,14 @@ Page({
shopInfo: wx.getStorageSync('shopInfoBuffer')
})
App.wxRequest({
App.request({
url: 'v1/commodity/getCommoditys',
data: {
params: {
'officeId': this.data.shopInfo.id,
'genre': 3,
},
success: (response) => {
})
.then((response) => {
let funcCommodityList = []
let funcResponse = response.data
......@@ -279,7 +278,6 @@ Page({
winLoading: false,
commodityList: this.data.commodityList.concat(funcCommodityList),
})
},
})
},
......
......@@ -34,12 +34,13 @@ Page({
},
queryBanner: function () {
App.wxRequest({
App.request({
url: 'v1/banner/getOfficeByBanner',
data: {
params: {
'smColumnId': 1,
},
success: (response) => {
})
.then((response) => {
let funcResponse = response.data
let funcList = []
......@@ -55,7 +56,6 @@ Page({
this.setData({
banner: funcList
})
}
})
},
......@@ -73,13 +73,14 @@ Page({
}
}
App.wxRequest({
App.request({
url: 'v1/commodity/getCommoditys',
data: {
params: {
'officeId': funcShopId,
'genre': funcCommodityType,
},
success: (response) => {
})
.then((response) => {
let funcCommodityList = []
let funcResponse = response.data
......@@ -183,12 +184,11 @@ Page({
funcCommodityItem.describe = ''
funcCommodityList = [funcCommodityItem]
App.wxRequest({
App.request({
url: 'v1/commodity/getSpaPriceRange',
data: {
},
success: (response) => {
params: {},
})
.then((response) => {
let funcResponse = response.data
funcCommodityItem.priceMin = App.modular.utils.formatAmount(funcResponse.sightseerPriceMin)
funcCommodityItem.priceMax = App.modular.utils.formatAmount(funcResponse.sightseerPriceMax)
......@@ -200,10 +200,8 @@ Page({
this.setData({
shopCommodityData: funcShopCommodityData,
})
}
})
}
},
})
},
......@@ -274,12 +272,13 @@ Page({
// 商品
// 跳转商品下单,需要查询商品参数
if (funcItme.targetId === '') return
App.wxRequest({
App.request({
url: 'v1/commodity/getCommodityParticulars',
data: {
params: {
'commodityId': funcItme.targetId
},
success: (response) => {
})
.then((response) => {
let funcCommodityInfo = App.setCommodityInfo(response.data)
let funcShopInfo = App.globalData.shopId
......@@ -295,7 +294,6 @@ Page({
wx.navigateTo({
url: funcUrl
})
}
})
break
}
......
......@@ -197,17 +197,17 @@ Page({
duration: 60000,
})
App.wxRequest({
App.request({
url: 'v1/subscribe/doSubscribe',
data: {
params: {
mobile: this.data.formPhone,
subscribeNum: this.data.formQuantity,
subscribeDate: this.data.formDate + ' 00:00:00',
name: this.data.formName,
type: 1,
},
success: (response) => {
let funcResponse = response
})
.then((response) => {
if (response.data && response.data.code === 500) {
App.ui.showToast({
iconType: 'error',
......@@ -220,13 +220,12 @@ Page({
this.setData({
appointmentComplete: true,
})
},
fail: (response) => {
})
.catch((response) => {
App.ui.showToast({
iconType: 'error',
title: response.msg,
})
}
})
},
......
......@@ -17,25 +17,26 @@ Page({
// 最新动态详情
getNoticeDetail() {
var that = this
App.wxRequest({
App.request({
url: 'v1/dynamic/getDetail',
data: { id: that.data.id },
success: function (res) {
var content = res.data.content.replace(/<img/gi, '<img style="width:100%;height:auto;display:block" ')
params: {
id: this.data.id
},
})
.then((response) => {
let content = response.data.content.replace(/<img/gi, '<img style="width:100%;height:auto;display:block" ')
.replace(/<table/gi, '<table style="max-width:100%;height:auto;display:block" ')
.replace(/<section/g, '<div')
.replace(/\/section>/g, '\div>');
var response = {
cover: res.data.imgs.length > 0 ? res.data.imgs[0] : '',
title: res.data.title,
date: res.data.releaseTime,
let funcResponse = {
cover: response.data.imgs.length > 0 ? response.data.imgs[0] : '',
title: response.data.title,
date: response.data.releaseTime,
describe: content,
}
that.setData({
notice: response
this.setData({
notice: funcResponse
})
}
})
},
......
......@@ -24,17 +24,20 @@ Page({
// 最新动态列表
getNoticeList() {
var that = this
App.wxRequest({
App.request({
url: 'v1/dynamic/getList',
data: { pageSize: that.data.pageSize, pageNo: that.data.pageNo },
success: function (res) {
that.setData({
params: {
pageSize: this.data.pageSize,
pageNo: this.data.pageNo
},
})
.then((response) => {
this.setData({
loading: false
})
let count = that.data.notice.length
let count = this.data.notice.length
var tmpArr = [];
res.data.list.forEach(item => {
response.data.list.forEach(item => {
var content = item.summary.replace(/<img/gi, '<img style="width:100%;height:auto;display:block" ')
.replace(/<table/gi, '<table style="max-width:100%;height:auto;display:block" ')
.replace(/<section/g, '<div')
......@@ -48,24 +51,22 @@ Page({
}
tmpArr.push(tmpItem)
})
if (that.data.pageNo == 1) {
that.setData({
moreData: (tmpArr.length >= Number(res.data.count)) ? false : true,
if (this.data.pageNo == 1) {
this.setData({
moreData: (tmpArr.length >= Number(response.data.count)) ? false : true,
notice: tmpArr
})
} else {
that.setData({
moreData: (tmpArr.length + count >= Number(res.data.count)) ? false : true,
notice: that.data.notice.concat(tmpArr)
this.setData({
moreData: (tmpArr.length + count >= Number(response.data.count)) ? false : true,
notice: this.data.notice.concat(tmpArr)
})
}
},
fail: function (err) {
that.setData({
})
.catch((response) => {
this.setData({
loading: false
})
}
})
},
......
......@@ -21,14 +21,15 @@ Page({
},
getBrands: function (index) {
App.wxRequest({
App.request({
url: 'v1/common/getBrands',
success: (response) => {
params: {},
})
.then((response) => {
let history = response.data[index]
this.setData({
history
})
}
})
},
})
\ No newline at end of file
......@@ -231,20 +231,21 @@ Page({
title: '提交中',
duration: 60000,
})
App.wxRequest({
App.request({
url: 'v1/subscribe/doSubscribe',
data: {
params: {
mobile: this.data.formPhone,
subscribeNum: this.data.formQuantity,
subscribeDate: this.data.formDate + ' 00:00:00',
name: this.data.formName,
type: 0,
},
success: (res) => {
if (res.data && res.data.code == 500) {
})
.then((response) => {
if (response.data && response.data.code == 500) {
App.ui.showToast({
iconType: 'error',
title: res.data.msg,
title: response.data.msg,
})
} else {
......@@ -253,13 +254,12 @@ Page({
})
App.ui.hideToast()
}
},
fail: (err) => {
})
.catch((response) => {
App.ui.showToast({
iconType: 'error',
title: err.msg,
title: response.msg,
})
}
})
},
......@@ -274,20 +274,20 @@ Page({
// 预约入园查询返回剩余名额
queryQuota: function () {
App.wxRequest({
App.request({
url: 'v1/subscribe/getResidue',
data: {
params: {
subscribeDate: this.data.formDate + ' 00:00:00',
type: 0,
},
success: (res) => {
})
.then((response) => {
this.setData({
total: res.data.total,
total: response.data.total,
winQuota: true,
formQuantity: 0,
})
this.updateSubmitButtonStatus()
}
})
},
......
......@@ -22,90 +22,67 @@ Page({
})
},
navBack: function (e) {
if (this.data.islogin && this.data.isphone) {
console.log('授权及绑定成功')
} else {
console.log('back home')
// setTimeout(()=>{
// wx.switchTab({
// url: '/pages/home/home',
// })
// },300)
}
},
/*
* 获取用户信息
*/
userInfoHandler: function (res) {
let funcGetUserInfo = res.detail.userInfo
if (!res.detail.userInfo) {
return
onGetUserInfo: function (funcEvent) {
console.log(funcEvent)
if (funcEvent.detail.errMsg === 'getUserInfo:ok') {
let funcUserInfo = {
'name': funcEvent.detail.userInfo.nickName,
'avatar': funcEvent.detail.userInfo.avatarUrl,
}
let funcUserInfo = this.data.userInfo
funcUserInfo.avatar = funcGetUserInfo.avatarUrl
funcUserInfo.name = funcGetUserInfo.nickName
funcUserInfo.sex = funcGetUserInfo.gender
this.registUserInfo({
param: {
avatarUrl: funcUserInfo.avatar,
nickName: funcUserInfo.name,
sessionKey: '',
encryptedData: '',
iv: '',
App.request({
url: 'v1/login/getDecryptData',
params: {
'iv': '',
'sessionKey': '',
'encryptedData': '',
'nickName': funcUserInfo.name,
'avatarUrl': funcUserInfo.avatar,
},
success: (res) => {
})
.then((response) => {
wx.setStorageSync('userInfo', Object.assign(wx.getStorageSync('userInfo'), funcUserInfo))
this.setData({
islogin: true
})
setTimeout(() => {
this.checkFinish()
}, 1000)
}
})
}
},
/*
* 绑定手机号
*/
userPhoneHandler: function (res) {
if (!res.detail.encryptedData) {
userPhoneHandler: function (funcEvent) {
console.log(funcEvent)
if (!funcEvent.detail.encryptedData) {
return
}
let sessionKey = wx.getStorageSync('sessionKey')
let funcUserInfo = wx.getStorageSync('userInfo')
this.registUserInfo({
param: {
avatarUrl: funcUserInfo.avatar,
nickName: funcUserInfo.name,
sessionKey: sessionKey,
encryptedData: res.detail.encryptedData,
iv: res.detail.iv,
let funcIv = funcEvent.detail.iv
let funcSessionKey = wx.getStorageSync('sessionKey')
let funcEncryptedData = funcEvent.detail.encryptedData
App.request({
url: 'v1/login/getDecryptData',
params: {
'iv': funcIv,
'sessionKey': funcSessionKey,
'encryptedData': funcEncryptedData,
'nickName': '',
'avatarUrl': '',
},
success: (res) => {
funcUserInfo.phone = res.data.phoneNumber
})
.then((response) => {
funcUserInfo.phone = response.data.phoneNumber
wx.setStorageSync('userInfo', Object.assign(wx.getStorageSync('userInfo'), funcUserInfo))
this.setData({
isphone: true
})
setTimeout(() => {
this.checkFinish()
}, 1000)
}
})
},
registUserInfo: function (obj) {
App.registUserInfo({
param: obj.param,
success: function(res) {
if (obj.success) {
obj.success(res)
}
}
})
},
......@@ -117,7 +94,7 @@ Page({
let funcTimer = setTimeout(() => {
wx.navigateBack({})
clearTimeout(funcTimer)
}, 1000)
}, 2000)
}
}
})
\ No newline at end of file
......@@ -9,7 +9,7 @@
<image src="{{resourcesBase + 'login/content.png'}}"></image>
</view>
<view class="login-operation">
<button class="login-operation-authorization" hidden="{{islogin}}" open-type="getUserInfo" bindgetuserinfo="userInfoHandler">微信授权登录</button>
<button class="login-operation-authorization" hidden="{{islogin}}" open-type="getUserInfo" bindgetuserinfo="onGetUserInfo">微信授权登录</button>
<view class="login-operation-authorization-complete row cc ac" hidden="{{!islogin}}">
<text class="fs30 fw400">已授权</text>
<image class="i32" src="../../image/icon/tick-3.png"></image>
......
......@@ -368,12 +368,13 @@ Page({
'duration': 60000
})
App.wxRequest({
App.request({
url: 'v1/volume/getVolume',
data: {
params: {
'volumeId': funcOrderInfo.codeId
},
success: (response) => {
})
.then((response) => {
App.ui.hideToast()
let funcResponse = response.data
......@@ -386,7 +387,6 @@ Page({
codeInfo: funcCodeInfo,
winCode: true,
})
}
})
},
// 多二维码 复制券码
......
......@@ -62,12 +62,13 @@ Page({
isDoing: true
})
App.wxRequest({
App.request({
url: 'v1/subscribe/cancelSubscribe',
data: {
params: {
'id': this.data.tickerInfo.id
},
success: (response) => {
})
.then((response) => {
App.ui.hideToast()
this.setData({
isDoing: false
......@@ -98,10 +99,8 @@ Page({
})
}, 2000);
}
}
})
},
fail: () => {},
})
},
//客服热线拨打
......
......@@ -252,13 +252,14 @@ Page({
isDoing: true
})
let funcItem = event.target.dataset.item
App.wxRequest({
App.request({
url: 'v1/activity/doCancel',
data: {
params: {
'enrollId': funcItem.enrollId,
'type': type, //0取消1删除
},
success: (response) => {
})
.then((response) => {
App.ui.hideToast()
if (response.data && response.data.code == 500) {
App.ui.showToast({
......@@ -278,10 +279,8 @@ Page({
this.queryActivityList()
}, 2000);
}
}
})
},
fail: () => {},
})
},
// 预约列表/我的预约
......@@ -308,16 +307,17 @@ Page({
this.setData({
isLoading: true
})
App.wxRequest({
App.request({
url: 'v1/subscribe/getList',
data: {
params: {
state: 1, //未过期 1,其他 空字符""
type: type //0 入园预约 1 看房预约 全部 空字符
},
success: (res) => {
})
.then((response) => {
App.ui.hideToast()
let tmpArr = []
res.data.forEach(item => {
response.data.forEach(item => {
let type = item.type * 1
let title = ''
let url = ''
......@@ -348,7 +348,6 @@ Page({
data: tmpArr,
isLoading: false
})
}
})
},
......
......@@ -92,12 +92,14 @@ Page({
// 获取业主认证信息
getAuth() {
let that = this
App.wxRequest({
App.request({
url: 'v1/userAuth/getAuth',
method: 'GET',
success: function(res) {
let state = res.data.state * 1 // 0 待审核 1 审核通过 2 不通过
params: {},
})
.then((response) => {
let funcResponseData = response.data
let state = funcResponseData.state * 1 // 0 待审核 1 审核通过 2 不通过
let type = 1 // 判断页面显示的类型 1.填写表单 2.认证中 3.认证失败
switch (state) {
case 0:
......@@ -116,22 +118,19 @@ Page({
type = 3;
break;
}
that.setData({
this.setData({
type: type,
name: res.data.name ? res.data.name : '',
phone: res.data.mobile ? res.data.mobile : '',
room: res.data.roomNo ? res.data.roomNo : '',
idCard: res.data.idcard ? res.data.idcard : '',
remarks: res.data.remarks ? res.data.remarks : ''
name: funcResponseData.name ? funcResponseData.name : '',
phone: funcResponseData.mobile ? funcResponseData.mobile : '',
room: funcResponseData.roomNo ? funcResponseData.roomNo : '',
idCard: funcResponseData.idcard ? funcResponseData.idcard : '',
remarks: funcResponseData.remarks ? funcResponseData.remarks : ''
})
}
})
},
// 提交认证申请
onSubmit() {
let that = this
let phone = this.data.phone
let room = this.data.room
let name = this.data.name
......@@ -152,29 +151,29 @@ Page({
duration: 60000
})
App.wxRequest({
App.request({
url: 'v1/userAuth/doAuth',
data: {
params: {
mobile: phone,
name: name,
idcard: idCard,
roomNo: room,
},
success: function(res) {
})
.then((response) => {
App.ui.showToast({
iconType: 'success',
title: '提交成功',
})
that.setData({
this.setData({
type: 2
})
},
fail: function(err) {
})
.catch((response) => {
App.ui.showToast({
iconType: 'error',
title: err.msg,
title: response.msg,
})
}
})
},
......
......@@ -47,16 +47,17 @@ Page({
'title': '加载中',
'duration': 60000
})
App.wxRequest({
App.request({
url: 'v1/volume/getVolumeList',
data: {
params: {
status: '', //0已过期1待使用2已使用(""全部)
pageNo: 1,
pageSize: -1
},
success: (res) => {
})
.then((response) => {
App.ui.hideToast()
let list = res.data.map(item => {
let list = response.data.map(item => {
let shopFilter = this.data.shopConfig.filter(k => {
return k.name.toLowerCase() == item.officeName.toLowerCase()
})
......@@ -94,9 +95,9 @@ Page({
passList: filterList,
marginTop
})
}
})
},
setView: function () {
switch (this.data.passListType) {
case 0:
......@@ -207,18 +208,17 @@ Page({
let funcItem = event.currentTarget.dataset.item
App.wxRequest({
App.request({
url: 'v1/order/getOrderDetail',
data: {
params: {
'orderId': funcItem.orderId
},
success: (response) => {
})
.then((response) => {
this.setData({
noticeDetail: response.data.particulars,
winNoticeDetail: true
})
}
})
},
......
......@@ -163,16 +163,15 @@ Page({
* @returns
*/
queryIntegral() {
let that = this
App.wxRequest({
App.request({
url: 'v1/smUser/getIntegral',
data: {},
success: function (res) {
let integral = res.data ? res.data.integral : '0'
that.setData({
params: {},
})
.then((response) => {
let integral = response.data ? response.data.integral : '0'
this.setData({
integral: integral
})
}
})
},
......
......@@ -274,14 +274,14 @@
<view class="club_examine row cc ac" wx:if="{{clubExamine > 0}}">
<text>{{clubExamine}}</text>
</view>
<image class="icon" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
<image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view>
</block>
<!-- 客服中心 -->
<view class="service row cb ac" bindtap="onService">
<text>客服中心</text>
<image class="icon" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
<image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view>
</view>
</view>
......
......@@ -119,12 +119,12 @@ Page({
'address': this.data.userInfo.address,
'birthday': this.data.userInfo.birthday,
}
App.wxRequest({
App.request({
url: 'v1/smUser/doUpdateInfo',
data: param,
success: (res) => {
params: param,
})
.then((response) => {
wx.setStorageSync('userInfo', this.data.userInfo)
}
})
},
......
......@@ -167,7 +167,6 @@ Page({
* @returns
*/
setOrderType: function () {
let that = this;
App.wxRequest({
url: 'v1/common/getDictByType',
data: {
......@@ -209,7 +208,7 @@ Page({
let orderTypeActive = 0 //
let aVal = ''
funcList.forEach((item, index) => {
if (item.value == that.data.optionsGoodType) {
if (item.value == this.data.optionsGoodType) {
typeTitle = item.name
orderTypeActive = index
}
......@@ -439,7 +438,6 @@ Page({
onOrderPay: function (event) {
// 数据校验不通过
let that = this
let funcItem = event.currentTarget.dataset.item
let wxRequest = funcItem.wxRequest
......@@ -452,11 +450,11 @@ Page({
signType: wxRequest.signType,
paySign: wxRequest.paySign,
success(res) {
that.setData({
this.setData({
'orderList': [],
'orderPages': 1,
})
that.queryOrder()
this.queryOrder()
},
fail(res) {}
})
......
......@@ -83,12 +83,13 @@ Page({
'iconType': 'loading',
'title': '提交中',
})
App.wxRequest({
App.request({
url: 'v1/smFeedback/doFeedBack',
data: {
params: {
content: this.data.feedbackContent
},
success: (res) => {
})
.then((response) => {
App.ui.showToast({
'iconType': 'success',
'title': '提交成功',
......@@ -98,13 +99,12 @@ Page({
title: '客服中心',
feedbackContent: '',
})
},
fail: (err) => {
})
.catch((response) => {
App.ui.showToast({
'iconType': 'error',
'title': err.msg,
'title': response.msg,
})
}
})
},
......
......@@ -80,16 +80,17 @@ Page({
duration: 60000
})
App.wxRequest({
App.request({
url: 'v1/volume/doVolume',
data: {
params: {
volumeId: this.data.couponDetail.volumeId,
},
success: (res) => {
if (res.data && res.data.code * 1 == 500) {
})
.then((response) => {
if (response.data && response.data.code * 1 == 500) {
App.ui.showToast({
iconType: 'error',
title: res.data.msg,
title: response.data.msg,
})
} else {
App.ui.showToast({
......@@ -100,13 +101,12 @@ Page({
wx.navigateBack()
}, 2000);
}
},
fail: (err) => {
})
.catch((response) => {
App.ui.showToast({
iconType: 'error',
title: err.msg,
title: response.msg,
})
}
})
}
})
\ No newline at end of file
......@@ -32,13 +32,11 @@ Page({
},
// 扫码
handleScanCode() {
let that = this
wx.scanCode({
onlyFromCamera: true,
success: (res) => {
console.log(res)
let result = res.result
that.getVolumeDetails(result)
this.getVolumeDetails(result)
}
})
},
......
......@@ -44,14 +44,14 @@ Page({
* @param
* @returns
*/
queryOrderDetail: function () {
let that = this
App.wxRequest({
queryOrderDetail: function () {s
App.request({
url: 'v1/order/getOrderDetail',
data: {
params: {
'orderId': this.data.orderInfo.id
},
success: (response) => {
})
.then((response) => {
let funcResponse = response.data
let funcOrderInfo = {
'id': this.data.orderInfo.id,
......@@ -107,15 +107,15 @@ Page({
let residueStamp = endTime - now
let residuePayTime = App.modular.miment(residueStamp).format('mm:ss')
if (residueStamp > 0) {
that.setData({
this.setData({
residuePayTime: residuePayTime
})
} else {
clearInterval(timeInter)
// that.queryOrderDetail()
// this.queryOrderDetail()
let state = `orderInfo.state`
that.setData({
this.setData({
[state]: -1
})
}
......@@ -132,7 +132,6 @@ Page({
if (this.data.isFromUse) {
}
}
})
},
......@@ -267,9 +266,9 @@ Page({
},
saveCommentInfo: function () {
App.wxRequest({
App.request({
url: 'v1/order/doAppraise',
data: {
params: {
'orderId': this.data.orderInfo.id,
'imgUrls': this.data.evaluateAlbum,
'serviceEvaluation': this.data.scoreServe,
......@@ -277,7 +276,8 @@ Page({
'environmentalEvaluation': this.data.scoreEnvironment,
'content': this.data.evaluateContent
},
success: (response) => {
})
.then((response) => {
App.ui.showToast({
iconType: 'success',
title: '评价成功',
......@@ -289,7 +289,6 @@ Page({
})
}
})
}
})
},
......
......@@ -246,13 +246,14 @@ Page({
title: '处理中',
duration: 60000,
})
App.wxRequest({
App.request({
url: 'v1/order/cancelOrder',
data: {
params: {
'orderId': this.data.orderInfo.id,
'type': type,
},
success: (response) => {
})
.then((response) => {
App.ui.showToast({
iconType: 'success',
title: type == 1 ? '订单删除成功' : '订单取消成功',
......@@ -267,7 +268,6 @@ Page({
})
}
})
}
})
}
})
......
......@@ -302,16 +302,16 @@ Page({
break
}
}
App.wxRequest({
App.request({
url: 'v1/park/getDetail',
data: {
params: {
'id': funcPointId
},
success: (response) => {
})
.then((response) => {
this.setData({
buyContentTime: response.data.businessTime
})
}
})
},
......@@ -570,14 +570,15 @@ Page({
setStock: function () {
let funcItem = this.data.shoppingCartList[0]
App.wxRequest({
App.request({
url: 'v1/commodity/getCommodityParticulars',
data: {
params: {
'commodityId': funcItem.id,
'classifyId': funcItem.typeId,
'genre': this.data.shopInfo.shopType,
},
success: (response) => {
})
.then((response) => {
let funcResponse = response.data
let funcRegisterTitle
let funcQuantityStock
......@@ -630,7 +631,6 @@ Page({
quantityTipNumber: funcQuantityStock,
quantityMax: funcQuantityStock < this.data.quantityMax ? funcQuantityStock : this.data.quantityMax
})
}
})
},
......@@ -668,10 +668,13 @@ Page({
switch (this.data.orderType) {
case 6:
case 7:
App.wxRequest({
App.request({
url: 'v1/activity/getDetail',
data: { 'id': this.data.shoppingCartList[0].id },
success: (response) => {
params: {
'id': this.data.shoppingCartList[0].id
},
})
.then((response) => {
let funcResponse = response.data
let funcRichText = funcResponse.notice
.replace(/<img/gi, '<img style="max-width:100%;height:auto;display:block" ')
......@@ -681,17 +684,17 @@ Page({
this.setData({
noticeDetail: funcRichText
})
}
})
break
default:
App.wxRequest({
App.request({
url: 'v1/commodity/getNotification',
data: {
params: {
'notificationId': this.data.shoppingCartList[0].notificationId
},
success: (response) => {
})
.then((response) => {
let funcResponse = response.data
let funcRichText = funcResponse.particulars
.replace(/<img/gi, '<img style="max-width:100%;height:auto;display:block" ')
......@@ -701,7 +704,6 @@ Page({
this.setData({
noticeDetail: funcRichText
})
}
})
}
......@@ -937,9 +939,9 @@ Page({
}
// 发送下单请求
App.wxRequest({
App.request({
url: 'v1/order/doOrder',
data: {
params: {
'isPayment': Number(this.data.payAmount) === 0 ? 0 : 2,
'totalMoney': Number(this.data.payAmount),
'office': { 'id': this.data.shopInfo.id },
......@@ -949,7 +951,8 @@ Page({
'mobilePhone': funcRegisterInfo[0].phone,
'goodType': this.data.shopInfo.shopType,
},
success: (response) => {
})
.then((response) => {
if (/ 商品不存在/.test(response.data.msg)) {
wx.setStorageSync('shoppingCartBuffer', [])
App.ui.showToast({
......@@ -1044,12 +1047,11 @@ Page({
// 开启支付状态轮询
// wx.showLoading({ title: '正在获取数据', mask: true })
this.queryPayStatus(pagePayId)
},
fail: (error) => {
})
.catch((response) => {
this.setData({
isPaySubmit: true,
})
}
})
},
......@@ -1124,18 +1126,18 @@ Page({
App.globalData.payStateTimer = setInterval(() => {
if (!pagePayId) return
App.wxRequest({
App.request({
url: 'v1/order/getOrderStatus',
data: {
params: {
'orderId': pagePayId
},
success: (response) => {
})
.then((response) => {
// -1 - 已取消,0 - 未付款,1 - 未发货,2 - 待使用,3 - 已使用,4 - 已过期
let funcResponse = response.data
if (funcResponse.status === '2') {
this.payStatus(true)
}
}
})
funcIndex = funcIndex + 1
......
......@@ -26,10 +26,13 @@ Page({
//主题活动详情
queryActivityDetail: function () {
App.wxRequest({
App.request({
url: 'v1/activity/getDetail',
data: { id: this.data.id },
success: (response) => {
params: {
id: this.data.id
},
})
.then((response) => {
let funcResponse = response.data
let funcItem = {
......@@ -95,7 +98,6 @@ Page({
}
})
this.configActiveState(funcResponse.activeState * 1)
}
})
},
// 活动报名
......
......@@ -79,15 +79,16 @@ Page({
* @returns
*/
queryMovie: function () {
App.wxRequest({
App.request({
url: 'v1/film/getAllFilm',
data: {
params: {
'pageNo': '1',
'pageSize': '-1',
'weekType': '0',
'tagIds': '102'
},
success: (response) => {
})
.then((response) => {
let funcResponse = response.data.list
let funcList = []
for (let i = 0, l = funcResponse.length; i < l; i++) {
......@@ -117,7 +118,6 @@ Page({
this.setData({
movieList: funcList
})
}
})
},
......@@ -252,13 +252,14 @@ Page({
* @returns
*/
routeList: function () {
App.wxRequest({
App.request({
url: 'v1/strategy/getList',
data: {
params: {
'pageNo': this.data.touristRoutePageNo,
'pageSize': this.data.touristRoutePageSize,
},
success: (response) => {
})
.then((response) => {
let funcResponse = response.data
let funcList = []
for (let i = 0, l = funcResponse.list.length; i < l; i++) {
......@@ -280,10 +281,6 @@ Page({
this.setData({
touristRouteList: this.data.touristRoutePageNo === 1 ? funcList : this.data.touristRouteList.concat(funcList)
})
},
fail: (err) => {
}
})
},
......
......@@ -45,12 +45,13 @@ Page({
},
// 获取电影详情场次
queryDetail: function (activityId) {
App.wxRequest({
App.request({
url: 'v1/film/getFilmDetail',
data: {
params: {
'activityId': activityId,
},
success: (response) => {
})
.then((response) => {
let movieInfo = response.data
console.log(movieInfo)
let showList = {}
......@@ -120,7 +121,6 @@ Page({
showList,
statusList
})
}
})
},
// 跳转到报名页面
......
......@@ -394,18 +394,17 @@ Page({
* @returns
*/
queryActivity: function() {
console.log('this.data.shopInfo.id')
console.log(this.data.shopInfo.id)
App.wxRequest({
App.request({
url: 'v1/activity/getList',
data: {
params: {
'listType': 1,
'pageSize': 10,
'pageNo': 1,
'tagId': '',
'officeId': this.data.shopInfo.id,
},
success: (response) => {
})
.then((response) => {
let funcResponse = response.data.list
let funcList = []
for (let i = 0, l = funcResponse.length; i < l; i++) {
......@@ -445,7 +444,6 @@ Page({
winActivity: true,
detailActivity: funcList
})
}
})
},
......@@ -456,16 +454,17 @@ Page({
* @returns
*/
queryCommodity: function() {
App.wxRequest({
App.request({
url: 'v1/commodity/recommend',
data: {
params: {
'officeId': this.data.shopInfo.id,
'genre': this.data.shopInfo.shopType,
'tag': '201',
'pageNo': 1,
'pageSize': 10,
},
success: (response) => {
})
.then((response) => {
let funcCommodityList = []
let funcResponse = response.data
for (let i = 0, l = funcResponse.length; i < l; i++) {
......@@ -506,7 +505,6 @@ Page({
detailCommodity: funcCommodityList,
winCommodity: true,
})
}
})
},
......@@ -517,15 +515,16 @@ Page({
* @returns
*/
queryMovie: function() {
App.wxRequest({
App.request({
url: 'v1/film/getAllFilm',
data: {
params: {
'weekType': 0,
'pageSize': 10,
'pageNo': 1,
'tagIds': '102'
},
success: (response) => {
})
.then((response) => {
let funcResponse = response.data.list
let funcList = []
for (let i = 0, l = funcResponse.length; i < l; i++) {
......@@ -559,7 +558,6 @@ Page({
detailCommodity: funcList,
movieHeight
})
}
})
},
......@@ -570,14 +568,15 @@ Page({
* @returns
*/
getAppraise: function() {
App.wxRequest({
App.request({
url: 'v1/appraise/getList',
data: {
params: {
'pageNo': '1',
'pageSize': '-1',
'officeId': this.data.shopInfo.id
},
success: (response) => {
})
.then((response) => {
let funcResponse = response.data
let funcList = []
......@@ -627,7 +626,6 @@ Page({
detailEvaluate: funcEvaluate
})
})
}
})
},
......@@ -896,21 +894,20 @@ Page({
},
// 查询门店评分
getOfficeAppraise: function() {
let that = this
let officeId = wx.getStorageSync('shopInfoBuffer').id
App.wxRequest({
App.request({
url: 'v1/appraise/getOfficeAppraise',
data: {
params: {
'officeId': officeId
},
success: function(response) {
})
.then((response) => {
let funcData = response.data
that.setData({
this.setData({
officeServiceText: funcData.serviceEvaluation.toFixed(1),
officeProductText: funcData.productEvaluatio.toFixed(1),
officeEnvironmentalText: funcData.environmentalEvaluation.toFixed(1),
})
}
})
},
......
......@@ -41,13 +41,14 @@ Page({
queryCommodityDetail: function () {
let funcCommodity = wx.getStorageSync('shoppingCartBuffer')[0]
App.wxRequest({
App.request({
url: 'v1/commodity/getCommodityParticulars',
data: {
params: {
'commodityId': funcCommodity.id,
'genre': funcCommodity.typeId,
},
success: (response) => {
})
.then((response) => {
let funcResponse = response.data
let funcItem = {
'id': funcResponse.id, // 商品标识
......@@ -95,7 +96,6 @@ Page({
banner: funcResponse.imgs.replace(/\|$/, '').split('|'),
serviceInfo: funcItem
})
}
})
},
......
......@@ -16,8 +16,7 @@ Page({
},
queryDetail: function () {
let that = this
let response = [
let funcPredefineData = [
{
describe: [
App.globalData.appResourcesBase + 'play/detail/detail-1-1.png'
......@@ -88,26 +87,41 @@ Page({
shop: []
},
]
App.wxRequest({
App.request({
url: 'v1/park/getList',
success: function(res) {
let funcData = res.list
response.forEach(res => {
res.shop.forEach(shop => {
funcData.forEach(item => {
if (shop.id === item.id) {
shop.name = item.name
shop.summary = item.summary
shop.time = item.businessTime
}
})
params: {},
})
.then((response) => {
let funcData = response.data
let funcShopTypeIndex = 0
let funcShopIndex = 0
let funcShopId = ''
while(funcPredefineData[funcShopTypeIndex]) {
if (funcPredefineData[funcShopTypeIndex].shop[funcShopIndex]) {
funcShopId = funcPredefineData[funcShopTypeIndex].shop[funcShopIndex].id
this.setShopInfo(funcPredefineData, funcShopTypeIndex, funcShopIndex, funcShopId, funcData)
funcShopIndex = funcShopIndex + 1
} else {
funcShopTypeIndex = funcShopTypeIndex + 1
funcShopIndex = 0
}
}
this.setData({
tabDetail: funcPredefineData
})
that.setData({
tabDetail: response
})
},
setShopInfo: function (funcPredefineData, funcShopTypeIndex, funcShopIndex, funcShopId, funcData) {
for (let i = 0, l = funcData.length; i < l; i++) {
if (funcShopId === funcData[i].id) {
funcPredefineData[funcShopTypeIndex].shop[funcShopIndex].name = funcData[i].name
funcPredefineData[funcShopTypeIndex].shop[funcShopIndex].time = funcData[i].businessTime
funcPredefineData[funcShopTypeIndex].shop[funcShopIndex].summary = funcData[i].summary
}
}
})
},
onShopDetail: function (funcItem) {
......
......@@ -41,29 +41,32 @@ Page({
* @returns
*/
queryTouristRouteDetail() {
App.wxRequest({
App.request({
url: 'v1/strategy/getDetail',
data: { id: this.data.id },
success: (res) => {
params: {
id: this.data.id
},
})
.then((response) => {
let funcData = response.data
// 此代码段处理目的为,匹配富文本代码中的 <img> 标签,并将其图片的宽度修改为适应屏幕
// width:100% --- 图片宽度加以限制,避免超出屏幕
// height:auto --- 高度自适应
// display:block --- 此代码,可以去掉图片之间的空白间隔,个人觉得好用
let content = res.data.content
// display:block --- 此代码,可以去掉图片之间的空白间隔
let content = funcData.content
.replace(/<img/gi, '<img style="width:100%;height:auto;display:block" ')
.replace(/<table/gi, '<table style="max-width:100%;height:auto;display:block" ')
.replace(/<section/g, '<div')
.replace(/\/section>/g, '\div>');
this.setData({
banner: res.data.banners,
banner: funcData.banners,
content: content,
date: res.data.updateDate,
title: res.data.title
date: funcData.updateDate,
title: funcData.title
})
this.queryRelation(res.data.smParkIds)
},
this.queryRelation(funcData.smParkIds)
})
},
......@@ -78,10 +81,13 @@ Page({
return
}
App.wxRequest({
App.request({
url: 'v1/park/getParksByParkIds',
data: { smParkIds: parkIds },
success: (response) => {
params: {
smParkIds: parkIds
},
})
.then((response) => {
let funcResponse = response.data
let funcList = []
......@@ -100,7 +106,6 @@ Page({
this.setData({
relation: funcList
})
}
})
},
......
/* 层级说明
- : 整体背景
0 : 视图
1 : 视图
2 : 视图
3 : 视图
4 : 视图
5 : 导航栏,占位元素
6 : 导航栏
7 : 遮罩,弹窗,提示,
8 : 遮罩
9 : 遮罩,toast,dialog
*/
.row { display: flex; flex-direction: row; }
.column { display: flex; flex-direction: column; }
.cs { justify-content: flex-start; }
.cc { justify-content: center; }
.ce { justify-content: flex-end; }
.cb { justify-content: space-between; }
.ca { justify-content: space-around; }
.as { align-items: flex-start; }
.ac { align-items: center; }
.ae { align-items: flex-end; }
.overflow_point_1 { overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 1; -webkit-box-orient: vertical; }
.overflow_point_2 { display: -webkit-box; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 2; -webkit-box-orient: vertical; }
.overflow_point_3 { display: -webkit-box; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical; }
.overflow_point_4 { display: -webkit-box; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 4; -webkit-box-orient: vertical; }
\ No newline at end of file
.text_decoration_delete {
text-decoration: line-through;
}
/* 字体颜色 */
.c00 { color: #000000; }
.c01 { color: #15191F; }
.c10 { color: #E66060; }
.c20 { color: #837048; }
.c30 { color: #5DB5DD; }
.c31 { color: #959DA9; }
.c32 { color: #656E7B; }
.c40 { color: #86C5E1; }
.c90 { color: #FFFFFF; }
/* 背景颜色 */
.cbg00 { background-color: #000000; }
.cbg01 { background-color: #15191F; }
.cbg10 { background-color: #E66060; }
.cbg20 { background-color: #837048; }
.cbg30 { background-color: #5DB5DD; }
.cbg31 { background-color: #959DA9; }
.cbg32 { background-color: #656E7B; }
.cbg40 { background-color: #86C5E1; }
.cbg90 { background-color: #FFFFFF; }
/* 字体字重 */
.fw100 { font-weight: 100; }
.fw200 { font-weight: 200; }
.fw300 { font-weight: 300; }
.fw400 { font-weight: 400; }
.fw500 { font-weight: 500; }
.fw600 { font-weight: 600; }
.fw700 { font-weight: 700; }
.fw800 { font-weight: 800; }
/* 字体大小 */
.fs18 { font-size: 18rpx; line-height: 26rpx; }
.fs22 { font-size: 22rpx; line-height: 32rpx; }
.fs26 { font-size: 26rpx; line-height: 36rpx; }
.fs30 { font-size: 30rpx; line-height: 40rpx; }
.fs34 { font-size: 34rpx; line-height: 48rpx; }
.fs38 { font-size: 38rpx; line-height: 52rpx; }
.fs42 { font-size: 42rpx; line-height: 58rpx; }
.fs50 { font-size: 50rpx; line-height: 72rpx; }
.fs54 { font-size: 54rpx; line-height: 76rpx; }
/* icon 大小 */
.i32 { width: 32rpx; height: 32rpx; }
.i40 { width: 40rpx; height: 40rpx; }
.i48 { width: 48rpx; height: 48rpx; }
.i136 { width: 136rpx; height: 136rpx; }
\ No newline at end of file
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 sign in to comment