Skip to content

Commit 2bf4bd3

Browse files
author
wzy
committed
Merge branch 'feat-xxx' of https://github.com/15170844121/miniprogram-demo-dev into feat-xxx
2 parents 9c03136 + c20910f commit 2bf4bd3

File tree

1,220 files changed

+18
-88202
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,220 files changed

+18
-88202
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
name: WeChat MiniProgram Demo CI/CD
22

33
on:
4+
45
pull_request:
6+
57
branches:
68
- feat-ce
79
jobs:
@@ -27,4 +29,6 @@ jobs:
2729
fi
2830
mkdir -p ./build
2931
echo "$WX_PRIVATE_KEY" > ./build/key
30-
echo "$WX_PRIVATE_KEY" | xxd
32+
33+
echo "$WX_PRIVATE_KEY" | xxd
34+

build/ci.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ const __filename = fileURLToPath(import.meta.url)
77
const __dirname = path.dirname(__filename)
88
const privateKeyPath = path.resolve(__dirname, './key')
99

10+
try {
11+
const content = fs.readFileSync(privateKeyPath, 'utf8');
12+
console.log('文件内容:', content);
13+
} catch (err) {
14+
console.error('读取文件出错:', err);
15+
}
16+
1017
// 检查私钥文件是否已存在
1118
if (!fs.existsSync(privateKeyPath)) {
1219
const privateKeyContent = process.env.WX_PRIVATE_KEY
@@ -18,7 +25,7 @@ if (!fs.existsSync(privateKeyPath)) {
1825
}
1926

2027
const project = new ci.Project({
21-
appid: 'wxe5f52902cf4de896',
28+
appid: 'wx622bee4f78fa4f5a',
2229
type: 'miniProgram',
2330
projectPath: path.resolve(__dirname, '../'),
2431
privateKeyPath: path.resolve(__dirname, './key'),

miniprogram/app.json

Lines changed: 1 addition & 174 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,7 @@
99
"usingComponents": {
1010
"mp-navigation-bar": "/component/navigation-bar/navigation-bar"
1111
},
12-
"chatTools": [
13-
{
14-
"root": "packageChatTool",
15-
"entryPagePath": "pages/activity_create/index",
16-
"desc": "群签到工具",
17-
"scopes": [
18-
"scope.userLocation"
19-
]
20-
}
21-
],
2212
"subpackages": [
23-
{
24-
"root": "packageChatTool",
25-
"pages": [
26-
"pages/activity_detail/index",
27-
"pages/activity_create/index"
28-
],
29-
"entry": "entry.js",
30-
"independent": true,
31-
"renderer": "skyline"
32-
},
3313
{
3414
"root": "packageComponent",
3515
"pages": [
@@ -52,18 +32,6 @@
5232
"pages/content/progress/progress",
5333
"pages/content/rich-text/rich-text",
5434
"pages/content/selection/selection",
55-
"pages/form/button/button",
56-
"pages/form/checkbox/checkbox",
57-
"pages/form/form/form",
58-
"pages/form/input/input",
59-
"pages/form/label/label",
60-
"pages/form/picker/picker",
61-
"pages/form/picker-view/picker-view",
62-
"pages/form/radio/radio",
63-
"pages/form/slider/slider",
64-
"pages/form/switch/switch",
65-
"pages/form/textarea/textarea",
66-
"pages/form/editor/editor",
6735
"pages/nav/navigator/navigator",
6836
"pages/nav/navigator/navigate",
6937
"pages/nav/navigator/redirect",
@@ -85,119 +53,6 @@
8553
"pages/doc-web-view/doc-web-view"
8654
]
8755
},
88-
{
89-
"root": "packageAPI",
90-
"pages": [
91-
"pages/api/login/login",
92-
"pages/api/get-user-info/get-user-info",
93-
"pages/api/request-payment/request-payment",
94-
"pages/api/jump/jump",
95-
"pages/api/share/share",
96-
"pages/api/share-button/share-button",
97-
"pages/api/custom-message/custom-message",
98-
"pages/api/subscribe-message/subscribe-message",
99-
"pages/api/choose-address/choose-address",
100-
"pages/api/choose-invoice-title/choose-invoice-title",
101-
"pages/api/soter-authentication/soter-authentication",
102-
"pages/api/setting/setting",
103-
"pages/ar/visionkit-basic/visionkit-basic",
104-
"pages/ar/visionkit-basic-v2/visionkit-basic-v2",
105-
"pages/ar/plane-ar/plane-ar",
106-
"pages/ar/plane-ar-v2/plane-ar-v2",
107-
"pages/ar/plane-ar-v2-options/plane-ar-v2-options",
108-
"pages/ar/plane-ar-v2-marker/plane-ar-v2-marker",
109-
"pages/ar/plane-ar-v2-depth/plane-ar-v2-depth",
110-
"pages/ar/plane-ar-3dof/plane-ar-3dof",
111-
"pages/ar/2dmarker-ar/2dmarker-ar",
112-
"pages/ar/3dmarker-ar/3dmarker-ar",
113-
"pages/ar/osd-ar/osd-ar",
114-
"pages/ar/face-detect/face-detect",
115-
"pages/ar/face-detect-3d/face-detect-3d",
116-
"pages/ar/face-detect-3d-glasses/face-detect-3d-glasses",
117-
"pages/ar/body-detect/body-detect",
118-
"pages/ar/body-detect-3d/body-detect-3d",
119-
"pages/ar/hand-detect/hand-detect",
120-
"pages/ar/hand-detect-3d/hand-detect-3d",
121-
"pages/ar/depth-detect/depth-detect",
122-
"pages/ar/cameraBuffer-detect/cameraBuffer-detect",
123-
"pages/ar/cameraBuffer-jpg/cameraBuffer-jpg",
124-
"pages/ar/ocr-detect/ocr-detect",
125-
"pages/ar/shoe-detect/shoe-detect",
126-
"pages/ar/photo-shoe-detect/photo-shoe-detect",
127-
"pages/ar/photo-ocr-detect/photo-ocr-detect",
128-
"pages/ar/photo-idcard-detect/photo-idcard-detect",
129-
"pages/ar/photo-hand-detect/photo-hand-detect",
130-
"pages/ar/photo-body-detect/photo-body-detect",
131-
"pages/ar/photo-face-detect/photo-face-detect",
132-
"pages/ar/photo-depth-detect/photo-depth-detect",
133-
"pages/ar/gaussian-splatting/gaussian-splatting",
134-
"pages/ar/gaussian-splatting/gaussian-splatting-ar",
135-
"pages/page/set-navigation-bar-title/set-navigation-bar-title",
136-
"pages/page/navigation-bar-loading/navigation-bar-loading",
137-
"pages/page/navigator/navigator",
138-
"pages/page/pull-down-refresh/pull-down-refresh",
139-
"pages/page/animation/animation",
140-
"pages/page/action-sheet/action-sheet",
141-
"pages/page/modal/modal",
142-
"pages/page/toast/toast",
143-
"pages/page/canvas/canvas",
144-
"pages/page/get-wxml-node-info/get-wxml-node-info",
145-
"pages/page/page-scroll/page-scroll",
146-
"pages/page/intersection-observer/intersection-observer",
147-
"pages/device/clipboard-data/clipboard-data",
148-
"pages/device/bluetooth/bluetooth",
149-
"pages/device/bluetooth/slave/slave",
150-
"pages/device/screen-brightness/screen-brightness",
151-
"pages/device/vibrate/vibrate",
152-
"pages/device/add-contact/add-contact",
153-
"pages/device/wifi/wifi",
154-
"pages/device/get-network-type/get-network-type",
155-
"pages/device/on-network-status-change/on-network-status-change",
156-
"pages/device/get-system-info/get-system-info",
157-
"pages/device/on-compass-change/on-compass-change",
158-
"pages/device/make-phone-call/make-phone-call",
159-
"pages/device/scan-code/scan-code",
160-
"pages/device/on-accelerometer-change/on-accelerometer-change",
161-
"pages/device/capture-screen/capture-screen",
162-
"pages/device/ibeacon/ibeacon",
163-
"pages/device/get-battery-info/get-battery-info",
164-
"pages/media/image/image",
165-
"pages/media/voice/voice",
166-
"pages/media/file/file",
167-
"pages/media/load-font-face/load-font-face",
168-
"pages/media/background-audio/background-audio",
169-
"pages/media/video/video",
170-
"pages/media/audio/audio",
171-
"pages/media/media-container/media-container",
172-
"pages/location/get-location/get-location",
173-
"pages/location/open-location/open-location",
174-
"pages/location/choose-location/choose-location",
175-
"pages/network/request/request",
176-
"pages/network/web-socket/web-socket",
177-
"pages/network/upload-file/upload-file",
178-
"pages/network/download-file/download-file",
179-
"pages/network/mdns/mdns",
180-
"pages/network/udp-socket/udp-socket",
181-
"pages/storage/storage/storage",
182-
"pages/storage/get-background-fetch-data/get-background-fetch-data",
183-
"pages/storage/get-background-prefetch-data/get-background-prefetch-data",
184-
"pages/performance/get-performance/get-performance",
185-
"pages/worker/worker/worker",
186-
"pages/framework/two-way-bindings/two-way-bindings",
187-
"pages/framework/wxs/wxs",
188-
"pages/framework/resizable/resizable",
189-
"pages/framework/wxs/movable",
190-
"pages/framework/wxs/sidebar",
191-
"pages/framework/wxs/stick-top",
192-
"pages/framework/wxs/nearby",
193-
"pages/ai/mobilenet/index",
194-
"pages/ai/style-trans/index",
195-
"pages/ai/mobilenet_int8/index",
196-
"pages/chattool/activity_assist/activity_assist",
197-
"pages/chattool/material_open/material_open",
198-
"pages/chattool/material_view/material_view"
199-
]
200-
},
20156
{
20257
"root": "packageCloud",
20358
"pages": [
@@ -401,18 +256,6 @@
401256
"packageComponent"
402257
]
403258
},
404-
"page/API/index": {
405-
"network": "all",
406-
"packages": [
407-
"packageAPI"
408-
]
409-
},
410-
"packageAPI/pages/chattool/activity_assist/activity_assist": {
411-
"network": "all",
412-
"packages": [
413-
"packageChatTool"
414-
]
415-
},
416259
"page/cloud/index": {
417260
"network": "all",
418261
"packages": [
@@ -512,21 +355,5 @@
512355
},
513356
"renderer": "skyline",
514357
"componentFramework": "glass-easel",
515-
"appBar": {},
516-
"supportedMaterials": [
517-
{
518-
"materialType": "image/*",
519-
"name": "用${nickname}打开",
520-
"desc": "聊天内容长按打开",
521-
"path": "packageAPI/pages/chattool/material_open/material_open"
522-
}
523-
],
524-
"multiSelectSupportedMaterials": [
525-
{
526-
"materialType": ["image/*"],
527-
"desc": "聊天内容长按多选打开",
528-
"path": "packageAPI/pages/chattool/material_open/material_open",
529-
"scopes": []
530-
}
531-
]
358+
"appBar": {}
532359
}

miniprogram/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
"dependencies": {
1313
"miniprogram-barrage": "^1.1.0",
1414
"miniprogram-recycle-view": "^0.1.5",
15-
"wxml-to-canvas": "^1.1.1",
16-
"threejs-miniprogram": "0.0.3"
15+
"wxml-to-canvas": "^1.1.1"
1716
}
1817
}

miniprogram/packageAPI/components/tdesign-miniprogram/cell-group/cell-group.d.ts

Lines changed: 0 additions & 13 deletions
This file was deleted.

miniprogram/packageAPI/components/tdesign-miniprogram/cell-group/cell-group.js

Lines changed: 0 additions & 43 deletions
This file was deleted.

miniprogram/packageAPI/components/tdesign-miniprogram/cell-group/cell-group.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

miniprogram/packageAPI/components/tdesign-miniprogram/cell-group/cell-group.wxml

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)