Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

project.config.json

+{
+  "description": "项目配置文件",
+  "packOptions": {
+    "ignore": []
+  },
+  "setting": {
+    "urlCheck": true,
+    "es6": true,
+    "enhance": false,
+    "postcss": true,
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": false,
+    "coverView": true,
+    "nodeModules": false,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "uglifyFileName": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "enableEngineNative": false,
+    "bundle": false,
+    "useIsolateContext": true,
+    "useCompilerModule": true,
+    "userConfirmedUseCompilerModuleSwitch": false,
+    "userConfirmedBundleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true
+  },
+  "compileType": "miniprogram",
+  "libVersion": "2.16.0",
+  "appid": "wx402a711597dddbaf",
+  "projectname": "miniprogram-1",
+  "debugOptions": {
+    "hidedInDevtools": []
+  },
+  "scripts": {},
+  "isGameTourist": false,
+  "condition": {
+    "search": {
+      "list": []
+    },
+    "conversation": {
+      "list": []
+    },
+    "game": {
+      "list": []
+    },
+    "plugin": {
+      "list": []
+    },
+    "gamePlugin": {
+      "list": []
+    },
+    "miniprogram": {
+      "list": []
+    }
+  }
+}

src/pages/order/complete.vue

 <template>
     <view class="com-content">
+        <complete-check :show="completeCheckStatus" :list-data="completeCheckResult" @close="closeCheckResult" @handle-problem="handerProgrom"></complete-check>
         <view class="u-wrap" v-if="!takeStatus">
             <u-navbar :background="{background: '#2272FF'}" back-icon-color="#fff" :title-size="26" title-color="#fff" :border-bottom="false" title="完工信息"></u-navbar>
             <u-tabs-swiper ref="tabs" :current="tabIndex" name="panelName" :list="list"  @change="tabsChange" :is-scroll="false" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="120"></u-tabs-swiper>
@@ -161,7 +162,12 @@
                 submitBtnStatus: false,
                 takeStatus: false,
                 fileIndex: null,
-                files: []
+                files: [],
+                completeCheckStatus: false,
+                completeCheckResult: [],
+                waitHandlerPanelIndex: 0,
+                waitHandlerGroupIndex: 0,
+                waitHandlerEleIndex: 0,
             }
         },
         components: {
@@ -286,16 +292,74 @@
 					}
 				})
 			},
+            checkCompleteItem(){
+                let self = this
+                let checkResult = []
+                let pass = true
+                let first = true
+                self.list.forEach((panel, panelIndex)=>{
+                    let panelResult = {label: panel.panelName, submitted: 0, required: 0, pass: true}
+                    panel.items.forEach((group, groupIndex) =>{
+                        group.items.forEach((ele, eleIndex)=>{
+                            if(ele.required){
+                                panelResult.required++
+                                let value = self.form[ele.fieldsName]
+                                if(value&&!Array.isArray(value)){
+                                    panelResult.submitted++
+                                }else if(value&&Array.isArray(value)&&value.length > 0){
+                                    panelResult.submitted++
+                                }else if(first){// 记录第一个 为空 并且需要必填的项 用于定位
+                                    first = false
+                                    self.waitHandlerPanelIndex = panelIndex
+                                    self.waitHandlerGroupIndex = groupIndex
+                                    self.waitHandlerEleIndex = eleIndex
+                                }
+                            }
+                        })
+                    })
+                    panelResult.pass = panelResult.required <= panelResult.submitted
+                    pass = pass&&panelResult.pass
+                    checkResult.push(panelResult)
+                })
+                console.log(checkResult)
+                self.completeCheckResult = checkResult
+                return pass
+            },
+            closeCheckResult(){// 检查结果窗口取消回调
+                this.completeCheckStatus = false
+            },
+            handerProgrom(){// 检查结果窗口 去处理回调 定位到缺失的项
+                this.completeCheckStatus = false
+                this.locationCompleteItem(this.waitHandlerPanelIndex,this.waitHandlerGroupIndex,this.waitHandlerEleIndex)
+            },
+            locationCompleteItem(panelIndex,groupIndex,eleIndex){ // 页面定位到某一项
+                this.tabIndex = panelIndex
+                this.arr = []
+                this.scrollRightTop = 0;
+                this.current = 0;
+                this.$nextTick(function() {
+                    this.swichMenu(groupIndex)
+                })
+            },
 			orderFinish(){
                 let self = this
+                let pass = this.checkCompleteItem()
+                if(!pass){
+                    self.completeCheckStatus = true
+                }else{
+                    console.log("完工");
+                    self.completeCheckStatus = true
                     if(self.inGuaranteePeriod === 'Y'){
                         self.$u.api.inOrderFinish(self.orderId).then((res)=>{
                             console.log(res)
+                            self.completeCheckStatus = true
                         })
                     }else{
                         self.$u.api.outOrderFinish({customerPayType:'CASH'}, self.orderId).then((res)=>{
                             console.log(res)
+                            self.completeCheckStatus = true
                         })
+                    }
                 }
 			},
             getTakeStatus(event) {