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/components/navBar/navBar.js

@@ -1,125 +0,0 @@
-"use strict";
-const common_vendor = require("../../common/vendor.js");
-const common_assets = require("../../common/assets.js");
-getApp();
-const _sfc_main = {
-  name: "navBar",
-  data() {
-    return {
-      navH: common_vendor.inject("navHeight"),
-      menuH: common_vendor.inject("menuHeight"),
-      navBarStyle: "",
-      backTitleStyle: "",
-      navTitleStyle: "",
-      titleColor: this.navTitleColor,
-      bgColor: this.navBgColor,
-      num: this.peopleNum
-    };
-  },
-  props: {
-    leftText: {
-      type: String,
-      default: ""
-    },
-    backBlack: {
-      type: Boolean,
-      default: false
-    },
-    navTitle: {
-      type: String,
-      default: ""
-    },
-    navBgColor: {
-      type: String,
-      default: ""
-    },
-    navTitleColor: {
-      type: String,
-      default: "white"
-    },
-    hideBack: {
-      type: Boolean,
-      default: false
-    },
-    hideNavBg: {
-      type: Boolean,
-      default: false
-    },
-    backLevel: {
-      type: Number,
-      default: 1
-    },
-    peopleNum: {
-      type: Number,
-      default: 0
-    }
-  },
-  mounted() {
-    let navHeight = this.navH;
-    let menuHeight = common_vendor.inject("menuHeight");
-    let menuTop = common_vendor.inject("menuTop");
-    let navBarStyle = `background-color:${this.bgColor};height:${navHeight}px;`;
-    let backTitleStyle = `height:${menuHeight}px;margin-top:${menuTop}px;color:${this.titleColor}`;
-    let navTitleStyle = `height:${menuHeight}px;line-height:${menuHeight}px;top:${menuTop}px;color:${this.titleColor}`;
-    this.navBarStyle = navBarStyle;
-    this.backTitleStyle = backTitleStyle;
-    this.navTitleStyle = navTitleStyle;
-  },
-  watch: {
-    navTitleColor: {
-      handler(newVal, oldVal) {
-        this.titleColor = newVal;
-      }
-    },
-    navBgColor: {
-      handler(newVal, oldVal) {
-        this.bgColor = newVal;
-      }
-    },
-    peopleNum: {
-      handler(newVal, oldVal) {
-        this.num = newVal;
-      }
-    }
-  },
-  methods: {
-    clickBack() {
-      common_vendor.index.navigateBack({
-        fail() {
-          common_vendor.index.switchTab({
-            url: "/pages/index/index"
-          });
-        }
-      });
-    }
-  }
-};
-function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  return common_vendor.e({
-    a: !$props.hideNavBg
-  }, !$props.hideNavBg ? {
-    b: common_assets._imports_0
-  } : {}, {
-    c: !$props.hideBack && !$props.backBlack
-  }, !$props.hideBack && !$props.backBlack ? {
-    d: common_assets._imports_1$12
-  } : {}, {
-    e: !$props.hideBack && $props.backBlack
-  }, !$props.hideBack && $props.backBlack ? {
-    f: common_assets._imports_2
-  } : {}, {
-    g: common_vendor.t($props.leftText),
-    h: common_vendor.s($data.backTitleStyle),
-    i: common_vendor.o((...args) => $options.clickBack && $options.clickBack(...args)),
-    j: common_vendor.t($props.navTitle),
-    k: $data.num > 0
-  }, $data.num > 0 ? {
-    l: common_vendor.t($data.num)
-  } : {}, {
-    m: common_vendor.s($data.navTitleStyle),
-    n: common_vendor.s($data.navBarStyle)
-  });
-}
-const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
-wx.createComponent(Component);
-//# sourceMappingURL=../../../.sourcemap/mp-weixin/components/navBar/navBar.js.map