diff --git a/.kaitian/launch.json b/.kaitian/launch.json
new file mode 100644
index 0000000..ec899f6
--- /dev/null
+++ b/.kaitian/launch.json
@@ -0,0 +1,7 @@
+{
+  // 使用 IntelliSense 了解相关属性。 
+  // 悬停以查看现有属性的描述。
+  // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": []
+}
diff --git a/.tea/entryFiles-development/config$.js b/.tea/entryFiles-development/config$.js
index ee892d4..184e1b5 100644
--- a/.tea/entryFiles-development/config$.js
+++ b/.tea/entryFiles-development/config$.js
@@ -2,6 +2,12 @@
 const g = typeof global !== 'undefined' ? global : self;
 g.appXAppJson = {
   "app": {
-    "$homepage": "pages/index/index"
+    "$homepage": "pages/index/index",
+    "plugins": {
+      "myPlugin": {
+        "version": "*",
+        "provider": "3000000091373235"
+      }
+    }
   }
 };
diff --git a/.tea/entryFiles-development/index$.web.js b/.tea/entryFiles-development/index$.web.js
index 4de132d..f05c207 100644
--- a/.tea/entryFiles-development/index$.web.js
+++ b/.tea/entryFiles-development/index$.web.js
@@ -1,6 +1,6 @@
 require('@alipay/appx-compiler/lib/sjsEnvInit');
 require('./config$');
