Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_app into V0.0.2

src/components/upload/gxuploader.vue

@@ -12,10 +12,21 @@
         :show-upload="false"
         :max-size="maxSize * 1024*1024"/>
     </div>
-    <div  class="van-uploader__upload" @click="useCamera(1)">
+    <div  class="van-uploader__upload" @click="selectCameraHandler()">
       <i class="van-icon van-icon-photograph van-uploader__upload-icon">
       </i>
     </div>
+    <van-popup
+      v-model="selectCamera"
+      position="bottom"
+      :style="{ height: '20%' }"
+    >
+      <van-cell-group>
+        <van-cell icon="photograph" title="拍照" @click="useCamera(1)" />
+        <van-cell icon="photo" title="从相册选择" @click="useCamera(2)" />
+        <van-cell icon="clear" title="取消" @click="selectCamera = false" />
+      </van-cell-group>
+    </van-popup>
   </div>
 </template>
 <script>
@@ -45,7 +56,8 @@ export default {
       //组件显示用
       fileList: [],
       //上传之后的图片列表，双向绑定之后覆盖fileList
-      imageList: []
+      imageList: [],
+      selectCamera:true
     };
   },
 
@@ -69,6 +81,9 @@ export default {
     }
   },
   methods: {
+    selectCameraHandler() {
+      this.selectCamera = true;
+    },
     openCameraCallBack(data) {
       //alert(data);
       let params = {};
@@ -97,6 +112,7 @@ export default {
       });
     },
     useCamera(actionType) {
+      this.selectCamera = false;
       if(this.fileList.length >= this.maxCount){
         this.$toast('最多上传'+this.maxCount+'张图片')
         return

src/components/upload/index.vue

@@ -27,9 +27,21 @@
         <!-- :before-read="beforeRead"
         :after-read="afterRead" -->
     </div>
-    <div class="van-uploader__upload" @click="useCamera(2)">
-      <i class="van-icon van-icon-photograph van-uploader__upload-icon"> </i>
+    <div  class="van-uploader__upload" @click="selectCameraHandler()">
+      <i class="van-icon van-icon-photograph van-uploader__upload-icon">
+      </i>
     </div>
+    <van-popup
+      v-model="selectCamera"
+      position="bottom"
+      :style="{ height: '20%' }"
+    >
+      <van-cell-group>
+        <van-cell icon="photograph" title="拍照" @click="useCamera(1)" />
+        <van-cell icon="photo" title="从相册选择" @click="useCamera(2)" />
+        <van-cell icon="clear" title="取消" @click="selectCamera = false" />
+      </van-cell-group>
+    </van-popup>
   </div>
 </template>
 <script>
@@ -62,7 +74,8 @@ export default {
     return {
       fileList: [],
       //上传之后的图片列表，双向绑定之后覆盖fileList
-      imageList: []
+      imageList: [],
+      selectCamera:false
     }
   },
 
@@ -87,7 +100,11 @@ export default {
     }
   },
   methods: {
+    selectCameraHandler() {
+      this.selectCamera = true;
+    },
     useCamera(actionType) {
+      this.selectCamera = false;
       window.openCameraCallBack = null
       window.openCameraCallBack = this.openCameraCallBack
       let parms = {}

src/views/menu/securityCheckRegister/detail.vue

@@ -20,6 +20,7 @@
             v-model="taskInfo.checkTeam"
             label="检查组成员"
             rows="2"
+            maxlength="100"
             autosize
             type="textarea"
             placeholder="请输入"
@@ -86,13 +87,13 @@
                   />
                   <van-field
                     required
-                    :maxlength="200"
+                    :maxlength="255"
                     v-model="item.remark"
                     rows="1"
                     autosize
                     label="情况描述："
-                    type="textarea"
-                    placeholder="请输入(200字以内)"
+                    type="textarea"                    
+                    placeholder="请输入(255字以内)"
                   />
                   <div class="upload-box">
                     <uploader v-if="enable" :maxCount="5" v-model="item.imgData" />