Merge branch 'master' of http://git.scdxtc.com/chen/flying-monkey

pages/repairsPage/repairsPage.vue

@@ -35,7 +35,7 @@
                            <view class="text">添加故障图片</view> 
                         </view>                      
                     </view>
-                    <textarea v-model="data.condition" class="fault-description radius10" placeholder="故障情况描述"
+                    <textarea v-model="data.fault_describe" class="fault-description radius10" placeholder="故障情况描述"
                         placeholder-class="fault-description-text" />
                     <view class="detailed-address inputCss">
                         <input type="text" v-model="data.address" class="fon26 width100"
@@ -58,6 +58,7 @@
 
 <script>
     import yyMmDdHhSs from '@/components/dates/yy-mm-dd-hh-ss.vue';
+        import { uploadImg } from '@/jsFile/public-api.js';
     export default {
         components: {
             yyMmDdHhSs
@@ -68,11 +69,13 @@
                 data: {
                     is_device: 0,
                     fault_type: "",
-                    device_name: "",
+                    device_name: "华为LED",
                     condition: "",
                     project_number: "",
+                    service_address:"",
                     address: "",
                     username: "",
+                    fault_describe:"",
                     images:"",
                     phone: "",
                     visit_time: ""
@@ -96,6 +99,7 @@
         onLoad() {
             this.getType()
         },
+        
         methods: {
             // 获取故障类型
             getType() {
@@ -138,7 +142,13 @@
                             this.imgsrcArr.push(item);
                         })
                         
-                        console.log( this.imgsrcArr)
+                 
+                        uploadImg({path:res.tempFilePaths[0]}).then(res=>{
+                        	if(res.code) {
+                        		this.$toolAll.tools.showToast('上传成功');
+                        	}
+                        })
+                      
                     }
                 })
             },