~jiangyouyao/beauty-erp.git

			@@ -132,7 +132,7 @@

			<el-main width="70%">
			<div>
			<el-tabs v-model="activeName" >
			<el-tabs v-model="activeName" @tab-click="clickSecondTab">
			<el-tab-pane label="活动设置" name="first">
			<div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
			<el-form-item label="活动名称" prop="actName">
			@@ -162,7 +162,7 @@
			<el-tab-pane label="奖品设置" name="second">
			<el-row style="display:flex;">
			<el-col :span="20">
			<el-tabs v-model="editableTabsValue" type="card" closable @tab-remove="removeTab">
			<el-tabs v-model="editableTabsValue" type="card" closable @tab-click="clickTab" @tab-remove="removeTab">
			<el-tab-pane v-for="(item, index) in editableTabs" :key="item.name" :label="item.title" :name="item.name">
			<el-row v-show="editableTabsValue !== '1'">
			<el-form-item label="签到累计天数">
			@@ -263,6 +263,15 @@
			:on-success="wechatImgSuccess">
			<img v-if="item.content.wechatImg" :src="item.content.wechatImg" style="max-width: 200px;">
			</el-upload>
			</el-form-item>
			</el-col>
			</el-row>
			</div>
			<div v-show="[1,3].includes(item.content.awardWay)">
			<el-row >
			<el-col>
			<el-form-item label="客服电话">
			<el-input v-model="item.content.customerPhone"></el-input>
			</el-form-item>
			</el-col>
			</el-row>
			@@ -417,13 +426,8 @@
			stripe:true
			style="width: 100%">
			<el-table-column
			prop="cname"
			label="优惠券名称"
			show-overflow-tooltip>
			</el-table-column>
			<el-table-column
			prop="endTime"
			label="截止日期"
			prop="name"
			label="名称"
			show-overflow-tooltip>
			</el-table-column>
			<el-table-column
			@@ -521,11 +525,11 @@
			<el-color-picker v-model="typographyColor"></el-color-picker>
			</el-form-item>
			<el-form-item label="字体大小" style="padding: 10px">
			<el-input-number v-model="typographyNum" :min="10" :max="20" label="描述文字"></el-input-number>
			<el-input-number v-model="typographyNum" :min="10" :max="50" label="描述文字"></el-input-number>
			</el-form-item>
			<el-form-item label="字体透明度" style="padding: 10px">
			<!--<el-form-item label="字体透明度" style="padding: 10px">
			<el-input-number v-model="typographyLight" :min="1" :max="100" label="描述文字">%</el-input-number>
			</el-form-item>
			</el-form-item>-->
			</div>
			</el-tab-pane>
			</el-tabs>
			@@ -574,6 +578,7 @@
			wechatImg:'',
			scoreCnt:'',
			couponId:'',
			customerPhone:'',
			goodsId:'',
			couponName:'',
			goodsName:'',
			@@ -676,6 +681,8 @@
			let _this = this;
			_this.drawerCoupon = true;
			_this.activeClickTab = parseInt(name);

			console.log(_this.activeClickTab);
			_this.formCoupon.yhjmc = val;
			_this.loadCouponList();
			},
			@@ -711,8 +718,6 @@
			},
			//重置
			resetFormCoupon(formName) {
			// this.formCoupon.yhjmc = ''
			// console.log(this.$refs[formName].resetFields)
			(this.$refs[formName])[0].resetFields();
			},
			changePageSizeCoupon(val) {
			@@ -834,6 +839,7 @@
			awardType: parseInt(prizeVo.awardType),
			awardName: prizeVo.awardName,
			introduceImg: prizeVo.introduceImg,
			customerPhone: prizeVo.customerPhone,
			introduceTip: prizeVo.introduceTip,
			awardInventoryCnt: prizeVo.awardInventoryCnt,
			awardDistributeCnt: prizeVo.awardDistributeCnt,
			@@ -919,6 +925,7 @@
			awardDistributeCnt: prize.awardDistributeCnt,
			awardWay: prize.awardWay,
			operationTip: prize.operationTip,
			customerPhone: prize.customerPhone,
			prizeAddress: prize.prizeAddress,
			wechatImg: prize.wechatImg,
			scoreCnt: prize.scoreCnt,
			@@ -961,6 +968,14 @@
			content: JSON.parse(JSON.stringify(prize)),
			});
			this.editableTabsValue = newTabName;
			this.activeClickTab = parseInt(newTabName);
			},
			clickSecondTab(targetName) {
			this.activeClickTab = 1;
			},
			clickTab(targetName) {
			console.log(targetName.name);
			this.activeClickTab = parseInt(targetName.name);
			},
			removeTab(targetName) {
			let tabs = this.editableTabs;