From 3383deabd20311418729eb9a656493f96477b4a3 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 1 Sep 2022 09:30:23 +0800 Subject: [PATCH 1/7] 31011 --- .../components/gridScoreRules.vue | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue index 5653dcd2..749badb2 100644 --- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue +++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue @@ -78,11 +78,11 @@ --> - + - + @@ -241,6 +241,7 @@ export default { rulueType: "0", girdNameList: [], list: [], + isOneAndTen: false, }; }, created() { @@ -352,6 +353,15 @@ export default { }, handleTypeForm(v) { if (this.dialog) { + if(v[0] == '1' || v[0]== '10') { + this.form.scoringCycle = '0' + this.form.numberLimit = '1' + this.isOneAndTen = true + } else { + this.form.scoringCycle = '' + this.form.numberLimit = '' + this.isOneAndTen = false + } this.form.systemRuleId = v?.[v.length - 1]; } }, From 7e918cbf4a07a1bd30d1ec0e9206da7b6aafcecc Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 1 Sep 2022 11:10:02 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=8F=96=E7=BB=9D=E5=AF=B9=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppGridMemberScore/components/gridScoreStatistics.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue index 1cb20a0b..f91e2b2f 100644 --- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue +++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue @@ -30,7 +30,7 @@

消耗积分

-

{{ data.reduceIntegral || 0 }}

+

{{ Math.abs(data.reduceIntegral) || 0 }}

From 9f5b6e10a3cb1e981233b655153800302f90b575 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 1 Sep 2022 13:45:37 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=8D=8F=E5=90=8C=E5=AE=A3=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppAnnounceWeChat/components/Add.vue | 65 +------------------ 1 file changed, 1 insertion(+), 64 deletions(-) diff --git a/project/sass/apps/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue b/project/sass/apps/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue index e1b271d6..1caa0867 100644 --- a/project/sass/apps/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue +++ b/project/sass/apps/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue @@ -70,7 +70,7 @@
@@ -130,10 +130,6 @@

网页

-
- -

小程序

-
@@ -211,43 +207,6 @@ - - -
- - - - - - - - - - - - - - - -
-
-
{ - if (valid) { - this.fileList.push({ - ...this.miniAppForm, - msgType: '5', - ...this.miniAppForm.media[0], - mediaId: this.miniAppForm.media[0].media.mediaId, - sysFileId: this.miniAppForm.media[0].id - }) - - this.isShowAddMiniapp = false - } - }) - }, - onClose() { this.linkForm.linkPicUrl = [] this.linkForm.linkDesc = '' From ec24628e0257537a037ce1e5dbbce7459501236c Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 1 Sep 2022 13:47:10 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=8D=8F=E5=90=8C=E5=AE=A3=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/project/sass/apps/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue b/project/sass/apps/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue index 1caa0867..edc2f2b8 100644 --- a/project/sass/apps/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue +++ b/project/sass/apps/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue @@ -267,7 +267,6 @@ export default { isLoading2: false, fileList: [], isShowAddLink: false, - isShowAddMiniapp: false, isShowDate: false, isLoading: false, linkForm: { @@ -448,9 +447,6 @@ export default { this.linkForm.linkDesc = '' this.linkForm.linkTitle = '' this.linkForm.linkUrl = '' - this.miniAppForm.mpAppid = '' - this.miniAppForm.mpPage = '' - this.miniAppForm.mpTitle = '' this.dateForm.choiceTime = '' this.isShowDate = false From 4a75301322d7d50d1d866a7ac9666ee38cae465a Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 1 Sep 2022 15:08:45 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=8D=8F=E5=90=8C=E5=AE=A3=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppAnnounceResident.vue | 79 ++ .../AppAnnounceResident/components/Add.vue | 1005 +++++++++++++++++ .../AppAnnounceResident/components/Detail.vue | 773 +++++++++++++ .../AppAnnounceResident/components/List.vue | 295 +++++ .../AppAnnounceResident/components/Phone.vue | 344 ++++++ .../AppAnnounceResidentStatistics.vue | 759 +++++++++++++ .../AppAnnounceWeChat/AppAnnounceWeChat.vue | 79 ++ .../AppAnnounceWeChat/components/Add.vue | 853 ++++++++++++++ .../AppAnnounceWeChat/components/Detail.vue | 697 ++++++++++++ .../AppAnnounceWeChat/components/List.vue | 296 +++++ .../AppAnnounceWeChat/components/Phone.vue | 344 ++++++ .../AppAnnounceWeChatStatistics.vue | 759 +++++++++++++ 12 files changed, 6283 insertions(+) create mode 100644 packages/wxwork/AnnounceResident/AppAnnounceResident/AppAnnounceResident.vue create mode 100644 packages/wxwork/AnnounceResident/AppAnnounceResident/components/Add.vue create mode 100644 packages/wxwork/AnnounceResident/AppAnnounceResident/components/Detail.vue create mode 100644 packages/wxwork/AnnounceResident/AppAnnounceResident/components/List.vue create mode 100644 packages/wxwork/AnnounceResident/AppAnnounceResident/components/Phone.vue create mode 100644 packages/wxwork/AnnounceResident/AppAnnounceResidentStatistics/AppAnnounceResidentStatistics.vue create mode 100644 packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/AppAnnounceWeChat.vue create mode 100644 packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue create mode 100644 packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue create mode 100644 packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/List.vue create mode 100644 packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Phone.vue create mode 100644 packages/wxwork/AnnounceWeChat/AppAnnounceWeChatStatistics/AppAnnounceWeChatStatistics.vue diff --git a/packages/wxwork/AnnounceResident/AppAnnounceResident/AppAnnounceResident.vue b/packages/wxwork/AnnounceResident/AppAnnounceResident/AppAnnounceResident.vue new file mode 100644 index 00000000..ea777c17 --- /dev/null +++ b/packages/wxwork/AnnounceResident/AppAnnounceResident/AppAnnounceResident.vue @@ -0,0 +1,79 @@ + + + + + diff --git a/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Add.vue b/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Add.vue new file mode 100644 index 00000000..4d20170d --- /dev/null +++ b/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Add.vue @@ -0,0 +1,1005 @@ + + + + + diff --git a/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Detail.vue b/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Detail.vue new file mode 100644 index 00000000..dfe924fd --- /dev/null +++ b/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Detail.vue @@ -0,0 +1,773 @@ + + + + + diff --git a/packages/wxwork/AnnounceResident/AppAnnounceResident/components/List.vue b/packages/wxwork/AnnounceResident/AppAnnounceResident/components/List.vue new file mode 100644 index 00000000..95a22443 --- /dev/null +++ b/packages/wxwork/AnnounceResident/AppAnnounceResident/components/List.vue @@ -0,0 +1,295 @@ + + + + + diff --git a/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Phone.vue b/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Phone.vue new file mode 100644 index 00000000..6eb38384 --- /dev/null +++ b/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Phone.vue @@ -0,0 +1,344 @@ + + + + + diff --git a/packages/wxwork/AnnounceResident/AppAnnounceResidentStatistics/AppAnnounceResidentStatistics.vue b/packages/wxwork/AnnounceResident/AppAnnounceResidentStatistics/AppAnnounceResidentStatistics.vue new file mode 100644 index 00000000..72b71145 --- /dev/null +++ b/packages/wxwork/AnnounceResident/AppAnnounceResidentStatistics/AppAnnounceResidentStatistics.vue @@ -0,0 +1,759 @@ + + + + + diff --git a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/AppAnnounceWeChat.vue b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/AppAnnounceWeChat.vue new file mode 100644 index 00000000..20061d6d --- /dev/null +++ b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/AppAnnounceWeChat.vue @@ -0,0 +1,79 @@ + + + + + diff --git a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue new file mode 100644 index 00000000..d6ea5f30 --- /dev/null +++ b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue @@ -0,0 +1,853 @@ + + + + + diff --git a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue new file mode 100644 index 00000000..61176b59 --- /dev/null +++ b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue @@ -0,0 +1,697 @@ + + + + + diff --git a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/List.vue b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/List.vue new file mode 100644 index 00000000..5af56011 --- /dev/null +++ b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/List.vue @@ -0,0 +1,296 @@ + + + + + diff --git a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Phone.vue b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Phone.vue new file mode 100644 index 00000000..6eb38384 --- /dev/null +++ b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Phone.vue @@ -0,0 +1,344 @@ + + + + + diff --git a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChatStatistics/AppAnnounceWeChatStatistics.vue b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChatStatistics/AppAnnounceWeChatStatistics.vue new file mode 100644 index 00000000..e8efd4ae --- /dev/null +++ b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChatStatistics/AppAnnounceWeChatStatistics.vue @@ -0,0 +1,759 @@ + + + + + From 71bebd80484edccb68111d85f70ee623178e4d14 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 1 Sep 2022 15:31:58 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BC=81=E5=BE=AE=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extra/AppWxcpAppSet/AppWxcpAppSet.vue | 324 ++++++++++++++++++ 1 file changed, 324 insertions(+) create mode 100644 packages/extra/AppWxcpAppSet/AppWxcpAppSet.vue diff --git a/packages/extra/AppWxcpAppSet/AppWxcpAppSet.vue b/packages/extra/AppWxcpAppSet/AppWxcpAppSet.vue new file mode 100644 index 00000000..34286cc7 --- /dev/null +++ b/packages/extra/AppWxcpAppSet/AppWxcpAppSet.vue @@ -0,0 +1,324 @@ + + + + + From 9f8f035b8306a4a882f3a69e7cb95bd9348be501 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 1 Sep 2022 15:58:10 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BC=81=E5=BE=AE=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/extra/AppWxcpAppSet/AppWxcpAppSet.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/extra/AppWxcpAppSet/AppWxcpAppSet.vue b/packages/extra/AppWxcpAppSet/AppWxcpAppSet.vue index 34286cc7..b378d866 100644 --- a/packages/extra/AppWxcpAppSet/AppWxcpAppSet.vue +++ b/packages/extra/AppWxcpAppSet/AppWxcpAppSet.vue @@ -20,7 +20,7 @@ - + @@ -74,7 +74,7 @@
- + @@ -114,7 +114,8 @@ export default { }, colConfigs: [ {prop: 'banner', label: 'banner封面', slot: 'banner'}, - {prop: 'title', label: '主页名称', width: 200}, + {prop: 'title', label: '主页名称', width: 150}, + {prop: 'id', label: '配置id', width: 300}, {prop: 'appNames', label: '应用列表'}, {slot: 'option', label: '操作', width: 200}, ],