admingit/MicroCommunityWeb
1
0
Fork 0
mirror of https://gitee.com/java110/MicroCommunityWeb.git synced 2026-02-24 05:46:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunityWeb

Browse Source
This commit is contained in:
shiyj1101 2021-06-29 18:59:10 +08:00
commit 70f16e084a
11 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/components/admin/addMainCategory/addMainCategory.html
View File

@ -19,7 +19,8 @@
<div class="col-sm-10">
<select class="custom-select" v-model="addMainCategoryInfo.categoryType">
<option selected disabled value="">必填，请选择目录类别</option>
<option value="120406">首页目录</option>
<option value="1">家政</option>
<option value="2">商圈</option>
</select>
</div>
</div>

4
public/components/admin/addMainCategoryProduct/addMainCategoryProduct.html
View File

@ -19,9 +19,9 @@
</div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">商品编号</label>
<label class="col-sm-2 col-form-label">商品(服务)编号</label>
<div class="col-sm-10">
<input v-model="addMainCategoryProductInfo.productId" type="text" placeholder="必填，请填写商品编号"
<input v-model="addMainCategoryProductInfo.productId" type="text" placeholder="必填，请填写商品(服务)编号"
class="form-control">
</div>
</div>

3
public/components/admin/addMainCategoryProduct/addMainCategoryProduct.js
View File

@ -56,7 +56,7 @@
},
{
limit: "maxLength",
param: "200",
param: "30",
errInfo: "商品编号太长"
},
],
@ -144,6 +144,7 @@
vc.component.addMainCategoryProductInfo = {
mainCategoryId: '',
productId: '',
productName: '',
startTime: '',
endTime: '',
seq: '',

3
public/components/admin/editMainCategory/editMainCategory.html
View File

@ -19,7 +19,8 @@
<div class="col-sm-10">
<select class="custom-select" v-model="editMainCategoryInfo.categoryType">
<option selected disabled value="">必填，请选择目录类别</option>
<option value="120406">首页目录</option>
<option value="1">家政</option>
<option value="2">商圈</option>
</select>
</div>
</div>

4
public/components/property/addAdvert/addAdvert.html
View File

@ -34,7 +34,9 @@
<option selected disabled value="">必填，请选择投放位置</option>
<option value="1000">小区内设备</option>
<option value="2000">业主首页</option>
<option value="3000">商城首页</option>
<option value="3000">商圈首页</option>
<option value="5000">家政首页</option>
<option value="6000">便民首页</option>
<option value="4000">员工首页</option>
</select>
</div>

7
public/components/property/addUnit/addUnit.js
View File

@ -61,12 +61,7 @@
limit:"required",
param:"",
errInfo:"单元编号不能为空"
},
{
limit:"num",
param:"",
errInfo:"单元编号必须为数字"
},
}
],
'addUnitInfo.layerCount':[
{

4
public/components/property/editAdvert/editAdvert.html
View File

@ -35,7 +35,9 @@
<option selected disabled value="">必填，请选择投放位置</option>
<option value="1000">小区内设备</option>
<option value="2000">业主首页</option>
<option value="3000">商城首页</option>
<option value="3000">商圈首页</option>
<option value="5000">家政首页</option>
<option value="6000">便民首页</option>
<option value="4000">员工首页</option>
</select>
</div>

7
public/components/property/editUnit/editUnit.js
View File

@ -42,12 +42,7 @@
limit: "required",
param: "",
errInfo: "单元编号不能为空"
},
{
limit: "num",
param: "",
errInfo: "单元编号必须为数字"
},
}
],
'editUnitInfo.layerCount': [
{

5
public/pages/admin/mainCategoryManage/mainCategoryManage.html
View File

@ -13,7 +13,8 @@
<div class="col-sm-4">
<select class="custom-select" v-model="mainCategoryManageInfo.conditions.categoryType">
<option selected value="">请选择目录类别</option>
<option value="120406">首页目录</option>
<option value="1">家政</option>
<option value="2">商圈</option>
</select>
</div>
<div class="col-sm-4">
@ -74,7 +75,7 @@
<tr v-for="mainCategory in mainCategoryManageInfo.mainCategorys">
<td class="text-center">{{mainCategory.mainCategoryId}}</td>
<td class="text-center">{{mainCategory.categoryName}}</td>
<td class="text-center">{{mainCategory.categoryType}}</td>
<td class="text-center">{{mainCategory.categoryType == '1'?'家政':'商圈'}}</td>
<td class="text-center">{{mainCategory.startTime}}</td>
<td class="text-center">{{mainCategory.endTime}}</td>
<td class="text-center">{{mainCategory.seq}}</td>

16
public/pages/admin/mainCategoryProductManage/mainCategoryProductManage.html
View File

@ -10,7 +10,7 @@
</div>
<div class="ibox-content">
<div class="row">
<div class="col-sm-4">
<div class="col-sm-3">
<select class="custom-select"
v-model="mainCategoryProductManageInfo.conditions.mainCategoryId">
<option selected value="">请选择目录</option>
@ -20,13 +20,19 @@
</option>
</select>
</div>
<div class="col-sm-4">
<div class="col-sm-3">
<div class="form-group">
<input type="text" placeholder="请输入商品编号"
<input type="text" placeholder="请输入编号"
v-model="mainCategoryProductManageInfo.conditions.productId" class=" form-control">
</div>
</div>
<div class="col-sm-3">
<div class="form-group">
<input type="text" placeholder="请输入名称"
v-model="mainCategoryProductManageInfo.conditions.productName" class=" form-control">
</div>
</div>
<div class="col-sm-2">
<select class="custom-select" v-model="mainCategoryProductManageInfo.conditions.state">
<option selected value="">请选择状态</option>
<option value="10021">待审核</option>
@ -67,7 +73,8 @@
<tr>
<th class="text-center">目录</th>
<th class="text-center">商品编号</th>
<th class="text-center">编号</th>
<th class="text-center">名称</th>
<th class="text-center">开始时间</th>
<th class="text-center">结束时间</th>
<th class="text-center">排序</th>
@ -80,6 +87,7 @@
<td class="text-center">{{mainCategoryProduct.categoryName}}</td>
<td class="text-center">{{mainCategoryProduct.productId}}</td>
<td class="text-center">{{mainCategoryProduct.productName}}</td>
<td class="text-center">{{mainCategoryProduct.startTime}}</td>
<td class="text-center">{{mainCategoryProduct.endTime}}</td>
<td class="text-center">{{mainCategoryProduct.seq}}</td>

1
public/pages/admin/mainCategoryProductManage/mainCategoryProductManage.js
View File

@ -16,6 +16,7 @@
conditions: {
mainCategoryId: '',
productId: '',
productName: '',
state: '',
}