Merge branch 'feat/tongdun' into 'master'

Feat/tongdun

See merge request !65

app/web/page/editor/component/DynamicForm/component/CouponTableModal/columns/coupon.column.ts

@@ -24,12 +24,12 @@ const receiverTypeList: object[] = [
   },
   {
     id: 2,
-    name: '自动发放',
-  },
-  {
-    id: 3,
-    name: '不限',
+    name: '系统发放',
   },
+  // {
+  //   id: 3,
+  //   name: '不限',
+  // },
 ];
 const listStatus: object[] = [
   {
@@ -137,6 +137,8 @@ const columns: object[] = [
     }, {}),
     render: (h, params) => {
       const obj = receiverTypeList.find(item => item.id === params.row.receiverType) || {};
+      // 处理优惠券列表显示券码的问题
+      if (params.row.receiverType == 4)  return h('div', '券码兑换');
       return h('div', obj.name);
     },
   },

app/web/page/editor/component/DynamicForm/component/CouponTableModal/index.ts

@@ -27,7 +27,7 @@ export default class CouponTableModal extends Vue {
   }
 
   async query(data) {
-    // receiverType 领取方式 1：主动领取 2：自动发放 3：不限
+    // receiverType 领取方式 1：主动领取 2：自动发放 3：不限, 4:券码
     const res = await operationApi.couponList({ ...data });
     const couponInfoList = res?.couponInfoList?.map(item => {
       if (item.receiverStartTime && item.receiverEndTime) {
@@ -49,6 +49,11 @@ export default class CouponTableModal extends Vue {
       return item;
     });
 
-    return { data: couponInfoList || [], total: res?.pageInfo?.totalCount };
+    return { data: couponInfoList.map(item => {
+      if (item.receiverType == 4) {
+        item._disabled = true;
+      }
+      return item;
+    }) || [], total: res?.pageInfo?.totalCount };
   }
 }
\ No newline at end of file

package-lock.json

@@ -2176,9 +2176,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.3.35",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.35.tgz",
-      "integrity": "sha512-qta4QqHlwn28hKNQkeHlaARPAU/aFlsp/nIHhyuDU/CRpI+U2QuXyw5lMMa+zxTZsO2Vm+ZEuJucQrKym9Wvcg==",
+      "version": "0.3.38",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.38.tgz",
+      "integrity": "sha512-3192nZfqeW5sD35+tpUZvI2CseCKTFmc2bBkwDtZ65iINekRl+HrrO7E2WeiaYQCVjbC5Hac0UaSRI42zob5LQ==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.23.9",

package.json

@@ -30,7 +30,7 @@
     "@hubcarl/json-typescript-mapper": "^2.0.0",
     "@qg/apollo-nodejs": "^2.1.2",
     "@qg/cherry-ui": "2.23.10",
-    "@qg/citrus-ui": "0.3.35",
+    "@qg/citrus-ui": "0.3.38",
     "@riophae/vue-treeselect": "^0.4.0",
     "@types/lodash": "^4.14.117",
     "@types/node": "^10.12.0",