1

pages/xqzggzs2/xqzgzs2.js

@@ -1,66 +0,0 @@
-// pages/xqzggzs2/xqzgzs2.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

pages/xqzggzs2/xqzgzs2.json

@@ -1,3 +0,0 @@
-{
-  "usingComponents": {}
-}

pages/xqzggzs2/xqzgzs2.wxml

@@ -1,2 +0,0 @@
-<!--pages/xqzggzs2/xqzgzs2.wxml-->
-<text>pages/xqzggzs2/xqzgzs2.wxml</text>

pages/xqzggzs2/xqzgzs2.wxss

@@ -1 +0,0 @@
-/* pages/xqzggzs2/xqzgzs2.wxss */

pages/xunjian/xunjian.js

@@ -1,5 +1,6 @@
 // pages/xunjian/xunjian.js
 import http from '../../base/httputil'
+import tools from '../../base/tools'
 Page({
   /**
    * 页面的初始数据
@@ -34,23 +35,76 @@ Page({
   },
 
 
-  takePicture: function () {
+  takePicture: function (e) {
     // 拍照
-  
+    let jibie = e.currentTarget.dataset.jibie
+    let listid = e.currentTarget.dataset.listid
+    let from = e.currentTarget.dataset.picfrom
+    let that = this
+
     wx.chooseMedia({
-      sourceType :['album','camera'],
-      success(res){
+      sourceType: ['album', 'camera'],
+      success(res) {
         let tempFilePath = res.tempFiles[0].tempFilePath
         console.log(tempFilePath)
+        //
+        that.data.xunjianItems[jibie][1].forEach(function (item, index) {
+          if (item.listid == listid) {
+            let uuid = tools.uuid()
+
+            let picutre = {
+              "pic_key": uuid,
+              "pic_value": tempFilePath,
+              "pic_base64":wx.getFileSystemManager().readFileSync(tempFilePath,'base64')
+            }
+            if (from == "before") {
+              that.data.xunjianItems[jibie][1][index].picturesBefore.push(picutre)
+            }
+            if (from == "after") {
+              that.data.xunjianItems[jibie][1][index].picturesAfter.push(picutre)
+            }
+            // let str = 'xunjianItems["' + jibie + '"][1][' + index + '].checked'
+            that.setData({
+              xunjianItems: that.data.xunjianItems
+            })
+          }
+        })
       }
     })
-    
+
     this.setData({
       show: false
     })
   },
 
-
+  deletePic(e) {
+    let that = this
+    let jibie = e.currentTarget.dataset.jibie
+    let listid = e.currentTarget.dataset.listid
+    let pickey = e.currentTarget.dataset.pickey
+    let from = e.currentTarget.dataset.picfrom
+    console.log(jibie, listid, pickey, from)
+    this.data.xunjianItems[jibie][1].forEach(function (item, index) {
+      if (item.listid == listid) {
+        if (from == "before") {
+          that.data.xunjianItems[jibie][1][index].picturesBefore.forEach(function (it, inx) {
+            if (it.pic_key == pickey) {
+              that.data.xunjianItems[jibie][1][index].picturesBefore.splice(inx, 1)
+            }
+          })
+        } else if (from == "after") {
+          that.data.xunjianItems[jibie][1][index].picturesAfter.forEach(function (it, inx) {
+            if (it.pic_key == pickey) {
+              that.data.xunjianItems[jibie][1][index].picturesAfter.splice(inx, 1)
+            }
+          })
+        }
+        that.setData({
+          xunjianItems: that.data.xunjianItems
+        })
+      }
+    })
+  },
 
   pictureAuthSetting() {
     wx.authorize({
@@ -283,7 +337,7 @@ Page({
   submitXujianSuccess(res) {
     if (res.code == 200) {
       wx.navigateTo({
-        url: '../xqzggzs2/xqzggzs2',
+        url: '../xqzggzs2/xqzggzs2?logId='+res.logId,
       })
     } else {
       wx.showToast({

pages/xunjian/xunjian.wxml

@@ -52,19 +52,25 @@
               <view class="zgq">
                 <text>整改前</text>
                 <view>
-                 
-                  <image wx:for="{{[1,2,3,4,5]}}" src="https://img10.360buyimg.com/seckillcms/s250x250_jfs/t1/143956/31/31944/50625/637dc0a6Ebdb3a642/e994dc312d91a86c.jpg" class="vi_img">
-                    <i class="iconfont sc_img icon-31shanchu"></i>
+                  <image wx:for="{{item.picturesBefore}}" wx:for-index="pbk" wx:for-item="pbv" src="{{pbv.pic_value}}" class="vi_img">
+                    <i class="iconfont sc_img icon-31shanchu" bindtap="deletePic" data-picfrom="before"
+                    data-listid="{{item.listid}}" data-jibie="{{item.jibie}}" data-pickey="{{pbv.pic_key}}"></i>
                   </image>
-              </view>
-                <view class="iconfont icon-mn_shangchuantupian" bindtap="takePicture">
+                </view>
+                <view class="iconfont icon-mn_shangchuantupian" data-listid="{{item.listid}}" data-jibie="{{item.jibie}}" data-picfrom="before" bindtap="takePicture">
                 </view>
 
               </view>
 
-              <view class="zgh">
+              <view class="zgh" wx:if="{{'items_type_0' == item.itemsType}}">
                 <text>整改后</text>
-                <view class="iconfont icon-mn_shangchuantupian" bindtap="takePicture"></view>
+                <view>
+                  <image wx:for="{{item.picturesAfter}}" wx:for-index="pak" wx:for-item="pav" src="{{pav.pic_value}}" class="vi_img">
+                    <i class="iconfont sc_img icon-31shanchu" bindtap="deletePic" data-picfrom="after"
+                    data-listid="{{item.listid}}" data-jibie="{{item.jibie}}" data-pickey="{{pav.pic_key}}"></i>
+                  </image>
+                </view>
+                <view class="iconfont icon-mn_shangchuantupian" data-listid="{{item.listid}}" data-jibie="{{item.jibie}}" data-picfrom="after" bindtap="takePicture"></view>
               </view>