Merge branch 'main' of http://git.zihai.cn/szj1219/JiaZhiQianYan-MiniProgram

# Conflicts:
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/concept/historicalTimeline/historicalTimeline.js.map
#	unpackage/dist/dev/mp-weixin/common/vendor.js

unpackage/dist/dev/mp-weixin/pages/mine/feedback/feedback.js

@@ -1,65 +0,0 @@
-"use strict";
-const common_vendor = require("../../../common/vendor.js");
-const request_api = require("../../../request/api.js");
-const common_assets = require("../../../common/assets.js");
-const _sfc_main = {
-  data() {
-    return {
-      navH: common_vendor.inject("navHeight"),
-      content: ""
-    };
-  },
-  onLoad() {
-  },
-  methods: {
-    clickSubmit() {
-      if (!this.content) {
-        common_vendor.index.showToast({
-          title: "请输入您要反馈的问题",
-          icon: "none"
-        });
-        return;
-      }
-      let param = { content: this.content, isJson: 1 };
-      request_api.feedback(param).then((res) => {
-        if (res.code == 200) {
-          common_vendor.index.showToast({
-            title: res.message,
-            icon: "none"
-          });
-          setTimeout(function() {
-            common_vendor.index.navigateBack();
-          }, 1e3);
-        } else
-          common_vendor.index.showToast({
-            title: res.message,
-            icon: "none"
-          });
-      }).catch((error) => {
-      });
-    }
-  }
-};
-if (!Array) {
-  const _easycom_navBar2 = common_vendor.resolveComponent("navBar");
-  _easycom_navBar2();
-}
-const _easycom_navBar = () => "../../../components/navBar/navBar.js";
-if (!Math) {
-  _easycom_navBar();
-}
-function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  return {
-    a: common_vendor.p({
-      leftText: "意见反馈"
-    }),
-    b: common_assets._imports_0,
-    c: $data.content,
-    d: common_vendor.o(($event) => $data.content = $event.detail.value),
-    e: common_vendor.s("top:" + $data.navH + "px;"),
-    f: common_vendor.o(($event) => $options.clickSubmit())
-  };
-}
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
-wx.createPage(MiniProgramPage);
-//# sourceMappingURL=../../../../.sourcemap/mp-weixin/pages/mine/feedback/feedback.js.map

unpackage/dist/dev/mp-weixin/pages/mine/feedback/feedback.json

@@ -1,6 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "usingComponents": {
-    "nav-bar": "../../../components/navBar/navBar"
-  }
-}

unpackage/dist/dev/mp-weixin/pages/mine/feedback/feedback.wxml

@@ -1 +0,0 @@
-<view><nav-bar wx:if="{{a}}" u-i="51b5eab8-0" bind:__l="__l" u-p="{{a}}"></nav-bar><image class="topBg absolute" src="{{b}}" mode="widthFix"></image><view class="feedbackC fixed" style="{{e}}"><view class="textareaC"><block wx:if="{{r0}}"><textarea placeholder="请输入您要反馈的问题（200 字以内）" placeholder-style="color:#C5C5C5" maxlength="200" value="{{c}}" bindinput="{{d}}"></textarea></block></view></view><view class="submit fixed" bindtap="{{f}}">提交</view></view>

unpackage/dist/dev/mp-weixin/pages/mine/feedback/feedback.wxss

@@ -1,39 +0,0 @@
-.topBg {
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: auto;
-}
-.feedbackC {
-  background-color: white;
-  margin-top: 10rpx;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  padding: 43rpx 25rpx 0;
-  border-radius: 20rpx 20rpx 0 0;
-}
-.feedbackC .textareaC {
-  background-color: #F3F6F9;
-  border-radius: 20rpx;
-  padding: 20rpx 27rpx;
-}
-.feedbackC .textareaC textarea {
-  width: 100%;
-  height: 400rpx;
-  font-size: 24rpx;
-  font-weight: 500;
-}
-.submit {
-  background-color: #F97316;
-  left: 0;
-  right: 0;
-  bottom: 73rpx;
-  margin: 0 25rpx;
-  line-height: 80rpx;
-  border-radius: 20rpx;
-  font-size: 26rpx;
-  font-weight: 500;
-  color: white;
-  text-align: center;
-}