Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android

liuyg

2022-03-09 ea2740fbf745b90a782b290ac43c43bee8c2abd9

Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android

 pages/grabOrders/grabOrdersMain/business.vue

@@ -121,11 +121,11 @@
          img: "/static/workbench/task9.png",
          url: "",
        },
        {
          title: "模拟考试",
          img: "/static/workbench/task5.png",
          url: "/pages/exam/startexam",
        }
        // {
        //   title: "模拟考试",
        //   img: "/static/workbench/task5.png",
        //   url: "/pages/exam/startexam",
        // }
      ],
    };
  },
@@ -133,13 +133,13 @@
    this.getNum();
  },
  onLoad() {
    // if (this.$store.state.billFlag == true) {
    //   this.dataTwo.push({
    //     title: "模拟考试",
    //     img: "/static/workbench/task5.png",
    //     url: "/pages/exam/startexam",
    //   });
    // }
    if (this.$store.state.billFlag == true) {
      this.dataTwo.push({
        title: "模拟考试",
        img: "/static/workbench/task5.png",
        url: "/pages/exam/startexam",
      });
    }
  },
  onBackPress(e) {
    console.log("监听返回按钮事件2", e);

 pages/myself/myself.vue

@@ -51,10 +51,10 @@
                showTextmsg: false,
                textmsg: {
                    title: '提示',
                    content: '您已登录，确认登出？',
                    content: '您已登录，确认退出？',
                    contentTwo: '',
                    cancel: '取消',
                    confirm: '登出'
                    confirm: '退出'
                },
                inSide: [
                    // {
@@ -99,7 +99,7 @@
                        open: 'shezhi'
                    },
                    {
                        title: '登出',
                        title: '退出',
                        imgSrc: '../../static/myself/logout002.png',
                        open: 'outIn',
                    },
@@ -119,7 +119,7 @@
                return this.$store.state.puserName;
            },
            butTitle() {
                return this.$store.state.loging == true ? '登出' : '登录'
                return this.$store.state.loging == true ? '退出' : '登录'
            }
        },
        onLoad() {