联调拆表

pages/workBenchNew/components/uninstallMeter/index.js

@@ -1,8 +1,9 @@
 // pages/workBenchNew/components/uninstallMeter/index.js
-import { uninstallMeter } from "../../../../service/meter";
+import { uninstallMeter,  } from "../../../../service/meter";
 import dayjs from "../../../../utils/dayjs"
 import request from "../../../../utils/request"
-import { alertInfo, alertSuccess, } from "../../../../utils/index"
+import { alertInfo, alertSuccess, loadingFunc} from "../../../../utils/index"
+import { uploadUninstallMeter } from "../../../../service/public"
 
 const { OK } = request;
 
@@ -113,12 +114,12 @@ Page({
     })
   },
   async onSubmit() {
-    const { meter, } = this.data;
+    const { meter, reason, url, meterInfo } = this.data;
     if (!meter) {
       alertInfo("请选择表号")
       return;
     }
-    const { code, message } = await uninstallMeter(meter)
+    const { code, message } = await uninstallMeter({sn: meterInfo.meterSn, images: url, reason})
     if (code !== OK) {
       alertInfo(message)
       return
@@ -148,7 +149,7 @@ Page({
         }
         var tempFilePaths = path;
         loadingFunc(async () => {
-          const { code, message, url } = await uploadInstallMeter(tempFilePaths)
+          const { code, message, url } = await uploadUninstallMeter(tempFilePaths)
           if (code !== OK) {
             alertError(message)
             return
@@ -165,6 +166,16 @@ Page({
       url: ""
     })
   },
+  showImage() {
+    this.setData({
+      imageShow: true
+    })
+  },
+  onClose() {
+    this.setData({
+      imageShow: false
+    })
+  },
   goback() {
     wx.navigateBack()
   },

pages/workBenchNew/components/uninstallMeter/index.json

@@ -5,7 +5,8 @@
     "search-select": "/components/searchSelect/index",
     "van-field": "@vant/weapp/field/index",
     "van-button": "@vant/weapp/button/index",
-    "searchSelectWrapper": "/components/searchSelectWrapper/index"
+    "searchSelectWrapper": "/components/searchSelectWrapper/index",
+    "van-image": "@vant/weapp/image/index"
   },
   "navigationStyle": "custom"
 }

pages/workBenchNew/components/uninstallMeter/index.wxml

@@ -46,7 +46,7 @@
                 <van-button type="danger" size="small" bind:click="clearImage" custom-style="margin-right: 20rpx;"> 清除 </van-button>
             </view>
         </view>
-        <van-image wx:if="{{!!url}}" width="100" height="100" src="{{url}}" custom-style="margin-left: 20rpx;" />
+        <van-image wx:if="{{!!url}}" width="100" height="100" src="{{url}}" custom-style="margin-left: 20rpx;" bind:tap="showImage" />
     </view>
 
 </searchSelectWrapper>