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

miniprogram/app.wxss

@@ -27,6 +27,10 @@
   color: #707070 !important;
 }
 
+.third-background-color {
+  background: #707070 !important;
+}
+
 .secondary-background-color {
   background: #EDEDED !important;
 }
@@ -35,6 +39,10 @@
   color: #FFFFFF !important;
 }
 
+.accent-background-color{
+  background:#FF4081
+}
+
 page {
   background: #EDEDED;
 }

miniprogram/pages/activity/activity.wxml

@@ -39,9 +39,13 @@
           readonly />
       </view>
 
-      <view wx:if="{{showEdit}}" class="btn primary-background-color" bindtap="editActivity">
-        <image class="btn-icon primary-background-color" mode="aspectFit" src="/images/publisher/publish2.png"></image>
-        <view class=" white-text-color">修改内容</view>
+      <view class="bottom" wx:if="{{showEdit}}">
+        <view class="btn accent-background-color white-text-color">删除</view>
+        <view class="btn primary-background-color" bindtap="editActivity">
+          <image class="btn-icon primary-background-color" mode="aspectFit" src="/images/publisher/publish2.png">
+          </image>
+          <view class="white-text-color">修改内容</view>
+        </view>
       </view>
     </view>
 

miniprogram/pages/activity/activity.wxss

@@ -184,15 +184,14 @@
 .btn {
   display: flex;
   font-size: 24rpx;
-  align-self: flex-end;
-  padding-top: 5rpx;
-  padding-bottom: 5rpx;
-  padding-right: 20rpx;
-  padding-left: 20rpx;
+  padding: 5rpx 20rpx;
   border-radius: 28rpx;
   box-shadow: 5rpx 5rpx 8rpx 0rpx rgba(0, 0, 0, 0.16);
-  width: 140rpx;
-  margin-bottom: 20rpx;
   margin-right: 20rpx;
-  margin-top: 10rpx;
+}
+
+.bottom {
+  display: flex;
+  width: 100%;
+  justify-content: flex-end;
 }

miniprogram/pages/publisherQuestion/publisherQuestion.js

@@ -7,7 +7,8 @@ Page({
     questions: [],
     publisherId: "",
     notAnswered: true,
-    answered: true
+    answered: true,
+    top: false,
   },
 
   updateText: function (e) {
@@ -31,6 +32,12 @@ Page({
     })
   },
 
+  top: function () {
+    this.setData({
+      top: !this.data.top
+    })
+  },
+
   saveQuestion: function (e) {
     const db = wx.cloud.database()
     db.collection("qaData").doc(e.target.dataset.id).update({

miniprogram/pages/publisherQuestion/publisherQuestion.wxml

@@ -17,8 +17,13 @@
     <view class="question primary-text-color">问：{{item.question}}</view>
     <textarea class="answer block-background-color" value="{{item.answer}}" placeholder="填写回答" data-index="{{index}}"
       bindinput="updateText"></textarea>
-    <view class="save-btn primary-background-color white-text-color" data-id="{{item._id}}"
-      data-answer="{{item.answer}}" bindtap="saveQuestion">保存</view>
+    <view class="btn">
+      <view class="save-btn primary-background-color white-text-color" data-id="{{item._id}}"
+        data-answer="{{item.answer}}" bindtap="saveQuestion">保存</view>
+      <view wx:if="{{top == false}}" class="top-btn primary-background-color white-text-color" bindtap="top">置顶提问</view>
+      <view wx:if="{{top == true}}" class="top-btn third-background-color white-text-color" bindtap="top">取消置顶
+      </view>
+    </view>
     <icon style="position: absolute; top: 20rpx; right: 20rpx;" type="cancel" size="20" data-id="{{item._id}}"
       catchtap="removeQuestion"></icon>
   </view>

miniprogram/pages/publisherQuestion/publisherQuestion.wxss

@@ -45,9 +45,23 @@
 }
 
 .save-btn {
-  margin: 0rpx 10rpx 20rpx 10rpx;
   padding: 10rpx 20rpx;
   border-radius: 20rpx;
   font-size: 35rpx;
   align-self: center;
+  margin-right: 20rpx;
+}
+
+.top-btn {
+  margin: 0rpx !important;
+  padding: 10rpx 20rpx !important;
+  border-radius: 20rpx;
+  font-size: 35rpx;
+  font-weight: normal !important;
+}
+
+.btn {
+  display: flex;
+  justify-content: center;
+  margin-bottom: 20rpx;
 }

project.config.json

@@ -19,22 +19,21 @@
     "checkSiteMap": true,
     "uploadWithSourceMap": true,
     "compileHotReLoad": false,
-    "useMultiFrameRuntime": false,
+    "useMultiFrameRuntime": true,
     "useApiHook": true,
+    "useApiHostProcess": false,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
     },
-    "bundle": false,
+    "enableEngineNative": false,
     "useIsolateContext": false,
     "useCompilerModule": true,
     "userConfirmedUseCompilerModuleSwitch": false,
+    "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
     "packNpmRelationList": [],
-    "useApiHostProcess": false,
-    "enableEngineNative": false,
-    "userConfirmedBundleSwitch": false,
     "minifyWXSS": true
   },
   "appid": "wx0e563b41fe518ad1",