Commit f837d158 authored by zhaofei's avatar zhaofei

s

parent 4f74537c
...@@ -11,9 +11,10 @@ ...@@ -11,9 +11,10 @@
<form-item style="width:100%" size="large" class="probability-prize-content-formItem" label="奖品类型" required> <form-item style="width:100%" size="large" class="probability-prize-content-formItem" label="奖品类型" required>
<view class="probability-prize-content-formitem-choosePrize-wrap"> <view class="probability-prize-content-formitem-choosePrize-wrap">
<select onChange="onPrizeTypeChange" defaultValue="{{isEdit ? prizeDialogData.record.type : prizeInitData.type}}"> <select onChange="onPrizeTypeChange" defaultValue="{{isEdit ? prizeDialogData.record.type : prizeInitData.type}}">
<option value="{{1}}">优惠券</option> <option a:if="{{typeChecked.includes(1)}}" value="{{1}}">优惠券</option>
<option value="{{2}}">积分</option> <option a:if="{{typeChecked.includes(2)}}" value="{{2}}">积分</option>
<option value="{{3}}">实物</option> <option a:if="{{typeChecked.includes(3)}}" value="{{3}}">实物</option>
<option a:if="{{typeChecked.includes(5)}}" value="{{5}}">降级奖品</option>
</select> </select>
</view> </view>
</form-item> </form-item>
......
...@@ -8,7 +8,7 @@ import { passUrlList, urlCheck } from "../../../utils/helper"; ...@@ -8,7 +8,7 @@ import { passUrlList, urlCheck } from "../../../utils/helper";
const EQUITY_TYPE = 1; const EQUITY_TYPE = 1;
const CREDITS_TYPE = 2; const CREDITS_TYPE = 2;
const OBJECT_TYPE = 3; const OBJECT_TYPE = 3;
const THANKS_TYPE = 5; const LOWER_TYPE = 5;
const STOCK_LIMIT = 1; const STOCK_LIMIT = 1;
const STOCK_NO_LIMIT = 2; const STOCK_NO_LIMIT = 2;
...@@ -38,7 +38,7 @@ Component({ ...@@ -38,7 +38,7 @@ Component({
EQUITY_TYPE, EQUITY_TYPE,
CREDITS_TYPE, CREDITS_TYPE,
OBJECT_TYPE, OBJECT_TYPE,
THANKS_TYPE, LOWER_TYPE,
showDialogMask: true, showDialogMask: true,
dialogTop: "", dialogTop: "",
rankTips: { rankTips: {
...@@ -115,6 +115,7 @@ Component({ ...@@ -115,6 +115,7 @@ Component({
datasource: [], datasource: [],
prizeDataType: null, prizeDataType: null,
conditionKeys: [], conditionKeys: [],
typeChecked: [],
onCloseDialog: function () { }, onCloseDialog: function () { },
onUpdate: function () { }, onUpdate: function () { },
}, },
...@@ -385,7 +386,6 @@ Component({ ...@@ -385,7 +386,6 @@ Component({
COUPON_TYPE, COUPON_TYPE,
CREDITS_TYPE, CREDITS_TYPE,
OBJECT_TYPE, OBJECT_TYPE,
THANKS_TYPE,
} = this.data; } = this.data;
if (type === LUKCY_POCKET_TYPE && !ename) { if (type === LUKCY_POCKET_TYPE && !ename) {
......
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
isEdit="{{isEdit}}" isEdit="{{isEdit}}"
conditionKeys="{{conditionKeys}}" conditionKeys="{{conditionKeys}}"
prizeDialogData="{{prizeDialogData}}" prizeDialogData="{{prizeDialogData}}"
typeChecked="{{typeChecked}}"
onClose="onCloseDialog" onClose="onCloseDialog"
type="{{type}}" type="{{type}}"
imageLimit="{{imageLimit}}" imageLimit="{{imageLimit}}"
......
...@@ -13,6 +13,7 @@ Component({ ...@@ -13,6 +13,7 @@ Component({
conditionKeys: [], conditionKeys: [],
imageLimit: [250, 250], imageLimit: [250, 250],
prizeDataType: null, prizeDataType: null,
typeChecked: [],
type:'' type:''
}, },
didMount() { }, didMount() { },
......
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
prizeDialogData="{{prizeDialogData}}" prizeDialogData="{{prizeDialogData}}"
prizeDataType="{{prizeDataType}}" prizeDataType="{{prizeDataType}}"
imageLimit="{{imageLimit}}" imageLimit="{{imageLimit}}"
typeChecked="{{typeChecked}}"
onClose="onCloseDialog" onClose="onCloseDialog"
type="rank" type="rank"
maxRankLimit="{{maxRankLimit}}" maxRankLimit="{{maxRankLimit}}"
......
...@@ -12,6 +12,7 @@ Component({ ...@@ -12,6 +12,7 @@ Component({
conditionKeys: [], conditionKeys: [],
maxRankLimit: '', maxRankLimit: '',
list: [], list: [],
typeChecked: [],
prizeDataType:null, prizeDataType:null,
onChange: () => { }, onChange: () => { },
dataName: '' dataName: ''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment