登录的时候没有区域地点或者联系电话，则需要补充数据

src/router/index.js

@@ -5,6 +5,7 @@ import Main from './../views/Main.vue'
 import Indes from './../views/indes.vue'//首页
 import Repair from './../views/repair.vue'//我的报修
 import My from './../views/my.vue'//设置
+import Supplementary from './../views/supplementary.vue'//补充资料
 import IncidentList from './../views/incidentList.vue'//事件列表
 import MyModify from './../views/myModify.vue'//个人信息修改
 import NoticeDetails from './../views/noticeDetails.vue'//公告详情
@@ -115,6 +116,11 @@ export default new Router({
       meta: { allowBack: false },
     },
     {
+      path: '/supplementary',
+      component: Supplementary,
+      meta: { allowBack: false },
+    },
+    {
       path: '*',
       hidden: true,
       redirect: { path: '/login' }

src/views/Login.vue

@@ -173,13 +173,21 @@ export default {
       this.$http.post("service/auth/reqlogin", postData).then(res => {
         that.loading = false;
         if (res.data && res.data.state == 200) {
-          var loginUserStr = JSON.stringify(res.data.data.requester);
-          localStorage.setItem("loginUser", loginUserStr);
+          localStorage.setItem(
+            "loginUser",
+            JSON.stringify(res.data.data.requester)
+          );
           localStorage.setItem(
             "loginConfig",
             JSON.stringify({ username: this.zhanghao, password: this.mima })
           );
-          this.loginNext();
+          // 判断是否有区域地点或联系电话，没有则需要补充
+          var requester = res.data.data.requester;
+          if (!requester.place || !requester.mphone) {
+            this.$router.push({ path: "/supplementary" });
+          } else {
+            this.loginNext();
+          }
         } else {
           that
             .$createDialog({
@@ -195,6 +203,7 @@ export default {
     }
   },
   created() {
+    localStorage.clear();
     this.isSSo = location.search.length > 0;
     if (this.isSSo) {
       this.zlogin();

src/views/my.vue

@@ -34,7 +34,7 @@
         </li>
         <li>
           <div>详细地址</div>
-          <div class="factionAdd" @click="toModify()">
+          <div class="factionAdd" @click="toModify('houseNumber')">
             <span>{{loginUser.houseNumber||"暂无"}}</span>
             <i class="iconfont icon-moren"></i>
           </div>
@@ -135,11 +135,11 @@ export default {
     };
   },
   methods: {
-    toModify(res) {
+    toModify(data) {
       this.$router.push({
         name: "MyModify",
         params: {
-          data: this.loginUser.houseNumber
+          data
         }
       });
     },

src/views/myModify.vue

@@ -1,116 +1,153 @@
 <template>
-    <div>
-        <div class="label">
-            详细地址
-        </div>
-        <cube-textarea v-model="value" placeholder="请输入你的详细地址"></cube-textarea>
-        <div class="chehui">
-            <div class="btn" @click="sub()">保&nbsp;存</div>
-        </div>
-        <promp-ting :conents="promptingConent" :status="promptingStatus"></promp-ting>
+  <div>
+    <div class="label">
+      {{ value.name }}
     </div>
+    <cube-textarea
+      v-model="value.value"
+      :placeholder="'请输入你的' + value.name"
+    ></cube-textarea>
+    <div class="chehui">
+      <div class="btn" @click="sub()">保&nbsp;存</div>
+    </div>
+    <promp-ting
+      :conents="promptingConent"
+      :status="promptingStatus"
+    ></promp-ting>
+  </div>
 </template>
 <script>
-    import PrompTing from './../views/prompting.vue'
-    export default {
-        data() {
-            return {
-                loginUser:JSON.parse(localStorage.getItem("loginUser")),
-                data:"",
-                value:"",
-                promptingConent:"",
-                promptingStatus:""
-            }
-        },
-        methods: {
-            getAddData(){
-                this.value=this.$route.params.data
-            },
-            sub(){
-                if(this.value==""){
-                    this.$createDialog({
-                        type: 'alert',
-                        title: '保存失败',
-                        content: '详细地址不能为空',
-                        icon: 'cubeic-wrong'
-                    }).show()
-                }else{
-                    var that=this;
-                    this.$http.post('service/user/updHouseNum',{
-                        "reqId":that.loginUser.id,
-                        "houseNum":that.value
-                    }).then(function(res){
-                        if(res.status==200){
-                            that.promptingConent="恭喜您,修改地址成功!";
-                            that.promptingStatus=true;
-                            $("#fade").fadeIn();
-                            setTimeout(function(){
-                                $("#fade").fadeOut();
-                            },2000);
-                            that.loginUser.houseNumber=that.value;
-                            var loginUserStr=JSON.stringify(that.loginUser);
-                            localStorage.setItem('loginUser',loginUserStr);
-                            that.dialog = that.$createDialog({
-                                type: 'alert',
-                                title: '修改成功',
-                                content: '点击确定返回我的信息',
-                                icon: 'cubeic-right',
-                                onConfirm: (e, promptValue) => {
-                                    that.$router.push({path:"/main/my"})
-                                }
-                            }).show()
-                        }else{
-                            that.promptingConent="修改失败,请稍后再试!";
-                            that.promptingStatus=false;
-                            $("#fade").fadeIn();
-                            setTimeout(function(){
-                                $("#fade").fadeOut();
-                            },2000);
-                        }
-                    })
+import PrompTing from "./../views/prompting.vue";
+export default {
+  data() {
+    return {
+      loginUser: JSON.parse(localStorage.getItem("loginUser")),
+      data: "",
+      value: { type: "", value: "" },
+      promptingConent: "",
+      promptingStatus: ""
+    };
+  },
+  methods: {
+    getAddData() {
+      switch (this.$route.params.data) {
+        case "houseNumber":
+          this.value = {
+            type: "houseNumber",
+            name: "详细地址",
+            value: this.loginUser.houseNumber
+          };
+          break;
+        case "mphone":
+          this.value = {
+            type: "mphone",
+            name: "联系电话",
+            value: this.loginUser.mphone
+          };
+          break;
+      }
+    },
+    sub() {
+      if (!this.value.value && this.value.type == "mphone") {
+        this.$createDialog({
+          type: "alert",
+          title: "保存失败",
+          content: this.value.name + "不能为空",
+          icon: "cubeic-wrong"
+        }).show();
+      } else {
+        var that = this;
+        let url = "",
+          postData = {};
+        switch (this.value.type) {
+          case "houseNumber":
+            url = "service/user/updHouseNum";
+            postData = {
+              reqId: that.loginUser.id,
+              houseNum: that.value.value
+            };
+            break;
+          case "mphone":
+            url = "service/user/updPhone";
+            postData = {
+              reqId: that.loginUser.id,
+              mphone: that.value.value
+            };
+            break;
+        }
+        this.$http.post(url, postData).then(function(res) {
+          if (res.status == 200) {
+            that.promptingConent = "恭喜您,修改" + that.value.name + "成功!";
+            that.promptingStatus = true;
+            $("#fade").fadeIn();
+            setTimeout(function() {
+              $("#fade").fadeOut();
+            }, 2000);
+            that.loginUser[that.value.type] = that.value.value;
+            var loginUserStr = JSON.stringify(that.loginUser);
+            localStorage.setItem("loginUser", loginUserStr);
+            that.dialog = that
+              .$createDialog({
+                type: "alert",
+                title: "修改成功",
+                content: "点击确定返回我的信息",
+                icon: "cubeic-right",
+                onConfirm: (e, promptValue) => {
+                  // that.$router.push({ path: "/main/my" });
+                  that.$router.go(-1);
                 }
-            }
-        },
-        created(){
-            this.getAddData()
-        },
-        mounted() {
-            
-        },
-        components: {
-            PrompTing
-        },
+              })
+              .show();
+          } else {
+            that.promptingConent = "修改失败,请稍后再试!";
+            that.promptingStatus = false;
+            $("#fade").fadeIn();
+            setTimeout(function() {
+              $("#fade").fadeOut();
+            }, 2000);
+          }
+        });
+      }
     }
+  },
+  created() {
+    this.getAddData();
+  },
+  mounted() {},
+  components: {
+    PrompTing
+  }
+};
 </script>
 <style scoped>
- .label{
-    background-color: rgb(238, 238, 238);
-    height: .6rem;
-    line-height: .6rem;
-    padding-left: .24rem;
-    font-size: .24rem;
-    color: #666666
-}   
-.chehui{
-    height: 1.3rem;
-    width: 100%;
-    border-top: .01rem rgb(223, 222, 222) solid;
-    background-color: rgb(248,248,248);
-    position: fixed;
-    left: 0;
-    bottom: 0;
-    display: flex;
-    align-items:center;
-    justify-content:center
+.label {
+  background-color: rgb(238, 238, 238);
+  height: 0.6rem;
+  line-height: 0.6rem;
+  padding-left: 0.24rem;
+  font-size: 0.24rem;
+  color: #666666;
+}
+.chehui {
+  height: 1.3rem;
+  width: 100%;
+  border-top: 0.01rem rgb(223, 222, 222) solid;
+  background-color: rgb(248, 248, 248);
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
-.chehui .btn{
-    width: 90%;
-    height: 1rem;
-    background-color: #005395;
-    border-radius: 10px;
-    line-height: 1rem;
-    color: white;
-    font-size: .36rem;
-    text-align: center
+.chehui .btn {
+  width: 90%;
+  height: 1rem;
+  background-color: #005395;
+  border-radius: 10px;
+  line-height: 1rem;
+  color: white;
+  font-size: 0.36rem;
+  text-align: center;
 }
-</style>
+</style>

src/views/supplementary.vue

@@ -0,0 +1,439 @@
+<template>
+  <div class="bgColor">
+    <div class="head">
+      <div class="img"></div>
+      <div class="name">{{ loginUser.name }}</div>
+    </div>
+    <div class="myMessage">
+      <div class="label">个人信息</div>
+      <ul>
+        <li>
+          <div>姓名</div>
+          <div>{{ loginUser.name || "暂无" }}</div>
+        </li>
+        <li>
+          <div>工号</div>
+          <div>{{ loginUser.account || "暂无" }}</div>
+        </li>
+        <li>
+          <div>联系电话</div>
+          <div class="factionAdd" @click="toModify('mphone')">
+            <span>{{ loginUser.mphone || "暂无" }}</span>
+            <i class="iconfont icon-moren"></i>
+          </div>
+        </li>
+        <li class="myArea">
+          <div>区域地点</div>
+          <div>
+            <cube-button @click="showCascadePicker">
+              {{ areaData || "暂无" }}
+              <i class="iconfont icon-moren"></i>
+            </cube-button>
+          </div>
+        </li>
+        <li>
+          <div>详细地址</div>
+          <div class="factionAdd" @click="toModify('houseNumber')">
+            <span>{{ loginUser.houseNumber || "暂无" }}</span>
+            <i class="iconfont icon-moren"></i>
+          </div>
+        </li>
+      </ul>
+    </div>
+    <div class="goToSystem" @click="goToSystem">进入系统</div>
+    <promp-ting
+      :conents="promptingConent"
+      :status="promptingStatus"
+    ></promp-ting>
+  </div>
+</template>
+<script>
+import "./../../static/css/iconfont.js";
+import PrompTing from "./../views/prompting.vue";
+export default {
+  data() {
+    return {
+      repairMain: null,
+      loginUser: JSON.parse(localStorage.getItem("loginUser")),
+      incidentStateData: "",
+      treeData: [],
+      areaData: "",
+      promptingConent: "",
+      promptingStatus: ""
+    };
+  },
+  methods: {
+    loginNext() {
+      // seimin
+      // 获取报修主体
+      this.$http
+        .post("service/sysinfo/data/fetchDataList/systemConfiguration", {
+          idx: 0,
+          sum: 1000,
+          systemConfiguration: { keyconfig: "repairMain" }
+        })
+        .then(result => {
+          if (result.data.status == 200) {
+            var repairMain = result.data.list[0];
+            window.localStorage.setItem(
+              "repairMain",
+              JSON.stringify(repairMain)
+            );
+            // 获取是否自动建单
+            this.$http
+              .post("service/sysinfo/data/fetchDataList/systemConfiguration", {
+                idx: 0,
+                sum: 1000,
+                systemConfiguration: { keyconfig: "ifCreate" }
+              })
+              .then(result => {
+                if (result.data.status == 200) {
+                  var ifCreate = result.data.list[0];
+                  window.localStorage.setItem(
+                    "ifCreate",
+                    JSON.stringify(ifCreate)
+                  );
+                  this.$router.push({ path: "/main" });
+                }
+              });
+          }
+        });
+      // seimin
+    },
+    goToSystem() {
+      if (!this.loginUser.mphone) {
+        this.$createDialog({
+          type: "alert",
+          content: "联系电话不能为空",
+          icon: "cubeic-wrong"
+        }).show();
+      } else if (!this.areaData) {
+        this.$createDialog({
+          type: "alert",
+          content: "区域地点不能为空",
+          icon: "cubeic-wrong"
+        }).show();
+      } else {
+        this.loginNext();
+      }
+    },
+    toModify(data) {
+      this.$router.push({
+        name: "MyModify",
+        params: {
+          data
+        }
+      });
+    },
+    getUserAreaData() {
+      if (this.loginUser.place) {
+        this.areaData =
+          this.loginUser.place.area.area + " " + this.loginUser.place.place;
+      }
+    },
+    toIncidentList(res) {
+      this.$router.push({
+        name: "IncidentList",
+        params: {
+          state: res
+        }
+      });
+    },
+    getIncidentData() {
+      var that = this;
+      this.$http
+        .post("service/apply/bpm/fetchServiceTasks", {
+          assignee: that.loginUser.id,
+          idx: 0,
+          sum: 9999
+        })
+        .then(function(res) {
+          that.incidentStateData = res.data;
+        });
+    },
+    getAreaData() {
+      var that = this;
+      this.$http
+        .post("service/user/data/fetchDataList/area", {
+          idx: 0,
+          sum: 1000,
+          area: {
+            wechatArea: true
+          }
+        })
+        .then(function(res) {
+          var data = res.data.list;
+          for (var i = 0; i < data.length; i++) {
+            that.treeData.push({
+              text: data[i].area,
+              value: data[i].id,
+              children: []
+            });
+          }
+        });
+    },
+    getPlaceData() {
+      var that = this;
+      this.$http
+        .post("service/user/data/fetchDataList/place", {
+          idx: 0,
+          sum: 1000,
+          area: {
+            wechatAreaId: ""
+          }
+        })
+        .then(function(res) {
+          var data = res.data.list;
+          for (var i = 0; i < data.length; i++) {
+            for (var j = 0; j < that.treeData.length; j++) {
+              if (data[i].area.id == that.treeData[j].value) {
+                that.treeData[j].children.push({
+                  text: data[i].place,
+                  value: data[i].id
+                });
+              }
+            }
+          }
+          that.cascadePicker = that.$createCascadePicker({
+            title: "请选择区域地点",
+            data: that.treeData,
+            selectedIndex: [0, 0],
+            onSelect: that.selectHandle,
+            onCancel: that.cancelHandle
+          });
+        });
+    },
+    showCascadePicker() {
+      this.cascadePicker.show();
+    },
+    selectHandle(selectedVal, selectedIndex, selectedText) {
+      var that = this;
+      this.$http
+        .get(
+          "service/user/updPlace/" + this.loginUser.id + "/" + selectedVal[1],
+          {}
+        )
+        .then(function(res) {
+          if (res.status == 200) {
+            that.promptingConent = "恭喜您,修改区域地点成功!";
+            that.promptingStatus = true;
+            $("#fade").fadeIn();
+            setTimeout(function() {
+              $("#fade").fadeOut();
+            }, 2000);
+            if (!that.loginUser.place) {
+              that.loginUser.place = {
+                area: {}
+              };
+            }
+            that.loginUser.place.id = selectedVal[1];
+            that.loginUser.place.area.id = selectedVal[0];
+            that.loginUser.place.place = selectedText[1];
+            that.loginUser.place.area.area = selectedText[0];
+            var loginUserStr = JSON.stringify(that.loginUser);
+            localStorage.setItem("loginUser", loginUserStr);
+            that.areaData = selectedText[0] + " " + selectedText[1];
+          } else {
+            that.promptingConent = "对不起,修改失败,请稍后再试!";
+            that.promptingStatus = false;
+            $("#fade").fadeIn();
+            setTimeout(function() {
+              $("#fade").fadeOut();
+            }, 2000);
+          }
+        });
+    },
+    cancelHandle() {}
+  },
+  created() {
+    this.getUserAreaData();
+    this.getAreaData();
+    this.getPlaceData();
+    this.getIncidentData();
+    // 获取报修主体
+    this.repairMain = JSON.parse(localStorage.getItem("repairMain"));
+  },
+  mounted() {
+    // this.cascadePicker = this.$createCascadePicker({
+    //     title: '请选择区域地点',
+    //     data: this.treeData,
+    //     selectedIndex: [0,0],
+    //     onSelect: this.selectHandle,
+    //     onCancel: this.cancelHandle
+    // })
+  },
+  components: {
+    PrompTing
+  }
+};
+</script>
+<style scoped>
+.goToSystem {
+  position: fixed;
+  left: 50%;
+  bottom: 0;
+  transform: translateX(-50%);
+  width: 90%;
+  height: 1rem;
+  background-color: #005395;
+  border-radius: 10px;
+  line-height: 1rem;
+  color: white;
+  font-size: 0.36rem;
+  text-align: center;
+}
+.bgColor {
+  background-color: white;
+}
+.icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
+.label {
+  background-color: rgb(238, 238, 238);
+  height: 0.6rem;
+  line-height: 0.6rem;
+  padding-left: 0.2rem;
+  font-size: 0.24rem;
+  color: #666666;
+  border-top: 0.01rem rgb(223, 222, 222) solid;
+  border-bottom: 0.01rem rgb(223, 222, 222) solid;
+}
+/* 头像 */
+
+.head {
+  height: 2.4rem;
+  background: linear-gradient(#005395, #226ca8);
+  padding-top: 0.3rem;
+}
+
+.head .img {
+  width: 1.36rem;
+  height: 1.36rem;
+  border-radius: 50%;
+  margin: 0 auto;
+  overflow: hidden;
+  background: url(./../../static/images/avatar-1-big.jpg);
+  background-size: contain;
+}
+
+.head .name {
+  font-size: 0.32rem;
+  text-align: center;
+  margin-top: 0.2rem;
+  color: #ffffff;
+}
+
+/* 个人信息 */
+
+/* .myMessage { */
+/* background-color: rgb(242, 242, 242); */
+/* margin-top: .2rem */
+/* } */
+
+.myMessage li {
+  border-bottom: 0.01rem rgb(223, 222, 222) solid;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  /* padding: .2rem .28rem */
+  /* height: .88rem; */
+  /* line-height: .88rem; */
+  line-height: 0.4rem;
+  padding: 0.24rem 0.24rem;
+}
+
+.myMessage li div:nth-child(1) {
+  width: 35%;
+  font-size: 0.32rem;
+}
+
+.myMessage li div:nth-child(2) {
+  width: 55%;
+  display: flex;
+  justify-content: flex-end;
+  font-size: 0.32rem;
+  /* line-height: .3rem */
+}
+.factionAdd {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.factionAdd span {
+  display: inline-block;
+  width: 90%;
+  text-align: right;
+}
+.factionAdd i {
+  display: inline-block;
+  font-size: 0.34rem;
+  width: 12%;
+}
+/* 我的报修 */
+
+/* .myRapir {
+    margin-top: .2rem
+} */
+
+.myRapir .tit {
+  /* background-color: rgb(242, 242, 242); */
+  height: 0.88rem;
+  line-height: 0.88rem;
+  display: flex;
+  padding: 0 0.24rem;
+  font-size: 0.32rem;
+  justify-content: space-between;
+  border-bottom: 0.01rem rgb(223, 222, 222) solid;
+}
+
+.rapirMessage {
+  display: flex;
+  height: 1.4rem;
+  border-bottom: 0.01rem rgb(223, 222, 222) solid;
+}
+.rapirMessage .status {
+  width: 16.5%;
+  border-left: 0.01rem rgb(223, 222, 222) solid;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+}
+.rapirMessage .status div:nth-child(1) {
+  width: 100%;
+  text-align: center;
+}
+.rapirMessage .status div:nth-child(1) svg {
+  width: 0.48rem;
+  height: 0.48rem;
+}
+.rapirMessage .status div:nth-child(2) {
+  margin-top: 0.2rem;
+  display: flex;
+  align-items: center;
+}
+.rapirMessage .status div:nth-child(2) span:nth-child(1) {
+  font-size: 0.24rem;
+  color: #333333;
+}
+.rapirMessage .status div:nth-child(2) span:nth-child(2) {
+  display: inline-block;
+  margin-left: 0.08rem;
+  font-size: 0.32rem;
+}
+</style>
+<style>
+.myArea .cube-btn {
+  padding: 0 !important;
+  background-color: white !important;
+  color: #333333 !important;
+  text-align: right !important;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+</style>