Skip to content

O
occloud-server
Commit 97e78bec by liuliufashi
Options

upudate

parent 331d775e
Showing with 36 additions and 52 deletions
web-vue-admin/src/App.vue
......@@ -12,7 +12,6 @@
text-align: center;
color: #2c3e50;
height: 100%;
}
nav {
......
web-vue-admin/src/views/goods-cabinet/components/goods/index.vue
......@@ -34,7 +34,7 @@
</a-form-item>
<a-form-item label="商品详情" name="body" labelAlign="left" :label-col="{ span: 1 }">
<div style="position: relative;">
<div style="position: absolute;right: 26%;height: 30px;width: 30px;">
<div style="position: absolute;right: 19%;height: 30px;width: 30px;">
<a-upload class="clearfix-up-1" action="http://43.142.42.187:8899/file/upload" list-type="picture-card" :maxCount="1"
@preview="onHandlePreview" @change="onEdithandleChange" :before-upload="onBeforeUpload">
<div style="width:30px;height:30px;border: none;"><i class="iconfont icon-tupian"
......@@ -129,16 +129,6 @@ let options = reactive({
[{ color: [] }, { background: [] }],
[{ align: [] }],
],
handlers: {
image: function (value: any) {
if (value) {
// 调用element图片上传
// document.querySelector(".editor-img-uploader>.el-upload").click();
} else {
Quill.format("image", true);
}
},
},
},
history: {
delay: 1000,
......@@ -187,17 +177,7 @@ const optionsEdit = reactive({
["link", "image"],
[{ color: [] }, { background: [] }],
[{ align: [] }],
],
handlers: {
image: function (value: any) {
if (value) {
// 调用element图片上传
// document.querySelector(".editor-img-uploader>.el-upload").click();
} else {
Quill.format("image", true);
}
},
},
]
},
history: {
delay: 1000,
......@@ -317,10 +297,7 @@ const onEdithandleChange = (info: any) => {
}
};
const onSelectPlain = (e: any) => {
console.log(e, 'e');
formState.price = "0"
// free 0
formState.price = "1"
value.value = e.target.value;
};
......
web-vue-admin/src/views/goods-cabinet/components/goodsubs/index.vue
......@@ -34,19 +34,17 @@
</a-form-item>
<a-form-item label="商品详情" name="body" :label-col="{ span: 1 }">
<div style="position: relative;">
<div style="position: absolute;right: 26%;height: 30px;width: 30px;">
<div style="position: absolute;right: 19%;height: 30px;width: 30px;">
<a-upload class="clearfix-up-1" action="http://43.142.42.187:8899/file/upload" list-type="picture-card" :maxCount="1"
@preview="onHandlePreview" @change="onEdithandleChange" :before-upload="onBeforeUpload">
<div style="width:30px;height:30px;border: none;"><i class="iconfont icon-tupian"
<div style="width:30px;height:30px;border: none;background: none;"><i class="iconfont icon-tupian"
style="font-size:28px;"></i> </div>
</a-upload>
</div>
<QuillEditor style="height:200px" ref="myQuillEditor" :options="options" :content="formState.body"
content-type="html" @update:content="textChange" @focus="onEditorFocus($event)" @blur="onEditorBlur($event)"
@change="onEditorChange($event)" />
</div>
<div class="editor-text">
<p>1、商品描述需符合《中华人民共和国广告法》</p>
<p>
......
web-vue-admin/src/views/goods-cabinet/index.vue
......@@ -173,18 +173,18 @@ const columns = [
},
{
title: "商品售卖数",
key: "markingprice",
dataIndex: "markingprice",
key: "sellcount",
dataIndex: "sellcount",
},
{
title: "默认金额售卖数",
title: "默认金额",
key: "price",
dataIndex: "price",
},
{
title: "已售金额",
key: "price",
dataIndex: "price",
key: "sellamount",
dataIndex: "sellamount",
},
{
title: "商品状态",
......
web-vue-admin/src/views/pay-list/components/createpay/index.vue
......@@ -22,14 +22,16 @@
</a-form-item>
<a-form-item label="支付金额" name="price" :label-col="{ span: 2 }" labelAlign="left">
<a-radio-group v-model:value="formState.paymentmodel" name="radioGroup" class="pay">
<div style="display: flex;height: 50px;">
<div style="display: flex;height: 40px;">
<a-radio value="0" style="width:150px;">商品默认金额</a-radio>
<a-input-number style="width:200px;height: 40px;" v-model:value="price" />
<a-input-number style="width:200px;height: 35px;" v-model:value="price" :formatter="value => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')"
:parser="value => value.replace(/\$\s?|(,*)/g, '')" :disabled="true" />
<div style="width:50px;">元</div>
</div>
<div style="display: flex;height: 50px">
<div style="display: flex;height: 40px;margin-top: 20px;">
<a-radio value="1" style="width:150px;">自定义金额</a-radio>
<a-input-number style="width:200px;height: 40px;" v-model:value="priceSet" />
<a-input-number style="width:200px;height: 35px;" v-model:value="priceSet" :formatter="value => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')"
:parser="value => value.replace(/\$\s?|(,*)/g, '')"/>
<div style="width:50px;">元</div>
</div>
</a-radio-group>
......@@ -57,13 +59,13 @@
<a-form-item label="开始时间" name="price" :label-col="{ span: 2 }"
labelAlign="left">
<div style="display:flex">
<a-date-picker v-model:value="formState.starttime" :locale="locale" :format="dateFormat" :disabledDate="disabledDate"/> <a-time-picker v-model:value="startvalue" format="HH:mm" />
<a-date-picker v-model:value="formState.starttime" :locale="locale" :format="dateFormat" :disabledDate="disabledDate"/> <a-time-picker style="margin-left:10px;" v-model:value="startvalue" format="HH:mm" />
</div>
</a-form-item>
<a-form-item label="结束时间" name="price" :label-col="{ span: 2 }"
labelAlign="left">
<div style="display:flex">
<a-date-picker v-model:value="formState.expireendtime" :locale="locale" :format="dateFormat" :disabledDate="disabledDate"/> <a-time-picker v-model:value="endvalue" format="HH:mm" />
<a-date-picker v-model:value="formState.expireendtime" :locale="locale" :format="dateFormat" :disabledDate="disabledDate"/> <a-time-picker style="margin-left:10px;" v-model:value="endvalue" format="HH:mm" />
</div>
</a-form-item>
<a-form-item label="信息备注" name="price" :label-col="{ span: 2 }"
......@@ -125,8 +127,8 @@ const endvalue = ref<Dayjs>(dayjs('10:00', 'HH:mm'));
const optionsWithDisabled = [
{ value: '微信', label: '1' },
{ label: '2', value: '支付宝' },
{ label: '3', value: '京东白条' },
{ label: '4', value: '花呗' }
// { label: '3', value: '京东白条' },
// { label: '4', value: '花呗' }
];
const checkboxValue = ref<any>([])
const onSelectss =(value:any, option:any)=>{
......@@ -222,8 +224,14 @@ const onSet = async(index:string)=>{
showModal()
}
const onSelectCheckboxValue = (e:any,index:any)=>{
checkboxValue.value[index] = e
if(checkboxValue.value.includes(e)){
checkboxValue.value.splice(index,1)
}else{
checkboxValue.value.push(e)
}
console.log(checkboxValue.value);
}
const showModal = () => {
visible.value = true;
......@@ -250,7 +258,7 @@ onMounted(async () => {
})
watch(formState,(newVal:any) => {
if(newVal.paymentmodel =='0'){
price.value = optionss.value[newVal.subject.index].price
price.value = optionss.value[newVal.subject.index].price
}
})
......
web-vue-admin/src/views/pay-list/index.vue
......@@ -75,12 +75,14 @@
<a-radio-group v-model:value="formState.paymentmodel" name="radioGroup" class="pay">
<div style="display: flex;height: 35px;">
<a-radio :value="0" style="width:150px;">商品默认金额</a-radio>
<a-input-number style="width:200px;height: 35px;" v-model:value="formState.payment" />
<a-input-number style="width:200px;height: 35px;" v-model:value="formState.payment" :formatter="value => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')"
:parser="value => value.replace(/\$\s?|(,*)/g, '')" :disabled="true"/>
<div style="width:50px;">元</div>
</div>
<div style="display: flex;height: 35px">
<div style="display: flex;height: 35px;margin-top: 20px;">
<a-radio :value="1" style="width:150px;">自定义金额</a-radio>
<a-input-number style="width:200px;height: 35px;" v-model:value="formState.paymentmodel" />
<a-input-number style="width:200px;height: 35px;" v-model:value="formState.paymentmodel" :formatter="value => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')"
:parser="value => value.replace(/\$\s?|(,*)/g, '')"/>
<div style="width:50px;">元</div>
</div>
</a-radio-group>
......@@ -94,14 +96,14 @@
<div style="display:flex">
<a-date-picker v-model:value="value2" :format="dateFormat"
:disabledDate="disabledDate" />
<a-time-picker v-model:value="value3" format="HH:mm" />
<a-time-picker style="margin-left: 20px;" v-model:value="value3" format="HH:mm" />
</div>
</a-form-item>
<a-form-item label="结束时间" name="price" :label-col="{ span: 2 }" labelAlign="left">
<div style="display:flex">
<a-date-picker v-model:value="value4" :format="dateFormat"
:disabledDate="disabledDate" />
<a-time-picker v-model:value="value5" format="HH:mm" />
<a-time-picker style="margin-left: 20px;" v-model:value="value5" format="HH:mm" />
</div>
</a-form-item>
<a-form-item label="信息备注" name="price" :label-col="{ span: 2 }" labelAlign="left">
......
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