wangyifang
/
yunyubang-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

课程

Browse Source
master
lion 2 years ago
parent 21649936f7
commit abb17e7506
7 changed files with 105 additions and 33 deletions
Show Stats Download Patch File Download Diff File

6
src/views/activity/activeTypes.vue
Unescape View File

@ -48,10 +48,14 @@ export default {
align:'left',
},
{
label:"id",
label:"链接",
// width: 220,
prop:'id',
align:'left',
formatter:(cell,data,value)=>{
return value? `/pages/active/active?activeTypeId=${value}`:''
}
// /pages/active/active?activeTypeId=2
// fixed:'left',
}
]

47
src/views/activity/activityList.vue
Unescape View File

@ -5,6 +5,9 @@
<slot>
<div style="display: flex;justify-content: flex-start;flex-wrap: wrap;">
<Input v-model="select.keyword" style="width: 200px;margin-right: 10px;" placeholder="关键字搜索" />
<Select clearable v-model="select.active_type_id" style="width: 200px;margin-right: 10px;" placeholder="选择活动分类">
<Option v-for="item in activeTypeList" :value="item.id">{{item.name}}</Option>
</Select>
<Button type="primary" @click="getActivities">查询</Button>
<Button icon="ios-add" type="primary" style="margin-left: 10px;" @click="$refs['addActivity'].isShow = true,$refs['addActivity'].type = 'add'">添加</Button>
</div>
@ -45,7 +48,7 @@
<script>
import {index,destroy} from "@/api/activity"
import {index as getTypes} from "@/api/activityType"
import addActivity from '@/views/activity/component/addActivity'
import checkActivity from '@/views/activity/component/checkActivity'
import showActiveOrder from '@/views/activity/component/showActiveOrder'
@ -61,7 +64,8 @@ export default {
select:{
pageSize:10,
pageIndex:1,
keyword:""
keyword:"",
active_type_id:''
},
total:0,
@ -69,6 +73,7 @@ export default {
isShowOrder:false,
activeId:null,
activeName:"",
activeTypeList:[],
table:[
{
label:"活动名称",
@ -78,17 +83,10 @@ export default {
fixed:'left',
},
{
label:"提交商家",
width: 220,
prop:'merchant_username',
label:"活动分类",
width: 180,
prop:'type.name',
align:'center',
formatter:(cell,data,value)=>{
if(cell.merchant){
return cell.merchant.username
}else{
return ""
}
}
},
{
label:"状态",
@ -118,6 +116,19 @@ export default {
)
}
},
{
label:"提交商家",
width: 220,
prop:'merchant_username',
align:'center',
formatter:(cell,data,value)=>{
if(cell.merchant){
return cell.merchant.username
}else{
return ""
}
}
},
{
label:"活动关联方",
width: 220,
@ -274,12 +285,19 @@ export default {
const res = await index({
page_size:this.select.pageSize,
page:this.select.pageIndex,
keyword:this.select.keyword
keyword:this.select.keyword,
active_type_id:this.select.active_type_id
})
this.list = res.data
this.total = res.total
},
async getTypeList(){
const res = await getTypes({
rows:99,
page:1
})
this.activeTypeList = res
},
pageChange(e){
this.select.pageIndex = e
this.getActivities()
@ -324,6 +342,7 @@ export default {
}
},
mounted() {
this.getTypeList()
this.getActivities()
}

30
src/views/order/orderList.vue
Unescape View File

@ -78,6 +78,16 @@
</el-date-picker>
</div>
</div>
</el-col>
<el-col :span="12">
<div class="select-content-item">
<div class="select-content-item-label">预产期</div>
<div>
<el-date-picker v-model="select.due_date" type="date" value-format="yyyy-MM-dd"
placeholder="预产期" align="right">
</el-date-picker>
</div>
</div>
</el-col>
</el-row>
@ -192,7 +202,8 @@
start_updated: "",
end_updated: "",
order_paid: false,
order_item_id:""
order_item_id:"",
due_date:''
},
pickerOptions: {
shortcuts: [{
@ -528,7 +539,8 @@
this.select.end_paid = '';
this.select.start_updated = '';
this.select.end_updated = '';
this.select.order_item_id=""
this.select.order_item_id=""
this.select.due_date = ''
this.getOrders();
},
changeUpdateDate(e) {
@ -637,6 +649,20 @@
this.select.is_merchant = is_merchant;
this.select.order_paid = order_paid;
}
},
watch:{
'$route.query.user_id'(newval){
if(newval){
this.memberId = this.$route.query.user_id
this.getOrders()
}
},
'$route.query.order_item_id'(newval){
if(newval){
this.select.order_item_id = this.$route.query.order_item_id?this.$route.query.order_item_id:""
this.getOrders()
}
},
},
mounted() {
this.memberId = this.$route.query.user_id

15
src/views/productService/classifyManage.vue
Unescape View File

@ -52,8 +52,19 @@ export default {
},
{
prop:'id',
label:'id'
}
label:'id',
},
// {
// prop:'id',
// label:'链接',
// customFn:(row)=>{
// return (
// <div>
// {row.pid===0?`/packages/packageBuy/pages/shopList/shopList?product_type_id=${row.id}`:row.id}
// </div>)
// }
// }
]
}
},

3
src/views/reports/typeOrder.vue
Unescape View File

@ -107,9 +107,6 @@
}else{
product_type_list = this.select.product_type_list.join(",")
}
console.log("this.select.product_type_list",this.select.product_type_list)
console.log("product_type_list",product_type_list)
// return
let url =`/admin/#/reports/userOrder?product_type_list=`+product_type_list+`&total_related_person=`+id+`&start_date=`+this.select.start_date+`&end_date=`+this.select.end_date
let seeBuy = window.open(url, 'seeBuy','location=0')
}

