diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 501e01c..075b9c5 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -2,10 +2,19 @@ // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数 "version": "0.0", "configurations": [{ - "type": "uniCloud", - "default": { - "launchtype": "remote" - } - } + "default" : + { + "launchtype" : "remote" + }, + "h5" : + { + "launchtype" : "remote" + }, + "mp-weixin" : + { + "launchtype" : "remote" + }, + "type" : "uniCloud" + } ] } diff --git a/components/verification/verification.vue b/components/verification/verification.vue index c38b6bb..1ba7f26 100644 --- a/components/verification/verification.vue +++ b/components/verification/verification.vue @@ -65,7 +65,6 @@ export default { // 可自行调整 this.scHight = phone.screenHeight / 2 - 200 + "px"; this.getCode(); - }, props: { height: { @@ -315,30 +314,6 @@ export default { width: 750rpx; } -.border-bom { - border-bottom: 0.5rpx solid #dddddd; -} - -.border-red { - border-bottom: 1rpx solid #d33e18; -} - -.border-bom-big { - border-bottom: 8rpx solid #dddddd; -} - -.border-bom-white { - border-bottom: 2rpx solid #ffffff; -} - -.border-bom-green { - border-bottom: 4rpx solid #f8f9bd; -} - -.border-bom-index { - border-bottom: 4rpx solid #27d9b3; -} - .padding-left { padding-left: 20rpx; } diff --git a/main.js b/main.js index 6b9df77..e02f774 100644 --- a/main.js +++ b/main.js @@ -4,13 +4,23 @@ import * as filters from "./utils/filters.js"; // global filter import uView from "uview-ui"; import store from "./store"; + +/** + * 仅在h5中显示唤醒app功能 + * 在h5页面手动挂载 + * + */ // #ifdef H5 -// 在h5页面手动挂载 h5唤醒app插件 import airBtn from "@/components/m-airbtn/index.vue"; let btn = Vue.component("airBtn", airBtn); //全局注册 document.body.appendChild(new btn().$mount().$el); // #endif + +/** + * 全局filters + */ + Object.keys(filters).forEach((key) => { Vue.filter(key, filters[key]); }); @@ -19,10 +29,20 @@ Object.keys(filters).forEach((key) => { Vue.prototype.$store = store; Vue.use(uView); Vue.config.productionTip = false; + + +/** + * 注意! + * 此处将常用的颜色嵌入到原型链上面 + * 颜色使用驼峰命名对应 uni.scss中全局颜色变量名 + * 如需更换主题请修改此处以及uni.scss中的全局颜色 + */ // 主题色 Vue.prototype.$mainColor = "#ff3c2a"; // 高亮主题色 Vue.prototype.$lightColor = "#ff6b35"; +// 辅助高亮颜色 +Vue.prototype.$aiderLightColor = "#ff9f28"; App.mpType = "app"; diff --git a/manifest.json b/manifest.json index ea03417..166ba0c 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "lili商城", "appid" : "__UNI__C100675", "description" : "", - "versionName" : "4.0.29", - "versionCode" : 4000029, + "versionName" : "4.0.30", + "versionCode" : 4000030, "transformPx" : false, "app-plus" : { "compatible" : { diff --git a/pages/cart/payment/popup/goods.vue b/pages/cart/payment/popup/goods.vue index 36716e7..77fe238 100644 --- a/pages/cart/payment/popup/goods.vue +++ b/pages/cart/payment/popup/goods.vue @@ -322,10 +322,10 @@ export default { } .active { - background: $jd-light-color !important; - border: 2rpx solid $jd-color; + background: $price-light-color !important; + border: 2rpx solid $price-color; font-weight: bold; - color: $jd-color !important; + color: $price-color !important; box-sizing: border-box; } @@ -377,7 +377,7 @@ export default { } .goods-price { - color: $jd-color; + color: $price-color; line-height: 80rpx; display: flex; } diff --git a/pages/cart/payment/popup/popup.scss b/pages/cart/payment/popup/popup.scss index 0dfe359..d571c30 100644 --- a/pages/cart/payment/popup/popup.scss +++ b/pages/cart/payment/popup/popup.scss @@ -14,7 +14,7 @@ line-height: 80rpx; height: 80rpx; - background: $jd-color; + background: $price-color; color: #fff; border-radius: 200px; text-align: center; diff --git a/pages/mine/deposit/withdrawal.vue b/pages/mine/deposit/withdrawal.vue index 8e98c79..b6e45b5 100644 --- a/pages/mine/deposit/withdrawal.vue +++ b/pages/mine/deposit/withdrawal.vue @@ -12,6 +12,10 @@ 全部 可提现金额{{ walletNum | unitPrice }} + + + + 最低提现金额为1.00元 @@ -19,7 +23,7 @@ \ No newline at end of file diff --git a/pages/mine/distribution/list.vue b/pages/mine/distribution/list.vue index e95e74e..fbddebc 100644 --- a/pages/mine/distribution/list.vue +++ b/pages/mine/distribution/list.vue @@ -454,7 +454,7 @@ export default { overflow: hidden; } > .-item-price { - color: $jd-color; + color: $price-color; > span { font-size: 36rpx; } diff --git a/pages/navigation/search/search.scss b/pages/navigation/search/search.scss index a0f6ada..dd0b84e 100644 --- a/pages/navigation/search/search.scss +++ b/pages/navigation/search/search.scss @@ -1,7 +1,7 @@ .sort-active { border: 1px solid $light-color; color: $light-color; - background: $jd-light-color !important; + background: $price-light-color !important; } .oldKeyList { diff --git a/pages/order/invoice/invoiceDetail.vue b/pages/order/invoice/invoiceDetail.vue index 759e03f..441d5d4 100644 --- a/pages/order/invoice/invoiceDetail.vue +++ b/pages/order/invoice/invoiceDetail.vue @@ -205,13 +205,6 @@ export default { } } -.btn { - font-size: 34rpx; - margin: 60rpx 20rpx; - &::after { - border: none; - } -} .u-cell { padding: 35rpx 20rpx; height: 110rpx; diff --git a/pages/passport/codeLogin.vue b/pages/passport/codeLogin.vue index 691d755..f10cca3 100644 --- a/pages/passport/codeLogin.vue +++ b/pages/passport/codeLogin.vue @@ -9,12 +9,13 @@
- {{ tips }} + {{ tips }} +
- 登录 - 一键登录 + 登录 + 一键登录 @@ -34,6 +35,7 @@ export default { props: ["status"], //是否勾选 《用户隐私》和《隐私政策》 data() { return { + aiderLightColor: this.$aiderLightColor, uuid, flage: false, //是否验证码验证 codeFlag: true, //验证开关,用于是否展示验证码 diff --git a/pages/passport/login.scss b/pages/passport/login.scss index f65737a..4d58d01 100644 --- a/pages/passport/login.scss +++ b/pages/passport/login.scss @@ -6,7 +6,6 @@ margin: 40rpx 0; } .login-ball { - background-image: linear-gradient(25deg, #fa123b, #ff6b35, #ff9f28, #ffcc03); border-bottom-left-radius: 300rpx; height: 400rpx; position: relative; @@ -43,8 +42,6 @@ span { .submit { height: 80rpx; line-height: 80rpx; - - background-image: linear-gradient(90deg, #ff6b35, #ff9f28, #ffcc03); color: #fff; text-align: center; font-size: 30rpx; @@ -61,7 +58,6 @@ span { } .text-tips { text-align: center; - color: #ff9f28; } .tips { position: absolute; diff --git a/pages/passport/login.vue b/pages/passport/login.vue index 36ff235..2c82933 100644 --- a/pages/passport/login.vue +++ b/pages/passport/login.vue @@ -1,7 +1,7 @@ @@ -22,6 +22,7 @@ import api from "@/config/api.js"; export default { data() { return { + aiderLightColor: this.$aiderLightColor, loginList: [ { icon: "weixin-circle-fill", diff --git a/pages/passport/wechatMPLogin.vue b/pages/passport/wechatMPLogin.vue index 348132b..3c05af1 100644 --- a/pages/passport/wechatMPLogin.vue +++ b/pages/passport/wechatMPLogin.vue @@ -223,15 +223,11 @@ text.shop { } .register { - color: #00a327 !important; + color: $weChat-color !important; border: none !important; background: #fff !important; } -.btn { - width: 100%; - text-align: center; -} .btn-auth { width: 92%; diff --git a/pages/product/product/goods/-goods-intro.vue b/pages/product/product/goods/-goods-intro.vue index 7ebd5b6..414b0ee 100644 --- a/pages/product/product/goods/-goods-intro.vue +++ b/pages/product/product/goods/-goods-intro.vue @@ -125,7 +125,7 @@ export default { width: 52rpx; height: 6rpx; - background-image: linear-gradient(90deg, $jd-color, $jd-light-color); + background-image: linear-gradient(90deg, $price-color, $price-light-color); } } > .goods-detail-item { diff --git a/pages/product/product/goods/-goods-recommend.vue b/pages/product/product/goods/-goods-recommend.vue index 14e7872..832c009 100644 --- a/pages/product/product/goods/-goods-recommend.vue +++ b/pages/product/product/goods/-goods-recommend.vue @@ -148,7 +148,7 @@ export default { white-space: nowrap; font-size: 26rpx; text-align: left; - color: $jd-color; + color: $price-color; line-height: 23px; font-weight: bold; > span { diff --git a/pages/product/product/popup/address.vue b/pages/product/product/popup/address.vue index 6079483..ac8acf7 100644 --- a/pages/product/product/popup/address.vue +++ b/pages/product/product/popup/address.vue @@ -144,7 +144,7 @@ export default { font-size: 28rpx; } .checked { - background: $jd-color; + background: $price-color; } .active { color: #fff; diff --git a/pages/product/product/popup/goods.vue b/pages/product/product/popup/goods.vue index 4bf8ab9..5bc8df9 100644 --- a/pages/product/product/popup/goods.vue +++ b/pages/product/product/popup/goods.vue @@ -322,10 +322,10 @@ export default { } .active { - background: $jd-light-color !important; - border: 2rpx solid $jd-color; + background: $price-light-color !important; + border: 2rpx solid $price-color; font-weight: bold; - color: $jd-color !important; + color: $price-color !important; box-sizing: border-box; } @@ -377,7 +377,7 @@ export default { } .goods-price { - color: $jd-color; + color: $price-color; line-height: 80rpx; display: flex; } diff --git a/pages/product/product/popup/popup.scss b/pages/product/product/popup/popup.scss index 0dfe359..d571c30 100644 --- a/pages/product/product/popup/popup.scss +++ b/pages/product/product/popup/popup.scss @@ -14,7 +14,7 @@ line-height: 80rpx; height: 80rpx; - background: $jd-color; + background: $price-color; color: #fff; border-radius: 200px; text-align: center; diff --git a/pages/product/product/product.scss b/pages/product/product/product.scss index e88115d..c14d087 100644 --- a/pages/product/product/product.scss +++ b/pages/product/product/product.scss @@ -23,7 +23,7 @@ padding-left: 14rpx; position: relative; &::before { - background-image: linear-gradient(180deg, $jd-color, $jd-light-color); + background-image: linear-gradient(180deg, $price-color, $price-light-color); content: ""; position: absolute; left: 0; diff --git a/pages/product/product/promotion/-promotion.vue b/pages/product/product/promotion/-promotion.vue index f4f65d6..4786672 100644 --- a/pages/product/product/promotion/-promotion.vue +++ b/pages/product/product/promotion/-promotion.vue @@ -94,9 +94,9 @@ export default {