Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

src/store/modules/user.js

@@ -74,6 +74,7 @@ const user = {
           commit('SET_TOKEN', res.token)
           getInfo(res.token).then(response => {
             const user = response.user
+            console.info(user.nickName);
             //   const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
             const avatar = "";
             if (response.roles && response.roles.length > 0) { // 验证返回的roles是否是一个非空数组
@@ -180,6 +181,7 @@ const user = {
         logout(state.token).then(() => {
           commit('SET_TOKEN', '')
           commit('SET_businessLevel', '')
+          commit('SET_NICKNAME', '')
           commit('SET_ROLES', [])
           commit('SET_PERMISSIONS', [])
           removeToken()

src/views/homesteadSurvey/index.vue

@@ -223,9 +223,12 @@
         userList().then(response => {
           this.taskExecutortions = response.data
         })
+        console.info(this.checked);
         if(this.checked){
           let userId = this.$store.getters.userId;
-          this.nickName = this.$store.getters.nickName;
+          setTimeout(() => {
+            this.nickName = this.$store.state.user.nickName;
+          },1000)
           this.$set(this.queryParams, "rwzxr", userId);
           this.getList();
         }else{

src/views/homesteadSurvey/nmfwAdd.vue

@@ -580,12 +580,12 @@ export default {
     this.permission = localStorage.getItem("executePermission");
     this.zjdzdxxItem = JSON.parse(localStorage.getItem("zjdzdxxItem"));
     if(this.form.id == null){
-      this.$set(this.form, 'hx', "01");
+      this.$set(this.form, 'hx', "03");
       this.$set(this.form, 'hxjg', "01");
       this.$set(this.form, 'fwlx', "01");
-      this.$set(this.form, 'fwxz', "6");
-      this.$set(this.form, 'fwjg', "01");
-      this.$set(this.form, 'sjly', "01");
+      this.$set(this.form, 'fwxz', "10");
+      this.$set(this.form, 'fwjg', "02");
+      this.$set(this.form, 'sjly', "04");
       this.$set(this.form, 'sffz', "0");
       this.$set(this.form, 'sfjf', "0");
       this.$set(this.form, 'sfcf', "0");
@@ -595,6 +595,7 @@ export default {
       this.$set(this.form, 'fwzt', "01");
       this.$set(this.form, 'fwyt', "10");
       this.$set(this.form, 'sfytrgy', "0");
+      this.$set(this.form, 'sjcs', 1);
     }else{
       if(this.form.sffz === "1"){
         this.showFzxx = true;

src/views/homesteadSurvey/zrzAdd.vue

@@ -167,6 +167,8 @@
           placeholder="请选择数据来源"
           remote-url="/open/zdzh/list/sjly"
           :on-remote-response="'data'"
+          :rules="[{ required: true }]"
+          required
         />
         <van-field
           input-align="right"

src/views/project/projectDetail.vue

@@ -33,7 +33,7 @@
           </van-row>
           <van-row>
             <van-col span="5">挂牌价</van-col>
-            <van-col span="19" class="price"><span>{{detail.price}}</span> 元/亩/年</van-col>
+            <van-col span="19" class="price"><span>{{detail.price}}</span> {{detail.unit}}</van-col>
           </van-row>
           <van-row>
             <van-col span="5">保证金</van-col>
@@ -71,7 +71,7 @@
             <van-col span="24"><span>竞价方向：</span>{{ detail.biddingDirect }}</van-col>
           </van-row>
           <van-row v-if="detail.ladderPrice">
-            <van-col span="24"><span>阶梯价（加价幅度）：</span>{{ detail.ladderPrice }}</van-col>
+            <van-col span="24"><span>阶梯价(增减幅度)：</span>{{ detail.ladderPrice }} 元</van-col>
           </van-row>
           <van-row>
             <van-col span="24"><span>延时周期：</span>{{timeConfig}}分钟</van-col>
@@ -95,28 +95,15 @@
           </van-row>
           <van-row>
             <van-col span="14"><span>经济类型</span>{{ detail.economicType }}</van-col>
-            <van-col span="10"><span>注册账号</span>{{ detail.registerNum }}</van-col>
+            <van-col span="10"><span>机构代码证号</span>{{ detail.areaNum }}</van-col>
           </van-row>
           <van-row>
-            <van-col span="24"><span>注册资本（万元）</span>{{ detail.registerMoney }}</van-col>
+            <van-col span="12"><span>法人/负责人</span>{{ detail.legalPerson }}</van-col>
+            <van-col span="12"><span>联系电话</span>{{ detail.phone }}</van-col>
           </van-row>
-          <van-row>
-            <van-col span="24"><span>机构代码证号</span>{{ detail.areaNum }}</van-col>
-          </van-row>
-          <van-row>
-            <van-col span="24"><span>法人/负责人</span>{{ detail.legalPerson }}</van-col>
-          </van-row>
-
           <van-row>
             <!-- <van-col span="24"><span>身份证号</span>{{ detail.idCardNum }}</van-col>          -->
-            <van-col span="24"><span>身份证号</span>******************</van-col>
-          </van-row>
-
-          <van-row>
-            <van-col span="24"><span>联系电话</span>{{ detail.phone }}</van-col>
-          </van-row>
-          <van-row>
-            <van-col span="24"><span>电子邮箱</span>{{ detail.email }}</van-col>
+            <van-col span="24"><span>身份证号</span>***************</van-col>
           </van-row>
           <van-row>
             <van-col span="14"><span>项目类型</span>{{ detail.projectNumber }}</van-col>
@@ -189,15 +176,13 @@
           <p v-if="detail.biddingType == '自由竞价' && biddingTimeType != 2">友情提示：自由竞价方式下，竞价过程中不显示竞价记录！</p>
           <table v-else width="100%" cellspacing="0">
             <tr>
-              <td>出价人账号</td>
-              <td>姓名</td>
-              <td>出价价格</td>
+              <td>出价人</td>
+              <td>出价</td>
               <td>状态</td>
-              <td>出价时间</td>
+              <td>时间</td>
             </tr>
             <tr v-for="(item,index) in biddinglistInformation" :key="index">
-              <td>{{ item.userAccount }}</td>
-              <td>{{ item.userName }}</td>
+              <td>{{ item.memberId }}</td>
               <td>{{ item.money}}</td>
               <template v-if="index==0">
                 <td style="color:#C21F3A">领先</td>