Merge branch 'main' of http://git.mokasz.com/maomao/mini_read_space_front

# Conflicts:
#	config/config.js
#	project.config.json

components/charge-dialog/charge-dialog.js

@@ -96,7 +96,7 @@ Component({
             novelManager.closeChargeDialog()
             console.log('关闭解锁组件')
             wx.showToast({
-              title: '解锁失败',
+              title: '广告解锁失败，请重试',
               icon: 'none'
             })
           }
@@ -114,7 +114,7 @@ Component({
       }).catch((err) => {
         console.log('激励视频播放失败', err)
         wx.showToast({
-          title: '广告拉起失败，请重试',
+          title: '观看人数太多，请稍后再试',
           icon: 'none'
         })
       }).then(() => {

config/config.js

@@ -471,7 +471,7 @@ const appInfoObj = {
 };
 
 // @config 确定使用的小程序appid
-const current_appid = 'wxa721f4474e3d548a';
+const current_appid = 'wx3800bb2ed4a326c5';
 export const apple = {
     ...appInfoObj[current_appid],
     appKey: '49TBR8Z1rA7PyqD30FV0v48AU',

project.config.json

@@ -1,46 +1,46 @@
 {
-  "compileType": "miniprogram",
-  "packOptions": {
-    "ignore": [
-      {
-        "value": "/minitest",
-        "type": "folder"
-      }
-    ],
-    "include": []
-  },
-  "setting": {
-    "coverView": true,
-    "es6": true,
-    "postcss": true,
-    "minified": true,
-    "enhance": true,
-    "showShadowRootInWxmlPanel": true,
-    "packNpmRelationList": [],
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
+    "compileType": "miniprogram",
+    "packOptions": {
+        "ignore": [
+            {
+                "value": "/minitest",
+                "type": "folder"
+            }
+        ],
+        "include": []
     },
-    "compileWorklet": false,
-    "uglifyFileName": false,
-    "uploadWithSourceMap": true,
-    "packNpmManually": false,
-    "minifyWXSS": true,
-    "minifyWXML": true,
-    "localPlugins": false,
-    "disableUseStrict": false,
-    "useCompilerPlugins": false,
-    "condition": false,
-    "swc": false,
-    "disableSWC": true
-  },
-  "editorSetting": {
-    "tabIndent": "auto",
-    "tabSize": 2
-  },
-  "appid": "wxa721f4474e3d548a",
-  "testRoot": "minitest/",
-  "libVersion": "trial",
-  "simulatorPluginLibVersion": {}
+    "setting": {
+        "coverView": true,
+        "es6": true,
+        "postcss": true,
+        "minified": true,
+        "enhance": true,
+        "showShadowRootInWxmlPanel": true,
+        "packNpmRelationList": [],
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
+        },
+        "compileWorklet": false,
+        "uglifyFileName": false,
+        "uploadWithSourceMap": true,
+        "packNpmManually": false,
+        "minifyWXSS": true,
+        "minifyWXML": true,
+        "localPlugins": false,
+        "disableUseStrict": false,
+        "useCompilerPlugins": false,
+        "condition": false,
+        "swc": false,
+        "disableSWC": true
+    },
+    "editorSetting": {
+        "tabIndent": "auto",
+        "tabSize": 2
+    },
+    "appid": "wx3800bb2ed4a326c5",
+    "testRoot": "minitest/",
+    "libVersion": "trial",
+    "simulatorPluginLibVersion": {}
 }