Compare commits
No commits in common. "b29534f7167c565531101ee890d6c576af10063e" and "915c3b6c7e52866653c2425b4e88a2aa2b5952a9" have entirely different histories.
b29534f716
...
915c3b6c7e
@ -193,11 +193,3 @@ export function saveBlack(data) {
|
|||||||
data: data
|
data: data
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
//查询通告券
|
|
||||||
export function getMemberCoupon() {
|
|
||||||
return request({
|
|
||||||
url: '/member/coupon/getMemberCoupon',
|
|
||||||
method: 'get',
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
// 应用全局配置
|
// 应用全局配置
|
||||||
module.exports = {
|
module.exports = {
|
||||||
//baseUrl: 'https://notice.lighting-it.cn',
|
//baseUrl: 'https://notice.lighting-it.cn',
|
||||||
// baseUrl: 'https://www.ddtg.site/noticeApi',
|
baseUrl: 'https://www.ddtg.site/noticeApi',
|
||||||
baseUrl: 'http://192.168.1.4:8099',
|
//baseUrl: 'http://192.168.1.31:8099',
|
||||||
// 应用信息
|
// 应用信息
|
||||||
appInfo: {
|
appInfo: {
|
||||||
// 应用名称
|
// 应用名称
|
||||||
|
|||||||
@ -38,7 +38,6 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import navigationBarVue from '@/components/navigation/navigationBar.vue';
|
import navigationBarVue from '@/components/navigation/navigationBar.vue';
|
||||||
import {getMemberCoupon} from '@/api/business/member.js'
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
navigationBarVue
|
navigationBarVue
|
||||||
@ -50,16 +49,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
onLoad(options){
|
onLoad(options){
|
||||||
},
|
this.coupon = options.coupon
|
||||||
onShow(){
|
|
||||||
this.initMyCoupon()
|
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
initMyCoupon(){
|
|
||||||
getMemberCoupon().then(res=>{
|
|
||||||
this.coupon = res.data
|
|
||||||
})
|
|
||||||
},
|
|
||||||
viewRichText() {
|
viewRichText() {
|
||||||
this.$tab.navigateTo(
|
this.$tab.navigateTo(
|
||||||
`/pages/common/richview/index?title=${this.globalConfig.appInfo.agreements[5].title}&code=${this.globalConfig.appInfo.agreements[5].code}`
|
`/pages/common/richview/index?title=${this.globalConfig.appInfo.agreements[5].title}&code=${this.globalConfig.appInfo.agreements[5].code}`
|
||||||
|
|||||||
@ -82,8 +82,7 @@
|
|||||||
import {
|
import {
|
||||||
saveOrder,
|
saveOrder,
|
||||||
getOrderList,
|
getOrderList,
|
||||||
prepayment,
|
prepayment
|
||||||
getMemberCoupon
|
|
||||||
} from '@/api/business/member.js'
|
} from '@/api/business/member.js'
|
||||||
import {
|
import {
|
||||||
toast
|
toast
|
||||||
@ -128,6 +127,7 @@
|
|||||||
},
|
},
|
||||||
onLoad(option) {
|
onLoad(option) {
|
||||||
this.menuIndex = option.index || 0
|
this.menuIndex = option.index || 0
|
||||||
|
this.coupon = option.coupon || 0
|
||||||
this.initCoupon();
|
this.initCoupon();
|
||||||
this.initOrder()
|
this.initOrder()
|
||||||
//获取url中的search
|
//获取url中的search
|
||||||
@ -143,10 +143,9 @@
|
|||||||
let that = this
|
let that = this
|
||||||
getWebAccessTokenAndOpenid(result.code).then(res => {
|
getWebAccessTokenAndOpenid(result.code).then(res => {
|
||||||
that.$store.dispatch('GzhLogin', res).then(() => {
|
that.$store.dispatch('GzhLogin', res).then(() => {
|
||||||
that.initCoupon();
|
this.initCoupon();
|
||||||
that.initOrder()
|
this.initOrder()
|
||||||
that.loginSuccess()
|
that.loginSuccess()
|
||||||
that.initMyCoupon()
|
|
||||||
}).catch((e) => {
|
}).catch((e) => {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
icon: 'error',
|
icon: 'error',
|
||||||
@ -160,17 +159,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onShow(){
|
|
||||||
if (getToken()){
|
|
||||||
this.initMyCoupon()
|
|
||||||
}
|
|
||||||
},
|
|
||||||
methods: {
|
methods: {
|
||||||
initMyCoupon(){
|
|
||||||
getMemberCoupon().then(res=>{
|
|
||||||
this.coupon = res.data
|
|
||||||
})
|
|
||||||
},
|
|
||||||
openVip() {
|
openVip() {
|
||||||
// 在你想触发跳转的地方
|
// 在你想触发跳转的地方
|
||||||
wx.openOfficialAccountProfile({
|
wx.openOfficialAccountProfile({
|
||||||
|
|||||||
@ -15,6 +15,7 @@
|
|||||||
<image v-if="!userInfo.avatar" class="touxiang" src="@/static/images/profile.jpg" mode="aspectFit">
|
<image v-if="!userInfo.avatar" class="touxiang" src="@/static/images/profile.jpg" mode="aspectFit">
|
||||||
</image>
|
</image>
|
||||||
<image v-else class="touxiang" :src="userInfo.avatar" mode="aspectFit"></image>
|
<image v-else class="touxiang" :src="userInfo.avatar" mode="aspectFit"></image>
|
||||||
|
<image class="sex" src="@/static/mine/sex_girl.png" mode="aspectFit"></image>
|
||||||
</view>
|
</view>
|
||||||
<view class="name-box">
|
<view class="name-box">
|
||||||
<view class="title-box">
|
<view class="title-box">
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user