人脸人体接口

src/miniprogram-2/.gitignore

@@ -0,0 +1,14 @@
+# Windows
+[Dd]esktop.ini
+Thumbs.db
+$RECYCLE.BIN/
+
+# macOS
+.DS_Store
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+
+# Node.js
+node_modules/

src/miniprogram-2/app.js

@@ -1,6 +1,23 @@
 // app.js
+// const mysql = require('mysql');
 App({
   onLaunch() {
+    //连接数据库
+    // const db = mysql.createConnection({
+    //   host:'localhost',
+    //   user:'root',
+    //   password:'mysql',
+    //   databases:'makeup'
+    // });
+    // db.connect(function(err){
+    //   if(err){
+    //     console.error('连接失败',err.stack);
+    //     return;
+    //   }
+    //   console.log('连接成功,ID:',db.threaId);
+    // });
+    // this.globalData.db = db;
+
     // 展示本地存储能力
     const logs = wx.getStorageSync('logs') || []
     logs.unshift(Date.now())
@@ -14,6 +31,7 @@ App({
     })
   },
   globalData: {
+    db:null,
     userInfo: null
   }
 })

src/miniprogram-2/app.json

@@ -13,7 +13,9 @@
     "pages/recommend/rec2",
     "pages/recommend/rec3",
     "pages/match/photo",
-    "pages/match/result"
+    "pages/match/result",
+    "pages/recommend/rec4",
+    "pages/recommend/rec5"
   ],
   "window": {
     "backgroundTextStyle": "light",
@@ -62,5 +64,11 @@
     "scope.camera": {
       "desc": "你的相机将用于小程序拍照"
     }
+  },
+  "@plugins": {
+    "mysql":{
+      "version": "0.10.0",
+      "provider":"wx6a3c4b5cb5c6c7d1"
+    }
   }
 }

src/miniprogram-2/app.wxss

@@ -8,3 +8,21 @@
   padding: 200rpx 0;
   box-sizing: border-box;
 } 
+.text {
+	/* 字体大小 */
+	font-size: 15px;
+	/* 字体颜色 */
+	color: black;
+	/* 字体风格-粗细 */
+	/*font-weight: bold;*/
+	/*段落排版--首字缩进*/
+	text-indent: 2em;
+	/*段落排版--行间距（行高）*/
+	line-height: 1.5em;
+	/*段落排版--中文字间距*/
+	letter-spacing: 1px;
+	/*字母间距*/
+	word-spacing: 4px;
+	/*文字对齐 right 、left 、center  */
+	text-align: left;
+}

src/miniprogram-2/miniprogram_npm/crypto-js/index.js

