chenjj 4 hete%!(EXTRA string=óta)
szülő
commit
a6daca2040

+ 11 - 7
components/cust-form/index.vue

@@ -28,7 +28,7 @@
                             trigger: ['blur']
                         }
                     ]" :required="true">
-                        <up-input v-model="formData.phonenumber" border="none" placeholder="请输入手机号"></up-input>
+                        <up-input v-model="formData.phonenumber" border="none" placeholder="请输入手机号" :disabled="!isCode"></up-input>
                     </up-form-item>
 
                     <up-form-item label="验证码" prop="code" labelWidth="94" borderBottom :rules="[
@@ -39,7 +39,7 @@
                             message: '请填写4位验证码',
                             trigger: ['blur']
                         }
-                    ]" :required="true" v-if="isCode">
+                    ]" :required="true" >
                         <up-input v-model="formData.code" border="none" placeholder="请填写验证码"></up-input>
                         <template #right>
                             <up-button @tap="getCode" :text="code_data.tips" type="success" size="mini"
@@ -237,27 +237,31 @@ function startFace() {
 
 function setData(data) {
     console.log('setData=>data', data);
+    Object.assign(formData, {
+                ...data,
+                sex: data.sex === 0 ? '男' : '女',
+    })
     for (let i = 0; i < props.column.length; i++) {
         const element = props.column[i];
 
+       
         if (element.type === 'cascader') {
             const key = data[element.key]
             // const key ='7'
 
             const lable = pickerRef.value.piceInit(key);
-            console.log('element.type', lable, key);
+            console.log('element.type', lable, key,element.key);
             Object.assign(formData, {
                 [element.key]: lable,
                 [element.key + 'key']: key
             })
+            console.log('eformData', formData);
+        }else {
+            
         }
 
     }
 
-    Object.assign(formData, {
-        ...data,
-        sex: data.sex === 0 ? '男' : '女',
-    })
 }
 
 function onSubmit() {

+ 2 - 1
components/picker/index.vue

@@ -140,8 +140,9 @@ function indexsToNames(indexs){
 
     return names;
         }
-const piceInit = (id) => {
+const piceInit = (key) => {
   try {
+    const id = key + '';
     console.log('piceInit-id',props.columnData,id);
   const indexs =  idToIndexs(props.columnData,id)
   console.log('piceInit-indexs',indexs);

+ 0 - 1
pages_home/pages/details/index.vue

@@ -145,7 +145,6 @@ const statusData = computed(() => {
     return {
         img: '/static/serverImg/home/yes.png',
         text: status_e[details.value.appStatus],
-        rejectReason: details.value.rejectReason
     }
 
 })

+ 1 - 5
pages_home/pages/register/index.vue

@@ -1,9 +1,5 @@
 <template>
 	<view class="register-main">
-		<up-alert description="您的注册被驳回,请查看驳回原因" type="warning" showIcon closable
-			v-if="details.appStatus === 3"></up-alert>
-		<up-alert description="您已完成账户注册" type="success" showIcon closable
-			v-if="!isAdd && details.appStatus !== 3"></up-alert>
 		<view class="register-user-info">
 			<FontTitle title="请完成注册信息填报" />
 			<CustForm :column="com_column" ref="cust_form_ref" :isCode="isAdd" />
@@ -21,7 +17,7 @@
 				v-if="item.permission.includes(data.key)" @onSubmit="onChange" />
 		</view>
 
-		<up-button type="primary" text="确定" @click="onSubmit" v-if="isAdd"></up-button>
+		<up-button type="primary" text="确定" @click="onSubmit" ></up-button>
 
 	</view>
 </template>