Augcl
/
popularize-front
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

代码修复提交

master
主管理员 1 month ago
parent
504f5d79dd
commit
df9890d55d
15 changed files with 95 additions and 41 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +10
    -0
      api/model/order.js
  2. +5
    -0
      api/model/zhaomu.js
  3. +2
    -2
      components/cart/CardList.vue
  4. +11
    -5
      components/zhaomu/zhaomu-item.vue
  5. +9
    -9
      components/zhaomu/zlx-item.vue
  6. +4
    -4
      config.js
  7. +1
    -1
      manifest.json
  8. +1
    -1
      pages_my/collection.vue
  9. +8
    -2
      pages_my/travelList.vue
  10. +2
    -2
      pages_my/zlx-qiandao.vue
  11. +1
    -1
      pages_order/huodong-detail.vue
  12. +13
    -2
      pages_order/invoiceIssuance.vue
  13. +26
    -10
      pages_order/invoiceRecords.vue
  14. +1
    -1
      pages_order/lvyou-detail.vue
  15. +1
    -1
      pages_zlx/zlx-form.vue

+ 10
- 0
api/model/order.js View File

@ -27,6 +27,11 @@ const api = {
url: '/order_common/invoice', url: '/order_common/invoice',
method: 'POST', method: 'POST',
}, },
//发票列表
getInvoicePageList:{
url: '/order_common/getInvoicePageList',
method: 'GET',
},
// 订单活动签到 // 订单活动签到
signIn: { signIn: {
url: '/order_common/signIn', url: '/order_common/signIn',
@ -37,6 +42,11 @@ const api = {
url: '/order_common/createOrder', url: '/order_common/createOrder',
method: 'POST', method: 'POST',
}, },
//我主理的信息
getTwoPageList: {
url: '/index_common/getTwoPageList',
method: 'GET',
}
} }
export default api export default api

+ 5
- 0
api/model/zhaomu.js View File

@ -20,6 +20,11 @@ const api = {
url: '/shop_common/getActivityMemberPageList', url: '/shop_common/getActivityMemberPageList',
method: 'get', method: 'get',
}, },
//参与招募
shopUserAuth: {
url: '/shop_common/shopUserAuth',
method: 'POST',
},
} }
export default api export default api

+ 2
- 2
components/cart/CardList.vue View File

@ -7,7 +7,7 @@
</view> </view>
<view class="content cardStyle_" :class="['U','S'].includes(item.state) ? 'content_border' : ''"> <view class="content cardStyle_" :class="['U','S'].includes(item.state) ? 'content_border' : ''">
<view class="left"> <view class="left">
<image :src="item.image" alt="">
<img :src="item.image.split(',')[0]" alt="">
</view> </view>
<view class="right"> <view class="right">
<view class="detailed"> <view class="detailed">
@ -25,7 +25,7 @@
<button @click.stop="skip(item,1)" v-if="item.state == 1" :style="{background: '#492623;', color: '#FF3E3F',margin:'0 30rpx 0 0'}" <button @click.stop="skip(item,1)" v-if="item.state == 1" :style="{background: '#492623;', color: '#FF3E3F',margin:'0 30rpx 0 0'}"
class="mini-btn" size="mini">活动签到</button> class="mini-btn" size="mini">活动签到</button>
<button @click.stop="skip(item,2)" v-if="item.state == 2" :style="{background: '#492623;', color: '#FF3E3F',margin:'0 30rpx 0 0'}"
<button @click.stop="skip(item,2)" v-if="item.state == 2 && item.isPj == 'N'" :style="{background: '#492623;', color: '#FF3E3F',margin:'0 30rpx 0 0'}"
class="mini-btn" size="mini">评价活动</button> class="mini-btn" size="mini">评价活动</button>
<button @click.stop="skip(item,3)" v-if="item.state == 2" :style="{background: '#49361D;', color: '#FFB245',margin:'0 30rpx 0 0'}" <button @click.stop="skip(item,3)" v-if="item.state == 2" :style="{background: '#49361D;', color: '#FFB245',margin:'0 30rpx 0 0'}"


+ 11
- 5
components/zhaomu/zhaomu-item.vue View File

