update

dist/app.js

@@ -97,7 +97,7 @@ var App = function App(_ref) {
 
 
 
-var config = {"pages":["pages/Clock","pages/index/index","pages/Second","pages/Login","pages/Auth","pages/ChooseAuth","pages/ChooseScenario","pages/SetSchedule","pages/H5","pages/Profile","pages/Metric","pages/Activity"],"subPackages":[{"root":"moduleA","pages":["pages/third"]}],"tabBar":{"custom":true,"list":[{"pagePath":"pages/Clock","text":"首页"},{"pagePath":"pages/Metric","text":"第二页"},{"pagePath":"pages/Activity","text":"第二页"},{"pagePath":"pages/Profile","text":"第二页"}]},"window":{"backgroundTextStyle":"light","navigationBarBackgroundColor":"#000000","navigationBarTitleText":"Weixin","navigationBarTextStyle":"white","backgroundColor":"#000000"},"darkmode":true};
+var config = {"pages":["pages/Clock","pages/index/index","pages/Login","pages/Auth","pages/ChooseAuth","pages/ChooseScenario","pages/SetSchedule","pages/H5","pages/Profile","pages/Metric","pages/Activity"],"subPackages":[{"root":"moduleA","pages":["pages/third"]}],"tabBar":{"custom":true,"list":[{"pagePath":"pages/Clock","text":"首页"},{"pagePath":"pages/Metric","text":"第二页"},{"pagePath":"pages/Activity","text":"第二页"},{"pagePath":"pages/Profile","text":"第二页"}]},"window":{"backgroundTextStyle":"light","navigationBarBackgroundColor":"#000000","navigationBarTitleText":"Weixin","navigationBarTextStyle":"white","backgroundColor":"#000000"},"darkmode":true};
 _tarojs_runtime__WEBPACK_IMPORTED_MODULE_1__.window.__taroAppConfig = config
 var inst = App((0,_tarojs_plugin_framework_react_dist_runtime__WEBPACK_IMPORTED_MODULE_2__.createReactApp)(_node_modules_babel_loader_lib_index_js_ruleSet_1_rules_5_use_0_app_tsx__WEBPACK_IMPORTED_MODULE_4__["default"], react__WEBPACK_IMPORTED_MODULE_5__, (react_dom__WEBPACK_IMPORTED_MODULE_6___default()), config))
 

dist/app.json

@@ -1 +1 @@
-{"pages":["pages/Clock","pages/index/index","pages/Second","pages/Login","pages/Auth","pages/ChooseAuth","pages/ChooseScenario","pages/SetSchedule","pages/H5","pages/Profile","pages/Metric","pages/Activity"],"subPackages":[{"root":"moduleA","pages":["pages/third"]}],"tabBar":{"custom":true,"list":[{"pagePath":"pages/Clock","text":"首页"},{"pagePath":"pages/Metric","text":"第二页"},{"pagePath":"pages/Activity","text":"第二页"},{"pagePath":"pages/Profile","text":"第二页"}]},"window":{"backgroundTextStyle":"light","navigationBarBackgroundColor":"#000000","navigationBarTitleText":"Weixin","navigationBarTextStyle":"white","backgroundColor":"#000000"},"darkmode":true}
+{"pages":["pages/Clock","pages/index/index","pages/Login","pages/Auth","pages/ChooseAuth","pages/ChooseScenario","pages/SetSchedule","pages/H5","pages/Profile","pages/Metric","pages/Activity"],"subPackages":[{"root":"moduleA","pages":["pages/third"]}],"tabBar":{"custom":true,"list":[{"pagePath":"pages/Clock","text":"首页"},{"pagePath":"pages/Metric","text":"第二页"},{"pagePath":"pages/Activity","text":"第二页"},{"pagePath":"pages/Profile","text":"第二页"}]},"window":{"backgroundTextStyle":"light","navigationBarBackgroundColor":"#000000","navigationBarTitleText":"Weixin","navigationBarTextStyle":"white","backgroundColor":"#000000"},"darkmode":true}

dist/common.js

@@ -869,10 +869,12 @@ var userSlice = (0,_reduxjs_toolkit__WEBPACK_IMPORTED_MODULE_0__.createSlice)({
       var _action$payload = action.payload,
         nickname = _action$payload.nickname,
         avatar = _action$payload.avatar,
-        token = _action$payload.token;
+        token = _action$payload.token,
+        scenario_select_count = _action$payload.scenario_select_count;
       state.nickname = nickname;
       state.avatar = avatar;
       state.token = token;
+      state.scenario_select_count = scenario_select_count;
       state.isLogin = true;
       __webpack_require__.g.token = token;
       _tarojs_taro__WEBPACK_IMPORTED_MODULE_1___default().setStorage({
@@ -884,10 +886,12 @@ var userSlice = (0,_reduxjs_toolkit__WEBPACK_IMPORTED_MODULE_0__.createSlice)({
       var _action$payload2 = action.payload,
         nickname = _action$payload2.nickname,
         avatar = _action$payload2.avatar,
-        token = _action$payload2.token;
+        token = _action$payload2.token,
+        scenario_select_count = _action$payload2.scenario_select_count;
       state.nickname = nickname;
       state.avatar = avatar;
       state.token = token;
+      state.scenario_select_count = scenario_select_count;
       state.isLogin = true;
       __webpack_require__.g.token = token;
       _tarojs_taro__WEBPACK_IMPORTED_MODULE_1___default().setStorage({
@@ -900,6 +904,7 @@ var userSlice = (0,_reduxjs_toolkit__WEBPACK_IMPORTED_MODULE_0__.createSlice)({
       state.avatar = null;
       state.token = null;
       state.isLogin = false;
+      state.scenario_select_count = 0;
       __webpack_require__.g.token = '';
       _tarojs_taro__WEBPACK_IMPORTED_MODULE_1___default().clearStorage();
     },
@@ -908,6 +913,7 @@ var userSlice = (0,_reduxjs_toolkit__WEBPACK_IMPORTED_MODULE_0__.createSlice)({
       state.avatar = null;
       state.token = null;
       state.isLogin = false;
+      state.scenario_select_count = 0;
       __webpack_require__.g.token = '';
       _tarojs_taro__WEBPACK_IMPORTED_MODULE_1___default().clearStorage();
     },
@@ -915,10 +921,12 @@ var userSlice = (0,_reduxjs_toolkit__WEBPACK_IMPORTED_MODULE_0__.createSlice)({
       var _action$payload3 = action.payload,
         nickname = _action$payload3.nickname,
         avatar = _action$payload3.avatar,
-        token = _action$payload3.token;
+        token = _action$payload3.token,
+        scenario_select_count = _action$payload3.scenario_select_count;
       state.nickname = nickname;
       state.avatar = avatar;
       state.token = token;
+      state.scenario_select_count = scenario_select_count;
       state.isLogin = true;
       __webpack_require__.g.token = token;
       _tarojs_taro__WEBPACK_IMPORTED_MODULE_1___default().setStorage({

dist/pages/Second.json

@@ -1 +0,0 @@
-{"usingComponents":{"comp":"../comp"}}

dist/pages/Second.wxml

@@ -1,2 +0,0 @@
-<import src="../base.wxml"/>
-<template is="taro_tmpl" data="{{root:root}}" />

src/app.config.ts

@@ -2,7 +2,6 @@ export default defineAppConfig({
   pages: [
     'pages/Clock',
     'pages/index/index',
-    'pages/Second',
     'pages/Login',
     'pages/Auth',
     'pages/ChooseAuth',

src/store/user.tsx

@@ -23,19 +23,21 @@ const userSlice = createSlice({
     initialState,
     reducers: {
         loginSuccess(state, action: PayloadAction<any>) {
-            const { nickname, avatar, token } = action.payload;
+            const { nickname, avatar, token,scenario_select_count } = action.payload;
             state.nickname = nickname;
             state.avatar = avatar;
             state.token = token;
+            state.scenario_select_count = scenario_select_count;
             state.isLogin = true;
             global.token = token;
             Taro.setStorage({ key: 'userData', data: JSON.stringify(action.payload) });
         },
         registerSuccess(state, action: PayloadAction<any>) {
-            const { nickname, avatar, token } = action.payload;
+            const { nickname, avatar, token,scenario_select_count } = action.payload;
             state.nickname = nickname;
             state.avatar = avatar;
             state.token = token;
+            state.scenario_select_count =  scenario_select_count;
             state.isLogin = true;
             global.token = token;
             Taro.setStorage({ key: 'userData', data: JSON.stringify(action.payload) });
@@ -45,6 +47,7 @@ const userSlice = createSlice({
             state.avatar = null;
             state.token = null;
             state.isLogin = false;
+            state.scenario_select_count = 0;
             global.token = '';
             Taro.clearStorage();
         },
@@ -53,14 +56,16 @@ const userSlice = createSlice({
             state.avatar = null;
             state.token = null;
             state.isLogin = false;
+            state.scenario_select_count = 0;
             global.token = '';
             Taro.clearStorage();
         },
         getInfoSuccess(state, action: PayloadAction<any>) {
-            const { nickname, avatar, token } = action.payload;
+            const { nickname, avatar, token,scenario_select_count } = action.payload;
             state.nickname = nickname;
             state.avatar = avatar;
             state.token = token;
+            state.scenario_select_count = scenario_select_count;
             state.isLogin = true;
             global.token = token;
             Taro.setStorage({ key: 'userData', data: JSON.stringify(action.payload) });