@@ -4,7 +4,7 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1699338904721, function(require, module, exports) {
+__DEFINE__(1699834100235, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -23,8 +23,8 @@ __DEFINE__(1699338904721, function(require, module, exports) {
 	return CryptoJS;
 
 }));
-}, function(modId) {var map = {"./core":1699338904722,"./x64-core":1699338904723,"./lib-typedarrays":1699338904724,"./enc-utf16":1699338904725,"./enc-base64":1699338904726,"./enc-base64url":1699338904727,"./md5":1699338904728,"./sha1":1699338904729,"./sha256":1699338904730,"./sha224":1699338904731,"./sha512":1699338904732,"./sha384":1699338904733,"./sha3":1699338904734,"./ripemd160":1699338904735,"./hmac":1699338904736,"./pbkdf2":1699338904737,"./evpkdf":1699338904738,"./cipher-core":1699338904739,"./mode-cfb":1699338904740,"./mode-ctr":1699338904741,"./mode-ctr-gladman":1699338904742,"./mode-ofb":1699338904743,"./mode-ecb":1699338904744,"./pad-ansix923":1699338904745,"./pad-iso10126":1699338904746,"./pad-iso97971":1699338904747,"./pad-zeropadding":1699338904748,"./pad-nopadding":1699338904749,"./format-hex":1699338904750,"./aes":1699338904751,"./tripledes":1699338904752,"./rc4":1699338904753,"./rabbit":1699338904754,"./rabbit-legacy":1699338904755,"./blowfish":1699338904756}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) {var map = {"./core":1699834100236,"./x64-core":1699834100237,"./lib-typedarrays":1699834100238,"./enc-utf16":1699834100239,"./enc-base64":1699834100240,"./enc-base64url":1699834100241,"./md5":1699834100242,"./sha1":1699834100243,"./sha256":1699834100244,"./sha224":1699834100245,"./sha512":1699834100246,"./sha384":1699834100247,"./sha3":1699834100248,"./ripemd160":1699834100249,"./hmac":1699834100250,"./pbkdf2":1699834100251,"./evpkdf":1699834100252,"./cipher-core":1699834100253,"./mode-cfb":1699834100254,"./mode-ctr":1699834100255,"./mode-ctr-gladman":1699834100256,"./mode-ofb":1699834100257,"./mode-ecb":1699834100258,"./pad-ansix923":1699834100259,"./pad-iso10126":1699834100260,"./pad-iso97971":1699834100261,"./pad-zeropadding":1699834100262,"./pad-nopadding":1699834100263,"./format-hex":1699834100264,"./aes":1699834100265,"./tripledes":1699834100266,"./rc4":1699834100267,"./rabbit":1699834100268,"./rabbit-legacy":1699834100269,"./blowfish":1699834100270}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904722, function(require, module, exports) {
+__DEFINE__(1699834100236, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -833,7 +833,7 @@ __DEFINE__(1699338904722, function(require, module, exports) {
 
 }));
 }, function(modId) { var map = {}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904723, function(require, module, exports) {
+__DEFINE__(1699834100237, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -1138,8 +1138,8 @@ __DEFINE__(1699338904723, function(require, module, exports) {
 	return CryptoJS;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904724, function(require, module, exports) {
+__DEFINE__(1699834100238, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -1216,8 +1216,8 @@ __DEFINE__(1699338904724, function(require, module, exports) {
 	return CryptoJS.lib.WordArray;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904725, function(require, module, exports) {
+__DEFINE__(1699834100239, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -1367,8 +1367,8 @@ __DEFINE__(1699338904725, function(require, module, exports) {
 	return CryptoJS.enc.Utf16;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904726, function(require, module, exports) {
+__DEFINE__(1699834100240, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -1505,8 +1505,8 @@ __DEFINE__(1699338904726, function(require, module, exports) {
 	return CryptoJS.enc.Base64;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904727, function(require, module, exports) {
+__DEFINE__(1699834100241, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -1655,8 +1655,8 @@ __DEFINE__(1699338904727, function(require, module, exports) {
 	return CryptoJS.enc.Base64url;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904728, function(require, module, exports) {
+__DEFINE__(1699834100242, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -1925,8 +1925,8 @@ __DEFINE__(1699338904728, function(require, module, exports) {
 	return CryptoJS.MD5;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904729, function(require, module, exports) {
+__DEFINE__(1699834100243, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -2077,8 +2077,8 @@ __DEFINE__(1699338904729, function(require, module, exports) {
 	return CryptoJS.SHA1;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904730, function(require, module, exports) {
+__DEFINE__(1699834100244, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -2278,8 +2278,8 @@ __DEFINE__(1699338904730, function(require, module, exports) {
 	return CryptoJS.SHA256;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904731, function(require, module, exports) {
+__DEFINE__(1699834100245, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -2360,8 +2360,8 @@ __DEFINE__(1699338904731, function(require, module, exports) {
 	return CryptoJS.SHA224;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722,"./sha256":1699338904730}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236,"./sha256":1699834100244}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904732, function(require, module, exports) {
+__DEFINE__(1699834100246, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -2688,8 +2688,8 @@ __DEFINE__(1699338904732, function(require, module, exports) {
 	return CryptoJS.SHA512;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722,"./x64-core":1699338904723}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236,"./x64-core":1699834100237}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904733, function(require, module, exports) {
+__DEFINE__(1699834100247, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -2773,8 +2773,8 @@ __DEFINE__(1699338904733, function(require, module, exports) {
 	return CryptoJS.SHA384;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722,"./x64-core":1699338904723,"./sha512":1699338904732}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236,"./x64-core":1699834100237,"./sha512":1699834100246}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904734, function(require, module, exports) {
+__DEFINE__(1699834100248, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -3101,8 +3101,8 @@ __DEFINE__(1699338904734, function(require, module, exports) {
 	return CryptoJS.SHA3;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722,"./x64-core":1699338904723}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236,"./x64-core":1699834100237}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904735, function(require, module, exports) {
+__DEFINE__(1699834100249, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -3370,8 +3370,8 @@ __DEFINE__(1699338904735, function(require, module, exports) {
 	return CryptoJS.RIPEMD160;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904736, function(require, module, exports) {
+__DEFINE__(1699834100250, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -3515,8 +3515,8 @@ __DEFINE__(1699338904736, function(require, module, exports) {
 
 
 }));
-}, function(modId) { var map = {"./core":1699338904722}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904737, function(require, module, exports) {
+__DEFINE__(1699834100251, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -3662,8 +3662,8 @@ __DEFINE__(1699338904737, function(require, module, exports) {
 	return CryptoJS.PBKDF2;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722,"./sha256":1699338904730,"./hmac":1699338904736}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236,"./sha256":1699834100244,"./hmac":1699834100250}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904738, function(require, module, exports) {
+__DEFINE__(1699834100252, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -3798,8 +3798,8 @@ __DEFINE__(1699338904738, function(require, module, exports) {
 	return CryptoJS.EvpKDF;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722,"./sha1":1699338904729,"./hmac":1699338904736}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236,"./sha1":1699834100243,"./hmac":1699834100250}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904739, function(require, module, exports) {
+__DEFINE__(1699834100253, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -4695,8 +4695,8 @@ __DEFINE__(1699338904739, function(require, module, exports) {
 
 
 }));
-}, function(modId) { var map = {"./core":1699338904722,"./evpkdf":1699338904738}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236,"./evpkdf":1699834100252}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904740, function(require, module, exports) {
+__DEFINE__(1699834100254, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -4777,8 +4777,8 @@ __DEFINE__(1699338904740, function(require, module, exports) {
 	return CryptoJS.mode.CFB;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722,"./cipher-core":1699338904739}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236,"./cipher-core":1699834100253}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904741, function(require, module, exports) {
+__DEFINE__(1699834100255, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -4837,8 +4837,8 @@ __DEFINE__(1699338904741, function(require, module, exports) {
 	return CryptoJS.mode.CTR;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722,"./cipher-core":1699338904739}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236,"./cipher-core":1699834100253}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904742, function(require, module, exports) {
+__DEFINE__(1699834100256, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -4955,8 +4955,8 @@ __DEFINE__(1699338904742, function(require, module, exports) {
 	return CryptoJS.mode.CTRGladman;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722,"./cipher-core":1699338904739}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236,"./cipher-core":1699834100253}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904743, function(require, module, exports) {
+__DEFINE__(1699834100257, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5011,8 +5011,8 @@ __DEFINE__(1699338904743, function(require, module, exports) {
 	return CryptoJS.mode.OFB;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722,"./cipher-core":1699338904739}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236,"./cipher-core":1699834100253}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904744, function(require, module, exports) {
+__DEFINE__(1699834100258, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5053,8 +5053,8 @@ __DEFINE__(1699338904744, function(require, module, exports) {
 	return CryptoJS.mode.ECB;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722,"./cipher-core":1699338904739}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236,"./cipher-core":1699834100253}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904745, function(require, module, exports) {
+__DEFINE__(1699834100259, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5104,8 +5104,8 @@ __DEFINE__(1699338904745, function(require, module, exports) {
 	return CryptoJS.pad.Ansix923;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722,"./cipher-core":1699338904739}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236,"./cipher-core":1699834100253}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904746, function(require, module, exports) {
+__DEFINE__(1699834100260, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5150,8 +5150,8 @@ __DEFINE__(1699338904746, function(require, module, exports) {
 	return CryptoJS.pad.Iso10126;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722,"./cipher-core":1699338904739}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236,"./cipher-core":1699834100253}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904747, function(require, module, exports) {
+__DEFINE__(1699834100261, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5192,8 +5192,8 @@ __DEFINE__(1699338904747, function(require, module, exports) {
 	return CryptoJS.pad.Iso97971;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722,"./cipher-core":1699338904739}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236,"./cipher-core":1699834100253}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904748, function(require, module, exports) {
+__DEFINE__(1699834100262, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5241,8 +5241,8 @@ __DEFINE__(1699338904748, function(require, module, exports) {
 	return CryptoJS.pad.ZeroPadding;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722,"./cipher-core":1699338904739}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236,"./cipher-core":1699834100253}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904749, function(require, module, exports) {
+__DEFINE__(1699834100263, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5273,8 +5273,8 @@ __DEFINE__(1699338904749, function(require, module, exports) {
 	return CryptoJS.pad.NoPadding;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722,"./cipher-core":1699338904739}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236,"./cipher-core":1699834100253}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904750, function(require, module, exports) {
+__DEFINE__(1699834100264, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5341,8 +5341,8 @@ __DEFINE__(1699338904750, function(require, module, exports) {
 	return CryptoJS.format.Hex;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722,"./cipher-core":1699338904739}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236,"./cipher-core":1699834100253}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904751, function(require, module, exports) {
+__DEFINE__(1699834100265, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5577,8 +5577,8 @@ __DEFINE__(1699338904751, function(require, module, exports) {
 	return CryptoJS.AES;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722,"./enc-base64":1699338904726,"./md5":1699338904728,"./evpkdf":1699338904738,"./cipher-core":1699338904739}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236,"./enc-base64":1699834100240,"./md5":1699834100242,"./evpkdf":1699834100252,"./cipher-core":1699834100253}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904752, function(require, module, exports) {
+__DEFINE__(1699834100266, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -6358,8 +6358,8 @@ __DEFINE__(1699338904752, function(require, module, exports) {
 	return CryptoJS.TripleDES;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722,"./enc-base64":1699338904726,"./md5":1699338904728,"./evpkdf":1699338904738,"./cipher-core":1699338904739}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236,"./enc-base64":1699834100240,"./md5":1699834100242,"./evpkdf":1699834100252,"./cipher-core":1699834100253}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904753, function(require, module, exports) {
+__DEFINE__(1699834100267, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -6499,8 +6499,8 @@ __DEFINE__(1699338904753, function(require, module, exports) {
 	return CryptoJS.RC4;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722,"./enc-base64":1699338904726,"./md5":1699338904728,"./evpkdf":1699338904738,"./cipher-core":1699338904739}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236,"./enc-base64":1699834100240,"./md5":1699834100242,"./evpkdf":1699834100252,"./cipher-core":1699834100253}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904754, function(require, module, exports) {
+__DEFINE__(1699834100268, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -6693,8 +6693,8 @@ __DEFINE__(1699338904754, function(require, module, exports) {
 	return CryptoJS.Rabbit;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722,"./enc-base64":1699338904726,"./md5":1699338904728,"./evpkdf":1699338904738,"./cipher-core":1699338904739}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236,"./enc-base64":1699834100240,"./md5":1699834100242,"./evpkdf":1699834100252,"./cipher-core":1699834100253}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904755, function(require, module, exports) {
+__DEFINE__(1699834100269, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -6885,8 +6885,8 @@ __DEFINE__(1699338904755, function(require, module, exports) {
 	return CryptoJS.RabbitLegacy;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722,"./enc-base64":1699338904726,"./md5":1699338904728,"./evpkdf":1699338904738,"./cipher-core":1699338904739}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236,"./enc-base64":1699834100240,"./md5":1699834100242,"./evpkdf":1699834100252,"./cipher-core":1699834100253}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1699338904756, function(require, module, exports) {
+__DEFINE__(1699834100270, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -7358,8 +7358,8 @@ __DEFINE__(1699338904756, function(require, module, exports) {
 	return CryptoJS.Blowfish;
 
 }));
-}, function(modId) { var map = {"./core":1699338904722,"./enc-base64":1699338904726,"./md5":1699338904728,"./evpkdf":1699338904738,"./cipher-core":1699338904739}; return __REQUIRE__(map[modId], modId); })
+}, function(modId) { var map = {"./core":1699834100236,"./enc-base64":1699834100240,"./md5":1699834100242,"./evpkdf":1699834100252,"./cipher-core":1699834100253}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1699338904721);
+return __REQUIRE__(1699834100235);
 })()
 //miniprogram-npm-outsideDeps=["crypto"]
 //# sourceMappingURL=index.js.map

src/miniprogram-2/pages/history/history.js

@@ -66,46 +66,20 @@
 // var fun = function(){//匿名函数
 //   console.log("he");
 // }
+const util = require('../../utils/util.js')
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    history:[]
+    his:[]
-  },
-  bindmaiViewTap() {
-    wx.redirectTo({
-      url: '../main/main'
-    })
-  },
-  bindhisViewTap(){
-    wx.redirectTo({
-      url: '../history/history'
-    })
-  },
-  bindrecViewTap(){
-    wx.redirectTo({
-      url: '../recommend/recommend'
-    })
-  },
-  bindmacViewTap(){
-    wx.redirectTo({
-      url: '../match/match'
-    })
   },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    this.setData({
+
-      logs: (wx.getStorageSync('history') || []).map(log => {
-        return {
-          date: util.formatTime(new Date(log)),
-          history:this.data.history
-        }
-      })
-    })
   },
 
   /**
@@ -119,7 +93,11 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
-
+    this.setData({
+      his:wx.getStorageSync('his').reverse()
+    })
+    console.log(this.data.his)
+    // console.log(wx.getStorageSync('his'))
   },
 
   /**

src/miniprogram-2/pages/history/history.wxml

@@ -1,21 +1,21 @@
 <!--pages/history/history.wxml-->
 <view class="container">
 	<view class="his_main">
-
+		<!-- <block wx:for="{{history}}">
+      <text class="his-item">{{index + 1}}. {{item}}</text>
+    </block> -->
+    <view wx:for="{{his}}" wx:key="time" wx:for-item="item">
+      <text class="text">{{index+1}}: 您第{{item.index+1}}次化妆\n时间：{{item.time}}\n场景：#{{item.scene}}\n</text>
+      <image src="{{item.image}}"/>
+      <!-- 获取妆容图片、介绍 -->
+      <text></text>
     </view>
-	<!-- <view class="his_navi">
+    <text>{{index}}</text>
-		<view>
-			<text bindtap="bindmaiViewTap" mode="cover">首页</text>
 	</view>
-		<view>
-			<text bindtap="bindmacViewTap" mode="cover">匹配</text>
-		</view>
-		<view>
-			<text bindtap="bindhisViewTap" mode="cover">历史</text>
-		</view>
-		<view>
-			<text bindtap="bindrecViewTap" mode="cover">推荐</text>
-		</view>
-	</view> -->
 </view>
-<text>pages/history/history.wxml</text>
+<!-- <view class="container log-list">
+  <block wx:for="{{logs}}" wx:key="timeStamp" wx:for-item="log">
+    <text class="log-item">{{index + 1}}. {{log.date}}</text>
+  </block>
+  <text>{{index}}</text>
+</view> -->

src/miniprogram-2/pages/index/index.js

@@ -23,21 +23,21 @@ Page({
       url: '../main/main'
     })
   },
-  bindhisViewTap(){
+  // bindhisViewTap(){
-    wx.redirectTo({
+  //   wx.redirectTo({
-      url: '../history/history'
+  //     url: '../history/history'
-    })
+  //   })
-  },
+  // },
-  bindrecViewTap(){
+  // bindrecViewTap(){
-    wx.switchTab({
+  //   wx.switchTab({
-      url: '../recommend/recommend'
+  //     url: '../recommend/recommend'
-    })
+  //   })
-  },
+  // },
-  bindmacViewTap(){
+  // bindmacViewTap(){
-    wx.redirectTo({
+  //   wx.redirectTo({
-      url: '../match/match'
+  //     url: '../match/match'
-    })
+  //   })
-  },
+  // },
   onLoad() {
     if (wx.getUserProfile) {
       this.setData({
@@ -92,7 +92,6 @@ Page({
   
   
   onLoad(options) {
-  
         this.setData({
             imageUrl1: '../images/main.jpg',
             selectedImageUrl1: '../images/main.jpg',

src/miniprogram-2/pages/logs/logs.js

@@ -7,12 +7,17 @@ Page({
   },
   onLoad() {
     this.setData({
+      //'||'符号当左侧数为空返回右侧数，但会有假值，可使用'??'
+      //m = ()=>{}匿名函数定义,m()调用
       logs: (wx.getStorageSync('logs') || []).map(log => {
         return {
           date: util.formatTime(new Date(log)),
+          //2023/11/14 22:42:08
           timeStamp: log
         }
       })
     })
+    if(this.log)
+      console.log(this.logs[0].data)
   }
 })

src/miniprogram-2/pages/match/photo.js

@@ -1,5 +1,6 @@
 // pages/match/photo.js
 const client = require("../../utils/client");
+const util = require("../../utils/util.js");
 
 Page({
 
@@ -11,6 +12,8 @@ Page({
     // src:"",
     scene:"",
     sceneNum:"",
+    msg:{},
+    user:"",
     imgUrl:"http://viapi-test.oss-cn-shanghai.aliyuncs.com/viapi-3.0domepic/facebody/PedestrianDetectAttribute/PedestrianDetectAttribute1.jpg"//这个是实际发送给阿里云的图片链接，到时候需要开发自己将本地或者拍照的照片转换成oss链接
   },
   return(){
@@ -18,6 +21,13 @@ Page({
       delta: 1
     })
   },
+  toMatch(){
+    wx.redirectTo({
+      url: '/pages/match/result',
+    })
+    wx.setStorageSync('matchTime', util.formatTime(new Date()))
+    console.log(wx.getStorageSync('matchTime'));
+  },
   
   /**
    * 生命周期函数--监听页面加载
@@ -27,12 +37,14 @@ Page({
     var img = wx.getStorageSync('imgFilePath');
     var sce = wx.getStorageSync('scene');
     var scen = wx.getStorageSync('sceneNum');
+    var msg = wx.getStorageSync('msg')
     console.log(sce);
     var that = this;
     that.setData({
       imgFilePath: img,
       scene:sce,
       sceneNum:scen,
+      msg:msg,
     })
     this.callApi()
   },
@@ -40,8 +52,35 @@ Page({
    * 调用阿里云人体结构属性识别
    */
   callApi: function() {
+    var this_=this;
+    var message;
+    var msg = {age:"",gender:"",uppercolor:"",upperwear:"",lowercolor:"",lowerwear:"",glasses:"",handbag:"",shoulderbag:"",hat:""}
+    // var age,gender;
+    // var uppercolor,upperwear,lowercolor,lowerwear;
+    // var glasses,handbag,shoulderbag,hat;
     client.callRecognizePersonFace(wx, this.data.imgUrl,function(result) {
-      console.log(result);
+      message=result.Data.Attributes[0]
+      console.log(message);
+      // console.log(msg);
+      // console.log(message.UpperColor.Name);
+      msg.age=message.Age.Name;
+      msg.gender=message.Gender.Name;
+      msg.uppercolor=message.UpperColor.Name;
+      msg.upperwear=message.UpperWear.Name;
+      msg.lowercolor=message.LowerColor.Name;
+      msg.lowerwear=message.LowerWear.Name;
+      msg.glasses=message.Glasses.Name;
+      msg.handbag=message.Handbag.Name;
+      msg.shoulderbag=message.ShoulderBag.Name;
+      msg.hat=message.Hat.Name;
+      wx.setStorageSync('msg', msg);
+      console.log(wx.getStorageSync('msg'));
+      if(wx.getStorageSync('msg').gender=="female"){
+        this_.setData({
+          user:"小美"
+        })
+      }else{this_.setData({user:"小帅"})}
+      
     }.bind(this));
   },
   /**

src/miniprogram-2/pages/match/photo.wxml

@@ -1,12 +1,17 @@
 <!--pages/match/photo.wxml-->
 <view class='container'>
   <view class='imgwindow'>
-    <view class='scewindow' src='{{scene}}'>
-      <text>场景：{{scene}}</text>
-    </view>
     <image class='imgwindow' mode='widthFix' src='{{imgFilePath}}'/>
 	<!-- 图片预览 -->
-    <text bind:tap="return" type="primary">返回</text>
+    <view class='scewindow' src='{{scene}}'>
-    <text bind:tap="toMatch">设计妆容</text>
+      <text class="text" style="font-weight: bolder">场景：</text>
+      <text class="text">{{scene}}</text>
+    </view>
+    <view class="message" src='{{msg}}{{user}}'>
+      <text class="text" style="font-weight: bolder">服装:\n</text>
+      <text class="text">{{user}}今日穿{{msg.uppercolor}}色{{msg.upperwear}}和{{msg.lowercolor}}色{{msg.lowerwear}}</text>
+    </view>
+    <button bind:tap="return" type="primary">返回</button>
+    <button bind:tap="toMatch" type="primary">设计妆容</button>
   </view>
 </view>

src/miniprogram-2/pages/match/photo.wxss

@@ -1 +1,20 @@
 /* pages/match/photo.wxss */
+.text {
+	/* 字体大小 */
+	font-size: 15px;
+	/* 字体颜色 */
+	color: black;
+	/* 字体风格-粗细 */
+	/*font-weight: bold;*/
+	/*段落排版--首字缩进*/
+	text-indent: 2em;
+	/*段落排版--行间距（行高）*/
+	line-height: 1.5em;
+	/*段落排版--中文字间距*/
+	letter-spacing: 1px;
+	/*字母间距*/
+	word-spacing: 4px;
+	/*文字对齐 right 、left 、center  */
+	text-align: left;
+
+}

src/miniprogram-2/pages/match/result.js

@@ -5,7 +5,9 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    index:0,
+    his:[],
+    gongxi:"../images/恭喜.webp",
   },
 
   /**
@@ -26,7 +28,33 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
-
+    var this_=this;
+    var img=wx.getStorageSync('imgFilePath');
+    var sce=wx.getStorageSync('scene');
+    var time=wx.getStorageSync('matchTime');
+    // console.log(time);
+
+    if(!wx.getStorageSync('his'))
+      wx.setStorageSync('his', this_.data.his);
+    var _his=wx.getStorageSync('his');
+    if(!wx.getStorageSync('index'))
+      wx.setStorageSync('index', this_.data.index);
+    var i=wx.getStorageSync('index');
+    let his_={"index":i,"time":time,"image":img,"scene":sce};
+    if(!_his){
+      _his=[his_];
+    }else{
+      _his.push(his_);
+    }
+    this_.setData({
+      his:_his,
+      index:i+1
+    })
+    console.log(this.data.his[0]);
+    // console.log(this.data.index);
+    wx.setStorageSync('his', this.data.his);
+    wx.setStorageSync('index', this.data.index)
+    console.log(wx.getStorageSync('his')[0])
   },
 
   /**

src/miniprogram-2/pages/match/result.wxml

@@ -1,2 +1,12 @@
 <!--pages/match/result.wxml-->
-<text>pages/match/result.wxml</text>
+<view class="container">
+	<view class="res_main" src="{{index}}">
+		<view class="row">
+			<image class="icon" src="{{gongxi}}" mode="widthFix"/>
+			<text class="text" style="text-align: center;">恭喜您！！这是您第{{index}}次完成妆容~</text>
+		</view>
+		<view class="res"> 
+		</view>
+
+	</view>
+</view>

src/miniprogram-2/pages/match/result.wxss

@@ -1 +1,10 @@
 /* pages/match/result.wxss */
+.row{
+	flex-direction:row;
+	justify-content:center;
+}
+.icon{
+		size: 30px;
+		width: 37px; /*控制裁剪区域大小*/
+		/* height: 30px; */
+}

src/miniprogram-2/pages/recommend/rec1.wxml

@@ -2,16 +2,16 @@
 <view class="container">
 	<view class="rec1">
 		<image src="{{r11}}"style="height:100%" mode="widthFix"></image>
-		<text class="text">黄黑皮低饱和清冷妆这么高级！</text>
+		<text class="text">黄黑皮低饱和清冷妆这么高级！\n</text>
+		<text class="text2" style="color: lightcoral;font-size: medium;">-工作通勤-</text>
 <text class="text2">
-    这种低饱和妆容真的很有感觉！
+这种低饱和妆容真的很有感觉！
-
 🌟大面积的腮红是重点（灰粉色会更自然）
-
 眼妆往细长狐狸眼的方向靠
 卧蚕也要画细长 眼妆浅色大面积晕染出上扬的形状就OK
-真的很有感觉！黄黑皮姐妹速速学起来！
+真的很有感觉！黄黑皮姐妹速速学起来！</text>
-#黄黑皮 #黄黑皮妆容 #妆容分享 #今日妆容 #清冷感妆容
+	<text class="text2" style="font-size: smaller;">
+#黄黑皮 #清冷感
 </text>
 	</view>
 </view>

src/miniprogram-2/pages/recommend/rec2.wxml

@@ -2,7 +2,8 @@
 <view class="container">
 	<view class="rec2">
 		<image src="{{r21}}" style="height:100%" mode="widthFix"></image>
-		<text class = "text">美拉德是我的舒适区🍁</text>
+		<text class = "text">美拉德是我的舒适区🍁\n</text>
+		<text class="text2" style="color: chocolate;font-size: medium;">-游玩娱乐-</text>
 <text class = "text2">
 	秋日当然不能少了棕色系啦！
 	美拉德火是有道理的～
@@ -10,12 +11,13 @@
 	妆容整体就是棕色调为主
 	口红选择了MAC新出的热吻棒
 	这三只颜色和秋冬适配度太高了
-	#67狂野棕：冷冽裸茶棕 美区辣妹属性大开
+	#67狂野棕：冷冽裸茶棕#67狂野棕：冷冽裸茶棕 美区辣妹属性大开
 	#69痴情咖：复古焦糖棕 爆浆太妃糖 内里都是惊喜
 	#79任性莓：甜熟浆果迸发热辣莓色 灰调复古感 时髦爆棚
 	质地很特别 上嘴迅速成膜不拔干
 	很爱这种不显唇纹的哑光感吃饭也不用担心掉色严重
-	24小时在线 谁能不爱呢
+	24小时在线 谁能不爱呢\n</text>
+	<text class="text2" style="font-size: smaller;">
 	#派对party #秋季 #冬季
 </text>
 	</view>

src/miniprogram-2/pages/recommend/rec3.wxml

@@ -2,10 +2,12 @@
 <view class="container">
 	<view class="rec3">
 		<image src="{{r31}}" style="height:100%" mode="widthFix"></image>
-		<text class = "text">新中式｜水是眼波横</text>
+		<text class = "text">新中式｜水是眼波横\n</text>
+		<text class="text2" style="color: firebrick;font-size: medium;">-酒席宴会-</text>
 <text class = "text2">
 1、唇妆涂的是TF黑金唇镜 22朝露，薄涂是很纯欲的樱花粉，厚涂是气质的玫瑰色。上嘴甜味氛围感拉满，很适合搭配白开水伪素颜淡妆。
-2、妆容统一杏粉色调，眼妆用消肿色简单带过，点彩刷沾取暖调粉色腮红，在面中大面积铺色打造白里透红的妆效
+2、妆容统一杏粉色调，眼妆用消肿色简单带过，点彩刷沾取暖调粉色腮红，在面中大面积铺色打造白里透红的妆效</text>
+	<text class="text2" style="font-size: smaller;">
 #工作通勤 #春季</text>
 	</view>
 </view>

src/miniprogram-2/pages/recommend/rec4.js

@@ -0,0 +1,66 @@
+// pages/recommend/rec4.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    r41:"../images/recom_1_4.webp"
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

src/miniprogram-2/pages/recommend/rec4.json

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

src/miniprogram-2/pages/recommend/rec4.wxml

@@ -0,0 +1,26 @@
+<!--pages/recommend/rec4.wxml-->
+<view class="container">
+	<view class="rec3">
+		<image src="{{r41}}" style="height:100%" mode="widthFix"></image>
+		<text class = "text">【艺考】上镜妆造思路超详细教程在此\n</text>
+		<text class="text2" style="color: firebrick;font-size: medium;">-工作通勤-</text>
+<text class = "text2">
+	虽然只有一个宝宝私信问 我也要说一下
+属于是源自于多个自我介绍视频
+和本老学姐当年的播音艺考经验
+如图 这是我接一些通告的自我介绍视频截图出来的
+凡是上镜 面对镜头表现的妆造
+大概需要注意以下几点
+1.不穿过分复杂的服装
+（身材不过分好的不用考虑邋遢宽松款）
+2.妆容主要目的在遮瑕和放大优点 不用过分纠结缺点
+3.脸的比例尽量三庭五眼
+4.妆容和服装风格统一
+5.思路：光线和背景氛围大于服装大于发型大于妆容
+其他具体详见图片～
+快收藏起来吧
+</text>
+	<text class="text2" style="font-size: smaller;">
+#工作通勤 #春季</text>
+	</view>
+</view>

src/miniprogram-2/pages/recommend/rec4.wxss

@@ -0,0 +1 @@
+/* pages/recommend/rec4.wxss */

src/miniprogram-2/pages/recommend/rec5.js

@@ -0,0 +1,66 @@
+// pages/recommend/rec5.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

src/miniprogram-2/pages/recommend/rec5.json

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

src/miniprogram-2/pages/recommend/rec5.wxml

@@ -0,0 +1,2 @@
+<!--pages/recommend/rec5.wxml-->
+<text>pages/recommend/rec5.wxml</text>

src/miniprogram-2/pages/recommend/rec5.wxss

@@ -0,0 +1 @@
+/* pages/recommend/rec5.wxss */

src/miniprogram-2/pages/recommend/recommend.js

@@ -7,6 +7,8 @@ Page({
   data: {
     rm4:"../images/rec_main_4.jpg",
     rm5:"../images/rec_main_5.jpg",
+    rm6:"../images/rec_main_6.png",
+    rm7:"../images/rec_main_1.jpg",
     indicatorDots: true,
     autoplay: true,
     interval: 5000,
@@ -32,6 +34,16 @@ Page({
       url:'/pages/recommend/rec3'
     })
   },
+  bindrec4ViewTap(){
+    wx.navigateTo({
+      url:'/pages/recommend/rec4'
+    })
+  },
+  bindrec5ViewTap(){
+    wx.navigateTo({
+      url:'/pages/recommend/rec5'
+    })
+  },
   bindmaiViewTap() {
     wx.redirectTo({
       url: '../main/main'

src/miniprogram-2/pages/recommend/recommend.wxml

@@ -24,6 +24,10 @@
 					</view>
         </view>
 				<view class="block">
+					<view class="rec_main_4" bind:tap="bindrec4ViewTap">
+						<image class="pic"  mode="widthFix" src="{{rm6}} "/>
+						<text class="title">第三个推文</text>
+					</view>
 				</view>
       </view>
       <view class="right">
@@ -34,6 +38,10 @@
 					</view>
         </view>
 				<view class="block">
+					<view class="rec_main_4" bind:tap="bindrec5ViewTap">
+						<image class="pic"  mode="widthFix" src="{{rm7}} "/>
+						<text class="title">第四个推文</text>
+					</view>
 				</view>
       </view>
     </view>