Fixed link

Signed-off-by: Kang Huaishuai <[email protected]>

Author: khs1994

.pcit.yaml

@@ -8,13 +8,11 @@ steps:
 
       export NODE_PATH=/usr/local/lib/node_modules
 
-      npm -g i fs-extra miniprogram-ci typescript \
+      npm -g i miniprogram-ci typescript \
         --registry https://registry.npm.taobao.org
 
       cd client && npm install --registry https://registry.npm.taobao.org && cd ..
 
-      npm run towxml:build
-
       npm run gitbook:summary:generate
       npm run gitbook:summary:towxml
 

.vscode/settings.json

@@ -7,31 +7,31 @@
       "fileMatch": [
         "client/app.json"
       ],
-      "url": "/schema/app.json"
+      "url": "/schema/app.schema.json"
     },
     {
       "fileMatch": [
         "client/sitemap.json"
       ],
-      "url": "/schema/sitemap.json"
+      "url": "/schema/sitemap.schema.json"
     },
     {
       "fileMatch": [
         "project.config.json"
       ],
-      "url": "/schema/projectconfig.json"
+      "url": "/schema/projectconfig.schema.json"
     },
     {
       "fileMatch": [
         "client/theme.json"
       ],
-      "url": "/schema/theme.json"
+      "url": "/schema/theme.schema.json"
     },
     {
       "fileMatch": [
         "client/pages/*.json"
       ],
-      "url": "/schema/page.json"
+      "url": "/schema/page.schema.json"
     },
   ]
 }

README.md

@@ -21,13 +21,12 @@
 
 ## 开发者
 
-- `$ npm -g i typescript fs-extra miniprogram-ci`
+- `$ npm -g i typescript miniprogram-ci`
 - **可选** 复制 `SUMMARY.md` 到 `summary/summary.source.md`
 - 安装依赖 `$ cd client ; npm install`
 - 执行 `$ npm run gitbook:summary:generate`
 - 执行 `$ npm run gitbook:summary:towxml`
-- 执行 `$ npm run towxml:build`
-- [ 微信开发者工具 -> 工具 -> 构建 npm ](项目贡献者) 或者 `$ npm run npm:build`(项目所有者)
+- [ 微信开发者工具 -> 工具 -> 构建 npm ](项目贡献者) 或者 `$ npm run npm:build`(项目所有者[因为需要私钥])
 - 编译
 - 上传预览 `$ npm run upload` (项目所有者)
 

client/app.json

@@ -5,13 +5,15 @@
     "pages/index/index",
     "pages/donate/index",
     "pages/news/index",
-    "pages/mdContent/index"
+    "pages/mdContent/index",
+    "pages/registry/index"
   ],
   "window": {
     "backgroundTextStyle": "@bgTxtStyle",
     "navigationBarTitleText": "Docker 从入门到实践",
     "navigationBarTextStyle": "white",
     "navigationBarBackgroundColor": "@navBgColor",
+    "backgroundColor": "@bgColor",
     "backgroundColorTop": "@bgColorTop",
     "backgroundColorBottom": "@bgColorBottom",
     "navigationStyle": "custom",
@@ -58,5 +60,6 @@
   "sitemapLocation": "sitemap.json",
   "workers": "workers",
   "darkmode": true,
-  "themeLocation": "theme.json"
+  "themeLocation": "theme.json",
+  "lazyCodeLoading": "requiredComponents"
 }

client/package.json

@@ -4,14 +4,13 @@
   "scripts": {
     "compile": "npx tsc",
     "compile:pro": "npx tsc --inlineSources false --inlineSourceMap false",
-    "yarn:update": "yarn upgrade-interactive --latest",
-    "towxml:build": "cd node_modules/towxml && npm run build"
+    "yarn:update": "yarn upgrade-interactive --latest"
   },
   "dependencies": {
-    "wx-markdown": "github:khs1994/wx-markdown"
+    "@khs1994/wx-markdown": "0.0.3"
   },
   "devDependencies": {
-    "miniprogram-api-typings": "^2.10.3"
+    "miniprogram-api-typings": "^3.0.2"
   },
   "license": "MIT"
 }

client/pages/book/index.ts

