Merge branch 'master' of http://192.168.1.26:3000/dianliang/dl_uniapp
This commit is contained in:
commit
5e88ae4144
@ -35,8 +35,8 @@ export function rightList(params) {
|
||||
})
|
||||
}
|
||||
|
||||
//------------------通告券相关-----------------------
|
||||
//查询基础通告券
|
||||
//------------------急招券相关-----------------------
|
||||
//查询基础急招券
|
||||
export function initCouponList() {
|
||||
return request({
|
||||
url: '/base/coupon/uniCouponList',
|
||||
|
||||
@ -201,7 +201,7 @@ export function saveBlack(data) {
|
||||
})
|
||||
}
|
||||
|
||||
//查询通告券
|
||||
//查询急招券
|
||||
export function getMemberCoupon() {
|
||||
return request({
|
||||
url: '/member/coupon/getMemberCoupon',
|
||||
|
||||
@ -31,6 +31,10 @@
|
||||
type: String,
|
||||
default: '#fff'
|
||||
},
|
||||
navigatePath: {
|
||||
type: String,
|
||||
default: '000'
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
@ -40,8 +44,8 @@
|
||||
methods: {
|
||||
back() {
|
||||
console.log('返回');
|
||||
if (this.title == '通告详情') {
|
||||
this.$emit('goIndex')
|
||||
if (this.navigatePath != '000') {
|
||||
this.$tab.navigateTo(this.navigatePath)
|
||||
} else {
|
||||
uni.navigateBack()
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<view class="container-box">
|
||||
<navigation-bar-vue title="通告券" style="width: 100%;" background-color="#ffffff"
|
||||
<navigation-bar-vue title="急招券" style="width: 100%;" background-color="#ffffff"
|
||||
title-color="#000000"></navigation-bar-vue>
|
||||
<view class="content">
|
||||
<view class="content-body">
|
||||
@ -24,7 +24,7 @@
|
||||
</view>
|
||||
<view class="item-field" style="align-items: center;">
|
||||
<!-- <view class="my-suggest-dom" @click="viewRichText()">-->
|
||||
<!-- <text>了解通告券</text>-->
|
||||
<!-- <text>了解急招券</text>-->
|
||||
<!-- <uni-icons type="right" color="#363636" size="14"></uni-icons>-->
|
||||
<!-- </view>-->
|
||||
<view class="my-suggest-dom" @click="goMyCoupon(1)">
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<view class="container-box">
|
||||
<navigation-bar-vue title="通告券" style="width: 100%;" background-color="#ffffff"
|
||||
<navigation-bar-vue title="急招券" style="width: 100%;" background-color="#ffffff"
|
||||
title-color="#000000"></navigation-bar-vue>
|
||||
<view class="content">
|
||||
<!-- 操作按钮 -->
|
||||
@ -37,7 +37,7 @@
|
||||
</view>
|
||||
<view class="item-field" style="align-items: center;">
|
||||
<view class="my-suggest-dom" @click="viewRichText()">
|
||||
<text>查看《通告券购买协议》</text>
|
||||
<text>查看《急招券购买协议》</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -53,7 +53,7 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="detail-item">
|
||||
<view class="left-dom">通告券</view>
|
||||
<view class="left-dom">急招券</view>
|
||||
<view class="right-dom">*{{item.goodsNum}} 张</view>
|
||||
</view>
|
||||
<view class="detail-item" style="border-bottom:1rpx solid #F4F4F4;padding-bottom: 25rpx;">
|
||||
@ -107,10 +107,10 @@
|
||||
data() {
|
||||
return {
|
||||
globalConfig: getApp().globalData.config,
|
||||
menus: ['通告券', '购买记录'],
|
||||
menus: ['急招券', '购买记录'],
|
||||
menuIndex: 0,
|
||||
coupon: 0,
|
||||
//选中的通告券下标
|
||||
//选中的急招券下标
|
||||
couponIndex: 0,
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
|
||||
@ -112,7 +112,7 @@
|
||||
<view class="menu-item" v-if="'01'==localUserType" @click="goCoupon()">
|
||||
<!-- <image src="@/static/mine/zuji.png" mode="aspectFit"></image> -->
|
||||
<image src="@/static/mine/caise/tonggaoquan.png" mode="aspectFit"></image>
|
||||
<view class="text-dom">通告券</view>
|
||||
<view class="text-dom">急招券</view>
|
||||
<uni-icons type="right" color="#623109" size="12"></uni-icons>
|
||||
</view>
|
||||
<view class="menu-item" @click="goHistory()">
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<view class="dl-detail-box">
|
||||
<navigation-bar-vue title="通告详情" @goIndex="goIndex" style="width: 100%;" background-color="#ffffff"
|
||||
<navigation-bar-vue title="通告详情" :navigatePath="navigatePath" style="width: 100%;" background-color="#ffffff"
|
||||
title-color="#000000"></navigation-bar-vue>
|
||||
<view class="notice-detail-last-box">
|
||||
<!-- 报名列表 -->
|
||||
@ -254,6 +254,7 @@
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
navigatePath: '000',
|
||||
//是否是看自己的通告-通告主
|
||||
viewMy: false,
|
||||
//通告ID
|
||||
@ -339,6 +340,10 @@
|
||||
this.noticeId = params.noticeId
|
||||
}
|
||||
|
||||
if (params.navigatePath && params.navigatePath == "index") {
|
||||
this.navigatePath = "/pages/index"
|
||||
}
|
||||
|
||||
},
|
||||
onShow() {
|
||||
if (null != getJSONData(constant.userInfo)) {
|
||||
@ -587,7 +592,7 @@
|
||||
this.$refs.share.open()
|
||||
},
|
||||
/**
|
||||
* 使用通告券加速
|
||||
* 使用急招券加速
|
||||
*/
|
||||
useCoupon() {
|
||||
|
||||
|
||||
@ -583,7 +583,7 @@
|
||||
saveNotice(this.dataObj).then(res => {
|
||||
this.dataObj.id = res.data.noticeId
|
||||
uni.showToast({
|
||||
title: '发布成功等待审核',
|
||||
title: res.data.msg,
|
||||
icon: 'none',
|
||||
duration: 1000
|
||||
})
|
||||
|
||||
Loading…
Reference in New Issue
Block a user