26
src/views/reports/userOrder.vue
Unescape View File

@ -16,8 +16,11 @@
</Select>
</div>
<div class="selector-item">
<div class="selector-item__label">建卡医院：</div>
<Input clearable v-model="select.hospital" style="width: 100px;" placeholder="建卡医院搜索" />
<div class="selector-item__label">建卡医院：</div>
<Select clearable v-model="select.hospital" style="width: 100px;" placeholder="选择建卡医院搜索">
<Option v-for="item in arrHospital" :value="item">{{item}}</Option>
</Select>
<!-- <Input clearable v-model="select.hospital" style="width: 100px;" placeholder="建卡医院搜索" /> -->
</div>
<div class="selector-item">
<el-checkbox v-model="select.is_phone">存在手机号</el-checkbox>
@ -102,6 +105,9 @@
product_pid:'',
product_type_list:[]
},
arrHospital: ["市立医院", "苏大附一院", "苏大附二院","附二浒关院区", "中医院", "第五人民医院", "苏州市第七人民医院", "明基医院", "九龙医院", "娄葑医院",
"吴中人民医院", "甪直人民医院", "相城人民医院", "相城区第二人民医院", "吴江第一人民医院", "吴江第二人民医院", "盛泽医院", "其他"
],
dateRange:[],
areas: ["吴中区", "吴江区", "姑苏区", "工业园区", "高新区", "相城区", "昆山", "常熟", "张家港", "太仓"],
@ -138,9 +144,11 @@
if(row.order_count<1){
return
}
this.$router.push({
path: `/order/orderList?user_id=${row.id}`,
})
let url =`/admin/#/order/orderList?user_id=${row.id}`
let seeBuy = window.open(url, 'seeBuy','location=0')
// this.$router.push({
// path: `/order/orderList?user_id=${row.id}`,
// })
}
}
}
@ -178,9 +186,11 @@
on = {
{
['click']: (e) => {
this.$router.push({
path: `/order/orderList?order_item_id=${k.items.id}`,
})
let url =`/admin/#/order/orderList?order_item_id=${k.items.id}`
let seeBuy = window.open(url, 'seeBuy','location=0')
// this.$router.push({
// path: `/order/orderList?order_item_id=${k.items.id}`,
// })
}
}
}>

11
src/views/userManage/memberManage.vue
Unescape View File

@ -16,8 +16,11 @@
</Select>
</div>
<div class="selector-item">
<div class="selector-item__label">建卡医院：</div>
<Input clearable v-model="select.hospital" style="width: 200px;" placeholder="建卡医院搜索" />
<div class="selector-item__label">建卡医院：</div>
<Select clearable v-model="select.hospital" style="width: 100px;" placeholder="选择建卡医院搜索">
<Option v-for="item in arrHospital" :value="item">{{item}}</Option>
</Select>
<!-- <Input clearable v-model="select.hospital" style="width: 200px;" placeholder="建卡医院搜索" /> -->
</div>
<div class="selector-item">
<el-checkbox v-model="select.is_phone">存在手机号</el-checkbox>
@ -79,7 +82,9 @@
is_phone: true
},
areas: ["吴中区", "吴江区", "姑苏区", "工业园区", "高新区", "相城区", "昆山", "常熟", "张家港", "太仓"],
arrHospital: ["市立医院", "苏大附一院", "苏大附二院","附二浒关院区", "中医院", "第五人民医院", "苏州市第七人民医院", "明基医院", "九龙医院", "娄葑医院",
"吴中人民医院", "甪直人民医院", "相城人民医院", "相城区第二人民医院", "吴江第一人民医院", "吴江第二人民医院", "盛泽医院", "其他"
],
total: 0,
list: [],
table: [{

Write Preview
Loading…
Cancel
Save