Skip to content

严立 / mini-shimao

Go to a project
Commit ddff6ecb by wjw
Options

Merge branch 'master' of http://120.77.182.185/yanl/mini-shimao.git into master

parents 8d9dc85d 04e8f2fc
Inline Side-by-side
Showing with 20 additions and 89 deletions
app.js
...@@ -286,6 +286,9 @@ App({ ...@@ -286,6 +286,9 @@ App({
this.login({ error: true }) this.login({ error: true })
break break
} }
},
fail: () => {
this.globalData.isRefreshToken = false
} }
}) })
}, },
......
pages/commodity/menu-food/menu-food.js
...@@ -34,7 +34,6 @@ Page({ ...@@ -34,7 +34,6 @@ Page({
}, },
onLoad: function (option) { onLoad: function (option) {
console.log(option)
this.setData({ this.setData({
option: option option: option
}) })
...@@ -209,7 +208,7 @@ Page({ ...@@ -209,7 +208,7 @@ Page({
url: '/api/v1/commodity/getCommoditys', url: '/api/v1/commodity/getCommoditys',
data: { data: {
'officeId': this.data.shopInfo.id, 'officeId': this.data.shopInfo.id,
'classifyId': this.data.sideBar[this.data.currentIndex].id, // 'classifyId': this.data.sideBar[this.data.currentIndex].id,
'genre': this.data.shopInfo.shopType, 'genre': this.data.shopInfo.shopType,
}, },
success: (response) => { success: (response) => {
......
pages/home/dynamic-detail/dynamic-detail.js
...@@ -8,17 +8,10 @@ Page({ ...@@ -8,17 +8,10 @@ Page({
}, },
onLoad: function (options) { onLoad: function (options) {
console.log(options)
this.setData({ this.setData({
id: options.id id: options.id
}) })
let that = this this.getNoticeDetail()
app.login({
success: function () {
that.getNoticeDetail()
}
})
}, },
// 最新动态详情 // 最新动态详情
......
pages/home/dynamic/dynamic.js
...@@ -12,12 +12,7 @@ Page({ ...@@ -12,12 +12,7 @@ Page({
}, },
onLoad: function () { onLoad: function () {
var that = this this.getNoticeList()
App.login({
success: function (token) {
that.getNoticeList()
}
})
}, },
onNoticeDetail: function (funcItem) { onNoticeDetail: function (funcItem) {
......
pages/home/home/home.js
...@@ -66,24 +66,14 @@ Page({ ...@@ -66,24 +66,14 @@ Page({
this.setData({ this.setData({
pageNo: 1 pageNo: 1
}) })
var that = this this.getBanner()
App.login({ // this.loadVisiterPlanList()
success: function (token) { this.getNoticeList()
that.getBanner() this.getBrands()
// that.loadVisiterPlanList()
that.getNoticeList()
that.getBrands()
}
})
}, },
setLogin: function () { setLogin: function () {
let funcUserInfo = wx.getStorageSync('userInfo') let funcUserInfo = wx.getStorageSync('userInfo')
// if (funcUserInfo.phone && funcUserInfo.name && funcUserInfo.avatar) { if (!funcUserInfo.isSignIn) {
// this.setData({
// isLogin: true,
// })
// }
if (funcUserInfo.isSignIn) {
this.setData({ this.setData({
isLogin: true isLogin: true
}) })
......
pages/home/home/home.wxml
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<image src="/image/ornament-0.png" mode="widthFix"></image> <image src="/image/ornament-0.png" mode="widthFix"></image>
</view> </view>
<view class="banner-notice login-notice row align-c" bindtap="onLogin" wx:if="{{!isLogin}}"> <view class="banner-notice login-notice row align-c" bindtap="onLogin" wx:if="{{isLogin}}">
<view class="row align-c"> <view class="row align-c">
<image src="/image/wechat.png"></image> <image src="/image/wechat.png"></image>
<text>微信登陆</text> <text>微信登陆</text>
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</view> </view>
</view> </view>
<view class="detail {{!isLogin ? 'login-detail' : ''}}"> <view class="detail {{isLogin ? 'login-detail' : ''}}">
<!-- 预约公告 --> <!-- 预约公告 -->
<view class="night row con-b" bindtap="onAppointmentInto"> <view class="night row con-b" bindtap="onAppointmentInto">
<image src="./image/into.png" mode="aspectFit"></image> <image src="./image/into.png" mode="aspectFit"></image>
......
pages/mine/accumulate/accumulate.js
...@@ -31,12 +31,7 @@ Page({ ...@@ -31,12 +31,7 @@ Page({
this.setData({ this.setData({
integral: integral integral: integral
}) })
App.login({ this.getAccumulate()
timeout: 0,
success: (result) => {
this.getAccumulate()
},
})
}, },
// 获取积分列表 // 获取积分列表
getAccumulate: function () { getAccumulate: function () {
......
pages/mine/card/card.js
...@@ -12,17 +12,7 @@ Page({ ...@@ -12,17 +12,7 @@ Page({
passList: [] passList: []
}, },
onLoad: function (options) { onLoad: function (options) {
// if (options.type) options.type = Number(options.type) this.getCardList()
// this.setData({
// passListType: options.type
// })
// this.setView()
App.login({
timeout: 0,
success: (result) => {
this.getCardList()
},
})
}, },
// 跳转订单详情 // 跳转订单详情
onOrderDetail: function (event) { onOrderDetail: function (event) {
......
pages/mine/order/order.js
...@@ -41,31 +41,12 @@ Page({ ...@@ -41,31 +41,12 @@ Page({
option: options, option: options,
optionsGoodType: options.goodType != undefined ? 1 * options.goodType : '' optionsGoodType: options.goodType != undefined ? 1 * options.goodType : ''
}) })
// App.login({
// timeout: 0,
// success: (result) => {
// this.setOrderType()
// },
// })
}, },
onShow: function () { onShow: function () {
App.login({ this.setOrderType()
timeout: 0,
success: (result) => {
this.setOrderType()
},
})
}, },
refresh: function () { refresh: function () {
App.login({ this.setOrderType()
timeout: 0,
success: (result) => {
this.setOrderType()
},
})
}, },
/** /**
......
pages/pay/order-detail/order-detail.js
...@@ -39,12 +39,7 @@ Page({ ...@@ -39,12 +39,7 @@ Page({
fromPage: options.fromPage === 'order' ? 'order' : '', fromPage: options.fromPage === 'order' ? 'order' : '',
isFromUse: options.showCode === 'true' ? true : false, isFromUse: options.showCode === 'true' ? true : false,
}) })
App.login({ this.queryOrderDetail()
timeout: 0,
success: (result) => {
this.queryOrderDetail()
},
})
}, },
// 再次下单 // 再次下单
onOrderAgain: function (event) { onOrderAgain: function (event) {
......
pages/play/activity-entry/activity-entry.js
...@@ -37,12 +37,7 @@ Page({ ...@@ -37,12 +37,7 @@ Page({
id: options.id id: options.id
}) })
var that = this this.getEnrollView()
App.login({
success: function () {
that.getEnrollView()
}
})
}, },
onQuantityCut: function () { onQuantityCut: function () {
...@@ -139,12 +134,7 @@ Page({ ...@@ -139,12 +134,7 @@ Page({
}, },
onSubmit: function () { onSubmit: function () {
var that = this this.doActivityEnroll()
App.login({
success: function () {
that.doActivityEnroll()
}
})
}, },
onEntryComplete: function () { onEntryComplete: function () {
......
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