From 09b4797fb18e2971434c8cfc217f706628e0126e Mon Sep 17 00:00:00 2001
From: Mr Ke <kelq@hugeinfo.com.cn>
Date: Tue, 31 Mar 2020 11:57:41 +0800
Subject: [PATCH] 问卷答题详情

---
 SunshineLnsMinApp/pages/xsjb/xsjb.js |   56 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/SunshineLnsMinApp/pages/xsjb/xsjb.js b/SunshineLnsMinApp/pages/xsjb/xsjb.js
index 231e8dd..12f1a32 100644
--- a/SunshineLnsMinApp/pages/xsjb/xsjb.js
+++ b/SunshineLnsMinApp/pages/xsjb/xsjb.js
@@ -32,12 +32,13 @@
     evalList: {},
     disabled: true,
     showInfo: false,
+    id: ''
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
+  onLoad: function(options) {
     const id = options.id || 'new';
     let that = this;
     var userinfo = wx.getStorageSync("user");
@@ -48,22 +49,23 @@
       data: {
         id,
       },
-      success: function (res) {
+      success: function(res) {
         console.log('res', res);
         var dataSet = res.data;
-        var evalList1000 = dataSet.attachments || [];
+        var evalList1000 = dataSet.attachmentList || [];
         var evalList = {
           evalList1000,
         };
         for (var i in evalList) {
           evalList[i] = evalList[i].map(({
             imgPath: pic,
-            attachmentId: id
+            id
           }) => ({
-            pic,
+            pic: app.globalData.url + '/api/v1/attachment/image/' + id,
             id
           }))
         }
+        console.log(evalList)
         const data = res.data || {}
         if (options.id) {
           that.setData({
@@ -111,32 +113,29 @@
 
   onSubmit() {
     console.log(this.data.thisData)
-    if(!this.data.thisData.tipoffObject){
+    if (!this.data.thisData.tipoffObject) {
       return app.showModal("请填写举报对象！");
     }
-    if(!this.data.thisData.tipoffAction){
-      return app.showModal("请选择举报行为！");
-    }
-    if(!this.data.thisData.tipoffAddress){
+    if (!this.data.thisData.tipoffAddress) {
       return app.showModal("请填写发生地！");
     }
-    if(!this.data.thisData.tipoffContent){
+    if (!this.data.thisData.tipoffContent) {
       return app.showModal("请填写具体事项！");
     }
-    if(!this.data.evalList){
+    if (!this.data.evalList) {
       return app.showModal("请上传证明材料！");
     }
-    if(!this.data.thisData.tipoffType){
+    if (!this.data.thisData.tipoffType) {
       return app.showModal("请选择方式！");
     }
-    if(this.data.thisData.tipoffType=='2'){
-      if(!this.data.thisData.createrName){
+    if (this.data.thisData.tipoffType == '2') {
+      if (!this.data.thisData.createrName) {
         return app.showModal("请填写姓名！");
       }
-      if(!this.data.thisData.createrMobile){
+      if (!this.data.thisData.createrMobile) {
         return app.showModal("请填写手机号码！");
       }
-      if(!this.data.thisData.createrAddress){
+      if (!this.data.thisData.createrAddress) {
         return app.showModal("请填写联系方式！");
       }
     }
@@ -147,15 +146,15 @@
       header: {
         "Content-Type": "application/json"
       },
-      success: function (res) {
+      success: function(res) {
         if (res.data.code == 0) {
           wx.showToast({
             title: '提交成功！',
             icon: 'success',
             duration: 2000
           })
-          wx.navigateTo({
-            url: '../zhwj/zhwj',
+          wx.navigateBack({
+            delta: 2
           })
         }
       }
@@ -163,10 +162,10 @@
   },
 
   // 选择地理位置
-  chooseLocation: function (e) {
+  chooseLocation: function(e) {
     const that = this;
     wx.chooseLocation({
-      success: function (res) {
+      success: function(res) {
         console.log('res', res);
         that.setData({
           thisData: {
@@ -179,21 +178,22 @@
   },
 
   //添加图片
-  joinPicture: function (e) {
+  joinPicture: function(e) {
     console.log(e)
     var that = this;
     console.log(that)
-    app.joinPicture(e, that, e.currentTarget.dataset.associatetypeid, that.data.id);
+    console.log('that.data.id', that.data.thisData.id)
+    app.joinPicture(e, that, e.currentTarget.dataset.associatetypeid, that.data.thisData.id);
   },
 
   // 删除图片
-  clearImg: function (e) {
+  clearImg: function(e) {
     var that = this;
     app.clearImg(e, that);
   },
 
   //预览图片
-  previewImage: function (e) {
+  previewImage: function(e) {
     app.previewImage(e);
   },
 
@@ -206,13 +206,13 @@
       this.setData({
         [key]: e.detail.value,
         [`display${key}`]: e.detail.label,
-        showInfo:true,
+        showInfo: true,
         thisData: {
           ...this.data.thisData,
           [key]: e.detail.value,
         }
       });
-    }else{
+    } else {
       this.setData({
         [key]: e.detail.value,
         [`display${key}`]: e.detail.label,

--
Gitblit v1.8.0