Skip to content

Y
ybf
Commit 57fe2206 authored by Z's avatar Z
Browse files
Options

Merge branch 'master' of http://114.67.93.201/xulili/ybf

parents 85bb601a d0c50363
Hide whitespace changes
Inline Side-by-side
Showing with 180 additions and 108 deletions
ybf_wx/src/views/active/createBigWheelActive.vue
View file @ 57fe2206
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<van-datetime-picker <van-datetime-picker
v-model="basicInfo.startTime" v-model="basicInfo.startTime"
type="date" type="date"
@cancel="basicInfo.startShow = false" @cancel="basicInfo.startShow = false"
@confirm="handleBasicSTime" @confirm="handleBasicSTime"
@change="startTimeChange" @change="startTimeChange"
/> />
...@@ -215,40 +215,47 @@ ...@@ -215,40 +215,47 @@
</van-radio-group> </van-radio-group>
</div> </div>
<div class="mj"> <div class="mj">
<div class="je"> <div class="l-yh">
<van-field <div class="je">
class="tm" <van-field
readonly class="tm"
clickable readonly
:value="prizeList[index].discountsMoney" clickable
@touchstart.native.stop="prizeList[index].discountsShow = true" :value="prizeList[index].discountsMoney"
placeholder="输入金额" @touchstart.native.stop="
/> prizeList[index].discountsShow = true
<van-number-keyboard "
v-model="prizeList[index].discountsMoney" placeholder="输入金额"
:show="prizeList[index].discountsShow" />
@blur="prizeList[index].discountsShow = false" <van-number-keyboard
/> v-model="prizeList[index].discountsMoney"
:show="prizeList[index].discountsShow"
@blur="prizeList[index].discountsShow = false"
/>
</div>
<span class="word">元优惠</span>
</div> </div>
<span class="word">元优惠</span> <div class="r-yh">
<van-checkbox v-model="prizeList[index].full"></van-checkbox> <van-checkbox v-model="prizeList[index].full"></van-checkbox>
<span class="word">满</span>
<div class="je"> <span class="word">满</span>
<van-field <div class="je">
class="tm" <van-field
readonly class="tm"
clickable readonly
:value="prizeList[index].fullMoney" clickable
@touchstart.native.stop="prizeList[index].fullShow = true" :value="prizeList[index].fullMoney"
placeholder="输入金额" @touchstart.native.stop="prizeList[index].fullShow = true"
/> placeholder="输入金额"
<van-number-keyboard />
v-model="prizeList[index].fullMoney" <van-number-keyboard
:show="prizeList[index].fullShow" v-model="prizeList[index].fullMoney"
@blur="prizeList[index].fullShow = false" :show="prizeList[index].fullShow"
/> @blur="prizeList[index].fullShow = false"
/>
</div>
<span class="word end">元可用</span>
</div> </div>
<span class="word end">元可用</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -256,52 +263,52 @@ ...@@ -256,52 +263,52 @@
<van-cell title="开始时间" style="font-size:14px;"> <van-cell title="开始时间" style="font-size:14px;">
<template slot="default"> <template slot="default">
<div class="jpsl"> <div class="jpsl">
<van-field <van-field
class="right" class="right"
v-model="prizeList[index].startTime1" v-model="prizeList[index].startTime1"
placeholder="选择活动开始时间" placeholder="选择活动开始时间"
readonly="readonly" readonly="readonly"
@click="prizeList[index].startShow = true" @click="prizeList[index].startShow = true"
/>
<van-popup
v-model="prizeList[index].startShow"
position="bottom"
:overlay="true"
>
<van-datetime-picker
v-model="prizeList[index].startTime"
type="date"
@cancel="prizeList[index].startShow = false"
@confirm="prizeList[index].startShow = false"
@change="startTimeChange2(prizeList[index].startTime, index)"
/> />
</van-popup> <van-popup
v-model="prizeList[index].startShow"
position="bottom"
:overlay="true"
>
<van-datetime-picker
v-model="prizeList[index].startTime"
type="date"
@cancel="prizeList[index].startShow = false"
@confirm="handleStartTime(prizeList[index].startTime,index)"
@change="startTimeChange2(prizeList[index].startTime, index)"
/>
</van-popup>
</div> </div>
</template> </template>
</van-cell> </van-cell>
<van-cell title="结束时间" style="font-size:14px;"> <van-cell title="结束时间" style="font-size:14px;">
<template slot="default"> <template slot="default">
<div class="jpsl"> <div class="jpsl">
<van-field <van-field
class="right" class="right"
v-model="prizeList[index].endTime1" v-model="prizeList[index].endTime1"
placeholder="选择活动结束时间" placeholder="选择活动结束时间"
readonly="readonly" readonly="readonly"
@click="prizeList[index].endShow = true" @click="prizeList[index].endShow = true"
/>
<van-popup
v-model="prizeList[index].endShow"
position="bottom"
:overlay="true"
>
<van-datetime-picker
v-model="prizeList[index].endTime"
type="date"
@cancel="prizeList[index].endShow = false"
@confirm="prizeList[index].endShow = false"
@change="endTimeChange2(prizeList[index].endTime, index)"
/> />
</van-popup> <van-popup
v-model="prizeList[index].endShow"
position="bottom"
:overlay="true"
>
<van-datetime-picker
v-model="prizeList[index].endTime"
type="date"
@cancel="prizeList[index].endShow = false"
@confirm="handleEndTime(prizeList[index].endTime,index)"
@change="endTimeChange2(prizeList[index].endTime, index)"
/>
</van-popup>
</div> </div>
</template> </template>
</van-cell> </van-cell>
...@@ -406,10 +413,10 @@ export default { ...@@ -406,10 +413,10 @@ export default {
fullMoney: "", fullMoney: "",
fullShow: false, fullShow: false,
validity: "", validity: "",
startTime: "", startTime: new Date(),
startTime1: "", startTime1: "",
startShow: false, startShow: false,
endTime: "", endTime: new Date(),
endTime1: "", endTime1: "",
endShow: false, endShow: false,
prize: "", prize: "",
...@@ -434,39 +441,62 @@ export default { ...@@ -434,39 +441,62 @@ export default {
}, },
methods: { methods: {
startTimeChange(e) { startTimeChange(e) {
let startTimeArr = e.getValues(); let startTimeArr = e.getValues();
this.basicInfo.startTime1 = `${startTimeArr[0]}-${startTimeArr[1]}-${startTimeArr[2]}`; this.basicInfo.startTime1 = `${startTimeArr[0]}-${startTimeArr[1]}-${startTimeArr[2]}`;
}, },
startTimeChange2(e, index) { startTimeChange2(e, index) {
console.log(111);
this.prizeList[index].startTime1 = this.timeFormat(e); this.prizeList[index].startTime1 = this.timeFormat(e);
}, console.log(this.prizeList[index].startTime1,"2222");
},
//////// ////////
handlePSTime(index) { handlePSTime(index) {
this.prizeList[index].startTime1 = this.timeFormat(this.confirmTime) this.prizeList[index].startTime1 = this.timeFormat(this.confirmTime);
this.prizeList[index].startShow=false this.prizeList[index].startShow = false;
}, },
timeFormat(time) { timeFormat(time) {
let year = 1900 + time.getYear(); let year = 1900 + time.getYear();
let month = "0" + (time.getMonth() + 1); let month = "0" + (time.getMonth() + 1);
let date = "0" + time.getDate(); let date = "0" + time.getDate();
return year + "-" + month.substring(month.length-2, month.length) + "-" + date.substring(date.length-2, date.length) return (
+ " " year +
"-" +
month.substring(month.length - 2, month.length) +
"-" +
date.substring(date.length - 2, date.length) +
" "
);
}, },
endTimeChange(e) { endTimeChange(e) {
let endTimeArr = e.getValues(); let endTimeArr = e.getValues();
this.basicInfo.endTime1 = `${endTimeArr[0]}-${endTimeArr[1]}-${endTimeArr[2]}`; this.basicInfo.endTime1 = `${endTimeArr[0]}-${endTimeArr[1]}-${endTimeArr[2]}`;
}, },
handleBasicETime(value) { handleBasicETime(value) {
this.basicInfo.endShow=false this.basicInfo.endShow = false;
this.basicInfo.endTime1 = this.timeFormat(value) this.basicInfo.endTime1 = this.timeFormat(value);
}, },
endTimeChange2(e, index) { endTimeChange2(e, index) {
this.prizeList[index].endTime1 = this.timeFormat(e); this.prizeList[index].endTime1 = this.timeFormat(e);
}, },
///点击确定不修改处理
handleStartTime(e,index) {
console.log(e,"e");
this.prizeList[index].startTime1 = this.timeFormat(e)
this.prizeList[index].startShow = false
},
handleEndTime(e,index) {
console.log(e,"e");
this.prizeList[index].endTime1 = this.timeFormat(e)
this.prizeList[index].endShow = false
},
////// //////
handlePETime(index) { handlePETime(index) {
this.prizeList[index].endTime1 = this.timeFormat(this.confirmTime) this.prizeList[index].endTime1 = this.timeFormat(this.confirmTime);
this.prizeList[index].endShow=false this.prizeList[index].endShow = false;
}, },
// 数字大写转小写 // 数字大写转小写
numberToUpperCase(textIndex) { numberToUpperCase(textIndex) {
...@@ -531,10 +561,10 @@ export default { ...@@ -531,10 +561,10 @@ export default {
fullMoney: "", fullMoney: "",
fullShow: false, fullShow: false,
validity: "", validity: "",
startTime: "", startTime: new Date(),
startTime1: "", startTime1: "",
startShow: false, startShow: false,
endTime: "", endTime: new Date(),
endTime1: "", endTime1: "",
endShow: false, endShow: false,
prize: "", prize: "",
...@@ -547,21 +577,27 @@ export default { ...@@ -547,21 +577,27 @@ export default {
this.prizeList.splice(index, 1); this.prizeList.splice(index, 1);
}, },
handleBasicSTime(value) { handleBasicSTime(value) {
this.basicInfo.startShow=false this.basicInfo.startShow = false;
this.basicInfo.startTime1 = this.timeFormat(value) this.basicInfo.startTime1 = this.timeFormat(value);
}, }
}, },
mounted() { mounted() {
this.pTime = this.timeFormat(this.pTime) this.pTime = this.timeFormat(this.pTime);
console.log(this.pTime,"time"); console.log(this.pTime, "time");
} }
}; };
</script> </script>
<style></style> <style></style>
<style scoped> <style scoped>
.l-yh,.r-yh {
width: 55%;
display: flex;
align-items: center;
}
.l-yh {
width: 45%;
}
.bfb { .bfb {
position: absolute; position: absolute;
right: 3px; right: 3px;
...@@ -664,7 +700,7 @@ export default { ...@@ -664,7 +700,7 @@ export default {
.mj { .mj {
height: 40px; height: 40px;
display: flex; display: flex;
justify-content: flex-end; justify-content: space-between;
align-items: center; align-items: center;
margin: 10px 0; margin: 10px 0;
} }
......
ybf_wx/src/views/goods/goodGrounding.vue
View file @ 57fe2206
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
<van-radio name="1" style="float:left;">固定金额</van-radio> <van-radio name="1" style="float:left;">固定金额</van-radio>
<van-radio name="2" style="float:right;">成交价比例</van-radio> <van-radio name="2" style="float:right;">成交价比例</van-radio>
</van-radio-group> </van-radio-group>
<div class="fr"> <div class="fr" v-if="type == 1">
<span class="fr" style="margin-top:16px;">元</span> <span class="fr" style="margin-top:18px;">元</span>
<van-field <van-field
class="price" class="price"
readonly readonly
...@@ -35,7 +35,23 @@ ...@@ -35,7 +35,23 @@
:show="show2" :show="show2"
@blur="show2 = false" @blur="show2 = false"
/> />
</div> </div>
<div class="fr" v-if="type == 2">
<span class="fr" style="margin-top:18px;">%</span>
<van-field
class="price"
readonly
clickable
:value="percent"
placeholder="请输入百分比"
@touchstart.native.stop="show3 = true"
/>
<van-number-keyboard
v-model="percent"
:show="show3"
@blur="show3 = false"
/>
</div>
</div> </div>
</div> </div>
</van-cell> </van-cell>
...@@ -43,7 +59,7 @@ ...@@ -43,7 +59,7 @@
<template slot="default"> <template slot="default">
<van-field <van-field
v-model="startTime1" v-model="startTime1"
placeholder="选择活动结束时间" placeholder="选择活动开始时间"
readonly="readonly" readonly="readonly"
@click="startShow = true" @click="startShow = true"
class="nop" class="nop"
...@@ -53,7 +69,7 @@ ...@@ -53,7 +69,7 @@
v-model="startTime" v-model="startTime"
type="datetime" type="datetime"
@cancel="startShow = false" @cancel="startShow = false"
@confirm="startShow = false" @confirm="handleStartTime"
@change="startTimeChange" @change="startTimeChange"
/> />
</van-popup> </van-popup>
...@@ -73,7 +89,7 @@ ...@@ -73,7 +89,7 @@
v-model="endTime" v-model="endTime"
type="datetime" type="datetime"
@cancel="endShow = false" @cancel="endShow = false"
@confirm="endShow = false" @confirm="handleEndTime"
@change="endTimeChange" @change="endTimeChange"
/> />
</van-popup> </van-popup>
...@@ -107,26 +123,43 @@ export default { ...@@ -107,26 +123,43 @@ export default {
return { return {
startTime: new Date(), startTime: new Date(),
startTime1: "", startTime1: "",
endTime: "", endTime: new Date(),
endTime1: "", endTime1: "",
startShow: false, startShow: false,
endShow: false, endShow: false,
number: "", number: "",
type: "", type: '1',
show: false, show: false,
show2: false, show2: false,
price: "" show3: false,
price: "",
percent: ""
}; };
}, },
methods: { methods: {
timeFormat(time) {
let year = 1900 + time.getYear();
let month = "0" + (time.getMonth() + 1);
let date = "0" + time.getDate();
return year + "-" + month.substring(month.length-2, month.length) + "-" + date.substring(date.length-2, date.length)
+ " "
},
startTimeChange(e) { startTimeChange(e) {
let startTimeArr = e.getValues(); let startTimeArr = e.getValues();
this.startTime1 = `${startTimeArr[0]}-${startTimeArr[1]}-${startTimeArr[2]} ${startTimeArr[3]}:${startTimeArr[4]}:00`; this.startTime1 = `${startTimeArr[0]}-${startTimeArr[1]}-${startTimeArr[2]}`;
}, },
endTimeChange(e) { endTimeChange(e) {
let endTimeArr = e.getValues(); let endTimeArr = e.getValues();
this.endTime1 = `${endTimeArr[0]}-${endTimeArr[1]}-${endTimeArr[2]} ${endTimeArr[3]}:${endTimeArr[4]}:00`; this.endTime1 = `${endTimeArr[0]}-${endTimeArr[1]}-${endTimeArr[2]}`;
} },
handleStartTime(value) {
this.startTime1 = this.timeFormat(value)
this.startShow = false
},
handleEndTime(value) {
this.endTime1 = this.timeFormat(value)
this.endShow = false
},
} }
}; };
</script> </script>
...@@ -215,6 +248,9 @@ h3 { ...@@ -215,6 +248,9 @@ h3 {
.phone { .phone {
float: left; float: left;
} }
.option {
margin-top: 10px;
}
.option >>> .van-field__control { .option >>> .van-field__control {
text-align: right; text-align: right;
} }
......
ybf_wx/src/views/task/taskList.vue
View file @ 57fe2206
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</van-cell> </van-cell>
</van-list> </van-list>
</van-tab> </van-tab>
<van-tab title="顾客流失"> <van-tab title="复购">
<van-list v-model="writeOff" :finished="finished" @load="onLoad"> <van-list v-model="writeOff" :finished="finished" @load="onLoad">
<van-cell <van-cell
:value="item.number" :value="item.number"
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</van-cell> </van-cell>
</van-list> </van-list>
</van-tab> </van-tab>
<van-tab title="拉接受问询"> <van-tab title="接受问询">
<van-list v-model="writeOff" :finished="finished" @load="onLoad"> <van-list v-model="writeOff" :finished="finished" @load="onLoad">
<van-cell <van-cell
:value="item.number" :value="item.number"
......
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