Skip to content

O
occloud-server
Commit 344534ec by liuliufashi
Options

upadte

parent 6f5cf5dc
Showing with 31 additions and 36 deletions
web-vue-admin/.env.prod
VUE_APP_MODE = 'prod'
NODE_ENV = 'production'
VUE_APP_BASE_URL = '/iships/'
VUE_APP_MODE = 'http://47.102.211.197:8092'
VUE_APP_MODE = 'http://43.142.42.187:8899'
VUE_APP_TEXT = '生产环境'
\ No newline at end of file
web-vue-admin/src/api/index.ts
......@@ -164,8 +164,6 @@ export const onUpdateGoodsPay = async(data:any)=>{
}
export const onDelectgoodpay = async(data:any)=>{
console.log(data,'data');
return await request({
url: `/goods/delectgoodpay?goodspayid=${data.goodspayid}&uid=${data.uid}`,
method:'post',
......
web-vue-admin/src/views/goods-cabinet/components/goods/index.vue
......@@ -15,7 +15,7 @@
<a-form-item label=" 商品示图" name="picurl" :rules="rulesRef.picurl" :wrapper-col="{ offset: 0, span: 8 }" class="Up"
labelAlign="left" :label-col="{ span: 1 }">
<div class="clearfix">
<a-upload class="clearfix-up" v-model:file-list="fileList" action="/api/file/upload" list-type="picture-card"
<a-upload class="clearfix-up" v-model:file-list="fileList" action="http://43.142.42.187:8899/file/upload" list-type="picture-card"
:maxCount="1" @preview="handlePreview" @change="handleChange" :before-upload="beforeUpload">
<div v-if="fileList.length < 8">
<plus-outlined />
......@@ -35,7 +35,7 @@
<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;">
<a-upload class="clearfix-up-1" action="/api/file/upload" list-type="picture-card" :maxCount="1"
<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"
style="font-size:28px;"></i> </div>
......@@ -352,7 +352,8 @@ const onSubmit = () => {
uid,
parent: 1,
markingprice:fromData.markingprice*100,
price:fromData.markingprice*100
price:fromData.markingprice*100,
picurl:fromData.picurl
}
const data: any = await onCreateGoods(JSON.stringify(prarms))
if (data.state === 1) {
......
web-vue-admin/src/views/goods-cabinet/components/goodsubs/index.vue
......@@ -15,7 +15,7 @@
<a-form-item label="商品示图" name="picurl" :rules="rulesRef.picurl" :wrapper-col="{ offset: 0, span: 8 }"
class="Up" :label-col="{ span: 1 }">
<div class="clearfix">
<a-upload class="clearfix-up" v-model:file-list="fileList" action="/api/file/upload" :maxCount="1"
<a-upload class="clearfix-up" v-model:file-list="fileList" action="http://43.142.42.187:8899/file/upload" :maxCount="1"
list-type="picture-card" @preview="handlePreview" @change="handleChange">
<div v-if="fileList.length < 8" :before-upload="beforeUpload">
<plus-outlined />
......@@ -35,7 +35,7 @@
<a-form-item label="商品详情" name="body" :label-col="{ span: 1 }">
<div style="position: relative;">
<div style="position: absolute;right: 26%;height: 30px;width: 30px;">
<a-upload class="clearfix-up-1" action="/api/file/upload" list-type="picture-card" :maxCount="1"
<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"
style="font-size:28px;"></i> </div>
......@@ -315,7 +315,8 @@ const onSubmit = () => {
uid,
parent: 1,
markingprice:fromData.markingprice*100,
price:fromData.markingprice*100
price:fromData.markingprice*100,
picurl:fromData.picurl
}
const data: any = await onCreateGoods(JSON.stringify(prarms))
if (data.state === 1) {
......
web-vue-admin/src/views/goods-cabinet/index.vue
......@@ -62,7 +62,7 @@
:label-col="{ span: 2 }">
<div class="clearfix">
<div style="display: flex;">
<a-upload v-model:file-list="fileList" :maxCount="1" action="/api/file/upload" list-type="picture-card"
<a-upload v-model:file-list="fileList" :maxCount="1" action="http://43.142.42.187:8899/file/upload" list-type="picture-card"
@preview="handlePreview" @change="handleChange">
<div v-if="fileList.length < 8">
<plus-outlined />
......@@ -80,7 +80,7 @@
<a-form-item label="商品详情" name="body" labelAlign="left" :label-col="{ span: 2 }">
<div style="position: relative;">
<div style="position: absolute;left: 38%;top: 9%;height: 30px;width: 30px;">
<a-upload class="clearfix-up-1" action="/api/file/upload" list-type="picture-card" :maxCount="1"
<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"
style="font-size:28px;"></i> </div>
......@@ -311,6 +311,7 @@ const onBack = async (e: Number) => {
const onEdit = (e: any) => {
visible.value = !visible.value;
modelRef.value = e
modelRef.value.sellingmodel = modelRef.value.price? '1':'0'
fileList.value[0].url = modelRef.value.picurl
};
const { resetFields, validate, validateInfos } = useForm(
......
web-vue-admin/src/views/pay-list/index.vue
......@@ -4,9 +4,6 @@
<div>
<a-input-search v-model:value="value" placeholder="请输入商品名" style="width: 200px;margin-left: 20px;"
@search="onSearch" />
<!-- <a-space direction="vertical">
<a-select v-model:value="value1" :size="size" style="width: 200px;margin-left: 20px;" :options="options"></a-select>
</a-space> -->
</div>
<div>
<a-button type="primary" block @click="onCreatePay">新建支付项</a-button>
......@@ -42,6 +39,12 @@
<a-button type="primary" style="margin-left: 20px">删除</a-button>
</a-popconfirm>
</div>
<div v-if="column.key == 'time' && (record.starttime >= new Date())" style="color: #DDD222;">
{{moment(record.starttime).format('YYYY-MM-DD HH:mm')}}
</div>
<div v-else-if="column.key == 'time' && (record.starttime<new Date())" style="color: red;">
{{moment(record.starttime).format('YYYY-MM-DD HH:mm')}}
</div>
</template>
</a-table>
</div>
......@@ -70,33 +73,18 @@
</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;">
<a-radio value="0" style="width:150px;">商品默认金额</a-radio>
<a-input-number style="width:200px;height: 40px;" v-model:value="formState.payment" />
<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" />
<div style="width:50px;">元</div>
</div>
<div style="display: flex;height: 50px">
<a-radio value="1" style="width:150px;">自定义金额</a-radio>
<a-input-number style="width:200px;height: 40px;" v-model:value="formState.paymentmodel" />
<div style="display: flex;height: 35px">
<a-radio :value="1" style="width:150px;">自定义金额</a-radio>
<a-input-number style="width:200px;height: 35px;" v-model:value="formState.paymentmodel" />
<div style="width:50px;">元</div>
</div>
</a-radio-group>
</a-form-item>
<!-- <a-form-item label="支付渠道" name="price" :label-col="{ span: 2 }" labelAlign="left">
<a-checkbox-group v-model:value="checkboxValue" style="width: 100%">
<div style="display:flex;" v-for="item, index in optionsWithDisabled" :itemKey="item">
<a-checkbox :value="item.value" :label="item.label"
@change="onSelectCheckboxValue(item, index)">
<div>{{ item.value }}</div>
</a-checkbox>
<div style="margin-left:20px;">收款账户</div>
<div style="margin-left:20px;color: black;" v-if="listValue[index] &&listValue[index].paytype == 1">{{listValue[index].name}}</div>
<div style="margin-left:20px;color: black;" v-else-if="listValue[index] &&listValue[index].paytype == 2">{{listValue[index].payname}}</div>
<div style="margin-left:20px;color: black;" v-else>默认</div>
<div style="margin-left:20px;color: rgb(15, 64, 245);cursor: pointer;" @click="onSet(item.label)">设置</div>
</div>
</a-checkbox-group>
</a-form-item> -->
<a-form-item label="支付前填写手机号" name="price" :label-col="{ span: 3 }" labelAlign="left">
<div style="display: flex;">
<a-switch :checked="formState.fullphone === '0'" />
......@@ -198,6 +186,11 @@ const columns = [
dataIndex: 'tags',
key: 'tags',
},
{
title: '生效时间',
dataIndex: 'time',
key: 'time',
},
]
const visible = ref<boolean>(false);
const value2 = ref<any>(dayjs('2015/01/01', dateFormat))
......@@ -270,7 +263,7 @@ const onCreatePay = async () => {
const onCopy = async(e:any) => {
const value = localStorage.getItem('url') || ''
try {
await toClipboard(`${value}?ditch=${uid}&goodsid=${e.id}&phone=${e.fullphone}`)
await toClipboard(`${value}/#/?ditch=${uid}&goodsid=${e.id}&phone=${e.fullphone}`)
message.success('复制成功')
} catch (e) {
console.error(e)
......
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