Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

package.json

@@ -20,7 +20,7 @@
     "clean": "rimraf node_modules",
     "start": "yarn api && yarn scripts:build && cross-env NODE_OPTIONS=--max_old_space_size=4096 UMI_ENV=local umi dev",
     "start-noApi": "yarn scripts:build && cross-env NODE_OPTIONS=--max_old_space_size=4096 UMI_ENV=local umi dev",
-    "build": "yarn api && yarn scripts:build && yarn build:clean",
+    "build": "yarn && yarn api && yarn scripts:build && yarn build:clean",
     "build-noApi": "yarn scripts:build && yarn build:clean",
     "build:yxc": "yarn api && yarn scripts:build-yxc && umi build",
     "build:analyze": "cross-env NODE_OPTIONS=--max_old_space_size=16384 ANALYZE=1 UMI_ENV=prod umi build",
@@ -71,7 +71,7 @@
     "@linkseeks/design-core": "^1.0.0",
     "@linkseeks/design-react": "^1.0.2",
     "@linkseeks/design-react-web": "^1.0.0",
-    "@linkseeks/design-ui": "^1.0.11",
+    "@linkseeks/design-ui": "^1.0.12",
     "@linkseeks/god": "^1.0.0",
     "@linkseeks/umi-plugin-yapi": "1.0.1",
     "@turf/turf": "^6.4.0",

src/locales/en-US/editor.ts

@@ -269,4 +269,5 @@
   'editor.advert.title': 'Advertising editor',
   'editor.shopfloorline.goods': 'Product Recommendation Settings',
   'editor.shopfloorline.category': 'Classification Recommendation Settings',
+  'editor.mainnav.title': 'Navigation bar editor',
 }

src/locales/en-US/marketingAbility/selfManagement.ts

