diff --git a/cloudfunctions/ARDemo/wx-server-sdk-wxg-service/README.md b/cloudfunctions/ARDemo/wx-server-sdk-wxg-service/README.md deleted file mode 100644 index 094c39f6..00000000 --- a/cloudfunctions/ARDemo/wx-server-sdk-wxg-service/README.md +++ /dev/null @@ -1,326 +0,0 @@ -# WXG Service for Mini Program Server SDK - -## wx-server-sdk 插件使用方式 - -需同时安装依赖 `wx-server-sdk` 和 `@tencent/wx-server-sdk-wxg-service`，后者必须使用 `tnpm` 安装。 - -注册 SDK 插件的示例代码： - -```js -const cloud = require('wx-server-sdk') -const wxgService = require('@tencent/wx-server-sdk-wxg-service') - -// 将 wxg service 注册到 cloud 上，获得 callWXSvrkit, callTencentInnerAPI 等内部接口 -cloud.registerService(wxgService) - -exports.main = async (event, context) => { - // 现在可以使用 callWXSvrkit 等内部接口了 - cloud.callWXSvrkit({ - // .... - }) -} -``` - -## 兼容性说明 - -从 `0.6.1` 起，需搭配 `wx-server-sdk` `2.0.3` 或以上使用。 - -## 接口 - -WXG Service 包含以下接口 - -### callTencentInnerAPI：调用腾讯内部服务 - -```js -const cloud = require('wx-server-sdk') -const wxgService = require('@tencent/wx-server-sdk-wxg-service') - -// 将 wxg service 注册到 cloud 上，获得 callWXSvrkit 接口 -cloud.registerService(wxgService) - -exports.main = async (event, context) => { - const callResult = await cloud.callTencentInnerAPI({ - cmdid: 12345, // 必填 - modid: 67890, // 必填 - path: '/aaa/bbb?xxx=1', // 必填，除域名外 URL 路径。URL 参数选填 - https: false, // 选填，是否使用 https - method: 'post', // 必填，HTTP Method - // 选填，HTTP 头部 - headers: { - 'Content-Type': 'application/json' - }, - // 选填，body 可以是 string 类型或 Buffer 类型 - body: JSON.stringify({ - x: 1, - y: 2, - }), - /** - * autoParse: - * 是否自动 parse 回包包体，如果是，则： - * 在 content-type 为 application/json 时自动 parse JSON - * 在 content-type 为 text/plain 时自动转为 string - * 其余情况不 parse，返回原始包体 buffer - */ - autoParse: true, - }) - - console.log(callResult) - - /** - * callResult: - * { - * errCode: 0, - * errMsg: 'callTencetnInnerAPI:ok', - * contentType: 'application/json', // 回包 content-type - * body: { x: 1 }, // 回包 http response body - * statusCode: 200, // 回包 http status code - * rawHeaders: [ // 回包 http headers - * { - * key: 'content-type', - * value: 'application' - * }, - * // ... - * ] - * } - */ - return callResult -} -``` - -### callWXSvrkit：调用微信 Svrkit 服务 - -供 WXG 内部小程序通过云函数调用微信 svrkit 模块。 - -因为 svrkit 的数据交换协议是 `protobuf`，且 svrkit 的模块调用需要一些模块信息，因此为了简化前端调用方式、省去接口数据处理和调用信息处理（pb 序列化与反序列化、模块信息传入）、我们也提供了一个 `@tencent/cloud-functions-tools` 工具用于将 svrkit 的调用流程配置化、标准化，开发者只需填写配置文件和放置 `proto` 文件，即可用工具生成辅助模块，实际调用时即可传入 `JSON` 对象获取 `JSON` 返回值。 - - -示例云函数已放置在公开的内部 git 仓库，仓库 `cloudfunctions` 目录下有两个子目录分别是 `svrkit-echo` 和 `svrkit-check-developer`这两个示例云函数，仓库地址 ：https://git.code.oa.com/mp-public/cloud-demos - - -### Step 1：安装 `@tencent/cloud-functions-tools` - -首先在需要使用该能力的云函数的目录下安装 `@tencent/cloud-functions-tools`： - -```shell -npm install --save-dev @tencent/cloud-functions-tools@latest -``` - -注意，云函数中同时需安装 `wx-server-sdk` 和 `@tencent/wx-server-sdk-wxg-service` - -```bash -npm install --save wx-server-sdk@latest -npm install --save @tencent/wx-server-sdk-wxg-service@latest -``` - - - -### Step 2：配置 - -在云函数目录下建立 `svrkit.config.js` 文件，用于填写 `svrkit` 调用的配置信息，并放置好相应 proto 文件，示例如下（从后台的原始 pb 文件提取模块调用信息的方法参见底部的[svrkit 调用信息提取](#extract_pb_info)）： - -```js -// 模块导出一个数组，每个元素是一个模块配置项 -module.exports = [ - { - // 模块对应的 proto 文件相对于该文件的路径 - proto: './proto/mmbizwxaqbasedemo.proto', - // 模块 service name - serviceName: 'MMBizWxaQbaseDemo', - // 模块 magic 数字 - magic: 18501, - // 模块导出的接口方法 - functions: { - // 接口 EchoTest 的名字及其对应的接口调用信息 - EchoTest: { - // 接口的 cmdid - cmdid: 1, - // 接口的 request 对应的 protobuf message 名字，需在 proto 文件中定义 - req: 'EchoTestRequest', - // 接口的 response 对应的 protobuf message 名字，需在 proto 文件中定义 - res: 'EchoTestResponse', - }, - // 接口 CheckWxaDeveloper 的名字及其对应的接口调用信息 - CheckWxaDeveloper: { - cmdid: 2, - req: 'CheckWxaDeveloperRequest', - } - } - } -] -``` - - - -示例的 `./proto/mmbizwxaqbasedemo.proto` 文件： - -``` -message MessageData -{ - optional string Data = 1; -} - -message EchoTestRequest -{ - required bool OpenTime = 1; // 是否需要服务端返回时间戳，required 必填 - - // 以下 optional 字段如果有填，在Resp中返回对应字段 - optional int32 IntData = 2; - optional string StringData = 3; - repeated uint32 UintListData = 4; - optional MessageData MessageData = 5; -} - -message EchoTestResponse -{ - optional uint32 TimeStamp = 1; - - optional int32 IntRespData = 2; - optional string StringRespData = 3; - repeated uint32 UintListRespData = 4; - optional MessageData MessageRespData = 5; -} - -// 校验是否为小程序开发者, 接口返回：0 是，1 否 -message CheckWxaDeveloperRequest -{ - optional uint32 appuin = 1; - optional uint32 useruin = 2; -} -``` - - - -### Step 3：用工具生成辅助类 - -用 `@tencent/cloud-functions-tools` 提供的工具根据 `svrkit.config.js` 生成辅助的 `svrkit-utils.js` 模块： - -```bash -# 在云函数目录执行以下命令，--config （或 -c） 对应的路径如果不同则替换为自己的路径 -./node_modules/.bin/svrkit-utils --config ./svrkit.config.js -# 如需自定义输出文件的路径，可以传入 --output （或 -o） -./node_modules/.bin/svrkit-utils --config ./svrkit.config.js --output ./svrkit-utils.js -``` - -> 注：可用此命令查看 cloud-functions-tools 的用法：./node_modules/.bin/svrkit-utils -h - -可以在 `package.json` 中添加一个 `script` 命令自动化这个流程： - -```json -{ - "scripts": { - "svrkit": "svrkit-utils --config ./svrkit.config.js --output ./svrkit-utils.js" - } -} -``` - -然后之后就可以用如下命令生成 js 模块了： - -```bash -npm run svrkit -``` - - - -### Step 4：发起调用 - - - -用 `callWXSvrkit` 方法配合生成的 `svrkit-utils.js` 模块发起 svrkit 调用 - - - -**callWXSvrkit 接口参数说明** - -| 参数 | 类型 | 必填 | 说明 | -| ---------- | ---- | ---- | --------------------------------------------------- | -| pbInstance | | 是 | 通过 `svrkit-utils.js` 的 `generate` 方法生成的对象 | -| timeout | number | 否 | 超时失败时间 | - -**callWXSvrkit 接口返回值说明** - -| 参数 | 类型 | 说明 | 最低版本 | -| -------------- | ------ | ------------------------------------------------------------ | -------- | -| errMsg | String | 通用返回结果 | | -| ret | Number | svrkit 模块调用结果，0 表示成功调到了目标模块，-306 表示小程序未在内部小程序登记平台登记，-307 表示小程序没有调用目标模块的权限 | | -| result | Number | 目标模块的调用返回码 | | -| respBody | Object | 目标模块返回的最终 JSON 对象 | | -| respBodyBuffer | Buffer | 目标模块返回的 pb buffer，有 respBody 可不用关注 | | - - - -调用代码示例： - -```js -const cloud = require('wx-server-sdk') -const wxgService = require('@tencent/wx-server-sdk-wxg-service') - -cloud.registerService(wxgService) -cloud.init() - -const svrkitUtils = require('./svrkit-utils.js') - -exports.main = async (event, context) => { - - return await cloud.callWXSvrkit({ - pbInstance: svrkitUtils.generate({ - serviceName: 'MMBizWxaQbaseDemo', - funcName: 'EchoTest', - data: { - OpenTime: event.OpenTime || true, - IntData: event.IntData || 10, - StringData: event.StringData || 'default_string', - UintListData: event.UintListData || [1, 2, 3], - MessageData: event.MessageData || { - Data: 'default_data_string' - }, - } - }) - }) - -} -``` - -预期返回： - -```js -{ - "ret": 0, - "result": 0, - "respBodyBuffer": Buffer, - "respBody": { - "TimeStamp": 1543501760, - "IntRespData": 10, - "StringRespData": "default_string", - "UintListRespData": [ - 1, - 2, - 3 - ], - "MessageRespData": { - "Data": "default_data_string" - } - }, - "errMsg": "callWXSvrkit:ok" -} -``` - -调用数据流如图： - -![svrkit 调用数据流](http://km.oa.com/files/photos/pictures//20181130//1543559018_58.png) - - -从后台原始 svrkit pb 信息中提取模块调用信息： - -1. `message` 定义的是 pb 数据接口体的定义，通常即是请求包与回包的定义 -2. `service` 定义的是 svrkit 模块的 `serviceName` -3. `tlvpickle.Magic` 定义的是模块 `magic` -4. `rpc` 后跟的词即是模块暴露的接口方法名，即 `funcName` -5. `rpc` 定义中包含了请求体结构和返回体结构，如 `EchoTest` 方法的请求体结构为 `EchoTestRequest`，返回体结构为 `EchoTestResponse` -6. `tlvpickle.SKBuiltinEmpty_PB` 是特殊的结构体，表示空结构体 - -![svrkit 模块调用信息](http://km.oa.com/files/photos/captures/201812/1543846169_62_w1668_h2228.png) - - -### callSvrkit: 调用微信 Svrkit 服务 - -> 已废弃，请使用 callWXSvrkit diff --git a/miniprogram/app.json b/miniprogram/app.json index 14f7688b..95d11114 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -220,51 +220,13 @@ { "root": "packageExtend", "pages": [ - "pages/form/cell/cell", - "pages/form/slideview/slideview", - "pages/form/form/form", - "pages/form/uploader/uploader", - "pages/base/article/article", - "pages/base/icons/icons", - "pages/base/badge/badge", - "pages/base/flex/flex", - "pages/base/footer/footer", - "pages/base/gallery/gallery", - "pages/base/grid/grid", - "pages/base/loadmore/loadmore", - "pages/base/loading/loading", - "pages/base/panel/panel", - "pages/base/preview/preview", - "pages/operate/dialog/dialog", - "pages/operate/msg/msg", - "pages/operate/msg/msg_success", - "pages/operate/msg/msg_text", - "pages/operate/msg/msg_text_primary", - "pages/operate/msg/msg_fail", - "pages/operate/half-screen-dialog/half-screen-dialog", - "pages/operate/actionsheet/actionsheet", - "pages/operate/toptips/toptips", - "pages/navigation/navigation/navigation", - "pages/navigation/tabbar/tabbar", - "pages/search/searchbar/searchbar", - "pages/extend/emoji/emoji", - "pages/extend/video-swiper/video-swiper", - "pages/extend/index-list/index-list", - "pages/extend/recycle-view/recycle-view", - "pages/extend/sticky/sticky", - "pages/extend/tabs/tabs", - "pages/extend/vtabs/vtabs", - "pages/extend/barrage/barrage", - "pages/extend/select-text/select-text", - "pages/extend/wxml-to-canvas/wxml-to-canvas", "pages/adapt/telescopic/telescopic", "pages/adapt/linebreak/linebreak", "pages/adapt/sidenavigation/sidenavigation", "pages/adapt/pagination/pagination", "pages/adapt/freelayout/freelayout", "pages/adapt/layeredpresentation/layeredpresentation", - "pages/adapt/horizontalexpansion/horizontalexpansion", - "pages/adapt/customscreenvalidation/customscreenvalidation" + "pages/adapt/horizontalexpansion/horizontalexpansion" ] }, { diff --git a/miniprogram/packageExtend/pages/adapt/customscreenvalidation/customscreenvalidation.json b/miniprogram/packageExtend/pages/adapt/customscreenvalidation/customscreenvalidation.json deleted file mode 100644 index d4218fa9..00000000 --- a/miniprogram/packageExtend/pages/adapt/customscreenvalidation/customscreenvalidation.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "usingComponents": {}, - "renderer": "webview", -"navigationBarTitleText": "特殊屏幕验证" -} \ No newline at end of file diff --git a/miniprogram/packageExtend/pages/adapt/customscreenvalidation/customscreenvalidation.less b/miniprogram/packageExtend/pages/adapt/customscreenvalidation/customscreenvalidation.less deleted file mode 100644 index b122557e..00000000 --- a/miniprogram/packageExtend/pages/adapt/customscreenvalidation/customscreenvalidation.less +++ /dev/null @@ -1,17 +0,0 @@ -/* packageExtend/pages/adapt/customscreenvalidation/customscreenvalidation.wxss */ -page { - display: block; - font-size: 1rem; - line-height: normal; -} - -.v { - margin: 0; - padding: 0; -} - -.t { - margin: 0; - padding: 0; - white-space: nowrap; -} \ No newline at end of file diff --git a/miniprogram/packageExtend/pages/adapt/customscreenvalidation/customscreenvalidation.ts b/miniprogram/packageExtend/pages/adapt/customscreenvalidation/customscreenvalidation.ts deleted file mode 100644 index 902563fa..00000000 --- a/miniprogram/packageExtend/pages/adapt/customscreenvalidation/customscreenvalidation.ts +++ /dev/null @@ -1,66 +0,0 @@ -// packageExtend/pages/adapt/customscreenvalidation/customscreenvalidation.ts -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad() { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - - } -}) \ No newline at end of file diff --git a/miniprogram/packageExtend/pages/adapt/customscreenvalidation/customscreenvalidation.wxml b/miniprogram/packageExtend/pages/adapt/customscreenvalidation/customscreenvalidation.wxml deleted file mode 100644 index 84cebdb0..00000000 --- a/miniprogram/packageExtend/pages/adapt/customscreenvalidation/customscreenvalidation.wxml +++ /dev/null @@ -1,24 +0,0 @@ - -01ABCDEFGabcdefg1234567890一二三四五 -02ABCDEFGabcdefg1234567890一二三四五 -03ABCDEFGabcdefg1234567890一二三四五 -04ABCDEFGabcdefg1234567890一二三四五 -05ABCDEFGabcdefg1234567890一二三四五 -06ABCDEFGabcdefg1234567890一二三四五 -07ABCDEFGabcdefg1234567890一二三四五 -08ABCDEFGabcdefg1234567890一二三四五 -09ABCDEFGabcdefg1234567890一二三四五 -10ABCDEFGabcdefg1234567890一二三四五 -11ABCDEFGabcdefg1234567890一二三四五 -12ABCDEFGabcdefg1234567890一二三四五 -13ABCDEFGabcdefg1234567890一二三四五 -14ABCDEFGabcdefg1234567890一二三四五 -15ABCDEFGabcdefg1234567890一二三四五 -16ABCDEFGabcdefg1234567890一二三四五 -17ABCDEFGabcdefg1234567890一二三四五 -18ABCDEFGabcdefg1234567890一二三四五 -19ABCDEFGabcdefg1234567890一二三四五 -20ABCDEFGabcdefg1234567890一二三四五 -21ABCDEFGabcdefg1234567890一二三四五 -22ABCDEFGabcdefg1234567890一二三四五 -23ABCDEFGabcdefg1234567890一二三四五 diff --git a/miniprogram/packageExtend/pages/adapt/freelayout/freelayout.json b/miniprogram/packageExtend/pages/adapt/freelayout/freelayout.json index 8d6ebfc8..cebf506a 100644 --- a/miniprogram/packageExtend/pages/adapt/freelayout/freelayout.json +++ b/miniprogram/packageExtend/pages/adapt/freelayout/freelayout.json @@ -4,5 +4,5 @@ "mp-row": "../../../components/row/index" }, "renderer": "webview", -"navigationBarTitleText": "自由布局" + "navigationBarTitleText": "自由布局" } \ No newline at end of file diff --git a/miniprogram/packageExtend/pages/adapt/freelayout/freelayout.wxml b/miniprogram/packageExtend/pages/adapt/freelayout/freelayout.wxml index 89591478..4f058682 100644 --- a/miniprogram/packageExtend/pages/adapt/freelayout/freelayout.wxml +++ b/miniprogram/packageExtend/pages/adapt/freelayout/freelayout.wxml @@ -3,53 +3,43 @@ - - A - + A - - B - + B - - C - + C - - - - - A + + + + A - - - - - - B + + + + B - - - + + - - - C - + + + C - + + \ No newline at end of file diff --git a/miniprogram/packageExtend/pages/adapt/horizontalexpansion/horizontalexpansion.json b/miniprogram/packageExtend/pages/adapt/horizontalexpansion/horizontalexpansion.json index f26c58e0..164b709c 100644 --- a/miniprogram/packageExtend/pages/adapt/horizontalexpansion/horizontalexpansion.json +++ b/miniprogram/packageExtend/pages/adapt/horizontalexpansion/horizontalexpansion.json @@ -4,5 +4,5 @@ "mp-row": "../../../components/row/index" }, "renderer": "webview", -"navigationBarTitleText": "横向拓展" + "navigationBarTitleText": "横向拓展" } \ No newline at end of file diff --git a/miniprogram/packageExtend/pages/adapt/horizontalexpansion/horizontalexpansion.wxml b/miniprogram/packageExtend/pages/adapt/horizontalexpansion/horizontalexpansion.wxml index 6b66c274..90d0a9b7 100644 --- a/miniprogram/packageExtend/pages/adapt/horizontalexpansion/horizontalexpansion.wxml +++ b/miniprogram/packageExtend/pages/adapt/horizontalexpansion/horizontalexpansion.wxml @@ -1,38 +1,32 @@ - - - A - - - B - - - C - - + + + A + + + B + + + C + + - - A - + A - - B - + B - - C - + C diff --git a/miniprogram/packageExtend/pages/adapt/layeredpresentation/layeredpresentation.json b/miniprogram/packageExtend/pages/adapt/layeredpresentation/layeredpresentation.json index e422d69d..2668001a 100644 --- a/miniprogram/packageExtend/pages/adapt/layeredpresentation/layeredpresentation.json +++ b/miniprogram/packageExtend/pages/adapt/layeredpresentation/layeredpresentation.json @@ -4,5 +4,5 @@ "mp-row": "../../../components/row/index" }, "renderer": "webview", -"navigationBarTitleText": "分层展现" + "navigationBarTitleText": "分层展现" } \ No newline at end of file diff --git a/miniprogram/packageExtend/pages/adapt/layeredpresentation/layeredpresentation.wxml b/miniprogram/packageExtend/pages/adapt/layeredpresentation/layeredpresentation.wxml index f5e1ceac..b1101684 100644 --- a/miniprogram/packageExtend/pages/adapt/layeredpresentation/layeredpresentation.wxml +++ b/miniprogram/packageExtend/pages/adapt/layeredpresentation/layeredpresentation.wxml @@ -3,23 +3,17 @@ - - A - + A - - B - + B - - C - + C diff --git a/miniprogram/packageExtend/pages/adapt/linebreak/linebreak.json b/miniprogram/packageExtend/pages/adapt/linebreak/linebreak.json index 89c246f9..c28e9526 100644 --- a/miniprogram/packageExtend/pages/adapt/linebreak/linebreak.json +++ b/miniprogram/packageExtend/pages/adapt/linebreak/linebreak.json @@ -4,5 +4,5 @@ "mp-row": "../../../components/row/index" }, "renderer": "webview", -"navigationBarTitleText": "换行排列" + "navigationBarTitleText": "换行排列" } \ No newline at end of file diff --git a/miniprogram/packageExtend/pages/adapt/linebreak/linebreak.wxml b/miniprogram/packageExtend/pages/adapt/linebreak/linebreak.wxml index 6744f361..95625f77 100644 --- a/miniprogram/packageExtend/pages/adapt/linebreak/linebreak.wxml +++ b/miniprogram/packageExtend/pages/adapt/linebreak/linebreak.wxml @@ -2,39 +2,33 @@ - - + - - + - - + - - + - - + - - + - + \ No newline at end of file diff --git a/miniprogram/packageExtend/pages/adapt/pagination/pagination.json b/miniprogram/packageExtend/pages/adapt/pagination/pagination.json index e2a4cd00..0e995762 100644 --- a/miniprogram/packageExtend/pages/adapt/pagination/pagination.json +++ b/miniprogram/packageExtend/pages/adapt/pagination/pagination.json @@ -4,5 +4,5 @@ "mp-row": "../../../components/row/index" }, "renderer": "webview", -"navigationBarTitleText": "分页展现" + "navigationBarTitleText": "分页展现" } \ No newline at end of file diff --git a/miniprogram/packageExtend/pages/adapt/pagination/pagination.wxml b/miniprogram/packageExtend/pages/adapt/pagination/pagination.wxml index 528b7ccc..cd23ced1 100644 --- a/miniprogram/packageExtend/pages/adapt/pagination/pagination.wxml +++ b/miniprogram/packageExtend/pages/adapt/pagination/pagination.wxml @@ -2,17 +2,13 @@ - - A - + A - - B - + B - \ No newline at end of file + \ No newline at end of file diff --git a/miniprogram/packageExtend/pages/adapt/sidenavigation/sidenavigation.json b/miniprogram/packageExtend/pages/adapt/sidenavigation/sidenavigation.json index 732f0c4c..92ec7cee 100644 --- a/miniprogram/packageExtend/pages/adapt/sidenavigation/sidenavigation.json +++ b/miniprogram/packageExtend/pages/adapt/sidenavigation/sidenavigation.json @@ -1,5 +1,5 @@ { "usingComponents": {}, "renderer": "webview", -"navigationBarTitleText": "侧边导航栏" + "navigationBarTitleText": "侧边导航栏" } \ No newline at end of file diff --git a/miniprogram/packageExtend/pages/adapt/telescopic/telescopic.json b/miniprogram/packageExtend/pages/adapt/telescopic/telescopic.json index 7372be44..9c9fe14a 100644 --- a/miniprogram/packageExtend/pages/adapt/telescopic/telescopic.json +++ b/miniprogram/packageExtend/pages/adapt/telescopic/telescopic.json @@ -4,5 +4,5 @@ "mp-row": "../../../components/row/index" }, "renderer": "webview", -"navigationBarTitleText": "左右伸缩" + "navigationBarTitleText": "左右伸缩" } \ No newline at end of file diff --git a/miniprogram/packageExtend/pages/adapt/telescopic/telescopic.wxml b/miniprogram/packageExtend/pages/adapt/telescopic/telescopic.wxml index e61cc3c4..0e15c3dc 100644 --- a/miniprogram/packageExtend/pages/adapt/telescopic/telescopic.wxml +++ b/miniprogram/packageExtend/pages/adapt/telescopic/telescopic.wxml @@ -2,28 +2,24 @@ - - + - - + - - + - - + diff --git a/miniprogram/packageExtend/pages/form/cell/cell.js b/miniprogram/packageExtend/pages/form/cell/cell.js deleted file mode 100644 index 532a3ddf..00000000 --- a/miniprogram/packageExtend/pages/form/cell/cell.js +++ /dev/null @@ -1,27 +0,0 @@ -import CustomPage from '../../../base/CustomPage' - -const base64 = require('../../images/base64') - -CustomPage({ - onLoad() { - this.setData({ - icon: base64.icon20, - slideButtons: [{ - text: '普通', - src: global.isDemo ? '/page/weui/example/cell/icon_love.svg' : '/example/cell/icon_love.svg', // icon的路径 - }, { - text: '普通', - extClass: 'test', - src: global.isDemo ? '/page/weui/example/cell/icon_star.svg' : '/example/cell/icon_star.svg', // icon的路径 - }, { - type: 'warn', - text: '警示', - extClass: 'test', - src: global.isDemo ? '/page/weui/example/cell/icon_del.svg' : '/example/cell/icon_del.svg', // icon的路径 - }], - }) - }, - slideButtonTap(e) { - console.log('slide button tap', e.detail) - } -}) diff --git a/miniprogram/packageExtend/pages/form/cell/cell.json b/miniprogram/packageExtend/pages/form/cell/cell.json deleted file mode 100644 index afe87ee4..00000000 --- a/miniprogram/packageExtend/pages/form/cell/cell.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "usingComponents": { - "mp-navigation-bar": "weui-miniprogram/navigation-bar/navigation-bar", - "mp-cells": "weui-miniprogram/cells/cells", - "mp-cell": "weui-miniprogram/cell/cell", - "mp-slideview": "weui-miniprogram/slideview/slideview" - }, - "navigationStyle": "custom", - "renderer": "skyline" -} diff --git a/miniprogram/packageExtend/pages/form/cell/cell.wxml b/miniprogram/packageExtend/pages/form/cell/cell.wxml deleted file mode 100644 index 529f2fc9..00000000 --- a/miniprogram/packageExtend/pages/form/cell/cell.wxml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - Cell - 列表 - - - - - - 标题文字（使用slot） - 说明文字 - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/miniprogram/packageExtend/pages/form/cell/cell.wxss b/miniprogram/packageExtend/pages/form/cell/cell.wxss deleted file mode 100644 index 9626f33b..00000000 --- a/miniprogram/packageExtend/pages/form/cell/cell.wxss +++ /dev/null @@ -1 +0,0 @@ -@import '../../common.wxss'; diff --git a/miniprogram/packageExtend/pages/form/cell/icon_del.svg b/miniprogram/packageExtend/pages/form/cell/icon_del.svg deleted file mode 100644 index c652fd84..00000000 --- a/miniprogram/packageExtend/pages/form/cell/icon_del.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/miniprogram/packageExtend/pages/form/cell/icon_love.svg b/miniprogram/packageExtend/pages/form/cell/icon_love.svg deleted file mode 100644 index 848ccfa4..00000000 --- a/miniprogram/packageExtend/pages/form/cell/icon_love.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/miniprogram/packageExtend/pages/form/cell/icon_star.svg b/miniprogram/packageExtend/pages/form/cell/icon_star.svg deleted file mode 100644 index aa3979af..00000000 --- a/miniprogram/packageExtend/pages/form/cell/icon_star.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/miniprogram/packageExtend/pages/form/form/form.js b/miniprogram/packageExtend/pages/form/form/form.js deleted file mode 100644 index a5327701..00000000 --- a/miniprogram/packageExtend/pages/form/form/form.js +++ /dev/null @@ -1,168 +0,0 @@ -import CustomPage from '../../../base/CustomPage' - -CustomPage({ - data: { - showTopTips: false, - - radioItems: [ - { name: 'cell standard', value: '0', checked: true }, - { name: 'cell standard', value: '1' } - ], - checkboxItems: [ - { name: 'standard is dealt for u.', value: '0', checked: true }, - { name: 'standard is dealicient for u.', value: '1' } - ], - items: [ - { name: 'USA', value: '美国' }, - { name: 'CHN', value: '中国', checked: 'true' }, - { name: 'BRA', value: '巴西' }, - { name: 'JPN', value: '日本' }, - { name: 'ENG', value: '英国' }, - { name: 'TUR', value: '法国' }, - ], - - date: '2016-09-01', - time: '12:01', - - countryCodes: ['+86', '+80', '+84', '+87'], - countryCodeIndex: 0, - - countries: ['中国', '美国', '英国'], - countryIndex: 0, - - accounts: ['微信号', 'QQ', 'Email'], - accountIndex: 0, - - isAgree: false, - formData: { - - }, - rules: [{ - name: 'radio', - rules: { required: false, message: '单选列表是必选项' }, - }, { - name: 'checkbox', - rules: { required: true, message: '多选列表是必选项' }, - }, { - name: 'name', - rules: { required: true, message: '请输入姓名' }, - }, { - name: 'qq', - rules: { required: true, message: 'qq必填' }, - }, { - name: 'mobile', - rules: [{ required: true, message: 'mobile必填' }, { mobile: true, message: 'mobile格式不对' }], - }, { - name: 'vcode', - rules: { required: true, message: '验证码必填' }, - }, { - name: 'idcard', - rules: { - validator(rule, value) { - if (!value || value.length !== 18) { - return 'idcard格式不正确' - } - return '' - } - }, - }] - }, - radioChange(e) { - console.log('radio发生change事件，携带value值为：', e.detail.value) - - const radioItems = this.data.radioItems - for (let i = 0, len = radioItems.length; i < len; ++i) { - radioItems[i].checked = radioItems[i].value === e.detail.value - } - - this.setData({ - radioItems, - 'formData.radio': e.detail.value - }) - }, - checkboxChange(e) { - console.log('checkbox发生change事件，携带value值为：', e.detail.value) - - const checkboxItems = this.data.checkboxItems; const - values = e.detail.value - for (let i = 0, lenI = checkboxItems.length; i < lenI; ++i) { - checkboxItems[i].checked = false - - for (let j = 0, lenJ = values.length; j < lenJ; ++j) { - if (checkboxItems[i].value === values[j]) { - checkboxItems[i].checked = true - break - } - } - } - - this.setData({ - checkboxItems, - 'formData.checkbox': e.detail.value - }) - }, - bindDateChange(e) { - this.setData({ - date: e.detail.value, - 'formData.date': e.detail.value - }) - }, - formInputChange(e) { - const { field } = e.currentTarget.dataset - this.setData({ - [`formData.${field}`]: e.detail.value - }) - }, - bindTimeChange(e) { - this.setData({ - time: e.detail.value - }) - }, - bindCountryCodeChange(e) { - console.log('picker country code 发生选择改变，携带值为', e.detail.value) - - this.setData({ - countryCodeIndex: e.detail.value - }) - }, - bindCountryChange(e) { - console.log('picker country 发生选择改变，携带值为', e.detail.value) - - this.setData({ - countryIndex: e.detail.value - }) - }, - bindAccountChange(e) { - console.log('picker account 发生选择改变，携带值为', e.detail.value) - - this.setData({ - accountIndex: e.detail.value - }) - }, - bindAgreeChange(e) { - this.setData({ - isAgree: !!e.detail.value.length - }) - }, - submitForm() { - this.selectComponent('#form').validate((valid, errors) => { - console.log('valid', valid, errors) - if (!valid) { - const firstError = Object.keys(errors) - if (firstError.length) { - this.setData({ - error: errors[firstError[0]].message - }) - } - } else { - wx.showToast({ - title: '校验通过' - }) - } - }) - // this.selectComponent('#form').validateField('mobile', (valid, errors) => { - // console.log('valid', valid, errors) - // }) - } - -}) diff --git a/miniprogram/packageExtend/pages/form/form/form.json b/miniprogram/packageExtend/pages/form/form/form.json deleted file mode 100644 index 18d7ab7f..00000000 --- a/miniprogram/packageExtend/pages/form/form/form.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "usingComponents": { - "mp-nagivation-bar": "weui-miniprogram/nagivation-bar/nagivation-bar", - "mp-form-page": "weui-miniprogram/form-page/form-page", - "mp-toptips": "weui-miniprogram/toptips/toptips", - "mp-cells": "weui-miniprogram/cells/cells", - "mp-cell": "weui-miniprogram/cell/cell", - "mp-checkbox": "weui-miniprogram/checkbox/checkbox", - "mp-checkbox-group": "weui-miniprogram/checkbox-group/checkbox-group", - "mp-form": "weui-miniprogram/form/form" - }, - "navigationStyle": "custom", - "renderer": "skyline" -} \ No newline at end of file diff --git a/miniprogram/packageExtend/pages/form/form/form.wxml b/miniprogram/packageExtend/pages/form/form/form.wxml deleted file mode 100644 index 562e5395..00000000 --- a/miniprogram/packageExtend/pages/form/form/form.wxml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -