kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/build' into build

Browse Source
This commit is contained in:
aixianling
2023-05-23 09:16:42 +08:00
parent 5bd534c170 c71cb51e11
commit 383fcd00b0
10 changed files with 102 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
project/fengdu/app/AppIntegratingOrder/components/GirdList.vue
View File

@@ -68,12 +68,12 @@
width="350">
<template v-slot="{ row }">
<div class="goods">
<ai-uploader
:disabled="true"
:instance="instance"
:value="[{url: row.goodsPicUrl}]"
:limit="1">
</ai-uploader>
<div class="img-content">
<img :src="row.goodsPicUrl" alt="" v-viewer>
<span class="type type0" v-if="row.goodsType === '0'">免费兑</span>
<span class="type type1" v-else>京东低价商品</span>
</div>
<p>{{ row.goodsTitle }}</p>
</div>
</template>
@@ -124,7 +124,8 @@
status: '',
size: 10,
startTime: '',
endTime: ''
endTime: '',
type: 0
},
isShow: false,
form: {
@@ -160,8 +161,7 @@
getList () {
this.instance.post(`/app/appintegralsupermarketorder/list`, null, {
params: {
...this.search,
type: 0
...this.search
}
}).then((res) => {
if (res.code == 0) {
@@ -219,5 +219,30 @@
display: flex;
align-items: center;
}
.img-content {
position: relative;
margin-right: 8px;
img {
width: 120px;
height: 120px;
cursor: pointer;
}
}
.type {
position: absolute;
top: 0;
left: 0;
font-size: 12px;
width: 120px;
text-align: center;
color: #fff;
z-index: 999;
}
.type1 {
background-color: #E64E39;
}
.type0 {
background-color: #FF6900;
}
}
</style>

13
project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue
View File

@@ -68,15 +68,11 @@
width="350">
<template v-slot="{ row }">
<div class="goods">
<!-- <ai-uploader
:disabled="true"
:instance="instance"
:value="[{url: row.goodsPicUrl}]"
:limit="1">
</ai-uploader> -->
<div class="img-content">
<img :src="row.goodsPicUrl" alt="" v-viewer>
<span class="type" :class="`type`+row.goodsType">{{$dict.getLabel('integralSGType', row.goodsType)}}</span>
<span class="type type0" v-if="row.goodsType === '0'">免费兑</span>
<span class="type type1" v-else>京东低价商品</span>
</div>
<p>{{ row.goodsTitle }}</p>
</div>
@@ -132,6 +128,7 @@
status: '',
size: 10,
startTime: '',
type: 1,
endTime: ''
},
isShow: false,
@@ -169,7 +166,6 @@
this.instance.post(`/app/appintegralsupermarketorder/list`, null, {
params: {
...this.search,
type: 1,
girdCode: this.areaId
}
}).then((res) => {
@@ -241,6 +237,7 @@
position: absolute;
top: 0;
left: 0;
font-size: 12px;
width: 120px;
text-align: center;
color: #fff;

6
project/fengdu/app/AppIntegratingSupermarket/components/GoodsList.vue
View File

@@ -54,9 +54,10 @@
</ai-uploader> -->
<div class="img-content">
<img :src="row.picUrl" alt="" v-viewer>
<span class="type" :class="`type`+row.type">{{$dict.getLabel('integralSGType', row.type)}}</span>
<span class="type type0" v-if="row.type === '0'">免费兑</span>
<span class="type type1" v-else>京东低价商品</span>
</div>
<p>{{ row.title }}</p>
</div>
</template>
@@ -203,6 +204,7 @@
text-align: center;
color: #fff;
z-index: 999;
font-size: 12px;
}
.type1 {
background-color: #E64E39;

7
project/fengdu/app/AppIntegratingSupermarket/components/addGoods.vue
View File

@@ -39,6 +39,12 @@
<el-form-item label="零售价格" prop="retailPrice" :rules="[{required: true, message: '请输入零售价格', trigger: 'change'}]">
<el-input-number style="width: 200px;" size="small" :precision="2" type="input" v-model="form.retailPrice" clearable placeholder="请输入零售价格" :min="0"></el-input-number>
</el-form-item>
<el-form-item v-if="form.type === '2'" label="小程序appid" prop="jdAppid" :rules="[{required: true, message: '请输入京东小程序appid', trigger: 'blur'}]">
<el-input type="input" size="small" v-model="form.jdAppid" clearable placeholder="请输入京东小程序appid"></el-input>
</el-form-item>
<el-form-item v-if="form.type === '2'" label="小程序路径" prop="jdUrl" :rules="[{required: true, message: '请输入小程序路径', trigger: 'blur'}]">
<el-input type="input" size="small" v-model="form.jdUrl" clearable placeholder="请输入小程序路径"></el-input>
</el-form-item>
<el-form-item v-if="form.type === '1'" label="商品链接" prop="jdUrl" :rules="[{required: true, message: '请输入商品链接', trigger: 'blur'}]">
<el-input type="input" size="small" v-model="form.jdUrl" clearable placeholder="请输入商品链接"></el-input>
</el-form-item>
@@ -73,6 +79,7 @@
title: '',
description: '',
jdUrl: '',
jdAppid: '',
retailPrice: undefined,
picUrl: []
},

4
project/fengdu/app/AppResidentInfo/components/Add.vue
View File

@@ -445,14 +445,14 @@ export default {
girdName: [
{required: true, message: "请选择网格", trigger: "change"}
],
householdName: [
isHousehold: [
{required: true, message: "请选择是否户主", trigger: "change"}
],
householdRelation: [
{required: true, message: "请选择与户主关系", trigger: "change"}
],
householdIdNumber: [
{required: true, validator: IdNumberPass, trigger: "blur"}
{required: true, message: "请输入身份证号", trigger: "blur"}
],
householdAddress: [
{required: true, message: "请选择户籍地详细地址", trigger: "blur"}

42
project/shuzipingchang/app/AppIntegratingOrder/components/GirdList.vue
View File

@@ -68,12 +68,11 @@
width="350">
<template v-slot="{ row }">
<div class="goods">
<ai-uploader
:disabled="true"
:instance="instance"
:value="[{url: row.goodsPicUrl}]"
:limit="1">
</ai-uploader>
<div class="img-content">
<img :src="row.goodsPicUrl" alt="" v-viewer>
<span class="type type0" v-if="row.goodsType === '0'">免费兑</span>
<span class="type type1" v-else>京东低价商品</span>
</div>
<p>{{ row.goodsTitle }}</p>
</div>
</template>
@@ -124,7 +123,8 @@
status: '',
size: 10,
startTime: '',
endTime: ''
endTime: '',
type: 0
},
isShow: false,
form: {
@@ -160,8 +160,7 @@
getList () {
this.instance.post(`/app/appintegralsupermarketorder/list`, null, {
params: {
...this.search,
type: 0
...this.search
}
}).then((res) => {
if (res.code == 0) {
@@ -219,5 +218,30 @@
display: flex;
align-items: center;
}
.img-content {
position: relative;
margin-right: 8px;
img {
width: 120px;
height: 120px;
cursor: pointer;
}
}
.type {
position: absolute;
top: 0;
left: 0;
font-size: 12px;
width: 120px;
text-align: center;
color: #fff;
z-index: 999;
}
.type1 {
background-color: #E64E39;
}
.type0 {
background-color: #FF6900;
}
}
</style>

12
project/shuzipingchang/app/AppIntegratingOrder/components/ResidentList.vue
View File

@@ -68,15 +68,10 @@
width="350">
<template v-slot="{ row }">
<div class="goods">
<!-- <ai-uploader
:disabled="true"
:instance="instance"
:value="[{url: row.goodsPicUrl}]"
:limit="1">
</ai-uploader> -->
<div class="img-content">
<img :src="row.goodsPicUrl" alt="" v-viewer>
<span class="type" :class="`type`+row.goodsType">{{$dict.getLabel('integralSGType', row.goodsType)}}</span>
<span class="type type0" v-if="row.goodsType === '0'">免费兑</span>
<span class="type type1" v-else>京东低价商品</span>
</div>
<p>{{ row.goodsTitle }}</p>
</div>
@@ -131,6 +126,7 @@
current: 1,
status: '',
size: 10,
type: 1,
startTime: '',
endTime: ''
},
@@ -169,7 +165,6 @@
this.instance.post(`/app/appintegralsupermarketorder/list`, null, {
params: {
...this.search,
type: 1,
girdCode: this.areaId
}
}).then((res) => {
@@ -241,6 +236,7 @@
position: absolute;
top: 0;
left: 0;
font-size: 12px;
width: 120px;
text-align: center;
color: #fff;

6
project/shuzipingchang/app/AppIntegratingSupermarket/components/GoodsList.vue
View File

@@ -54,9 +54,10 @@
</ai-uploader> -->
<div class="img-content">
<img :src="row.picUrl" alt="" v-viewer>
<span class="type" :class="`type`+row.type">{{$dict.getLabel('integralSGType', row.type)}}</span>
<span class="type type0" v-if="row.type === '0'">免费兑</span>
<span class="type type1" v-else>京东低价商品</span>
</div>
<p>{{ row.title }}</p>
</div>
</template>
@@ -203,6 +204,7 @@
text-align: center;
color: #fff;
z-index: 999;
font-size: 12px;
}
.type1 {
background-color: #E64E39;

7
project/shuzipingchang/app/AppIntegratingSupermarket/components/addGoods.vue
View File

@@ -39,6 +39,12 @@
<el-form-item label="零售价格" prop="retailPrice" :rules="[{required: true, message: '请输入零售价格', trigger: 'change'}]">
<el-input-number style="width: 200px;" size="small" :precision="2" type="input" v-model="form.retailPrice" clearable placeholder="请输入零售价格" :min="0"></el-input-number>
</el-form-item>
<el-form-item v-if="form.type === '2'" label="小程序appid" prop="jdAppid" :rules="[{required: true, message: '请输入京东小程序appid', trigger: 'blur'}]">
<el-input type="input" size="small" v-model="form.jdAppid" clearable placeholder="请输入京东小程序appid"></el-input>
</el-form-item>
<el-form-item v-if="form.type === '2'" label="小程序路径" prop="jdUrl" :rules="[{required: true, message: '请输入小程序路径', trigger: 'blur'}]">
<el-input type="input" size="small" v-model="form.jdUrl" clearable placeholder="请输入小程序路径"></el-input>
</el-form-item>
<el-form-item v-if="form.type === '1'" label="商品链接" prop="jdUrl" :rules="[{required: true, message: '请输入商品链接', trigger: 'blur'}]">
<el-input type="input" size="small" v-model="form.jdUrl" clearable placeholder="请输入商品链接"></el-input>
</el-form-item>
@@ -73,6 +79,7 @@
title: '',
description: '',
jdUrl: '',
jdAppid: '',
retailPrice: undefined,
picUrl: []
},

4
project/shuzipingchang/app/AppResidentInfo/components/Add.vue
View File

@@ -445,14 +445,14 @@ export default {
girdName: [
{required: true, message: "请选择网格", trigger: "change"}
],
householdName: [
isHousehold: [
{required: true, message: "请选择是否户主", trigger: "change"}
],
householdRelation: [
{required: true, message: "请选择与户主关系", trigger: "change"}
],
householdIdNumber: [
{required: true, validator: IdNumberPass, trigger: "blur"}
{required: true, message: '请输入身份证号', trigger: "blur"}
],
householdAddress: [
{required: true, message: "请选择户籍地详细地址", trigger: "blur"}