Merge refs/remotes/origin/master into refs/heads/master

miniprogram/pages/myQuestion/myQuestion.wxml

@@ -1,5 +1,4 @@
 <!--为我的-我的提问页面-->
-<!--还未完成功能，仅有页面框架-->
 <view wx:if="{{questions.length == 0}}" class="title primary-text-color" style="text-align: center;">这里空空如也</view>
 <view wx:for="{{questions}}" wx:for-item="item" wx:for-index="index" wx:key="_id">
   <view wx:if="{{notAnswered && item.answer == '' || answered && item.answer != ''}}" class="card">

miniprogram/pages/publisherDetail/publisherDetail.wxss

@@ -10,7 +10,6 @@
 .block2 {
   margin-bottom: 4rpx;
   padding: 20rpx 40rpx 20rpx 40rpx;
-  display: flex;
   font-size: 30rpx;
   background-color: #ffffff;
   align-items: flex-start;

miniprogram/pages/search/search.js

@@ -28,7 +28,7 @@ Page({
       }.bind(this)
     })
     const db = wx.cloud.database()
-    db.collection("searchData").orderBy("time", "desc").limit(20).get({
+    db.collection("search").orderBy("time", "desc").limit(20).get({
       success: function (res) {
         var count = {},
           hotTag = []
@@ -121,14 +121,14 @@ Page({
     })
     const db = wx.cloud.database()
     const _ = db.command
-    db.collection("searchData").add({
+    db.collection("search").add({
       data: {
         key: this.data.searchText,
         time: new Date()
       },
       success: function () {
         var reg = new RegExp(this.data.searchText, "i")
-        db.collection("mainData").where(
+        db.collection("message").where(
           _.or([{
               title: reg
             },

project.config.json

@@ -19,21 +19,22 @@
     "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": true,
     "userConfirmedUseCompilerModuleSwitch": false,
-    "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
     "packNpmRelationList": [],
+    "useApiHostProcess": false,
+    "enableEngineNative": false,
+    "userConfirmedBundleSwitch": false,
     "minifyWXSS": true
   },
   "appid": "wx0e563b41fe518ad1",