解决冲突2

pages/offence/index.js

@@ -69,13 +69,13 @@ Page({
   onReachBottom: function () {
     //上拉分页,将页码加1，然后调用分页函数
     this.data.page = this.data.page + 1;
-    this.getwzlist();
+    this.getwzlist(this.data.page);
 
   },
   getwzlist: function (page) {
     var that = this;
     if (page != 1) { page = that.data.page }
-    api.request('api/offence/?a=listall', 'GET').then(res => {
+    api.request('api/offence/?a=listall', 'GET', {page:page}).then(res => {
       if (res.rows.length == 0) {
         if (page == 1) {
           this.setData({

pages/trouble/addtroublezg.wxml

@@ -21,7 +21,7 @@
         </view>
 
         <view class="weui-cell__bd">
-          <navigator url="/pages/dickey/treeselect?a=yhlx">
+          <navigator url="/pages/dickey/treeselect?a=yhlxo">
             <view class="weui-select">
               {{yhlxo__name}}
             </view>

project.config.json

@@ -18,15 +18,14 @@
     "checkSiteMap": true,
     "uploadWithSourceMap": true,
     "compileHotReLoad": false,
-    "useMultiFrameRuntime": true,
+    "useMultiFrameRuntime": false,
     "useApiHook": true,
-    "useApiHostProcess": false,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
     },
-    "enableEngineNative": false,
+    "bundle": false,
     "useIsolateContext": false,
     "useCompilerModule": false,
     "userConfirmedUseCompilerModuleSwitch": false,