Skip to content

严立 / mini-shimao

Go to a project
Commit efb140ad by 严立
Options

畅玩门店对外路径 | host 模块 | 删除多余资源路径参数

parent 4eaa1f81
Inline Side-by-side
Showing with 409 additions and 354 deletions
app.js
...@@ -21,19 +21,24 @@ App({ ...@@ -21,19 +21,24 @@ App({
globalData: { globalData: {
appStatus: false, appStatus: false,
appImageBase: '../../../image/',
appResourcesBase: iEnvironmental.host + '/userfiles/appResourcesS2/',
sourceValue: 1000,
shopId: iEnvironmental.shopId, shopId: iEnvironmental.shopId,
pointInfo: iEnvironmental.pointInfo, pointInfo: iEnvironmental.pointInfo,
payStateTimer: 0, payStateTimer: 0,
userInfo: null, userInfo: null,
baseUrl: iOption.baseUrl,//测试
}, },
onLaunch: function (options) { onLaunch: function (options) {
this.globalData.sourceValue = options.scene // wx.setEnableDebug({
console.log(this.globalData.sourceValue) // enableDebug: true
// })
wx.getNetworkType({
success: (res) => {
console.log('getNetworkType', res.errMsg)
console.log('getNetworkType', res.networkType)
}
})
wxApiExtend(wx) // wx.api 拓展，重新定义某些 api 接口。 wxApiExtend(wx) // wx.api 拓展，重新定义某些 api 接口。
pageExtend(this) // Page 实例拓展，为所有 Page 统一增加属性或者方法 pageExtend(this) // Page 实例拓展，为所有 Page 统一增加属性或者方法
iMui(this) // m-ui 相关函数引入 iMui(this) // m-ui 相关函数引入
...@@ -46,22 +51,34 @@ App({ ...@@ -46,22 +51,34 @@ App({
this.setUserStatus() this.setUserStatus()
}, },
onError (message) {
console.log('onError', message)
},
/** /**
* 查询 app 功能启用状态 * 查询 app 功能启用状态
* @function * @function
* @param * @param
* @returns * @returns
*/ */
setAppStatus: function () { setAppStatus: function (Page, from) {
this.request({ this.request({
url: 'v1/common/getDictByType', url: 'v1/common/getDictByType',
params: { params: {
'type': 'is_open' 'type': 'is_open'
} }
}).then((response) => { }).then((response) => {
let funcData = response.data let funcAppStatus = Boolean(Number(response.data[0].value))
this.globalData.appStatus = Boolean(Number(funcData[0].value)) this.globalData.appStatus = funcAppStatus
}).catch(() => {}) if (Page) {
if (Page.data.appStatus !== funcAppStatus) {
Page.setData({
appStatus: funcAppStatus
})
console.log('set Page appStatus', from, funcAppStatus)
}
}
})
}, },
/** /**
...@@ -83,7 +100,6 @@ App({ ...@@ -83,7 +100,6 @@ App({
* @returns * @returns
*/ */
userUpdate: function () { userUpdate: function () {
console.log('userUpdate')
this.queryClubAuditTotal() this.queryClubAuditTotal()
}, },
...@@ -114,7 +130,7 @@ App({ ...@@ -114,7 +130,7 @@ App({
// 发送 res.code 到后台换取 openId, sessionKey, unionId // 发送 res.code 到后台换取 openId, sessionKey, unionId
this.request({ this.request({
url: 'v1/login/getSmallSession?code=' + response.code, url: 'v1/login/getSmallSession?code=' + response.code,
method: 'GET', method: 'get',
}).then((response) => { }).then((response) => {
let funcData = response.data let funcData = response.data
...@@ -150,6 +166,25 @@ App({ ...@@ -150,6 +166,25 @@ App({
}) })
}, },
tryLogin: function () {
wx.login({
success: (response) => {
// 发送 res.code 到后台换取 openId, sessionKey, unionId
this.request({
url: 'v1/login/getSmallSession?code=' + response.code,
method: 'get',
}).then((response) => {
let funcData = response.data
wx.setStorageSync('token', funcData.token)
wx.setStorageSync('tokenRefresh', funcData.refreshToken)
wx.setStorageSync('sessionKey', funcData.session_key)
}).catch((error) => {
console.log('tryLogin fail', error)
})
}
})
},
/** /**
* 设置令牌 * 设置令牌
* @function * @function
...@@ -162,7 +197,7 @@ App({ ...@@ -162,7 +197,7 @@ App({
// 发送 res.code 到后台换取 openId, sessionKey, unionId // 发送 res.code 到后台换取 openId, sessionKey, unionId
this.request({ this.request({
url: 'v1/login/getSmallSession?code=' + response.code, url: 'v1/login/getSmallSession?code=' + response.code,
method: 'GET', method: 'get',
}).then((response) => { }).then((response) => {
let funcData = response.data let funcData = response.data
wx.setStorageSync('token', funcData.token) wx.setStorageSync('token', funcData.token)
......
environmental.js
let Development = { let Development = {
host: 'https://sm-web.meiqicloud.com',
// host: 'https://smbhyh-web.meiqicloud.com',
// 景点信息 // 景点信息
pointInfo: [ pointInfo: [
{ appId: 1, id: '21a0cbbd39604380bc46fba38ac5fb63', name: '海错图' }, { appId: 1, id: '21a0cbbd39604380bc46fba38ac5fb63', name: '海错图' },
......
package-lock.json deleted 100644 → 0
{
"name": "mini-shimao",
"version": "1.0.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"lin-ui": {
"version": "0.8.6",
"resolved": "https://registry.npm.taobao.org/lin-ui/download/lin-ui-0.8.6.tgz",
"integrity": "sha1-mLXXHCzVzIAutYSCAJyRmlav1KY="
}
}
}
\ No newline at end of file
package.json deleted 100644 → 0
{
"name": "mini-shimao",
"version": "1.0.0",
"description": "",
"main": "app.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "",
"license": "ISC",
"dependencies": {
"lin-ui": "^0.8.6"
}
}
\ No newline at end of file
pages/campsite/home-mirror/home-mirror.js
...@@ -2,22 +2,26 @@ let App = getApp() ...@@ -2,22 +2,26 @@ let App = getApp()
Page({ Page({
data: { data: {
appStatus: false, appStatus: App.globalData.appStatus,
showPopup: false, showPopup: false,
winSide: true, winSide: true,
sideHeight: 1250, sideHeight: 1250,
shareImage: App.globalData.appResourcesBase + 'share/share-1.png', shareImage: '',
childActivity: [], childActivity: [],
bannerImage: App.globalData.appResourcesBase + 'campsite/campsite-header.png', bannerImage: '',
campsiteDescribe: [], campsiteDescribe: [],
average: 0, average: 0,
}, },
onLoad: function (options) { onLoad: function (options) {
this.setData({
shareImage: this.data.resourcesBase + 'share/share-1.png',
bannerImage: this.data.resourcesBase + 'campsite/campsite-header.png',
})
this.setSideHeight() this.setSideHeight()
this.setData({ appStatus: App.globalData.appStatus }) this.setData({ appStatus: App.globalData.appStatus })
console.log(App.globalData.appStatus) App.setAppStatus(this)
}, },
onShow: function () { onShow: function () {
this.setShopInfo(3, 1) this.setShopInfo(3, 1)
...@@ -98,7 +102,6 @@ Page({ ...@@ -98,7 +102,6 @@ Page({
}).then((response) => { }).then((response) => {
let funcData = response.data let funcData = response.data
let funcAverage = Math.floor(funcData.environmentalEvaluation + funcData.productEvaluatio + funcData.serviceEvaluation) / 3 let funcAverage = Math.floor(funcData.environmentalEvaluation + funcData.productEvaluatio + funcData.serviceEvaluation) / 3
console.log(funcAverage)
this.setData({ this.setData({
average: funcAverage average: funcAverage
}) })
......
pages/campsite/home/home.js
...@@ -2,22 +2,25 @@ let App = getApp() ...@@ -2,22 +2,25 @@ let App = getApp()
Page({ Page({
data: { data: {
appStatus: false, appStatus: App.globalData.appStatus,
showPopup: false, showPopup: false,
winSide: true, winSide: true,
sideHeight: 1250, sideHeight: 1250,
shareImage: App.globalData.appResourcesBase + 'share/share-1.png', shareImage: '',
childActivity: [], childActivity: [],
bannerImage: App.globalData.appResourcesBase + 'campsite/campsite-header.png', bannerImage: '',
campsiteDescribe: [], campsiteDescribe: [],
average: 0, average: 0,
}, },
onLoad: function (options) { onLoad: function (options) {
this.setData({
shareImage: this.data.resourcesBase + 'share/share-1.png',
bannerImage: this.data.resourcesBase + 'campsite/campsite-header.png',
})
this.setSideHeight() this.setSideHeight()
this.setData({ appStatus: App.globalData.appStatus }) App.setAppStatus(this, '营地')
console.log(App.globalData.appStatus)
}, },
onShow: function () { onShow: function () {
this.setShopInfo(3, 1) this.setShopInfo(3, 1)
...@@ -98,7 +101,6 @@ Page({ ...@@ -98,7 +101,6 @@ Page({
}).then((response) => { }).then((response) => {
let funcData = response.data let funcData = response.data
let funcAverage = Math.floor(funcData.environmentalEvaluation + funcData.productEvaluatio + funcData.serviceEvaluation) / 3 let funcAverage = Math.floor(funcData.environmentalEvaluation + funcData.productEvaluatio + funcData.serviceEvaluation) / 3
console.log(funcAverage)
this.setData({ this.setData({
average: funcAverage average: funcAverage
}) })
...@@ -174,7 +176,6 @@ Page({ ...@@ -174,7 +176,6 @@ Page({
'shopType': funcShopType, 'shopType': funcShopType,
'commodityLogo': funcShopId[i].commodityLogo 'commodityLogo': funcShopId[i].commodityLogo
} }
console.log('33')
wx.setStorageSync('shopInfoBuffer', funcShopInfo) wx.setStorageSync('shopInfoBuffer', funcShopInfo)
break break
} }
......
pages/club/create/create.js
...@@ -11,8 +11,6 @@ Page({ ...@@ -11,8 +11,6 @@ Page({
'errorUserPhone': '', 'errorUserPhone': '',
}, },
data: { data: {
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
establishInfo: {}, establishInfo: {},
}, },
......
pages/club/home/home.js
let App = getApp() let App = getApp()
Page({ Page({
data: { data: {
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
bannerCreatTop: 0, bannerCreatTop: 0,
tabItem: [ tabItem: [
......
pages/club/information/information.js
let App = getApp() let App = getApp()
Page({ Page({
data: { data: {
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
clubInfo: {}, clubInfo: {},
clubActivity: [], clubActivity: [],
activityTypeTag: [], activityTypeTag: [],
......
pages/commodity/home/home.js
...@@ -3,9 +3,6 @@ let App = getApp() ...@@ -3,9 +3,6 @@ let App = getApp()
Page({ Page({
data: { data: {
appStatus: App.globalData.appStatus, appStatus: App.globalData.appStatus,
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
cssGreeting: '', // 适应顶部边距 cssGreeting: '', // 适应顶部边距
option: {}, option: {},
...@@ -31,11 +28,12 @@ Page({ ...@@ -31,11 +28,12 @@ Page({
onShow: function () { onShow: function () {
wx.removeStorageSync('shopInfoBuffer') wx.removeStorageSync('shopInfoBuffer')
this.setData({ appStatus: App.globalData.appStatus }) App.setAppStatus(this, '服务')
this.setData({ this.setData({
userInfo: wx.getStorageSync('userInfo'), userInfo: wx.getStorageSync('userInfo'),
cssGreeting: wx.getStorageSync('navStatusHeight') + wx.getStorageSync('navTitleHeight') + 20 * wx.getStorageSync('unitProportion'), cssGreeting: wx.getStorageSync('navStatusHeight') + wx.getStorageSync('navTitleHeight') + 20 * wx.getStorageSync('unitProportion'),
}) })
this.setDefaultGreetingMessage() this.setDefaultGreetingMessage()
this.queryFestivalGreeting() this.queryFestivalGreeting()
this.queryShopCover() this.queryShopCover()
...@@ -375,7 +373,6 @@ Page({ ...@@ -375,7 +373,6 @@ Page({
'shopType': funcShopType, 'shopType': funcShopType,
'commodityLogo': funcShopId[i].commodityLogo 'commodityLogo': funcShopId[i].commodityLogo
} }
console.log('66')
wx.setStorageSync('shopInfoBuffer', funcShopInfo) wx.setStorageSync('shopInfoBuffer', funcShopInfo)
break break
} }
......
pages/commodity/menu-food/menu-food.js
...@@ -6,9 +6,6 @@ Page({ ...@@ -6,9 +6,6 @@ Page({
sideBarIsSelection: false, sideBarIsSelection: false,
data: { data: {
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
option: {}, option: {},
animationData: {}, animationData: {},
...@@ -107,7 +104,8 @@ Page({ ...@@ -107,7 +104,8 @@ Page({
}, },
setShopInfo: function () { setShopInfo: function () {
if (this.data.option.formPage === 'order') { console.log('this.data.option', this.data.option)
if (this.data.option.formPage === 'order' || this.data.option.from === 'subscription') {
let funcAppId = Number(this.data.option.shopAppId) let funcAppId = Number(this.data.option.shopAppId)
for (let i = 0, l = App.globalData.shopId.length; i < l; i++) { for (let i = 0, l = App.globalData.shopId.length; i < l; i++) {
if (funcAppId === App.globalData.shopId[i].appId) { if (funcAppId === App.globalData.shopId[i].appId) {
...@@ -116,6 +114,7 @@ Page({ ...@@ -116,6 +114,7 @@ Page({
'id': App.globalData.shopId[i].id, 'id': App.globalData.shopId[i].id,
'name': App.globalData.shopId[i].name, 'name': App.globalData.shopId[i].name,
'logo': App.globalData.shopId[i].logo, 'logo': App.globalData.shopId[i].logo,
'cover': App.globalData.shopId[i].cover,
'shopType': Number(this.data.option.commodityType) 'shopType': Number(this.data.option.commodityType)
} }
wx.setStorageSync('shopInfoBuffer', funcShopInfo) wx.setStorageSync('shopInfoBuffer', funcShopInfo)
...@@ -257,6 +256,7 @@ Page({ ...@@ -257,6 +256,7 @@ Page({
this.setCommodityClassification(funcCommodityList) this.setCommodityClassification(funcCommodityList)
}).catch((response) => { }).catch((response) => {
console.log('resolve', response) console.log('resolve', response)
App.ui.hideToast()
}) })
}, },
......
pages/commodity/project-detail/project-detail.js
...@@ -2,8 +2,7 @@ let App = getApp() ...@@ -2,8 +2,7 @@ let App = getApp()
Page({ Page({
data: { data: {
imageBase: App.globalData.appImageBase, option: {},
resourcesBase: App.globalData.appResourcesBase,
navTitle: '', navTitle: '',
banner: '', banner: '',
...@@ -16,7 +15,11 @@ Page({ ...@@ -16,7 +15,11 @@ Page({
commodityList: [], commodityList: [],
}, },
onLoad: function () { onLoad: function (options) {
this.setData({
option: options
})
this.setShopInfo()
// 设置当前门店信息 // 设置当前门店信息
this.setData({ this.setData({
shopInfo: wx.getStorageSync('shopInfoBuffer') shopInfo: wx.getStorageSync('shopInfoBuffer')
...@@ -281,6 +284,26 @@ Page({ ...@@ -281,6 +284,26 @@ Page({
}) })
}, },
setShopInfo: function () {
console.log('this.data.option', this.data.option)
if (this.data.option.from === 'subscription') {
let funcAppId = Number(this.data.option.shopAppId)
for (let i = 0, l = App.globalData.shopId.length; i < l; i++) {
if (funcAppId === App.globalData.shopId[i].appId) {
let funcShopInfo = {
'appId': App.globalData.shopId[i].appId,
'id': App.globalData.shopId[i].id,
'name': App.globalData.shopId[i].name,
'logo': App.globalData.shopId[i].logo,
'shopType': Number(this.data.option.commodityType)
}
wx.setStorageSync('shopInfoBuffer', funcShopInfo)
break
}
}
}
},
/** /**
* 前往商品详情 * 前往商品详情
* @function * @function
......
pages/commodity/project/project.js
...@@ -2,9 +2,6 @@ let App = getApp() ...@@ -2,9 +2,6 @@ let App = getApp()
Page({ Page({
data: { data: {
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
banner: [], banner: [],
bannerIndex: 0, bannerIndex: 0,
......
pages/commodity/room-appointment/room-appointment.js
...@@ -2,9 +2,6 @@ let App = getApp() ...@@ -2,9 +2,6 @@ let App = getApp()
Page({ Page({
data: { data: {
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
appointmentDate: '', appointmentDate: '',
appointmentEndDate: '', appointmentEndDate: '',
appointmentComplete: false, appointmentComplete: false,
......
pages/commodity/shopping-cart/shopping-cart.js
...@@ -2,9 +2,6 @@ let App = getApp() ...@@ -2,9 +2,6 @@ let App = getApp()
Page({ Page({
data: { data: {
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
shopInfo: {}, shopInfo: {},
shopId: '', shopId: '',
shopLogo: '', shopLogo: '',
......
pages/home/guide/guide.js
...@@ -7,8 +7,6 @@ let logicData = { ...@@ -7,8 +7,6 @@ let logicData = {
Page({ Page({
data: { data: {
appStatus: App.globalData.appStatus, appStatus: App.globalData.appStatus,
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
mapCss: '', mapCss: '',
arrowCss: '', arrowCss: '',
...@@ -29,7 +27,10 @@ Page({ ...@@ -29,7 +27,10 @@ Page({
}, },
onShow: function () { onShow: function () {
this.setData({ appStatus: App.globalData.appStatus }) this.setData({
appStatus: App.globalData.appStatus
})
App.setAppStatus(this)
}, },
initGuide: function () { initGuide: function () {
...@@ -331,7 +332,7 @@ Page({ ...@@ -331,7 +332,7 @@ Page({
}) })
wx.downloadFile({ wx.downloadFile({
url: App.globalData.appResourcesBase + 'guide/save-guide.png', url: this.data.resourcesBase + 'guide/save-guide.png',
success: (result) => { success: (result) => {
wx.saveImageToPhotosAlbum({ wx.saveImageToPhotosAlbum({
filePath: result.tempFilePath, filePath: result.tempFilePath,
......
pages/home/home/home.js
...@@ -224,6 +224,14 @@ Page({ ...@@ -224,6 +224,14 @@ Page({
}) })
}, },
onImageLoad: function (funcEvent) {
console.log('首页 ImageLoad')
},
onImageError: function (funcEvent) {
console.log('首页 ImageError', funcEvent.detail.errMsg)
},
/** /**
* 页面滚动事件 * 页面滚动事件
* @function * @function
......
pages/home/home/home.wxml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<swiper autoplay circular class="banner-swiper" indicator-dots="{{false}}" interval="5000" duration="500" bindchange="eventSwiperChange"> <swiper autoplay circular class="banner-swiper" indicator-dots="{{false}}" interval="5000" duration="500" bindchange="eventSwiperChange">
<block wx:for="{{banner}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{banner}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<swiper-item class="banner-swiper-item" data-item="{{item}}" bindtap="onBanner"> <swiper-item class="banner-swiper-item" data-item="{{item}}" bindtap="onBanner">
<image class="banner-swiper-image" src="{{item.cover}}"></image> <image class="banner-swiper-image" src="{{item.cover}}" bindload="onImageLoad" binderror="onImageError"></image>
</swiper-item> </swiper-item>
</block> </block>
</swiper> </swiper>
......
pages/login/login.js
...@@ -14,6 +14,7 @@ Page({ ...@@ -14,6 +14,7 @@ Page({
this.setData({ option: options }) this.setData({ option: options })
let funcUserInfo = wx.getStorageSync('userInfo') let funcUserInfo = wx.getStorageSync('userInfo')
console.log(funcUserInfo)
this.setData({ this.setData({
height: wx.getSystemInfoSync().windowHeight, height: wx.getSystemInfoSync().windowHeight,
...@@ -44,7 +45,11 @@ Page({ ...@@ -44,7 +45,11 @@ Page({
}, },
}) })
.then((response) => { .then((response) => {
wx.setStorageSync('userInfo', Object.assign(wx.getStorageSync('userInfo'), funcUserInfo)) let funcStorageUserInfo = wx.getStorageSync('userInfo')
if (!funcStorageUserInfo) {
funcStorageUserInfo = {}
}
wx.setStorageSync('userInfo', Object.assign(funcStorageUserInfo, funcUserInfo))
this.setData({ this.setData({
islogin: true islogin: true
}) })
...@@ -87,6 +92,7 @@ Page({ ...@@ -87,6 +92,7 @@ Page({
}, },
checkFinish: function () { checkFinish: function () {
console.log(this.data.islogin, this.data.isphone)
if (this.data.islogin && this.data.isphone) { if (this.data.islogin && this.data.isphone) {
// 在注册完成之后 login 一次，重新设置用户信息以及相关状态参数 // 在注册完成之后 login 一次，重新设置用户信息以及相关状态参数
App.userLogin() App.userLogin()
......
pages/mall/exchange-state/exchange-state.js
...@@ -29,6 +29,7 @@ Page({ ...@@ -29,6 +29,7 @@ Page({
isExpress: false, isExpress: false,
winPopup: false, winPopup: false,
winCouponCode: false, winCouponCode: false,
isViewDataReady: false,
}, },
onLoad: function (options) { onLoad: function (options) {
......
pages/mine/card/card.js
...@@ -2,14 +2,12 @@ let App = getApp() ...@@ -2,14 +2,12 @@ let App = getApp()
Page({ Page({
data: { data: {
imageBase: App.globalData.appImageBase,
animation: {}, animation: {},
passListType: 1, // 0为单张卡 1为多张卡 passListType: 1, // 0为单张卡 1为多张卡
privateStatus: true, privateStatus: true,
swiperCurrent: 0, swiperCurrent: 0,
shopConfig: App.globalData.shopId, shopConfig: App.globalData.shopId,
imageResourcesBase: App.globalData.appResourcesBase,
passList: [], passList: [],
marginTop: 0, marginTop: 0,
......
pages/mine/card/card.wxml
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
<!-- 单张卡 --> <!-- 单张卡 -->
<view class="card-wrapper" wx:if="{{passList.length == 1}}"> <view class="card-wrapper" wx:if="{{passList.length == 1}}">
<view class="card-header"> <view class="card-header">
<image wx:if="{{passList[0].cardType==1}}" class="card-bg year-bg" src="{{imageResourcesBase +'mine/card/year-bg.png'}}"></image> <image wx:if="{{passList[0].cardType==1}}" class="card-bg year-bg" src="{{resourcesBase +'mine/card/year-bg.png'}}"></image>
<image wx:elif="{{passList[0].cardType==2}}" class="card-bg year-bg" src="{{imageResourcesBase +'mine/card/month-bg.png'}}"></image> <image wx:elif="{{passList[0].cardType==2}}" class="card-bg year-bg" src="{{resourcesBase +'mine/card/month-bg.png'}}"></image>
<image wx:else class="card-bg month-bg" src="{{imageResourcesBase +'pay/order-input/card-3.png'}}"> <image wx:else class="card-bg month-bg" src="{{resourcesBase +'pay/order-input/card-3.png'}}">
</image> </image>
<view class="use-notice row ac" data-item="{{passList[0]}}" bindtap="onNotice"> <view class="use-notice row ac" data-item="{{passList[0]}}" bindtap="onNotice">
<text>使用须知</text> <text>使用须知</text>
...@@ -75,8 +75,8 @@ ...@@ -75,8 +75,8 @@
</view> </view>
<!-- 右下角图片 --> <!-- 右下角图片 -->
<view class="bottom-img"> <view class="bottom-img">
<image wx:if="{{passList[0].cardType==0}}" class="bottom-month" src="{{imageResourcesBase +'mine/card/bird-2.png'}}"></image> <image wx:if="{{passList[0].cardType==0}}" class="bottom-month" src="{{resourcesBase +'mine/card/bird-2.png'}}"></image>
<image wx:if="{{passList[0].cardType==1}}" class="bottom-year" src="{{imageResourcesBase +'mine/card/bird-1.png'}}"></image> <image wx:if="{{passList[0].cardType==1}}" class="bottom-year" src="{{resourcesBase +'mine/card/bird-1.png'}}"></image>
</view> </view>
</view> </view>
...@@ -86,9 +86,9 @@ ...@@ -86,9 +86,9 @@
<swiper-item> <swiper-item>
<view class="card-wrapper {{index === swiperCurrent ? 'item-right' : ''}} {{swiperCurrent === passList.length-1 ? 'item-center' : ''}}"> <view class="card-wrapper {{index === swiperCurrent ? 'item-right' : ''}} {{swiperCurrent === passList.length-1 ? 'item-center' : ''}}">
<view class="card-header"> <view class="card-header">
<image wx:if="{{item.cardType==1}}" class="card-bg year-bg" src="{{imageResourcesBase +'mine/card/year-bg.png'}}"></image> <image wx:if="{{item.cardType==1}}" class="card-bg year-bg" src="{{resourcesBase +'mine/card/year-bg.png'}}"></image>
<image wx:elif="{{item.cardType==2}}" class="card-bg year-bg" src="{{imageResourcesBase +'mine/card/month-bg.png'}}"></image> <image wx:elif="{{item.cardType==2}}" class="card-bg year-bg" src="{{resourcesBase +'mine/card/month-bg.png'}}"></image>
<image wx:else class="card-bg month-bg" src="{{imageResourcesBase +'pay/order-input/card-3.png'}}"> <image wx:else class="card-bg month-bg" src="{{resourcesBase +'pay/order-input/card-3.png'}}">
</image> </image>
<view class="use-notice row ac" data-item="{{item}}" bindtap="onNotice"> <view class="use-notice row ac" data-item="{{item}}" bindtap="onNotice">
<text>使用须知</text> <text>使用须知</text>
...@@ -160,8 +160,8 @@ ...@@ -160,8 +160,8 @@
<!-- 右下角图片 --> <!-- 右下角图片 -->
<view class="bottom-img"> <view class="bottom-img">
<block> <block>
<image wx:if="{{item.cardType==1}}" class="bottom-year" src="{{imageResourcesBase +'mine/card/bird-1.png'}}"></image> <image wx:if="{{item.cardType==1}}" class="bottom-year" src="{{resourcesBase +'mine/card/bird-1.png'}}"></image>
<image wx:if="{{item.cardType==2}}" class="bottom-month" src="{{imageResourcesBase +'mine/card/bird-2.png'}}"></image> <image wx:if="{{item.cardType==2}}" class="bottom-month" src="{{resourcesBase +'mine/card/bird-2.png'}}"></image>
</block> </block>
</view> </view>
</view> </view>
...@@ -170,13 +170,13 @@ ...@@ -170,13 +170,13 @@
</swiper> </swiper>
<!-- 底部logo --> <!-- 底部logo -->
<view class="footer-logo" style="margin-top: {{marginTop + 'rpx'}}"> <view class="footer-logo" style="margin-top: {{marginTop + 'rpx'}}">
<image src="{{imageResourcesBase +'mine/card/card-footer.png'}}"></image> <image src="{{resourcesBase +'mine/card/card-footer.png'}}"></image>
</view> </view>
<view class="cloud-left"> <view class="cloud-left">
<image src="{{imageResourcesBase +'mine/card/cloud-1.png'}}"></image> <image src="{{resourcesBase +'mine/card/cloud-1.png'}}"></image>
</view> </view>
<view class="cloud-right"> <view class="cloud-right">
<image src="{{imageResourcesBase +'mine/card/cloud-2.png'}}"></image> <image src="{{resourcesBase +'mine/card/cloud-2.png'}}"></image>
</view> </view>
</view> </view>
......
pages/mine/home/home.js
...@@ -2,9 +2,6 @@ let App = getApp() ...@@ -2,9 +2,6 @@ let App = getApp()
Page({ Page({
data: { data: {
appStatus: App.globalData.appStatus, appStatus: App.globalData.appStatus,
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
userInfo: { userInfo: {
'openId': '', 'openId': '',
'name': '', 'name': '',
...@@ -102,8 +99,7 @@ Page({ ...@@ -102,8 +99,7 @@ Page({
isMoreOrder: false, isMoreOrder: false,
isMoreAppointment: false, isMoreAppointment: false,
}) })
App.setAppStatus(this, '我的')
this.setData({ appStatus: App.globalData.appStatus })
this.setUserInfo() // 设置用户信息 this.setUserInfo() // 设置用户信息
this.queryIntegral() // 查询积分 this.queryIntegral() // 查询积分
this.queryCouponPermissions() // 查询券码核销权限 this.queryCouponPermissions() // 查询券码核销权限
...@@ -524,7 +520,7 @@ Page({ ...@@ -524,7 +520,7 @@ Page({
* @returns * @returns
*/ */
onIntegralDetail: function () { onIntegralDetail: function () {
if (!App.globalData.appStatus) return if (!this.data.appStatus) return
wx.getStorageSync('userInfo').isSignIn ? wx.navigateTo({ url: '/pages/mall/home/home' }) : wx.navigateTo({ url: '/pages/login/login' }) wx.getStorageSync('userInfo').isSignIn ? wx.navigateTo({ url: '/pages/mall/home/home' }) : wx.navigateTo({ url: '/pages/login/login' })
}, },
......
pages/mine/info/info.js
let App = getApp() let App = getApp()
Page({ Page({
data: { data: {
imageBase: App.globalData.appImageBase,
birthdayLimit: App.modular.miment().format('YYYY-MM-DD'), birthdayLimit: App.modular.miment().format('YYYY-MM-DD'),
genderList: [ genderList: [
{ id: 1, name: '男' }, { id: 1, name: '男' },
......
pages/mine/order/order.js
let App = getApp() let App = getApp()
Page({ Page({
data: { data: {
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
option: {}, option: {},
orderTypeTitle: '全部分类', orderTypeTitle: '全部分类',
orderTypeHeight: 0, orderTypeHeight: 0,
......
pages/pay/coupon-detail/coupon-detail.js
let App = getApp() let App = getApp()
Page({ Page({
data: { data: {
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
orderType: 1, // 1 - 年卡/月卡，2 - 次票， 3 - SPA， 4 - 文创， 5 - 餐品， 6 - 活动， 7 - 观影 orderType: 1, // 1 - 年卡/月卡，2 - 次票， 3 - SPA， 4 - 文创， 5 - 餐品， 6 - 活动， 7 - 观影
couponInfo: null, couponInfo: null,
goodsList: null, goodsList: null,
......
pages/pay/coupon-input/coupon-input.js
let App = getApp() let App = getApp()
Page({ Page({
data: { data: {
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
bgUrl: '/pages/mine/home/image/mine.png', bgUrl: '/pages/mine/home/image/mine.png',
avatarUrl: '/pages/mine/home/image/avatar.png', avatarUrl: '/pages/mine/home/image/avatar.png',
name: '姓名', name: '姓名',
......
pages/pay/order-comment/order-comment.js
import host from '../../../utils/host.js'
let App = getApp() let App = getApp()
Page({ Page({
data: { data: {
shopConfig: App.globalData.shopId, shopConfig: App.globalData.shopId,
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
scoreServe: 0, // 服务分数 scoreServe: 0, // 服务分数
scoreProduct: 0, // 产品分数 scoreProduct: 0, // 产品分数
scoreEnvironment: 0, // 环境分数 scoreEnvironment: 0, // 环境分数
...@@ -210,7 +210,7 @@ Page({ ...@@ -210,7 +210,7 @@ Page({
for (let i = 0; i < funcEvaluateAlbumTemp.length; i++) { for (let i = 0; i < funcEvaluateAlbumTemp.length; i++) {
let funcUploadResult = new Promise((funcResolve, funcReject) => { let funcUploadResult = new Promise((funcResolve, funcReject) => {
wx.uploadFile({ wx.uploadFile({
url: App.globalData.baseUrl + 'v1/common/upload', url: host().api + 'v1/common/upload',
filePath: funcEvaluateAlbumTemp[i].path, filePath: funcEvaluateAlbumTemp[i].path,
name: 'file', name: 'file',
header: { header: {
......
pages/pay/order-input/order-input.js
...@@ -18,9 +18,6 @@ let pagePayId = '' ...@@ -18,9 +18,6 @@ let pagePayId = ''
Page({ Page({
data: { data: {
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
animation: {}, animation: {},
shopInfo: {}, shopInfo: {},
orderId: '', orderId: '',
......
pages/pay/order-state/order-state.js
...@@ -2,8 +2,6 @@ let App = getApp() ...@@ -2,8 +2,6 @@ let App = getApp()
Page({ Page({
data: { data: {
imageBase: App.globalData.appImageBase,
payState: '', payState: '',
payAmount: 0, payAmount: 0,
orderId: '', orderId: '',
......
pages/play/activity/activity.js
let App = getApp() let App = getApp()
Page({ Page({
data: { data: {
imageBase: App.globalData.appImageBase,
tabTop: 0, tabTop: 0,
tabItem: [{ text: '全部', value: 0 }], tabItem: [{ text: '全部', value: 0 }],
......
pages/play/home/home.js
let App = getApp() let App = getApp()
Page({ Page({
data: { data: {
appStatus: App.globalData.appStatus,
recentActivitiesList: [], recentActivitiesList: [],
clubList: [], clubList: [],
...@@ -22,7 +23,7 @@ Page({ ...@@ -22,7 +23,7 @@ Page({
}, },
onLoad: function () { onLoad: function () {
this.setData({ appStatus: App.globalData.appStatus }) App.setAppStatus(this, '畅玩')
this.queryActivity() this.queryActivity()
this.queryMovie() this.queryMovie()
this.queryClub() this.queryClub()
...@@ -317,4 +318,12 @@ Page({ ...@@ -317,4 +318,12 @@ Page({
let funcItem = funcEvent.currentTarget.dataset.item let funcItem = funcEvent.currentTarget.dataset.item
wx.navigateTo({ url: '/pages/club/information/information?id=' + funcItem.id }) wx.navigateTo({ url: '/pages/club/information/information?id=' + funcItem.id })
}, },
onImageLoad: function (funcEvent) {
console.log('畅玩 ImageLoad')
},
onImageError: function (funcEvent) {
console.log('畅玩 ImageError', funcEvent.detail.errMsg)
}
}) })
\ No newline at end of file
pages/play/home/home.wxml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<!-- 畅玩分类 --> <!-- 畅玩分类 -->
<block wx:if="{{appStatus}}"> <block wx:if="{{appStatus}}">
<view class="banner"> <view class="banner">
<image src="{{resourcesBase + 'play/home/type.png'}}"></image> <image src="{{resourcesBase + 'play/home/type.png'}}" bindload="onImageLoad" binderror="onImageError"></image>
<button class="art-button" bindtap="onToArt"></button> <button class="art-button" bindtap="onToArt"></button>
<button class="health-button" bindtap="onToHealth"></button> <button class="health-button" bindtap="onToHealth"></button>
<button class="food-button" bindtap="onToFood"></button> <button class="food-button" bindtap="onToFood"></button>
......
pages/play/point-detail/point-detail.js
...@@ -37,133 +37,133 @@ Page({ ...@@ -37,133 +37,133 @@ Page({
title: '星光广场', title: '星光广场',
contact: '13316748039', contact: '13316748039',
banner: [ banner: [
App.globalData.appResourcesBase + 'guide/banner/banner-1-1.png', this.data.resourcesBase + 'guide/banner/banner-1-1.png',
App.globalData.appResourcesBase + 'guide/banner/banner-1-2.png', this.data.resourcesBase + 'guide/banner/banner-1-2.png',
App.globalData.appResourcesBase + 'guide/banner/banner-1-3.png', this.data.resourcesBase + 'guide/banner/banner-1-3.png',
], ],
ornament: './image/ornament-1.png', ornament: './image/ornament-1.png',
describe: [ describe: [
App.globalData.appResourcesBase + 'guide/detail/detail-1-1.png', this.data.resourcesBase + 'guide/detail/detail-1-1.png',
App.globalData.appResourcesBase + 'guide/detail/detail-1-2.png', this.data.resourcesBase + 'guide/detail/detail-1-2.png',
App.globalData.appResourcesBase + 'guide/detail/detail-1-3.png', this.data.resourcesBase + 'guide/detail/detail-1-3.png',
App.globalData.appResourcesBase + 'guide/detail/detail-1-4.png', this.data.resourcesBase + 'guide/detail/detail-1-4.png',
], ],
background: 'background: #314f88;', background: 'background: #314f88;',
popupImage: App.globalData.appResourcesBase + 'share/share-8.png', popupImage: this.data.resourcesBase + 'share/share-8.png',
}, { }, {
id: 102, id: 102,
name: '云之亭', name: '云之亭',
title: '云之亭', title: '云之亭',
contact: '13316748039', contact: '13316748039',
banner: [ banner: [
App.globalData.appResourcesBase + 'guide/banner/banner-2-1.png', this.data.resourcesBase + 'guide/banner/banner-2-1.png',
App.globalData.appResourcesBase + 'guide/banner/banner-2-2.png', this.data.resourcesBase + 'guide/banner/banner-2-2.png',
App.globalData.appResourcesBase + 'guide/banner/banner-2-3.png', this.data.resourcesBase + 'guide/banner/banner-2-3.png',
], ],
ornament: './image/ornament-2.png', ornament: './image/ornament-2.png',
describe: [ describe: [
App.globalData.appResourcesBase + 'guide/detail/detail-2-1.png', this.data.resourcesBase + 'guide/detail/detail-2-1.png',
App.globalData.appResourcesBase + 'guide/detail/detail-2-2.png', this.data.resourcesBase + 'guide/detail/detail-2-2.png',
App.globalData.appResourcesBase + 'guide/detail/detail-2-3.png', this.data.resourcesBase + 'guide/detail/detail-2-3.png',
App.globalData.appResourcesBase + 'guide/detail/detail-2-4.png', this.data.resourcesBase + 'guide/detail/detail-2-4.png',
], ],
background: 'background: #9d9ee0;', background: 'background: #9d9ee0;',
popupImage: App.globalData.appResourcesBase + 'share/share-14.png', popupImage: this.data.resourcesBase + 'share/share-14.png',
}, { }, {
id: 103, id: 103,
name: '湿地公园', name: '湿地公园',
title: '湿地公园', title: '湿地公园',
contact: '13316748039', contact: '13316748039',
banner: [ banner: [
App.globalData.appResourcesBase + 'guide/banner/banner-3-1.png', this.data.resourcesBase + 'guide/banner/banner-3-1.png',
App.globalData.appResourcesBase + 'guide/banner/banner-3-2.png', this.data.resourcesBase + 'guide/banner/banner-3-2.png',
App.globalData.appResourcesBase + 'guide/banner/banner-3-3.png', this.data.resourcesBase + 'guide/banner/banner-3-3.png',
], ],
ornament: './image/ornament-3.png', ornament: './image/ornament-3.png',
describe: [ describe: [
App.globalData.appResourcesBase + 'guide/detail/detail-3-1.png', this.data.resourcesBase + 'guide/detail/detail-3-1.png',
App.globalData.appResourcesBase + 'guide/detail/detail-3-2.png', this.data.resourcesBase + 'guide/detail/detail-3-2.png',
App.globalData.appResourcesBase + 'guide/detail/detail-3-3.png', this.data.resourcesBase + 'guide/detail/detail-3-3.png',
App.globalData.appResourcesBase + 'guide/detail/detail-3-4.png', this.data.resourcesBase + 'guide/detail/detail-3-4.png',
], ],
background: 'background: #8bac7d;', background: 'background: #8bac7d;',
popupImage: App.globalData.appResourcesBase + 'share/share-4.png', popupImage: this.data.resourcesBase + 'share/share-4.png',
}, { }, {
id: 104, id: 104,
name: '新月码头', name: '新月码头',
title: '新月码头', title: '新月码头',
contact: '13316748039', contact: '13316748039',
banner: [ banner: [
App.globalData.appResourcesBase + 'guide/banner/banner-4-1.png', this.data.resourcesBase + 'guide/banner/banner-4-1.png',
App.globalData.appResourcesBase + 'guide/banner/banner-4-2.png', this.data.resourcesBase + 'guide/banner/banner-4-2.png',
App.globalData.appResourcesBase + 'guide/banner/banner-4-3.png', this.data.resourcesBase + 'guide/banner/banner-4-3.png',
], ],
ornament: './image/ornament-4.png', ornament: './image/ornament-4.png',
describe: [ describe: [
App.globalData.appResourcesBase + 'guide/detail/detail-4-1.png', this.data.resourcesBase + 'guide/detail/detail-4-1.png',
App.globalData.appResourcesBase + 'guide/detail/detail-4-2.png', this.data.resourcesBase + 'guide/detail/detail-4-2.png',
App.globalData.appResourcesBase + 'guide/detail/detail-4-3.png', this.data.resourcesBase + 'guide/detail/detail-4-3.png',
App.globalData.appResourcesBase + 'guide/detail/detail-4-4.png', this.data.resourcesBase + 'guide/detail/detail-4-4.png',
], ],
background: 'background: #6fc0d0;', background: 'background: #6fc0d0;',
popupImage: App.globalData.appResourcesBase + 'share/share-7.png', popupImage: this.data.resourcesBase + 'share/share-7.png',
}, { }, {
id: 105, id: 105,
name: '温泉洋房（建设中)', name: '温泉洋房（建设中)',
title: '温泉洋房', title: '温泉洋房',
contact: '13316748039', contact: '13316748039',
banner: [ banner: [
App.globalData.appResourcesBase + 'guide/banner/banner-5-1.png', this.data.resourcesBase + 'guide/banner/banner-5-1.png',
App.globalData.appResourcesBase + 'guide/banner/banner-5-2.png', this.data.resourcesBase + 'guide/banner/banner-5-2.png',
App.globalData.appResourcesBase + 'guide/banner/banner-5-3.png', this.data.resourcesBase + 'guide/banner/banner-5-3.png',
], ],
ornament: './image/ornament-5.png', ornament: './image/ornament-5.png',
describe: [ describe: [
App.globalData.appResourcesBase + 'guide/detail/detail-5-1.png', this.data.resourcesBase + 'guide/detail/detail-5-1.png',
App.globalData.appResourcesBase + 'guide/detail/detail-5-2.png', this.data.resourcesBase + 'guide/detail/detail-5-2.png',
App.globalData.appResourcesBase + 'guide/detail/detail-5-3.png', this.data.resourcesBase + 'guide/detail/detail-5-3.png',
App.globalData.appResourcesBase + 'guide/detail/detail-5-4.png', this.data.resourcesBase + 'guide/detail/detail-5-4.png',
], ],
background: 'background: #5ca2e2;', background: 'background: #5ca2e2;',
popupImage: App.globalData.appResourcesBase + 'share/share-6.png', popupImage: this.data.resourcesBase + 'share/share-6.png',
}, { }, {
id: 106, id: 106,
name: '星耀银湖', name: '星耀银湖',
title: '星耀银湖', title: '星耀银湖',
contact: '13316748039', contact: '13316748039',
banner: [ banner: [
App.globalData.appResourcesBase + 'guide/banner/banner-6-1.png', this.data.resourcesBase + 'guide/banner/banner-6-1.png',
App.globalData.appResourcesBase + 'guide/banner/banner-6-2.png', this.data.resourcesBase + 'guide/banner/banner-6-2.png',
App.globalData.appResourcesBase + 'guide/banner/banner-6-3.png', this.data.resourcesBase + 'guide/banner/banner-6-3.png',
], ],
ornament: './image/ornament-6.png', ornament: './image/ornament-6.png',
describe: '高8米、重4.5吨的鲸鱼胖茂，采用多切面锆石与镜面不锈钢打造，配合10米高水幕背景、裸眼3d效果，环绕立体声场营造，将大鲸鱼、小鱼群都生动地展现在我们眼前，感受星空与大海的交相辉映。', describe: [ describe: '高8米、重4.5吨的鲸鱼胖茂，采用多切面锆石与镜面不锈钢打造，配合10米高水幕背景、裸眼3d效果，环绕立体声场营造，将大鲸鱼、小鱼群都生动地展现在我们眼前，感受星空与大海的交相辉映。', describe: [
App.globalData.appResourcesBase + 'guide/detail/detail-6-1.png', this.data.resourcesBase + 'guide/detail/detail-6-1.png',
App.globalData.appResourcesBase + 'guide/detail/detail-6-2.png', this.data.resourcesBase + 'guide/detail/detail-6-2.png',
App.globalData.appResourcesBase + 'guide/detail/detail-6-3.png', this.data.resourcesBase + 'guide/detail/detail-6-3.png',
App.globalData.appResourcesBase + 'guide/detail/detail-6-4.png', this.data.resourcesBase + 'guide/detail/detail-6-4.png',
], ],
background: 'background: #82524c;', background: 'background: #82524c;',
popupImage: App.globalData.appResourcesBase + 'share/share-10.png', popupImage: this.data.resourcesBase + 'share/share-10.png',
}, { }, {
id: 107, id: 107,
name: '奇幻森林', name: '奇幻森林',
title: '奇幻森林', title: '奇幻森林',
contact: '13316748039', contact: '13316748039',
banner: [ banner: [
App.globalData.appResourcesBase + 'guide/banner/banner-7-1.png', this.data.resourcesBase + 'guide/banner/banner-7-1.png',
App.globalData.appResourcesBase + 'guide/banner/banner-7-2.png', this.data.resourcesBase + 'guide/banner/banner-7-2.png',
App.globalData.appResourcesBase + 'guide/banner/banner-7-3.png', this.data.resourcesBase + 'guide/banner/banner-7-3.png',
], ],
ornament: './image/ornament-7.png', ornament: './image/ornament-7.png',
describe: [ describe: [
App.globalData.appResourcesBase + 'guide/detail/detail-7-1.png', this.data.resourcesBase + 'guide/detail/detail-7-1.png',
App.globalData.appResourcesBase + 'guide/detail/detail-7-2.png', this.data.resourcesBase + 'guide/detail/detail-7-2.png',
App.globalData.appResourcesBase + 'guide/detail/detail-7-3.png', this.data.resourcesBase + 'guide/detail/detail-7-3.png',
App.globalData.appResourcesBase + 'guide/detail/detail-7-4.png', this.data.resourcesBase + 'guide/detail/detail-7-4.png',
], ],
background: 'background: #659b82;', background: 'background: #659b82;',
popupImage: App.globalData.appResourcesBase + 'share/share-3.png', popupImage: this.data.resourcesBase + 'share/share-3.png',
} }
] ]
......
pages/play/service-detail/service-detail.js
...@@ -2,11 +2,6 @@ let App = getApp() ...@@ -2,11 +2,6 @@ let App = getApp()
Page({ Page({
data: { data: {
appStatus: App.globalData.appStatus, appStatus: App.globalData.appStatus,
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
option: {}, option: {},
// 弹出控制 // 弹出控制
showPopup: false, showPopup: false,
...@@ -28,9 +23,6 @@ Page({ ...@@ -28,9 +23,6 @@ Page({
detailEvaluate: [], // 评论 detailEvaluate: [], // 评论
evaluateAlbum: [], evaluateAlbum: [],
evaluateAlbumActive: 0, evaluateAlbumActive: 0,
emptyImg: App.globalData.appResourcesBase + 'play/service/nothing.jpg',
isBlack: false, isBlack: false,
cssTabContentTop: 0, cssTabContentTop: 0,
...@@ -73,6 +65,7 @@ Page({ ...@@ -73,6 +65,7 @@ Page({
this.setData({ this.setData({
appStatus: App.globalData.appStatus appStatus: App.globalData.appStatus
}) })
App.setAppStatus(this)
}, },
setViewContent: function () { setViewContent: function () {
...@@ -181,11 +174,11 @@ Page({ ...@@ -181,11 +174,11 @@ Page({
appId: 1, appId: 1,
id: App.globalData.pointInfo[0].id, id: App.globalData.pointInfo[0].id,
banner: [ banner: [
App.globalData.appResourcesBase + 'shop/banner/banner-1-1-1.png', this.data.resourcesBase + 'shop/banner/banner-1-1-1.png',
App.globalData.appResourcesBase + 'shop/banner/banner-1-1-2.png', this.data.resourcesBase + 'shop/banner/banner-1-1-2.png',
App.globalData.appResourcesBase + 'shop/banner/banner-1-1-3.png', this.data.resourcesBase + 'shop/banner/banner-1-1-3.png',
], ],
shareImage: App.globalData.appResourcesBase + 'share/share-2.png', shareImage: this.data.resourcesBase + 'share/share-2.png',
name: '海错图展馆', name: '海错图展馆',
title: '海错图', title: '海错图',
date: '周一至周日 10:00 - 20:00', date: '周一至周日 10:00 - 20:00',
...@@ -218,11 +211,11 @@ Page({ ...@@ -218,11 +211,11 @@ Page({
specialPrice: '100', specialPrice: '100',
}], }],
describe: [ describe: [
App.globalData.appResourcesBase + 'shop/detail/detail-1-1-1.png', this.data.resourcesBase + 'shop/detail/detail-1-1-1.png',
App.globalData.appResourcesBase + 'shop/detail/detail-1-1-2.png', this.data.resourcesBase + 'shop/detail/detail-1-1-2.png',
App.globalData.appResourcesBase + 'shop/detail/detail-1-1-3.png', this.data.resourcesBase + 'shop/detail/detail-1-1-3.png',
App.globalData.appResourcesBase + 'shop/detail/detail-1-1-4.png', this.data.resourcesBase + 'shop/detail/detail-1-1-4.png',
App.globalData.appResourcesBase + 'shop/detail/detail-1-1-5.png', this.data.resourcesBase + 'shop/detail/detail-1-1-5.png',
], ],
evaluate: [{ evaluate: [{
avatar: '', avatar: '',
...@@ -238,92 +231,92 @@ Page({ ...@@ -238,92 +231,92 @@ Page({
appId: 5, appId: 5,
id: App.globalData.pointInfo[4].id, id: App.globalData.pointInfo[4].id,
banner: [ banner: [
App.globalData.appResourcesBase + 'shop/banner/banner-1-2-1.png', this.data.resourcesBase + 'shop/banner/banner-1-2-1.png',
App.globalData.appResourcesBase + 'shop/banner/banner-1-2-2.png', this.data.resourcesBase + 'shop/banner/banner-1-2-2.png',
App.globalData.appResourcesBase + 'shop/banner/banner-1-2-3.png', this.data.resourcesBase + 'shop/banner/banner-1-2-3.png',
], ],
shareImage: App.globalData.appResourcesBase + 'share/share-5.png', shareImage: this.data.resourcesBase + 'share/share-5.png',
name: '拾光花坊', name: '拾光花坊',
title: '拾光花坊', title: '拾光花坊',
date: '周一至周日 10:00 - 20:00', date: '周一至周日 10:00 - 20:00',
describe: [ describe: [
App.globalData.appResourcesBase + 'shop/detail/detail-1-2-1.png', this.data.resourcesBase + 'shop/detail/detail-1-2-1.png',
], ],
contact: '13316748039' contact: '13316748039'
}, { }, {
appId: 7, appId: 7,
id: App.globalData.pointInfo[6].id, id: App.globalData.pointInfo[6].id,
banner: [ banner: [
App.globalData.appResourcesBase + 'shop/banner/banner-2-1-1.png', this.data.resourcesBase + 'shop/banner/banner-2-1-1.png',
App.globalData.appResourcesBase + 'shop/banner/banner-2-1-2.png', this.data.resourcesBase + 'shop/banner/banner-2-1-2.png',
App.globalData.appResourcesBase + 'shop/banner/banner-2-1-3.png', this.data.resourcesBase + 'shop/banner/banner-2-1-3.png',
], ],
shareImage: App.globalData.appResourcesBase + 'share/share-11.png', shareImage: this.data.resourcesBase + 'share/share-11.png',
name: '元养水韵SPA', name: '元养水韵SPA',
title: '元养水韵SPA', title: '元养水韵SPA',
date: '周一至周日 10:00 - 22:00', date: '周一至周日 10:00 - 22:00',
describe: [ describe: [
App.globalData.appResourcesBase + 'shop/detail/detail-2-1-1.png', this.data.resourcesBase + 'shop/detail/detail-2-1-1.png',
App.globalData.appResourcesBase + 'shop/detail/detail-2-1-2.png', this.data.resourcesBase + 'shop/detail/detail-2-1-2.png',
App.globalData.appResourcesBase + 'shop/detail/detail-2-1-3.png', this.data.resourcesBase + 'shop/detail/detail-2-1-3.png',
App.globalData.appResourcesBase + 'shop/detail/detail-2-1-4.png', this.data.resourcesBase + 'shop/detail/detail-2-1-4.png',
], ],
contact: '13316748039' contact: '13316748039'
}, { }, {
appId: 6, appId: 6,
id: App.globalData.pointInfo[5].id, id: App.globalData.pointInfo[5].id,
banner: [ banner: [
App.globalData.appResourcesBase + 'shop/banner/banner-3-1-1.png', this.data.resourcesBase + 'shop/banner/banner-3-1-1.png',
App.globalData.appResourcesBase + 'shop/banner/banner-3-1-2.png', this.data.resourcesBase + 'shop/banner/banner-3-1-2.png',
App.globalData.appResourcesBase + 'shop/banner/banner-3-1-3.png', this.data.resourcesBase + 'shop/banner/banner-3-1-3.png',
], ],
shareImage: App.globalData.appResourcesBase + 'share/share-12.png', shareImage: this.data.resourcesBase + 'share/share-12.png',
name: '原味舒食', name: '原味舒食',
title: '原味舒食', title: '原味舒食',
date: '周一至周日 10:00 - 21:30', date: '周一至周日 10:00 - 21:30',
describe: [ describe: [
App.globalData.appResourcesBase + 'shop/detail/detail-3-1-1.png', this.data.resourcesBase + 'shop/detail/detail-3-1-1.png',
App.globalData.appResourcesBase + 'shop/detail/detail-3-1-2.png', this.data.resourcesBase + 'shop/detail/detail-3-1-2.png',
App.globalData.appResourcesBase + 'shop/detail/detail-3-1-3.png', this.data.resourcesBase + 'shop/detail/detail-3-1-3.png',
App.globalData.appResourcesBase + 'shop/detail/detail-3-1-4.png', this.data.resourcesBase + 'shop/detail/detail-3-1-4.png',
App.globalData.appResourcesBase + 'shop/detail/detail-3-1-5.png', this.data.resourcesBase + 'shop/detail/detail-3-1-5.png',
App.globalData.appResourcesBase + 'shop/detail/detail-3-1-6.png', this.data.resourcesBase + 'shop/detail/detail-3-1-6.png',
App.globalData.appResourcesBase + 'shop/detail/detail-3-1-7.png', this.data.resourcesBase + 'shop/detail/detail-3-1-7.png',
], ],
contact: '13316748039' contact: '13316748039'
}, { }, {
appId: 4, appId: 4,
id: App.globalData.pointInfo[3].id, id: App.globalData.pointInfo[3].id,
banner: [ banner: [
App.globalData.appResourcesBase + 'shop/banner/banner-3-2-1.png', this.data.resourcesBase + 'shop/banner/banner-3-2-1.png',
App.globalData.appResourcesBase + 'shop/banner/banner-3-2-2.png', this.data.resourcesBase + 'shop/banner/banner-3-2-2.png',
App.globalData.appResourcesBase + 'shop/banner/banner-3-2-3.png', this.data.resourcesBase + 'shop/banner/banner-3-2-3.png',
], ],
shareImage: App.globalData.appResourcesBase + 'share/share-13.png', shareImage: this.data.resourcesBase + 'share/share-13.png',
name: '原野MOJITO', name: '原野MOJITO',
title: '原野MOJITO', title: '原野MOJITO',
date: '周一至周日 10:00 - 凌晨02:00', date: '周一至周日 10:00 - 凌晨02:00',
describe: [ describe: [
App.globalData.appResourcesBase + 'shop/detail/detail-3-2-1.png', this.data.resourcesBase + 'shop/detail/detail-3-2-1.png',
], ],
contact: '13316748039' contact: '13316748039'
}, { }, {
appId: 2, appId: 2,
id: App.globalData.pointInfo[1].id, id: App.globalData.pointInfo[1].id,
banner: [ banner: [
App.globalData.appResourcesBase + 'shop/banner/banner-4-1-1.png', this.data.resourcesBase + 'shop/banner/banner-4-1-1.png',
App.globalData.appResourcesBase + 'shop/banner/banner-4-1-2.png', this.data.resourcesBase + 'shop/banner/banner-4-1-2.png',
App.globalData.appResourcesBase + 'shop/banner/banner-4-1-3.png', this.data.resourcesBase + 'shop/banner/banner-4-1-3.png',
], ],
shareImage: App.globalData.appResourcesBase + 'share/share-9.png', shareImage: this.data.resourcesBase + 'share/share-9.png',
name: '星空影院', name: '星空影院',
title: '星空影院', title: '星空影院',
date: '周一至周日 10:00 - 20:30', date: '周一至周日 10:00 - 20:30',
describe: [ describe: [
App.globalData.appResourcesBase + 'shop/detail/detail-4-1-1.png', this.data.resourcesBase + 'shop/detail/detail-4-1-1.png',
App.globalData.appResourcesBase + 'shop/detail/detail-4-1-2.png', this.data.resourcesBase + 'shop/detail/detail-4-1-2.png',
App.globalData.appResourcesBase + 'shop/detail/detail-4-1-3.png', this.data.resourcesBase + 'shop/detail/detail-4-1-3.png',
App.globalData.appResourcesBase + 'shop/detail/detail-4-1-4.png', this.data.resourcesBase + 'shop/detail/detail-4-1-4.png',
], ],
contact: '13316748039' contact: '13316748039'
}] }]
......
pages/play/service-sell/service-sell.js
...@@ -2,9 +2,6 @@ let App = getApp() ...@@ -2,9 +2,6 @@ let App = getApp()
Page({ Page({
data: { data: {
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
bannerIndex: 0, bannerIndex: 0,
bannerStyle: 1, bannerStyle: 1,
banner: [], banner: [],
......
pages/play/service-sell/service-sell.wxml
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</view> </view>
<view class="time-address row cb"> <view class="time-address row cb">
<text>{{serviceInfo.address}}</text> <text>{{serviceInfo.address}}</text>
<image class="service-icon" src="imageBase + 'icon/arrow-r-1.png'"></image> <image class="service-icon" src="{{imageBase + 'icon/arrow-r-1.png'}}"></image>
</view> </view>
</view> </view>
</view> </view>
......
pages/play/service/service.js
...@@ -19,70 +19,70 @@ Page({ ...@@ -19,70 +19,70 @@ Page({
let funcPredefineData = [ let funcPredefineData = [
{ {
describe: [ describe: [
App.globalData.appResourcesBase + 'play/detail/detail-1-1.png' this.data.resourcesBase + 'play/detail/detail-1-1.png'
], ],
shop: [{ shop: [{
appId: 1, appId: 1,
id: App.globalData.pointInfo[0].id, id: App.globalData.pointInfo[0].id,
name: '海错图展馆', name: '海错图展馆',
cover: App.globalData.appResourcesBase + 'play/detail/shop-bg-1-1.png', cover: this.data.resourcesBase + 'play/detail/shop-bg-1-1.png',
subCover: App.globalData.appResourcesBase + 'play/detail/shop-bg-1-2.png', subCover: this.data.resourcesBase + 'play/detail/shop-bg-1-2.png',
logo: App.globalData.appResourcesBase + 'shop/logo-1.png', logo: this.data.resourcesBase + 'shop/logo-1.png',
shopType: '4' shopType: '4'
}, { }, {
appId: 5, appId: 5,
id: App.globalData.pointInfo[4].id, id: App.globalData.pointInfo[4].id,
name: '拾光花坊', name: '拾光花坊',
cover: App.globalData.appResourcesBase + 'play/detail/shop-bg-1-3.png', cover: this.data.resourcesBase + 'play/detail/shop-bg-1-3.png',
logo: App.globalData.appResourcesBase + 'shop/logo-5.png', logo: this.data.resourcesBase + 'shop/logo-5.png',
shopType: '' shopType: ''
}] }]
}, { }, {
describe: [ describe: [
App.globalData.appResourcesBase + 'play/detail/detail-2-1.png' this.data.resourcesBase + 'play/detail/detail-2-1.png'
], ],
shop: [{ shop: [{
appId: 7, appId: 7,
id: App.globalData.pointInfo[6].id, id: App.globalData.pointInfo[6].id,
name: '水元养韵SPA', name: '水元养韵SPA',
cover: App.globalData.appResourcesBase + 'play/detail/shop-bg-2-1.png', cover: this.data.resourcesBase + 'play/detail/shop-bg-2-1.png',
logo: App.globalData.appResourcesBase + 'shop/logo-7.png', logo: this.data.resourcesBase + 'shop/logo-7.png',
shopType: '2' shopType: '2'
}] }]
}, { }, {
describe: [ describe: [
App.globalData.appResourcesBase + 'play/detail/detail-3-1.png' this.data.resourcesBase + 'play/detail/detail-3-1.png'
], ],
shop: [{ shop: [{
appId: 6, appId: 6,
id: App.globalData.pointInfo[5].id, id: App.globalData.pointInfo[5].id,
name: '原味舒食', name: '原味舒食',
cover: App.globalData.appResourcesBase + 'play/detail/shop-bg-3-1.png', cover: this.data.resourcesBase + 'play/detail/shop-bg-3-1.png',
logo: App.globalData.appResourcesBase + 'shop/logo-6-2.png', logo: this.data.resourcesBase + 'shop/logo-6-2.png',
shopType: '5' shopType: '5'
}, { }, {
appId: 4, appId: 4,
id: App.globalData.pointInfo[3].id, id: App.globalData.pointInfo[3].id,
name: '原野MOJITO', name: '原野MOJITO',
cover: App.globalData.appResourcesBase + 'play/detail/shop-bg-3-2.png', cover: this.data.resourcesBase + 'play/detail/shop-bg-3-2.png',
logo: App.globalData.appResourcesBase + 'shop/logo-4.png', logo: this.data.resourcesBase + 'shop/logo-4.png',
shopType: '5' shopType: '5'
}] }]
}, { }, {
describe: [ describe: [
App.globalData.appResourcesBase + 'play/detail/detail-4-1.png' this.data.resourcesBase + 'play/detail/detail-4-1.png'
], ],
shop: [{ shop: [{
appId: 2, appId: 2,
id: App.globalData.pointInfo[1].id, id: App.globalData.pointInfo[1].id,
name: '星空影院', name: '星空影院',
cover: App.globalData.appResourcesBase + 'play/detail/shop-bg-4-1.png', cover: this.data.resourcesBase + 'play/detail/shop-bg-4-1.png',
logo: App.globalData.appResourcesBase + 'shop/logo-2.png', logo: this.data.resourcesBase + 'shop/logo-2.png',
shopType: '' shopType: ''
}] }]
}, { }, {
describe: [ describe: [
App.globalData.appResourcesBase + 'play/detail/detail-5-1.png' this.data.resourcesBase + 'play/detail/detail-5-1.png'
], ],
shop: [] shop: []
}, },
......
pages/play/strategy-detail/strategy-detail.js
...@@ -2,10 +2,6 @@ let App = getApp() ...@@ -2,10 +2,6 @@ let App = getApp()
Page({ Page({
data: { data: {
appStatus: App.globalData.appStatus, appStatus: App.globalData.appStatus,
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
banner: [], banner: [],
bannerIndex: 0, bannerIndex: 0,
title: '', title: '',
...@@ -31,7 +27,10 @@ Page({ ...@@ -31,7 +27,10 @@ Page({
}, },
onShow: function () { onShow: function () {
this.setData({ appStatus: App.globalData.appStatus }) this.setData({
appStatus: App.globalData.appStatus
})
App.setAppStatus(this)
}, },
/** /**
......
project.config.json
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
"checkSiteMap": false, "checkSiteMap": false,
"uploadWithSourceMap": true, "uploadWithSourceMap": true,
"compileHotReLoad": false, "compileHotReLoad": false,
"useMultiFrameRuntime": false, "useMultiFrameRuntime": true,
"useApiHook": true, "useApiHook": true,
"babelSetting": { "babelSetting": {
"ignore": [], "ignore": [],
...@@ -33,9 +33,11 @@ ...@@ -33,9 +33,11 @@
"useIsolateContext": true, "useIsolateContext": true,
"useCompilerModule": true, "useCompilerModule": true,
"userConfirmedUseCompilerModuleSwitch": false, "userConfirmedUseCompilerModuleSwitch": false,
"userConfirmedBundleSwitch": false,
"packNpmManually": false, "packNpmManually": false,
"packNpmRelationList": [], "packNpmRelationList": [],
"minifyWXSS": true "minifyWXSS": true,
"useApiHostProcess": false
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.11.0", "libVersion": "2.11.0",
...@@ -48,24 +50,66 @@ ...@@ -48,24 +50,66 @@
"simulatorType": "wechat", "simulatorType": "wechat",
"simulatorPluginLibVersion": {}, "simulatorPluginLibVersion": {},
"condition": { "condition": {
"search": {
"list": []
},
"conversation": {
"list": []
},
"plugin": { "plugin": {
"list": [] "list": []
}, },
"game": { "game": {
"currentL": -1,
"list": [] "list": []
}, },
"gamePlugin": { "gamePlugin": {
"list": [] "list": []
}, },
"miniprogram": { "miniprogram": {
"list": [] "list": [
{
"name": "原味舒食",
"pathName": "pages/commodity/menu-food/menu-food",
"query": "shopAppId=6&commodityType=5&from=subscription",
"scene": 1047
},
{
"name": "原野MOJITO",
"pathName": "pages/commodity/menu-food/menu-food",
"query": "shopAppId=4&commodityType=5&from=subscription",
"scene": null
},
{
"name": "补给儿童营地",
"pathName": "pages/commodity/menu-food/menu-food",
"query": "shopAppId=3&commodityType=5&from=subscription",
"scene": null
},
{
"name": "补给拾光花坊",
"pathName": "pages/commodity/menu-food/menu-food",
"query": "shopAppId=5&commodityType=5&from=subscription",
"scene": null
},
{
"name": "文创儿童营地",
"pathName": "pages/commodity/menu-food/menu-food",
"query": "shopAppId=3&commodityType=4&from=subscription",
"scene": null
},
{
"name": "门票儿童营地",
"pathName": "pages/commodity/project-detail/project-detail",
"query": "shopAppId=3&commodityType=1&from=subscription",
"scene": null
},
{
"name": "门票海错",
"pathName": "pages/commodity/project-detail/project-detail",
"query": "shopAppId=1&commodityType=3&from=subscription",
"scene": null
},
{
"name": "门票元养水韵",
"pathName": "pages/commodity/project-detail/project-detail",
"query": "shopAppId=7&commodityType=2&from=subscription",
"scene": null
}
]
} }
} }
} }
\ No newline at end of file
read.js deleted 100644 → 0
/**
* 代码编写规范 - js - 变量命名
* is，状态类变量，通常数值为布尔类型。例如用户登录状态，isSignIn。
* view，窗口显隐控制，通常数值为布尔类型。例如 viewToast，viewDialog。
* func，函数内部变量前缀。
*
* 代码编写规范 - js - 变量命名禁忌
* 避免无意义命名，如 list，data，等等。
*
* 代码编写规范 - js - 常用变量命名
* option，页面参数对象
* userInfo，用户信息对象
*
* 代码编写规范 - js - 函数命名
* query
*
* js - 列表相关
* 循环一定添加 key index
*
* 页面代码结构：
* let App = getApp()
* Page({
* data: {},
* onLoad: function () {},
* 生命周期函数
*
* setXX: function () {},
* 初始，设置数据函数
*
* queryXX: function () {},
* 数据查询函数
*
* onXX: function () {},
* 交互事件函数，点击按钮，触发窗口等等
*
* XX: function () {},
* 其他自定义函数
*
* eventXX: function () {},
* 逻辑事件函数，所有不是用户触发的事件，比如 swiper 组件 bindchange 事件
* })
*/
\ No newline at end of file
utils/extend/page.js
import host from '../host.js'
let hostUrl = host()
let funcPageExtend = function (App) { let funcPageExtend = function (App) {
let funcPage = Page let funcPage = Page
...@@ -5,10 +8,8 @@ let funcPageExtend = function (App) { ...@@ -5,10 +8,8 @@ let funcPageExtend = function (App) {
const { onLoad, onShow, onHide, onCatchNewEvent, onShareAppMessage } = funPage const { onLoad, onShow, onHide, onCatchNewEvent, onShareAppMessage } = funPage
// 页面全局变量初始化。 // 页面全局变量初始化。
funPage.data = Object.assign(funPage.data, { funPage.data = Object.assign(funPage.data, {
'imageBase': App.globalData.appImageBase, 'imageBase': '../../../image/',
'resourcesBase': App.globalData.appResourcesBase, 'resourcesBase': hostUrl.serverRes,
'isViewDataReady': false, // 视图显示控制，当页面数据请求到位时设置为 true ，以显示视图。避免请求过程中页面显示不完整问题。
'sourceValue': App.globalData.sourceValue,
}) })
// 捕获发送给当前页面的待处理事件 // 捕获发送给当前页面的待处理事件
...@@ -26,7 +27,7 @@ let funcPageExtend = function (App) { ...@@ -26,7 +27,7 @@ let funcPageExtend = function (App) {
return { return {
title: '碧海银湖 | 理想生活', title: '碧海银湖 | 理想生活',
path: '/pages/home/home/home', path: '/pages/home/home/home',
imageUrl: App.globalData.appImageBase + 'share.png', imageUrl: '../../../image/share.png',
} }
} }
} }
......
utils/host.js 0 → 100644
// 重构日期：2021-03
export default function host () {
let env = wx.getAccountInfoSync().miniProgram.envVersion
let appId = wx.getAccountInfoSync().miniProgram.appId
let domain = ''
let envOption = {}
// 根据小程序 appId 设置主域名
switch (appId) {
case 'wx7c468a29cb33a246':
domain = 'https://smbhyh-web.meiqicloud.com'
break
case 'wx37a9b7a3d92029f2':
domain = 'https://sm-web.meiqicloud.com'
break
}
// 根据环境设置相关业务地址
switch (env) {
// 开发版
case 'develop':
envOption = {
api: domain + '/api/',
upload: domain + '/obpm/',
serverRes: domain + '/userfiles/appResourcesS2/',
}
break
// 体验版
case 'trial':
envOption = {
api: domain + '/',
upload: domain + '/obpm/',
serverRes: domain + '/userfiles/appResourcesS2/',
}
break
// 正式版
case 'release':
envOption = {
api: domain + '/',
upload: domain + '/obpm/',
serverRes: domain + '/userfiles/appResourcesS2/',
}
break
}
console.log('[host] ', domain)
console.log('[host] ', envOption)
return envOption
}
\ No newline at end of file
utils/login/login.js
...@@ -29,15 +29,15 @@ let output = function (App) { ...@@ -29,15 +29,15 @@ let output = function (App) {
case 'invalid': case 'invalid':
console.log('[login] invalid') console.log('[login] invalid')
App.userLogin() App.tryLogin()
break break
case 'nothing': case 'nothing':
console.log('[login] nothing') console.log('[login] nothing')
App.userLogin() App.tryLogin()
break break
} }
console.log(funcTokenState) // console.log(funcTokenState)
} }
export default output export default output
\ No newline at end of file
utils/request/corvus.js
import iOption from './option.js' import host from '../host.js'
import interceptor from './interceptor.js' import interceptor from './interceptor.js'
// 设置请求地址，文件上传，下载地址等通用环境地址
let hostUrl = host()
/** /**
* 检查传参格式，数值有效性。 * 检查传参格式，数值有效性。
* @function * @function
...@@ -16,6 +19,7 @@ function inspectOption (funcOption) { ...@@ -16,6 +19,7 @@ function inspectOption (funcOption) {
// 请求方式必须是post或者get之一。 // 请求方式必须是post或者get之一。
if (funcOption.method && ['get', 'post'].indexOf(funcOption.method) < 0) { if (funcOption.method && ['get', 'post'].indexOf(funcOption.method) < 0) {
console.log(funcOption)
console.log('[request] "method" is invalid!') console.log('[request] "method" is invalid!')
return return
} }
...@@ -35,7 +39,7 @@ function request (funcOption) { ...@@ -35,7 +39,7 @@ function request (funcOption) {
// { 'Content-Type': 'application/json;' } // { 'Content-Type': 'application/json;' }
// { 'Content-Type': 'text/plain;' } // { 'Content-Type': 'text/plain;' }
let funcDefaultOption = { let funcDefaultOption = {
base: iOption.baseUrl, base: hostUrl.api,
method: 'post', method: 'post',
header: { 'content-type': 'application/json' }, header: { 'content-type': 'application/json' },
timeout: 5000, timeout: 5000,
...@@ -66,6 +70,8 @@ function request (funcOption) { ...@@ -66,6 +70,8 @@ function request (funcOption) {
fail: (funcResponse) => { fail: (funcResponse) => {
// 网络请求失败 // 网络请求失败
interceptor.response(funcOption, funcResponse) interceptor.response(funcOption, funcResponse)
console.log('funcOption', funcOption)
console.log('funcResponse', funcResponse)
funcReject('[request] "request end!') funcReject('[request] "request end!')
}, },
}) })
......
utils/request/interceptor.js
import iMd5 from '../md5.js'
let Output = { let Output = {
/** /**
* 请求拦截器，对请求进行配置修改或者拦截。 * 请求拦截器，对请求进行配置修改或者拦截。
...@@ -12,21 +10,6 @@ let Output = { ...@@ -12,21 +10,6 @@ let Output = {
if (funcToken) { if (funcToken) {
option.header.token = funcToken option.header.token = funcToken
} }
// 网络断开场景
// if (!App.globalData.networkStatus) {
// console.log('offline')
// }
// if (option.url !== 'api/app/weixin/v1/pay/findStatus' && option.url !== 'vx/appletapi/v1/gongZheng/getState') {
// wx.showLoading({ title: '正在获取数据', mask: true })
// }
// let funcToken = App.globalData.encryptedData.token
// let funcSecret = '4b16f0e4b729a04d756e2af1bf2132693d22fad6746330c00f1e3408bb4cdb3547ce13ee48591a47ecd4ce8f6f02602e599bf3586095b67a8ba6382885e89628'
// let funcMd5 = iMd5(funcToken + JSON.stringify(option.params) + funcSecret)
// option.header = Object.assign(option.header, { 'sign': funcMd5 })
// option.header = Object.assign(option.header, { 'T_XSSL_Token': App.globalData.encryptedData.token })
return option return option
}, },
...@@ -79,7 +62,10 @@ let Output = { ...@@ -79,7 +62,10 @@ let Output = {
break break
case 402: case 402:
// 对于没有 token 缓存的用户不会进行刷新 token 请求。
if (wx.getStorageSync('token')) {
getApp().setNewToken(funcOption) getApp().setNewToken(funcOption)
}
break break
case 500: case 500:
......
utils/request/option.js
if (wx.getAccountInfoSync().miniProgram.appId === 'wx7c468a29cb33a246') {
console.log('option')
console.log('https://smbhyh-web.meiqicloud.com/api/')
}
const output = { const output = {
baseUrl: 'https://sm-web.meiqicloud.com/api/', baseUrl: 'https://sm-web.meiqicloud.com/api/',
// 正式环境
// baseUrl: 'https://smbhyh-web.meiqicloud.com/api/', // baseUrl: 'https://smbhyh-web.meiqicloud.com/api/',
} }
......
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