~jiangyouyao/beauty-erp.git

			@@ -139,7 +139,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">
			@@ -148,7 +148,7 @@
			</div>
			<div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
			<el-form-item label="活动编码" prop="actCode">
			<el-input v-model.number="ruleForm.actCode" placeholder="请输入最大开团数量"></el-input>
			<el-input v-model.number="ruleForm.actCode" placeholder="请输入活动编码"></el-input>
			</el-form-item>
			</div>
			<div class="col-sm-4 col-sm-offset-1" style="padding: 10px">
			@@ -270,6 +270,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>
			@@ -423,13 +432,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
			@@ -527,11 +531,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>
			@@ -581,6 +585,7 @@
			couponId:'',
			goodsId:'',
			couponName:'',
			customerPhone:'',
			goodsName:'',
			}
			var app = new Vue({
			@@ -850,6 +855,7 @@
			operationTip: prize.operationTip,
			prizeAddress: prize.prizeAddress,
			wechatImg: prize.wechatImg,
			customerPhone: prize.customerPhone,
			scoreCnt: prize.scoreCnt,
			couponId: prize.couponId,
			goodsId: prize.goodsId,
			@@ -890,6 +896,10 @@
			content: JSON.parse(JSON.stringify(prize)),
			});
			this.editableTabsValue = newTabName;
			this.activeClickTab = parseInt(newTabName);
			},
			clickSecondTab(targetName) {
			this.activeClickTab = 1;
			},
			clickTab(targetName) {
			console.log(targetName.name);
			@@ -954,7 +964,6 @@
			//奖品设置的图片介绍
			introduceImgSuccess(res, file) {
			this.editableTabs[this.activeClickTab-1].content.introduceImg = res.path;
			// this.prize.introduceImg = URL.createObjectURL(file.raw);
			},
			//奖品设置的客服微信
			wechatImgSuccess(res, file) {