- 活动预约
- 采茶预约
- 其他预约
+ 活动预约
+ 采茶预约
+ 其他预约
类型错误
@@ -41,59 +34,59 @@
+ 报名成功
+ 已取消
+ 类型错误
+
+
+
+
+ -
+ {{ scope.row.cancelData }}
+
+
+
+ -
+ {{ scope.row.cancelReason }}
+
+
+
+
+
+
+
+
+
diff --git a/src/views/marketing/activity/venueReservation/index.vue b/src/views/marketing/activity/venueReservation/index.vue
new file mode 100644
index 0000000..d3e74c2
--- /dev/null
+++ b/src/views/marketing/activity/venueReservation/index.vue
@@ -0,0 +1,296 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 电话联系
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/marketing/coupon/list/createTree.vue b/src/views/marketing/coupon/list/createTree.vue
new file mode 100644
index 0000000..f49e016
--- /dev/null
+++ b/src/views/marketing/coupon/list/createTree.vue
@@ -0,0 +1,223 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 待确认
+ 预约成功
+ 预约取消
+ 类型错误
+
+
+
+
+ -
+ {{ scope.row.cancelData }}
+
+
+
+ -
+ {{ scope.row.cancelReason }}
+
+
+
+
+
+ 预约人：{{this.mobileFrom.userName}}
+ 联系方式：{{this.mobileFrom.cellPhone}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提交
+ 重置
+
+
+
+
+
+
+
+
diff --git a/src/views/marketing/lottery/config/index.vue b/src/views/marketing/lottery/config/index.vue
index 773971a..8a5b497 100644
--- a/src/views/marketing/lottery/config/index.vue
+++ b/src/views/marketing/lottery/config/index.vue
@@ -1,55 +1,209 @@
+ ![]()
+
+
+
+
+
+ ![]()
+
+
+
+
+
+ ![]()
+
+
+
+
+
+ ![]()
+
+
+
+
+
+ ![]()
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 编辑
+
+ 详情
+
+
@@ -60,57 +214,44 @@
import {marketingGameInfoListApi, marketingGameListApi} from "@/api/marketing";
export default {
- data(){
- return{
- tableFrom: {
- page: 1,
- limit: 20,
- cid:747
- },
- modalPic: false,
- isChoice: '单选',
- picTit: '',
- specsData:[]
- }
- },
+ data() {
+ return {
+ dataList: {},
+ dataListLoading: false,
+ gameFrom: {},
+ specsData: {}
+ }
+ },
mounted() {
- this.getList()
+ this.getDataList()
},
- methods:{
+ methods: {
// 列表
- getList() {
- marketingGameListApi(this.tableFrom).then(res => {
- this.listLoading = false
- // res.list[0].id
+ getDataList() {
+ marketingGameListApi({cid: 748}).then(res => {
+ this.dataListLoading = false
this.getInfo(res.list[0].id)
}).catch(res => {
- this.listLoading = false
+ this.dataListLoading = false
})
},
- getInfo(id){
- marketingGameInfoListApi({id:id}).then(res =>{
- this.specsData = res.rule.items
+ getInfo(id) {
+ marketingGameInfoListApi({id: id}).then(res => {
+ console.log(res)
+ this.specsData = res
+
+ if (this.specsData.rule.everySunlightStair === null) {
+ this.specsData.rule.everySunlightStair = []
+ }
})
},
-
- // 点击商品图
- modalPicTap(tit, index) {
- const _this = this
- this.$modalUpload(function(img) {
- if(img.length >= 2) return this.$message.warning("最多选择1张图片！");
- _this.specsData[index].productImage = img[0].sattDir
-
-
-
- },tit, 'store')
- },
}
}
-
diff --git a/src/views/user/list/index.vue b/src/views/user/list/index.vue
index 6997d2d..dc099e8 100644
--- a/src/views/user/list/index.vue
+++ b/src/views/user/list/index.vue
@@ -80,14 +80,14 @@
placement="bottom-end"
placeholder="自定义时间"
class="selWidth"
- :picker-options="pickerOptions"
+ :picker-options="pickerOptions"
@change="onchangeTime"
/>
@@ -138,7 +138,7 @@
@@ -209,7 +209,7 @@
label="ID"
min-width="80"
/>
-
-
-
+
- ![]()
-
-
-
-
-
+ 规则
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加规则
+
+
+
+
+
+
+
+
+ 添加茶株
+
+
+
+
+
+ {{ scope.row.productName }}
-
+ {{ scope.row.message }}
-
+ {{ scope.row.lotteryRate }}
-
+
@@ -273,6 +273,17 @@
label="积分"
min-width="100"
/>
+
+
+ 非核销员
+ 核销员
+
+
+
编辑
@@ -681,7 +692,7 @@
// el.child.forEach((cel, j) => {
// delete cel.child
// })
- // })
+ // })
this.addresData = res
// })
},