@@ -14,7 +14,7 @@ Page({
 
   share() {
     let imgUrl =
-      'https://user-images.githubusercontent.com/16733187/57310918-3c3afd80-711d-11e9-8816-266e5ede70bb.jpg';
+      'https://dpsigs.coding.net/p/docker_practice/d/docker-practice.com/git/raw/master/book_20200905223833.jpg';
     wx.previewImage({
       current: imgUrl,
       urls: [imgUrl],

client/pages/book/index.wxml

@@ -1,5 +1,5 @@
 <!-- jd.com 导购页面 -->
-<image mode="aspectFit" src="cloud://pro-02adcb.7072-pro-02adcb/images/jd_book_mini.jpg"
+<image mode="aspectFit" src="https://dpsigs.coding.net/p/docker_practice/d/docker-practice.com/git/raw/master/book_20200905223833.jpg"
 style="height:70vh;width:100vw" show-menu-by-longpress="{{true}}"
 />
 

client/pages/docker/content/index.json

@@ -6,7 +6,7 @@
     "i-notice-bar": "/src/ui/iviewui/dist/notice-bar/index",
     "i-button": "/src/ui/iviewui/dist/button/index",
     "i-spin": "/src/ui/iviewui/dist/spin/index",
-    "markdown": "wx-markdown/component/index"
+    "markdown": "@khs1994/wx-markdown/component/index"
   },
   "enablePullDownRefresh": true,
   "backgroundColor": "#36a1f0",

client/pages/docker/content/index.ts

@@ -17,6 +17,8 @@ const app = getApp<IMyApp>();
 const cache = new Cache();
 const ad = new Ad();
 
+let title = '';
+
 wx.onNetworkStatusChange((res) => {
   wx.showToast({
     title: `${res.networkType.toUpperCase()} 已连接`,
@@ -53,9 +55,10 @@ Page({
     showFixedStatusBar: false,
     fontType: '默认',
     showAd: true,
-    ad: isqq
-      ? ['f2ba7917096dc03c7d798df304a90c49', 'a4f45b9d8d5704ab70bebfd0780854a8']
-      : ['adunit-3ea71b7cfce6c721', 'adunit-1246f0a5e441ea4c'],
+    ad: [],
+    // ad: isqq
+    //   ? ['f2ba7917096dc03c7d798df304a90c49', 'a4f45b9d8d5704ab70bebfd0780854a8']
+    //   : ['adunit-3ea71b7cfce6c721', 'adunit-1246f0a5e441ea4c'],
     cache: true,
   },
 
@@ -197,11 +200,20 @@ Page({
     };
   },
 
+  onShareTimeline() {
+    return {
+      title: 'Docker 从入门到实践 ' + title,
+      // query: '',
+      // imageUrl: '',
+    };
+  },
+
   // 系统事件 end
 
   // 处理加载事件
   async load(options: any, requestFirst: boolean = false) {
     const key = options.key;
+    title = options.title;
 
     let [folder, next_key, before_key] = [
       getFolder(key),
@@ -368,9 +380,11 @@ Page({
       title: '加载中...',
     });
 
-    const [, key] =
+    const [_title, key] =
       type === 'next' ? <any>this.data.next_key : <any>this.data.before_key;
 
+    title = _title;
+
     // 隐藏广告 功能按钮
     this.setData!({
       // spinShow: true,

client/pages/docker/content/index.wxml

@@ -46,8 +46,6 @@ key="{{key}}"
 
 <view wx:if="{{show}}">
 
-<i-button shape="circle" bind:click="pushNote" size="large" type="primary">在 GitHub 反馈本节内容</i-button>
-
 <i-button shape="circle" bind:click="favorites" size="large" type="warning">收藏</i-button>
 
 <i-button shape="circle" bind:click="buyBook" size="large" type="error">进阶学习 (实体书) 📕</i-button>

client/pages/docker/content/readme.ts

@@ -17,6 +17,6 @@ Docker 自身仍在快速发展中，生态环境也在蓬勃成长。建议初
 
 ### 长按图片(或截屏)保存 扫码加入微信群
 
-![](https://user-images.githubusercontent.com/16733187/65308302-55b87f80-dbbc-11e9-9d42-57eac554fb3b.jpg)
+![](https://dpsigs.coding.net/p/docker_practice/d/docker-practice.com/git/raw/master/wechat.jpg)
 
 `;

client/pages/docker/index/index.json

@@ -2,7 +2,7 @@
   "usingComponents": {
     "i-notice-bar": "/src/ui/iviewui/dist/notice-bar/index",
     "i-spin": "/src/ui/iviewui/dist/spin/index",
-    "markdown": "wx-markdown/component/index"
+    "markdown": "@khs1994/wx-markdown/component/index"
   },
   "navigationStyle": "default",
   "enablePullDownRefresh": false

client/pages/docker/summary/index.json

@@ -3,5 +3,6 @@
     "i-notice-bar": "/src/ui/iviewui/dist/notice-bar/index"
   },
   "navigationStyle": "default",
-  "enablePullDownRefresh": true
+  "enablePullDownRefresh": true,
+  "initialRenderingCache": "static"
 }

client/pages/docker/summary/index.ts

@@ -5,11 +5,11 @@ import daShang from '../../../src/utils/DaShang';
 import openGithub from '../../../src/utils/OpenGithub';
 import qiandao from '../../../src/utils/Qiandao';
 import { isSign, uploadAdError } from '../../../src/utils/Qiandao';
-import Ad from '../../../src/utils/Ad';
+//import Ad from '../../../src/utils/Ad';
 import DB from '../../../src/Framework/src/Support/DB';
 // import Cloud from '../../../src/Framework/src/Support/Cloud';
 
-const ad = new Ad();
+//const ad = new Ad();
 const db = DB.getInstance();
 // const cloud = Cloud.getInstance();
 
@@ -36,6 +36,8 @@ let interstitialAd: any;
 import getSummary from '../../../src/utils/getSummary';
 import isqq from '../../../src/utils/isqq';
 
+let isHide = false;
+
 Page({
   /**
    * 页面的初始数据
@@ -50,8 +52,6 @@ Page({
     ],
     isqq,
     showAd: true,
-    isHide: false,
-    interstitialAd: null,
     theme: 'white',
     noticeMessage:
       '《Docker 技术入门与实战》第三版已经面世，介绍最新的容器技术栈，欢迎大家阅读使用并反馈建议。',
@@ -193,12 +193,7 @@ Page({
 
   ad(id: string) {
     if (id === 'bus') {
-      ad.bus();
-      return;
-    }
-
-    if (id === 'yuebao') {
-      ad.yuebao();
+      // ad.bus();
       return;
     }
 
@@ -300,13 +295,9 @@ Page({
           : 'adunit-6ef44789d84b9392',
       });
 
-      this.setData!({
-        interstitialAd,
-      });
-
       setTimeout(() => {
         try {
-          if (!this.data.isHide) {
+          if (!isHide) {
             interstitialAd
               .show()
               .then(() => {})
@@ -371,11 +362,9 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    this.setData!({
-      isHide: false,
-    });
+    isHide = false;
 
-    if (!this.data.interstitialAd) {
+    if (!interstitialAd) {
       return;
     }
 
@@ -399,9 +388,7 @@ Page({
    * 生命周期函数--监听页面隐藏
    */
   onHide: function () {
-    this.setData!({
-      isHide: true,
-    });
+    isHide = true;
   },
 
   /**

client/pages/docker/summary/index.wxml

@@ -3,13 +3,18 @@
 </view>
 
 <i-notice-bar icon="systemprompt" loop
-speed="1200" backgroundcolor="#fff" color="#36a1f0" bind:tap="buyBook">
+speed="1200" backgroundcolor="{{theme === 'white' ? '#fff': '#000'}}" color="#36a1f0" bind:tap="buyBook">
 {{noticeMessage}}
 </i-notice-bar>
 
 <!-- <ad unit-id="{{isqq ? 'a4f45b9d8d5704ab70bebfd0780854a8' : 'adunit-3ea71b7cfce6c721'}}" binderror="adError" ad-intervals="30"></ad> -->
 
-<ad unit-id="adunit-86d99366312002b6" ad-type="video" ad-theme="{{theme}}"></ad>
+<view class="adContainer" wx:if="{{theme === 'white'}}">
+<ad unit-id="adunit-86d99366312002b6" ad-type="video" ad-theme="white"></ad>
+</view>
+<view class="adContainer" wx:else>
+<ad unit-id="adunit-86d99366312002b6" ad-type="video" ad-theme="black"></ad>
+</view>
 
 <view class="page">
 <view class="page__hd">
@@ -28,12 +33,12 @@ speed="1200" backgroundcolor="#fff" color="#36a1f0" bind:tap="buyBook">
                 <view id="{{item.id}}" class="weui-flex kind-list__item-hd {{item.open ? 'kind-list__item-hd_show' : ''}}" bindtap="kindToggle">
                     <view wx:if="{{item.color}}" class="weui-flex__item" style="color: {{item.color}}">{{item.name}}</view>
                     <view wx:else class="weui-flex__item">{{item.name}}</view>
-                    <image lazy-load="{{true}}" class="kind-list__img" src="/images/icon_nav_{{item.id}}.svg"></image>
+                    <!-- <image wx:if="{{theme === 'white'}}" lazy-load="{{true}}" class="kind-list__img" src="/images/icon_nav_{{item.id}}.svg"></image> -->
                 </view>
                 <view class="kind-list__item-bd {{item.open ? 'kind-list__item-bd_show' : ''}}">
                     <view class="weui-cells {{item.open ? 'weui-cells_show' : ''}}">
                         <block wx:for="{{item.pages}}" wx:for-item="page" wx:key="id">
-                            <navigator url="../content/index?key={{page.id}}&pro={{page.pro === undefined ? 0:1}}" class="weui-cell weui-cell_access">
+                            <navigator url="../content/index?key={{page.id}}&title={{page.name}}&pro={{page.pro === undefined ? 0:1}}" class="weui-cell weui-cell_access">
                                 <view class="weui-cell__bd">{{page.name}}</view>
                                 <view class="weui-cell__ft weui-cell__ft_in-access"></view>
                             </navigator>
@@ -45,7 +50,12 @@ speed="1200" backgroundcolor="#fff" color="#36a1f0" bind:tap="buyBook">
     </view>
 </view>
 
-<ad unit-id="{{isqq ? 'f2ba7917096dc03c7d798df304a90c49' : 'adunit-4478ecdd36509a60'}}" ad-type="grid" grid-opacity="0.8" grid-count="5" ad-theme="{{theme}}"></ad>
+<view class="adContainer" wx:if="{{theme === 'white'}}">
+<ad unit-id="{{isqq ? 'f2ba7917096dc03c7d798df304a90c49' : 'adunit-4478ecdd36509a60'}}" ad-type="grid" grid-opacity="0.8" grid-count="5" ad-theme="light"></ad>
+</view>
+<view class="adContainer" wx:else>
+<ad unit-id="{{isqq ? 'f2ba7917096dc03c7d798df304a90c49' : 'adunit-4478ecdd36509a60'}}" ad-type="grid" grid-opacity="0.8" grid-count="5" ad-theme="black"></ad>
+</view>
 
 </view>
 <view class="weui-footer">

client/pages/mdContent/index.json

@@ -1,6 +1,6 @@
 {
   "usingComponents": {
-    "markdown": "wx-markdown/component/index",
+    "markdown": "@khs1994/wx-markdown/component/index",
     "i-button": "/src/ui/iviewui/dist/button/index"
   },
   "navigationStyle": "default",

client/pages/mdContent/index.ts

@@ -257,4 +257,13 @@ Page({
         'https://gitee.com/docker_practice/docker_practice/raw/master/_images/cover.jpg',
     };
   },
+
+  onShareTimeline(): any {
+    return {
+      title: '今日分享 -- ' + title,
+      query: `key=${key}&title=${title}`,
+      imageUrl:
+        'https://gitee.com/docker_practice/docker_practice/raw/master/_images/cover.jpg',
+    };
+  },
 });

client/pages/news/index.wxml

@@ -1,4 +1,5 @@
-<ad unit-id="{{isqq ? 'f2ba7917096dc03c7d798df304a90c49' : 'adunit-4478ecdd36509a60'}}" ad-type="grid" grid-opacity="0.8" grid-count="5" ad-theme="white"></ad>
+<ad-custom unit-id="adunit-8e6404aa46256998" ad-theme="black"></ad-custom>
+<!-- <ad unit-id="{{isqq ? 'f2ba7917096dc03c7d798df304a90c49' : 'adunit-4478ecdd36509a60'}}" ad-type="grid" grid-opacity="0.8" grid-count="5" ad-theme="white"></ad> -->
 
 <view class="page__bd page__bd_spacing">
     <view class="kind-list">

client/pages/registry/index.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

client/pages/registry/index.ts

@@ -0,0 +1 @@
+Page({});