From 98aea6c3c436978d2e10caa44d41c7da6b67bfa4 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 8 Feb 2023 16:56:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=20=E6=9C=88=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.js                                     |  11 +-
 node_modules/uview-ui/package.json            | 104 ++-
 package-lock.json                             | 259 +-----
 .../pages/careCenter/careCenter.vue           |  23 +-
 .../pages/commonService/commonCenter.vue      |  11 +-
 .../packageCarecenter/pages/home/home.vue     | 188 ++++-
 .../packageCarecenter/static/carecenter.png   | Bin 0 -> 11108 bytes
 .../packageCarecenter/static/commoncenter.png | Bin 0 -> 10942 bytes
 pages/active/active.vue                       |  10 +-
 pages/active/detail.vue                       |  38 +-
 pages/active/my.vue                           | 754 +++++++++++-------
 pages/my/my.vue                               |  15 +-
 12 files changed, 797 insertions(+), 616 deletions(-)
 create mode 100644 packages/packageCarecenter/static/carecenter.png
 create mode 100644 packages/packageCarecenter/static/commoncenter.png

diff --git a/config.js b/config.js
index 806801c..c483e18 100644
--- a/config.js
+++ b/config.js
@@ -2,10 +2,13 @@ export const appConfig = {
 	appId: 'wx9b4762770771d98a', //孕育邦
 	//appId:"wx3dc65ce9b588727a",//孕育咨询
 	//baseUrl: 'http://yunyubang.localhost.com',
-	baseUrl:'https://yunyubang.ali251.langye.net',// 'https://yunyubang2021.langye.net', //孕育邦
-	//baseUrl: 'https://yybtest.ali251.langye.net',
-	newBaseUrl: 'https://yunyubang.ali251.langye.net',
-	//newBaseUrl: 'http://yybtest.ali251.langye.net',
+	
+	//baseUrl:'https://yunyubang.ali251.langye.net',// 'https://yunyubang2021.langye.net', //孕育邦
+	baseUrl: 'https://yybtest.ali251.langye.net',
+	
+	// newBaseUrl: 'https://yunyubang.ali251.langye.net',
+	newBaseUrl: 'http://yybtest.ali251.langye.net',
+	
 	//baseUrl:'https://yybtest2021.langye.net',//孕育咨询
 	openidInfoKey: 'openid_info_yunyubang'
 }
