(hyx_2024-10-23_tongbu)

用户名，身份证号中台校验
兼容微信小程序
2024-10-23 14:30:25 +08:00 · 2024-09-30 09:40:54 +08:00 · 2024-09-29 14:57:55 +08:00 · 2024-08-29 09:53:08 +08:00 · 2024-08-27 15:04:44 +08:00 · 2024-08-15 16:56:46 +08:00
35 changed files with 4571 additions and 4048 deletions
--- a/api/index.js
+++ b/api/index.js
@ -1,8 +1,8 @@
 import {post, upload, uploads} from "../utils/request";

 export const submitLogin = (params) => post("/app/admin/check", params) // 登录
-export const getIDCardDeduplication = (params) => post("/app/user/hasCardIdForApp", params) // 身份证去重
-export const getUserDeduplication = (params) => post("/app/user/hasUserNameForApp", params) // 用户名去重
+export const getIDCardDeduplication = (params) => post("/app/user/goCheck", params) // 身份证去重
+export const getUserDeduplication = (params) => post("/app/user/goCheck", params) // 用户名去重
 export const getPhoneNumberDeduplication = (params) => post("/app/user/hasPhoneForApp", params) // 手机号去重
 export const setRegister = (params) => post("/app/admin/register", params) // 注册
 export const setForgotPassword = (params) => post("/app/admin/forgetPassword", params) // 忘记密码