@ -7,7 +7,7 @@
</view> </view>
<view class="right"> <view class="right">
<view class="detailed"> <view class="detailed">
<view class="title">{{item.enTitle}}</view>
<view class="title">{{item.title}}</view>
<view class="date">{{item.startTime}}</view> <view class="date">{{item.startTime}}</view>
<view class="address"> <view class="address">
<view class="img-box"> <view class="img-box">
@ -23,8 +23,8 @@
</view> </view>
<view class="bottom-box"> <view class="bottom-box">
<view class="bottom-box-l"> <view class="bottom-box-l">
<uv-avatar-group :urls="urls" size="45rpx" gap="0.1"></uv-avatar-group>
<view class="num">4人参加</view>
<uv-avatar-group :urls="urls" keyName="headImage" size="45rpx" gap="0.1"></uv-avatar-group>
<view class="num">{{item.num}}人参加</view>
</view> </view>
<view class="bottom-box-r" @click="toZhaomu(item)"> <view class="bottom-box-r" @click="toZhaomu(item)">
参与招募 参与招募
@ -59,6 +59,7 @@
handler(val){ handler(val){
this.iconTextArr = val.iconText.split("，"); this.iconTextArr = val.iconText.split("，");
this.imgArr = val.image.split(",") this.imgArr = val.image.split(",")
this.urls = val.popularizeRecruitLogList;
}, },
immediate:true immediate:true
} }
@ -72,8 +73,13 @@
}) })
}, },
toZhaomu(item) { toZhaomu(item) {
uni.navigateTo({
url: `/pages_order/lvyou-detail?travelId=${item.id}`
let params = {
recruitId:item.id,
}
this.$api('shopUserAuth',params,res=>{
if(res.code == 200) {
this.$Toast('参与成功')
}
}) })
} }
} }


+ 9
- 9
components/zhaomu/zlx-item.vue View File

@ -1,14 +1,14 @@
<template> <template>
<view class="cardList"> <view class="cardList">
<view class="content">
<view class="content" >
<view class="left"> <view class="left">
<img src="https://up.zhuoku.org/22/a4/60/50/fc3bd0b4e656911fccdde4383637c1cd.jpg" alt="">
<img :src="item.image.split(',')[0]" alt="">
</view> </view>
<view class="right"> <view class="right">
<view class="detailed"> <view class="detailed">
<view class="title">夏日去撒野旅游计划</view>
<view class="date">2024.08.23 12:00</view>
<view class="address">成都市东丽湖露营地</view>
<view class="title">{{item.title}}</view>
<view class="date">{{item.createTime}}</view>
<view class="address">{{item.address}}</view>
</view> </view>
<view class="price" v-if="showBottom"> <view class="price" v-if="showBottom">
<view class="num-box">20/40</view> <view class="num-box">20/40</view>
@ -23,10 +23,10 @@
<script> <script>
export default { export default {
props: { props: {
showBottom:{
type:Boolean,
default:true
}
item: {
type: Object,
default: ()=>{}
},
}, },
data() { data() {
return { return {


+ 4
- 4
config.js View File

@ -13,14 +13,14 @@ const type = 'prod'
// 环境配置 // 环境配置
const config = { const config = {
dev : { dev : {
baseUrl : 'http://test-lzx.natapp1.cc/popularize-admin',
// baseUrl : 'https://popularize-admin.hhlm1688.com/popularize-admin',
// baseUrl : 'http://test-lzx.natapp1.cc/popularize-admin',
baseUrl : 'https://popularize-admin.hhlm1688.com/popularize-admin',
// baseUrl : 'http://h5.xzaiyp.top/popularize-admin', // baseUrl : 'http://h5.xzaiyp.top/popularize-admin',
}, },
prod : { prod : {
baseUrl : 'http://test-lzx.natapp1.cc/popularize-admin',
// baseUrl : 'http://test-lzx.natapp1.cc/popularize-admin',
// baseUrl : 'http://h5.xzaiyp.top/popularize-admin', // baseUrl : 'http://h5.xzaiyp.top/popularize-admin',
// baseUrl : 'https://popularize-admin.hhlm1688.com/popularize-admin',
baseUrl : 'https://popularize-admin.hhlm1688.com/popularize-admin',
} }
} }


+ 1
- 1
manifest.json View File

@ -1,6 +1,6 @@
{ {
"name" : "vtrip", "name" : "vtrip",
"appid" : "__UNI__EFB8158",
"appid" : "__UNI__53D8233",
"description" : "", "description" : "",
"versionName" : "1.0.0", "versionName" : "1.0.0",
"versionCode" : "100", "versionCode" : "100",


+ 1
- 1
pages_my/collection.vue View File

@ -5,7 +5,7 @@
<view class="content contentPosition_"> <view class="content contentPosition_">
<view class="info cardStyle_" v-for="(item, index) in cardListData" :key="index"> <view class="info cardStyle_" v-for="(item, index) in cardListData" :key="index">
<view class="left"> <view class="left">
<image :src="item.image" alt="">
<image :src="item.image.split(',')[0]" alt="">
</view> </view>
<view class="right"> <view class="right">
<view class="detailed"> <view class="detailed">


+ 8
- 2
pages_my/travelList.vue View File

@ -50,8 +50,9 @@
</view> </view>
<view class="data"> <view class="data">
<text>¥{{item.price}}</text> <text>¥{{item.price}}</text>
<text>11/40</text>
<text class="btn">已开票</text>
<text>{{item.num}}/{{item.sum}}</text>
<text class="btn" v-if="item.state == 0">报名中</text>
<text class="btn-2" v-if="item.state == 1">已结束</text>
</view> </view>
</view> </view>
</view> </view>
@ -254,6 +255,11 @@
padding: 10rpx 40rpx; padding: 10rpx 40rpx;
border-radius: 30rpx 0px 0px 30rpx; border-radius: 30rpx 0px 0px 30rpx;
} }
.btn-2 {
color: $uni-color-primary;
padding: 10rpx 40rpx;
border-radius: 30rpx 0px 0px 30rpx;
}
} }
} }
} }


