比较差异，不合并

examples/mini-program-example/config/index.js

@@ -10,7 +10,7 @@ const config = {
     828: 1.81 / 2
   },
   sourceRoot: 'src',
-  outputRoot: `dist/${process.env.TARO_ENV}`,
+  outputRoot: `dist/spa/main`,
   plugins: [],
   alias: {
     '@/util': path.resolve(__dirname, '..', 'src/util'),
@@ -58,7 +58,7 @@ const config = {
     }
   },
   h5: {
-    publicPath: '/',
+    publicPath: '/spa/main/',
     staticDirectory: 'static',
     postcss: {
       autoprefixer: {

examples/mini-program-example/package.json

@@ -44,35 +44,36 @@
   "author": "",
   "dependencies": {
     "@babel/runtime": "^7.14.5",
-    "@tarojs/components": "3.6.15",
-    "@tarojs/helper": "3.6.15",
-    "@tarojs/plugin-platform-weapp": "3.6.15",
-    "@tarojs/plugin-platform-alipay": "3.6.15",
-    "@tarojs/plugin-platform-tt": "3.6.15",
-    "@tarojs/plugin-platform-swan": "3.6.15",
-    "@tarojs/plugin-platform-jd": "3.6.15",
-    "@tarojs/plugin-platform-qq": "3.6.15",
-    "@tarojs/plugin-platform-h5": "3.6.15",
+    "@tarojs/components": "workspace:*",
+    "@tarojs/helper": "workspace:*",
+    "@tarojs/plugin-platform-weapp": "workspace:*",
+    "@tarojs/plugin-platform-alipay": "workspace:*",
+    "@tarojs/plugin-platform-tt": "workspace:*",
+    "@tarojs/plugin-platform-swan": "workspace:*",
+    "@tarojs/plugin-platform-jd": "workspace:*",
+    "@tarojs/plugin-platform-qq": "workspace:*",
+    "@tarojs/plugin-platform-h5": "workspace:*",
     "@tarojs/plugin-platform-mpharmony": "workspace:*",
     "@tarojs/plugin-platform-mpandroid": "workspace:*",
     "@tarojs/components-mpharmony": "workspace:*",
-    "@tarojs/runtime": "3.6.15",
-    "@tarojs/shared": "3.6.15",
-    "@tarojs/taro": "3.6.15",
+    "@tarojs/taro-mpharmony": "workspace:*",
+    "@tarojs/runtime": "workspace:*",
+    "@tarojs/shared": "workspace:*",
+    "@tarojs/taro": "workspace:*",
     "@tarojs/plugin-framework-react": "workspace:*",
-    "@tarojs/react": "3.6.15",
+    "@tarojs/react": "workspace:*",
     "react-dom": "^18.2.0",
     "react": "^18.2.0"
   },
   "devDependencies": {
     "@babel/core": "^7.8.0",
-    "@tarojs/cli": "3.6.15",
+    "@tarojs/cli": "workspace:*",
     "@types/webpack-env": "^1.13.6",
     "@types/react": "^18.2.0",
     "webpack": "5.78.0",
-    "@tarojs/webpack5-runner": "3.6.15",
-    "babel-preset-taro": "3.6.15",
-    "eslint-config-taro": "3.6.15",
+    "@tarojs/webpack5-runner": "workspace:*",
+    "babel-preset-taro": "workspace:*",
+    "eslint-config-taro": "workspace:*",
     "eslint": "^8.12.0",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.5",
     "react-refresh": "^0.11.0",

examples/mini-program-example/src/app.config.ts

@@ -148,6 +148,7 @@ export default defineAppConfig({
     'pages/api/thirdParty/index',
     'pages/api/worker/index',
     'pages/api/wxml/index',
+    'pages/performance/index/index'
   ],
   tabBar: {
     color: '#7A7E83',

examples/mini-program-example/src/app.ts

@@ -38,6 +38,14 @@ class App extends React.Component {
     })
   }
 
+  componentDidShow(res) {
+    TestConsole.consoleNormal('App componentDidShow', res)
+  }
+
+  componentDidHide() {
+    TestConsole.consoleNormal('App componentDidHide')
+  }
+
   render() {
     // this.props.children 是将要会渲染的页面
     return this.props.children

examples/mini-program-example/src/pages/api/basics/basics/index.tsx

@@ -71,11 +71,11 @@ export default class Index extends React.Component {
             '字面量示例3：live-pusher.audio-reverb-type.4----',
             Taro.canIUse('live-pusher.audio-reverb-type.4')
           )
-          TestConsole.consoleDebug('字面量示例4：checkbox-group----', Taro.canIUse("checkbox-group"))
-          TestConsole.consoleDebug('字面量示例5：button----', Taro.canIUse("button"))
-          TestConsole.consoleDebug('字面量示例6：button.size----', Taro.canIUse("button.size"))
-          TestConsole.consoleDebug('字面量示例7：button.size.mini----', Taro.canIUse("button.size.mini"))
-          
+          TestConsole.consoleDebug('字面量示例4：checkbox-group----', Taro.canIUse('checkbox-group'))
+          TestConsole.consoleDebug('字面量示例5：button----', Taro.canIUse('button'))
+          TestConsole.consoleDebug('字面量示例6：button.size----', Taro.canIUse('button.size'))
+          TestConsole.consoleDebug('字面量示例7：button.size.mini----', Taro.canIUse('button.size.mini'))
+
           const apiName1 = 'share-element.rect-tween-type.cubic-bezier(x1,'
           const apiName2 = 'live-pusher.aspect.9:16'
           const apiName3 = 'live-pusher.audio-reverb-type.4'

examples/mini-program-example/src/pages/api/basics/miniProgram/applicationLevelEvents/index.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import Taro from '@tarojs/taro'
-import { View, Text } from '@tarojs/components'
+import { View } from '@tarojs/components'
 import { TestConsole } from '@/util/util'
 import ButtonList from '@/components/buttonList'
 
@@ -84,20 +84,30 @@ export default class Index extends React.Component {
       },
       {
         id: 'onAppShow',
-        func: (apiIndex) => {
+        func: () => {
           TestConsole.consoleTest('Taro.onAppShow')
-          Taro.onAppShow((res) => {
-            TestConsole.consoleOnCallback.call(this, res, 'onAppShow', apiIndex)
-          })
+          Taro.onAppShow(this.appShow)
+        },
+      },
+      {
+        id: 'onAppShow1',
+        func: () => {
+          TestConsole.consoleTest('Taro.onAppShow1')
+          Taro.onAppShow(this.appShow1)
         },
       },
       {
         id: 'onAppHide',
-        func: (apiIndex) => {
+        func: () => {
           TestConsole.consoleTest('Taro.onAppHide')
-          Taro.onAppHide((res) => {
-            TestConsole.consoleOnCallback.call(this, res, 'onAppHide', apiIndex)
-          })
+          Taro.onAppHide(this.appHide)
+        },
+      },
+      {
+        id: 'onAppHide1',
+        func: () => {
+          TestConsole.consoleTest('Taro.onAppHide1')
+          Taro.onAppHide(this.appHide1)
         },
       },
       {
@@ -150,25 +160,51 @@ export default class Index extends React.Component {
       },
       {
         id: 'offAppShow',
-        func: (apiIndex) => {
+        func: () => {
           TestConsole.consoleTest('Taro.offAppShow')
-          Taro.offAppShow((res) => {
-            TestConsole.consoleOnCallback.call(this, res, 'offAppShow', apiIndex)
-          })
+          Taro.offAppShow(this.appShow)
+        },
+      },
+      {
+        id: 'offAppShow1',
+        func: () => {
+          TestConsole.consoleTest('Taro.offAppShow1')
+          Taro.offAppShow(this.appShow1)
         },
       },
       {
         id: 'offAppHide',
-        func: (apiIndex) => {
+        func: () => {
           TestConsole.consoleTest('Taro.offAppHide')
-          Taro.offAppHide((res) => {
-            TestConsole.consoleOnCallback.call(this, res, 'offAppHide', apiIndex)
-          })
+          Taro.offAppHide(this.appHide)
+        },
+      },
+      {
+        id: 'offAppHide1',
+        func: () => {
+          TestConsole.consoleTest('Taro.offAppHide1')
+          Taro.offAppHide(this.appHide1)
         },
       },
     ],
   }
 
+  appShow = (res) => {
+    TestConsole.consoleOnCallback.call(this, res, 'onAppShow', 6)
+  }
+
+  appShow1 = (res) => {
+    TestConsole.consoleOnCallback.call(this, res, 'onAppShow1', 7)
+  }
+
+  appHide = (res) => {
+    TestConsole.consoleOnCallback.call(this, res, 'onAppHide', 8)
+  }
+
+  appHide1 = (res) => {
+    TestConsole.consoleOnCallback.call(this, res, 'onAppHide1', 9)
+  }
+
   render() {
     const { list } = this.state
     return (

examples/mini-program-example/src/pages/api/basics/system/index.tsx

@@ -50,7 +50,7 @@ export default class Index extends React.Component {
           const currentTime = Date.now()
           const res = Taro.getSystemSetting()
           const took = Date.now() - currentTime
-          console.log("getSystemSetting took: ", took)
+          console.log('getSystemSetting took: ', took)
           TestConsole.consoleSuccess.call(this, res, apiIndex)
         },
       },

examples/mini-program-example/src/pages/api/canvas/index.scss

@@ -4,22 +4,20 @@
     color: #f5f5f5;
     background-color: $color-success;
 }
-.api-page{
-    padding-top:650px;
-}
 .canvas {
     width: 305px;
     height: 280px;
     background-color: #f7f7f7;
 }
-.canvas-main{
+.canvas-main {
     position: fixed;
-    top: 0;
-    padding-left:20px;
+    display: flex;
+    justify-content: center;
     left:0;
     width: 100%;
     background: #fff;
     z-index: 100;
+    margin-bottom: 20px;
 }
 .hide{
     display: none;

examples/mini-program-example/src/pages/api/canvas/index.tsx

@@ -336,10 +336,7 @@ export default class Index extends React.Component {
                 success: (res) => {
                   this.initCanvas(apiIndex, async () => {
                     context.beginPath()
-                    context.drawImage(
-                      res.path,
-                      ...Object.values(data)
-                    )
+                    context.drawImage(res.path, ...Object.values(data))
                     await context.draw()
                     TestConsole.consoleNormal('CanvasContext-drawImage success ', context)
                   })
@@ -388,7 +385,7 @@ export default class Index extends React.Component {
            *   await context.draw()
            *   TestConsole.consoleNormal('CanvasContext-drawImage success ', context)
            * })
-          */
+           */
         },
       },
       {
@@ -887,8 +884,8 @@ export default class Index extends React.Component {
   render() {
     const { list, canvasId, src } = this.state
     return (
-      <View className='api-page'>
-        <View className='canvas-main'>
+      <View>
+        <View className='canvas-main' style={{ top: '79px' }}>
           <Canvas
             canvasId={canvasId}
             className='canvas'
@@ -897,6 +894,7 @@ export default class Index extends React.Component {
             style='width: 305px; height: 280px;'
           ></Canvas>
         </View>
+        <View style={{ height: '300px' }}></View>
         <View className={`${!src ? 'hide' : 'show'}`}>
           <View>Taro.canvasToTempFilePath图片 </View>
           <Image className='image-show' src={src}></Image>

examples/mini-program-example/src/pages/api/device/scan/index.tsx

@@ -2,6 +2,7 @@ import React from 'react'
 import Taro from '@tarojs/taro'
 import { View, Text } from '@tarojs/components'
 import ButtonList from '@/components/buttonList'
+import { TestConsole } from '@/util/util'
 import './index.scss'
 
 /**
@@ -14,14 +15,58 @@ export default class Index extends React.Component {
     list: [
       {
         id: 'scanCode',
-        func: null,
+        inputData: {
+          onlyFromCamera: false,
+          scanType: ['qrCode']
+        },
+        func: (apiIndex, data) => {
+          TestConsole.consoleTest('Taro.scanCode')
+          Taro.scanCode({
+            ...data,
+            success: (res) => {
+              TestConsole.consoleSuccess.call(this, res, apiIndex)
+              this.setState({
+                scanResult: res
+              })
+            },
+            fail: (res) => {
+              TestConsole.consoleFail.call(this, res, apiIndex)
+            },
+            complete: (res) => {
+              TestConsole.consoleComplete.call(this, res, apiIndex)
+            },
+          }).then((res) => {
+            TestConsole.consoleResult.call(this, res, apiIndex)
+          }).catch((err) => {
+            TestConsole.consoleDebug('scanCode', err)
+          })
+        },
       },
     ],
+    scanResult: {}
   }
-  render() {
-    const { list } = this.state
+  render () {
+    const { list, scanResult } = this.state
     return (
-      <View className='api-page'>
+      <View>
+        <View>
+          <Text>扫码结果</Text>
+          {Object.keys(scanResult).length === 0 && (
+            <View>
+              <Text>未扫描到内容</Text>
+            </View>
+          )}
+          {Object.keys(scanResult).length !== 0 && (
+            <View>
+              <View>
+                <Text>{'扫码的字符集: ' + scanResult?.charSet}</Text><br />
+                <Text>{'编码原始数据: ' + scanResult?.rawData}</Text><br />
+                <Text>{'所扫码的内容: ' + scanResult?.result}</Text><br />
+                <Text>{'所扫码的类型: ' + scanResult?.scanType}</Text><br />
+              </View>
+            </View>
+          )}
+        </View>
         <ButtonList buttonList={list} />
       </View>
     )