@ -27,8 +27,8 @@ export const getUserInfo = (params) => post("/app/user/getDetailByUserIdAndCorpI
 export const setUserInfo = (params) => post("/app/user/edit", params) //修改用户信息
 export const getCertificateInformationList = (params) => post("/app/specialUser/list", params) //证书信息列表
 export const getCertificateInformationView = (params) => post("/app/specialUser/goEdit", params) //证书信息查看
-export const setCertificateInformationAdd = (params) => upload("/app/specialUser/add", params) //证书信息添加
-export const setCertificateInformationEdit = (params) => upload("/app/specialUser/edit", params) //证书信息修改
+export const setCertificateInformationAdd = (params) => uploads("/app/specialUser/add", params) //证书信息添加
+export const setCertificateInformationEdit = (params) => uploads("/app/specialUser/edit", params) //证书信息修改
 export const setCertificateInformationEditPost = (params) => post("/app/specialUser/edit", params) //证书信息修改
 export const getDeptTree = (params) => post("/api/department/listzTree", params) //用户信息
 export const getEMPLOYMENTAPPLYMANAGEMENTID = (params) => post("/app/user/getEMPLOYMENTAPPLYMANAGEMENTID",params)//获取EMPLOYMENTAPPLYMANAGEMENTID
--- a/components/empty/empty.vue
+++ b/components/empty/empty.vue
@ -1,6 +1,6 @@
 <template>
  <view class="empty">
-    <u--image :showLoading="true" src="/static/svg/empty.svg" width="750upx" height="500upx"></u--image>
+    <u--image :showLoading="true" src="/static/svg/empty.svg" width="750rpx" height="500rpx"></u--image>
    <view class="empty-text">{{ message }}</view>
  </view>
 </template>
@ -24,10 +24,10 @@ export default {
  align-items: center;
  position: relative;
  .empty-text{
-    font-size: 30upx;
+    font-size: 30rpx;
    color: $uni-text-color-placeholder;
    position: absolute;
-    top: 400upx;
+    top: 400rpx;
  }
 }
 </style>
--- a/components/fab_button/index.vue
+++ b/components/fab_button/index.vue
@ -0,0 +1,39 @@
+<template>
+  <view class="fab_button" @click="$emit('click')">
+    <block v-if="type === 'plus'">
+      <u-icon name="plus" color="#fff" size="28rpx"></u-icon>
+    </block>
+    <block v-if="type === 'search'">
+      <u-icon name="search" color="#fff" size="28rpx"></u-icon>
+    </block>
+    <block v-if="type === 'edit'">
+      <u-icon name="edit-pen" color="#fff" size="28rpx"></u-icon>
+    </block>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    type: {
+      type: String,
+      default: "plus",
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.fab_button {
+  position: fixed;
+  bottom: 100rpx;
+  right: 30rpx;
+  background-color: #3377ff;
+  border-radius: 50%;
+  width: 80rpx;
+  height: 80rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+</style>
--- a/components/sign/sign.vue
+++ b/components/sign/sign.vue
@ -53,7 +53,7 @@ export default {

 <style lang="scss" scoped>
 .handCenter {
-  border: 4upx dashed #e9e9e9;
+  border: 4rpx dashed #e9e9e9;
  height: 80vh;
  overflow: hidden;
  box-sizing: border-box;
--- a/manifest.json
+++ b/manifest.json
@ -105,11 +105,18 @@
    "quickapp" : {},
    /* 小程序特有相关 */
    "mp-weixin" : {
-        "appid" : "",
+        "appid" : "wx06c53a01ae0afd2c",
        "setting" : {
-            "urlCheck" : false
+            "urlCheck" : false,
+            "minified" : true,
+            "es6" : true
        },
-        "usingComponents" : true
+        "usingComponents" : true,
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "展示当前位置信息"
+            }
+        }
    },
    "mp-alipay" : {
        "usingComponents" : true
--- a/pages.json
+++ b/pages.json
@ -72,17 +72,7 @@
 		{
 			"path": "pages/certificate_information/index",
 			"style": {
-				"navigationBarTitleText": "证书信息",
-				"app-plus": {
-					"titleNView": {
-						"buttons": [{
-							"text": "新建",
-							"fontSize": "15",
-							"float": "right",
-							"width": "40px"
-						}]
-					}
-				}
+				"navigationBarTitleText": "证书信息"
 			}
 		},
 		{
@ -119,17 +109,7 @@
 		{
 			"path": "pages/mine/information/index",
 			"style": {
-				"navigationBarTitleText": "我的信息",
-				"app-plus": {
-					"titleNView": {
-						"buttons": [{
-							"text": "修改",
-							"fontSize": "15",
-							"float": "right",
-							"width": "40px"
-						}]
-					}
-				}
+				"navigationBarTitleText": "我的信息"
 			}
 		},
 		{
--- a/pages/certificate_information/add.vue
+++ b/pages/certificate_information/add.vue
@ -2,7 +2,7 @@
  <view class="content">
    <view class="card">
      <u--form labelPosition="left" :model="form" :rules="rules" ref="form" labelWidth="100px">
-        <u-form-item label="证书图片" prop="fileList" borderBottom required>
+        <u-form-item label="证书正面图片" prop="fileList" borderBottom required>
          <u-upload
              :fileList="form.fileList"
              @afterRead="fnAfterRead"
@ -11,6 +11,15 @@
              previewFullImage
          ></u-upload>
        </u-form-item>
+        <u-form-item label="证书反面图片" prop="fileListBack" borderBottom required>
+          <u-upload
+              :fileList="form.fileListBack"
+              @afterRead="fnAfterRead1"
+              @delete="fnDeletePic1"
+              :maxCount="1"
+              previewFullImage
+          ></u-upload>
+        </u-form-item>
        <u-form-item label="姓名" prop="NAME" borderBottom required>
          <u--input v-model="form.NAME" border="none" disabled disabledColor="#ffffff"></u--input>
        </u-form-item>
@ -21,7 +30,8 @@
          <u--input v-model="form.PHONE" border="none" disabled disabledColor="#ffffff"></u--input>
        </u-form-item>
        <u-form-item label="身份证号码" prop="CARD_ID" borderBottom required>
-          <u--input v-model="form.CARD_ID" border="none" @blur="fnCardIdDisassembly" disabled disabledColor="#ffffff"></u--input>
+          <u--input v-model="form.CARD_ID" border="none" @blur="fnCardIdDisassembly" disabled
+                    disabledColor="#ffffff"></u--input>
        </u-form-item>
        <u-form-item label="证书类型" prop="CER_TYPE_NAME" borderBottom required @click="fnShowCertificateType">
          <u--input v-model="form.CER_TYPE_NAME" border="none" disabled disabledColor="#ffffff"></u--input>
@ -39,10 +49,12 @@
        <u-form-item label="工种" prop="JOBS_TYPE" borderBottom required>
          <u--input v-model="form.JOBS_TYPE" border="none" disabledColor="#ffffff"></u--input>
        </u-form-item>
-        <u-form-item v-if="form.CER_TYPE_NAME === '特种作业'" label="作业类别" prop="specialName" borderBottom required @click="fnShowCertificateTypeSpe">
+        <u-form-item v-if="form.CER_TYPE_NAME === '特种作业'" label="作业类别" prop="specialName" borderBottom required
+                     @click="fnShowCertificateTypeSpe">
          <u--input v-model="form.specialName" border="none" disabled disabledColor="#ffffff"></u--input>
        </u-form-item>
-        <u-form-item v-if="form.CER_TYPE_NAME === '特种作业'" label="操作项目" prop="operationName" borderBottom required @click="fnShowCertificateTypeOpe">
+        <u-form-item v-if="form.CER_TYPE_NAME === '特种作业'" label="操作项目" prop="operationName" borderBottom
+                     required @click="fnShowCertificateTypeOpe">
          <u--input v-model="form.operationName" border="none" disabled disabledColor="#ffffff"></u--input>
        </u-form-item>
        <u-form-item label="有效期开始" prop="VALIDITY_TIME_START" borderBottom required
@ -71,7 +83,9 @@
                         @confirm="fnTermOfValidityEndConfirm" @cancel="fnShowTermOfValidityEnd"></u-datetime-picker>
      <u-datetime-picker :show="showReviewTime" v-model="reviewTimeValue" mode="date"
                         @confirm="fnReviewTimeConfirm" @cancel="fnShowReviewTime"></u-datetime-picker>
-      <u-button type="primary" text="保 存" class="mt-10" @click="$u.debounce(fnSubmit, 1000,true)"></u-button>
+      <view class="mt-10">
+        <u-button type="primary" text="保 存" @click="$u.debounce(fnSubmit, 1000,true)"></u-button>
+      </view>
    </view>
  </view>
 </template>
@ -105,16 +119,17 @@ export default {
      reviewTimeValue: new Date().toString(),
      form: {
        fileList: [],
+        fileListBack: [],
        NAME: '',
        SEX_NAME: '',
        PHONE: '',
        CARD_ID: '',
        CER_TYPE: '',
        CER_TYPE_NAME: '',
-        CERTIFICATE:'',
-        JOBS_TYPE:'',
-        SPECIAL_TYPE:'',
-        OPERATION_TYPE:'',
+        CERTIFICATE: '',
+        JOBS_TYPE: '',
+        SPECIAL_TYPE: '',
+        OPERATION_TYPE: '',
        SPECIAL_NUMBER: '',
        ISSUING_AUTHORITY: '',
        VALIDITY_TIME_START: '',
@ -122,95 +137,63 @@ export default {
        REVIEW_TIME: ''
      },
      rules: {
-        // fileList: {
-        //   type: 'array',
-        //   required: true,
-        //   message: '请上传证书图片',
-        //   trigger: ['change']
-        // },
-        // NAME: {
-        //   required: true,
-        //   message: '请填写姓名',
-        //   trigger: ['blur']
-        // },
-        // SEX_NAME: {
-        //   required: true,
-        //   message: '请选择性别',
-        //   trigger: ['change']
-        // },
-        // PHONE: [
-        //   {
-        //     required: true,
-        //     message: '请填写手机号',
-        //     trigger: ['blur']
-        //   },
-        //   {
-        //     validator: (rule, value, callback) => {
-        //       return uni.$u.test.mobile(value);
-        //     },
-        //     message: '手机号格式不正确',
-        //     trigger: ['blur'],
-        //   },
-        // ],
-        // CARD_ID: [
-        //   {
-        //     required: true,
-        //     message: '请填写身份证号',
-        //     trigger: ['blur']
-        //   },
-        //   {
-        //     validator: (rule, value, callback) => {
-        //       return uni.$u.test.idCard(value);
-        //     },
-        //     message: '身份证号格式不正确',
-        //     trigger: ['blur'],
-        //   },
-        // ],
-        // CER_TYPE_NAME: {
-        //   required: true,
-        //   message: '请选择证书类型',
-        //   trigger: ['change']
-        // },
-        // CERTIFICATE: {
-        //   required: true,
-        //   message: '请填写证书名称',
-        //   trigger: ['change']
-        // },
-        // SPECIAL_NUMBER: {
-        //   required: true,
-        //   message: '请填写证书编号',
-        //   trigger: ['blur']
-        // },
-        // JOBS_TYPE: {
-        //   required: true,
-        //   message: '请填写工种',
-        //   trigger: ['change']
-        // },
-        // specialName: {
-        //   required: true,
-        //   message: '请选择作业类别',
-        //   trigger: ['change']
-        // },
-        // operationName: {
-        //   required: true,
-        //   message: '请选择操作项目',
-        //   trigger: ['change']
-        // },
-        // ISSUING_AUTHORITY: {
-        //   required: true,
-        //   message: '请填写发证机关',
-        //   trigger: ['blur']
-        // },
-        // VALIDITY_TIME_START: {
-        //   required: true,
-        //   message: '请选择有效期开始时间',
-        //   trigger: ['change']
-        // },
-        // VALIDITY_TIME_END: {
-        //   required: true,
-        //   message: '请选择有效期结束时间',
-        //   trigger: ['change']
-        // },
+        fileList: {
+          type: 'array',
+          required: true,
+          message: '请上传证书图片',
+          trigger: ['change']
+        },
+        fileListBack: {
+          type: 'array',
+          required: true,
+          message: '请上传证书图片',
+          trigger: ['change']
+        },
+        CER_TYPE_NAME: {
+          required: true,
+          message: '请选择证书类型',
+          trigger: ['change']
+        },
+        CERTIFICATE: {
+          required: true,
+          message: '请填写证书名称',
+          trigger: ['change']
+        },
+        SPECIAL_NUMBER: {
+          required: true,
+          message: '请填写证书编号',
+          trigger: ['blur']
+        },
+        JOBS_TYPE: {
+          required: true,
+          message: '请填写工种',
+          trigger: ['change']
+        },
+        specialName: {
+          required: true,
+          message: '请选择作业类别',
+          trigger: ['change']
+        },
+        operationName: {
+          required: true,
+          message: '请选择操作项目',
+          trigger: ['change']
+        },
+        ISSUING_AUTHORITY: {
+          required: true,
+          message: '请填写发证机关',
+          trigger: ['blur']
+        },
+        VALIDITY_TIME_START: {
+          required: true,
+          message: '请选择有效期开始时间',
+          trigger: ['change']
+        },
+        VALIDITY_TIME_END: {
+          required: true,
+          message: '请选择有效期结束时间',
+          trigger: ['change']
+        },
        REVIEW_TIME: {
          required: true,
          message: '请选择复审时间',
@ -243,15 +226,22 @@ export default {
  },
  methods: {
    async fnGetData() {
-      if(this.SPECIAL_USER_ID){
+      if (this.SPECIAL_USER_ID) {
        let resData = await getCertificateInformationView({
-          SPECIAL_USER_ID:this.SPECIAL_USER_ID
+          SPECIAL_USER_ID: this.SPECIAL_USER_ID
        })
-        this.form = {...this.form, ...resData.pd,CER_TYPE_NAME:resData.pd.typeName}
-        this.$set(this.form,'fileList',[{url:this.$filePath + resData.pd.FILEPATH,FILEPATH:this.$filePath + resData.pd.FILEPATH}])
-		let resDatares = await getDataDictionary({DICTIONARIES_ID:this.form.SPECIAL_TYPE})
-		this.certificateTypeColumnsOpe = [resDatares.list]
-	  }else {
+        this.form = {...this.form, ...resData.pd, CER_TYPE_NAME: resData.pd.typeName}
+        this.$set(this.form, 'fileList', [{
+          url: this.$filePath + resData.pd.FILEPATH,
+          FILEPATH: this.$filePath + resData.pd.FILEPATH
+        }])
+        this.$set(this.form, 'fileListBack', [{
+          url: this.$filePath + resData.pd.FILEPATH_BACK,
+          FILEPATH: this.$filePath + resData.pd.FILEPATH_BACK
+        }])
+        let resDatares = await getDataDictionary({DICTIONARIES_ID: this.form.SPECIAL_TYPE})
+        this.certificateTypeColumnsOpe = [resDatares.list]
+      } else {
        let resData = await getUserInfo({
          CORPINFO_ID: this.userInfo.CORPINFO_ID,
        })
@ -259,26 +249,26 @@ export default {
        this.fnCardIdDisassembly(this.form.CARD_ID)
        this.fnCardIdDisassembly(this.form.CARD_ID)
      }
-      if (this.form.SEX_NAME == '0') {
+      if (this.form.SEX_NAME === '0') {
        this.form.SEX_NAME = '男'
-      } else if (this.form.SEX_NAME == '1') {
+      } else if (this.form.SEX_NAME === '1') {
        this.form.SEX_NAME = '女'
      }
    },
-    async fnGetDataDictionary(){
-      let resData = await getDataDictionary({DICTIONARIES_ID:'6f87965751b84311b066484ac93c8077'})
+    async fnGetDataDictionary() {
+      let resData = await getDataDictionary({DICTIONARIES_ID: '6f87965751b84311b066484ac93c8077'})
      this.certificateTypeColumns = [resData.list]
    },
-    async fnGetDataDictionaryJobs(){
-      let resData = await getDataDictionary({DICTIONARIES_ID:'55484e491a5e442d839c4595380713ec'})
+    async fnGetDataDictionaryJobs() {
+      let resData = await getDataDictionary({DICTIONARIES_ID: '55484e491a5e442d839c4595380713ec'})
      this.certificateTypeColumnsJobs = [resData.list]
    },
-    async fnGetDataDictionarySpe(){
-      let resData = await getDataDictionary({DICTIONARIES_ID:'f4c3890d06d54904b32986cb6428ed4f'})
+    async fnGetDataDictionarySpe() {
+      let resData = await getDataDictionary({DICTIONARIES_ID: 'f4c3890d06d54904b32986cb6428ed4f'})
      this.certificateTypeColumnsSpe = [resData.list]
    },
-    async fnGetDataDictionaryOpe(){
-      let resData = await getDataDictionary({DICTIONARIES_ID:this.form.SPECIAL_TYPE})
+    async fnGetDataDictionaryOpe() {
+      let resData = await getDataDictionary({DICTIONARIES_ID: this.form.SPECIAL_TYPE})
      this.certificateTypeColumnsOpe = [resData.list]
    },
    fnCardIdDisassembly(event) {
@ -311,13 +301,13 @@ export default {
      this.form.specialName = e.value[0].NAME
      this.form.SPECIAL_TYPE = e.value[0].DICTIONARIES_ID
      this.fnShowCertificateTypeSpe()
-	  this.fnGetDataDictionaryOpe();
-	  this.form.operationName  ='';
-	  this.form.OPERATION_TYPE= '';
+      this.fnGetDataDictionaryOpe();
+      this.form.operationName = '';
+      this.form.OPERATION_TYPE = '';
    },
    fnCertificateTypeConfirmOpe(e) {
-      this.form.operationName  = e.value[0].NAME
-      this.form.OPERATION_TYPE= e.value[0].DICTIONARIES_ID
+      this.form.operationName = e.value[0].NAME
+      this.form.OPERATION_TYPE = e.value[0].DICTIONARIES_ID
      this.fnShowCertificateTypeOpe()
    },
    fnShowTermOfValidityStart() {
@ -345,55 +335,102 @@ export default {
      this.form.REVIEW_TIME = uni.$u.timeFormat(event.value, 'yyyy-mm-dd')
    },
    fnAfterRead(event) {
-		var houzhui = event.file.url.replace(/.+\./,"");
-		console.log(houzhui);
-		if(houzhui=="jpg"||houzhui=="png"){
-			this.form.fileList.push(event.file)
-		}else{
-			uni.$u.toast('图片格式不正确，请上传jpg格式图片或者png格式图片')
-			this.form.fileList=[]
-			
-		}
-      
+      var houzhui = event.file.url.replace(/.+\./, "");
+      console.log(houzhui);
+      if (houzhui == "jpg" || houzhui == "png") {
+        this.form.fileList.push(event.file)
+      } else {
+        uni.$u.toast('图片格式不正确，请上传jpg格式图片或者png格式图片')
+        this.form.fileList = []
+
+      }
+    },
+    fnAfterRead1(event) {
+      var houzhui = event.file.url.replace(/.+\./, "");
+      console.log(houzhui);
+      if (houzhui == "jpg" || houzhui == "png") {
+        this.form.fileListBack.push(event.file)
+      } else {
+        uni.$u.toast('图片格式不正确，请上传jpg格式图片或者png格式图片')
+        this.form.fileListBack = []
+      }
    },
    fnDeletePic(event) {
      this.form.fileList.splice(event.index, 1)
    },
+    fnDeletePic1(event) {
+      this.form.fileListBack.splice(event.index, 1)
+    },
    async fnSubmit() {
      console.info(this.$refs)
      this.$refs.form.validate().then(async () => {
-        if(!this.SPECIAL_USER_ID){
+        if (!this.SPECIAL_USER_ID) {
+          let files = []
+          files.push({
+            name: 'FILEPATH',
+            file: this.form.fileList[0],
+            uri: this.form.fileList[0].url,
+          })
+
+          files.push({
+            name: 'FILEPATH_BACK',
+            file: this.form.fileListBack[0],
+            uri: this.form.fileListBack[0].url,
+          })
+
+          if (files.length !== 2) {
+            uni.$u.toast('请上传证书正反面')
+            return
+          }
+
          await setCertificateInformationAdd({
-            filePath: this.form.fileList[0].url,
-            name: 'file',
+            files: files,
            formData: {
              ...this.form
            }
          })
-        }else {
-          if (!this.form.fileList[0].FILEPATH) {
+        } else {
+          if (!this.form.fileList[0].FILEPATH || !this.form.fileListBack[0].FILEPATH) {
+            uni.$u.toast('1')
+            let files = []
+            if (!this.form.fileList[0].FILEPATH) {
+              files.push({
+                name: 'FILEPATH',
+                file: this.form.fileList[0],
+                uri: this.form.fileList[0].url,
+              })
+            }
+
+            if (!this.form.fileListBack[0].FILEPATH) {
+              files.push({
+                name: 'FILEPATH_BACK',
+                file: this.form.fileListBack[0],
+                uri: this.form.fileListBack[0].url,
+              })
+            }
+
            await setCertificateInformationEdit({
-              filePath: this.form.fileList[0].url,
-              name: 'file',
+              files: files,
              formData: {
                ...this.form
              }
            })
          } else {
            this.form.fileMark = '1',
-            await setCertificateInformationEditPost({
-                ...this.form
-            })
+                await setCertificateInformationEditPost({
+                  ...this.form
+                })
          }

        }
-        uni.$u.toast('保存成功')
-        setTimeout(()=>{
+        // uni.$u.toast('保存成功')
+        setTimeout(() => {
          uni.navigateBack()
-        },2000)
+        }, 2000)
      }).catch((e) => {
        console.info(e)
-        uni.$u.toast('请补全必填项')
+        // uni.$u.toast('请补全必填项')
+        uni.$u.toast(e)
      })
    }
  },
--- a/pages/certificate_information/index.vue
+++ b/pages/certificate_information/index.vue
@ -4,7 +4,7 @@
      <u-list-item v-for="(item, index) in list" :key="index">
        <view style="display: flex;align-items: center;justify-content: space-between;">
          <view>
-            <u-image width="200upx" height="200upx" :src="$filePath + item.FILEPATH"></u-image>
+            <u-image width="200rpx" height="200rpx" :src="$filePath + item.FILEPATH"></u-image>
          </view>
          <view class="ml-10" style="flex: 1;">
            <view class="flex-between main-title">
@ -19,8 +19,12 @@
            <view class="flex-between mt-10 subtitle">
              <view></view>
              <view class="flex-between">
-                <u-button type="primary" text="编辑" size="mini" class="bth-mini" @click="fnEdit(item.SPECIAL_USER_ID)"></u-button>
-                <u-button type="primary" text="查看" size="mini" class="bth-mini ml-10" @click="fnView(item.SPECIAL_USER_ID)"></u-button>
+                <u-button type="primary" text="编辑" size="mini"
+                          @click="fnEdit(item.SPECIAL_USER_ID)"></u-button>
+                <view class="ml-10">
+                  <u-button type="primary" text="查看" size="mini"
+                            @click="fnView(item.SPECIAL_USER_ID)"></u-button>
+                </view>
              </view>
            </view>
          </view>
@ -28,16 +32,21 @@
      </u-list-item>
    </u-list>
    <empty v-else></empty>
+    <fab-button @click="fnEdit"/>
  </view>
 </template>

 <script>
 import {getCertificateInformationList, getCertificateInformationView} from "../../api";
+import FabButton from '@/components/fab_button/index.vue'

 export default {
+  components: {
+    FabButton,
+  },
  data() {
    return {
-      SPECIAL_USER_ID:'',
+      SPECIAL_USER_ID: '',
      info: {},
      pageSize: 10,
      currentPage: 1,
@ -52,11 +61,6 @@ export default {
  onShow() {
    this.resetList()
  },
-  onNavigationBarButtonTap(e) {
-    if (e.index === 0) {
-      this.fnEdit()
-    }
-  },
  methods: {
    async getData() {
      let resData = await getCertificateInformationList({
@ -79,7 +83,7 @@ export default {
    fnView(SPECIAL_USER_ID) {
      uni.$u.route({
        url: '/pages/certificate_information/view',
-        params:{
+        params: {
          SPECIAL_USER_ID
        }
      })
@ -87,7 +91,7 @@ export default {
    fnEdit(SPECIAL_USER_ID) {
      uni.$u.route({
        url: '/pages/certificate_information/add',
-        params:{
+        params: {
          SPECIAL_USER_ID
        }
      })
--- a/pages/certificate_information/view.vue
+++ b/pages/certificate_information/view.vue
@ -4,7 +4,9 @@
      <u-cell-group>
        <u-cell title="证书图片">
          <template #value>
-            <u--image :src="info.FILEPATH" width="100upx" height="100upx" radius="10upx" @click="fnPreview"></u--image>
+            <u--image :src="info.FILEPATH" width="100rpx" height="100rpx" radius="10rpx" @click="fnPreview"></u--image>
+            <u--image v-if="info.FILEPATH_BACK" :src="info.FILEPATH_BACK" width="100rpx" height="100rpx" radius="10rpx"
+                      @click="fnPreview"></u--image>
          </template>
        </u-cell>
        <u-cell title="姓名" :value="info.NAME"></u-cell>
@ -14,7 +16,7 @@
        <u-cell title="证书类型" :value="info.typeName"></u-cell>
        <u-cell title="证书名称" :value="info.CERTIFICATE"></u-cell>
        <u-cell title="证书编号" :value="info.SPECIAL_NUMBER"></u-cell>
-<!--        <u-cell title="工种" :value="info.JOBS_TYPE"></u-cell>-->
+        <!--        <u-cell title="工种" :value="info.JOBS_TYPE"></u-cell>-->
        <u-cell v-show="info.typeName === '特种作业'" title="作业类别" :value="info.specialName"></u-cell>
        <u-cell v-show="info.typeName === '特种作业'" title="操作项目" :value="info.operationName"></u-cell>
        <u-cell title="发证机关" :value="info.ISSUING_AUTHORITY"></u-cell>
@ -31,7 +33,7 @@ import {getCertificateInformationView} from "../../api";
 export default {
  data() {
    return {
-      SPECIAL_USER_ID:'',
+      SPECIAL_USER_ID: '',
      info: {}
    }
  },
@ -40,16 +42,19 @@ export default {
    this.fnGetData()
  },
  methods: {
-    async fnGetData(){
+    async fnGetData() {
      let resData = await getCertificateInformationView({
-        SPECIAL_USER_ID:this.SPECIAL_USER_ID
+        SPECIAL_USER_ID: this.SPECIAL_USER_ID
      })
      this.info = resData.pd
-      this.$set(this.info,'FILEPATH',this.$filePath + resData.pd.FILEPATH)
+      this.$set(this.info, 'FILEPATH', this.$filePath + resData.pd.FILEPATH)
+      if (resData.pd.FILEPATH_BACK) {
+        this.$set(this.info, 'FILEPATH_BACK', this.$filePath + resData.pd.FILEPATH_BACK)
+      }
    },
    fnPreview() {
      uni.previewImage({
-        urls:[this.info.FILEPATH]
+        urls: [this.info.FILEPATH]
      })
    }
  },
--- a/pages/electronic_work_card/index.vue
+++ b/pages/electronic_work_card/index.vue
@ -1,78 +1,81 @@
 <template>
-	<view class="content">
-		<view class="card">
-			<u-cell-group>
-				<u-cell title="照片">
-					<template #value>
-						<u--image :src="info.PHOTO" shape="circle" width="100upx" height="100upx"
-							@click="fnPreview(info.PHOTO)"></u--image>
-					</template>
-				</u-cell>
-				<u-cell title="姓名" :value="info.NAME"></u-cell>
-				<u-cell title="性别" :value="info.SEX === '1' ? '女' : '男'">
-				</u-cell>
-				<u-cell title="出生年月" :value="info.DATE_OF_BIRTH"></u-cell>
-				<u-cell title="年龄" :value="info.AGE"></u-cell>
-				<u-cell title="身份证" :value="info.CARD_ID"></u-cell>
-				<u-cell title="就职单位相关方单位" :value="info.RELEVANT_UNIT_NAME"></u-cell>
-				<u-cell title="岗位名称" :value="info.POST_ID"></u-cell>
-				<u-cell title="联系电话" :value="info.PHONE"></u-cell>
-				<u-cell title="人员类型" :value="info.ISFLOW === '1' ? '流动人员' : '固定人员'">
-				</u-cell>
-				<u-cell title="二维码" v-show="!CODE_TYPE && info.STATUS === '2' && info.CORPINFO_ID">
-					<template #value>
-						<u--image :src="info.code" width="100upx" height="100upx" @click="fnPreview(info.code)">
-						</u--image>
-					</template>
-				</u-cell>
-			</u-cell-group>
-		</view>
-	</view>
+  <view class="content">
+    <view class="card">
+      <u-cell-group>
+        <u-cell title="照片">
+          <template #value>
+            <u--image :src="info.PHOTO" shape="circle" width="100rpx" height="100rpx"
+                      @click="fnPreview(info.PHOTO)"></u--image>
+          </template>
+        </u-cell>
+        <u-cell title="姓名" :value="info.NAME"></u-cell>
+        <u-cell title="性别" :value="info.SEX === '1' ? '女' : '男'">
+        </u-cell>
+        <u-cell title="出生年月" :value="info.DATE_OF_BIRTH"></u-cell>
+        <u-cell title="年龄" :value="info.AGE"></u-cell>
+        <u-cell title="身份证" :value="info.CARD_ID"></u-cell>
+        <u-cell title="就职单位相关方单位" :value="info.RELEVANT_UNIT_NAME"></u-cell>
+        <u-cell title="岗位名称" :value="info.POST_ID"></u-cell>
+        <u-cell title="联系电话" :value="info.PHONE"></u-cell>
+        <u-cell title="人员类型" :value="info.ISFLOW === '1' ? '流动人员' : '固定人员'">
+        </u-cell>
+        <u-cell title="二维码"
+                v-if="info.CORPINFO_ID && cleanCode && (info.DEPART_STATE == '0' || info.DEPART_STATE == '-1')">
+          <template #value>
+            <u--image :src="info.code" width="100rpx" height="100rpx" @click="fnPreview(info.code)">
+            </u--image>
+          </template>
+        </u-cell>
+      </u-cell-group>
+    </view>
+  </view>
 </template>

 <script>
-	import {
-		getElectronicWorkCard,
-		getElectronicWorkCardQRCode
-	} from "../../api";
+import {
+  getElectronicWorkCard,
+  getElectronicWorkCardQRCode
+} from "../../api";

-	export default {
-		data() {
-			return {
-				info: {},
-				USER_ID: '',
-				CODE_TYPE: ''
-			}
-		},
-		created() {
-			this.fnGetData()
-		},
-		onLoad(query) {
-			this.USER_ID = query.USER_ID
-			this.CODE_TYPE = query.CODE_TYPE
-		},
-		methods: {
-			async fnGetData() {
-				var params = {}
-				if (this.CODE_TYPE) {
-					params.USER_ID = this.USER_ID
-				}
-				let resData = await getElectronicWorkCard(params)
-				let {
-					code
-				} = await getElectronicWorkCardQRCode(params)
-				this.info = resData.pd
-				console.log(this.$filePath + resData.pd.PHOTO)
-				this.info.PHOTO = this.$filePath + resData.pd.PHOTO
-				this.info.code = 'data:image/jpg;base64,' + code
-			},
-			fnPreview(urls) {
-				uni.previewImage({
-					urls: [urls]
-				})
-			}
-		},
-	}
+export default {
+  data() {
+    return {
+      info: {},
+      USER_ID: '',
+      CODE_TYPE: '',
+      cleanCode: ''
+    }
+  },
+  created() {
+    this.fnGetData()
+  },
+  onLoad(query) {
+    this.USER_ID = query.USER_ID
+    this.CODE_TYPE = query.CODE_TYPE
+  },
+  methods: {
+    async fnGetData() {
+      var params = {}
+      if (this.CODE_TYPE) {
+        params.USER_ID = this.USER_ID
+      }
+      let resData = await getElectronicWorkCard(params)
+      let {
+        code
+      } = await getElectronicWorkCardQRCode(params)
+      this.info = resData.pd
+      console.log(this.$filePath + resData.pd.PHOTO)
+      this.info.PHOTO = this.$filePath + resData.pd.PHOTO
+      this.info.code = 'data:image/jpg;base64,' + code
+      this.cleanCode = code
+    },
+    fnPreview(urls) {
+      uni.previewImage({
+        urls: [urls]
+      })
+    }
+  },
+}
 </script>

 <style scoped>
--- a/pages/employed_by/index.vue
+++ b/pages/employed_by/index.vue
@ -1,14 +1,14 @@
 <template>
-	<view class="content">
-		<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
-			<u-list-item v-for="(item, index) in list" :key="index">
-				<view>
-					<view class="flex-between main-title">
-						<text>单位名称：{{ item.RELEVANT_UNIT_NAME }}</text>
-					</view>
-					<view class="flex-between mt-10 subtitle" v-show="item.START_DATE">
-						<text>就职时间：{{ item.START_DATE }}-{{ item.END_DATE || '至今' }}</text>
-					</view>
+  <view class="content">
+    <u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
+      <u-list-item v-for="(item, index) in list" :key="index">
+        <view>
+          <view class="flex-between main-title">
+            <text>单位名称：{{ item.RELEVANT_UNIT_NAME }}</text>
+          </view>
+          <view class="flex-between mt-10 subtitle" v-show="item.START_DATE">
+            <text>就职时间：{{ item.START_DATE }}-{{ item.END_DATE || '至今' }}</text>
+          </view>
          <view class="flex-between mt-10 subtitle" v-show="item.DEPART_STATE">
            <text>就职状态：
              <template v-if="item.DEPART_STATE === '0'">在职</template>
@ -18,100 +18,102 @@
              <template v-if="item.DEPART_STATE === '3'">已审核</template>
            </text>
          </view>
-					<view class="flex-between mt-10 subtitle">
-						<text>单位在职申请审核状态：
-							<template v-if="item.AUDIT_STATE === '0'">已打回</template>
-							<template v-if="item.AUDIT_STATE === '1'">待审核</template>
-							<template v-if="item.AUDIT_STATE === '2'">审核通过</template>
-						</text>
-					</view>
-					<view class="flex-between mt-10 subtitle" v-show="item.DEPART_STATE !== '0' && item.REVIEW_STATE">
-						<text>单位离职申请审核状态：
-							<template v-if="item.REVIEW_STATE === '0'">已打回</template>
-							<template v-if="item.REVIEW_STATE === '1'">待审核</template>
-							<template v-if="item.REVIEW_STATE === '2'">审核通过</template>
-						</text>
-					</view>
+          <view class="flex-between mt-10 subtitle">
+            <text>单位在职申请审核状态：
+              <template v-if="item.AUDIT_STATE === '0'">已打回</template>
+              <template v-if="item.AUDIT_STATE === '1'">待审核</template>
+              <template v-if="item.AUDIT_STATE === '2'">审核通过</template>
+            </text>
+          </view>
+          <view class="flex-between mt-10 subtitle" v-show="item.DEPART_STATE !== '0' && item.REVIEW_STATE">
+            <text>单位离职申请审核状态：
+              <template v-if="item.REVIEW_STATE === '0'">已打回</template>
+              <template v-if="item.REVIEW_STATE === '1'">待审核</template>
+              <template v-if="item.REVIEW_STATE === '2'">审核通过</template>
+            </text>
+          </view>

          <view class="flex-between mt-10 subtitle" v-if="item.AUDIT_REMARKS">
-						<text>审核意见：{{ item.AUDIT_REMARKS }}
-						</text>
-					</view>
-					<view class="flex-between mt-10 subtitle">
-						<view></view>
-						<view class="flex-between">
-							<u-button type="primary" text="查看" size="mini" class="bth-mini ml-10"
-								@click="fnView(item.EMPLOYMENT_APPLY_MANAGEMENT_ID, item.CORPINFO_ID, item.DEPART_STATE)"></u-button>
-							<u-button type="primary" text="离职申请" size="mini" class="bth-mini ml-10"
-								v-if="item.DEPART_STATE === '0'"
-								@click="fnResignationApplication(item.EMPLOYMENT_APPLY_MANAGEMENT_ID,item.RELEVANT_UNIT_NAME)">
-							</u-button>
-						</view>
-					</view>
-				</view>
-			</u-list-item>
-		</u-list>
-		<empty v-else></empty>
-	</view>
+            <text>审核意见：{{ item.AUDIT_REMARKS }}
+            </text>
+          </view>
+          <view class="flex-between mt-10 subtitle">
+            <view></view>
+            <view class="flex-between">
+              <u-button type="primary" text="查看" size="mini"
+                        @click="fnView(item.EMPLOYMENT_APPLY_MANAGEMENT_ID, item.CORPINFO_ID, item.DEPART_STATE)"></u-button>
+              <view class="ml-10">
+                <u-button type="primary" text="离职申请" size="mini"
+                          v-if="item.DEPART_STATE === '0'"
+                          @click="fnResignationApplication(item.EMPLOYMENT_APPLY_MANAGEMENT_ID,item.RELEVANT_UNIT_NAME)">
+                </u-button>
+              </view>
+            </view>
+          </view>
+        </view>
+      </u-list-item>
+    </u-list>
+    <empty v-else></empty>
+  </view>
 </template>

 <script>
-	import {
-		getEmployedBy
-	} from "../../api";
+import {
+  getEmployedBy
+} from "../../api";

-	export default {
-		data() {
-			return {
-				pageSize: 10,
-				currentPage: 1,
-				totalPage: 0,
-				list: [],
-			}
-		},
-		onShow() {
-			this.resetList()
-		},
-		methods: {
-			async getData() {
-				let resData = await getEmployedBy({
-					showCount: this.pageSize,
-					currentPage: this.currentPage,
-				});
-				this.list = [...this.list, ...resData.varList];
-				this.totalPage = resData.page.totalPage;
-			},
-			resetList() {
-				this.pageSize = 10
-				this.currentPage = 1
-				this.list = []
-				this.getData()
-			},
-			scrolltolower() {
-				this.currentPage++;
-				if (this.totalPage >= this.currentPage) this.getData();
-			},
-			fnResignationApplication(EMPLOYMENT_APPLY_MANAGEMENT_ID, RELEVANT_UNIT_NAME) {
-				uni.$u.route({
-					url: '/pages/employed_by/resignation_application',
-					params: {
-						EMPLOYMENT_APPLY_MANAGEMENT_ID,
-						RELEVANT_UNIT_NAME
-					}
-				})
-			},
-			fnView(EMPLOYMENT_APPLY_MANAGEMENT_ID, CORPINFO_ID, DEPART_STATE) {
-				uni.$u.route({
-					url: '/pages/related_party_units/view',
-					params: {
-						EMPLOYMENT_APPLY_MANAGEMENT_ID,
-            CORPINFO_ID,
-            DEPART_STATE
-					}
-				})
-			}
-		}
-	}
+export default {
+  data() {
+    return {
+      pageSize: 10,
+      currentPage: 1,
+      totalPage: 0,
+      list: [],
+    }
+  },
+  onShow() {
+    this.resetList()
+  },
+  methods: {
+    async getData() {
+      let resData = await getEmployedBy({
+        showCount: this.pageSize,
+        currentPage: this.currentPage,
+      });
+      this.list = [...this.list, ...resData.varList];
+      this.totalPage = resData.page.totalPage;
+    },
+    resetList() {
+      this.pageSize = 10
+      this.currentPage = 1
+      this.list = []
+      this.getData()
+    },
+    scrolltolower() {
+      this.currentPage++;
+      if (this.totalPage >= this.currentPage) this.getData();
+    },
+    fnResignationApplication(EMPLOYMENT_APPLY_MANAGEMENT_ID, RELEVANT_UNIT_NAME) {
+      uni.$u.route({
+        url: '/pages/employed_by/resignation_application',
+        params: {
+          EMPLOYMENT_APPLY_MANAGEMENT_ID,
+          RELEVANT_UNIT_NAME
+        }
+      })
+    },
+    fnView(EMPLOYMENT_APPLY_MANAGEMENT_ID, CORPINFO_ID, DEPART_STATE) {
+      uni.$u.route({
+        url: '/pages/related_party_units/view',
+        params: {
+          EMPLOYMENT_APPLY_MANAGEMENT_ID,
+          CORPINFO_ID,
+          DEPART_STATE
+        }
+      })
+    }
+  }
+}
 </script>

 <style scoped>
--- a/pages/employed_by/resignation_application.vue
+++ b/pages/employed_by/resignation_application.vue
@ -12,7 +12,9 @@
        <u-cell title="申请时间" :value="form.APPLY_TIME"></u-cell>
        <u-cell title="申请人" :value="userInfo.NAME"></u-cell>
      </u-cell-group>
-      <u-button type="primary" text="提交" class="mt-10" @click="$u.debounce(fnSubmit, 1000,true)"></u-button>
+      <view class="mt-10">
+        <u-button type="primary" text="提交" @click="$u.debounce(fnSubmit, 1000,true)"></u-button>
+      </view>
    </view>
  </view>
 </template>
@ -23,14 +25,14 @@ import {setResignationApplication} from "../../api";
 export default {
  data() {
    return {
-      EMPLOYMENT_APPLY_MANAGEMENT_ID:'',
-      RELEVANT_UNIT_NAME:'',
+      EMPLOYMENT_APPLY_MANAGEMENT_ID: '',
+      RELEVANT_UNIT_NAME: '',
      form: {
        LEAVE_REASON: '',
        APPLY_TIME: uni.$u.timeFormat(new Date(), 'yyyy-mm-dd'),
-		REVIEW_STATE: '1',
-		DEPART_STATE: '-1',
-		EMPLOYMENT_APPLY_MANAGEMENT_ID: ''
+        REVIEW_STATE: '1',
+        DEPART_STATE: '-1',
+        EMPLOYMENT_APPLY_MANAGEMENT_ID: ''
      }
    }
  },
@ -45,19 +47,19 @@ export default {
  },
  methods: {
    async fnSubmit() {
-      if(!this.form.LEAVE_REASON){
+      if (!this.form.LEAVE_REASON) {
        uni.$u.toast('请填写离职原因')
        return
      }
-	this.form.EMPLOYMENT_APPLY_MANAGEMENT_ID = this.EMPLOYMENT_APPLY_MANAGEMENT_ID
+      this.form.EMPLOYMENT_APPLY_MANAGEMENT_ID = this.EMPLOYMENT_APPLY_MANAGEMENT_ID
      await setResignationApplication({
        ...this.form,
-        OPERATOR:this.userInfo.USER_ID
+        OPERATOR: this.userInfo.USER_ID
      })
      uni.$u.toast('申请成功')
-      setTimeout(()=>{
+      setTimeout(() => {
        uni.navigateBack()
-      },2000)
+      }, 2000)
    }
  },
 }
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -1,21 +1,22 @@
 <template>
  <view class="page">
-    <!-- #ifdef APP-PLUS -->
    <view class="status_bar">
      <view class="top_view"></view>
    </view>
-    <!-- #endif -->
    <view class="wui_banner">
-      <view class="wui-bar">
-        <view class="icon-ui">
-          <u-icon name="scan" color="#fff" size="28" @click="fnScan"></u-icon>
-        </view>
-      </view>
      <view class="banner_img">
        <image src="../../static/home-bg.png" mode=""></image>
      </view>
    </view>
    <view class="home-apps">
+      <view class="home-apps-item" @click="fnScan">
+        <view class="home-apps-item-img">
+          <image src="../../static/icon-apps/app_icons6.png" mode=""></image>
+        </view>
+        <view class="text">
+          <text>扫码</text>
+        </view>
+      </view>
      <view class="home-apps-item" v-for="(item,index) in baseList" :key="index" @click="fnNavigator(index)">
        <view class="home-apps-item-img">
          <image :src="item.img" mode=""></image>
@ -26,7 +27,8 @@
      </view>
    </view>
    <u-modal :show="updateVersion.modalShow" title="温馨提示" :showConfirmButton="updateVersion.showConfirmButton"
-             :showCancelButton="updateVersion.showCancelButton" :confirmText="updateVersion.confirmText" :cancelText="updateVersion.cancelText"
+             :showCancelButton="updateVersion.showCancelButton" :confirmText="updateVersion.confirmText"
+             :cancelText="updateVersion.cancelText"
             @cancel="modalCancel" @confirm="modalConfirm">
      <view style="text-align: center;color:#606266">
        <rich-text :nodes="updateVersion.modalContent"></rich-text>
@ -40,7 +42,7 @@ import updateVersion from "../../utils/updateVersion";
 import {setRelatedPartyScanning} from "../../api";

 export default {
-  mixins:[updateVersion],
+  mixins: [updateVersion],
  data() {
    return {
      baseList: [
@ -76,18 +78,18 @@ export default {
    this.fnUpdateVersion(false)
  },
  methods: {
-    fnScan(){
+    fnScan() {
      uni.scanCode({
        success: async (res) => {
-			  let obj =JSON.parse(res.result)
+          let obj = JSON.parse(res.result)
          let type = obj[0].CODE_TYPE
          if (type === '0') {
            // type=0时跳转注册相关方企业页面
-            await setRelatedPartyScanning({CORPINFO_ID:obj[0].CORPINFO_ID})
+            await setRelatedPartyScanning({CORPINFO_ID: obj[0].CORPINFO_ID})
            uni.$u.route({
              url: '/pages/related_party_units/add',
-              params:{
-                CORPINFO_ID:obj[0].CORPINFO_ID,
+              params: {
+                CORPINFO_ID: obj[0].CORPINFO_ID,
                RELEVANT_UNIT_NAME: obj[0].RELEVANT_UNIT_NAME
              }
            })
@ -95,9 +97,9 @@ export default {
            // type=1时跳转电子工牌页面
            uni.$u.route({
              url: '/pages/electronic_work_card/index',
-              params:{
-                USER_ID:obj[0].USER_ID,
-                CODE_TYPE:obj[0].CODE_TYPE
+              params: {
+                USER_ID: obj[0].USER_ID,
+                CODE_TYPE: obj[0].CODE_TYPE
              }
            })
          }
--- a/pages/login/forgot_password.vue
+++ b/pages/login/forgot_password.vue
@ -2,7 +2,7 @@
  <view class="content1">
    <view class="change-password">
      <u--form labelPosition="top" :model="form" :rules="rules" ref="form" labelWidth="100%"
-               :labelStyle="{color:'#333',  fontSize:'34upx', fontWeight:'bold'}">
+               :labelStyle="{color:'#333',  fontSize:'34rpx', fontWeight:'bold'}">
        <u-form-item label="用户名" prop="USERNAME" borderBottom>
          <u--input v-model="form.USERNAME" border="none"></u--input>
        </u-form-item>
@ -73,7 +73,7 @@ export default {
    submitPassword() {
      this.$refs.form.validate().then(async () => {
        await setForgotPassword({
-         ...this.form
+          ...this.form
        })
        this.$refs.uToast.show({
          message: '修改成功',
@ -95,7 +95,7 @@ export default {
 <style lang="scss" scoped>
 .change-password {
  background-color: #fff;
-  border-radius: 20upx;
-  padding: 40upx;
+  border-radius: 20rpx;
+  padding: 40rpx;
 }
 </style>
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@ -1,22 +1,24 @@
 <template>
  <view class="wui_login">
    <view class="form">
-      <u--form labelPosition="top" :model="form" labelWidth="140upx" >
+      <u--form labelPosition="top" :model="form" labelWidth="140rpx">
        <u-form-item label="账号" borderBottom>
-          <u--input v-model="form.userName" border="none" placeholder="请输入账号..." ></u--input>
+          <u--input v-model="form.userName" border="none" placeholder="请输入账号..."></u--input>
        </u-form-item>
        <u-form-item label="密码" borderBottom>
-          <u--input v-model="form.userPwd" type="password" border="none" placeholder="请输入密码..." ></u--input>
+          <u--input v-model="form.userPwd" type="password" border="none" placeholder="请输入密码..."></u--input>
        </u-form-item>
      </u--form>
-      <u-button type="primary" text="登 录" @click="$u.debounce(fnLogin, 1000,true)"></u-button>
+      <u-button type="primary" text="登 录" custom-style="margin:40rpx 0 20rpx 0"
+                @click="$u.debounce(fnLogin, 1000,true)"></u-button>
      <view class="tip">
        <view @click="fnForgotPassword">忘记密码</view>
        <view @click="fnRegister">新用户注册</view>
      </view>
    </view>
    <u-modal :show="updateVersion.modalShow" title="温馨提示" :showConfirmButton="updateVersion.showConfirmButton"
-             :showCancelButton="updateVersion.showCancelButton" :confirmText="updateVersion.confirmText" :cancelText="updateVersion.cancelText"
+             :showCancelButton="updateVersion.showCancelButton" :confirmText="updateVersion.confirmText"
+             :cancelText="updateVersion.cancelText"
             @cancel="modalCancel" @confirm="modalConfirm">
      <view style="text-align: center;color:#606266">
        <rich-text :nodes="updateVersion.modalContent"></rich-text>
@ -31,7 +33,7 @@ import updateVersion from '../../utils/updateVersion'
 import JSEncrypt from '../../static/js/jsencrypt.min.js'

 export default {
-  mixins:[updateVersion],
+  mixins: [updateVersion],
  data() {
    return {
      publicKey: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2zCyUYSD0pNrbtaYdvGfHfWoRV+fo/2N9O2PLLz/jZvMkigkq4eAq4JO+Ek0wDHI9WxP6iTSLYCHhIOs9CQTPvyldJFm8riZtQZlBTD8Plkb3rjrgwTqbBi3w3+HKYdkSvGFXJIdSOPbpXnj5BzN8vlVaybs24R/vpUzG9178lwIDAQAB',
@ -45,12 +47,12 @@ export default {
    this.fnUpdateVersion(false)
  },
  methods: {
-    fnRegister(){
+    fnRegister() {
      uni.$u.route({
        url: '/pages/login/register',
      })
    },
-    fnForgotPassword(){
+    fnForgotPassword() {
      uni.$u.route({
        url: '/pages/login/forgot_password',
      })
@ -71,11 +73,11 @@ export default {
      var jsencrypt = new JSEncrypt()
      jsencrypt.setPublicKey(this.publicKey)
      const keydataVal = jsencrypt.encrypt('qdkjchina' + this.form.userName + ',qd,' + this.form.userPwd)
-      let resData = await submitLogin({'KEYDATA':keydataVal});
+      let resData = await submitLogin({'KEYDATA': keydataVal});
      // console.log(resData)
-	  if (resData.PHOTO != '') {
-	  	resData.PHOTO = this.$filePath + resData.PHOTO
-	  }
+      if (resData.PHOTO != '') {
+        resData.PHOTO = this.$filePath + resData.PHOTO
+      }
      await this.$store.dispatch('setUserInfo', resData);
      uni.$u.route({
        url: '/pages/index/index',
@ -90,51 +92,40 @@ export default {
 .wui_login {
  background-image: url(/static/bg-login.png);
  background-repeat: no-repeat;
-  background-size:100% 100%;
-  height:100vh;
+  background-size: 100% 100%;
+  height: 100vh;
  background-color: #058cf5;
  position: relative;
-  .title{
+
+  .title {
    color: #fff;
-    font-size: 44upx;
+    font-size: 44rpx;
    font-weight: 500;
    display: flex;
    flex-direction: column;
-    padding-top: 106upx;
-    padding-left: 46upx;
+    padding-top: 106rpx;
+    padding-left: 46rpx;
    line-height: 1.6;
  }
-  .form{
+
+  .form {
    width: 70%;
    position: absolute;
    top: 49%;
    left: 50%;
-	background-color: #fff;
-	border-radius: 20upx;
-	padding: 30upx 9%;
+    background-color: #fff;
+    border-radius: 20rpx;
+    padding: 30rpx 9%;
    transform: translate(-50%, -50%);
-    .tip{
-      font-size: 20upx;
-      margin-bottom: 40upx;
+
+    .tip {
+      font-size: 24rpx;
+      margin-bottom: 40rpx;
      color: #0b80e7;
      display: flex;
      align-items: center;
      justify-content: space-between;
    }
  }
-  button{
-    margin-top: 40upx;
-    background-color: #0b80e7;
-    color: #fff;
-    font-weight: bold;
-    border: none;
-    border-radius: 10upx;
-    margin-bottom: 20upx;
-  }
-  ::v-deep{
-    .u-button__text{
-      font-size: 32upx !important;
-    }
-  }
 }
 </style>
--- a/pages/login/register.vue
+++ b/pages/login/register.vue
@ -19,7 +19,9 @@
        </u-form-item>
        <view class="tip">密码长度8~32位，须包含数字、字母、符号至少2种或以上元素</view>
      </u--form>
-      <u-button type="primary" text="注 册" class="mt-10" @click="$u.debounce(fnRegister, 1000,true)"></u-button>
+      <view class="mt-10">
+        <u-button type="primary" text="注 册" @click="$u.debounce(fnRegister, 1000,true)"></u-button>
+      </view>
    </view>
  </view>
 </template>
@ -121,16 +123,16 @@ export default {
    },
    async fnRegister() {
      this.$refs.form.validate().then(async () => {
-        if(await this.fnIDCardDeduplication()) return
-        if(await this.fnUserDeduplication()) return
+        if (await this.fnIDCardDeduplication()) return
+        if (await this.fnUserDeduplication()) return
        await setRegister({...this.form})
        uni.$u.toast('注册成功')
-        setTimeout(()=>{
+        setTimeout(() => {
          uni.$u.route({
            url: '/pages/login/login',
-            type:'reLaunch'
+            type: 'reLaunch'
          })
-        },2000)
+        }, 2000)
      }).catch(() => {
        uni.$u.toast('请补全必填项')
      })
@ -140,9 +142,9 @@ export default {
 </script>

 <style scoped lang="scss">
-.tip{
-  padding-top: 20upx;
-  padding-bottom: 20upx;
-  font-size: 20upx;
+.tip {
+  padding-top: 20rpx;
+  padding-bottom: 20rpx;
+  font-size: 20rpx;
 }
 </style>
--- a/pages/mine/about_us/about_us.vue
+++ b/pages/mine/about_us/about_us.vue
@ -1,31 +1,31 @@
 <template>
-	<view class="">
-		<view class="about-us">
-			<u-cell-group :border="false">
-				<u-cell isLink url="/pages/mine/agreement/agreement">
-					<u-icon slot="icon" size="20" name="/static/svg/menu_yhxy.svg"></u-icon>
-					<view slot="title" class="title">用户服务协议</view>
-				</u-cell>
-				<u-cell isLink url="/pages/mine/privacy/privacy">
-					<u-icon slot="icon" size="20" name="/static/svg/menu_yszc.svg"></u-icon>
-					<view slot="title" class="title">隐私协议</view>
-				</u-cell>
-			</u-cell-group>
-		</view>
-	</view>
+  <view class="">
+    <view class="about-us">
+      <u-cell-group :border="false">
+        <u-cell isLink url="/pages/mine/agreement/agreement">
+          <u-icon slot="icon" size="20" name="/static/svg/menu_yhxy.svg"></u-icon>
+          <view slot="title" class="title">用户服务协议</view>
+        </u-cell>
+        <u-cell isLink url="/pages/mine/privacy/privacy">
+          <u-icon slot="icon" size="20" name="/static/svg/menu_yszc.svg"></u-icon>
+          <view slot="title" class="title">隐私协议</view>
+        </u-cell>
+      </u-cell-group>
+    </view>
+  </view>
 </template>

 <script>
-	export default {
-	}
+export default {}
 </script>

 <style lang="scss" scoped>
-	.about-us {
-		background-color: #fff;
-		box-sizing: border-box;
-		line-height: 60rpx;
-		.title {
-		}
-	}
+.about-us {
+  background-color: #fff;
+  box-sizing: border-box;
+  line-height: 60rpx;
+
+  .title {
+  }
+}
 </style>
--- a/pages/mine/agreement/agreement.vue
+++ b/pages/mine/agreement/agreement.vue
@ -7,9 +7,7 @@
 </template>

 <script>
-export default {
-
-}
+export default {}
 </script>

 <style scoped>
--- a/pages/mine/change_password/change_password.vue
+++ b/pages/mine/change_password/change_password.vue
@ -1,110 +1,110 @@
 <template>
-	<view class="content1">
-		<view class="change-password">
-			<u--form labelPosition="top" :model="form" :rules="rules" ref="form" labelWidth="100%"
-				:labelStyle="{color:'#333',  fontSize:'34upx', fontWeight:'bold'}">
-				<u-form-item label="原密码" prop="oldPwd" borderBottom>
-					<u--input v-model="form.oldPwd" type="password" border="none"></u--input>
-				</u-form-item>
-				<u-form-item label="新密码" prop="nowPwd" borderBottom>
-					<u--input v-model="form.nowPwd" type="password" border="none"></u--input>
-				</u-form-item>
-				<u-form-item label="确认新密码" prop="confirmPwd" borderBottom>
-					<u--input v-model="form.confirmPwd" type="password" border="none"></u--input>
-				</u-form-item>
-				<u--text type="error" text="密码长度8~32位，须包含数字、字母、符号至少2种或以上元素"></u--text>
-				<u-form-item>
-					<u-button type="primary" shape="circle" text="确定" @click="$u.debounce(submitPassword, 1000, true)">
-					</u-button>
-				</u-form-item>
-			</u--form>
-		</view>
-		<u-toast ref="uToast"></u-toast>
-	</view>
+  <view class="content1">
+    <view class="change-password">
+      <u--form labelPosition="top" :model="form" :rules="rules" ref="form" labelWidth="100%"
+               :labelStyle="{color:'#333',  fontSize:'34rpx', fontWeight:'bold'}">
+        <u-form-item label="原密码" prop="oldPwd" borderBottom>
+          <u--input v-model="form.oldPwd" type="password" border="none"></u--input>
+        </u-form-item>
+        <u-form-item label="新密码" prop="nowPwd" borderBottom>
+          <u--input v-model="form.nowPwd" type="password" border="none"></u--input>
+        </u-form-item>
+        <u-form-item label="确认新密码" prop="confirmPwd" borderBottom>
+          <u--input v-model="form.confirmPwd" type="password" border="none"></u--input>
+        </u-form-item>
+        <u--text type="error" text="密码长度8~32位，须包含数字、字母、符号至少2种或以上元素"></u--text>
+        <u-form-item>
+          <u-button type="primary" shape="circle" text="确定" @click="$u.debounce(submitPassword, 1000, true)">
+          </u-button>
+        </u-form-item>
+      </u--form>
+    </view>
+    <u-toast ref="uToast"></u-toast>
+  </view>
 </template>

 <script>
-	import {
-		setUpdatePassword
-	} from "../../../api";
+import {
+  setUpdatePassword
+} from "../../../api";

-	export default {
-		data() {
-			return {
-				form: {
-					oldPwd: '',
-					nowPwd: '',
-					confirmPwd: '',
-				},
-				rules: {
-					oldPwd: [{
-							required: true,
-							message: '请输入旧密码',
-							trigger: 'blur'
-						},
-						{
-							min: 8,
-							message: '长度最少8个字符',
-							trigger: 'blur'
-						},
-					],
-					nowPwd: [{
-							required: true,
-							message: '请输入新密码',
-							trigger: 'blur'
-						},
-						{
-							pattern: /^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?!([^(0-9a-zA-Z)])+$).{8,32}$/,
-							message: '密码格式不正确',
-							trigger: ['blur']
-						},
-					],
-					confirmPwd: [{
-							required: true,
-							message: '请再次输入新密码',
-							trigger: 'blur'
-						},
-						{
-							validator: (rule, value, callback) => {
-								return value === this.form.nowPwd
-							},
-							message: '两次输入密码不一致',
-							trigger: 'blur',
-						}
-					],
-				},
-			}
-		},
-		methods: {
-			submitPassword() {
-				this.$refs.form.validate().then(async () => {
-					await setUpdatePassword({
-						PASSWORD: this.form.oldPwd,
-						NEWPASSWORD: this.form.nowPwd,
-						USER_ID: this.$store.getters.getUserInfo.USER_ID,
-						USERNAME: this.$store.getters.getUserInfo.USERNAME
-					})
-					this.$refs.uToast.show({
-						message: '修改成功',
-						type: 'success',
-						complete: () => {
-							uni.reLaunch({
-								url: '/pages/login/login'
-							})
-						}
-					})
-				}).catch((error) => {
-					this.$refs.uToast.error('请填写完整')
-				})
-			}
-		}
-	}
+export default {
+  data() {
+    return {
+      form: {
+        oldPwd: '',
+        nowPwd: '',
+        confirmPwd: '',
+      },
+      rules: {
+        oldPwd: [{
+          required: true,
+          message: '请输入旧密码',
+          trigger: 'blur'
+        },
+          {
+            min: 8,
+            message: '长度最少8个字符',
+            trigger: 'blur'
+          },
+        ],
+        nowPwd: [{
+          required: true,
+          message: '请输入新密码',
+          trigger: 'blur'
+        },
+          {
+            pattern: /^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?!([^(0-9a-zA-Z)])+$).{8,32}$/,
+            message: '密码格式不正确',
+            trigger: ['blur']
+          },
+        ],
+        confirmPwd: [{
+          required: true,
+          message: '请再次输入新密码',
+          trigger: 'blur'
+        },
+          {
+            validator: (rule, value, callback) => {
+              return value === this.form.nowPwd
+            },
+            message: '两次输入密码不一致',
+            trigger: 'blur',
+          }
+        ],
+      },
+    }
+  },
+  methods: {
+    submitPassword() {
+      this.$refs.form.validate().then(async () => {
+        await setUpdatePassword({
+          PASSWORD: this.form.oldPwd,
+          NEWPASSWORD: this.form.nowPwd,
+          USER_ID: this.$store.getters.getUserInfo.USER_ID,
+          USERNAME: this.$store.getters.getUserInfo.USERNAME
+        })
+        this.$refs.uToast.show({
+          message: '修改成功',
+          type: 'success',
+          complete: () => {
+            uni.reLaunch({
+              url: '/pages/login/login'
+            })
+          }
+        })
+      }).catch((error) => {
+        this.$refs.uToast.error('请填写完整')
+      })
+    }
+  }
+}
 </script>

 <style lang="scss" scoped>
-	.change-password {
-		background-color: #fff;
-		border-radius: 20upx;
-		padding: 40upx;
-	}
+.change-password {
+  background-color: #fff;
+  border-radius: 20rpx;
+  padding: 40rpx;
+}
 </style>
--- a/pages/mine/feedback/feedback.vue
+++ b/pages/mine/feedback/feedback.vue
@ -1,188 +1,189 @@
 <template>
-	<view class="">
-		<view class="feedback">
-			<u--input v-model="form.FEEDBACK_TITLE" placeholder="请输入标题" border="bottom" clearable></u--input>
-			<view class="feedback-type">
-				<view class="item" v-for="(item, index) in feedbackType" :key="index"
-					:class="{active:item.value === form.FEEDBACK_TYPE}" @click="form.FEEDBACK_TYPE = item.value">
-					<u--image :src="item.img" width="40upx" height="38upx"
-						style="margin-left: 70upx; margin-top: 20upx;"></u--image>
-					<view style="margin-top: -40upx;">{{item.label}}</view>
-				</view>
-			</view>
-			<view class="title">我要反馈</view>
-			<u--textarea v-model="form.FEEDBACK_CONTENT" maxlength="255" height="100" count confirmType="done"
-				placeholder="请输入问题描述"></u--textarea>
-			<view class="title">
-				<text>请提供相关问题的截图或照片</text>
-			</view>
-			<u-upload ref="aaa" capture="album" uploadIcon="plus" :fileList="form.fileList" @afterRead="afterRead"
-				@delete="deletePic" name="1" multiple :maxCount="4"></u-upload>
-			<u-button type="primary" text="提交" @click="$u.debounce(submitFeedback, 1000, true)"></u-button>
-		</view>
-		<u-toast ref="uToast"></u-toast>
-	</view>
+  <view class="">
+    <view class="feedback">
+      <u--input v-model="form.FEEDBACK_TITLE" placeholder="请输入标题" border="bottom" clearable></u--input>
+      <view class="feedback-type">
+        <view class="item" v-for="(item, index) in feedbackType" :key="index"
+              :class="{active:item.value === form.FEEDBACK_TYPE}" @click="form.FEEDBACK_TYPE = item.value">
+          <view style="margin-left: 70rpx; margin-top: 20rpx;">
+            <u--image :src="item.img" width="40rpx" height="38rpx"></u--image>
+          </view>
+          <view style="margin-top: -40rpx;">{{ item.label }}</view>
+        </view>
+      </view>
+      <view class="title">我要反馈</view>
+      <u--textarea v-model="form.FEEDBACK_CONTENT" maxlength="255" height="100" count confirmType="done"
+                   placeholder="请输入问题描述"></u--textarea>
+      <view class="title">
+        <text>请提供相关问题的截图或照片</text>
+      </view>
+      <u-upload ref="aaa" capture="album" uploadIcon="plus" :fileList="form.fileList" @afterRead="afterRead"
+                @delete="deletePic" name="1" multiple :maxCount="4"></u-upload>
+      <u-button type="primary" text="提交" @click="$u.debounce(submitFeedback, 1000, true)"></u-button>
+    </view>
+    <u-toast ref="uToast"></u-toast>
+  </view>
 </template>

 <script>
 import {setFeedbackAdd, setFeedbackUpload} from "../../../api";

-  export default {
-		data() {
-			return {
-				form: {
-					FEEDBACK_TITLE: '',
-					FEEDBACK_TYPE: '其他',
-					FEEDBACK_CONTENT: '',
-					fileList: [],
-					urlList: [],
-				},
-				feedbackType: [{
-						label: '系统错误',
-						value: '1',
-						img: require('../../../static/images/fico1.png'),
-					},
-					{
-						label: '界面优化',
-						value: '2',
-						img: require('../../../static/images/fico2.png'),
-					},
-					{
-						label: '设计缺陷',
-						value: '3',
-						img: require('../../../static/images/fico3.png'),
-					},
-					{
-						label: '性能问题',
-						value: '4',
-						img: require('../../../static/images/fico4.png'),
-					},
-					{
-						label: '其他问题',
-						value: '9',
-						img: require('../../../static/images/fico5.png'),
-					},
-				]
-			}
-		},
-		methods: {
-			// 新增图片
-			afterRead(event) {
-				this.form.fileList = [...this.form.fileList, ...event.file]
-			},
-			// 删除图片
-			deletePic(event) {
-				this.form.fileList = this.form.fileList.filter(item => item.url !== event.file.url)
-			},
-			// 提交反馈
-      submitFeedback() {
-				if (!this.form.FEEDBACK_TITLE) {
-					this.$refs.uToast.warning('为了更加方便我们排查，请输入标题')
-					return
-				}
-				if (!this.form.FEEDBACK_CONTENT) {
-					this.$refs.uToast.warning('为了更加方便我们排查，请输入问题描述')
-					return
-				}
-				if (this.form.fileList.length === 0) {
-					this.$refs.uToast.warning('为了更加方便我们排查，请上传问题截图或照片')
-					return
-				}
-        let PromiseArr = [];
-        for (let i = 0; i < this.form.fileList.length; i++) {
-          PromiseArr.push(this.fnSetFeedbackUpload(this.form.fileList[i].url))
-        }
-        Promise.all(PromiseArr).then(async () => {
-          await setFeedbackAdd({
-            ...this.form,
-            USER_ID: this.$store.getters.getUserInfo.USER_ID,
-            FEEDBACK_IMG: this.form.urlList.join(';')
-          })
-          this.$refs.uToast.show({
-            message: '反馈成功',
-            type: 'success',
-            complete: () => {
-              uni.switchTab({
-                url: '/pages/mine/index/index'
-              })
-            }
-          })
-        }).catch(() => {
-          this.$refs.uToast.show({
-            message: '反馈失败',
-            type: 'error',
-          })
-        })
-			},
-      async fnSetFeedbackUpload(filePath){
-        let resData = await setFeedbackUpload({
-          name: 'FFILE',
-          filePath,
-        })
-        this.form.urlList.push(resData.imgPath)
-        return resData
+export default {
+  data() {
+    return {
+      form: {
+        FEEDBACK_TITLE: '',
+        FEEDBACK_TYPE: '其他',
+        FEEDBACK_CONTENT: '',
+        fileList: [],
+        urlList: [],
+      },
+      feedbackType: [{
+        label: '系统错误',
+        value: '1',
+        img: require('../../../static/images/fico1.png'),
+      },
+        {
+          label: '界面优化',
+          value: '2',
+          img: require('../../../static/images/fico2.png'),
+        },
+        {
+          label: '设计缺陷',
+          value: '3',
+          img: require('../../../static/images/fico3.png'),
+        },
+        {
+          label: '性能问题',
+          value: '4',
+          img: require('../../../static/images/fico4.png'),
+        },
+        {
+          label: '其他问题',
+          value: '9',
+          img: require('../../../static/images/fico5.png'),
+        },
+      ]
+    }
+  },
+  methods: {
+    // 新增图片
+    afterRead(event) {
+      this.form.fileList = [...this.form.fileList, ...event.file]
+    },
+    // 删除图片
+    deletePic(event) {
+      this.form.fileList = this.form.fileList.filter(item => item.url !== event.file.url)
+    },
+    // 提交反馈
+    submitFeedback() {
+      if (!this.form.FEEDBACK_TITLE) {
+        this.$refs.uToast.warning('为了更加方便我们排查，请输入标题')
+        return
      }
-		},
-	}
+      if (!this.form.FEEDBACK_CONTENT) {
+        this.$refs.uToast.warning('为了更加方便我们排查，请输入问题描述')
+        return
+      }
+      if (this.form.fileList.length === 0) {
+        this.$refs.uToast.warning('为了更加方便我们排查，请上传问题截图或照片')
+        return
+      }
+      let PromiseArr = [];
+      for (let i = 0; i < this.form.fileList.length; i++) {
+        PromiseArr.push(this.fnSetFeedbackUpload(this.form.fileList[i].url))
+      }
+      Promise.all(PromiseArr).then(async () => {
+        await setFeedbackAdd({
+          ...this.form,
+          USER_ID: this.$store.getters.getUserInfo.USER_ID,
+          FEEDBACK_IMG: this.form.urlList.join(';')
+        })
+        this.$refs.uToast.show({
+          message: '反馈成功',
+          type: 'success',
+          complete: () => {
+            uni.switchTab({
+              url: '/pages/mine/index/index'
+            })
+          }
+        })
+      }).catch(() => {
+        this.$refs.uToast.show({
+          message: '反馈失败',
+          type: 'error',
+        })
+      })
+    },
+    async fnSetFeedbackUpload(filePath) {
+      let resData = await setFeedbackUpload({
+        name: 'FFILE',
+        filePath,
+      })
+      this.form.urlList.push(resData.imgPath)
+      return resData
+    }
+  },
+}
 </script>

 <style lang="scss" scoped>
-	.feedback {
-		padding: 40upx;
-		background-color: #fff;
+.feedback {
+  padding: 40rpx;
+  background-color: #fff;

-		.title {
-			font-weight: bold;
-			margin-top: 20upx;
-			margin-bottom: 20upx;
-			color: $uni-text-color-placeholder;
-			font-size: 30upx;
+  .title {
+    font-weight: bold;
+    margin-top: 20rpx;
+    margin-bottom: 20rpx;
+    color: $uni-text-color-placeholder;
+    font-size: 30rpx;

-			&:irst-child {
-				margin-top: 0;
-			}
-		}
+    &:first-child {
+      margin-top: 0;
+    }
+  }

-		.feedback-type {
-			display: flex;
-			flex-wrap: wrap;
-			margin-bottom: 20upx;
-			margin-top: 20upx;
+  .feedback-type {
+    display: flex;
+    flex-wrap: wrap;
+    margin-bottom: 20rpx;
+    margin-top: 20rpx;


-			.item {
-				padding: 10upx;
-				border-radius: 10upx;
-				margin-top: 10upx;
-				margin-right: 10upx;
-				margin-bottom: 10upx;
-				background-color: #f6f7fb;
-				text-align: center;
-				font-size: 30upx;
-				color: #9fa7bc;
-				width: 207upx;
-				height: 143upx;
-				box-sizing: border-box;
-				line-height: 143upx;
-				text-align: center;
+    .item {
+      padding: 10rpx;
+      border-radius: 10rpx;
+      margin-top: 10rpx;
+      margin-right: 10rpx;
+      margin-bottom: 10rpx;
+      background-color: #f6f7fb;
+      text-align: center;
+      font-size: 30rpx;
+      color: #9fa7bc;
+      width: 207rpx;
+      height: 143rpx;
+      box-sizing: border-box;
+      line-height: 143rpx;
+      text-align: center;

-				&.active {
-					background-color: #3c9cff;
-					color: #fff;
-				}
-			}
-		}
+      &.active {
+        background-color: #3c9cff;
+        color: #fff;
+      }
+    }
+  }

-		::v-deep {
-			.u-upload__wrap__preview__image {
-				width: 146upx !important;
-				height: 146upx !important;
-			}
-		}
-	}
+  ::v-deep {
+    .u-upload__wrap__preview__image {
+      width: 146rpx !important;
+      height: 146rpx !important;
+    }
+  }
+}

-	.title {
-		font-size: 32upx;
-		color: #333;
-	}
+.title {
+  font-size: 32rpx;
+  color: #333;
+}
 </style>
--- a/pages/mine/index/index.vue
+++ b/pages/mine/index/index.vue
@ -1,84 +1,88 @@
 <template>
-	<view class="main_container">
-		<view class="mytop">
-			<view class="mytop_main">
-				<view class="mytop_main_info">
-					<view class="mytop_main_info_tx">
-						<u-avatar :src="userInfo.PHOTO || 'account-fill'" size="50"></u-avatar>
-					</view>
-					<view class="mytop_main_test">
-						<view class="mytop_main_test_name">
+  <view class="main_container">
+    <view class="mytop">
+      <view class="mytop_main">
+        <view class="mytop_main_info">
+          <view class="mytop_main_info_tx">
+            <u-avatar :src="userInfo.PHOTO || 'account-fill'" size="50"></u-avatar>
+          </view>
+          <view class="mytop_main_test">
+            <view class="mytop_main_test_name">
              {{ userInfo.NAME }}
-						</view>
-						<view class="mytop_main_test_p">
+            </view>
+            <view class="mytop_main_test_p">
              {{ userInfo.DEPARTMENT_NAME }}
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="my_main">
-			<view class="my_main_info">
-				<view class="my_main_info_wrap" v-for="(item,index) in list" :key="item.name" @click="clickItem(item.name,index)">
-					<view class="my_main_info_wrap_img">
-						<u--image :src="item.img" width="40upx" height="40upx"></u--image>
-					</view>
-					<view class="my_main_info_wrap_info">
-						<view class="my_main_info_wrap_info_lable">
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="my_main">
+      <view class="my_main_info">
+        <view class="my_main_info_wrap" v-for="(item,index) in list" :key="item.name"
+              @click="clickItem(item.name,index)">
+          <view class="my_main_info_wrap_img">
+            <u--image :src="item.img" width="40rpx" height="40rpx"></u--image>
+          </view>
+          <view class="my_main_info_wrap_info">
+            <view class="my_main_info_wrap_info_lable">
              {{ item.name }}
-						</view>
-						<view class="">
-							<u-icon name="arrow-right" color="#999" size="14"></u-icon>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="layout_btner" @click="logOut">
-			<view class="layout_btn">
-				退出登录
-			</view>
-		</view>
-		<u-modal :show="updateVersion.modalShow" title="温馨提示" :showConfirmButton="updateVersion.showConfirmButton"
-			:showCancelButton="updateVersion.showCancelButton" :confirmText="updateVersion.confirmText" :cancelText="updateVersion.cancelText"
-			@cancel="modalCancel" @confirm="modalConfirm">
-			<view style="text-align: center;color:#606266">
-				<rich-text :nodes="updateVersion.modalContent"></rich-text>
-			</view>
-		</u-modal>
-	</view>
+            </view>
+            <view class="">
+              <u-icon name="arrow-right" color="#999" size="14"></u-icon>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="layout_btner" @click="logOut">
+      <view class="layout_btn">
+        退出登录
+      </view>
+    </view>
+    <u-modal :show="updateVersion.modalShow" title="温馨提示" :showConfirmButton="updateVersion.showConfirmButton"
+             :showCancelButton="updateVersion.showCancelButton" :confirmText="updateVersion.confirmText"
+             :cancelText="updateVersion.cancelText"
+             @cancel="modalCancel" @confirm="modalConfirm">
+      <view style="text-align: center;color:#606266">
+        <rich-text :nodes="updateVersion.modalContent"></rich-text>
+      </view>
+    </u-modal>
+  </view>
 </template>

 <script>
 import updateVersion from '../../../utils/updateVersion'

 export default {
-  mixins:[updateVersion],
+  mixins: [updateVersion],
  data() {
    return {
-      list:[
+      list: [
        {
          img: require('../../../static/images/my_ico1.png'),
-          name:'个人信息',
-          url:'/pages/mine/information/index'
+          name: '个人信息',
+          url: '/pages/mine/information/index'
        },
        {
          img: require('../../../static/images/my_ico3.png'),
-          name:'问题反馈',
-          url:'/pages/mine/feedback/feedback'
+          name: '问题反馈',
+          url: '/pages/mine/feedback/feedback'
        },
        {
          img: require('../../../static/images/my_ico4.png'),
-          name:'修改密码',
-          url:'/pages/mine/change_password/change_password'
+          name: '修改密码',
+          url: '/pages/mine/change_password/change_password'
        },
+        // #ifdef APP-PLUS
        {
          img: require('../../../static/images/my_ico5.png'),
-          name:'版本更新',
+          name: '版本更新',
        },
+        // #endif
        {
          img: require('../../../static/images/my_ico6.png'),
-          name:'关于我们',
+          name: '关于我们',
          url: '/pages/mine/about_us/about_us'
        },
      ],
@ -110,8 +114,8 @@ export default {
        }
      })
    },
-    clickItem(name,index){
-      if(name === '版本更新') this.fnUpdateVersion()
+    clickItem(name, index) {
+      if (name === '版本更新') this.fnUpdateVersion()
      else {
        uni.$u.route({
          url: this.list[index].url
@ -123,106 +127,106 @@ export default {
 </script>

 <style lang="scss" scoped>
-	.main_container {
-		width: 100%;
+.main_container {
+  width: 100%;

-		.mytop {
-			width: 100%;
-			background: url(/static/images/mybannerbg.png);
-			height: 400upx;
-			background-size: 100% 100%;
-			padding: 20upx;
-			box-sizing: border-box;
+  .mytop {
+    width: 100%;
+    background: url(/static/images/mybannerbg.png);
+    height: 400rpx;
+    background-size: 100% 100%;
+    padding: 20rpx;
+    box-sizing: border-box;

-			.mytop_main_info {
-				width: 80%;
-				margin: 0 auto;
-				margin-top: 150upx;
-				display: flex;
-				align-items: center;
+    .mytop_main_info {
+      width: 80%;
+      margin: 0 auto;
+      margin-top: 150rpx;
+      display: flex;
+      align-items: center;

-				.mytop_main_info_tx {
-					margin-right: 20upx;
-				}
+      .mytop_main_info_tx {
+        margin-right: 20rpx;
+      }

-				.mytop_main_test_name {
-					color: #fff;
-					font-size: 36upx;
-					font-weight: 600;
-				}
+      .mytop_main_test_name {
+        color: #fff;
+        font-size: 36rpx;
+        font-weight: 600;
+      }

-				.mytop_main_test_p {
-					color: #fff;
-					font-size: 26upx;
-					opacity: 0.6;
-					margin-top: 5upx;
-				}
-			}
-		}
+      .mytop_main_test_p {
+        color: #fff;
+        font-size: 26rpx;
+        opacity: 0.6;
+        margin-top: 5rpx;
+      }
+    }
+  }

-		.my_main {
-			width: 100%;
-			padding: 40upx;
-			margin-top: -120upx;
-			box-sizing: border-box;
+  .my_main {
+    width: 100%;
+    padding: 40rpx;
+    margin-top: -120rpx;
+    box-sizing: border-box;

-			.my_main_info {
-				width: 100%;
-				background: #fff;
-				padding: 20upx 40upx;
-				box-sizing: border-box;
-				border-radius: 10upx;
-				box-shadow: 0 0 20upx #eee;
+    .my_main_info {
+      width: 100%;
+      background: #fff;
+      padding: 20rpx 40rpx;
+      box-sizing: border-box;
+      border-radius: 10rpx;
+      box-shadow: 0 0 20rpx #eee;

-				.my_main_info_wrap {
-					width: 100%;
-					display: flex;
-					align-items: center;
+      .my_main_info_wrap {
+        width: 100%;
+        display: flex;
+        align-items: center;

-					.my_main_info_wrap_img {
-						width: 50upx;
-						height: 50upx;
-						margin-top: 10upx;
-					}
+        .my_main_info_wrap_img {
+          width: 50rpx;
+          height: 50rpx;
+          margin-top: 10rpx;
+        }

-					.my_main_info_wrap_info {
-						flex: 1;
-						border-bottom: 1upx solid #eee;
-						display: flex;
-						justify-content: space-between;
-						align-items: center;
-						padding: 30upx 0upx;
-						padding-left: 10upx;
+        .my_main_info_wrap_info {
+          flex: 1;
+          border-bottom: 1rpx solid #eee;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          padding: 30rpx 0rpx;
+          padding-left: 10rpx;

-						.my_main_info_wrap_info_lable {
+          .my_main_info_wrap_info_lable {

-						}
-					}
-				}
+          }
+        }
+      }

-				.my_main_info_wrap:last-child .my_main_info_wrap_info {
-					border-bottom: none;
-				}
-			}
-		}
-	}
+      .my_main_info_wrap:last-child .my_main_info_wrap_info {
+        border-bottom: none;
+      }
+    }
+  }
+}

-	.layout_btner {
-		width: 100%;
-		text-align: center;
-		padding: 0upx 40upx;
-		box-sizing: border-box;
+.layout_btner {
+  width: 100%;
+  text-align: center;
+  padding: 0rpx 40rpx;
+  box-sizing: border-box;


-		.layout_btn {
-			width: 100%;
-			text-align: center;
-			padding: 20upx;
-			background: #e72f2f;
-			box-sizing: border-box;
-			color: #fff;
-			box-shadow: 0 0 20upx #eee;
-			border-radius: 10upx;
-		}
-	}
+  .layout_btn {
+    width: 100%;
+    text-align: center;
+    padding: 20rpx;
+    background: #e72f2f;
+    box-sizing: border-box;
+    color: #fff;
+    box-shadow: 0 0 20rpx #eee;
+    border-radius: 10rpx;
+  }
+}
 </style>
--- a/pages/mine/information/index.vue
+++ b/pages/mine/information/index.vue
@ -1,162 +1,234 @@
 <template>
-	<view class="content">
-		<view class="card">
-			<u-cell-group>
-				<u-cell title="照片">
-					<template #value>
-						<u--image :src="info.userPhoto" shape="circle" width="100upx" height="100upx"></u--image>
-					</template>
-				</u-cell>
-				<u-cell title="姓名" :value="info.NAME"></u-cell>
-				<u-cell title="性别" :value="info.SEX === '1' ? '女' : '男'">
-					<template #value>
-						{{info.SEX === '1' ? '女' : ''}}
-						{{info.SEX === '0' ? '男' : ''}}
-					</template>
-				</u-cell>
-				<u-cell title="出生年月" :value="info.DATE_OF_BIRTH"></u-cell>
-				<u-cell title="年龄" :value="info.AGE"></u-cell>
-				<u-cell title="身份证" :value="info.CARD_ID"></u-cell>
-				<u-cell title="身份证照片">
-					<template #value>
-						<view v-for="(item,index) in userCardIDPhotoFile" :key="index"
-							style="display: flex;justify-content: space-between">
-							<u--image :src="item" width="100upx" height="100upx" style="margin-left: 10upx;"
-								@click="fnPreview(userCardIDPhotoFile)"></u--image>
-						</view>
-					</template>
-				</u-cell>
-				<u-cell title="民族" :value="info.minzuName"></u-cell>
-				<u-cell title="户口所在地">
-					<template #value>
-						<u--text :lines="2" align="right" :text="info.HKLOCAL"></u--text>
-					</template>
-				</u-cell>
-				<u-cell title="现住址">
-					<template #value>
-						<u--text :lines="2" align="right" :text="info.ADDRESS"></u--text>
-					</template>
-				</u-cell>
-				<u-cell title="联系电话" :value="info.PHONE"></u-cell>
-				<u-cell title="婚姻状况" :value="info.MARITALSTATUS == 0 ? '未婚':'已婚'"></u-cell>
-				<u-cell title="政治面貌" :value="info.zzName"></u-cell>
-				<u-cell v-if="info.POLITICAL_STATUS == 'zhonggongdangyuan'" title="入党时间" :value="info.POLITICAL_TIME"></u-cell>
-				<u-cell title="是否缴纳社保" :value="info.IS_SOCIAL_NAME"></u-cell>
-				<u-cell title="社会保障号" v-if="info.IS_SOCIAL==='1'" :value="info.SOCIAL_NUMBER"></u-cell>
-				<u-cell title="社会保障卡照片" v-if="info.IS_SOCIAL==='1'" >
-					<template #value>
-						<view v-for="(item,index) in socialPhotoFile" :key="index"
-							style="display: flex;justify-content: space-between">
-							<u--image :src="item" width="100upx" height="100upx" style="margin-left: 10upx;"
-								@click="fnPreview(socialPhotoFile)"></u--image>
-						</view>
-					</template>
-				</u-cell>
-				<u-cell title="是否按期缴纳工伤保险" :value="info.IS_INJURIES_PAY_NAME"></u-cell>
-				<u-cell title="工伤保险有效期" v-if="info.IS_INJURIES_PAY==='1'" :value="info.IS_INJURIES_PAY_TIME"></u-cell>
-				<u-cell title="工伤保险凭证" v-if="info.IS_INJURIES_PAY==='1'">
-					<template #value>
-						<view v-for="(item,index) in injuriesPayTiemFile" :key="index"
-							style="display: flex;justify-content: space-between">
-							<u--image :src="item" width="100upx" height="100upx" style="margin-left: 10upx;"
-								@click="fnPreview(injuriesPayTiemFile)"></u--image>
-						</view>
-					</template>
-				</u-cell>
-				<u-cell title="是否流动人员" :value="info.ISFLOW_NAME"></u-cell>
-			</u-cell-group>
-		</view>
-	</view>
+  <view class="content">
+    <view class="card">
+      <u-cell-group>
+        <u-cell title="照片">
+          <template #value>
+            <u--image :src="info.userPhoto" shape="circle" width="100rpx" height="100rpx"></u--image>
+          </template>
+        </u-cell>
+        <u-cell title="姓名" :value="info.NAME"></u-cell>
+        <u-cell title="性别" :value="info.SEX === '1' ? '女' : '男'">
+          <template #value>
+            {{ info.SEX === '1' ? '女' : '' }}
+            {{ info.SEX === '0' ? '男' : '' }}
+          </template>
+        </u-cell>
+        <u-cell title="出生年月" :value="info.DATE_OF_BIRTH"></u-cell>
+        <u-cell title="年龄" :value="info.AGE"></u-cell>
+        <u-cell title="身份证" :value="info.CARD_ID" @blur="fnIDCardDeduplication"></u-cell>
+        <u-cell title="身份证照片">
+          <template #value>
+            <view v-for="(item,index) in userCardIDPhotoFile" :key="index"
+                  style="display: flex;justify-content: space-between;margin-left: 10rpx;">
+              <u--image :src="item" width="100rpx" height="100rpx"
+                        @click="fnPreview(userCardIDPhotoFile)"></u--image>
+            </view>
+          </template>
+        </u-cell>
+        <u-cell title="民族" :value="info.minzuName"></u-cell>
+        <u-cell title="户口所在地">
+          <template #value>
+            <u--text :lines="2" align="right" :text="info.HKLOCAL"></u--text>
+          </template>
+        </u-cell>
+        <u-cell title="现住址">
+          <template #value>
+            <u--text :lines="2" align="right" :text="info.ADDRESS"></u--text>
+          </template>
+        </u-cell>
+        <u-cell title="联系电话" :value="info.PHONE"></u-cell>
+        <u-cell title="婚姻状况" :value="info.MARITALSTATUS == 0 ? '未婚':'已婚'"></u-cell>
+        <u-cell title="政治面貌" :value="info.zzName"></u-cell>
+        <u-cell v-if="info.POLITICAL_STATUS == 'zhonggongdangyuan'" title="入党时间"
+                :value="info.POLITICAL_TIME"></u-cell>
+        <u-cell title="是否缴纳社保" :value="info.IS_SOCIAL_NAME"></u-cell>
+        <!-- 用v-if会出现渲染问题导致出现两行相同的数据 所以改成v-show modify by water_xu 2024.7.19 -->
+        <u-cell title="社会保障号" v-show="info.IS_SOCIAL==='1'" :value="info.SOCIAL_NUMBER"></u-cell>
+        <u-cell title="社会保障卡照片" v-show="info.IS_SOCIAL==='1'">
+          <template #value>
+            <view v-for="(item,index) in socialPhotoFile" :key="index"
+                  style="display: flex;justify-content: space-between;margin-left: 10rpx;">
+              <u--image :src="item" width="100rpx" height="100rpx"
+                        @click="fnPreview(socialPhotoFile)"></u--image>
+            </view>
+          </template>
+        </u-cell>
+        <u-cell title="是否签订劳动合同" :value="info.IS_SIGN_LABOR_NAME"></u-cell>
+        <u-cell title="合同图片" v-show="info.IS_SIGN_LABOR==='1'">
+          <template #value>
+            <view v-for="(item,index) in contractFile" :key="index"
+                  style="display: flex;justify-content: space-between;margin-left: 10rpx;">
+              <u--image :src="item" width="100rpx" height="100rpx"
+                        @click="fnPreview(contractFile)"></u--image>
+            </view>
+          </template>
+        </u-cell>
+        <u-cell title="是否缴纳商业保险" :value="info.ISPAY_NAME"></u-cell>
+        <u-cell title="商业保险单号" v-show="info.ISPAY==='1'" :value="info.ISPAY_NUMBER"></u-cell>
+        <u-cell title="保险图片" v-show="info.ISPAY==='1'">
+          <template #value>
+            <view v-for="(item,index) in insuranceFile" :key="index"
+                  style="display: flex;justify-content: space-between;margin-left: 10rpx;">
+              <u--image :src="item" width="100rpx" height="100rpx"
+                        @click="fnPreview(insuranceFile)"></u--image>
+            </view>
+          </template>
+        </u-cell>
+        <u-cell title="是否按期缴纳工伤保险" :value="info.IS_INJURIES_PAY_NAME"></u-cell>
+        <u-cell title="工伤保险有效期" v-show="info.IS_INJURIES_PAY==='1'" :value="info.IS_INJURIES_PAY_TIME"></u-cell>
+        <u-cell title="工伤保险凭证" v-show="info.IS_INJURIES_PAY==='1'">
+          <template #value>
+            <view v-for="(item,index) in injuriesPayTiemFile" :key="index"
+                  style="display: flex;justify-content: space-between;margin-left: 10rpx;">
+              <u--image :src="item" width="100rpx" height="100rpx"
+                        @click="fnPreview(injuriesPayTiemFile)"></u--image>
+            </view>
+          </template>
+        </u-cell>
+        <u-cell title="岗位名称(工种)" :value="info.POST_ID"></u-cell>
+        <u-cell title="是否参加三级安全培训" :value="info.IS_LEVEL_THREE_NAME"></u-cell>
+        <u-cell title="三级安全培训照片" v-show="info.IS_LEVEL_THREE==='1'">
+          <template #value>
+            <view v-for="(item,index) in photosOfLevel" :key="index"
+                  style="display: flex;justify-content: space-between;margin-left: 10rpx;">
+              <u--image :src="item" width="100rpx" height="100rpx"
+                        @click="fnPreview(photosOfLevel)"></u--image>
+            </view>
+          </template>
+        </u-cell>
+        <u-cell title="是否流动人员" :value="info.ISFLOW_NAME"></u-cell>
+      </u-cell-group>
+    </view>
+    <fab-button type="edit" @click="$u.route({url: '/pages/mine/information/update'})"/>
+  </view>
 </template>

 <script>
-	import {
-		getUserInfo,
-		getEmployedBy
-	} from "../../../api";
+import {
+  getUserInfo,
+  getEmployedBy, getIDCardDeduplication
+} from "../../../api";
+import FabButton from "@/components/fab_button/index.vue";

-	export default {
-		data() {
-			return {
-				info: {},
-				userCardIDPhotoFile: [],
-				socialPhotoFile: [],
-				injuriesPayTiemFile:[],
-				EMPLOYMENT_APPLY_MANAGEMENT_ID:'',
-			}
-		},
-		onNavigationBarButtonTap(e) {
-			if (e.index === 0) {
-				uni.$u.route({
-					url: '/pages/mine/information/update'
-				})
-			}
-		},
-		onShow() {
-			this.fnGetData()
-		},
-		computed: {
-			userInfo() {
-				return this.$store.getters.getUserInfo
-			}
-		},
-		methods: {
-			fnPreview(urls) {
-				uni.previewImage({
-					urls
-				})
-			},
-			async fnGetData() {
-				this.userCardIDPhotoFile = []
-				this.socialPhotoFile = []
-				this.injuriesPayTiemFile = []
-				let Employed =  await getEmployedBy({
-					showCount: 10,
-					currentPage: 1,
-					DEPART_STATE:'0'
-				})
-				if(Employed.varList.length>0){
-					Employed.varList.forEach(item => {
-						console.log(item.EMPLOYMENT_APPLY_MANAGEMENT_ID);
-						this.EMPLOYMENT_APPLY_MANAGEMENT_ID = item.EMPLOYMENT_APPLY_MANAGEMENT_ID
-					})
-				}
-				let resData = await getUserInfo({
-					CORPINFO_ID: this.userInfo.CORPINFO_ID,
-					EMPLOYMENT_APPLY_MANAGEMENT_ID:this.EMPLOYMENT_APPLY_MANAGEMENT_ID
-				})
-				this.info = resData.pd
-				for (let i = 0; i < resData.userCardIDPhotoFile.length; i++) {
-					this.userCardIDPhotoFile.push(this.$filePath + resData.userCardIDPhotoFile[i].FILEPATH)
-				}
-				for (let i = 0; i < resData.socialPhotoFile.length; i++) {
-					this.socialPhotoFile.push(this.$filePath + resData.socialPhotoFile[i].FILEPATH)
-				}
-				
-				for (let i = 0; i < resData.workInsurancePhotoFile.length; i++) {
-					this.injuriesPayTiemFile.push(this.$filePath + resData.workInsurancePhotoFile[i].FILEPATH)
-				}
-				if (this.info.ISFLOW === '0') {
-					this.info.ISFLOW_NAME = '否'
-				} else if (this.info.ISFLOW === '1') {
-					this.info.ISFLOW_NAME = '是'
-				}
-				if (this.info.IS_SOCIAL === '0') {
-					this.info.IS_SOCIAL_NAME = '否'
-				} else if (this.info.IS_SOCIAL === '1') {
-					this.info.IS_SOCIAL_NAME = '是'
-				}
-				if (this.info.IS_INJURIES_PAY === '0') {
-					this.info.IS_INJURIES_PAY_NAME = '否'
-				} else if (this.info.IS_INJURIES_PAY === '1') {
-					this.info.IS_INJURIES_PAY_NAME = '是'
-				}
-				if (resData.userPhotoFile.length > 0) {
-					this.$set(this.info, 'userPhoto', this.$filePath + resData.userPhotoFile[0].FILEPATH)
-				}
-			}
-		},
-	}
+export default {
+  components: {FabButton},
+  data() {
+    return {
+      info: {},
+      userCardIDPhotoFile: [],
+      socialPhotoFile: [],
+      injuriesPayTiemFile: [],
+      photosOfLevel: [],
+      contractFile: [],
+      insuranceFile: [],
+      EMPLOYMENT_APPLY_MANAGEMENT_ID: '',
+    }
+  },
+  onShow() {
+    this.fnGetData()
+  },
+  computed: {
+    userInfo() {
+      return this.$store.getters.getUserInfo
+    }
+  },
+  methods: {
+    async fnIDCardDeduplication(CARD_ID = this.form.CARD_ID) {
+      let resData = await getIDCardDeduplication({CARD_ID})
+      if (resData.pd) {
+        uni.$u.toast('身份证号重复')
+        return true
+      }
+      return false
+    },
+    fnPreview(urls) {
+      uni.previewImage({
+        urls
+      })
+    },
+    async fnGetData() {
+      this.userCardIDPhotoFile = []
+      this.socialPhotoFile = []
+      this.injuriesPayTiemFile = []
+      this.contractFile = []
+      this.photosOfLevel = []
+      this.insuranceFile = []
+      let Employed = await getEmployedBy({
+        showCount: 10,
+        currentPage: 1,
+        DEPART_STATE: '0'
+      })
+      if (Employed.varList.length > 0) {
+        Employed.varList.forEach(item => {
+          console.log(item.EMPLOYMENT_APPLY_MANAGEMENT_ID);
+          this.EMPLOYMENT_APPLY_MANAGEMENT_ID = item.EMPLOYMENT_APPLY_MANAGEMENT_ID
+        })
+      }
+      let resData = await getUserInfo({
+        CORPINFO_ID: this.userInfo.CORPINFO_ID,
+        EMPLOYMENT_APPLY_MANAGEMENT_ID: this.EMPLOYMENT_APPLY_MANAGEMENT_ID
+      })
+      this.info = resData.pd
+      for (let i = 0; i < resData.userCardIDPhotoFile.length; i++) {
+        this.userCardIDPhotoFile.push(this.$filePath + resData.userCardIDPhotoFile[i].FILEPATH)
+      }
+      for (let i = 0; i < resData.socialPhotoFile.length; i++) {
+        this.socialPhotoFile.push(this.$filePath + resData.socialPhotoFile[i].FILEPATH)
+      }
+
+      for (let i = 0; i < resData.workInsurancePhotoFile.length; i++) {
+        this.injuriesPayTiemFile.push(this.$filePath + resData.workInsurancePhotoFile[i].FILEPATH)
+      }
+
+      for (let i = 0; i < resData.contractFile.length; i++) {
+        this.contractFile.push(this.$filePath + resData.contractFile[i].FILEPATH)
+      }
+
+      for (let i = 0; i < resData.photosOfLevel.length; i++) {
+        this.photosOfLevel.push(this.$filePath + resData.photosOfLevel[i].FILEPATH)
+      }
+
+      for (let i = 0; i < resData.insuranceFile.length; i++) {
+        this.insuranceFile.push(this.$filePath + resData.insuranceFile[i].FILEPATH)
+      }
+
+      if (this.info.ISFLOW === '0') {
+        this.info.ISFLOW_NAME = '否'
+      } else if (this.info.ISFLOW === '1') {
+        this.info.ISFLOW_NAME = '是'
+      }
+      if (this.info.IS_SOCIAL === '0') {
+        this.info.IS_SOCIAL_NAME = '否'
+      } else if (this.info.IS_SOCIAL === '1') {
+        this.info.IS_SOCIAL_NAME = '是'
+      }
+      if (this.info.IS_INJURIES_PAY === '0') {
+        this.info.IS_INJURIES_PAY_NAME = '否'
+      } else if (this.info.IS_INJURIES_PAY === '1') {
+        this.info.IS_INJURIES_PAY_NAME = '是'
+      }
+      if (this.info.IS_SIGN_LABOR === '0') {
+        this.info.IS_SIGN_LABOR_NAME = '否'
+      } else if (this.info.IS_SIGN_LABOR === '1') {
+        this.info.IS_SIGN_LABOR_NAME = '是'
+      }
+      if (this.info.IS_LEVEL_THREE === '0') {
+        this.info.IS_LEVEL_THREE_NAME = '否'
+      } else if (this.info.IS_LEVEL_THREE === '1') {
+        this.info.IS_LEVEL_THREE_NAME = '是'
+      }
+      if (this.info.ISPAY === '1') {
+        this.info.ISPAY_NAME = '是'
+      } else {
+        this.info.ISPAY_NAME = '否'
+      }
+      if (resData.userPhotoFile.length > 0) {
+        this.$set(this.info, 'userPhoto', this.$filePath + resData.userPhotoFile[0].FILEPATH)
+      }
+    }
+  },
+}
 </script>

 <style scoped>
--- a/pages/mine/information/update.vue
+++ b/pages/mine/information/update.vue
--- a/pages/mine/privacy/privacy.vue
+++ b/pages/mine/privacy/privacy.vue
@ -1,15 +1,13 @@
 <template>
  <view class="content">
    <view>
-        <web-view src="https://skqhdg.porthebei.com:9006/xieyi/privacy.html"></web-view>
+      <web-view src="https://skqhdg.porthebei.com:9006/xieyi/privacy.html"></web-view>
    </view>
  </view>
 </template>

 <script>
-export default {
-
-}
+export default {}
 </script>

 <style scoped>
--- a/pages/related_party_units/add.vue
+++ b/pages/related_party_units/add.vue
--- a/pages/related_party_units/edit.vue
+++ b/pages/related_party_units/edit.vue
--- a/pages/related_party_units/view.vue
+++ b/pages/related_party_units/view.vue
@ -1,256 +1,256 @@
 <template>
-	<view>
-		<view class="content" style="padding: 10px;">
-			<view class="card">
-				<view class="text_content">
-					<view class="title title_left">基础信息</view>
-					<view class="title_right" @click="fnGoEditUserInfo">修改</view>
-				</view>
-				<u-cell-group>
-					<u-cell title="照片">
-						<template #value>
-							<u--image :src="info.userPhoto" shape="circle" width="100upx" height="100upx"></u--image>
-						</template>
-					</u-cell>
-					<u-cell title="姓名" :value="info.NAME"></u-cell>
-					<u-cell title="性别" :value="info.SEX === '1' ? '女' : '男'">
-						<template #value>
-							{{info.SEX === '1' ? '女' : ''}}
-							{{info.SEX === '0' ? '男' : ''}}
-						</template>
-					</u-cell>
-					<u-cell title="出生年月" :value="info.DATE_OF_BIRTH"></u-cell>
-					<u-cell title="年龄" :value="info.AGE"></u-cell>
-					<u-cell title="身份证" :value="info.CARD_ID"></u-cell>
-					<u-cell title="身份证照片">
-						<template #value>
-							<view v-for="(item,index) in userCardIDPhotoFile" :key="index"
-								style="display: flex;justify-content: space-between">
-								<u--image :src="item" width="100upx" height="100upx" style="margin-left: 10upx;"
-									@click="fnPreview(userCardIDPhotoFile)"></u--image>
-							</view>
-						</template>
-					</u-cell>
-					<u-cell title="民族" :value="info.NATIONALITY_NAME"></u-cell>
-					<u-cell title="户口所在地">
-						<template #value>
-							<u--text :lines="2" align="right" :text="info.HKLOCAL"></u--text>
-						</template>
-					</u-cell>
-					<u-cell title="现住址">
-						<template #value>
-							<u--text :lines="2" align="right" :text="info.ADDRESS"></u--text>
-						</template>
-					</u-cell>
-					<u-cell title="联系电话" :value="info.PHONE"></u-cell>
-					<u-cell title="婚姻状况" :value="info.MARITALSTATUS_NAME"></u-cell>
-					<u-cell title="政治面貌" :value="info.POLITICAL_STATUS_NAME"></u-cell>
-					<u-cell v-if="info.POLITICAL_STATUS == 'zhonggongdangyuan'" title="入党时间" :value="info.POLITICAL_TIME"></u-cell>
-					
-					
-					<u-cell title="社会保障号" :value="info.SOCIAL_NUMBER"></u-cell>
-					<u-cell title="社会保障卡照片">
-						<template #value>
-							<view v-for="(item,index) in socialPhotoFile" :key="index"
-								style="display: flex;justify-content: space-between">
-								<u--image :src="item" width="100upx" height="100upx" style="margin-left: 10upx;"
-									@click="fnPreview(socialPhotoFile)"></u--image>
-							</view>
-						</template>
-					</u-cell>
-					<u-cell title="是否流动人员" :value="info.ISFLOW == '0' ? '否' : '是'"></u-cell>
-				</u-cell-group>
-			</view>
-		</view>
-		<view class="content" style="padding: 10px">
-			<view class="card">
-				<view class="text_content">
-					<view class="title title_left">企业就职信息</view>
-					<view v-if = "info.DEPART_STATE == '0'" class="title_right" @click="goEdit">修改</view>
-					<view v-else class="title_right_red">已离职</view>
-				</view>
-				<u-cell-group>
-					<u-cell title="岗位名称" :value="info.POST_ID"></u-cell>
-					<u-cell title="本企业从业开始日期" :value="info.CORP_START_DATE"></u-cell>
-					<u-cell title="本岗位从业开始日期" :value="info.ENTRY_DATE"></u-cell>
-					<u-cell title="是否签署劳动合同" :value="info.IS_SIGN_LABOR == '0' ? '否' : '是'"></u-cell>
-					<u-cell title="劳动合同附件" v-show="info.IS_SIGN_LABOR === '1'">
-						<template #value>
-							<view v-for="(item,index) in contractFile" :key="index"
-								style="display: flex;justify-content: space-between">
-								<u--image :src="item" width="100upx" height="100upx" style="margin-left: 10upx;"
-									@click="fnPreview(contractFile)"></u--image>
-							</view>
-						</template>
-					</u-cell>
-					<u-cell title="是否缴纳工伤保险" :value="info.IS_INJURIES_PAY == '0' ? '否' : '是'"></u-cell>
-					<u-cell title="工伤有效期" v-show="info.IS_INJURIES_PAY === '1'" :value="info.IS_INJURIES_PAY_TIME">
-					</u-cell>
-					<u-cell title="工伤保险凭证" v-show="info.IS_INJURIES_PAY === '1'">
-						<template #value>
-							<view v-for="(item,index) in workInsurancePhotoFile" :key="index"
-								style="display: flex;justify-content: space-between">
-								<u--image :src="item" width="100upx" height="100upx" style="margin-left: 10upx;"
-									@click="fnPreview(workInsurancePhotoFile)"></u--image>
-							</view>
-						</template>
-					</u-cell>
-					<u-cell title="是否缴纳商业保险" :value="info.ISPAY == '0' ? '否' : '是'"></u-cell>
-					<u-cell title="商业保险单号" v-show="info.ISPAY === '1'" :value="info.ISPAY_NUMBER"></u-cell>
-					<u-cell title="保险附件" v-show="info.ISPAY === '1'">
-						<template #value>
-							<view v-for="(item,index) in insuranceFile" :key="index"
-								style="display: flex;justify-content: space-between">
-								<u--image :src="item" width="100upx" height="100upx" style="margin-left: 10upx;"
-									@click="fnPreview(insuranceFile)"></u--image>
-							</view>
-						</template>
-					</u-cell>
-					<u-cell title="是否参加三级安全培训" :value="info.IS_LEVEL_THREE == '0' ? '否' : '是'"></u-cell>
-					<!-- <u-cell title="是否开展入场安全告知" :value="info.IS_SAFETY_TELL == '0' ? '否' : '是'"></u-cell> -->
-					<u-cell title="身体状况是否适应本岗位工作" :value="info.IS_BODY_ADAPT == '0' ? '否' : '是'"></u-cell>
-					<u-cell title="是否特殊工种" :value="info.IS_SPECIAL_JOB == '0' ? '否' : '是'"></u-cell>
-					<!-- <u-cell title="是否流动人员" :value="info.ISFLOW == '0' ? '否' : '是'"></u-cell> -->
-					<!-- <u-cell title="审核意见" v-show="info.AUDIT_REMARKS != ''" :value="info.AUDIT_REMARKS"></u-cell>-->
-				</u-cell-group>
-			</view>
-		</view>
-	</view>
+  <view>
+    <view class="content" style="padding: 10px;">
+      <view class="card">
+        <view class="text_content">
+          <view class="title title_left">基础信息</view>
+          <!--					<view class="title_right" @click="fnGoEditUserInfo">修改</view>-->
+        </view>
+        <u-cell-group>
+          <u-cell title="照片">
+            <template #value>
+              <u--image :src="info.userPhoto" shape="circle" width="100rpx" height="100rpx"></u--image>
+            </template>
+          </u-cell>
+          <u-cell title="姓名" :value="info.NAME"></u-cell>
+          <u-cell title="性别" :value="info.SEX === '1' ? '女' : '男'">
+            <template #value>
+              {{ info.SEX === '1' ? '女' : '' }}
+              {{ info.SEX === '0' ? '男' : '' }}
+            </template>
+          </u-cell>
+          <u-cell title="出生年月" :value="info.DATE_OF_BIRTH"></u-cell>
+          <u-cell title="年龄" :value="info.AGE"></u-cell>
+          <u-cell title="身份证" :value="info.CARD_ID"></u-cell>
+          <u-cell title="身份证照片">
+            <template #value>
+              <view v-for="(item,index) in userCardIDPhotoFile" :key="index"
+                    style="display: flex;justify-content: space-between;margin-left: 10rpx;">
+                <u--image :src="item" width="100rpx" height="100rpx"
+                          @click="fnPreview(userCardIDPhotoFile)"></u--image>
+              </view>
+            </template>
+          </u-cell>
+          <u-cell title="民族" :value="info.NATIONALITY_NAME"></u-cell>
+          <u-cell title="户口所在地">
+            <template #value>
+              <u--text :lines="2" align="right" :text="info.HKLOCAL"></u--text>
+            </template>
+          </u-cell>
+          <u-cell title="现住址">
+            <template #value>
+              <u--text :lines="2" align="right" :text="info.ADDRESS"></u--text>
+            </template>
+          </u-cell>
+          <u-cell title="联系电话" :value="info.PHONE"></u-cell>
+          <u-cell title="婚姻状况" :value="info.MARITALSTATUS_NAME"></u-cell>
+          <u-cell title="政治面貌" :value="info.POLITICAL_STATUS_NAME"></u-cell>
+          <u-cell v-if="info.POLITICAL_STATUS == 'zhonggongdangyuan'" title="入党时间"
+                  :value="info.POLITICAL_TIME"></u-cell>
+
+
+          <u-cell title="社会保障号" :value="info.SOCIAL_NUMBER"></u-cell>
+          <u-cell title="社会保障卡照片">
+            <template #value>
+              <view v-for="(item,index) in socialPhotoFile" :key="index"
+                    style="display: flex;justify-content: space-between;margin-left: 10rpx;">
+                <u--image :src="item" width="100rpx" height="100rpx"
+                          @click="fnPreview(socialPhotoFile)"></u--image>
+              </view>
+            </template>
+          </u-cell>
+          <u-cell title="是否流动人员" :value="info.ISFLOW == '0' ? '否' : '是'"></u-cell>
+        </u-cell-group>
+      </view>
+    </view>
+    <view class="content" style="padding: 10px">
+      <view class="card">
+        <view class="text_content">
+          <view class="title title_left">企业就职信息</view>
+          <!--					<view v-if = "info.DEPART_STATE == '0'" class="title_right" @click="goEdit">修改</view>-->
+          <!--					<view v-else class="title_right_red">已离职</view>-->
+          <view class="title_right_red" v-if="info.DEPART_STATE != '0'">已离职</view>
+        </view>
+        <u-cell-group>
+          <u-cell title="岗位名称" :value="info.POST_ID"></u-cell>
+          <!--					<u-cell title="本企业从业开始日期" :value="info.CORP_START_DATE"></u-cell>-->
+          <!--					<u-cell title="本岗位从业开始日期" :value="info.ENTRY_DATE"></u-cell>-->
+          <u-cell title="是否签署劳动合同" :value="info.IS_SIGN_LABOR == '0' ? '否' : '是'"></u-cell>
+          <u-cell title="劳动合同附件" v-show="info.IS_SIGN_LABOR === '1'">
+            <template #value>
+              <view v-for="(item,index) in contractFile" :key="index"
+                    style="display: flex;justify-content: space-between;margin-left: 10rpx;">
+                <u--image :src="item" width="100rpx" height="100rpx"
+                          @click="fnPreview(contractFile)"></u--image>
+              </view>
+            </template>
+          </u-cell>
+          <u-cell title="是否缴纳工伤保险" :value="info.IS_INJURIES_PAY == '0' ? '否' : '是'"></u-cell>
+          <u-cell title="工伤有效期" v-show="info.IS_INJURIES_PAY === '1'" :value="info.IS_INJURIES_PAY_TIME">
+          </u-cell>
+          <u-cell title="工伤保险凭证" v-show="info.IS_INJURIES_PAY === '1'">
+            <template #value>
+              <view v-for="(item,index) in workInsurancePhotoFile" :key="index"
+                    style="display: flex;justify-content: space-between;margin-left: 10rpx;">
+                <u--image :src="item" width="100rpx" height="100rpx"
+                          @click="fnPreview(workInsurancePhotoFile)"></u--image>
+              </view>
+            </template>
+          </u-cell>
+          <u-cell title="是否缴纳商业保险" :value="info.ISPAY == '0' ? '否' : '是'"></u-cell>
+          <u-cell title="商业保险单号" v-show="info.ISPAY === '1'" :value="info.ISPAY_NUMBER"></u-cell>
+          <u-cell title="保险附件" v-show="info.ISPAY === '1'">
+            <template #value>
+              <view v-for="(item,index) in insuranceFile" :key="index"
+                    style="display: flex;justify-content: space-between;margin-left: 10rpx;">
+                <u--image :src="item" width="100rpx" height="100rpx"
+                          @click="fnPreview(insuranceFile)"></u--image>
+              </view>
+            </template>
+          </u-cell>
+          <u-cell title="是否参加三级安全培训" :value="info.IS_LEVEL_THREE == '0' ? '否' : '是'"></u-cell>
+          <u-cell title="是否特殊工种" :value="info.IS_SPECIAL_JOB == '0' ? '否' : '是'"></u-cell>
+        </u-cell-group>
+      </view>
+    </view>
+  </view>

 </template>

 <script>
-	import {
-		getUserInfo
-	} from "../../api";
+import {
+  getUserInfo
+} from "../../api";

-	export default {
-		data() {
-			return {
-				info: {},
-				empInfo: {},
-				userPhoto: {},
-				contractFile: [],
-				userCardIDPhotoFile: [],
-				socialPhotoFile: [],
-				insuranceFile: [],
-				workInsurancePhotoFile: [],
-				EMPLOYMENT_APPLY_MANAGEMENT_ID: '',
-				CORPINFO_ID: '',
-				DEPART_STATE: ''
-			}
-		},
-		onNavigationBarButtonTap(e) {
-			if (e.index === 0) {
-				this.goEdit()
-			}
-		},
-		onLoad(query) {
-			this.EMPLOYMENT_APPLY_MANAGEMENT_ID = query.EMPLOYMENT_APPLY_MANAGEMENT_ID
-			this.CORPINFO_ID = query.CORPINFO_ID
-			if (query.DEPART_STATE != '0') {
-				this.DEPART_STATE = query.DEPART_STATE
-			}
-			this.fnGetData()
-		},
-		computed: {
-			userInfo() {
-				return this.$store.getters.getUserInfo
-			}
-		},
-		methods: {
-			fnGoEditUserInfo() {
-				uni.$u.route({
-					url: '/pages/mine/information/update'
-				})
-			},
-			goEdit() {
-				uni.$u.route({
-					url: '/pages/related_party_units/edit',
-					params: {
-						EMPLOYMENT_APPLY_MANAGEMENT_ID: this.EMPLOYMENT_APPLY_MANAGEMENT_ID,
-						CORPINFO_ID: this.CORPINFO_ID,
-						DEPART_STATE: this.DEPART_STATE
-					}
-				})
-			},
-			reloadx() {
-				this.contractFile = []
-				this.insuranceFile = []
-				this.userCardIDPhotoFile = []
-				this.socialPhotoFile = []
-				this.workInsurancePhotoFile = []
-				this.fnGetData()
-			},
-			async fnGetData() {
-				let resData = await getUserInfo({
-					// CORPINFO_ID:this.userInfo.CORPINFO_ID,
-					dataType: this.DEPART_STATE,
-					CORPINFO_ID: this.CORPINFO_ID,
-					EMPLOYMENT_APPLY_MANAGEMENT_ID: this.EMPLOYMENT_APPLY_MANAGEMENT_ID
-				})
-				this.info = resData.pd
-        if(resData.userCardIDPhotoFile){
-          for (let i = 0; i < resData.userCardIDPhotoFile.length; i++) {
-            this.userCardIDPhotoFile.push(this.$filePath + resData.userCardIDPhotoFile[i].FILEPATH)
-          }
+export default {
+  data() {
+    return {
+      info: {},
+      empInfo: {},
+      userPhoto: {},
+      contractFile: [],
+      userCardIDPhotoFile: [],
+      socialPhotoFile: [],
+      insuranceFile: [],
+      workInsurancePhotoFile: [],
+      EMPLOYMENT_APPLY_MANAGEMENT_ID: '',
+      CORPINFO_ID: '',
+      DEPART_STATE: ''
+    }
+  },
+  onNavigationBarButtonTap(e) {
+    if (e.index === 0) {
+      this.goEdit()
+    }
+  },
+  onLoad(query) {
+    this.EMPLOYMENT_APPLY_MANAGEMENT_ID = query.EMPLOYMENT_APPLY_MANAGEMENT_ID
+    this.CORPINFO_ID = query.CORPINFO_ID
+    // if (query.DEPART_STATE != '0') {
+    // 	this.DEPART_STATE = query.DEPART_STATE
+    // }
+    this.fnGetData()
+  },
+  computed: {
+    userInfo() {
+      return this.$store.getters.getUserInfo
+    }
+  },
+  methods: {
+    fnGoEditUserInfo() {
+      uni.$u.route({
+        url: '/pages/mine/information/update'
+      })
+    },
+    // goEdit() {
+    // 	uni.$u.route({
+    // 		url: '/pages/related_party_units/edit',
+    // 		params: {
+    // 			EMPLOYMENT_APPLY_MANAGEMENT_ID: this.EMPLOYMENT_APPLY_MANAGEMENT_ID,
+    // 			CORPINFO_ID: this.CORPINFO_ID,
+    // 			DEPART_STATE: this.DEPART_STATE
+    // 		}
+    // 	})
+    // },
+    reloadx() {
+      this.contractFile = []
+      this.insuranceFile = []
+      this.userCardIDPhotoFile = []
+      this.socialPhotoFile = []
+      this.workInsurancePhotoFile = []
+      this.fnGetData()
+    },
+    async fnGetData() {
+      let resData = await getUserInfo({
+        // CORPINFO_ID:this.userInfo.CORPINFO_ID,
+        dataType: this.DEPART_STATE,
+        CORPINFO_ID: this.CORPINFO_ID,
+        EMPLOYMENT_APPLY_MANAGEMENT_ID: this.EMPLOYMENT_APPLY_MANAGEMENT_ID
+      })
+      this.info = resData.pd
+      if (resData.userCardIDPhotoFile) {
+        for (let i = 0; i < resData.userCardIDPhotoFile.length; i++) {
+          this.userCardIDPhotoFile.push(this.$filePath + resData.userCardIDPhotoFile[i].FILEPATH)
        }
-        if(resData.socialPhotoFile){
-          for (let i = 0; i < resData.socialPhotoFile.length; i++) {
-            this.socialPhotoFile.push(this.$filePath + resData.socialPhotoFile[i].FILEPATH)
-          }
+      }
+      if (resData.socialPhotoFile) {
+        for (let i = 0; i < resData.socialPhotoFile.length; i++) {
+          this.socialPhotoFile.push(this.$filePath + resData.socialPhotoFile[i].FILEPATH)
        }
-        if(resData.contractFile){
-          for (let i = 0; i < resData.contractFile.length; i++) {
-            this.contractFile.push(this.$filePath + resData.contractFile[i].FILEPATH)
-          }
+      }
+      if (resData.contractFile) {
+        for (let i = 0; i < resData.contractFile.length; i++) {
+          this.contractFile.push(this.$filePath + resData.contractFile[i].FILEPATH)
        }
-        if(resData.insuranceFile){
-          for (let i = 0; i < resData.insuranceFile.length; i++) {
-            this.insuranceFile.push(this.$filePath + resData.insuranceFile[i].FILEPATH)
-          }
+      }
+      if (resData.insuranceFile) {
+        for (let i = 0; i < resData.insuranceFile.length; i++) {
+          this.insuranceFile.push(this.$filePath + resData.insuranceFile[i].FILEPATH)
        }
-        if(resData.workInsurancePhotoFile){
-          for (let i = 0; i < resData.workInsurancePhotoFile.length; i++) {
-            this.workInsurancePhotoFile.push(this.$filePath + resData.workInsurancePhotoFile[i].FILEPATH)
-          }
-        }
-        if(resData.userPhotoFile && resData.userPhotoFile.length>0){
-          this.$set(this.info, 'userPhoto', this.$filePath + resData.userPhotoFile[0].FILEPATH)
+      }
+      if (resData.workInsurancePhotoFile) {
+        for (let i = 0; i < resData.workInsurancePhotoFile.length; i++) {
+          this.workInsurancePhotoFile.push(this.$filePath + resData.workInsurancePhotoFile[i].FILEPATH)
        }
+      }
+      if (resData.userPhotoFile && resData.userPhotoFile.length > 0) {
+        this.$set(this.info, 'userPhoto', this.$filePath + resData.userPhotoFile[0].FILEPATH)
+        console.log(this.info.userPhoto)
+      }

-			},
-			fnPreview(urls) {
-				uni.previewImage({
-					urls
-				})
-			}
-		},
-	}
+    },
+    fnPreview(urls) {
+      uni.previewImage({
+        urls
+      })
+    }
+  },
+}
 </script>

 <style scoped>
-	.text_content {
-		display: flex;
-	}
+.text_content {
+  display: flex;
+}

-	.title_left {
-		font-size: 40rpx;
-		justify-content: flex-start;
-		float: left;
-		text-align: left;
-		margin-bottom: 12px;
-	}
+.title_left {
+  font-size: 40rpx;
+  justify-content: flex-start;
+  float: left;
+  text-align: left;
+  margin-bottom: 12px;
+}

-	.title_right {
-		margin-left: auto;
-		font-size: 30rpx;
-		margin-top: 5px;
-	}
-	.title_right_red {
-		margin-left: auto;
-		color: red;
-		font-size: 30rpx;
-		margin-top: 5px;
-	}
+.title_right {
+  margin-left: auto;
+  font-size: 30rpx;
+  margin-top: 5px;
+}
+
+.title_right_red {
+  margin-left: auto;
+  color: red;
+  font-size: 30rpx;
+  margin-top: 5px;
+}
 </style>
--- a/pages/service_unit_management/index.vue
+++ b/pages/service_unit_management/index.vue
@ -16,7 +16,8 @@
          </view>
          <view class="flex-between mt-10 subtitle">
            <view></view>
-            <u-button type="primary" text="查看" size="mini" class="bth-mini" @click="fnView(item.SERVICE_COMPANY_USER_MAP_ID)"></u-button>
+            <u-button type="primary" text="查看" size="mini"
+                      @click="fnView(item.SERVICE_COMPANY_USER_MAP_ID)"></u-button>
          </view>
        </view>
      </u-list-item>
@ -41,29 +42,29 @@ export default {
  onLoad() {
    this.resetList()
  },
-  methods:{
-    async getData(){
+  methods: {
+    async getData() {
      let resData = await getServiceUnitList({
        showCount: this.pageSize,
        currentPage: this.currentPage,
      });
-      this.list = [...this.list,...resData.varList];
+      this.list = [...this.list, ...resData.varList];
      this.totalPage = resData.page.totalPage;
    },
    resetList() {
-      this.pageSize= 10
-      this.currentPage= 1
+      this.pageSize = 10
+      this.currentPage = 1
      this.list = []
      this.getData()
    },
    scrolltolower() {
      this.currentPage++;
-      if(this.totalPage >= this.currentPage) this.getData();
+      if (this.totalPage >= this.currentPage) this.getData();
    },
-    fnView(SERVICE_COMPANY_USER_MAP_ID){
+    fnView(SERVICE_COMPANY_USER_MAP_ID) {
      uni.$u.route({
        url: '/pages/service_unit_management/view',
-        params:{
+        params: {
          SERVICE_COMPANY_USER_MAP_ID
        }
      })
--- a/pages/service_unit_management/view.vue
+++ b/pages/service_unit_management/view.vue
@ -20,7 +20,7 @@ export default {
  data() {
    return {
      SERVICE_COMPANY_USER_MAP_ID: '',
-      info:{}
+      info: {}
    }
  },
  onLoad(query) {
@ -30,7 +30,7 @@ export default {
  methods: {
    async fnGetData() {
      let resData = await getServiceUnitView({
-        SERVICE_COMPANY_USER_MAP_ID:this.SERVICE_COMPANY_USER_MAP_ID
+        SERVICE_COMPANY_USER_MAP_ID: this.SERVICE_COMPANY_USER_MAP_ID
      })
      this.info = resData.pd
    }
--- a/qa-prevention-xgf-app.iml
+++ b/qa-prevention-xgf-app.iml
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
--- a/qa-related-parties-gwj-app.iml
+++ b/qa-related-parties-gwj-app.iml
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
--- a/static/icon-apps/app_icons6.png
+++ b/static/icon-apps/app_icons6.png
--- a/styles/home_style.scss
+++ b/styles/home_style.scss
@ -12,53 +12,9 @@
 	}
 }
 .wui_banner{
-	height: 507upx;
+	height: 507rpx;
 	position: relative;
 	overflow: hidden;
-	.wui-bar{
-		display: flex;
-		align-items: center;
-		min-height: 100upx;
-		justify-content: flex-end;
-		z-index: 9999;
-		position: absolute;
-		width: 100%;
-		.search-form{
-			background: rgba(255,255,255,0.2);
-			border-radius: 100upx;
-			flex: 1;
-			height: 60upx;
-			line-height: 60upx;
-			font-size: 24upx;
-			color: #333333;
-			display: flex;
-			align-items: center;
-			margin: 0 30upx;
-			padding: 0 30upx;
-			.cuIcon-search{
-				color: rgba(255,255,255,0.5);
-				margin-right: 16upx;
-				font-size: 28upx;
-			}
-			input{
-				color: rgba(255,255,255,0.5);
-				flex: 1;
-				padding-right: 30upx;
-				height: 64upx;
-				line-height: 64upx;
-				font-size: 26upx;
-				background-color: transparent;
-				.phcolor{
-					color: rgba(255,255,255,0.5);
-				}
-			}
-		}
-		.icon-ui {
-			color: #fff;
-			font-size: 42upx;
-			margin-right: 22upx;
-		}
-	}
 	.banner_img{
 		z-index: 1;
 		width: 100%;
@ -74,11 +30,11 @@

 .home-apps {
 	position: relative;
-	top: -180upx;
+	top: -180rpx;
 	background-color: #fff;
-	padding: 30upx 20upx;
-	border-radius: 40upx;
-	margin: 0 30upx;
+	padding: 30rpx 20rpx;
+	border-radius: 40rpx;
+	margin: 0 30rpx;
 	display: flex;
 	flex-wrap:wrap;
 	.home-apps-item {
@ -88,14 +44,14 @@
 		flex-grow: 0;
 		width: 25%;
 		.text {
-			margin: 10upx 0;
-			font-size: 28upx;
+			margin: 10rpx 0;
+			font-size: 28rpx;
 			text-align: center;
-			width: 140upx;
+			width: 140rpx;
 		}
 		.home-apps-item-img {
-			width: 136upx;
-			height: 136upx;
+			width: 136rpx;
+			height: 136rpx;
 			image {
 				width: 100%;
 				height: 100%;
@ -105,39 +61,39 @@
 }
 .home-message{
 	position: relative;
-	top: -160upx;
-	height: 120upx;
+	top: -160rpx;
+	height: 120rpx;
 	background-color: #fff;
-	border-radius: 40upx;
-	margin: 0 30upx;
-	padding: 0 30upx;
+	border-radius: 40rpx;
+	margin: 0 30rpx;
+	padding: 0 30rpx;
 	display: flex;
 	align-items: center;
 	.home-title{
 		width: 54px;
 		height: 54px;
-		margin-right: 10upx;
+		margin-right: 10rpx;
 		image{
 			width: 100%;
 			height: 100%;
 		}
 	}
 	.home-content{
-		font-size: 28upx;
+		font-size: 28rpx;
 		flex: 1;
 	}
 	.home-more{
 		color: #ccc;
-		font-size: 26upx;
+		font-size: 26rpx;
 	}
 }
 .home-letters{
 	position: relative;
-	top: -140upx;
+	top: -140rpx;
 	background-color: #fff;
-	border-radius: 40upx;
-	margin: 0 30upx;
-	padding: 30upx;
+	border-radius: 40rpx;
+	margin: 0 30rpx;
+	padding: 30rpx;

 	.letters-title{
 		width: 80px;
@ -149,17 +105,17 @@
 	}
 	.letters-content{
 		.letters-item{
-			border-bottom: 1upx solid #e5e5e5;
-			padding: 20upx 0;
+			border-bottom: 1rpx solid #e5e5e5;
+			padding: 20rpx 0;
 			&:last-child{
 				border: none;
 			}
 			.lable{
-				font-size: 30upx;
+				font-size: 30rpx;
 				white-space: nowrap;
 			}
 			.font{
-				font-size: 28upx;
+				font-size: 28rpx;
 				color: #666;
 			}
 			.letters-title{
@ -185,14 +141,14 @@
 				align-items: flex-start;
 				justify-content: space-between;
 				width: 100%;
-				font-size: 30upx;
-				margin: 10upx 0;
+				font-size: 30rpx;
+				margin: 10rpx 0;
 			}
 			.letters-date{
 				display: flex;
 				align-items: center;
 				width: 100%;
-				font-size: 30upx;
+				font-size: 30rpx;

 			}
 		}
@ -200,7 +156,7 @@
 }
 .home-line{
 	position: relative;
-	top: -70upx;
+	top: -70rpx;
 	text-align: center;
 	color: #ccc;
 }
@ -213,19 +169,19 @@
 		z-index: 999;
 	}
 	.grid_item{
-		width: calc(47% - 4upx);
+		width: calc(47% - 4rpx);
 		display: block;
-		padding: 30upx 0;
+		padding: 30rpx 0;
 		color: #fff;
 		margin-left: 2%;
 		margin-top: 2%;
 		text-align: center;
 	background-image: linear-gradient(to bottom right, rgba(0,138,255,1), rgba(91,74,255,1));
-		border: 1upx solid #2084d9;
+		border: 1rpx solid #2084d9;
 		position: relative;
 		.grid_text{
 			display: flex;
-			padding-left: 30upx;
+			padding-left: 30rpx;
 			.grid_tut{
 				width: 85%;
 			}
@ -235,28 +191,28 @@


 .message_list{
-	padding: 30upx;
+	padding: 30rpx;
 	.message_item{
 		position: relative;
 		.message_flex{
-			width: calc(100% - 30upx);
+			width: calc(100% - 30rpx);
 			display: flex;
 			flex-direction: row;
 			justify-content: space-between;
 			align-items: center;
 			.fontstyle{
-				font-size: 32upx;
-				line-height: 60upx;
+				font-size: 32rpx;
+				line-height: 60rpx;
 			}
 			.font0{
-				font-size: 30upx;
+				font-size: 30rpx;
 				color: #666;
-				flex-basis: 72upx;
+				flex-basis: 72rpx;
 			}
 			.message_time{
-				font-size: 26upx;
+				font-size: 26rpx;
 				color: #666;
-				line-height: 60upx;
+				line-height: 60rpx;
 			}
 		}
 	}
@ -269,12 +225,12 @@
 		bottom: 0;
 		display: block;
 		margin: auto;
-		width: 30upx;
-		height: 30upx;
+		width: 30rpx;
+		height: 30rpx;
 		color: #b4b4b4;
 		content: "\e6a3";
 		text-align: center;
-		font-size: 34upx;
+		font-size: 34rpx;
 		font-family: cuIcon;
-		line-height: 30upx
+		line-height: 30rpx
 	}
--- a/styles/theme.scss
+++ b/styles/theme.scss
@ -1,154 +1,130 @@
-.ml-10{
-  margin-left: 20upx !important;
+.ml-10 {
+  margin-left: 20rpx !important;
 }
-.mt-10{
-  margin-top: 20upx !important;
+
+.mt-10 {
+  margin-top: 20rpx !important;
 }
-.mb-10{
-  margin-bottom: 20upx !important;
+
+.mb-10 {
+  margin-bottom: 20rpx !important;
 }
-.mr-10{
-  margin-right: 20upx !important;
+
+.mr-10 {
+  margin-right: 20rpx !important;
 }
-.m-10{
-  margin: 20upx !important;
+
+.m-10 {
+  margin: 20rpx !important;
 }
-.p-10{
-  padding: 20upx !important;
+
+.p-10 {
+  padding: 20rpx !important;
 }
-.pl-10{
-  padding-left: 20upx !important;
+
+.pl-10 {
+  padding-left: 20rpx !important;
 }
-.pr-10{
-  padding-right: 20upx !important;
+
+.pr-10 {
+  padding-right: 20rpx !important;
 }
-.pt-10{
-  padding-top: 20upx !important;
+
+.pt-10 {
+  padding-top: 20rpx !important;
 }
-.pb-10{
-  padding-bottom: 20upx !important;
+
+.pb-10 {
+  padding-bottom: 20rpx !important;
 }
-.w100{
+
+.w100 {
  width: 100%;
 }
-.flex1{
+
+.flex1 {
  flex: 1;
 }
-.pr{
+
+.pr {
  position: relative;
 }
-.border{
-    border: 1px solid #e5e5e5;
+
+.border {
+  border: 1px solid #e5e5e5;
 }
+
 .content {
  position: relative;
  min-height: 100vh;
  background-color: $uni-bg-color-grey;
 }
-.card{
-  padding: 20upx;
+
+.card {
+  padding: 20rpx;
  background-color: #FFFFFF;
 }
-.search{
+
+.search {
  border-bottom: 1px solid #ccc;
  display: flex;
  flex-direction: row;
-  .u-text{
-    width: 100upx !important;
+
+  .u-text {
+    width: 100rpx !important;
    flex: none !important;
  }
+
  .u-button {
-    height: 68upx !important;
+    height: 68rpx !important;
  }
-  .u-input__content__field-wrapper__field{
-    height: 42upx !important;
+
+  .u-input__content__field-wrapper__field {
+    height: 42rpx !important;
  }
 }
-.bth-mini{
-  width: auto !important;
-  border-radius: 15upx !important;
-  margin-left: unset;
-  margin-right: unset;
-}
-.bth{
-  flex: 1;
-  border-radius: 15upx !important;
-  margin-left: unset;
-  margin-right: unset;
-}
-.flex-between{
+
+.flex-between {
  display: flex;
  flex-direction: row;
  justify-content: space-between;
 }
-.flex-end{
+
+.flex-end {
  display: flex;
  flex-direction: row;
  justify-content: flex-end;
 }
-.flex-warp{
+
+.flex-warp {
  display: flex;
  flex-direction: row;
  flex-wrap: wrap;
 }
-.main-title{
+
+.main-title {
  color: #333333;
-  font-size: 30upx;
+  font-size: 30rpx;
 }
-.subtitle{
+
+.subtitle {
  color: #888888;
-  font-size: 26upx;
+  font-size: 26rpx;
 }
-.view-title{
-  border-left: 8upx solid #1d82fe;
-  .u-text{
-    padding-left: 10upx;
-    color: #353535 !important;
-  }
-}
-.title{
+
+.title {
  font-weight: bold;
  color: #000000;
-  font-size: 28upx;
+  font-size: 28rpx;
 }
-.title-none{
-  .u-cell__body__content,.u-cell__title{
-    display: none !important;
-  }
-}
-.title-show{
-  .u-cell__body__content,.u-cell__title{
-    display: flex !important;
-  }
-}
-.flex-none{
-  display: block;
-  .u-cell__body{
-    display: block !important;
-  }
-}
-.required{
-  &:before{
+
+.required {
+  &:before {
    content: '*';
    position: absolute;
    left: 0;
    color: #f56c6c;
-    font-size: 40upx;
+    font-size: 40rpx;
    font-weight: normal;
  }
 }
-.form-item-block{
-.u-form-item__body{
-  display: block !important;
-  .u-form-item__body__left{
-    width: 100% !important;
-  }
-  .u-form-item__body__right{
-    .u-form-item__body__right__content__slot{
-      justify-content: flex-start;
-      position: relative;
-      margin-left: 20upx;
-    }
-  }
-}
-}
--- a/styles/uview.scss
+++ b/styles/uview.scss
@ -1,17 +1,17 @@
 .u-list {
  .u-list-item {
-    padding: 20upx;
+    padding: 20rpx;
    background-color: #fff;
    border-bottom: 1px solid rgb(214, 215, 217);
  }
 }
 .u-textarea{
-  padding: 18upx;
+  padding: 18rpx;
 }
 .u-form-item__body__left__content__required{
  position: relative !important;
  left: 0 !important;
-  margin-right: 10upx;
+  margin-right: 10rpx;
 }
 .u-form-item__body__left{
  //flex: 1 !important;
@ -20,7 +20,7 @@
  .u-form-item__body__right__content__slot{
    justify-content: flex-end;
    position: relative;
-    padding-right: 20upx;
+    padding-right: 20rpx;
  }
  .u-text{
    justify-content: flex-end !important;
@ -30,19 +30,19 @@
  }
 }
 .u-text__value{
-  font-size: 28upx !important;
+  font-size: 28rpx !important;
 }
 .u-form-item__body__left__content__label{
-  font-size: 28upx !important;
+  font-size: 28rpx !important;
 }
 .u-tabs__wrapper__nav__item{
  flex: 1 !important;
 }
 .u-upload__deletable{
-  height: 40upx !important;
-  width: 40upx !important;
+  height: 40rpx !important;
+  width: 40rpx !important;
  .u-icon__icon{
-    font-size: 30upx !important;
-    line-height: 30upx !important;
+    font-size: 30rpx !important;
+    line-height: 30rpx !important;
  }
 }
Author	SHA1	Message	Date
huangyuxuan	fa39606861	(hyx_2024-10-23_tongbu) 用户名，身份证号中台校验	2024-10-23 14:30:25 +08:00
LiuJiaNan	0b6c61b5b3	兼容微信小程序	2024-09-30 09:40:54 +08:00
LiuJiaNan	8aa01ed294	Merge branch 'refs/heads/pet' into dev	2024-09-29 14:57:55 +08:00
water_xu	362552fc86	相关方 - 电子工牌培训不合格人员也会显示合格证bug	2024-08-29 09:53:08 +08:00
LiuJiaNan	ac49d4525f	upx单位改rpx	2024-08-27 15:04:44 +08:00
water_xu	6f0cbd3c31	Merge branch 'refs/heads/pet' into dev	2024-08-15 16:56:46 +08:00
water_xu	f7e87105f8	相关方 - 适配电子工牌 & 电子工牌显示条件修改	2024-08-02 11:12:19 +08:00
water_xu	2f1884a903	Merge remote-tracking branch 'refs/remotes/origin/pet' into dev # Conflicts: # pages/mine/information/index.vue	2024-07-30 16:24:27 +08:00
water_xu	f88d4e0856	相关方 - 人员离职再入职流程bug修正以及优化	2024-07-20 15:13:03 +08:00
liujun	99deba7cf2	解决app编译后显示项重复问题修复	2024-07-02 18:41:26 +08:00
liujun	3392c5c718	解决app编译后显示项重复问题修复	2024-07-02 17:53:59 +08:00
liujun	7036b72802	解决app编译后显示项重复问题修复	2024-07-02 17:16:10 +08:00
WenShiJun	58e1c1cc74	相关页面bug修改	2024-07-01 18:04:23 +08:00
liujun	4d1e6a7cf0	1、相关方app样式混乱更改 2、相关方流程审批bug修复	2024-06-13 18:06:18 +08:00
liujun	a964030d0e	相关方人员编辑按钮逻辑调整	2024-06-13 16:36:23 +08:00
liujun	1094bd3d82	bug修复	2024-06-13 15:52:27 +08:00
liujun	ce7d33dc34	相关方app端编辑信息bug修复	2024-06-07 09:29:05 +08:00
liujun	eee02bfa5a	相关方app端编辑信息bug修复	2024-06-06 17:33:07 +08:00
liujun	bbea3b58db	相关方app信息同步	2024-06-06 17:03:31 +08:00
liujun	287a51c891	相关方证书无法更换图片bug	2024-04-08 16:28:12 +08:00
liujun	1564af86d4	特种作业证书状态更新	2024-04-08 14:48:21 +08:00