Merge branch 'develop' into 'test'

miniprogram/pages/feedbackDetail/feedbackDetail.js

@@ -125,7 +125,8 @@ Page({
             });
             return;
         }
-        var id = this.data.dataList[this.data.dataList.length - 1].id;
+        // var id = this.data.dataList[this.data.dataList.length - 1].id;
+        var id = this.data.id;
         var val = this.data.inputValue;
         if (val.trim() == "")
             val = "您的反馈客服已处理，谢谢！";

miniprogram/pages/feedbackDetail/feedbackDetail.ts

@@ -124,7 +124,8 @@ Page({
       })
       return
     }
-    const  id  = this.data.dataList[this.data.dataList.length-1].id;
+    // const  id  = this.data.dataList[this.data.dataList.length-1].id;
+    const  id  = this.data.id;
     let val = this.data.inputValue;
     if (val.trim() == "") val = "您的反馈客服已处理，谢谢！"
     console.log(val, id);

miniprogram/project.config.json

 {
   "description": "项目配置文件",
   "packOptions": {
-    "ignore": []
+    "ignore": [],
+    "include": []
   },
   "setting": {
     "urlCheck": true,
@@ -42,35 +43,11 @@
   },
   "compileType": "miniprogram",
   "libVersion": "2.16.0",
-  "appid": "wx6c0f07775b60792b",
+  "appid": "wx458799fcb933d34f",
   "projectname": "wx-manage-shell",
-  "debugOptions": {
-    "hidedInDevtools": []
-  },
-  "scripts": {},
-  "staticServerOptions": {
-    "baseURL": "",
-    "servePath": ""
-  },
-  "isGameTourist": false,
-  "condition": {
-    "search": {
-      "list": []
-    },
-    "conversation": {
-      "list": []
-    },
-    "game": {
-      "list": []
-    },
-    "plugin": {
-      "list": []
-    },
-    "gamePlugin": {
-      "list": []
-    },
-    "miniprogram": {
-      "list": []
-    }
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
   }
 }
\ No newline at end of file

miniprogram/project.private.config.json

+{
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "projectname": "wx-manage-shell",
+  "setting": {
+    "compileHotReLoad": true
+  }
+}
\ No newline at end of file