diff --git a/node_modules/uview-ui/package.json b/node_modules/uview-ui/package.json
index e613705..bc25b9c 100644
--- a/node_modules/uview-ui/package.json
+++ b/node_modules/uview-ui/package.json
@@ -1,39 +1,69 @@
 {
-	"name": "uview-ui",
-	"version": "1.8.6",
-	"description": "uView UI，是uni-app生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水",
-	"main": "index.js",
-	"keywords": [
-		"uview",
-		"uView",
-		"uni-app",
-		"uni-app ui",
-		"uniapp",
-		"uviewui",
-		"uview ui",
-		"uviewUI",
-		"uViewui",
-		"uViewUI",
-		"uView UI",
-		"uni ui",
-		"uni UI",
-		"uniapp ui",
-		"ui",
-		"UI框架",
-		"uniapp ui框架",
-		"uniapp UI"
-	],
-	"scripts": {
-		"test": "echo \"Error: no test specified\" && exit 1"
-	},
-	"repository": {
-		"type": "git",
-		"url": ""
-	},
-	"devDependencies": {
-		"node-sass": "^4.14.0",
-		"sass-loader": "^8.0.2"
-	},
-	"author": "uView",
-	"license": "MIT"
+  "_args": [
+    [
+      "uview-ui@1.8.6",
+      "/Users/mac/Documents/朗业/2022/y-孕育邦/yunyubang-miniprogram"
+    ]
+  ],
+  "_from": "uview-ui@1.8.6",
+  "_id": "uview-ui@1.8.6",
+  "_inBundle": false,
+  "_integrity": "sha512-R93WU6htCP2Fpw668ABpF7Y8UqIx66pUKGAwBYLDkbnIldyKWkjtfJzqjFm22tF41ty6FVB+82L+gIL775c5LQ==",
+  "_location": "/uview-ui",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "uview-ui@1.8.6",
+    "name": "uview-ui",
+    "escapedName": "uview-ui",
+    "rawSpec": "1.8.6",
+    "saveSpec": null,
+    "fetchSpec": "1.8.6"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.8.6.tgz",
+  "_spec": "1.8.6",
+  "_where": "/Users/mac/Documents/朗业/2022/y-孕育邦/yunyubang-miniprogram",
+  "author": {
+    "name": "uView"
+  },
+  "description": "uView UI，是uni-app生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水",
+  "devDependencies": {
+    "node-sass": "^4.14.0",
+    "sass-loader": "^8.0.2"
+  },
+  "keywords": [
+    "uview",
+    "uView",
+    "uni-app",
+    "uni-app ui",
+    "uniapp",
+    "uviewui",
+    "uview ui",
+    "uviewUI",
+    "uViewui",
+    "uViewUI",
+    "uView UI",
+    "uni ui",
+    "uni UI",
+    "uniapp ui",
+    "ui",
+    "UI框架",
+    "uniapp ui框架",
+    "uniapp UI"
+  ],
+  "license": "MIT",
+  "main": "index.js",
+  "name": "uview-ui",
+  "repository": {
+    "type": "git",
+    "url": ""
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "version": "1.8.6"
 }
diff --git a/package-lock.json b/package-lock.json
index a126458..7279431 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,270 +1,13 @@
 {
     "name": "下拉多选、单选",
     "version": "1.0.5",
-    "lockfileVersion": 2,
+    "lockfileVersion": 1,
     "requires": true,
-    "packages": {
-        "": {
-            "name": "下拉多选、单选",
-            "version": "1.0.5",
-            "dependencies": {
-                "uview": "^0.1.0",
-                "uview-ui": "^1.8.4"
-            }
-        },
-        "node_modules/@babel/parser": {
-            "version": "7.18.10",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.10.tgz",
-            "integrity": "sha512-TYk3OA0HKL6qNryUayb5UUEhM/rkOQozIBEA5ITXh5DWrSp0TlUQXMyZmnWxG/DizSWBeeQ0Zbc5z8UGaaqoeg==",
-            "peer": true,
-            "bin": {
-                "parser": "bin/babel-parser.js"
-            },
-            "engines": {
-                "node": ">=6.0.0"
-            }
-        },
-        "node_modules/@vue/compiler-sfc": {
-            "version": "2.7.8",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.8.tgz",
-            "integrity": "sha512-2DK4YWKfgLnW9VDR9gnju1gcYRk3flKj8UNsms7fsRmFcg35slVTZEkqwBtX+wJBXaamFfn6NxSsZh3h12Ix/Q==",
-            "peer": true,
-            "dependencies": {
-                "@babel/parser": "^7.18.4",
-                "postcss": "^8.4.14",
-                "source-map": "^0.6.1"
-            }
-        },
-        "node_modules/async-validator": {
-            "version": "1.12.2",
-            "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.12.2.tgz",
-            "integrity": "sha512-57EETfCPFiB7M4QscvQzWSGNsmtkjjzZv318SK1CBlstk+hycV72ocjriMOOM48HjvmoAoJGpJNjC7Z76RlnZA=="
-        },
-        "node_modules/core-js": {
-            "version": "2.6.12",
-            "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-            "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-            "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-            "hasInstallScript": true
-        },
-        "node_modules/csstype": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz",
-            "integrity": "sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==",
-            "peer": true
-        },
-        "node_modules/deepmerge": {
-            "version": "1.5.2",
-            "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
-            "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/nanoid": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-            "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-            "peer": true,
-            "bin": {
-                "nanoid": "bin/nanoid.cjs"
-            },
-            "engines": {
-                "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-            }
-        },
-        "node_modules/picocolors": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-            "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-            "peer": true
-        },
-        "node_modules/popper.js": {
-            "version": "0.6.4",
-            "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-0.6.4.tgz",
-            "integrity": "sha512-KGPaJaw9822VnignV8HuPdVv0C66d3iC5YbdPaty/57LPmBqmbZX39n2gqN/bDeOtGHzsOA2AA9f9DH2Y0z6AQ==",
-            "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1"
-        },
-        "node_modules/postcss": {
-            "version": "8.4.14",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
-            "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
-            "funding": [
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/postcss/"
-                },
-                {
-                    "type": "tidelift",
-                    "url": "https://tidelift.com/funding/github/npm/postcss"
-                }
-            ],
-            "peer": true,
-            "dependencies": {
-                "nanoid": "^3.3.4",
-                "picocolors": "^1.0.0",
-                "source-map-js": "^1.0.2"
-            },
-            "engines": {
-                "node": "^10 || ^12 || >=14"
-            }
-        },
-        "node_modules/source-map": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-            "peer": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/source-map-js": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-            "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-            "peer": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/uview": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/uview/-/uview-0.1.0.tgz",
-            "integrity": "sha512-zvumg1++gN+GpeHVlQAIfMzfFUigKJXma7tgHOcfYgkBp89t6U1j3pgqp9xG9PLz+AmIth9PYk4w36PQ3XVBnA==",
-            "dependencies": {
-                "async-validator": "^1.7.1",
-                "core-js": "^2.4.1",
-                "deepmerge": "^1.5.0",
-                "popper.js": "^0.6.4"
-            },
-            "engines": {
-                "node": ">= 4.0.0",
-                "npm": ">= 3.0.0"
-            },
-            "peerDependencies": {
-                "vue": "^2.4.1"
-            }
-        },
-        "node_modules/uview-ui": {
-            "version": "1.8.6",
-            "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.8.6.tgz",
-            "integrity": "sha512-R93WU6htCP2Fpw668ABpF7Y8UqIx66pUKGAwBYLDkbnIldyKWkjtfJzqjFm22tF41ty6FVB+82L+gIL775c5LQ=="
-        },
-        "node_modules/vue": {
-            "version": "2.7.8",
-            "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.8.tgz",
-            "integrity": "sha512-ncwlZx5qOcn754bCu5/tS/IWPhXHopfit79cx+uIlLMyt3vCMGcXai5yCG5y+I6cDmEj4ukRYyZail9FTQh7lQ==",
-            "peer": true,
-            "dependencies": {
-                "@vue/compiler-sfc": "2.7.8",
-                "csstype": "^3.1.0"
-            }
-        }
-    },
     "dependencies": {
-        "@babel/parser": {
-            "version": "7.18.10",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.10.tgz",
-            "integrity": "sha512-TYk3OA0HKL6qNryUayb5UUEhM/rkOQozIBEA5ITXh5DWrSp0TlUQXMyZmnWxG/DizSWBeeQ0Zbc5z8UGaaqoeg==",
-            "peer": true
-        },
-        "@vue/compiler-sfc": {
-            "version": "2.7.8",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.8.tgz",
-            "integrity": "sha512-2DK4YWKfgLnW9VDR9gnju1gcYRk3flKj8UNsms7fsRmFcg35slVTZEkqwBtX+wJBXaamFfn6NxSsZh3h12Ix/Q==",
-            "peer": true,
-            "requires": {
-                "@babel/parser": "^7.18.4",
-                "postcss": "^8.4.14",
-                "source-map": "^0.6.1"
-            }
-        },
-        "async-validator": {
-            "version": "1.12.2",
-            "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.12.2.tgz",
-            "integrity": "sha512-57EETfCPFiB7M4QscvQzWSGNsmtkjjzZv318SK1CBlstk+hycV72ocjriMOOM48HjvmoAoJGpJNjC7Z76RlnZA=="
-        },
-        "core-js": {
-            "version": "2.6.12",
-            "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-            "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
-        },
-        "csstype": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz",
-            "integrity": "sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==",
-            "peer": true
-        },
-        "deepmerge": {
-            "version": "1.5.2",
-            "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
-            "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
-        },
-        "nanoid": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-            "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-            "peer": true
-        },
-        "picocolors": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-            "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-            "peer": true
-        },
-        "popper.js": {
-            "version": "0.6.4",
-            "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-0.6.4.tgz",
-            "integrity": "sha512-KGPaJaw9822VnignV8HuPdVv0C66d3iC5YbdPaty/57LPmBqmbZX39n2gqN/bDeOtGHzsOA2AA9f9DH2Y0z6AQ=="
-        },
-        "postcss": {
-            "version": "8.4.14",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
-            "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
-            "peer": true,
-            "requires": {
-                "nanoid": "^3.3.4",
-                "picocolors": "^1.0.0",
-                "source-map-js": "^1.0.2"
-            }
-        },
-        "source-map": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-            "peer": true
-        },
-        "source-map-js": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-            "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-            "peer": true
-        },
-        "uview": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/uview/-/uview-0.1.0.tgz",
-            "integrity": "sha512-zvumg1++gN+GpeHVlQAIfMzfFUigKJXma7tgHOcfYgkBp89t6U1j3pgqp9xG9PLz+AmIth9PYk4w36PQ3XVBnA==",
-            "requires": {
-                "async-validator": "^1.7.1",
-                "core-js": "^2.4.1",
-                "deepmerge": "^1.5.0",
-                "popper.js": "^0.6.4"
-            }
-        },
         "uview-ui": {
             "version": "1.8.6",
             "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.8.6.tgz",
             "integrity": "sha512-R93WU6htCP2Fpw668ABpF7Y8UqIx66pUKGAwBYLDkbnIldyKWkjtfJzqjFm22tF41ty6FVB+82L+gIL775c5LQ=="
-        },
-        "vue": {
-            "version": "2.7.8",
-            "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.8.tgz",
-            "integrity": "sha512-ncwlZx5qOcn754bCu5/tS/IWPhXHopfit79cx+uIlLMyt3vCMGcXai5yCG5y+I6cDmEj4ukRYyZail9FTQh7lQ==",
-            "peer": true,
-            "requires": {
-                "@vue/compiler-sfc": "2.7.8",
-                "csstype": "^3.1.0"
-            }
         }
     }
 }
