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

unpackage/dist/dev/mp-weixin/components/navBar/navBar.json

@@ -1,4 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {}
-}

unpackage/dist/dev/mp-weixin/components/navBar/navBar.wxml

@@ -1 +0,0 @@
-<view class="nav flex fixed" style="{{n}}"><image wx:if="{{a}}" class="bg absolute" src="{{b}}" mode="widthFix"></image><view class="backC relative flex" style="{{h}}" bindtap="{{i}}"><image wx:if="{{c}}" class="icon" src="{{d}}" mode="widthFix"></image><image wx:if="{{e}}" class="icon" src="{{f}}" mode="widthFix"></image><text class="title">{{g}}</text></view><view class="titleC relative" style="{{m}}">{{j}} <view wx:if="{{k}}" class="peopleNum absolute"><view class="num">{{l}}人</view></view></view></view>

unpackage/dist/dev/mp-weixin/components/navBar/navBar.wxss

@@ -1,73 +0,0 @@
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.nav {
-  top: 0;
-  left: 0;
-  right: 0;
-  z-index: 99;
-  overflow: hidden;
-}
-.nav .bg {
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: auto;
-}
-.nav .backC {
-  padding: 0 25rpx;
-}
-.nav .backC .icon {
-  margin-right: 12rpx;
-  width: 32rpx;
-  height: auto;
-}
-.nav .title {
-  font-size: 36rpx;
-  font-weight: bold;
-}
-.nav .titleC {
-  position: absolute;
-  left: calc((100% - 400rpx) / 2);
-  width: 400rpx;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  text-align: center;
-  font-size: 36rpx;
-  font-weight: 500;
-}
-.nav .titleC .peopleNum {
-  background-color: #3B9174;
-  top: -15rpx;
-  left: 270rpx;
-  height: 30rpx;
-  border-radius: 15px 15px 15px 0px;
-  line-height: 30rpx;
-  font-size: 24rpx;
-  color: white;
-}
-.nav .titleC .peopleNum .num {
-  margin: 0 16rpx;
-}