问题修改1,7

miniprogram/subpages/checkIn/pages/checkIn/register/register.js

@@ -10,6 +10,14 @@ Page({
         look: true,
         informFlag: false,
         selectOption: [
+                { label: '党政机关', value: '0' },
+                { label: '事业单位', value: '1' },
+                { label: '国有企业', value: '2' },
+                { label: '私营企业', value: '3' },
+                { label: '集体企业', value: '4' },
+                { label: '外资企业、合资企业', value: '5' },
+                { label: '社会组织', value: '6' },
+                { label: '其他', value: '7' }
         ],
         selectedStatus: false,
         form: {
@@ -283,7 +291,6 @@ Page({
         })
     },
     pickerConfirm(e) {
-      
             this.setData({
                 'form.workType': e.detail.label,
                 selectedStatus: false
@@ -293,26 +300,8 @@ Page({
     //点击显示下拉
     handleCLickShow(e) {
         this.setData({
-            pickerValue: e.currentTarget.dataset.value,
             selectedStatus: true,
-            selectOption: []
         })
-        if (e.currentTarget.dataset.value == '0') {
-            this.setData({
-                selectOption: this.data.orgOptions
-            })
-        } else if (e.currentTarget.dataset.value == '1') {
-            this.setData({
-                selectOption: [{ label: '党政机关', value: '0' },
-                { label: '事业单位', value: '1' },
-                { label: '国有企业', value: '2' },
-                { label: '私营企业', value: '3' },
-                { label: '集体企业', value: '4' },
-                { label: '外资企业、合资企业', value: '5' },
-                { label: '社会组织', value: '6' },
-                { label: '其他', value: '7' }]
-            })
-        } 
     },
   
     showToast(title) {
@@ -403,7 +392,6 @@ Page({
         })
     },
     handleNext() {
-        console.log('11233');
         this.setData({
             informFlag: true
         })

miniprogram/subpages/checkIn/pages/checkIn/register/register.wxml

@@ -43,9 +43,9 @@
                 <!-- <text class="must">*</text> -->
                 <view class="title">单位性质</view>
             </view>
-           <view class="right" bind:tap="handleCLickShow" data-value='1'>
+           <view class="right"  bind:tap="handleCLickShow">
-                    <view class="{{form.workType?'picker':'picker gray-font'}}" >{{form.workType?form.workType:'请选择'}}</view>
+                    <view  class="{{form.workType?'picker':'picker gray-font'}}" >{{form.workType?form.workType:'请选择'}}</view>
-                </view>
+            </view>
         </view>
         <view class="list-item gray">
             <view class="left">
@@ -197,5 +197,5 @@
         <button type="warn" class="next" disabled="{{look}}" bind:tap="handleNext">下一步</button>
     </view>
 </block>
-<wux-picker cols="1" data-value="{{pickerValue}}" options="{{selectOption}}" value="{{selectedValuevalue}}" visible="{{selectedStatus}}"  bind:confirm="pickerConfirm" bind:cancel="pickerCancel">
+<wux-picker  cols="1"  options="{{selectOption}}" value="{{form.workType}}" visible="{{selectedStatus}}"  bind:confirm="pickerConfirm" controlled bind:cancel="pickerCancel">
 </wux-picker>

miniprogram/subpages/knight/pages/knight/observeResi/observeResi.js

@@ -29,7 +29,8 @@ Page({
         multiIds:[],
         multiIndex: [0, 0],
         submitStatus:false,
-        changeFlag:false
+        changeFlag:false,
+        wordInput:false
     },
 
     /**
@@ -80,7 +81,6 @@ Page({
      * 生命周期函数--监听页面显示
      */
     onShow() {
-        // this.getByLoginUser()
     },
 
     /**
@@ -124,6 +124,11 @@ Page({
           duration: 2000
         })
       },
+      bindFlagPartyChange(e){
+        this.setData({
+            'form.party': e.detail.value
+        })
+      },
       bindMultiPickerChange() {
         this.setData({
             'form.allDeptIds':['1175270520603930625',this.data.multiIds[0].value,this.data.multiIds[1].value],
@@ -185,18 +190,6 @@ Page({
             changeFlag:true
         })
       },
-    getByLoginUser(){
-       
-        api.getByLoginUser().then(res=>{
-            if (res.code !== 0) {
-                return this.$message.error(res.msg)
-              }
-              let arr = res.data.options[0].children.filter((item)=>(item.children))
-              this.setData({
-                orgOptions : arr
-              })
-        })
-    },
        //姓名双向绑定
        bindRealNameInput (e) {
         this.setData({
@@ -247,10 +240,26 @@ Page({
         }
      
     },
+    confirmDlaog(e){
+        console.log(e);
+        this.setData({
+            wordInput:false
+        })
+    },
+    cancelDlaog(){
+        this.setData({
+            wordInput:false
+        })
+    },
     //下拉提交
     pickerConfirmH (e) {
         console.log(e);
         if(e.currentTarget.dataset.value == '0'){
+            if(e.detail.selectedValue[0] == '5'){
+                this.setData({
+                    wordInput:true
+                })
+            }
             this.setData({
                 ['form.courier']: e.detail.selectedValue[0],
                 selectedValueHlabel: e.detail.label,

miniprogram/subpages/knight/pages/knight/observeResi/observeResi.wxml

@@ -33,8 +33,15 @@
                 <text class="must">*</text>
                 <view class="title">是否中共党员</view>
             </view>
-            <view class="right">
+            <!-- <view class="right">
                 <view class="{{form.party?'picker':'picker gray-font'}}" data-value='2' bind:tap="handleCLickH">{{form.party?form.party == 0 ?'否':'是':'请选择'}}</view>
+            </view> -->
+            <view class="right">
+                <radio-group class="radio-group" bindchange="bindFlagPartyChange">
+                    <radio checked="{{form.party == 0}}" value="0"  class="radio">否</radio>
+                <radio checked="{{form.party == 1}}" value="1"  class="radio" checked="true" style="margin-left: 20rpx;">是</radio>
+               
+              </radio-group>
             </view>
         </view>
         <view class="list-item ">
@@ -71,6 +78,8 @@
                 <input confirm-type="next" bindblur="bindRealWorkUnitInput" bindinput="bindRealWorkUnitInput" value="{{form.workUnit}}" placeholder-class="placeholder-style" placeholder="请输入" />
             </view>
         </view>
+     
+        
     </view>
     <view wx:else class="tip">
             <view class="box">
@@ -111,4 +120,8 @@
     </view>
 </block>
 <wux-picker cols="1" data-value="{{pickerValue}}" options="{{selectedListH}}" value="{{pickerValue == 0?form.courier:pickerValue == 1?form.deptId:form.party}}" visible="{{selectedStatusH}}" controlled bind:confirm="pickerConfirmH" bind:cancel="pickerCancelH">
-</wux-picker>
+</wux-picker>
+
+<modal hidden="{{!wordInput}}" title="请输入行业类型" confirm-text="提交" cancel-text="取消" bindcancel="cancelDlaog"  bindconfirm="confirmDlaog"> 
+	 <input type='text'placeholder="请输入" auto-focus/>
+</modal>

miniprogram/subpages/redSail/pages/registerParty/registerParty.wxml

@@ -70,9 +70,6 @@
                     <text class="must">*</text>
                     <view class="title">所属社区</view>
                 </view>
-                <!-- <view class="right" bind:tap="handleCLickShow" data-value='1'>
-                    <view class="{{form.deptName?'picker':'picker gray-font'}}" >{{form.deptName?form.deptName:'请选择'}}</view>
-                </view> -->
              <picker mode="multiSelector" bindchange="bindMultiPickerChange" bindcolumnchange="bindMultiPickerColumnChange"
                     value="{{multiIndex}}" range="{{newArr}}" >
                     <view class="picker">