@@ -118,7 +118,7 @@ export default {
     "selfManagement.seconds": "The start spike time must be less than the end spike time",
     "selfManagement.secondGreater": "The end spike time must be greater than the start spike time",
     "selfManagement.expiresActivitiesAccordingExtractingTrialSystemAutomaticallyApplicationExtractGenerate": "When the trial activity expires, the trial user time is extracted according to the setting, and the system automatically extracts trial users from the trial users and generates orders",
-    "selfManagement.extractingUserTimeTrial": "Extracting User Time Trial",
+    "selfManagement.extractingUserTimeTrial": "Trial user time",
     "selfManagement.pleaseSelectExtract": "Please choose to extract trial user time",
     "selfManagement.arrivalRequestSubmitsReportSystemRemindSubmitReport": "After the trial end time is reached, trial users are required to submit trial reports, and the system reminds trial users to submit trial reports",
     "selfManagement.endOfTheTrialTime": "Trial end time",
@@ -151,9 +151,9 @@ export default {
     "selfManagement.transfiniteIndividualPurchaseQuantityBeyondOriginal": "The over-limit rule means that when the personal purchase limit is exceeded, the excess can be set to purchase at the original price or set to be non-purchasable",
     "selfManagement.transfiniteRules": "TransfiniteRules",
     "selfManagement.negotiateMaximumAmountBargainingAmountAccordingAmountFixedRandomAmountAmountWithinRandomAmount": "The maximum amount that can be bargained each time a user helps bargain. A fixed amount means that the amount to be chopped each time is fixed, and the random amount means that the amount to be chopped each time is a random amount within the setting range" ,
-    "selfManagement.amountBargaining": "Amount of bargaining each time",
+    "selfManagement.amountBargaining": "Cut-off Amount",
     "selfManagement.negotiateMaximumDegree": "The maximum number of times each user helps bargain",
-    "selfManagement.userLimitNumberOf": "User Limit Number of Times",
+    "selfManagement.userLimitNumberOf": "Limit Times",
     "selfManagement.requirementsCloudsAchieveNumberPeopleGroup-buyingDemandCloudsNumberNumber": "The number of people required to form a group must be reached. If only the number of people participating in the group purchase meets the group number setting requirements, the group purchase will be established",
     "selfManagement.theNumberOfClusters": "Number of Clusters",
     "selfManagement.cloudsOfTime": "Group Time",
@@ -161,7 +161,7 @@ export default {
     "selfManagement.tuxedoTuxedoGroup-buyingActivitiesWhetherGroup-buyingActivitiesEffectivelyWithoutLimitingUnlimitedRequiredNumberDefault": "User participation restriction means whether users who have joined the group in this group purchase activity can participate in other valid group purchase activities. Unrestricted means that they can participate without restriction. The number of times required to fill in the restriction is 1 by default. ",
     "selfManagement.userTuxedoLimit": "User TuxedoLimit",
     "selfManagement.secondsSecondBargainSecondsRestoreOriginal": "Set the daily spike-kill time period during the activity period. During the spike-time period, you can purchase at the second-bargain price. If not during the second-kill time period, restore the original price to purchase",
-    "selfManagement.dailySecondsToKillTime": "Daily Second Kill Time Period",
+    "selfManagement.dailySecondsToKillTime": "Second Kill Time",
     "selfManagement.theDepositPaymentTime": "Deposit Payment Time",
     "selfManagement.balancePaymentPaymentTime": "Final Payment Payment Time",
     "selfManagement.activityDescription": "Activity Description",
@@ -241,7 +241,7 @@ export default {
     "selfManagement.is": "Yes",
     "selfManagement.no": "No",
     "selfManagement.sureYouWantToSubmit?": "Are you sure you want to submit?",
-    "selfManagement.yuan": "元",
+    "selfManagement.yuan": "yuan",
     "selfManagement.thereIsNo": "No",
     "selfManagement.pleaseSelectThePrizeSet!": "Please select the prize setting!",
     "selfManagement.amountGreaterDecimalPlaces": "The amount must be greater than 0 and keep at most 2 decimal places",

src/locales/en-US/responseCode.ts

@@ -1131,5 +1131,7 @@ export default {
   "37104": "Please fill in the address of the recipient of the order self-pickup method",
   "37107": "The province does not exist",
   "37108": "The city does not exist",
-  "37109": "Zone does not exist"
-}
\ No newline at end of file
+  "37109": "Zone does not exist",
+  "60146": 'The member type is not a channel member or a channel individual member, and a channel cannot be created',
+  "47015": "Cannot find the corresponding portal ID, please create the corresponding portal first",
+}

src/locales/ko-KR/editor.ts

@@ -269,5 +269,6 @@ export default {
   'editor.advert.title': '광고 편집',
   'editor.shopfloorline.goods': '상품 추천 설정',
   'editor.shopfloorline.category': '분류 권장 설정',
+  'editor.mainnav.title': '탐색 모음 편집기',
 }
 

src/locales/ko-KR/responseCode.ts

@@ -1130,5 +1130,7 @@ export default {
   "37104": "주문접수 방법 수령인 주소를 기입해주세요",
   "37107": "지역이 존재하지 않습니다",
   "37108": "도시가 존재하지 않습니다",
-  "37109": "영역이 존재하지 않습니다"
-}
\ No newline at end of file
+  "37109": "영역이 존재하지 않습니다",
+  "60146": '구성원 유형은 채널 구성원 또는 채널 개별 구성원이 아니며 채널을 만들 수 없습니다',
+  "47015": "해당 포털 ID를 찾을 수 없습니다. 먼저 해당 포털을 생성하십시오.",
+}

src/locales/zh-CN/editor.ts

@@ -269,5 +269,6 @@ export default {
   'editor.advert.title': '广告编辑',
   'editor.shopfloorline.goods': '商品推荐设置',
   'editor.shopfloorline.category': '分类推荐设置',
+  'editor.mainnav.title': '导航栏编辑',
 }
 

src/locales/zh-CN/responseCode.ts

@@ -1131,5 +1131,8 @@ export default {
   "37104": "请填写订单自提方式接收人的地址",
   "37107": "省不存在",
   "37108": "市不存在",
-  "37109": "区不存在"
+  "37109": "区不存在",
+  "60146": '会员类型不是渠道会员或渠道个人会员, 不能创建渠道',
+  "47015": "找不到对应门户ID，请先去创建对应门户",
+
 }

src/pages/commodity/products/constant/index.tsx

@@ -88,12 +88,11 @@ export enum CommodityImagesType {
 /** 商品的操作文本 */
 export const opeartionLabel = [
   '',
-  '提交审核',
-  '修改商品',
-  '审核商品'
+  getIntl().formatMessage({ id: 'commodity.products.constant.opeartionLabel.1' }),
+  getIntl().formatMessage({ id: 'commodity.products.constant.opeartionLabel.2' }),
+  getIntl().formatMessage({ id: 'commodity.products.constant.opeartionLabel.3' })
 ]
 
-
 /** 查看商品 审核历史列 */
 export const columns: ColumnType<any>[] = [
   {

src/pages/editor/configs/componentConfigs/LingXiUI/MallMainNav.ts

 import { ComponentSchemaType, PROPS_SETTING_TYPES } from '@linkseeks/design-core';
+import { getIntl } from 'umi'
+const intl = getIntl()
 
 const MallMainNav: ComponentSchemaType = {
   propsConfig: {
     componentType: {
-      label: '导航朗编辑',
+      label: intl.formatMessage({ id: 'editor.mainnav.title' }),
       type: PROPS_SETTING_TYPES.mallNav
     },
   },

src/pages/editor/ownMallEdit/defaultData.ts

@@ -2,7 +2,7 @@
 export const mallLayoutConfig = {
   key: "0",
   "0": {
-    "componentName": "MallLayout",
+    componentName: 'LocaleProvide',
     "props": {
       "style": {
         "width": "100%",

src/pages/mobileTemplate/channelTemplateEdit/config.ts

 /*
  * @Author: ghua
  * @Date: 2021-02-22 17:02:20
- * @LastEditTime: 2021-03-01 11:47:26
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-02-17 14:23:55
+ * @LastEditors: GHua
  * @Description: In User Settings Edit
  * @FilePath: /lingxi-business-paltform/src/pages/mobileTemplate/channelTemplateEdit/config.ts
  */
@@ -22,6 +22,21 @@ export const defaultHeaderNavData = [
   },
 ]
 
+export const defaultBottomData = [
+  {
+    defaultIcon: "https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/home_default_icon@2x53811228510b478b982e930f3abd311c.png",
+    name: intl.formatMessage({ id: 'editor.bottom.link.type.home' }),
+    selectIcon: "https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/home_select_icon61bb51708e454013bf26126b8ccca779.png",
+    type: 1,
+  },
+  {
+    defaultIcon: "https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/mine_default_icon7c3a9ddd9dc844b89abbd7ecc906869e.png",
+    name: intl.formatMessage({ id: 'editor.bottom.link.type.mine' }),
+    selectIcon: "https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/mine_select_icon66af7fd1a6374b1a8081247d6e6f18c7.png",
+    type: 7,
+  }
+]
+
 export const channelLayoutConfig : PageConfigType = {
   '0': {
     componentName: 'LocaleProvide',

src/pages/mobileTemplate/channelTemplateEdit/index.tsx

 /*
  * @Author: ghua
  * @Date: 2021-02-22 17:02:20
- * @LastEditTime: 2021-03-01 11:37:34
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-02-17 14:18:17
+ * @LastEditors: GHua
  * @Description: app渠道商城装修
  * @FilePath: /lingxi-business-paltform/src/pages/mobileTemplate/channelTemplateEdit/index.tsx
  */
@@ -27,6 +27,7 @@ import {
   couponsModalConfig,
   defaultConfig,
   suggestProductConfig,
+  defaultBottomData,
 } from './config';
 import {
   marketingConfig_1,
@@ -212,7 +213,7 @@ const mobileShopTempleteEdit: React.FC<ShopPreviewPropsType> = props => {
         navList: appConfig?.navList ? appConfig?.navList.details : [],
         advert: appConfig?.advert ? appConfig?.advert.details : [],
         informationTitle: await getInfoList(),
-        bottom: appConfig?.bottom ? appConfig?.bottom.details : [],
+        bottom: (appConfig?.bottom && appConfig?.bottom.details && appConfig?.bottom.details.length > 0) ? appConfig?.bottom.details : defaultBottomData,
       };
       const _suggestProductConfig: any = cloneDeep(suggestProductConfig);
 

src/pages/mobileTemplate/ownMallTemplateEdit/config.ts

 /*
  * @Author: ghua
  * @Date: 2021-02-22 17:02:20
- * @LastEditTime: 2021-03-01 11:47:26
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-02-17 14:13:58
+ * @LastEditors: GHua
  * @Description: In User Settings Edit
  * @FilePath: /lingxi-business-paltform/src/pages/mobileTemplate/channelTemplateEdit/config.ts
  */
@@ -228,3 +228,5 @@ export const couponsModalConfig = {
     canDrag: false,
   },
 };
+// https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/home_default_icon@2x53811228510b478b982e930f3abd311c.png
+// https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/home_select_icon61bb51708e454013bf26126b8ccca779.png

src/pages/transaction/marketingAbility/components/couponsListLayout/components/productLayout/index.tsx

@@ -93,7 +93,7 @@ const ProductLayout: React.FC<ProductLayoutProps> = (props: any) => {
               return Promise.reject(new Error(remind.message[4]));
             }
             if (!pattern.test(value) && remind.label[2] !== '元') {
-              return Promise.reject(new Error(remind.label[1] + `${intl.formatMessage({ id: 'selfManagement.bixudayu0zuiduobaoliu3wei'})}`));
+              return Promise.reject(new Error(remind.label[1] + `${intl.formatMessage({ id: 'selfManagement.bixudayu0zuiduobaoliu3wei'})}`)); activityPage.yuan
             }
             if (!pattern1.test(value) && remind.label[2] === '元') {
               return Promise.reject(new Error(remind.label[1] + `${intl.formatMessage({ id: 'marketingAbility.bixudayu0zuiduobaoliu2weixiaoshu'})}`));

src/pages/user/index.less

@@ -332,3 +332,45 @@
 
 
 }
+
+.is_required {
+  .mega-layout-item-content {
+    position: relative;
+    display: inline-flex;
+    align-items: center;
+    max-width: 100%;
+    // height: 32px;
+    color: rgba(0, 0, 0, 0.85);
+    font-size: 12px;
+    &::before {
+      display: inline-block;
+      margin-right: 4px;
+      color: #ff4d4f;
+      font-size: 12px;
+      font-family: SimSun, sans-serif;
+      line-height: 1;
+      content: '*';
+    }
+  }
+}
+
+.no_required {
+  .mega-layout-item-content {
+    position: relative;
+    display: inline-flex;
+    align-items: center;
+    max-width: 100%;
+    // height: 32px;
+    color: rgba(0, 0, 0, 0.85);
+    font-size: 12px;
+    &::before {
+      display: inline-block;
+      margin-right: 4px;
+      color: transparent;
+      font-size: 12px;
+      font-family: SimSun, sans-serif;
+      line-height: 1;
+      content: '*';
+    }
+  }
+}

src/utils/index.tsx

@@ -419,6 +419,9 @@ export const getFieldType = (field) => {
       ] : [],
       // .concat([{ required: field.fieldEmpty === 0 }, { max: field.fieldLength }]),
       maxLength: field.fieldLength,
+      'x-props': {
+        itemClassName: field.fieldEmpty === 0 ? 'is_required' : 'no_required'
+      },
       "x-component-props": {
         help: field.fieldRemark,
         placeholder: `${intl.formatMessage({ id: 'common.form.input.placeholder' })}${field.fieldLocalName || field.fieldCNName}`,