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

src/views/dope/dope.vue

@@ -125,6 +125,8 @@ export default {
                 v.hasread = 1;
               }
             });
+            //修改首页未读条数
+            this.$EventBus.$emit("nreadChange");
           } else {
             this.$Message.error(res.msg);
           }

src/views/layout.vue

@@ -17,7 +17,7 @@
         </div>
         <div class="dope" @click="headerDope" v-if="powerParams.rtype != 1">
           <img class="img1" src="../assets/img/dope.png" />
-          <div class="img2">
+          <div class="img2" v-if="nreadNum > 0">
             {{ nreadNum }}
           </div>
         </div>
@@ -237,6 +237,11 @@ export default {
       return this.$store.getters.powerParams;
     }
   },
+  mounted() {
+    this.$EventBus.$on("nreadChange", () => {
+      this.nreadNum = this.nreadNum > 0 ? this.nreadNum - 1 : 0;
+    });
+  },
   methods: {
     init() {
       logdoperatemsg_get_nrn({

src/views/regionSection/setting/powerUp.vue

@@ -18,14 +18,6 @@
             placeholder="请输入页面地址"
           ></Input>
         </FormItem>
-        <FormItem label="约定标识" style="width: 100%">
-          <RadioGroup v-model="adminInfo.singleType">
-            <Radio :label="1">账号</Radio>
-            <Radio :label="2">学号</Radio>
-            <Radio :label="3">手机号码</Radio>
-            <Radio :label="4">身份证号码</Radio>
-          </RadioGroup>
-        </FormItem>
       </Form>
     </div>
     <div class="footer">
@@ -50,8 +42,7 @@ export default {
       adminInfo: {
         regionid: "",
         appPackage: "",
-        authUrl: "",
-        singleType: 1
+        authUrl: ""
       },
       userInfo: {},
       showLoading: false
@@ -80,8 +71,7 @@ export default {
           if (res.obj) {
             this.adminInfo = {
               appPackage: res.obj.appPackage,
-              authUrl: res.obj.authUrl,
-              singleType: res.obj.singleType
+              authUrl: res.obj.authUrl
             };
           }
         } else {
@@ -99,8 +89,7 @@ export default {
         objectid: this.powerParams.objectid,
         regionid: this.powerParams.objectid,
         appPackage: this.adminInfo.appPackage,
-        authUrl: this.adminInfo.authUrl,
-        singleType: this.adminInfo.singleType
+        authUrl: this.adminInfo.authUrl
       };
       this.showLoading = true;
       autoapp_edit(form).then((res) => {