Skip to content

J
jinfa-admin
Commit caa03f43 authored by 前端-黄佳鑫's avatar 前端-黄佳鑫
Browse files
Options

Merge branch 'test' of http://10.0.0.22:3000/lingxi/lingxi-business-system into test

parents 97056e68 84e18af8
Show whitespace changes
Inline Side-by-side
Showing with 92 additions and 46 deletions
package.json
View file @ caa03f43
......@@ -47,7 +47,7 @@
"core-js": "^3.6.5",
"god": "0.1.29",
"lingxi-design": "^1.0.8",
"lingxi-design-ui": "^1.1.10",
"lingxi-design-ui": "^1.1.14",
"lingxi-editor-core": "^1.0.6",
"lingxi-web": "^1.0.6",
"lint-staged": "^10.0.7",
......
src/pages/member/memberMaintain/addMember.tsx
View file @ caa03f43
......@@ -90,7 +90,7 @@ const AddMember: React.FC<any> = props => {
const {
memberTypeId,
roleId,
levelId,
level,
countryCodeId,
phone,
email,
......@@ -100,7 +100,6 @@ const AddMember: React.FC<any> = props => {
statusName,
currentOuterStep,
level,
outerVerifySteps,
validateId,
...rest
......@@ -115,7 +114,7 @@ const AddMember: React.FC<any> = props => {
PublicApi.postMemberMaintenanceAddmember({
memberTypeId,
roleId,
levelId,
level,
countryCodeId,
phone,
email,
......@@ -143,7 +142,7 @@ const AddMember: React.FC<any> = props => {
validateId,
memberTypeId,
roleId,
levelId,
level,
countryCodeId,
phone,
email,
......@@ -212,8 +211,8 @@ const AddMember: React.FC<any> = props => {
}
linkage.value('roleId', undefined);
linkage.enum('roleId', []);
linkage.value('levelId', undefined);
linkage.enum('levelId', []);
linkage.value('level', undefined);
linkage.enum('level', []);
});
// 根据会员角色，查询其他注册资料
......@@ -233,8 +232,8 @@ const AddMember: React.FC<any> = props => {
// 手动触发改变的话重置等级下拉框
onFieldInputChange$('*(memberTypeId,roleId)').subscribe(() => {
linkage.value('levelId', undefined);
linkage.enum('levelId', []);
linkage.value('level', undefined);
linkage.enum('level', []);
});
// 根据会员类型和角色，查询等级下拉
......@@ -247,7 +246,7 @@ const AddMember: React.FC<any> = props => {
const otherValue = formActions.getFieldState(otherName, state => state.value);
if (selfValue && otherValue) {
linkage.loading('levelId');
linkage.loading('level');
PublicApi.getMemberMaintenanceAddpageitemsLevel({
memberTypeId: selfName == 'memberTypeId' ? selfValue : otherValue,
......@@ -257,11 +256,11 @@ const AddMember: React.FC<any> = props => {
}).then(res => {
if (res.code === 1000) {
const { data = [] } = res;
const options = data.map(item => ({ label: item.levelTag, value: item.levelId }));
linkage.enum('levelId', options);
const options = data.map(item => ({ label: item.levelTag, value: item.level }));
linkage.enum('level', options);
}
}).finally(() => {
linkage.loaded('levelId');
linkage.loaded('level');
});
}
}, 0);
......
src/pages/member/memberMaintain/schema/index.tsx
View file @ caa03f43
......@@ -245,7 +245,7 @@ export const initDetailSchema = (props: any) => {
hasFeedback: true,
},
},
levelId: {
level: {
type: 'string',
required: true,
title: '会员等级',
......
src/pages/pageCustomized/preview/channelPreview/index.tsx
View file @ caa03f43
......@@ -79,7 +79,8 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
"goodsPicUrl": "https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/53caa906bde04a8c8d042de721a6f8e71601283425278.jpg",
"goodsPrice": "1000.0",
"categoryName": "工控设备",
"brandName": "友飞翔"
"brandName": "友飞翔",
"priceType": 1
},
{
"goodsId": 21,
......@@ -87,7 +88,8 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
"goodsPicUrl": "https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/2aa8143601ef4b0fbe736db6339e552a1601379088893.png",
"goodsPrice": "1300.0",
"categoryName": "工控设备",
"brandName": "火狐热控"
"brandName": "火狐热控",
"priceType": 1
},
{
"goodsId": 22,
......@@ -95,7 +97,8 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
"goodsPicUrl": "https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/57dd9e8027b04e24a40a26af4f5a97f01601282964802.jpg",
"goodsPrice": "987.0",
"categoryName": "工控设备",
"brandName": "友飞翔"
"brandName": "友飞翔",
"priceType": 1
},
{
"goodsId": 28,
......@@ -103,7 +106,8 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
"goodsPicUrl": "https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/80a5abfdae394da5ab1dc62893e1f1821601284763925.jpg",
"goodsPrice": "4.6",
"categoryName": "变送器",
"brandName": "友昌振兴"
"brandName": "友昌振兴",
"priceType": 1
}
]
},
......@@ -123,7 +127,8 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
"goodsPicUrl": "https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/a0561fc936364f969d9216027138737b1601278766489.jpg",
"goodsPrice": "10000.0",
"categoryName": "挖掘机",
"brandName": "数商云"
"brandName": "数商云",
"priceType": 1
},
{
"goodsId": 31,
......@@ -131,7 +136,8 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
"goodsPicUrl": "https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/9c535ba9c3374307ae6afbbf535a311e1601364018708.jpeg",
"goodsPrice": "20000.0",
"categoryName": "立式包装机",
"brandName": "合能为"
"brandName": "合能为",
"priceType": 1
},
{
"goodsId": 30,
......@@ -139,7 +145,8 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
"goodsPicUrl": "https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/a748f76ebffc4912a104ad5a1e2727851601364061691.jpeg",
"goodsPrice": "30000.0",
"categoryName": "挖掘机",
"brandName": "友飞翔"
"brandName": "友飞翔",
"priceType": 1
},
{
"goodsId": 26,
......@@ -147,7 +154,8 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
"goodsPicUrl": "https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/03f5168b495b428baea67c7ad87f82361601364173457.jpeg",
"goodsPrice": "20000.0",
"categoryName": "挖掘机",
"brandName": "鹏飞宏"
"brandName": "鹏飞宏",
"priceType": 1
}
]
}
......
src/pages/pageCustomized/preview/shopPreview/index.tsx
View file @ caa03f43
......@@ -86,7 +86,8 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
"goodsPicUrl": "https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/53caa906bde04a8c8d042de721a6f8e71601283425278.jpg",
"goodsPrice": "1000.0",
"categoryName": "工控设备",
"brandName": "友飞翔"
"brandName": "友飞翔",
"priceType": 1
},
{
"goodsId": 21,
......@@ -94,7 +95,8 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
"goodsPicUrl": "https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/2aa8143601ef4b0fbe736db6339e552a1601379088893.png",
"goodsPrice": "1300.0",
"categoryName": "工控设备",
"brandName": "火狐热控"
"brandName": "火狐热控",
"priceType": 1
},
{
"goodsId": 22,
......@@ -102,7 +104,8 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
"goodsPicUrl": "https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/57dd9e8027b04e24a40a26af4f5a97f01601282964802.jpg",
"goodsPrice": "987.0",
"categoryName": "工控设备",
"brandName": "友飞翔"
"brandName": "友飞翔",
"priceType": 1
},
{
"goodsId": 28,
......@@ -110,7 +113,8 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
"goodsPicUrl": "https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/80a5abfdae394da5ab1dc62893e1f1821601284763925.jpg",
"goodsPrice": "4.6",
"categoryName": "变送器",
"brandName": "友昌振兴"
"brandName": "友昌振兴",
"priceType": 1
}
]
},
......@@ -130,7 +134,8 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
"goodsPicUrl": "https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/a0561fc936364f969d9216027138737b1601278766489.jpg",
"goodsPrice": "10000.0",
"categoryName": "挖掘机",
"brandName": "数商云"
"brandName": "数商云",
"priceType": 1
},
{
"goodsId": 31,
......@@ -138,7 +143,8 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
"goodsPicUrl": "https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/9c535ba9c3374307ae6afbbf535a311e1601364018708.jpeg",
"goodsPrice": "20000.0",
"categoryName": "立式包装机",
"brandName": "合能为"
"brandName": "合能为",
"priceType": 1
},
{
"goodsId": 30,
......@@ -146,7 +152,8 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
"goodsPicUrl": "https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/a748f76ebffc4912a104ad5a1e2727851601364061691.jpeg",
"goodsPrice": "30000.0",
"categoryName": "挖掘机",
"brandName": "友飞翔"
"brandName": "友飞翔",
"priceType": 1
},
{
"goodsId": 26,
......@@ -154,7 +161,8 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
"goodsPicUrl": "https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/03f5168b495b428baea67c7ad87f82361601364173457.jpeg",
"goodsPrice": "20000.0",
"categoryName": "挖掘机",
"brandName": "鹏飞宏"
"brandName": "鹏飞宏",
"priceType": 1
}
]
}
......
src/pages/pageCustomized/settingsPanel/propsSettings/components/BrandSetting/index.tsx
View file @ caa03f43
......@@ -112,10 +112,11 @@ const BrandSetting: React.FC<ShopSettingPropsType> = (props) => {
if (JSON.stringify(brandList) === JSON.stringify(selectBrandList)) {
return
}
if (selectBrandList.length <= 0) {
message.error("请选择要推荐的品牌")
return
} else if (selectBrandList.length > 6) {
// if (selectBrandList.length <= 0) {
// message.error("请选择要推荐的品牌")
// return
// } else
if (selectBrandList.length > 6) {
message.error("最多推荐6个品牌")
return
}
......
src/pages/pageCustomized/settingsPanel/propsSettings/components/GoodsSetting/GoodsItem.tsx
View file @ caa03f43
......@@ -9,6 +9,26 @@ const GoodsItem: React.FC<GoodsItemPropsType> = (props) => {
const { dataInfo = {} } = props
const renderPriceByType = (info: any) => {
switch (info.priceType) {
case 1:
return (
<div className={styles.goods_item_info_price}>
<i>￥</i>
<span>{dataInfo.priceRange || dataInfo.goodsPrice}</span>
</div>
)
case 2:
return (
<div className={styles.inquiry_price}>
<label>在线询价</label>
</div>
)
default:
break
}
}
return (
<div className={styles.goods_item}>
<div className={styles.goods_item_imgbox}>
......@@ -16,10 +36,7 @@ const GoodsItem: React.FC<GoodsItemPropsType> = (props) => {
</div>
<div className={styles.goods_item_info}>
<div className={styles.goods_item_info_name}>{dataInfo.goodsName}</div>
<div className={styles.goods_item_info_price}>
<i>￥</i>
<span>{dataInfo.priceRange || dataInfo.goodsPrice}</span>
</div>
{renderPriceByType(dataInfo)}
<div className={styles.goods_item_info_brief}>
<span>品类：</span>
<span>{dataInfo.categoryName}</span>
......
src/pages/pageCustomized/settingsPanel/propsSettings/components/GoodsSetting/index.less
View file @ caa03f43
......@@ -14,6 +14,17 @@
}
}
.inquiry_price {
color: #FFF;
background-color: #D32F2F;
font-size: 12px;
height: 18px;
line-height: 14px;
padding: 2px 8px;
display: inline-block;
margin-top: 2px;
}
&_info {
flex: 1;
width: 0;
......
src/pages/pageCustomized/settingsPanel/propsSettings/components/GoodsSetting/index.tsx
View file @ caa03f43
......@@ -172,10 +172,11 @@ const GoodsSetting: React.FC<GoodsSettingPropsType> = (props) => {
if (JSON.stringify(goodsList) === JSON.stringify(selectGoodsList)) {
return
}
if (selectGoodsList.length <= 0) {
message.error("请选择要推荐的商品")
return
} else if (selectGoodsList.length > 10) {
// if (selectGoodsList.length <= 0) {
// message.error("请选择要推荐的商品")
// return
// } else
if (selectGoodsList.length > 10) {
message.error("最多推荐10件商品")
return
}
......
src/pages/pageCustomized/settingsPanel/propsSettings/components/ShopSetting/index.tsx
View file @ caa03f43
......@@ -113,10 +113,11 @@ const ShopSetting: React.FC<ShopSettingPropsType> = (props) => {
return
}
if (selectShopsList.length <= 0) {
message.error("请选择要推荐的店铺")
return
} else if (selectShopsList.length > 5) {
// if (selectShopsList.length <= 0) {
// message.error("请选择要推荐的店铺")
// return
// } else
if (selectShopsList.length > 5) {
message.error("最多推荐5个店铺")
return
}
......
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