暂存

pages/workOrder/modules/vCode.vue

@@ -1,24 +1,26 @@
 <template>
-    <up-modal :show="showModal" @cancel="showModal = false" @confirm="completion" ref="uModal" confirmText="确认完工"
-        showCancelButton :asyncClose="true">
+    <up-modal :show="showModal" title="完工验证" @cancel="showModal = false" @confirm="completion" ref="uModal"
+        confirmText="确认完工" showCancelButton :asyncClose="true">
         <view class="slot-content">
-            <!-- #ifndef APP-NVUE -->
-            <up-input placeholder="完工验证码" v-model="code" :focus="downTime == 59">
-                <!-- #endif -->
-                <!-- #ifdef APP-NVUE -->
+            <view style="padding: 20rpx 0 20rpx 0;">
+                <!-- #ifndef APP-NVUE -->
                 <up-input placeholder="完工验证码" v-model="code" :focus="downTime == 59">
                     <!-- #endif -->
-                    <template #suffix>
-                        <up-button @tap="getCode" :disabled="downTime" :text="tips" type="success" size="mini">{{
-                            downTime +
-                            '秒重新获取' }}</up-button>
-                    </template>
-                    <!-- #ifndef APP-NVUE -->
+                    <!-- #ifdef APP-NVUE -->
+                    <up-input placeholder="完工验证码" v-model="code" :focus="downTime == 59">
+                        <!-- #endif -->
+                        <template #suffix>
+                            <up-button @tap="getCode" :disabled="downTime != 0" :text="tips" type="success" size="mini">{{
+                                downTime == 0 ? '重新发送验证码' : downTime +
+                                    '秒重新获取' }}</up-button>
+                        </template>
+                        <!-- #ifndef APP-NVUE -->
+                    </up-input>
+                    <!-- #endif -->
+                    <!-- #ifdef APP-NVUE -->
                 </up-input>
                 <!-- #endif -->
-                <!-- #ifdef APP-NVUE -->
-            </up-input>
-            <!-- #endif -->
+            </view>
         </view>
     </up-modal>
 </template>
@@ -115,6 +117,13 @@ function getCode() {
             resolve(res.code == 1);
             downTime.value = 60;
             if (res.code == 1) {
+                if (res.data.msg.includes("手机验证码为")) {
+                    uni.showToast({
+                        title: res.data.msg,
+                        icon: 'none'
+                    });
+                    code.value = res.data.msg.split(":")[1].trim();
+                }
                 interval = setInterval(() => {
                     downTime.value--;
                     if (downTime.value <= 0) {

pages/workOrder/work.vue

@@ -207,6 +207,7 @@ let keys = {
     confirm: 'confirm_value', // 确认信息
     itemtype: "questionoption",
     questionedit: "questionedit",
+    passcheck: "passcheck",
 }
 
 // keys 与 form 互相转换字段
@@ -241,6 +242,7 @@ const questionoption = ref([]);
 onLoad(() => {
     data = reactive($Http.data);
     delete $Http.data;
+    console.log("data", data)
 
     form.fileupload = data.attinfos.length ? '1' : '';
     uni.setNavigationBarTitle({
@@ -312,7 +314,6 @@ onLoad(() => {
     for (let key in keys) {
         if (data[keys[key]]) {
             form[key] = data[keys[key]];
-            console.log(key, form[key])
         }
     }
 
@@ -395,7 +396,7 @@ function submit() {
                                     formModified.value = false;
                                     setTimeout(() => {
                                         uni.navigateBack()
-                                    }, 800);
+                                    }, 300);
                                 })
                             }
                             uni.showToast({ title: res.code !== 1 ? res.msg : "提交成功", icon: 'none', mask: res.code == 1 });