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/build/mp-weixin/pages/mine/web/web.js

@@ -1 +0,0 @@
-"use strict";const t=require("../../../common/vendor.js"),e=require("../../../request/api.js"),n=require("../../../common/assets.js"),s={data:()=>({navH:t.inject("navHeight"),navTitle:"",type:"",webContent:""}),onLoad(t){t.type&&(this.type=t.type,this.getUserInfoData(),1==t.type?this.navTitle="关于我们":2==t.type?this.navTitle="服务条款":3==t.type&&(this.navTitle="隐私协议"))},methods:{getUserInfoData(){e.agreements().then((e=>{200==e.code?1==this.type?this.webContent=e.data.agreements.about_us.content:2==this.type?this.webContent=e.data.agreements.service_terms.content:3==this.type&&(this.webContent=e.data.agreements.privacy_policy.content):t.wx$1.showToast({title:e.message})})).catch((t=>{}))}}};if(!Array){t.resolveComponent("navBar")()}Math;const a=t._export_sfc(s,[["render",function(e,s,a,o,i,r){return{a:t.p({leftText:i.navTitle}),b:n._imports_0,c:t.t(i.webContent),d:t.s("top:"+i.navH+"px;")}}]]);wx.createPage(a);

unpackage/dist/build/mp-weixin/pages/mine/web/web.json

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

unpackage/dist/build/mp-weixin/pages/mine/web/web.wxml

@@ -1 +0,0 @@
-<view><nav-bar wx:if="{{a}}" u-i="97b35da4-0" bind:__l="__l" u-p="{{a}}"></nav-bar><image class="topBg absolute" src="{{b}}" mode="widthFix"></image><view class="contentC fixed" style="{{d}}"><text>{{c}}</text></view></view>

unpackage/dist/build/mp-weixin/pages/mine/web/web.wxss

@@ -1 +0,0 @@
-.topBg{top:0;left:0;width:100%;height:auto}.contentC{background-color:#fff;left:0;right:0;bottom:0;margin-top:10rpx;padding:50rpx 25rpx;overflow-y:scroll}