Browse Source

Merge remote-tracking branch 'origin/gzb' into wzl

gzb
wangzhonglu 8 months ago
parent
commit
50a1304035
3 changed files with 11 additions and 15 deletions
  1. 2
    0
      src/views/dope/dope.vue
  2. 6
    1
      src/views/layout.vue
  3. 3
    14
      src/views/regionSection/setting/powerUp.vue

+ 2
- 0
src/views/dope/dope.vue View File

125
                 v.hasread = 1;
125
                 v.hasread = 1;
126
               }
126
               }
127
             });
127
             });
128
+            //修改首页未读条数
129
+            this.$EventBus.$emit("nreadChange");
128
           } else {
130
           } else {
129
             this.$Message.error(res.msg);
131
             this.$Message.error(res.msg);
130
           }
132
           }

+ 6
- 1
src/views/layout.vue View File

17
         </div>
17
         </div>
18
         <div class="dope" @click="headerDope" v-if="powerParams.rtype != 1">
18
         <div class="dope" @click="headerDope" v-if="powerParams.rtype != 1">
19
           <img class="img1" src="../assets/img/dope.png" />
19
           <img class="img1" src="../assets/img/dope.png" />
20
-          <div class="img2">
20
+          <div class="img2" v-if="nreadNum > 0">
21
             {{ nreadNum }}
21
             {{ nreadNum }}
22
           </div>
22
           </div>
23
         </div>
23
         </div>
237
       return this.$store.getters.powerParams;
237
       return this.$store.getters.powerParams;
238
     }
238
     }
239
   },
239
   },
240
+  mounted() {
241
+    this.$EventBus.$on("nreadChange", () => {
242
+      this.nreadNum = this.nreadNum > 0 ? this.nreadNum - 1 : 0;
243
+    });
244
+  },
240
   methods: {
245
   methods: {
241
     init() {
246
     init() {
242
       logdoperatemsg_get_nrn({
247
       logdoperatemsg_get_nrn({

+ 3
- 14
src/views/regionSection/setting/powerUp.vue View File

18
             placeholder="请输入页面地址"
18
             placeholder="请输入页面地址"
19
           ></Input>
19
           ></Input>
20
         </FormItem>
20
         </FormItem>
21
-        <FormItem label="约定标识" style="width: 100%">
22
-          <RadioGroup v-model="adminInfo.singleType">
23
-            <Radio :label="1">账号</Radio>
24
-            <Radio :label="2">学号</Radio>
25
-            <Radio :label="3">手机号码</Radio>
26
-            <Radio :label="4">身份证号码</Radio>
27
-          </RadioGroup>
28
-        </FormItem>
29
       </Form>
21
       </Form>
30
     </div>
22
     </div>
31
     <div class="footer">
23
     <div class="footer">
50
       adminInfo: {
42
       adminInfo: {
51
         regionid: "",
43
         regionid: "",
52
         appPackage: "",
44
         appPackage: "",
53
-        authUrl: "",
54
-        singleType: 1
45
+        authUrl: ""
55
       },
46
       },
56
       userInfo: {},
47
       userInfo: {},
57
       showLoading: false
48
       showLoading: false
80
           if (res.obj) {
71
           if (res.obj) {
81
             this.adminInfo = {
72
             this.adminInfo = {
82
               appPackage: res.obj.appPackage,
73
               appPackage: res.obj.appPackage,
83
-              authUrl: res.obj.authUrl,
84
-              singleType: res.obj.singleType
74
+              authUrl: res.obj.authUrl
85
             };
75
             };
86
           }
76
           }
87
         } else {
77
         } else {
99
         objectid: this.powerParams.objectid,
89
         objectid: this.powerParams.objectid,
100
         regionid: this.powerParams.objectid,
90
         regionid: this.powerParams.objectid,
101
         appPackage: this.adminInfo.appPackage,
91
         appPackage: this.adminInfo.appPackage,
102
-        authUrl: this.adminInfo.authUrl,
103
-        singleType: this.adminInfo.singleType
92
+        authUrl: this.adminInfo.authUrl
104
       };
93
       };
105
       this.showLoading = true;
94
       this.showLoading = true;
106
       autoapp_edit(form).then((res) => {
95
       autoapp_edit(form).then((res) => {

Loading…
Cancel
Save