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

src/views/login.vue

@@ -119,10 +119,10 @@ export default {
   data() {
     return {
       formData: {
-        username: "admin", //账号
-        password: "admin123", //密码
-        // username:'',
-        // password:'',
+        // username: "admin", //账号
+        // password: "admin123", //密码
+        username:'',
+        password:'',
         code: null, //图片验证码
         uuid: null, //识别uuid
         mobile: null, //手机号

src/views/sunVillage_info/list_finance_detail.vue

@@ -30,7 +30,7 @@
              </template>
            </van-field>
 
-           <van-field readonly input-align="right" :border="false" >
+           <van-field readonly v-model="form.updateTime === null ? form.createTime : form.updateTime" input-align="right" :border="false">
              <template #label>
                <img src="../../assets/images/sunVillage_info/add_tit_icon_03.png" width="18">
                <p style="margin-left: 5px;">公开图片</p>