diff --git a/packages/packageCarecenter/pages/careCenter/careCenter.vue b/packages/packageCarecenter/pages/careCenter/careCenter.vue
index 72fdb6a..f73d8c8 100644
--- a/packages/packageCarecenter/pages/careCenter/careCenter.vue
+++ b/packages/packageCarecenter/pages/careCenter/careCenter.vue
@@ -1,6 +1,11 @@
 <template>
-	<view class="content">
-		<!-- <image class="careBanner" src="../../static/banner.png"></image> -->
+	<view class="content">
+		<!-- <carehome></carehome> -->
+<!-- 		<view>
+			<image class="careBanner" src="../../static/carecenter.png"></image>
+			<image class="careBanner" src="../../static/commoncenter.png"></image>
+		</view> -->
+		
 		<view class="strategyBox">
 			<view class="strate">
 				<view class="strTit flex_between">
@@ -126,8 +131,12 @@
 	} from '@/utils/weixin.js'
 	import {
 		data
-	} from 'uview-ui/libs/mixin/mixin';
-	export default {
+	} from 'uview-ui/libs/mixin/mixin';
+	// import carehome from '../home/home.vue'
+	export default {
+		// components:{
+		// 	carehome
+		// },
 		data() {
 			return {
 				parameter: {
@@ -409,9 +418,9 @@
 	}
 
 	.careBanner {
-		display: block;
-		width: 690rpx;
-		height: 220rpx;
+		display: inline-block;
+		width: 357rpx;
+		height: 182rpx;
 		margin: 20rpx auto;
 	}
 
diff --git a/packages/packageCarecenter/pages/commonService/commonCenter.vue b/packages/packageCarecenter/pages/commonService/commonCenter.vue
index 861bff8..fda740f 100644
--- a/packages/packageCarecenter/pages/commonService/commonCenter.vue
+++ b/packages/packageCarecenter/pages/commonService/commonCenter.vue
@@ -1,5 +1,6 @@
 <template>
-	<view class="content">
+	<view class="content">
+		<!-- <carehome></carehome> -->
 		<!-- <image class="careBanner" src="../../static/banner.png"></image> -->
 		<view class="strategyBox">
 			<view class="strate">
@@ -126,8 +127,12 @@
 	} from '@/utils/weixin.js'
 	import {
 		data
-	} from 'uview-ui/libs/mixin/mixin';
-	export default {
+	} from 'uview-ui/libs/mixin/mixin';
+	// import carehome from '../home/home.vue'
+	export default {
+		// components:{
+		// 	carehome
+		// },
 		data() {
 			return {
 				paraType: {
diff --git a/packages/packageCarecenter/pages/home/home.vue b/packages/packageCarecenter/pages/home/home.vue
index 53b16bd..8205426 100644
--- a/packages/packageCarecenter/pages/home/home.vue
+++ b/packages/packageCarecenter/pages/home/home.vue
@@ -1,28 +1,202 @@
 <template>
-	<view>
-		<view @click="goto(1)">月子中心</view>
-		<view @click="goto(2)">月嫂</view>
+	<view class="content">
+		<!-- <view @click="goto(1)">月子中心</view>
+		<view @click="goto(2)">月嫂</view> -->
+		<view>
+			<image @click="goto(1)" class="careBanner" src="../../static/carecenter.png"></image>
+			<image @click="goto(2)" class="careBanner" src="../../static/commoncenter.png"></image>
+		</view>
+		<view class="strategyBox">
+			<view class="strate">
+				<view class="strTit flex_between">
+					<view class="strL flex_start">
+						<image src="../../static/icon_gonglve.png"></image><text>月子攻略</text>
+					</view>
+					<!-- <view class="more" @click="toStrategyCenter">更多</view> -->
+				</view>
+				<view class="strCol flex_start" v-for="(item,index) in strategies" :key="item.id"
+					@click="toStrategyDetail(item.id)">
+					<view class="strPic">
+						<image mode="aspectFill" :src="item.cover_picture || '../../static/banner.png'"></image>
+					</view>
+					<view class="strInfo">
+						<view class="h3">{{item.title}}</view>
+						<view class="p" v-if="item.subheading">
+							{{item.subheading}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="bottom-btn">
+			<view class="bottom-btn-boder">
+				<u-image src="/packages/packageCarecenter/static/msg.png" width="39" height="39"></u-image>
+				<u-button :custom-style="btnStyle" :hair-line="false" hover-class="none" open-type="contact">询问客服
+				</u-button>
+			</view>
+		</view>
 	</view>
 </template>
 
 <script>
+	import {
+		weixin
+	} from '@/utils/weixin.js'
 	export default {
 		data() {
 			return {
-				
+				btnStyle: {
+					border: 'none',
+					background: 'transparent',
+					color: '#fff',
+					width: '136rpx',
+					height: '48rpx',
+					fontSize: '34rpx',
+					fontWeight: 400,
+					marginLeft: '20rpx'
+				},
+				strategies: [], //攻略
 			}
 		},
+		mounted(){
+			this.getStrategy();
+		},
 		methods: {
 			goto(type){
 				let url = type==1?"/packages/packageCarecenter/pages/careCenter/careCenter":"/packages/packageCarecenter/pages/commonService/commonCenter?type=maternity";
 				uni.redirectTo({
 					url:url
 				})
-			}
+			},
+			getStrategy() {
+				weixin.request({
+					newUrl: true,
+					api: '/api/member/get-strategy',
+					data: {
+						page: 1,
+						page_size: 5,
+						call_logo: "confinement"
+					},
+					utilSuccess: res => {
+						this.strategies = res.rows
+						console.log(this.strategies);
+					}
+				})
+			},
 		}
 	}
 </script>
 
-<style>
-
+<style scoped lang="scss">
+	.content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+	.careBanner {
+		display: inline-block;
+		width: 357rpx;
+		height: 182rpx;
+		margin: 20rpx auto;
+	}
+	.strategyBox {
+		width: 710rpx;
+		padding-bottom: 16rpx;
+		background-image: linear-gradient(180deg, #FFE4EC 0%, #FFFFFF 24%);
+		border: 4rpx solid #FFFFFF;
+		box-shadow: 0 0 20rpx 0 rgba(0, 0, 0, 0.03);
+		border-radius: 16rpx;
+	
+		.strTit {
+			padding: 30rpx 25rpx 15rpx 25rpx;
+	
+			.strL {
+				font-size: 34rpx;
+				color: #333333;
+				letter-spacing: 1rpx;
+				font-weight: 500;
+	
+				image {
+					display: block;
+					width: 30rpx;
+					height: 34rpx;
+					margin-right: 10rpx;
+				}
+			}
+	
+			.more {
+				font-size: 28rpx;
+				color: #333333;
+				font-weight: 400;
+			}
+		}
+	
+		.strCol {
+			padding: 16rpx 25rpx;
+	
+			.strPic {
+				width: 140rpx;
+				height: 140rpx;
+				border-radius: 10rpx;
+	
+				image {
+					display: block;
+					width: 140rpx;
+					height: 140rpx;
+					border-radius: 10rpx;
+				}
+			}
+	
+			.strInfo {
+				flex: 1;
+				padding-left: 30rpx;
+	
+				.h3 {
+					font-size: 30rpx;
+					color: #333333;
+					font-weight: 500;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					width: 460rpx;
+				}
+	
+				.p {
+					margin-top: 10rpx;
+					font-size: 24rpx;
+					color: #999999;
+					font-weight: 400;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					width: 460rpx;
+				}
+			}
+		}
+	}
+	.bottom-btn {
+		height: 136rpx;
+		background: #fff;
+		border-top: 1rpx solid rgba(180, 180, 180, 0.6);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+	
+		&-boder {
+			width: 480rpx;
+			height: 89rpx;
+			border-radius: 45rpx;
+			background: #FF578A;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+	
+		}
+	}
 </style>
diff --git a/packages/packageCarecenter/static/carecenter.png b/packages/packageCarecenter/static/carecenter.png
new file mode 100644
index 0000000000000000000000000000000000000000..b57b6f82675d3ab0262f7f9cc29e76c422c461a7
GIT binary patch
literal 11108
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

literal 0
HcmV?d00001

diff --git a/packages/packageCarecenter/static/commoncenter.png b/packages/packageCarecenter/static/commoncenter.png
new file mode 100644
index 0000000000000000000000000000000000000000..09a5a74ec0a65c86ef1d9c4f47eb21ff0258c6c4
GIT binary patch
literal 10942
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

literal 0
HcmV?d00001

diff --git a/pages/active/active.vue b/pages/active/active.vue
index 6e60c52..1061ad6 100644
--- a/pages/active/active.vue
+++ b/pages/active/active.vue
@@ -33,11 +33,11 @@
 						<image mode="aspectFill" :src="item.active_playbill"></image>
 						<view class="date">{{item.end_at}}</view>
 					</view>
-					<view class="title">{{item.name}}</view>
+					<view class="title">{{item.active_name}}</view>
 					<view class="subTit">{{item.address}}</view>
 					<view class="price">
 						<text class="font_red">{{ Number(item.money) > 0 ? `￥${item.money}` : '免费' }}</text>
-						{{item.member_sum}}人参与
+						{{`${item.total+item.start_member_sum}人参与`}}
 					</view>
 				</view>
 			</view>
@@ -56,11 +56,11 @@
 			<view class="intro_column" v-for="item in activityList" :key="item.id" @tap="gotoDetail(item.id)">
 				<view class="imgOuter"><image mode="aspectFill" :src="item.active_playbill"></image><view class="i_intro">推荐</view></view>
 				<view class="columnInfo">
-					<view class="title">{{item.name}}</view>
+					<view class="title">{{item.active_name}}</view>
 					<view class="tags">
-						<text v-for="(sub, subIdx) in item.label" :key="subIdx">{{sub}}</text>
+						<text v-for="(sub, subIdx) in item.active_tag" :key="subIdx">{{sub}}</text>
 					</view>
-					<view class="subInfo">{{item.end_at}}</view>
+					<view class="subInfo">{{item.start_date}}～{{item.end_date}}</view>
 					<view class="subInfo">{{item.address}}</view>
 					<view class="price">
 						<text class="font_red" v-if="Number(item.money) > 0">￥{{item.money}}</text>
diff --git a/pages/active/detail.vue b/pages/active/detail.vue
index 8a2a56b..9a0fabc 100644
--- a/pages/active/detail.vue
+++ b/pages/active/detail.vue
@@ -49,6 +49,30 @@
 				</view>
 			</view>
 		</view>
+		<view class="activeinfo">
+			<view class="active">
+				<u-row gutter="16">
+					<u-col span="3">
+						<view>活动时间：</view>
+					</u-col>
+					<u-col span="12" v-if="info.start_date">
+						<view>{{info.start_date}} {{info.start_time}} ~ {{info.end_date}} {{info.end_time}}</view>
+					</u-col>
+					<u-col span="3">
+						活动地点:
+					</u-col>
+					<u-col span="9" v-if="info.address">
+						{{info.address}}
+					</u-col>
+					<u-col span="3">
+						参与人数:
+					</u-col>
+					<u-col span="9" v-if="info.member_sum">
+						{{info.member_sum}}
+					</u-col>
+				</u-row>
+			</view>
+		</view>
 		<view class="details">
 			<view class="detail">
 				<view class="tit" v-if="false">商品详情</view>
@@ -84,7 +108,7 @@
 							</view>
 						</view>
 						<view class="subInfo">{{item.start_date}} ~ {{item.end_date}}</view>
-						<view class="menu"><text class="hui">热</text>{{item.great_services}}</view>
+						<view class="menu"><text class="hui">热</text>{{item.great_services?item.great_services:""}}</view>
 					</view>
 				</view>
 			</block>
@@ -1337,7 +1361,17 @@
 			border-bottom: 0;
 		}
 	}
-
+	.activeinfo{
+		margin-top: 10rpx;
+		padding: 30rpx 30rpx 30rpx 30rpx;
+		background: #fff;
+		width: 100%;
+		box-sizing: border-box;
+		
+		ul-col:nth-of-type(2n){
+			color:red
+		}
+	}
 	.details {
 		margin-top: 10rpx;
 		padding: 0 30rpx 30rpx 30rpx;
diff --git a/pages/active/my.vue b/pages/active/my.vue
index a623729..aa437a3 100644
--- a/pages/active/my.vue
+++ b/pages/active/my.vue
@@ -1,291 +1,467 @@
-<template>
-	<view class="introBox hasMenu">
-		<view v-if="activityList.length > 0">
-			<view class="intro_column" v-for="item in activityList" :key="item.id" @tap="gotoDetail(item.id)">
-				<view class="imgOuter">
-					<image mode="aspectFill" :src="item.active_playbill"></image>
-					<view class="i_intro">推荐</view>
-				</view>
-				<view class="columnInfo">
-					<view class="title">{{item.name}}</view>
-					<view class="tags">
-						<text v-for="(sub, subIdx) in item.label" :key="subIdx">{{sub}}</text>
-					</view>
-					<view class="subInfo">{{item.end_at}}</view>
-					<view class="subInfo">{{item.address}}</view>
-					<view class="price">
-						<text class="font_red" v-if="Number(item.money) > 0">￥{{item.money}}</text>
-						<text class="free" v-else>免费</text>
-						<view class="shareMoney" v-if="Number(item.money) > 0">
-							<text>分享金</text>{{ Number(item.money) }}元
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view v-else style="padding: 20rpx 0;text-align: center;font-weight: 600;">
-			暂无数据
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		weixin
-	} from '@/utils/weixin.js'
-	export default {
-		data() {
-			return {
-				activitySelect: {
-					page: 1,
-					page_size: 10,
-					myself: 1
-				},
-				activityList: []
-			}
-		},
-		onReachBottom() {
-			this.getActivityList()
-		},
+<template>
+	<view class="content">
+		<view class="end-title" style="display:none;">
+			<view v-for="(item,index) in items" :key="index" :class="{btna:count == index}" @tap="change(index)">
+				{{item}}
+				<view class="line"></view>
+			</view>
+		</view>
+		<view class="end-cont" :class="{dis:btnnum == 0}">
+			<view class="statusBox">
+				<text v-for="(item,index) in statusLabels" :key="index" @click="changeStatus(item.state)"
+					:class="{cur: item.state == status}">{{item.txt}}</text>
+			</view>
+			<view style="height:120rpx;"></view>
+			<view v-if="list.length>0">
+				　　<view class="orderCol" v-for="(item, index) in list" :key="item.id" @click="goDetail(item.id)">
+					<view class="orderNo">
+						<text>订单编号：</text><text>{{item.serial}}</text>
+					</view>
+					<view class="title">
+						<view>{{item.order_name || '暂无'}}<!-- <text class="free">免费</text> -->
+						</view>
+						<view class="status">{{item.statusName}}</view>
+					</view>
+					<view class="infoList">
+						<view class="infoCol">
+							<view class="date">
+								<image mode="heightFix" src="../../static/icon_shijian@2x.png"></image>
+								{{timeFormat(item.created_at, 'yyyy年mm月dd日')}}
+							</view>
+							<view class="price"><text>¥</text>{{item.total}}</view>
+						</view>
+						<!--<view class="infoCol"><view class="address"><image mode="heightFix" src="../../static/icon_dizhi.png"></image>苏州·园区星海街188号苏州万怡大酒店南栋大酒店南栋</view></view>-->
+					</view>
+					<view class="btn">
+						<text @click.stop="goDetail(item.id)"> 查看 </text>
+						<text v-if="item.state=='unpaid'" class="pay" @click.stop="goPay(item.id)"> 支付 </text>
+					</view>
+				</view>
+			</view>
+			<view v-else>
+				<view class="info-none"> {{list.length>0?"":"暂无数据"}} </view>
+			</view>
+
+		</view>
+		<view class="end-cont" :class="{dis:btnnum == 1}">
+			<view class="statusBox">
+				<text>待付款</text>
+				<text class="cur">待服务</text>
+				<text>已服务</text>
+				<text>待评价</text>
+			</view>
+			　　<view class="orderCol">
+				<view class="title">
+					<view>33孕期保健Q&A<text class="free">免费</text></view>
+					<view class="status">待参加</view>
+				</view>
+				<view class="infoList">
+					<view class="infoCol">
+						<view class="date">
+							<image mode="heightFix" src="../../static/icon_shijian@2x.png"></image>2021-02-10 14:00
+						</view>
+						<view class="price"><text>¥</text>100</view>
+					</view>
+					<view class="infoCol">
+						<view class="address">
+							<image mode="heightFix" src="../../static/icon_dianpu@2x.png"></image>苏州·园区星海街188号苏州万怡大酒店
+						</view>
+					</view>
+				</view>
+				<view class="btn"><text>投诉</text></view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		weixin
+	} from '../../utils/weixin.js';
+	//{"0":"待确认","10":"待支付","20":"进行中","100":"已完成"}
+	export default {
+		data() {
+			return {
+				info: {
+					token: ''
+				},
+				btnnum: 0,
+				items: ["活动订单", "商品订单"],
+				count: "",
+				token: '',
+				page: 1,
+				list: [],
+				status: "",
+				statusLabels: [{
+					state: "",
+					txt: "全部"
+				}, {
+					state: "unpaid",
+					txt: "待支付"
+				}, {
+					state: "ongoing",
+					txt: "进行中"
+				}, {
+					state: "finished",
+					txt: "已完成"
+				}],
+				user_info: {},
+				openid: ""
+			}
+		},
+		onLoad(options) {
+			const userInfo = uni.getStorageSync('userInfo')
+			this.info.phone = userInfo.user_info.phone
+			this.token = userInfo.access_token;
+			var that = this;
+			if (!weixin.isNull(options.status))
+				this.status = options.status
+			weixin.getOpenidInfo(info => {
+				that.user_info = info.user_info
+			}, false)
+			this.openid = that.user_info.openid;
+		},
+		onShow() {
+			this.list = []
+			this.getOrderList(1)
+		},
+		onReachBottom() {
+			this.getOrderList(this.page + 1)
+		},
 		methods: {
-			gotoDetail(id) {
-				uni.navigateTo({
-					url: `/pages/active/detail?id=${id}`
-				})
-			},
-			getActivityList() {
-				weixin.request({
-					api: "/api/member/active-list",
-					data: this.activitySelect,
-					utilSuccess: res => {
-						if (res.data.length > 0) {
-							this.activitySelect.page++
-						} else {
-							uni.showToast({
-								icon: 'none',
-								title: "没有更多了"
-							})
-						}
-						if (this.activitySelect.page === 1) {
-							this.activityList = res.data
-						} else {
-							this.activityList.push(...res.data)
-						}
-						console.log(res);
-
-					},
-					utilFail: err => {
-						console.log(err);
-					}
-				})
-			},
-		},
-		onShow() {
-			this.getActivityList()
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.introBox {
-		width: 710rpx;
-		margin: 20rpx auto 0 auto;
-		border-radius: 16rpx;
-		background: #fff;
-		padding: 0 35rpx;
-		box-sizing: border-box;
-	}
-
-	.intro_row {
-		display: flex;
-		justify-content: space-between;
-		width: 100%;
-	}
-
-	.row_col {
-		width: 310rpx;
-		border-radius: 8rpx;
-		padding-bottom: 20rpx;
-
-		.imgOuter {
-			width: 310rpx;
-			height: 230rpx;
-			position: relative;
-
-			image {
-				width: 310rpx;
-				height: 230rpx;
-				border-radius: 8rpx 8rpx 0 0;
-			}
-
-			.date {
-				background-color: rgba(0, 0, 0, 0.3);
-				font-size: 20rpx;
-				color: #fff;
-				line-height: 32rrpx;
-				padding: 0 8rpx;
-				border-radius: 5rpx;
-				position: absolute;
-				left: 20rpx;
-				bottom: 20rpx;
-				font-weight: 500;
-			}
-		}
-
-		.title {
-			width: 100%;
-			font-size: 28rpx;
-			color: #333;
-			font-weight: 500;
-			overflow: hidden;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-			padding-top: 20rpx;
-		}
-
-		.subTit {
-			width: 100%;
-			font-size: 22rpx;
-			color: #333;
-			font-weight: 400;
-			overflow: hidden;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-			padding-top: 10rpx;
-		}
-
-		.price {
-			margin-top: 20rpx;
-			font-size: 22rpx;
-			color: #999;
-
-			text {
-				font-size: 32rpx;
-				font-weight: 400;
-				padding-right: 15rpx;
-			}
-		}
-	}
-
-	.introBox .intro_column:last-child {
-		border-bottom: none;
-	}
-
-	.intro_column {
-		display: flex;
-		justify-content: flex-start;
-		padding: 20rpx 0;
-		border-bottom: 2rpx solid #EAEAEA;
-
-		.imgOuter {
-			width: 260rpx;
-			height: 210rpx;
-			position: relative;
-
-			image {
-				width: 260rpx;
-				height: 210rpx;
-				border-radius: 5rpx;
-			}
-
-			.i_intro {
-				position: absolute;
-				top: 0;
-				left: 0;
-				width: 68rpx;
-				height: 32rpx;
-				background: #FF578A;
-				border-radius: 5rpx 0px 18rpx 5rpx;
-				font-size: 22rpx;
-				font-weight: 400;
-				color: #FFFFFF;
-				line-height: 32rpx;
-				text-align: center;
-			}
-		}
-
-		.columnInfo {
-			width: 360rpx;
-			margin-left: 22rpx;
-
-			.title {
-				width: 100%;
-				font-size: 30rpx;
-				font-weight: bold;
-				color: #333;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-			}
-
-			.tags text {
-				height: 28rpx;
-				background: rgba(255, 177, 62, 0.1);
-				border-radius: 4rpx;
-				line-height: 28rpx;
-				font-size: 20rpx;
-				padding: 0 10rpx;
-				margin-right: 10rpx;
-				color: #FF753E;
-			}
-
-			.subInfo {
-				width: 100%;
-				font-size: 24rpx;
-				color: #999;
-				font-weight: 400;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-				padding-top: 5rpx;
-
-				.font_red {
-					margin-left: 10rpx;
-				}
-			}
-
-			.price {
-				display: flex;
-				justify-content: flex-start;
-				align-items: center;
-				align-content: center;
-				margin-top: 8rpx;
-
-				text {
-					margin-right: 10rpx;
-				}
-
-				.shareMoney {
-					height: 28rpx;
-					border: 2rpx solid #FF578A;
-					border-radius: 4rpx;
-					line-height: 28rpx;
-					font-size: 20rpx;
-					margin-right: 10rpx;
-					padding-right: 10rpx;
-					color: #FF578A;
-					display: flex;
-					flex-direction: flex-start;
-
-					text {
-						background: #FF578A;
-						color: #fff;
-						padding: 0 10rpx;
-					}
-				}
-
-				.free {
-					height: 28rpx;
-					background: #FF753E;
-					border-radius: 4rpx;
-					line-height: 28rpx;
-					font-size: 20rpx;
-					padding: 0 10rpx;
-					margin-right: 10rpx;
-					color: #fff;
-				}
-			}
-
-		}
-	}
+			timeFormat(time,format){
+				//this.util.
+			},
+			changeStatus(status) {
+				this.status = status
+				this.list = []
+				this.getOrderList(1)
+			},
+			change(e) {
+				this.count = e
+				this.btnnum = e
+				console.log(this.count)
+			},
+			goDetail(id) {
+				uni.navigateTo({
+					url: "../orderPackageDetail/orderPackageDetail?id=" + id
+				})
+			},
+			goPay(id) {
+				var that = this;
+				weixin.request({
+					api: '/api/member/order-payment',
+					method: 'GET',
+					data: {
+						order_id: id,
+						openid: this.openid
+					},
+					utilSuccess: res => {
+
+						weixin.getOpenidInfo(() => {}, true);
+						setTimeout(function() {
+							uni.hideLoading();
+							that.showPop = false;
+						}, 100);
+						try {
+							let payParams = JSON.parse(res.jsApiParameters)
+							payParams.provider = 'wxpay'
+							payParams.success = result => {
+								that.status = "ongoing";
+								that.loadData(that.currentPage);
+							}
+							payParams.fail = result => {
+								console.log(result);
+							}
+							wx.requestPayment(payParams);
+
+						} catch (err) {
+							console.log(err)
+						} finally {
+							// finallyCode - 无论 try / catch 结果如何都会执行的代码块
+						}
+					},
+					utilFail: res => {
+						uni.showToast({
+							title: res
+						})
+						console.log(res);
+					}
+				})
+			},
+			getOrderList(page) {
+				const userInfo = uni.getStorageSync('userInfo')
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				});
+				var data = {
+					page: page,
+					page_size: 6,
+					token: userInfo.access_token
+				}
+				if (this.status != "") {
+					data = {
+						...data,
+						state: this.status
+					};
+				}
+				var that = this;
+				uni.request({
+					url: this.baseUrl + '/api/member/get-orders',
+					method: 'GET',
+					data: data,
+					success: r => {
+						setTimeout(function() {
+							uni.hideLoading();
+						}, 100);
+
+						var hasNoMore = that.list.length < 5 && page > 1;
+						if (hasNoMore || r.data.data.length == 0 && page > 1) {
+							// 已加载到最后一页
+							uni.showToast({
+								title: '已加载到最后一页',
+								icon: 'none'
+							});
+							return;
+						}
+
+						for (var m of r.data.data) {
+							var mod = this.statusLabels.filter((p) => {
+								return p.state == m.state;
+							})[0];
+							if (mod)
+								m.statusName = mod.txt;
+						}
+						this.list = this.list.concat(r.data.data);
+						this.page = page;
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.info-none {
+		padding: 40rpx;
+		color: #6E6E6E;
+	}
+
+	.end-title {
+		display: flex;
+		width: 100%;
+		height: 88rpx;
+		background: #FFFFFF;
+		box-shadow: 0px 2px 12px 0px #DEE4E7;
+		line-height: 88rpx;
+		font-size: 32rpx;
+		font-weight: 400;
+		color: #333;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 999;
+	}
+
+	.end-title view {
+		flex-grow: 1;
+		text-align: center;
+		position: relative;
+
+		.line {
+			position: absolute;
+			width: 128rpx;
+			height: 8rpx;
+			background: #FF578A;
+			border-radius: 4rpx;
+			bottom: 0;
+			left: 50%;
+			margin-left: -64rpx;
+			display: none;
+		}
+	}
+
+	.end-cont {
+		display: none;
+		// padding-top:88rpx;
+	}
+
+	.orderNo {
+		padding: 20rpx 0rpx;
+	}
+
+	.btna {
+		color: #FF578A;
+	}
+
+	.btna .line {
+		display: block !important;
+	}
+
+	.dis {
+		display: block;
+	}
+
+	.orderCol {
+		background: #fff;
+		border-radius: 16rpx;
+		width: 710rpx;
+		margin: 20rpx auto 0 auto;
+		padding: 0 30rpx;
+		box-sizing: border-box;
+
+		.title {
+			padding: 20rpx 0;
+			display: flex;
+			justify-content: space-between;
+			align-content: center;
+			align-items: center;
+			font-size: 32rpx;
+			font-weight: 500;
+			color: #333;
+
+			.free {
+				display: inline-block;
+				width: 58rpx;
+				height: 32rpx;
+				background: #FF753E;
+				border-radius: 6rpx;
+				font-size: 20rpx;
+				font-weight: 400;
+				color: #FFFFFF;
+				text-align: center;
+				line-height: 32rpx;
+				margin-left: 10rpx;
+			}
+
+			.status {
+				font-size: 28rpx;
+				font-weight: 400;
+				color: #666666;
+			}
+		}
+
+		.btn {
+			display: flex;
+			justify-content: flex-end;
+			padding: 30rpx 0;
+
+
+			text {
+				display: block;
+				width: 160rpx;
+				height: 64rpx;
+				border-radius: 8rpx;
+				border: 2rpx solid #DEDEDE;
+				font-size: 28rpx;
+				font-weight: 400;
+				color: #333333;
+				text-align: center;
+				line-height: 64rpx;
+				margin-left: 20rpx;
+			}
+
+			text.pay {
+				border: 2rpx solid #FF578A;
+				color: #FF578A;
+			}
+		}
+
+		.infoList {
+			.infoCol {
+				display: flex;
+				justify-content: space-between;
+				color: #666;
+				font-size: 28rpx;
+				line-height: 1.8;
+				align-items: center;
+				align-content: center;
+
+				.date image {
+					width: 26rpx;
+					height: 26rpx;
+					display: inline-block;
+					margin-right: 12rpx;
+				}
+
+				.bulid {
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+				}
+
+				.bulid image {
+					width: 25rpx;
+					height: 26rpx;
+					display: inline-block;
+					margin-right: 12rpx;
+				}
+
+				.address {
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+				}
+
+				.address image {
+					width: 24rpx;
+					height: 26rpx;
+					display: inline-block;
+					margin-right: 12rpx;
+				}
+
+				.price {
+					font-size: 36rpx;
+					font-weight: 500;
+					color: #FF578A;
+
+					text {
+						font-size: 28rpx;
+						margin-right: 5rpx;
+					}
+				}
+			}
+		}
+	}
+
+	.statusBox {
+		width: 750rpx;
+		margin: 2rpx auto;
+		box-sizing: border-box;
+		height: 120rpx;
+		background: #fff;
+		display: flex;
+		padding: 0 30rpx;
+		justify-content: space-around;
+		align-items: center;
+		align-content: center;
+		color: #666;
+		font-size: 28rpx;
+		position: fixed;
+		left: 0;
+		top: -1rpx;
+
+		text {
+			display: block;
+			width: 156rpx;
+			height: 64rpx;
+			background: #F0F0F0;
+			border-radius: 32rpx;
+			text-align: center;
+			line-height: 64rpx;
+		}
+
+		.cur {
+			background: #FF578A;
+			color: #fff;
+		}
+	}
 </style>
diff --git a/pages/my/my.vue b/pages/my/my.vue
index ed2127d..9efa3c9 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -300,10 +300,17 @@
 					url: "../../packages/packageOrder/pages/myOrder/myOrder?status=" + v
 				})
 			},
-			goMyActive(flag){
-				uni.navigateTo({
-					url:'/pages/active/my'
-				})
+			goMyActive(v){
+				if(v){
+					uni.navigateTo({
+						url: "/pages/active/my?status=" + v
+					})
+				}else{
+					uni.navigateTo({
+						url:'/pages/active/my'
+					})
+				}
+
 			},
 			nodata() {
 				uni.showToast({