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

# Conflicts:
#	unpackage/dist/dev/.sourcemap/mp-weixin/app.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/assets.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/components/LCCalendar/LCCalendar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/geGuCenter/geGuCenter.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesStock/stockCenterDetails/bkydmx.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
#	unpackage/dist/dev/mp-weixin/common/assets.js
#	unpackage/dist/dev/mp-weixin/common/vendor.js
#	unpackage/dist/dev/mp-weixin/components/zysj-view/zysj-view.js
#	unpackage/dist/dev/mp-weixin/pages/geGuCenter/geGuCenter.wxml
#	unpackage/dist/dev/mp-weixin/pages/mine/mine.js
#	unpackage/dist/dev/mp-weixin/pages/ztfx/ztfx.js
#	unpackage/dist/dev/mp-weixin/pagesMine/vip/vip.js
#	unpackage/dist/dev/mp-weixin/pagesMine/vipMeal/vipMeal.js
#	unpackage/dist/dev/mp-weixin/pagesStock/stockCenterDetails/bkydmx.js
#	unpackage/dist/dev/mp-weixin/pagesStock/stockCenterDetails/bkydmx.wxml
#	unpackage/dist/dev/mp-weixin/pagesStock/stockCenterDetails/cwDetails.js
#	unpackage/dist/dev/mp-weixin/pagesStock/stockCenterDetails/stockCenterDetails.js
#	unpackage/dist/dev/mp-weixin/pagesStock/stockCenterDetails/ztfx.js

pages/index/stockDetails/stockDetails.vue

@@ -235,6 +235,7 @@
 				// chart.on('click',function (params) {
 				// 	console.log(params)
 				// })
+				console.log(chart)
 				if(this.selectCategory==0)
 				{
 					//分时图

pages/mine/mine.vue

@@ -11,6 +11,7 @@
 			</view>
 			<image class="arrow" src="/static/icon/mine/infoArrow.png" mode="widthFix"></image>
 		</view>
+		
 		<view v-if="userInfo" class="numList relative flex">
 			<view class="item flex1 flexColumnCenter" @click="clickNumItem(0)">
 				<view class="num">{{userInfo.statistics.total_comments}}</view>
@@ -86,7 +87,7 @@
 				{
 					icon:'/static/icon/mine/logout.png',
 					title:'退出登录',
-				}]
+				}],
 			}
 		},
 		onLoad() {
@@ -95,8 +96,10 @@
 		onShow() {
 			this.getUserInfoData()
 			this.getMemberStatus()
+			this.init()
 		},
 		methods: {
+			
 			/**
 			 * 点击查看个人信息
 			 */