diff --git a/.eslintrc.js b/.eslintrc.js index 09d40e3ad912050ea8e4d5bff90fcb1ebacf83b4..9c708b51874249298cdcb1020eac31321e5e2f22 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -10,7 +10,7 @@ module.exports = { }, rules: { "no-console": process.env.NODE_ENV === "production" ? "warn" : "off", - "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off", + "no- ": process.env.NODE_ENV === "production" ? "warn" : "off", "prettier/prettier": [ "error", { diff --git a/package.json b/package.json index a0e3292f8e29c5a62e02b53bde31ebbf1d76f523..50d6b92d3a99315c333ee9416b8c38f74568f6c0 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,8 @@ "vue-property-decorator": "^9.1.2", "vue-qr": "^3.2.4", "vue-router": "^3.2.0", - "vuex": "^3.5.1" + "vuex": "^3.5.1", + "element-ui": "^2.4.6" }, "devDependencies": { "@typescript-eslint/eslint-plugin": "^4.18.0", diff --git a/src/assets/images/Deposit.png b/src/assets/images/Deposit.png new file mode 100644 index 0000000000000000000000000000000000000000..785d676a0858bb854030e85b52310c0fe91c1f7f Binary files /dev/null and b/src/assets/images/Deposit.png differ diff --git a/src/assets/images/Interest.png b/src/assets/images/Interest.png new file mode 100644 index 0000000000000000000000000000000000000000..1aa628a3541a9ddf27ed655e4e0fd429cc8aabcb Binary files /dev/null and b/src/assets/images/Interest.png differ diff --git a/src/assets/images/Login.png b/src/assets/images/Login.png new file mode 100644 index 0000000000000000000000000000000000000000..131d5a2da4caf8122585e704ec628656993de3d2 Binary files /dev/null and b/src/assets/images/Login.png differ diff --git a/src/assets/images/backageImg.png b/src/assets/images/backageImg.png new file mode 100644 index 0000000000000000000000000000000000000000..e698c8bd322a4c7fcc5f1c91859e875e445fe14a Binary files /dev/null and b/src/assets/images/backageImg.png differ diff --git a/src/assets/images/background-card.png b/src/assets/images/background-card.png new file mode 100644 index 0000000000000000000000000000000000000000..62f7e1cb2cbb277c04f2b6e306e41b98feaba12e Binary files /dev/null and b/src/assets/images/background-card.png differ diff --git a/src/assets/images/coupon.png b/src/assets/images/coupon.png new file mode 100644 index 0000000000000000000000000000000000000000..1c5cf49421ce87b1c684ddbb58ba71bcb5b1ac78 Binary files /dev/null and b/src/assets/images/coupon.png differ diff --git a/src/assets/images/login1.png b/src/assets/images/login1.png new file mode 100644 index 0000000000000000000000000000000000000000..5585b9117b0b9f833ed33ed6b2d4f5e609b55da7 Binary files /dev/null and b/src/assets/images/login1.png differ diff --git a/src/assets/images/mycard.png b/src/assets/images/mycard.png new file mode 100644 index 0000000000000000000000000000000000000000..7aceb0e303035ce8c51408e1eb1e60a791cf8f63 Binary files /dev/null and b/src/assets/images/mycard.png differ diff --git a/src/assets/images/stars.png b/src/assets/images/stars.png new file mode 100644 index 0000000000000000000000000000000000000000..24d36a0eae90bddbee69c07d9ca33f447ad0eb54 Binary files /dev/null and b/src/assets/images/stars.png differ diff --git a/src/components/common/Bottom.vue b/src/components/common/Bottom.vue index 8133d9e82014cbf0d6f1a252c8e9a594719afe73..cba9ef616e958b40def2974ff994372a237af001 100644 --- a/src/components/common/Bottom.vue +++ b/src/components/common/Bottom.vue @@ -2,7 +2,7 @@ * @Author: jiangzaicheng jiangzaicheng_jzc@163.com * @Date: 2022-07-07 16:13:13 * @LastEditors: jiangzaicheng jiangzaicheng_jzc@163.com - * @LastEditTime: 2022-07-07 20:43:56 + * @LastEditTime: 2022-07-11 18:19:25 * @FilePath: \mcep-h5\src\components\common\Bottom.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -25,15 +25,12 @@ + diff --git a/src/components/common/CardUnLogin.vue b/src/components/common/CardUnLogin.vue new file mode 100644 index 0000000000000000000000000000000000000000..82426e2dc78a000242da71a6019fcc5fafb8e2bb --- /dev/null +++ b/src/components/common/CardUnLogin.vue @@ -0,0 +1,66 @@ + + + + + + diff --git a/src/components/common/LittleCard.vue b/src/components/common/LittleCard.vue new file mode 100644 index 0000000000000000000000000000000000000000..c35ade92d745f9b80d2d1cf95217d8acd5c8709b --- /dev/null +++ b/src/components/common/LittleCard.vue @@ -0,0 +1,80 @@ + + + + + diff --git a/src/components/common/Person.vue b/src/components/common/Person.vue index e3f8f8906176b0cbb10ee22e03ebb8c5f1b7b014..c08655203ff999efc6fab66ae57fced937f35e9b 100644 --- a/src/components/common/Person.vue +++ b/src/components/common/Person.vue @@ -2,18 +2,78 @@ * @Author: jiangzaicheng jiangzaicheng_jzc@163.com * @Date: 2022-07-04 16:24:00 * @LastEditors: jiangzaicheng jiangzaicheng_jzc@163.com - * @LastEditTime: 2022-07-07 20:47:51 + * @LastEditTime: 2022-07-14 13:54:18 * @FilePath: \mcep-h5\src\components\common\Tatle.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -27,16 +87,50 @@ import { Component, Vue, Prop, Watch } from "vue-property-decorator"; }) export default class Person extends Vue { @Prop({ default: "" }) title: string | undefined; // 页面标题 + @Prop({ default: "" }) param: any | undefined; // Name + @Prop({ default: "" }) starname: string | undefined; // 星星 + @Prop({ default: "" }) grow: string | undefined; // 成长 + @Prop({ default: false }) login: boolean | undefined; // 是否登录 + + //星星的点击事件 + pushStarts(){ + this.$router.push({ + name:"level" + }) + } } diff --git a/src/components/common/ProductDetail.vue b/src/components/common/ProductDetail.vue new file mode 100644 index 0000000000000000000000000000000000000000..28230d68478026fb065ec11160374bef59b61744 --- /dev/null +++ b/src/components/common/ProductDetail.vue @@ -0,0 +1,61 @@ + + + + + diff --git a/src/components/common/Tatle.vue b/src/components/common/Tatle.vue index 0f495245b53eeb77a7fbc95f26f7ea83c13c2546..88fafff97235d47a9389cc7fb2f1b526ddd48a41 100644 --- a/src/components/common/Tatle.vue +++ b/src/components/common/Tatle.vue @@ -2,7 +2,7 @@ * @Author: jiangzaicheng jiangzaicheng_jzc@163.com * @Date: 2022-07-04 16:24:00 * @LastEditors: jiangzaicheng jiangzaicheng_jzc@163.com - * @LastEditTime: 2022-07-05 17:52:47 + * @LastEditTime: 2022-07-08 14:23:56 * @FilePath: \mcep-h5\src\components\common\Tatle.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -35,9 +35,13 @@ export default class Tatle extends Vue { diff --git a/src/views/MyView/MyPage.vue b/src/views/MyView/MyPage.vue index f996614b81ee34b6bfab7185130dedf3edb11297..3e9ce51bb4ec492587ee6a1bd26a5bf76e780137 100644 --- a/src/views/MyView/MyPage.vue +++ b/src/views/MyView/MyPage.vue @@ -2,13 +2,23 @@ * @Author: jiangzaicheng jiangzaicheng_jzc@163.com * @Date: 2022-07-05 14:05:30 * @LastEditors: jiangzaicheng jiangzaicheng_jzc@163.com - * @LastEditTime: 2022-07-07 19:00:04 + * @LastEditTime: 2022-07-14 13:48:42 * @FilePath: \mcep-h5\src\views\main\MainView.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -20,9 +30,84 @@ import { ProductData } from '@/model/entity/ProductData' name: "MyPage", }) export default class MyPage extends Vue { - tatleName = "我的" - + tatleName = "个人中心" + loginFlag = true; + param: any = {} + //判断是否登录 + created() { + //判断登录登陆状态 + //this.loginFlag=localStorage.getItem("loginFlag") + if(this.loginFlag){ + this.param = { + name:"孙旭东", + live:"二星级", + grow:"531" + } + }else{ + this.param={ + name:"登录/注册" + } + } + + } + //列表信息 + litterParam: any = [{ + productname: "个人信息", + //个人信息 + img: "#icon-a-gerenxinxi16x16px" + }, + { + productname: "我的贷款", + //图片信息 + img: "#icon-a-wodedaikuan16x16px" + }, + { + productname: "兑换记录", + //图片信息 + img: "#icon-a-duihuanjilu16x16px" + }, + { + productname: "合作企业", + //图片信息 + img: "#icon-a-hezuoqiye16x16px" + }] } diff --git a/src/views/ProductDetail/ProductDetails.vue b/src/views/ProductDetail/ProductDetails.vue new file mode 100644 index 0000000000000000000000000000000000000000..033fe925416c9b56b09e3414047dcbea5cfd3524 --- /dev/null +++ b/src/views/ProductDetail/ProductDetails.vue @@ -0,0 +1,74 @@ + + + + diff --git a/src/views/authentication/LoginView.vue b/src/views/authentication/LoginView.vue index cad36b0c657ed8051df370d9d1dd23b55533ffce..4caa1b2fce38eae88f301fca4b39c6113325bd19 100644 --- a/src/views/authentication/LoginView.vue +++ b/src/views/authentication/LoginView.vue @@ -2,7 +2,7 @@ * @Author: jiangzaicheng jiangzaicheng_jzc@163.com * @Date: 2022-07-04 15:41:06 * @LastEditors: jiangzaicheng jiangzaicheng_jzc@163.com - * @LastEditTime: 2022-07-06 15:57:44 + * @LastEditTime: 2022-07-12 14:53:10 * @FilePath: \mcep-h5\src\views\authentication\LoginView.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -53,7 +53,7 @@ - {{ getCmstotal }} + {{ getCmstotal }}
登录 @@ -76,12 +76,12 @@ diff --git a/src/views/main/MainView.vue b/src/views/main/MainView.vue index af296986e1b399fa09e900f7f43a6f1c6e83e875..c20aab7d58dc19b127d3813130ef256c20d5672b 100644 --- a/src/views/main/MainView.vue +++ b/src/views/main/MainView.vue @@ -2,7 +2,7 @@ * @Author: jiangzaicheng jiangzaicheng_jzc@163.com * @Date: 2022-07-05 14:05:30 * @LastEditors: jiangzaicheng jiangzaicheng_jzc@163.com - * @LastEditTime: 2022-07-07 20:43:35 + * @LastEditTime: 2022-07-08 14:28:26 * @FilePath: \mcep-h5\src\views\main\MainView.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -10,7 +10,7 @@
-
+
diff --git a/src/views/recognition/Agreement.vue b/src/views/recognition/Agreement.vue new file mode 100644 index 0000000000000000000000000000000000000000..f182ab6f066f4050234c56e4bf46c541571f0982 --- /dev/null +++ b/src/views/recognition/Agreement.vue @@ -0,0 +1,63 @@ + + + + + + diff --git a/src/views/recognition/Recognition.vue b/src/views/recognition/Recognition.vue new file mode 100644 index 0000000000000000000000000000000000000000..b6d3385930a4b23cacc16098851d2be24667f18b --- /dev/null +++ b/src/views/recognition/Recognition.vue @@ -0,0 +1,122 @@ + + + + + + diff --git a/src/views/workbench/products-recommended/ProductsRecommended.vue b/src/views/workbench/products-recommended/ProductsRecommended.vue deleted file mode 100644 index 586399e607d0ee301a20cd28f7d74e4c07ff5a17..0000000000000000000000000000000000000000 --- a/src/views/workbench/products-recommended/ProductsRecommended.vue +++ /dev/null @@ -1,143 +0,0 @@ - - - - - diff --git a/src/views/workbench/products-recommended/loan-products/ProductDetails.vue b/src/views/workbench/products-recommended/loan-products/ProductDetails.vue deleted file mode 100644 index ce411afdb6dba95c9daa4a761d5525cce6b53000..0000000000000000000000000000000000000000 --- a/src/views/workbench/products-recommended/loan-products/ProductDetails.vue +++ /dev/null @@ -1,263 +0,0 @@ - - - - -