-
+require('../../app');
 require('../../node_modules/mini-antui/es/am-icon/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
 require('../../components/myFooter/myFooter?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
 require('../../pages/index/components/recommend/recommend?hash=efa451848b581ae39f6dfc3f481e34d889c0c338');
@@ -13,15 +13,20 @@ require('../../node_modules/mini-antui/es/flex/index?hash=05d2a9730dd6009bf94461
 require('../../node_modules/mini-antui/es/flex/flex-item/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
 require('../../components/myPay/myPay?hash=95d4e6a1d744881766987015bf4637f54936e766');
 require('../../node_modules/mini-antui/es/search-bar/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
-require('../../pages/index/index?hash=66c19b063693971ffd8bb661372c9cf3c21a2d1c');
-require('../../pages/discover/discover?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/binge/binge?hash=9c0e6999933e5108fcfa627bb178a74557ebd612');
-require('../../pages/my/my?hash=6b9bee5d51f8a2ab4725afd9772f57296d40424a');
-require('../../pages/search/search?hash=145a1c9adbd3105ceec389ed0e6ff898eeb269fd');
-require('../../pages/history/history?hash=9a3d729fefe59caf793121dfbe58ede84e5bf831');
-require('../../pages/transaction/transaction?hash=9a3d729fefe59caf793121dfbe58ede84e5bf831');
-require('../../pages/give/give?hash=9a3d729fefe59caf793121dfbe58ede84e5bf831');
-require('../../pages/wxkf/wxkf?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/purchaseNotes/purchaseNotes?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/addqywx/addqywx?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/video/video?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
+require('../../node_modules/mini-antui/es/modal/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
+require('../../node_modules/mini-antui/es/badge/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
+require('../../node_modules/mini-antui/es/tabs/index?hash=b998354db5b64281090d8969355b2b3db41cda49');
+require('../../node_modules/mini-antui/es/tabs/tab-content/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
+require('../../pages/index/index?hash=c4e2a134875c6734d176f2bda090e0e51de10962');
+require('../../pages/discover/discover?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
+require('../../pages/binge/binge?hash=6164953b5a1ef04f4f4f6e6561b545255541aa0c');
+require('../../pages/my/my?hash=75b5b8f1ecfabe3e2ac25d83ad8d5dac4aa47c98');
+require('../../pages/search/search?hash=aba215d007624a3ae18a69066f7987a8463d4c8c');
+require('../../pages/history/history?hash=496b52f9f456db6a9f22580be95fd2756db9e17d');
+require('../../pages/transaction/transaction?hash=496b52f9f456db6a9f22580be95fd2756db9e17d');
+require('../../pages/give/give?hash=496b52f9f456db6a9f22580be95fd2756db9e17d');
+require('../../pages/wxkf/wxkf?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
+require('../../pages/purchaseNotes/purchaseNotes?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
+require('../../pages/addqywx/addqywx?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
+require('../../pages/video/video?hash=2f86860594605cd2430cc3d9ad723984b88e0e36');
+require('../../pages/recharge/recharge?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
diff --git a/.tea/entryFiles-development/index$.worker.js b/.tea/entryFiles-development/index$.worker.js
index 5eedbb6..f998d5c 100644
--- a/.tea/entryFiles-development/index$.worker.js
+++ b/.tea/entryFiles-development/index$.worker.js
@@ -1,6 +1,6 @@
 if(!self.__appxInited) {
 self.__appxInited = 1;
-
+require('@alipay/appx-compiler/lib/sjsEnvInit');
 
 require('./config$');
 
@@ -31,7 +31,7 @@ if(AFAppX.registerApp) {
   });
 }
 
-
+if(AFAppX.compilerConfig){ AFAppX.compilerConfig.component2 = true; }
 
 function success() {
 require('../../app');
@@ -47,18 +47,23 @@ require('../../node_modules/mini-antui/es/flex/index?hash=05d2a9730dd6009bf94461
 require('../../node_modules/mini-antui/es/flex/flex-item/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
 require('../../components/myPay/myPay?hash=95d4e6a1d744881766987015bf4637f54936e766');
 require('../../node_modules/mini-antui/es/search-bar/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
-require('../../pages/index/index?hash=66c19b063693971ffd8bb661372c9cf3c21a2d1c');
-require('../../pages/discover/discover?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/binge/binge?hash=9c0e6999933e5108fcfa627bb178a74557ebd612');
-require('../../pages/my/my?hash=6b9bee5d51f8a2ab4725afd9772f57296d40424a');
-require('../../pages/search/search?hash=145a1c9adbd3105ceec389ed0e6ff898eeb269fd');
-require('../../pages/history/history?hash=9a3d729fefe59caf793121dfbe58ede84e5bf831');
-require('../../pages/transaction/transaction?hash=9a3d729fefe59caf793121dfbe58ede84e5bf831');
-require('../../pages/give/give?hash=9a3d729fefe59caf793121dfbe58ede84e5bf831');
-require('../../pages/wxkf/wxkf?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/purchaseNotes/purchaseNotes?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/addqywx/addqywx?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/video/video?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
+require('../../node_modules/mini-antui/es/modal/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
+require('../../node_modules/mini-antui/es/badge/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
+require('../../node_modules/mini-antui/es/tabs/index?hash=b998354db5b64281090d8969355b2b3db41cda49');
+require('../../node_modules/mini-antui/es/tabs/tab-content/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
+require('../../pages/index/index?hash=c4e2a134875c6734d176f2bda090e0e51de10962');
+require('../../pages/discover/discover?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
+require('../../pages/binge/binge?hash=6164953b5a1ef04f4f4f6e6561b545255541aa0c');
+require('../../pages/my/my?hash=75b5b8f1ecfabe3e2ac25d83ad8d5dac4aa47c98');
+require('../../pages/search/search?hash=aba215d007624a3ae18a69066f7987a8463d4c8c');
+require('../../pages/history/history?hash=496b52f9f456db6a9f22580be95fd2756db9e17d');
+require('../../pages/transaction/transaction?hash=496b52f9f456db6a9f22580be95fd2756db9e17d');
+require('../../pages/give/give?hash=496b52f9f456db6a9f22580be95fd2756db9e17d');
+require('../../pages/wxkf/wxkf?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
+require('../../pages/purchaseNotes/purchaseNotes?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
+require('../../pages/addqywx/addqywx?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
+require('../../pages/video/video?hash=2f86860594605cd2430cc3d9ad723984b88e0e36');
+require('../../pages/recharge/recharge?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
 }
 self.bootstrapApp ? self.bootstrapApp({ success }) : success();
 }
\ No newline at end of file
diff --git a/.tea/entryFiles-production/config$.js b/.tea/entryFiles-production/config$.js
index ee892d4..184e1b5 100644
--- a/.tea/entryFiles-production/config$.js
+++ b/.tea/entryFiles-production/config$.js
@@ -2,6 +2,12 @@
 const g = typeof global !== 'undefined' ? global : self;
 g.appXAppJson = {
   "app": {
-    "$homepage": "pages/index/index"
+    "$homepage": "pages/index/index",
+    "plugins": {
+      "myPlugin": {
+        "version": "*",
+        "provider": "3000000091373235"
+      }
+    }
   }
 };
diff --git a/.tea/entryFiles-production/index$.web.js b/.tea/entryFiles-production/index$.web.js
index 0596c63..f05c207 100644
--- a/.tea/entryFiles-production/index$.web.js
+++ b/.tea/entryFiles-production/index$.web.js
@@ -1,6 +1,6 @@
 require('@alipay/appx-compiler/lib/sjsEnvInit');
 require('./config$');
-
+require('../../app');
 require('../../node_modules/mini-antui/es/am-icon/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
 require('../../components/myFooter/myFooter?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
 require('../../pages/index/components/recommend/recommend?hash=efa451848b581ae39f6dfc3f481e34d889c0c338');
@@ -13,14 +13,20 @@ require('../../node_modules/mini-antui/es/flex/index?hash=05d2a9730dd6009bf94461
 require('../../node_modules/mini-antui/es/flex/flex-item/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
 require('../../components/myPay/myPay?hash=95d4e6a1d744881766987015bf4637f54936e766');
 require('../../node_modules/mini-antui/es/search-bar/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
-require('../../pages/index/index?hash=66c19b063693971ffd8bb661372c9cf3c21a2d1c');
-require('../../pages/discover/discover?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/binge/binge?hash=9c0e6999933e5108fcfa627bb178a74557ebd612');
-require('../../pages/my/my?hash=6b9bee5d51f8a2ab4725afd9772f57296d40424a');
-require('../../pages/search/search?hash=145a1c9adbd3105ceec389ed0e6ff898eeb269fd');
-require('../../pages/history/history?hash=9a3d729fefe59caf793121dfbe58ede84e5bf831');
-require('../../pages/transaction/transaction?hash=9a3d729fefe59caf793121dfbe58ede84e5bf831');
-require('../../pages/give/give?hash=9a3d729fefe59caf793121dfbe58ede84e5bf831');
-require('../../pages/wxkf/wxkf?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/purchaseNotes/purchaseNotes?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/addqywx/addqywx?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
+require('../../node_modules/mini-antui/es/modal/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
+require('../../node_modules/mini-antui/es/badge/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
+require('../../node_modules/mini-antui/es/tabs/index?hash=b998354db5b64281090d8969355b2b3db41cda49');
+require('../../node_modules/mini-antui/es/tabs/tab-content/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
+require('../../pages/index/index?hash=c4e2a134875c6734d176f2bda090e0e51de10962');
+require('../../pages/discover/discover?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
+require('../../pages/binge/binge?hash=6164953b5a1ef04f4f4f6e6561b545255541aa0c');
+require('../../pages/my/my?hash=75b5b8f1ecfabe3e2ac25d83ad8d5dac4aa47c98');
+require('../../pages/search/search?hash=aba215d007624a3ae18a69066f7987a8463d4c8c');
+require('../../pages/history/history?hash=496b52f9f456db6a9f22580be95fd2756db9e17d');
+require('../../pages/transaction/transaction?hash=496b52f9f456db6a9f22580be95fd2756db9e17d');
+require('../../pages/give/give?hash=496b52f9f456db6a9f22580be95fd2756db9e17d');
+require('../../pages/wxkf/wxkf?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
+require('../../pages/purchaseNotes/purchaseNotes?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
+require('../../pages/addqywx/addqywx?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
+require('../../pages/video/video?hash=2f86860594605cd2430cc3d9ad723984b88e0e36');
+require('../../pages/recharge/recharge?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
diff --git a/.tea/entryFiles-production/index$.worker.js b/.tea/entryFiles-production/index$.worker.js
index 67d01c3..dae5556 100644
--- a/.tea/entryFiles-production/index$.worker.js
+++ b/.tea/entryFiles-production/index$.worker.js
@@ -2,7 +2,7 @@
  /**! __BUGME_END__ */
 if(!self.__appxInited) {
 self.__appxInited = 1;
-
+require('@alipay/appx-compiler/lib/sjsEnvInit');
 
 require('./config$');
 require('./importScripts$');
@@ -25,7 +25,7 @@ if(AFAppX.registerApp) {
   });
 }
 
-
+if(AFAppX.compilerConfig){ AFAppX.compilerConfig.component2 = true; }
 
 function success() {
 require('../../app');
@@ -41,17 +41,23 @@ require('../../node_modules/mini-antui/es/flex/index?hash=05d2a9730dd6009bf94461
 require('../../node_modules/mini-antui/es/flex/flex-item/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
 require('../../components/myPay/myPay?hash=95d4e6a1d744881766987015bf4637f54936e766');
 require('../../node_modules/mini-antui/es/search-bar/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
-require('../../pages/index/index?hash=66c19b063693971ffd8bb661372c9cf3c21a2d1c');
-require('../../pages/discover/discover?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/binge/binge?hash=9c0e6999933e5108fcfa627bb178a74557ebd612');
-require('../../pages/my/my?hash=6b9bee5d51f8a2ab4725afd9772f57296d40424a');
-require('../../pages/search/search?hash=145a1c9adbd3105ceec389ed0e6ff898eeb269fd');
-require('../../pages/history/history?hash=9a3d729fefe59caf793121dfbe58ede84e5bf831');
-require('../../pages/transaction/transaction?hash=9a3d729fefe59caf793121dfbe58ede84e5bf831');
-require('../../pages/give/give?hash=9a3d729fefe59caf793121dfbe58ede84e5bf831');
-require('../../pages/wxkf/wxkf?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/purchaseNotes/purchaseNotes?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/addqywx/addqywx?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
+require('../../node_modules/mini-antui/es/modal/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
+require('../../node_modules/mini-antui/es/badge/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
+require('../../node_modules/mini-antui/es/tabs/index?hash=b998354db5b64281090d8969355b2b3db41cda49');
+require('../../node_modules/mini-antui/es/tabs/tab-content/index?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
+require('../../pages/index/index?hash=c4e2a134875c6734d176f2bda090e0e51de10962');
+require('../../pages/discover/discover?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
+require('../../pages/binge/binge?hash=6164953b5a1ef04f4f4f6e6561b545255541aa0c');
+require('../../pages/my/my?hash=75b5b8f1ecfabe3e2ac25d83ad8d5dac4aa47c98');
+require('../../pages/search/search?hash=aba215d007624a3ae18a69066f7987a8463d4c8c');
+require('../../pages/history/history?hash=496b52f9f456db6a9f22580be95fd2756db9e17d');
+require('../../pages/transaction/transaction?hash=496b52f9f456db6a9f22580be95fd2756db9e17d');
+require('../../pages/give/give?hash=496b52f9f456db6a9f22580be95fd2756db9e17d');
+require('../../pages/wxkf/wxkf?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
+require('../../pages/purchaseNotes/purchaseNotes?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
+require('../../pages/addqywx/addqywx?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
+require('../../pages/video/video?hash=2f86860594605cd2430cc3d9ad723984b88e0e36');
+require('../../pages/recharge/recharge?hash=c38b953af6bdab8fe399141b33dd1ad1ceb7ea7f');
 }
 self.bootstrapApp ? self.bootstrapApp({ success }) : success();
 }
\ No newline at end of file
diff --git a/app.js b/app.js
index db6eb2b..85d0058 100644
--- a/app.js
+++ b/app.js
@@ -1,35 +1,48 @@
 
 import { httpRequest, cloud } from './utils/httpRequest';
+// import { getUserInfo, getSystemInfoSync } from '../../utils/obtainInfo'
+// const { httpRequest } = getApp();
 import { storageUid } from './utils/utils'
-import { getUserInfo, getSystemInfoSync } from './utils/obtainInfo'
+
 
 App({
-	cloud,
-	httpRequest,
-	globalData: {
-		userInfo: {},
-		systemInfo: {}
-	},
-	onLaunch(options) {
-		// 第一次打开
-		// options.query == {number:1}
-		console.info('App onLaunch');
-	},
-	onShow(options) {
-		// 从后台被 scheme 重新打开
-		// options.query == {number:1}
-		this.testLogin();
-	},
-	async testLogin() {
-		const paramenter = {
-			path: '/reg',
-			method: 'POST',
-		}
-		const res = await httpRequest(paramenter)
-		if (res.status == 1) {
-			storageUid(res.data.uid);
-			getUserInfo();
-			getSystemInfoSync();
-		}
-	},
+  cloud,
+  httpRequest,
+  globalData: {
+    userInfo: {},
+    systemInfo: {}
+  },
+  onLaunch(options) {
+  },
+  onShow() {
+    this.globalData.systemInfo = my.getSystemInfoSync();
+    this.testLogin();
+
+  },
+  async testLogin() {
+    const paramenter = {
+      path: '/reg',
+      method: 'POST',
+    }
+    const res = await httpRequest(paramenter)
+    // console.log(res, "regregreg")
+    if (res && res.status == 1) {
+      storageUid(res.data.uid);
+
+      const userParamenter = {
+        path: '/user',
+        method: 'POST',
+      }
+      const userRes = await httpRequest(userParamenter);
+      if (userRes.status == 1) {
+        getApp().globalData.userInfo = userRes.data.info;
+        my.setStorageSync({
+          key: 'userInfo',
+          data: {
+            userInfo: userRes.data.info
+          }
+        })
+      }
+    }
+  },
 });
diff --git a/app.json b/app.json
index 2c7342d..ef67d0d 100644
--- a/app.json
+++ b/app.json
@@ -11,8 +11,15 @@
     "pages/wxkf/wxkf",
     "pages/purchaseNotes/purchaseNotes",
     "pages/addqywx/addqywx",
-    "pages/video/video"
+    "pages/video/video",
+    "pages/recharge/recharge"
   ],
+  "plugins": {
+    "myPlugin": {
+      "version": "*",
+      "provider": "3000000091373235"
+    }
+  },
   "window": {
     "defaultTitle": "古言剧场"
   },
diff --git a/components/myPay/myPay.js b/components/myPay/myPay.js
index 181e397..170bac0 100644
--- a/components/myPay/myPay.js
+++ b/components/myPay/myPay.js
@@ -1,5 +1,6 @@
 import { imageBasUrl } from '../../utils/config';
-import { storagePaymentBack } from '../../utils/utils'
+import { storagePaymentBack } from '../../utils/utils';
+var plugin = requirePlugin("myPlugin");
 
 Component({
 	mixins: [],
diff --git a/global.acss b/global.acss
index 04b3e34..1682084 100644
--- a/global.acss
+++ b/global.acss
@@ -107,6 +107,13 @@ text {
 ._is_image {
   display: block;
   width: 100%;
+  height: 100%;
+	border-radius: 12rpx;
+}
+
+._is_swiper_img {
+	display: block;
+  width: 100%;
   height: 100%;
 }
 
diff --git a/pages/addqywx/addqywx.acss b/pages/addqywx/addqywx.acss
index 6da352c..df807d2 100644
--- a/pages/addqywx/addqywx.acss
+++ b/pages/addqywx/addqywx.acss
@@ -1,9 +1,13 @@
-page,
-._addqywx_page_html {
+page{
 	width: 100%;
 	height: 100%;
 }
 
+._addqywx_page_html {
+	width: 100%;
+	height: 100vh;
+}
+
 ._addqywx_page_body {
 	position: relative;
 	width: 100%;
diff --git a/pages/addqywx/addqywx.js b/pages/addqywx/addqywx.js
index 389fb16..030c3f3 100644
--- a/pages/addqywx/addqywx.js
+++ b/pages/addqywx/addqywx.js
@@ -1,14 +1,22 @@
 import { imageBasUrl } from '../../utils/config';
+const { httpRequest } = getApp();
 
 Page({
 	data: {
 		imageBasUrl,
 		codeImage: ''
 	},
-	onLoad(query) {
-		console.log('page onLoad', query)
-	},
-	onShow() { 
+	onShow() {
 		// .get('/getGuidecode')
+		const paramenter = {
+			path: '/getGuidecode',
+			method: 'GET',
+		}
+		httpRequest(paramenter).then(res => {
+			console.log(res, "getGuidecode")
+			this.setData({
+				codeImage: res.data.code,
+			})
+		})
 	}
 })
\ No newline at end of file
diff --git a/pages/authority/authority.acss b/pages/authority/authority.acss
new file mode 100644
index 0000000..ac5ed0d
--- /dev/null
+++ b/pages/authority/authority.acss
@@ -0,0 +1,103 @@
+._authority_html {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  background-color: #000;
+}
+
+._authority_describe {
+  flex: 1;
+  flex-shrink: 0;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  background-color: #fff;
+  border-radius: 0 0 16rpx 16rpx;
+  padding: 40rpx 40rpx 200rpx;
+}
+
+._authority_header {
+  display: flex;
+  align-items: center;
+}
+
+._authority_logo {
+  width: 40rpx;
+  height: 40rpx;
+}
+
+._authority_logo .img {
+  display: block;
+  width: 100%;
+  height: 100%;
+}
+
+._authority_h1_title {
+  font-size: 28rpx;
+  color: #333;
+  margin-left: 20rpx;
+}
+
+._authority_list_title {
+  font-size: 36rpx;
+  color: #333;
+  margin-top: 40rpx;
+  font-weight: 500;
+}
+
+._authority_list_item {
+  display: flex;
+  align-items: center;
+  margin-top: 40rpx;
+}
+
+._authority_list_item_tis {
+  font-size: 24rpx;
+  color: #333;
+  margin-left: 20rpx;
+}
+
+._authority_btn_warp {
+  display: flex;
+  justify-content: center;
+  width: 100%;
+}
+
+._authority_btn {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 280rpx;
+  height: 70rpx;
+  background-color: #05C160;
+  font-size: 26rpx;
+  color: #fff;
+  border-radius: 12rpx;
+}
+
+._authority_tips {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  height: 200rpx;
+  background-color: #000;
+  padding: 0 40rpx;
+}
+
+._authority_tips_text {
+ font-size: 24rpx;
+ color: #7F7F7F; 
+ line-height: 1.5;
+ padding: 0 40rpx 0 20rpx;
+}
+
+._authority_use_warp {
+  display: flex;
+  align-items: center;
+}
+
+._authority_use__text {
+  font-size: 28rpx;
+  color: #fff;
+  white-space: nowrap;
+}
\ No newline at end of file
diff --git a/pages/authority/authority.axml b/pages/authority/authority.axml
new file mode 100644
index 0000000..e04a831
--- /dev/null
+++ b/pages/authority/authority.axml
@@ -0,0 +1,53 @@
+<view class="_authority_html">
+  <view class="_authority_describe">
+    <view>
+      <view class="_authority_header">
+        <view class="_authority_logo">
+          <image mode="scaleToFill" src="/static/images/logo.png" class="img" />
+        </view>
+        <view class="_authority_h1_title">
+          古言剧场
+        </view>
+        <view class="_authority_h1_title">
+          申请获得
+        </view>
+      </view>
+      
+      <view class="_authority_list_title">
+        以下权限
+      </view>
+      
+      <view class="_authority_list_item">
+        <am-icon type="success-o" size="{{24}}" color="#333" />
+        <view class="_authority_list_item_tis">
+          获得你的昵称、头像
+        </view>
+      </view>
+    </view>
+    
+    <view class="_authority_btn_warp">
+      <view class="_authority_btn" onTap="isAuthorize">
+        同意
+      </view>
+    </view>
+    
+  </view>
+  
+  <view class="_authority_tips">
+    <view class="_authority_tips_icon">
+      <am-icon type="warning-o" size="{{24}}" color="#C55F5E" />
+    </view>
+    
+    <view class="_authority_tips_text">
+      该小程序需要获取个人信息才可完整服务，当前尽可浏览部分内容
+    </view>
+    
+    <view class="_authority_use_warp">
+      <view class="_authority_use__text" onTap="isAuthorize">
+        使用完整服务
+      </view>
+      <am-icon type="arrow-right" size="{{14}}" color="#fff" />
+    </view>
+    
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/authority/authority.js b/pages/authority/authority.js
new file mode 100644
index 0000000..66034f6
--- /dev/null
+++ b/pages/authority/authority.js
@@ -0,0 +1,73 @@
+import { storageUid } from '../../utils/utils'
+import { getUserInfo, getSystemInfoSync } from '../../utils/obtainInfo'
+const { httpRequest } = getApp();
+
+Page({
+  data: {},
+  onLoad(query) {
+    console.log('page onLoad', query)
+  },
+  onShow() {
+    // 从后台被 scheme 重新打开
+    // my.authorize({
+    //   scopes: 'scope.userInfo',
+    //   success: (res) => {
+    //     console.log(res, "===========")
+    //   },
+    //   fail: (err) => {
+    //     console.log(err, "errerr")
+    //   }
+    // });
+  },
+
+  isAuthorize() {
+
+    my.getAuthUserInfo({
+      success: (userInfo) => {
+        this.testLogin();
+        // console.log(userInfo, "resres")
+        //昵称 userInfo.nickName
+        //头像 userInfo.avatar
+        my.setStorageSync({
+          key: 'taobaoUserInfo',
+          data: {
+            userInfo: userInfo
+          }
+        })
+      }
+    });
+  },
+
+  async testLogin() {
+    const paramenter = {
+      path: '/reg',
+      method: 'POST',
+    }
+    const res = await httpRequest(paramenter)
+    console.log(res, "regregreg")
+    if (res && res.status == 1) {
+      storageUid(res.data.uid);
+
+      const userParamenter = {
+        path: '/user',
+        method: 'POST',
+      }
+      const userRes = await httpRequest(userParamenter);
+      // console.log(res, "useruser")
+      if (userRes.status == 1) {
+        getApp().globalData.userInfo = userRes.data.info;
+        my.setStorageSync({
+          key: 'userInfo',
+          data: {
+            userInfo: userRes.data.info
+          }
+        })
+
+        my.switchTab({
+          url: '/pages/index/index'
+        });
+      }
+
+    }
+  },
+})
\ No newline at end of file
diff --git a/pages/authority/authority.json b/pages/authority/authority.json
new file mode 100644
index 0000000..88c9c5e
--- /dev/null
+++ b/pages/authority/authority.json
@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "am-icon": "mini-antui/es/am-icon/index"
+  }
+}
\ No newline at end of file
diff --git a/pages/binge/binge.acss b/pages/binge/binge.acss
index de1792f..3e8aa1f 100644
--- a/pages/binge/binge.acss
+++ b/pages/binge/binge.acss
@@ -8,11 +8,31 @@ page,
 }
 
 ._bin_bo_step_sign_in {
+	position: relative;
 	width: 100%;
 	height: 190rpx;
 	padding: 0 20rpx;
 }
 
+._bin_bo_sign_in_btn {
+	position: absolute;
+	left: 60rpx;
+	bottom: 40rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 160rpx;
+	height: 50rpx;
+	border: 2rpx solid #fff;
+	border-radius: 30rpx;
+}
+
+._bin_bo_sign_in_btn >text{
+	font-size: 18rpx;
+	line-height: 1;
+	color: #fff;
+}
+
 ._bin_bo_step_my_vido {
 	padding: 0 30rpx 30rpx;
 }
diff --git a/pages/binge/binge.axml b/pages/binge/binge.axml
index 10fe33c..f452e0a 100644
--- a/pages/binge/binge.axml
+++ b/pages/binge/binge.axml
@@ -1,7 +1,13 @@
 <view class="_binge_page_html">
   <view class="_binge_page_body">
-    <view class="_bin_bo_step_sign_in" onTap="setSignIn" a:if="{{!signin}}">
-      <image mode="scaleToFill" src="{{`${imageBasUrl}/iamge/signIn.png`}}" class="_is_image" />
+    <view class="_bin_bo_step_sign_in">
+      <image mode="scaleToFill" src="{{`${imageBasUrl}/iamge/signIn_2.png`}}" class="_is_image" />
+      <view class="_bin_bo_sign_in_btn" onTap="setSignIn" a:if="{{!signin}}">
+        <text>立即签到</text>
+      </view>
+      <view class="_bin_bo_sign_in_btn" a:else>
+        <text>已签到</text>
+      </view>
     </view>
     
     <view class="_bin_bo_step_my_vido">
@@ -22,15 +28,15 @@
           </block>
         </view>
         <view class="_vido_warp_content">
-          <block a:if="{{bookcase.length}}">
+          <block a:if="{{bookcase.length && likelistFlag}}">
             <block a:for="{{bookcase}}">
-              <view class="_pursue_item" a:key="{{item.id}}">
+              <view class="_pursue_item" a:key="{{item.id}}" onTap="toPathVideo" data-item="{{item}}">
                 <pursue-item rowData="{{item}}" isEdit="{{isEdit}}" onDelItem="onDelItem" key="{{index}}" />
               </view>
             </block>
           </block>
           
-          <block a:else>
+          <block a:elif="{{likelistFlag}}">
             <view class="mb-30">
               <my-empty tipsName="去追剧~" />
             </view>
@@ -49,13 +55,13 @@
         <view class="_vido_warp_content">
           <block a:if="{{likelist.length}}">
             <block a:for="{{likelist}}">
-              <view class="_pursue_item" a:key="{{item.id}}">
+              <view class="_pursue_item" a:key="{{item.id}}" onTap="toPathVideo" data-item="{{item}}">
                 <pursue-item rowData="{{item}}" onDelItem="onDelItem" key="{{index}}" />
               </view>
             </block>
           </block>
           
-          <block a:else>
+          <block a:elif="{{likelistFlag}}">
             <view class="mb-30">
               <my-empty tipsName="暂无数据~" />
             </view>
diff --git a/pages/binge/binge.js b/pages/binge/binge.js
index c3c100a..c4a5f5a 100644
--- a/pages/binge/binge.js
+++ b/pages/binge/binge.js
@@ -7,10 +7,8 @@ Page({
 		likelist: [],
 		bookcase: [],
 		signin: 0,
-		isEdit: false
-	},
-	onLoad(query) {
-		console.log('page onLoad', query)
+		isEdit: false,
+		likelistFlag: false,
 	},
 	onShow() {
 		this.isGetList();
@@ -30,7 +28,8 @@ Page({
 				this.setData({
 					likelist: data.likelist,
 					bookcase: data.bookcase,
-					signin: data.signin
+					signin: data.signin,
+					likelistFlag: true
 				})
 			}
 		})
@@ -40,16 +39,13 @@ Page({
 		const paramenter = {
 			path: '/signin',
 			method: 'GET',
-			// body: {
-			//   uid: 24
-			// }
 		}
 		httpRequest(paramenter).then(res => {
 			console.log(res, "signin")
 			if (res.status == 1) {
 				const { data } = res;
 				my.showToast({
-					content: `${data.msg},获得${data.money}看币`,
+					content: `${res.msg},获得${data.money}看币`,
 					duration: 3000,
 				});
 			}
@@ -86,6 +82,13 @@ Page({
 				});
 			}
 		})
-	}
+	},
+
+	toPathVideo(event) {
+		const data = event.target.dataset.item;
+		my.navigateTo({
+			url: `/pages/video/video?sid=${data.bookid || data.id}`
+		});
+	},
 
 })
\ No newline at end of file
diff --git a/pages/index/components/recommend/recommend.acss b/pages/index/components/recommend/recommend.acss
index 9d2ea45..3af5a75 100644
--- a/pages/index/components/recommend/recommend.acss
+++ b/pages/index/components/recommend/recommend.acss
@@ -7,8 +7,8 @@
 }
 
 ._banner_swiper {
-  position: absolute;
-  top: 0;
+  /* position: absolute;_bou_scr_ul_name
+  top: 0; */
   width: 100%;
   height: 724rpx;
 }
@@ -34,7 +34,7 @@
 
 ._search_placeholder > text {
   line-height: 1;
-  color:#B2B2B2 ;
+  color:rgba(0, 0, 0, 0.5);
   font-size: 28rpx;
   margin-left: 16rpx;
 }
diff --git a/pages/index/components/recommend/recommend.axml b/pages/index/components/recommend/recommend.axml
index f619742..8760dce 100644
--- a/pages/index/components/recommend/recommend.axml
+++ b/pages/index/components/recommend/recommend.axml
@@ -3,13 +3,13 @@
     <swiper class="_banner_swiper" interval="{{4000}}" duration="{{150}}" current="{{tabIndex}}" onChange="{{bannerChange}}">
       <swiper-item class="flex-1" a:for="{{pageDataInfo.bannerList}}" a:key="{{index}}">
         <view class="_ba_swiper_item" onTap="{{toPathVideo}}" data-item="{{item}}">
-          <image src="{{item.cover}}" mode="aspectFill" class="_is_image"></image>
+          <image src="{{item.cover}}" mode="aspectFill" class="_is_swiper_img"></image>
         </view>
       </swiper-item>
     </swiper>
     <view class="_banner_search_warp flex-row" onTap="getSearch">
       <view class="_serach_icon">
-        <am-icon type="search" size="{{20}}" color="#B2B2B2" />
+        <am-icon type="search" size="{{20}}" color="rgba(0, 0, 0, 0.5)" />
       </view>
       <view class="_search_placeholder">
         <text>寻找你喜欢的短剧</text>
@@ -43,6 +43,29 @@
       </view>
     </view>
     
+    <view class="_v_li_heat_item">
+      <view class="_li_con_item_header">
+        <view class="_it_head_title">
+          <text>全网热播</text>
+        </view>
+        <view class="_it_head_exit"></view>
+      </view>
+      <view class="_it_heat_warp">
+        <block a:for="{{pageDataInfo.module3}}">
+          <view class="_heat_wa_ul" a:key="{{item.id}}" data-item="{{item}}" onTap="toPathVideo">
+            <view class="_heat__ul_li">
+              <view class="_heat__li_image">
+                <image mode="scaleToFill" src="{{item.cover}}" class="_is_image" />
+              </view>
+              <view class="_heat__li_name">
+                <text>{{item.name}}</text>
+              </view>
+            </view>
+          </view>
+        </block>
+      </view>
+    </view>
+    
     <view class="_v_li_con_item">
       <view class="_li_con_item_header">
         <view class="_it_head_title">
@@ -67,28 +90,7 @@
       </view>
     </view>
     
-    <view class="_v_li_heat_item">
-      <view class="_li_con_item_header">
-        <view class="_it_head_title">
-          <text>全网热播</text>
-        </view>
-        <view class="_it_head_exit"></view>
-      </view>
-      <view class="_it_heat_warp">
-        <block a:for="{{pageDataInfo.module3}}">
-          <view class="_heat_wa_ul" a:key="{{item.id}}" data-item="{{item}}" onTap="toPathVideo">
-            <view class="_heat__ul_li">
-              <view class="_heat__li_image">
-                <image mode="scaleToFill" src="{{item.cover}}" class="_is_image" />
-              </view>
-              <view class="_heat__li_name">
-                <text>{{item.name}}</text>
-              </view>
-            </view>
-          </view>
-        </block>
-      </view>
-    </view>
+    
     
     <view class="_rem_my_footer">
       <my-footer/>
diff --git a/pages/index/index.acss b/pages/index/index.acss
index 2a48f24..c73667e 100644
--- a/pages/index/index.acss
+++ b/pages/index/index.acss
@@ -93,4 +93,112 @@ page,
   color: #db601a;
   line-height: 68rpx;
   text-align: center;
+}
+
+._idx_page_serarch {
+  padding: 30rpx 40rpx;
+}
+
+._idx_page_ser_warp {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  height: 70rpx;
+  padding: 0 20rpx;
+  background-color: #fff;
+  border-radius: 35rpx;
+  box-shadow: 0 0 16rpx rgba(0, 0, 0, 0.2);
+}
+
+._search_placeholder {
+  line-height: 1;
+  margin-left: 10rpx;
+  color:#999;
+  font-size: 28rpx;
+}
+
+
+._idx_swiper_warp {
+  padding: 0 40rpx;
+  margin-bottom: 40rpx;
+}
+
+._banner_swiper {
+  width: 100%;
+  height: 300rpx;
+}
+
+._is_swiper_img {
+  display: block;
+  width: 100%;
+  height: 100%;
+  border-radius: 16rpx;
+}
+
+._idx_page_video_item {
+  padding: 0 40rpx;
+  margin-bottom: 30rpx;
+}
+
+._idx_video_it_warp {
+  width: 100%;
+  padding: 20rpx 0 20rpx 20rpx;
+  background-color: #fff;
+  border-radius: 16rpx;
+}
+
+._idx_vi_it_wa_header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding-right: 20rpx;
+}
+
+._idx_vi_it_wa_he_title {
+  font-size: 30rpx;
+  color: #333;
+  line-height: 1;
+}
+
+._idx_vi_it_wa_he_extry {
+  font-size: 22rpx;
+  color: #999;
+  line-height: 1;
+}
+
+._idx_vi_it_wa_list {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+._idx_vi_it_wa_li_box {
+  width: 33.33%;
+  padding-right: 20rpx;
+  margin-top: 20rpx;
+}
+
+._idx_vi_it_wa_li_b_w {
+  width: 100%;
+}
+
+._idx_vi_i_w_li_w_cover {
+  width: 100%;
+  height: 260rpx;
+}
+
+._idx_v_i_w_i_w_cov_img {
+  display: flex;
+  width: 100%;
+  height: 100%;
+  border-radius: 10rpx;
+}
+
+._idx_vi_i_w_li_w_name {
+  font-size: 28rpx;
+  color: #333;
+  line-height: 1;
+  margin-top: 20rpx;
+  overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
 }
\ No newline at end of file
diff --git a/pages/index/index.axml b/pages/index/index.axml
index dfabcde..e728f14 100644
--- a/pages/index/index.axml
+++ b/pages/index/index.axml
@@ -1,7 +1,7 @@
 <view class="_index_container">
   <block a:if="{{baoxianFlag}}">
     <view class="_bao_xian">
-      <view class="_bao_xian_image">
+      <view class="_bao_xian_image" onTap="toPathAddqywx">
         <image mode="scaleToFill" src="/static/images/qiwei.gif" class="_is_image" />
       </view>
       <view class="_bao_xian_icon_close" onTap="closeBaoXian">
@@ -11,7 +11,7 @@
   </block>
   <block a:if="{{dinyueFlag}}">
     <view class="_din_yue">
-      <view class="_din_yue_image" onTa="getDinyue">
+      <view class="_din_yue_image" onTap="getDinyue">
         <image mode="scaleToFill" src="https://uigds.huiliuwan.cn/public/web/dinyue.gif" class="_is_image" />
       </view>
       <view class="_din_yue_icon_close" onTap="closeDinYue">
@@ -43,6 +43,93 @@
     </view>
   </block>
   
+  <view class="_idx_page_serarch">
+    <view class="_idx_page_ser_warp" onTap="getSearch">
+      <view class="_serach_icon">
+        <am-icon type="search" size="{{20}}" color="#999999" />
+      </view>
+      <view class="_search_placeholder">寻找你喜欢的短剧</view>
+    </view>
+  </view>
   
-  <recommend pageDataInfo="{{pageDataInfo}}" />
+  <view class="_idx_swiper_warp">
+    <swiper class="_banner_swiper" interval={{4000}} duration={{150}} onChange="{{bannerChange}}">
+      <swiper-item class="flex-1" a:for="{{pageDataInfo.bannerList}}" a:key={{index}}>
+        <view class="_ba_swiper_item" onTap="{{toPathVideo}}" data-item="{{item}}">
+          <image src="{{item.cover}}" mode="aspectFill" class="_is_swiper_img"></image>
+        </view>
+      </swiper-item>
+    </swiper>
+  </view>
+  
+  <view class="_idx_page_video_item">
+    <view class="_idx_video_it_warp">
+      <view class="_idx_vi_it_wa_header">
+        <view class="_idx_vi_it_wa_he_title">精品短剧</view>
+        <view class="_idx_vi_it_wa_he_extry">超级无敌好看剧集</view>
+      </view>
+      
+      <view class="_idx_vi_it_wa_list">
+        <block a:for={{pageDataInfo.module1}}>
+          <view class="_idx_vi_it_wa_li_box" onTap="toPathVideo" data-item={{item}} a:key={{item.id}}>
+            <view class="_idx_vi_it_wa_li_b_w">
+              <view class="_idx_vi_i_w_li_w_cover">
+                <image mode="scaleToFill" src={{item.cover}} class="_idx_v_i_w_i_w_cov_img" />
+              </view>
+              <view class="_idx_vi_i_w_li_w_name">{{item.name}}</view>
+            </view>
+          </view>
+        </block>
+      </view>
+      
+    </view>
+  </view>
+  
+  <view class="_idx_page_video_item">
+    <view class="_idx_video_it_warp">
+      <view class="_idx_vi_it_wa_header">
+        <view class="_idx_vi_it_wa_he_title">全网热播</view>
+        <view class="_idx_vi_it_wa_he_extry"></view>
+      </view>
+      
+      <view class="_idx_vi_it_wa_list">
+        <block a:for={{pageDataInfo.module2}}>
+          <view class="_idx_vi_it_wa_li_box" onTap="toPathVideo" data-item={{item}} a:key={{item.id}}>
+            <view class="_idx_vi_it_wa_li_b_w">
+              <view class="_idx_vi_i_w_li_w_cover">
+                <image mode="scaleToFill" src={{item.cover}} class="_idx_v_i_w_i_w_cov_img" />
+              </view>
+              <view class="_idx_vi_i_w_li_w_name">{{item.name}}</view>
+            </view>
+          </view>
+        </block>
+      </view>
+      
+    </view>
+  </view>
+
+  <view class="_idx_page_video_item">
+    <view class="_idx_video_it_warp">
+      <view class="_idx_vi_it_wa_header">
+        <view class="_idx_vi_it_wa_he_title">猜你想追</view>
+        <view class="_idx_vi_it_wa_he_extry"></view>
+      </view>
+      
+      <view class="_idx_vi_it_wa_list">
+        <block a:for={{pageDataInfo.module3}}>
+          <view class="_idx_vi_it_wa_li_box" onTap="toPathVideo" data-item={{item}} a:key={{item.id}}>
+            <view class="_idx_vi_it_wa_li_b_w">
+              <view class="_idx_vi_i_w_li_w_cover">
+                <image mode="scaleToFill" src={{item.cover}} class="_idx_v_i_w_i_w_cov_img" />
+              </view>
+              <view class="_idx_vi_i_w_li_w_name">{{item.name}}</view>
+            </view>
+          </view>
+        </block>
+      </view>
+      
+    </view>
+  </view>
+
+
 </view>
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index 8cbe45d..b7a88ee 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -14,19 +14,7 @@ Page({
   },
   onShow() {
     // 页面显示
-    // my.authorize({
-    //   scopes: 'scope.userInfo',
-    //   success: (res) => {
-    //     console.log(res, "resres")
-    //     my.getAuthUserInfo({
-    //       success: (userInfo) => {
-    //         console.log(userInfo, "resres")
-    //         //昵称 userInfo.nickName
-    //         //头像 userInfo.avatar
-    //       }
-    //     });
-    //   },
-    // });
+
     this.isGetList();
   },
 
@@ -35,12 +23,10 @@ Page({
     const paramenter = {
       path: '/index',
       method: 'GET',
-      // body: {
-      //   uid: 24
-      // }
     }
     httpRequest(paramenter).then(res => {
-      if (res.status == 1) {
+      console.log(res, "resres")
+      if (res && res.status == 1) {
         const { data } = res;
         this.setData({
           pageDataInfo: {
@@ -60,12 +46,30 @@ Page({
     })
   },
 
+
+
   closeDinYue() {
     this.setData({
       dinyueFlag: false
     })
   },
 
+
+
+  closeHisMadel() {
+    this.setData({
+      historyShow: false
+    })
+  },
+
+  getDinyue() { },
+
+  toPathAddqywx() {
+    my.navigateTo({
+      url: '/pages/addqywx/addqywx'
+    })
+  },
+
   navgetHistory() {
     my.navigateTo({
       url: `/pages/video/index?sid=${this.history.sid}&id=${this.history.id || ""
@@ -73,13 +77,18 @@ Page({
     });
   },
 
-  closeHisMadel() {
-    this.setData({
-      historyShow: false
+  getSearch() {
+    my.navigateTo({
+      url: '/pages/search/search'
     })
   },
 
-  getDinyue() { },
+  toPathVideo(event) {
+    const data = event.target.dataset.item;
+    my.navigateTo({
+      url: `/pages/video/video?sid=${data.bookid || data.id}`
+    });
+  },
 
   onHide() {
     // 页面隐藏
diff --git a/pages/my/my.axml b/pages/my/my.axml
index debcd56..374f100 100644
--- a/pages/my/my.axml
+++ b/pages/my/my.axml
@@ -36,7 +36,7 @@
         </view>
       </view>
       <view class="_b_us_in_right">
-        <view class="_us_in_ri_refresh_icon" onTap="getUserInfo">
+        <view class="_us_in_ri_refresh_icon" onTap="isGetUserInfo">
           <image mode="scaleToFill" src="{{`${imageBasUrl}/iamge/shuaxing.png`}}" class="_is_image" />
         </view>
       </view>
diff --git a/pages/my/my.js b/pages/my/my.js
index 0bd13d5..1f3dfdc 100644
--- a/pages/my/my.js
+++ b/pages/my/my.js
@@ -1,5 +1,6 @@
 import { imageBasUrl } from '../../utils/config';
 import { myToPathList, myToHistroy } from "../../utils/constData";
+const { httpRequest } = getApp();
 
 Page({
 	data: {
@@ -19,35 +20,80 @@ Page({
 		})
 	},
 
-	getUserInfo() {
+	async isGetUserInfo() {
 
+		my.showLoading({
+			content: '刷新中...',
+		});
+		const paramenter = {
+			path: '/user',
+			method: 'GET',
+		}
+		const res = await httpRequest(paramenter);
+		my.hideLoading({
+			page: this,
+		});
+
+		if (res.status == 1) {
+			my.showToast({
+				type: 'none',
+				content: '刷新成功',
+				duration: 2000,
+			});
+			this.setData({
+				userInfo: res.data.info,
+			})
+			getApp().globalData.userInfo = res.data.info;
+			my.setStorageSync({
+				key: 'userInfo',
+				data: {
+					userInfo: res.data.info
+				}
+			})
+		}
 	},
+
 	toPathOtherPage(event) {
 		console.log(event, "==========")
-		const url = event.target.dataset.item.toPath;
-		my.navigateTo({
-			url: url
-		});
+		const item = event.target.dataset.item;
+		if (item.id == 4) {
+			my.tb.openMessage({
+				sellerNick: "湖南秦九",
+				success: (res) => {
+					console.log(res);
+				},
+				fail: (res) => {
+					console.log(res);
+				},
+			})
+		} else {
+			my.navigateTo({
+				url: item.toPath
+			});
+		}
 	},
+
 	goIndex() {
 		my.switchTab({
 			url: '/pages/index/index',
 		})
 	},
-	getPayG() {
-		my.hideTabBar({
-			animation: true
-		})
-		this.setData({
-			popupShow: true
-		})
-	},
-	onClosePopup() {
-		this.setData({
-			popupShow: false
-		})
-		my.showTabBar({
-			animation: true
-		})
-	}
+
+	// getPayG() {
+	// 	my.hideTabBar({
+	// 		animation: true
+	// 	})
+	// 	this.setData({
+	// 		popupShow: true
+	// 	})
+	// },
+
+	// onClosePopup() {
+	// 	this.setData({
+	// 		popupShow: false
+	// 	})
+	// 	my.showTabBar({
+	// 		animation: true
+	// 	})
+	// }
 })
\ No newline at end of file
diff --git a/pages/recharge/recharge.acss b/pages/recharge/recharge.acss
new file mode 100644
index 0000000..dce384c
--- /dev/null
+++ b/pages/recharge/recharge.acss
@@ -0,0 +1,126 @@
+._recharge_html {
+  flex: 1;
+  padding: 40rpx;
+  /* background-color: #fff; */
+  padding-bottom: calc(140rpx + constant(safe-area-inset-bottom));
+  padding-bottom: calc(140rpx + env(safe-area-inset-bottom));
+}
+
+._recharge_step_one {
+  padding: 20rpx;
+  background-color: #fff;
+  border-radius: 16rpx;
+}
+
+._recharge_describe {
+  font-size: 28rpx;
+  color: #333;
+}
+
+._recharge_balance {
+  display: flex;
+  margin-top: 20rpx;
+}
+
+._recharge_balance_name {
+  font-size: 28rpx;
+  color: #333;
+}
+
+._recharge_balance_num {
+  font-size: 28rpx;
+  font-weight: 500;
+  color: #333;
+}
+
+._recharge_step_two {
+  padding: 20rpx 0 20rpx 20rpx;
+  background-color: #fff;
+  border-radius: 16rpx;
+  margin-top: 20rpx;
+}
+
+._recharge_template_header {
+  padding-right: 20rpx;
+}
+
+._recharge_te_he_name {
+  font-size: 32rpx;
+  color: #333;
+}
+
+._recharge_template_list {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+._recharge_te_li_item {
+  width: 50%;
+  padding-right: 20rpx;
+  margin-top: 30rpx;
+}
+
+._recharge_te_li_it_warp {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 200rpx;
+  background-color: #f9f9f9;
+  border-radius: 16rpx;
+  border: 2rpx solid transparent;
+}
+
+._recharge_te_li_it_warp.active {
+  border-color: #EA6A4E;
+  background-color:rgba(245, 107, 95, 0.2) ;
+}
+
+._re_amount_text {
+  font-size: 36rpx;
+  line-height: 1;
+  font-weight: 700;
+}
+
+._re_amount_coin {
+  margin-top: 16rpx;
+  font-size: 26rpx;
+  color: #999;
+  line-height: 1;
+}
+
+._re_amount_give {
+  margin-top: 16rpx;
+  font-size: 26rpx;
+  color: #999;
+  line-height: 1;
+}
+
+._recharge_notice_text {
+  font-size: 26rpx;
+  color: #333;
+  line-height: 1.6;
+  margin-top: 16rpx;
+}
+
+._recharge_btn_warp {
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  padding-bottom: constant(safe-area-inset-bottom);
+  padding-bottom: env(safe-area-inset-bottom);
+  background-color:#E94E41 ;
+}
+
+._recharge_btn {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100rpx;
+  background-color:#E94E41 ;
+  font-size: 28rpx;
+  color: #fff;
+}
\ No newline at end of file
diff --git a/pages/recharge/recharge.axml b/pages/recharge/recharge.axml
new file mode 100644
index 0000000..297da90
--- /dev/null
+++ b/pages/recharge/recharge.axml
@@ -0,0 +1,54 @@
+<view class="_recharge_html">
+  <view class="_recharge_step_one">
+    <view class="_recharge_describe">
+      创作不易，支持作者
+    </view>
+    
+    <view class="_recharge_balance">
+      <view class="_recharge_balance_name">我的K币：</view>
+      <view class="_recharge_balance_num">
+        {{coinNum}} K币
+      </view>
+    </view>
+  </view>
+  
+  <view class="_recharge_step_two">
+    <view class="_recharge_template_header">
+      <view class="_recharge_te_he_name">
+        请选择充值金额
+      </view>
+    </view>
+    
+    <view class="_recharge_template_list">
+      <block a:for={{5}}>
+        <view class="_recharge_te_li_item" key={{index}}>
+          <view class="_recharge_te_li_it_warp {{tempIndex == index ? 'active':''}}" onTap="selectPayTem" data-idx={{index}}>
+            <view class="_re_amount_text">199元</view>
+            <view class="_re_amount_coin">37621K币</view>
+            <view class="_re_amount_give">多增送20元K币</view>
+          </view>
+        </view>
+      </block>
+    </view>
+    
+  </view>
+  
+  <view class="_recharge_step_two">
+    <view class="_recharge_template_header">
+      <view class="_recharge_te_he_name">
+        购买须知
+      </view>
+    </view>
+    <view class="_recharge_notice_text"> 1、k币和会员属于虚拟产品，一经购买不可退换</view>
+    <view class="_recharge_notice_text"> 2、未满18岁的未成年人需要在监护人主导、同意下进行相关付费操作。</view>
+    <view class="_recharge_notice_text"> 3、{{userInfo.giftTime}}</view>
+    <view class="_recharge_notice_text"> 4、充值K币一般在10分钟内到账，如未到账请在“我的”页面联系客服</view>
+  </view>
+  
+  <view class="_recharge_btn_warp">
+    <view class="_recharge_btn">
+      立即充值
+    </view>
+  </view>
+  
+</view>
\ No newline at end of file
diff --git a/pages/recharge/recharge.js b/pages/recharge/recharge.js
new file mode 100644
index 0000000..1b24734
--- /dev/null
+++ b/pages/recharge/recharge.js
@@ -0,0 +1,17 @@
+Page({
+  data: {
+    coinNum: 0,
+    tempIndex: 0,
+    userInfo: {}
+  },
+  onLoad(query) {
+    console.log('page onLoad', query)
+  },
+  onShow() { },
+  selectPayTem(ev) {
+    const idx = ev.target.dataset.idx;
+    this.setData({
+      tempIndex: idx
+    })
+  }
+})
\ No newline at end of file
diff --git a/pages/recharge/recharge.json b/pages/recharge/recharge.json
new file mode 100644
index 0000000..9e26dfe
--- /dev/null
+++ b/pages/recharge/recharge.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/pages/search/search.acss b/pages/search/search.acss
index b81b203..7e9b754 100644
--- a/pages/search/search.acss
+++ b/pages/search/search.acss
@@ -2,12 +2,13 @@ page {
   background-color: #F1F4FA;
 }
 
-._serach_html {
-  padding: 24rpx;
-}
+/* ._serach_html {
+ 
+} */
 
 ._s_b_search_i_warp {
   width: 100%;
+  padding: 24rpx;
   height: 72rpx;
   margin-bottom: 40rpx;
 }
@@ -15,7 +16,12 @@ page {
 ._s_b_search_i_warp .am-search {
   height: 72rpx;
   background-color: transparent;
-  /* padding: 0; */
+  padding: 0;
+}
+
+.am-search-clear {
+  top: 50%;
+  transform: translateY(-50%);
 }
 
 ._s_b_search_i_warp .am-search-input{
@@ -31,6 +37,10 @@ page {
   line-height: 72rpx;
 }
 
+._search_result_header {
+  padding: 24rpx;
+}
+
 ._search_result_title {
   line-height: 1;
   font-size: 32rpx;
@@ -39,13 +49,30 @@ page {
 	margin-bottom: 20rpx;
 }
 
+.search_result_list {
+  display: flex;
+  flex-wrap: wrap;
+  padding-left: 24rpx;
+}
+
+.search_re_li_box {
+  width: 33.33%;
+  padding-right: 24rpx;
+  margin-bottom: 24rpx;
+}
+
+.search_re_li_item {
+  width: 100%;
+}
 
 ._search_history {
   width: 100%;
 }
 
 ._se_his_header {
+  padding: 24rpx;
   justify-content: space-between;
+  align-items: center;
 }
 
 ._his_hea_name {
@@ -56,19 +83,21 @@ page {
 }
 
 ._se_his_list {
+  padding: 0 24rpx;
   flex-wrap: wrap;
 }
 
 ._his_list_item {
-  padding: 8rpx 20rpx;
-	background: #f3f3f3;
+  padding: 8rpx 30rpx;
+	background-color: #fff;
+	/* background: pink; */
 	border-radius: 58rpx;
 	margin-right: 20rpx;
 	margin-bottom: 20rpx;
 }
 
 ._hi_li_it_text {
-  font-size: 28rpx;
+  font-size: 32rpx;
 	font-weight: 400;
 	color: #1a1a1a;
 }
diff --git a/pages/search/search.axml b/pages/search/search.axml
index 9655d9b..b0c1ef4 100644
--- a/pages/search/search.axml
+++ b/pages/search/search.axml
@@ -7,19 +7,28 @@
     
     <block a:if="{{searchFlag}}">
       <view class="_search_result">
-        <view class="_search_result_title">
-          <text>搜索结果</text>
+        <view class="_search_result_header">
+          <view class="_search_result_title">
+            <text>搜索结果</text>
+          </view>
         </view>
+        
         <block a:if="{{searchList.length}}">
-          <view class="flex-row d-flex">
+          <view class="search_result_list">
             <block a:for="{{searchList}}">
-              <pursue-item rowData="{{item}}" a:key="{{index}}" />
+              <view class="search_re_li_box">
+                <view class="search_re_li_item">
+                  <pursue-item rowData="{{item}}" a:key="{{index}}" />
+                </view>
+              </view>
             </block>
           </view>
         </block>
+        
         <block a:else>
-          <my-empty />
+          <my-empty  />
         </block>
+        
       </view>
     </block>
     
diff --git a/pages/search/search.js b/pages/search/search.js
index 571480c..fecbe5e 100644
--- a/pages/search/search.js
+++ b/pages/search/search.js
@@ -1,4 +1,6 @@
 import { imageBasUrl } from '../../utils/config'
+const { httpRequest } = getApp();
+
 Page({
   data: {
     searchKeyword: '',
@@ -6,22 +8,41 @@ Page({
     searchList: [],
     historySearch: []
   },
-
-  onLoad(query) {
-    console.log('page onLoad', query)
+  onShow() {
+    const historyData = my.getStorageSync({ key: 'historySearch' });
+    this.setData({
+      historySearch: historyData.data
+    })
   },
 
-  onShow() { },
-
   handleSearchClear() {
     this.setData({
-      searchKeyword: ''
+      searchKeyword: '',
+      searchFlag: false
     })
   },
 
   handleSearchSubmit(event) {
-    this.setData({
-      searchKeyword: event
+    const historySearch = this.data.historySearch;
+    my.hideKeyboard();
+    const paramenter = {
+      path: '/find',
+      method: 'POST',
+      body: {
+        keyword: event
+      }
+    }
+    httpRequest(paramenter).then(res => {
+      console.log(res, Array.isArray(res.data), "findfind")
+      if (Array.isArray(res.data)) {
+        historySearch.push(event);
+        this.setHistorySearch(historySearch);
+        this.setData({
+          searchList: res.data,
+          searchKeyword: event,
+          searchFlag: true
+        })
+      }
     })
   },
 
@@ -54,13 +75,29 @@ Page({
   },
 
   historuNavigator(event) {
-    this.setData({
-      searchKeyword: ''
+    const historySearch = this.data.historySearch;
+    console.log(event, "event")
+    const item = event.target.dataset.item;
+
+    my.hideKeyboard();
+    const paramenter = {
+      path: '/find',
+      method: 'POST',
+      body: {
+        keyword: item
+      }
+    }
+    httpRequest(paramenter).then(res => {
+      console.log(res, Array.isArray(res.data), "findfind")
+      if (Array.isArray(res.data)) {
+        historySearch.push(item);
+        this.setHistorySearch(historySearch);
+        this.setData({
+          searchList: res.data,
+          searchKeyword: item,
+          searchFlag: true
+        })
+      }
     })
   },
-
-  onDelItem() {
-    console.log("[[[[[[[[[[")
-  }
-
 })
\ No newline at end of file
diff --git a/pages/video/video.acss b/pages/video/video.acss
index e69de29..f52a776 100644
--- a/pages/video/video.acss
+++ b/pages/video/video.acss
@@ -0,0 +1,292 @@
+page {
+  width: 100%;
+  height: 100%;
+  background-color:#000;
+}
+
+._video_html{
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  height: 100vh;
+  padding-bottom: constant(safe-area-inset-bottom);
+  padding-bottom: env(safe-area-inset-bottom);
+}
+
+._video_box {
+  flex: 1;
+}
+
+.swiper_item {
+  width: 100%;
+}
+
+.swiper_item_warp {
+  width: 100%;
+  position: relative;
+}
+
+.swiper_video_box{
+  width: 100%;
+  height: 100%;
+}
+
+._swiper_video_cover {
+  position: absolute;
+  bottom: 180rpx;
+  right: 30rpx;
+  z-index: 2;
+  background-color: transparent;
+}
+
+._chasing_dramas_cover {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  background-color: transparent;
+}
+
+._chasing_dramas_text {
+  background-color: transparent;
+  color: #fff;
+  font-size: 26rpx;
+}
+
+.swiper_pay_modal {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  background-color: #000;
+  width: 100%;
+  height: 100%;
+}
+
+.sw_pay_mo_order >text {
+  font-size: 50rpx;
+  font-weight: 700;
+  color: #fff;
+}
+
+.sw_pay_isAutoplay_tips {
+  margin-top: 40rpx;
+}
+
+.sw_pay_isAutoplay_tips >text {
+  font-size: 50rpx;
+  font-weight: 700;
+  color: #fff;
+}
+
+.sw_pay_isAutoplay_btn {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 350rpx;
+  height: 80rpx;
+  line-height: 1;
+  background-color: #FF2B2B;
+  margin-top: 40rpx;
+  border-radius: 16rpx;
+}
+
+.sw_pay_isAutoplay_btn >text {
+  font-size: 26rpx;
+  color: #fff;
+}
+
+._video_series {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  height: 100rpx;
+  padding: 0 30rpx;
+}
+
+._video_series_left {
+  display: flex;
+  align-items: center;
+}
+
+._vi_ser_le_img {
+  width: 88rpx;
+  height: 56rpx;
+}
+
+._vi_ser_le_order {
+  font-size: 28rpx;
+  color: #fff;
+  margin-left: 16rpx;
+}
+
+/* 加入追剧 */
+/* ._chasing_dramas_modal {
+
+} */
+
+._chasing_dramas_mo_header {
+
+}
+
+._ch_dr_mp_he_title >text {
+  font-size: 34rpx;
+  color: #333;
+}
+
+._ch_dr_mp_he_content >text {
+  color: #7F7F7F;
+  font-size: 28rpx;
+}
+
+._ch_dr_mp_footer {
+  display: flex;
+  width: 100%;
+  height: 100%;
+}
+
+._ch_mo_footer_close,
+._ch_mo_footer_submit {
+  flex: 1;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100%;
+}
+
+._ch_mo_footer_close> text {
+  font-size: 30rpx;
+  color: #e24848;
+  line-height: 1;
+}
+
+._ch_mo_footer_submit  {
+  background-color: #e24848;
+}
+
+._ch_mo_footer_submit >text {
+  font-size: 30rpx;
+  color: #fff;
+  line-height: 1;
+}
+
+._popup_order_content {
+  width: 100%;
+  height: 740rpx;
+  background: linear-gradient(180deg, #ffe2e2 0%, #ffffff 50%);
+  border-radius: 24rpx 24rpx 0 0;
+}
+
+._pop_order_con_header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: 100rpx;
+  padding: 0 30rpx;
+}
+
+._pop_ord_hea_left {
+  display: flex;
+}
+
+._pop_ord_hea_le_title {
+  width: 360rpx;
+  white-space: nowrap; 
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+._pop_ord_hea_le_title >text {
+  font-size: 36rpx;
+  color: #333;
+  font-weight: 700;
+  white-space: nowrap; 
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+._pop_ord_hea_le_all{
+  margin-left: 4rpx;
+}
+
+._pop_ord_hea_le_all>text {
+  font-size: 26rpx;
+  color: #333;
+}
+
+/* ._pop_order_con_tabs {
+  padding: 0 30rpx;
+} */
+
+/* ._pop_order_con_warp {
+  padding-left:30rpx ;
+} */
+._pop_order__tabs .am-tabs-bar-tab {
+  padding:  0 30rpx;
+  justify-content: flex-start;
+}
+
+._pop_order__tabs .am-tabs-bar-tab,
+._pop_order__tabs .am-tabs-bar{
+  background-color: transparent !important;
+}
+
+._pop_order__tabs .am-tabs-scroll-right{
+  background: transparent !important;
+}
+._pop_order__tabs .am-tabs-scroll-left{
+  background: transparent !important;
+}
+
+._pop_order__tabs .am-tabs-content-wrap {
+  background: transparent !important;
+}
+
+._pop_order__tabs .tab_c_list {
+  display: flex;
+  flex-wrap: wrap;
+  padding: 30rpx 10rpx 0 30rpx ;
+}
+
+.tab_c_list_ul {
+  width: 16.66%;
+  padding-right: 20rpx;
+  margin-bottom: 20rpx;
+}
+
+.tab_c_list_ul_li {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: relative;
+  width: 100%;
+  height: 80rpx;
+  background-color: #e1e1e1;
+  border-radius: 16rpx;
+}
+
+.tab_c_list_ul_li text {
+  font-size: 26rpx;
+  color: #333;
+  font-weight: 700;
+}
+
+.tab_c__ul_li_lock {
+  position: absolute;
+  top: 0;
+  right: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 30rpx;
+  height: 30rpx;
+  background-color: #B5C0C7;
+  border-radius: 0 8rpx 0 8rpx ;
+}
+
+._li_lock_image {
+  display: block;
+  width: 22rpx;
+  height: 22rpx;
+}
\ No newline at end of file
diff --git a/pages/video/video.axml b/pages/video/video.axml
index 04a4ce6..be17ad2 100644
--- a/pages/video/video.axml
+++ b/pages/video/video.axml
@@ -1,3 +1,95 @@
-<view>
-  new page
+<view class="_video_html">
+  <view class="_video_box" id="_video_box">
+    <swiper class="_video_swiper" duration={{200}} vertical={{true}} current={{swiperCurrent}}>
+      <block a:for={{swiperList}}>
+        
+        <swiper-item key="swiper_item_{{index}}" class="swiper_item">
+          <view class="swiper_item_warp" style="height:{{swiperItemHeight}}px">
+            <!-- 播放 -->
+            <block a:if={{swiperCurrent === index && item.chackpay == 1}}>
+              <video class="swiper_video_box" style="height:{{swiperItemHeight}}px" src={{item.video_url}} poster={{item.videocover}}  autoplay={{true}} onError="videoErrorFn" objectFit="contain"></video>
+            </block>
+            
+            <block a:if={{iosPayment.status === 2 || systemInfo.platform != 'ios'}}>
+              <view class="swiper_pay_modal">
+                <view class="sw_pay_mo_order">
+                  <text>第几集</text></view>
+                <view class="sw_pay_isAutoplay_tips">
+                  <text>当前剧集是付费剧集</text>
+                </view>
+                <view class="sw_pay_isAutoplay_btn">
+                  <text>立即充值</text>
+                </view>
+              </view>
+            </block>
+            
+            <cover-view class="_swiper_video_cover">
+              <cover-view class="_chasing_dramas_cover" onTap="addChasingDramasFn">
+                <am-icon type="heart" size="{{26}}" color="{{videoInfoObj.iskeep === 0 ? '#ffffff' :'#FF2B2B'}}" />
+                <cover-view class="_chasing_dramas_text">追剧</cover-view>
+              </cover-view>
+            </cover-view>
+            
+          </view>
+        </swiper-item>
+        
+      </block>
+    </swiper>
+  </view>
+  
+  <view class="_video_series" onTap="selectEpisodesFn">
+    <view class="_video_series_left">
+      <view class="_vi_ser_le_img">
+        <image mode="scaleToFill" src="{{imageBasUrl}}/iamge/video-bottom.png" class="_is_image" />
+      </view>
+      <view class="_vi_ser_le_order">
+        <text>第 {{swiperOrder}} 集</text>
+      </view>
+    </view>
+    <view class="_video_series_right">
+      <am-icon type="arrow-right" size="{{20}}" color="#fff" />
+    </view>
+  </view>
+  
+  <popup show="{{orderPopupShow}}" position="bottom" onClose="onPopupClose">
+    <view class="_popup_order_content">
+      <view class="_pop_order_con_header">
+        <view class="_pop_ord_hea_left">
+          <view class="_pop_ord_hea_le_title">
+            <text>{{videoInfoObj.title}}</text>
+          </view>
+          <view class="_pop_ord_hea_le_all">
+            <text>全{{videoInfoObj.total}}集</text>
+          </view>
+        </view>
+        <view class="_pop_ord_hea_right" onTap="closeOrderPopup">
+          <!-- arrow-down -->
+          <am-icon type="cross" size="{{20}}" color="#333" />
+        </view>
+      </view>
+      
+      <view class="_pop_order_con_tabs">
+        <tabs tabs={{orderList}} onTabClick="handleTabClick" activeTab="{{activeTab}} " className="_pop_order__tabs" tabBarActiveTextColor="#CE3636" 
+          tabBarInactiveTextColor="#7F7F7F" tabBarUnderlineColor="#CE3636">
+          <block a:for={{orderList}}>
+            <tab-content key={{index}}>
+              <view class="tab_c_list">
+                <block a:for="{{item.temp}}" a:for-index="idx" a:for-item="j">
+                  <view class="tab_c_list_ul" key={{idx}}>
+                    <view class="tab_c_list_ul_li" data-item="{{j}}" onTap="handleOrderCurrent">
+                      <text>{{index + idx + 1}}</text>
+                      <view class="tab_c__ul_li_lock">
+                        <image mode="scaleToFill" src="{{imageBasUrl}}/iamge/videoLock.png" class="_li_lock_image" />
+                      </view>
+                    </view>
+                  </view>
+                </block>
+              </view>
+            </tab-content>
+          </block>
+        </tabs>
+      </view>
+    </view>
+  </popup>
+  
 </view>
\ No newline at end of file
diff --git a/pages/video/video.js b/pages/video/video.js
index 97645e8..0cb3065 100644
--- a/pages/video/video.js
+++ b/pages/video/video.js
@@ -1,7 +1,305 @@
+import { imageBasUrl } from '../../utils/config'
+const { httpRequest } = getApp();
+
 Page({
-  data: {},
-  onLoad(query) {
-    console.log('page onLoad', query)
+  data: {
+    swiperItemHeight: 0,
+    imageBasUrl,
+    // chasingDramasShow: false,
+    chasDraIconColor: '#fff',
+    orderList: [],
+    videoInfoObj: {},
+    activeTab: 0,
+    orderPopupShow: false,
+    systemInfo: {},
+    userInfo: {},
+    iosPayment: {},
+    swiperList: [],
+    swiperCurrent: 0,
+    swiperOrder: 0,
+    sid: '',
+  },
+  //  获取其它信息
+  isOtherFn() {
+    my.createSelectorQuery().select('#_video_box').boundingClientRect().exec((r) => {
+      this.setData({
+        swiperItemHeight: r[0].height
+      })
+    });
+    this.setData({
+      userInfo: getApp().globalData.userInfo,
+      systemInfo: getApp().globalData.systemInfo
+    })
+  },
+
+  // 处理显示的集数
+  isSwiperListFn(orNum, ls, orInfo) {
+    // 总共显示集数
+    let showOrder = 9;
+    // 平均前后的集数
+    let halfNum = Math.ceil(showOrder / 2) - 1;
+    // 集数减一为，列表的索引
+    const sum = orNum - 1;
+    // 当前的集数加上，平均前后的集数，不能超过总的集数
+    const all = orNum + halfNum;
+    // 新的列表
+    const list = [];
+    let swiperCurrent = 0;
+
+    if (ls.length < showOrder) {
+      showOrder = ls.length;
+      halfNum = Math.ceil(ls.length / 2) - 1;
+    }
+
+    if (all >= ls.length) {
+
+      let digit = 0;
+      let first = halfNum;
+      // let after = halfNum;
+      let cunIdx = 0;
+      if (ls.length >= orNum) {
+        digit = ls.length - orNum;
+        first = (halfNum - digit) + halfNum;
+      }
+
+      for (let y = 0; y < showOrder; y++) {
+        if (first == 0) {
+          list.push(orInfo);
+          swiperCurrent = y;
+          first = first - 1;
+        } else if (first > 0) {
+          list.push(ls[orNum - first]);
+          first = first - 1;
+        } else {
+          if (cunIdx == 0) {
+            list.push(ls[orNum]);
+            cunIdx = cunIdx + 1;
+          } else {
+            console.log(orNum + cunIdx, "orNum + cunIdx]")
+            list.push(ls[orNum + cunIdx]);
+            cunIdx = cunIdx + 1;
+          }
+        }
+      }
+
+    } else if (orNum > halfNum) {
+
+      let first = halfNum;
+      // let after = halfNum;
+      let cunIdx = 0;
+      for (let y = 0; y < showOrder; y++) {
+        if (first == 0) {
+          list.push(orInfo);
+          swiperCurrent = y;
+          first = first - 1;
+        } else if (first > 0) {
+          list.push(ls[orNum - first]);
+          first = first - 1;
+        } else {
+          if (cunIdx == 0) {
+            list.push(ls[orNum]);
+            cunIdx = cunIdx + 1;
+          } else {
+            list.push(ls[orNum + cunIdx]);
+            cunIdx = cunIdx + 1;
+          }
+        }
+      }
+
+    } else {
+
+      for (let y = 0; y < showOrder; y++) {
+        if (sum == y) {
+          list.push(orInfo);
+          swiperCurrent = y;
+        } else {
+          list.push(ls[y])
+        }
+      }
+
+    }
+
+    this.setData({
+      swiperList: list,
+      swiperCurrent
+    })
+  },
+  // 处理弹框的集数
+  async handelOrder(infoObj) {
+    const paramenter = {
+      path: '/batchlist',
+      method: 'POST',
+      body: {
+        sid: infoObj.sid,
+        start: 1,
+        end: infoObj.total.length
+      }
+    }
+    const isBatchlist = await httpRequest(paramenter);
+    console.log(isBatchlist, "isBatchlist")
+    const num = 2;
+    let remain = 0;
+    let temp = [];
+    const mlist = [];
+    // if (Array.isArray(isBatchlist.data)) {
+    //   vls.forEach((m, idx) => {
+    //     if ((num * remain + num) < (idx + 1)) {
+    //       remain += 1;
+    //       temp = [];
+    //     }
+    //     temp.push(m);
+    //     let obj = {
+    //       firstNum: num * remain + 1,
+    //       lastNum: idx + 1,
+    //       title: `${num * remain + 1}-${idx + 1}`,
+    //       temp: [...temp],
+    //     }
+    //     mlist[remain] = obj;
+    //   });
+
+    //   this.setData({
+    //     orderList: mlist
+    //   })
+    // }
+  },
+
+  // 获取 剧情
+  async isIosPaymentFn(sid) {
+    const paramenter = {
+      path: '/iosPayment',
+      method: 'GET',
+    }
+    const iosPayment = await httpRequest(paramenter);
+    // console.log(iosPayment, "iosPayment")
+    const paramVideo = {
+      path: '/videoread',
+      method: 'POST',
+      body: {
+        sid: sid
+      }
+    }
+
+    const videoRead = await httpRequest(paramVideo);
+    console.log(videoRead, "videoRead")
+    if (Array.isArray(videoRead.data)) {
+      const videoInfoObj = videoRead.data[0];
+      const swiperList = Array.from({ length: videoInfoObj.total }, (v, k) => k + 1);
+      // console.log(swiperList, "swiperList")
+      this.isSwiperListFn(videoInfoObj.order, swiperList, videoInfoObj);
+      this.handelOrder(videoInfoObj);
+      this.setData({
+        iosPayment: iosPayment,
+        swiperOrder: videoInfoObj.order,
+        // swiperList: swiperList
+        videoInfoObj: videoInfoObj
+      })
+      my.setNavigationBar({
+        title: videoInfoObj.title,
+      });
+    }
+
+  },
+
+  videoErrorFn(e) {
+    console.log(e, "eee")
+  },
+
+  //显示 选择集数
+  selectEpisodesFn() {
+    this.setData({
+      orderPopupShow: true
+    })
+  },
+  // 关闭 选择集数
+  closeOrderPopup() {
+    this.setData({
+      orderPopupShow: false
+    })
+  },
+  // 切换 级数的
+  handleTabClick(e) {
+    // console.log(e, "handleTabClickhandleTabClick")
+    this.setData({
+      activeTab: e.index
+    })
+  },
+  handleOrderCurrent(e) {
+    console.log(e, "handleOrderCurrent");
+  },
+
+  onLoad(query) {
+    const sid = query.sid;
+
+    this.setData({
+      sid: sid
+    })
+  },
+
+  onShow() {
+    const sid = this.data.sid;
+    this.isOtherFn();
+    this.isIosPaymentFn(sid);
+    console.log("--------------")
+  },
+
+  // 不追剧
+  // noChasingDramasFn() {
+  //   this.setData({
+  //     chasingDramasShow: false
+  //   })
+  // },
+  // 添加追剧
+  addChasingDramasFn() {
+    const videoInfoObj = this.data.videoInfoObj;
+    if (videoInfoObj.iskeep == 0) {
+
+      const paramenter = {
+        path: '/addkeep',
+        method: 'POST',
+        body: {
+          sid: videoInfoObj.sid
+        }
+      }
+      httpRequest(paramenter).then(() => {
+        my.showToast({
+          icon: 'none',
+          content: '追剧成功',
+          duration: 1000,
+        });
+        this.setData({
+          videoInfoObj: {
+            ...videoInfoObj,
+            iskeep: 1
+          }
+        })
+      })
+
+    } else {
+      const paramenter = {
+        path: '/chasingdramadel',
+        method: 'POST',
+        body: {
+          sid: videoInfoObj.sid
+        }
+      }
+      httpRequest(paramenter).then(() => {
+        my.showToast({
+          icon: 'none',
+          content: '取消成功',
+          duration: 1000,
+        });
+        this.setData({
+          videoInfoObj: {
+            ...videoInfoObj,
+            iskeep: 0
+          }
+        })
+      })
+
+    }
+
+    // this.setData({
+    //   chasDraIconColor: '#FF2B2B'
+    // })
   },
-  onShow() {}
 })
\ No newline at end of file
diff --git a/pages/video/video.json b/pages/video/video.json
index 9e26dfe..8cfd671 100644
--- a/pages/video/video.json
+++ b/pages/video/video.json
@@ -1 +1,13 @@
-{}
\ No newline at end of file
+{
+  "pullRefresh": false,
+  "allowsBounceVertical": "NO",
+  "navigationBarTextStyle": "white",
+  "titleBarColor": "#000",
+  "usingComponents": {
+    "am-icon": "mini-antui/es/am-icon/index",
+    "modal": "mini-antui/es/modal/index",
+    "popup": "mini-antui/es/popup/index",
+    "tabs": "mini-antui/es/tabs/index",
+    "tab-content": "mini-antui/es/tabs/tab-content/index"
+  }
+}
\ No newline at end of file
diff --git a/pages/wxkf/wxkf.acss b/pages/wxkf/wxkf.acss
index f85b1c4..363ba74 100644
--- a/pages/wxkf/wxkf.acss
+++ b/pages/wxkf/wxkf.acss
@@ -14,7 +14,10 @@ page {
 ._wxkf_page_body {
 	display: flex;
 	flex-direction: column;
+	justify-content: center;
 	align-items: center;
+	width: 100%;
+	height: 100vh;
 }
 
 ._wxkf_image_bx {
diff --git a/static/images/logo.png b/static/images/logo.png
new file mode 100644
index 0000000..d4da22e
Binary files /dev/null and b/static/images/logo.png differ
diff --git a/static/images/signIn_2.png b/static/images/signIn_2.png
new file mode 100644
index 0000000..cb0bf18
Binary files /dev/null and b/static/images/signIn_2.png differ
diff --git a/utils/httpRequest.js b/utils/httpRequest.js
index 9e95b9a..03bb726 100644
--- a/utils/httpRequest.js
+++ b/utils/httpRequest.js
@@ -51,8 +51,8 @@ const httpRequest = async ({ path, method = 'GET', params = {}, body = {}, exts
 				...exts,
 			}
 		});
-		// console.log(result, "result")
-		if (result != '{}' && result) {
+		// console.log(JSON.stringify(result),"JSON.stringify(resul")
+		if (JSON.stringify(result) != '{}' && result) {
 			const isResult = JSON.parse(result);
 			if (isResult.status == 1) {
 				return isResult;
@@ -64,11 +64,11 @@ const httpRequest = async ({ path, method = 'GET', params = {}, body = {}, exts
 				});
 				return Promise.reject(isResult);
 			}
-
 		}
 		return result;
 		// console.log(JSON.stringify(result));
 	} catch (err) {
+		
 		console.log(err, 'httpRequest_err')
 	}
 };
diff --git a/utils/obtainInfo.js b/utils/obtainInfo.js
index c0d4367..5965935 100644
--- a/utils/obtainInfo.js
+++ b/utils/obtainInfo.js
@@ -2,24 +2,10 @@
 import { httpRequest } from './httpRequest'
 
 export const getUserInfo = async () => {
-	const paramenter = {
-		path: '/user',
-		method: 'GET',
-	}
-	const res = await httpRequest(paramenter);
-	console.log(res, "useruser")
-	if (res.status == 1) {
-		getApp().globalData.userInfo = res.data.info;
-		my.setStorageSync({
-			key: 'userInfo',
-			data: {
-				userInfo: res.data.info
-			}
-		})
-	}
+	
 }
 
 export const getSystemInfoSync = () => {
-	console.log(my.getSystemInfoSync(), "my.getSystemInfoSync()")
-	getApp().globalData.systemInfo = my.getSystemInfoSync();
+	// console.log(my.getSystemInfoSync(), "my.getSystemInfoSync()")
+	
 }
\ No newline at end of file