+ 2
- 2
pages_my/zlx-qiandao.vue View File

@ -52,8 +52,8 @@
}, },
methods:{ methods:{
getactivityMemberPageList(){ getactivityMemberPageList(){
this.$api('activityMemberPageList',this.params,res=>{
this.$api('activityMemberPageList',{type:0},res=>{
this.cardListData = res.result.records;
}) })
}, },
qiandaoClick() { qiandaoClick() {


+ 1
- 1
pages_order/huodong-detail.vue View File

@ -220,7 +220,7 @@ import { error } from '../uni_modules/uv-ui-tools/libs/function'
this.chooseIndex = i this.chooseIndex = i
}, },
confirmClick(typePrice) { confirmClick(typePrice) {
this.$api('createOrder',{id:this.activityId,typePrice:typePrice},res=>{
this.$api('createOrder',{id:this.activityId,typePrice:typePrice,type:0},res=>{
if(res.code === 200) { if(res.code === 200) {
uni.requestPaymentWxPay(res) uni.requestPaymentWxPay(res)
.then(res => { .then(res => {


+ 13
- 2
pages_order/invoiceIssuance.vue View File

@ -32,7 +32,7 @@
</uv-radio-group> </uv-radio-group>
</view> </view>
<view class="iptInfo" v-if="radioValue"> <view class="iptInfo" v-if="radioValue">
<uv-form-item label="企业名称" labelWidth="180rpx" borderBottom>
<uv-form-item :label="radioValue === '0' ? '姓名' : '企业名称'" labelWidth="180rpx" borderBottom>
<uv-input placeholder="请输入内容" fontSize="29rpx" color="#fff" v-model="invoicingInfo.name" border="none"></uv-input> <uv-input placeholder="请输入内容" fontSize="29rpx" color="#fff" v-model="invoicingInfo.name" border="none"></uv-input>
</uv-form-item> </uv-form-item>
<uv-form-item :label="radioValue === '0' ? '身份证号' : '税号'" labelWidth="180rpx" borderBottom> <uv-form-item :label="radioValue === '0' ? '身份证号' : '税号'" labelWidth="180rpx" borderBottom>
@ -66,13 +66,24 @@
name: '', name: '',
no: '', no: '',
emil: '' emil: ''
}
},
activityItem:{}
} }
}, },
onLoad({orderId}) { onLoad({orderId}) {
this.orderId = orderId this.orderId = orderId
console.log("发票标识："+orderId)
this.toOrderDetails("orderId");
}, },
methods: { methods: {
//查询订单详情信息
toOrderDetails(orderId) {
this.$api('orderInfo',{orderId:this.orderId},res=>{
if(res.code == 200) {
this.activityItem = res.result
}
})
},
toInvoiceRecords() { toInvoiceRecords() {
let params = {} let params = {}
params = this.invoicingInfo; params = this.invoicingInfo;


+ 26
- 10
pages_order/invoiceRecords.vue View File

@ -3,19 +3,24 @@
<view class="head-box"></view> <view class="head-box"></view>
<Navbar title="开票记录" :autoBack="true" :bgColor="bgColor" leftIconSize="18px" height="100rpx" :leftIconColor="leftIconColor" :titleStyle="{color:fontColor}" /> <Navbar title="开票记录" :autoBack="true" :bgColor="bgColor" leftIconSize="18px" height="100rpx" :leftIconColor="leftIconColor" :titleStyle="{color:fontColor}" />
<view class="content contentPosition_"> <view class="content contentPosition_">
<view class="info cardStyle_">
<view class="left">
<image src="https://img0.baidu.com/it/u=4274003247,920124130&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1031" alt="">
<view class="info cardStyle_" v-for="(item, index) in list" :key="index">
<view class="left" v-if="item.noType == 0">
<image :src="item.activityList[0].image.split(',')[0]" alt="">
</view> </view>
<view class="left" v-if="item.noType == 1">
<image :src="item.travelList[0].image.split(',')[0]" alt="">
</view>
<view class="right"> <view class="right">
<view class="detailed"> <view class="detailed">
<view class="title">夏日去撒野旅游计划～</view>
<view class="date">2024.10.28 10:00</view>
<view class="address">成都市东丽湖露营地32号</view>
<view class="title" v-if="item.noType == 0">{{item.activityList[0].title}}</view>
<view class="title" v-if="item.noType == 1">{{item.travelList[0].title}}</view>
<view class="date">{{item.createTime}}</view>
<view class="date">{{item.name}}</view>
<view class="address">{{item.emil}}</view>
</view> </view>
<view class="data"> <view class="data">
<text>标准票</text> <text>标准票</text>
<text>×3</text>
<text>×1</text>
<text class="btn">已开票</text> <text class="btn">已开票</text>
</view> </view>
</view> </view>
@ -35,7 +40,7 @@ export default {
}, },
data() { data() {
return { return {
list:[]
}; };
}, },
components: { components: {
@ -48,13 +53,24 @@ export default {
}, },
created() { created() {
}, },
onShow() {
console.log("进入了发票管理")
this.getInvoicePageList();
},
mounted() { mounted() {
}, },
methods: { methods: {
getInvoicePageList(){
this.$api('getInvoicePageList',res=>{
if(res.code == 200) {
this.list = res.result.records
}
})
}
} }
}; };
</script> </script>


+ 1
- 1
pages_order/lvyou-detail.vue View File

@ -146,7 +146,7 @@
}, },
methods:{ methods:{
toBaoming() { toBaoming() {
this.$api('createOrder',{id:this.travelId,typePrice:1},res=>{
this.$api('createOrder',{id:this.travelId,typePrice:1,type:1},res=>{
if(res.code === 200) { if(res.code === 200) {
uni.requestPaymentWxPay(res) uni.requestPaymentWxPay(res)
.then(res => { .then(res => {


+ 1
- 1
pages_zlx/zlx-form.vue View File

@ -9,7 +9,7 @@
<view class="user-msg"> <view class="user-msg">
<view class="user-msg-top"> <view class="user-msg-top">
<view>{{userInfo.nickName}}</view> <view>{{userInfo.nickName}}</view>
<view class="level-box">普通用户</view>
<!-- <view class="level-box">普通用户</view> -->
</view> </view>
<view class="id-box"> <view class="id-box">
<text>ID:{{userInfo.id}}</text> <text>ID:{{userInfo.id}}</text>


Write Preview
Loading…
Cancel
Save