diff --git a/README.md b/README.md index c3a19e5..d65eb18 100644 --- a/README.md +++ b/README.md @@ -3,5 +3,9 @@ svn://39.106.86.127:28386/projects/wutian_xueyoubing_b/proj_src/shop/frontend/web/GeneB +(/images/)(\S*(?=["|'])) +{{imageUrl}}$2?t={{Timestamp}} + + https://pic1.zhimg.com/50/v2-8cfef5f9ea7d15963af2277c6814f152_720w.jpg?source=2c26e567 diff --git a/dist.ps1 b/dist.ps1 index d75626b..56abc95 100644 --- a/dist.ps1 +++ b/dist.ps1 @@ -6,3 +6,5 @@ svn add . --no-ignore --force # Commit the changes with a message svn ci -m "版本更新" + +ssh hb127 "cd /data1/wwwroot/default/wutian_xueyoubing_b/shop/frontend/web/ && svn up && exit" diff --git a/project.private.config.json b/project.private.config.json index 539d3d8..ab5c055 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -2,7 +2,7 @@ "projectname": "GeneB-miniprogram", "setting": { "compileHotReLoad": true, - "urlCheck": false, + "urlCheck": true, "coverView": true, "lazyloadPlaceholderEnable": false, "skylineRenderEnable": false, @@ -23,11 +23,25 @@ "miniprogram": { "list": [ { + "name": "知识夸详情-文章", + "pathName": "pages/knowledgeDetail/index", + "query": "id=9", + "scene": null, + "launchMode": "default" + }, + { + "name": "知识库详情-视频", + "pathName": "pages/knowledgeDetailVideo/index", + "query": "id=3", + "launchMode": "default", + "scene": null + }, + { "name": "患者-首页", "pathName": "patient/pages/home/index", "query": "", - "scene": null, - "launchMode": "default" + "launchMode": "default", + "scene": null }, { "name": "患者-录入个人信息", @@ -72,36 +86,36 @@ "scene": null }, { - "name": "知识库详情-视频", - "pathName": "pages/knowledgeDetailVideo/index", + "name": "知识库", + "pathName": "pages/knowledge/index", "query": "", "launchMode": "default", "scene": null }, { - "name": "知识夸详情-文章", - "pathName": "pages/knowledgeDetail/index", + "name": "基因疗法申请-结果页", + "pathName": "pages/applyFromResult/index", "query": "", "launchMode": "default", "scene": null }, { - "name": "知识库", - "pathName": "pages/knowledge/index", + "name": "基因疗法申请", + "pathName": "pages/applyFrom/index", "query": "", "launchMode": "default", "scene": null }, { - "name": "基因疗法申请-结果页", - "pathName": "pages/applyFromResult/index", + "name": "首页", + "pathName": "pages/index/index", "query": "", "launchMode": "default", "scene": null }, { - "name": "基因疗法申请", - "pathName": "pages/applyFrom/index", + "name": "登录", + "pathName": "pages/login/index", "query": "", "launchMode": "default", "scene": null diff --git a/src/app.json b/src/app.json index 34ae6c6..2f2ae13 100644 --- a/src/app.json +++ b/src/app.json @@ -1,6 +1,8 @@ { "$schema": "https://dldir1.qq.com/WechatWebDev/editor-extension/wx-json/app.schema.json", "pages": [ + "pages/start/index", + "pages/login/index", "pages/index/index", "pages/my/index", "pages/applyFrom/index", @@ -13,7 +15,11 @@ "subPackages": [ { "root": "patient", - "pages": ["pages/protocol/index", "pages/login/index", "pages/entryInfo/index","pages/home/index"] + "pages": ["pages/protocol/index", "pages/login/index", "pages/entryInfo/index", "pages/home/index"] + }, + { + "root": "doc", + "pages": ["pages/doc1/index"] } ], "tabBar": { diff --git a/src/components/login/index.ts b/src/components/login/index.ts index 4073978..2d784da 100644 --- a/src/components/login/index.ts +++ b/src/components/login/index.ts @@ -1,4 +1,4 @@ -const _app = getApp() +const app = getApp() Component({ properties: { @@ -7,7 +7,10 @@ Component({ value: false, }, }, - data: {}, + data: { + imageUrl: app.globalData.imageUrl, + Timestamp:app.globalData.Timestamp + }, methods: { handleOk() { this.setData({ diff --git a/src/components/navbar/index.ts b/src/components/navbar/index.ts index 0fd5c4a..0cb5894 100644 --- a/src/components/navbar/index.ts +++ b/src/components/navbar/index.ts @@ -1,4 +1,4 @@ -const _app = getApp() +const app = getApp() Component({ options: { @@ -30,16 +30,17 @@ Component({ /** * 组件的初始数据 */ - data: {}, + data: { + imageUrl: app.globalData.imageUrl, + Timestamp:app.globalData.Timestamp + }, /** * 组件的方法列表 */ methods: { onClickLeft() { - if (this.data.back) { - wx.navigateBack() - } + if(this.data.back) this.triggerEvent('clickLeft', {}, {}) }, onClickRight() { diff --git a/src/components/pagination/index.js b/src/components/pagination/index.js index c1a789f..60d4803 100644 --- a/src/components/pagination/index.js +++ b/src/components/pagination/index.js @@ -11,6 +11,7 @@ Component({ }, data: { imageUrl: app.globalData.imageUrl, + Timestamp:app.globalData.Timestamp }, methods: { handleTouchmove() { diff --git a/src/components/pickerArea/index.ts b/src/components/pickerArea/index.ts index e08fb38..e41ffd4 100644 --- a/src/components/pickerArea/index.ts +++ b/src/components/pickerArea/index.ts @@ -1,4 +1,4 @@ -const _app = getApp() +const app = getApp() Component({ properties: { @@ -13,6 +13,9 @@ Component({ }, data: { + imageUrl: app.globalData.imageUrl, + Timestamp:app.globalData.Timestamp, + show: false, options: [], fieldNames: { diff --git a/src/components/popup/index.scss b/src/components/popup/index.scss index 699b742..25b7784 100644 --- a/src/components/popup/index.scss +++ b/src/components/popup/index.scss @@ -24,9 +24,14 @@ margin-top: 64rpx; font-size: 32rpx; color: rgba(1, 1, 5, 0.3); + display: flex; .checkbox { transform: scale(0.8); } + .c-content{ + padding-top: 5rpx; + line-height: 48rpx; + } } .link { color: #f23a2f; diff --git a/src/components/popup/index.ts b/src/components/popup/index.ts index 9ebc74c..f3447c2 100644 --- a/src/components/popup/index.ts +++ b/src/components/popup/index.ts @@ -1,4 +1,4 @@ -const _app = getApp() +const app = getApp() Component({ properties: { @@ -17,6 +17,9 @@ Component({ data: { popup1Check1: false, + + imageUrl: app.globalData.imageUrl, + Timestamp:app.globalData.Timestamp }, methods: { handleOk() { diff --git a/src/components/popup/index.wxml b/src/components/popup/index.wxml index 10299f1..0d52231 100644 --- a/src/components/popup/index.wxml +++ b/src/components/popup/index.wxml @@ -8,7 +8,7 @@ > - 欢迎加入“向光而行” + 欢迎加入“愈见守护” 亲爱的用户,为了更好地向您提供平台服务保护您的权益,我们完善了 《个人信息及隐私政策》 @@ -16,8 +16,11 @@ - 我已阅读并同意 - 《个人信息及隐私政策》 + + 我特此同意 + 《个人信息及隐私政策》 + 规定收集我的相关敏感个人信息 + 同意并继续 不同意 diff --git a/src/custom-tab-bar/index.ts b/src/custom-tab-bar/index.ts index 05fdc5f..aa39b12 100644 --- a/src/custom-tab-bar/index.ts +++ b/src/custom-tab-bar/index.ts @@ -5,6 +5,8 @@ Component({ properties: {}, data: { imageUrl: app.globalData.imageUrl, + Timestamp:app.globalData.Timestamp, + isChild: 0, active: 0, list: [ diff --git a/src/custom-tab-bar/index.wxml b/src/custom-tab-bar/index.wxml index e895d01..f61df59 100644 --- a/src/custom-tab-bar/index.wxml +++ b/src/custom-tab-bar/index.wxml @@ -5,7 +5,7 @@ wx:if="{{ index != 3 || !anyWhere}}" bind:tap="handleNav" data-index="{{index}}" - icon="/images/tabbar/{{active==index ? item.iconActive : item.icon}}.png" + icon="{{imageUrl}}/tabbar/{{active==index ? item.iconActive : item.icon}}.png?r={{Timestamp}}" > {{item.text}} diff --git a/src/doc/pages/doc1/index.json b/src/doc/pages/doc1/index.json new file mode 100644 index 0000000..a97367d --- /dev/null +++ b/src/doc/pages/doc1/index.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} diff --git a/src/doc/pages/doc1/index.scss b/src/doc/pages/doc1/index.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/doc/pages/doc1/index.ts b/src/doc/pages/doc1/index.ts new file mode 100644 index 0000000..067b6bb --- /dev/null +++ b/src/doc/pages/doc1/index.ts @@ -0,0 +1,8 @@ +const _app = getApp(); + +Page({ + data: {}, + onLoad() {}, +}); + +export {} diff --git a/src/doc/pages/doc1/index.wxml b/src/doc/pages/doc1/index.wxml new file mode 100644 index 0000000..a10af0e --- /dev/null +++ b/src/doc/pages/doc1/index.wxml @@ -0,0 +1,2 @@ + +pages/story/index.wxml diff --git a/src/images/banner1.png b/src/images/banner1.png new file mode 100644 index 0000000..b9d8e17 Binary files /dev/null and b/src/images/banner1.png differ diff --git a/src/images/bg5.png b/src/images/bg5.png new file mode 100644 index 0000000..7215cf5 Binary files /dev/null and b/src/images/bg5.png differ diff --git a/src/images/login-title1.png b/src/images/login-title1.png new file mode 100644 index 0000000..b189127 Binary files /dev/null and b/src/images/login-title1.png differ diff --git a/src/images/start.png b/src/images/start.png new file mode 100644 index 0000000..9bf6025 Binary files /dev/null and b/src/images/start.png differ diff --git a/src/pages/applyFrom/index.scss b/src/pages/applyFrom/index.scss index 27d5ad9..96ce2f8 100644 --- a/src/pages/applyFrom/index.scss +++ b/src/pages/applyFrom/index.scss @@ -11,7 +11,11 @@ page { .from-item { padding: 32rpx 0; display: flex; + align-items: center; border-bottom: 1px solid #ededf7; + &.no-center{ + align-items: start; + } &:last-of-type { border: none; } diff --git a/src/pages/applyFrom/index.wxml b/src/pages/applyFrom/index.wxml index 2dc0a89..8ea1b80 100644 --- a/src/pages/applyFrom/index.wxml +++ b/src/pages/applyFrom/index.wxml @@ -62,7 +62,7 @@ - + 其他说明