Merge remote-tracking branch 'origin/master'

src/views/platinum/platinum_customer_info/compoments/common-detail/index.vue

@@ -56,11 +56,13 @@ export default defineComponent({
         }
         watchEffect(() => {
             if (props.selectedRow.logincode) {
+                console.log('props.selectedRow', props.selectedRow);
+
                 const data = props.selectedRow;
                 // 个人
                 const person = [
                     { label: '客户类型', value: '个人' },
-                    { label: '姓名', value: data.customername },
+                    { label: '姓名', value: data.username },
                     { label: '身份证号码', value: formatValue(data.cardnum) },
                     { label: '手机号码', value: formatValue(data.mobile) },
                     { label: '身份证正面照', value: formatValue(getImgName(data.cardfrontphotourl)), className: 'blue' },

src/views/platinum/platinum_customer_info/compoments/modify/index.vue

@@ -356,10 +356,12 @@ export default defineComponent({
 
                 userid.value = props.selectedRow.userid;
                 mergeTwoObj(formState, props.selectedRow);
-                const { provinceid, cityid, attachment1, cardfrontphotourl, cardbackphotourl, parentuserid, userinfotype } = props.selectedRow;
+                const { provinceid, cityid, attachment1, cardfrontphotourl, cardbackphotourl, parentuserid, mobile, address } = props.selectedRow;
                 provinceid ? getCityList(provinceid) : (formState.provinceid = undefined);
                 cityid ? getDistrictList(cityid) : ((formState.cityid = undefined), (formState.districtid = undefined));
                 parentuserid ? (formState.areaid = parentuserid) : (formState.areaid = undefined);
+                formState.mobilephone = mobile;
+                formState.ipaddress = address;
                 // userinfotype ? (formState.userinfotype = userinfotype) : (formState.userinfotype = undefined);
                 if (attachment1) {
                     // 营业执照