zhuce
/
lilishop-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改部分scss类名，新增部分注释以及登录颜色化配置:)

master
lemon橪 2021-08-19 16:20:21 +08:00
parent 775bf3055d
commit 224eb05703
27 changed files with 96 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.hbuilderx/launch.json
View File

@ -2,10 +2,19 @@
// launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数 // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
"version": "0.0", "version": "0.0",
"configurations": [{ "configurations": [{
"type": "uniCloud", "default" :
"default": { {
"launchtype": "remote" "launchtype" : "remote"
} },
} "h5" :
{
"launchtype" : "remote"
},
"mp-weixin" :
{
"launchtype" : "remote"
},
"type" : "uniCloud"
}
] ]
} }

25
components/verification/verification.vue
View File

@ -65,7 +65,6 @@ export default {
// 可自行调整 // 可自行调整
this.scHight = phone.screenHeight / 2 - 200 + "px"; this.scHight = phone.screenHeight / 2 - 200 + "px";
this.getCode(); this.getCode();
}, },
props: { props: {
height: { height: {
@ -315,30 +314,6 @@ export default {
width: 750rpx; 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 {
padding-left: 20rpx; padding-left: 20rpx;
} }

22
main.js
View File

@ -4,13 +4,23 @@ import * as filters from "./utils/filters.js"; // global filter
import uView from "uview-ui"; import uView from "uview-ui";
import store from "./store"; import store from "./store";
/**
* 仅在h5中显示唤醒app功能
* 在h5页面手动挂载
*
*/
// #ifdef H5 // #ifdef H5
// 在h5页面手动挂载 h5唤醒app插件
import airBtn from "@/components/m-airbtn/index.vue"; import airBtn from "@/components/m-airbtn/index.vue";
let btn = Vue.component("airBtn", airBtn); //全局注册 let btn = Vue.component("airBtn", airBtn); //全局注册
document.body.appendChild(new btn().$mount().$el); document.body.appendChild(new btn().$mount().$el);
// #endif // #endif
/**
* 全局filters
*/
Object.keys(filters).forEach((key) => { Object.keys(filters).forEach((key) => {
Vue.filter(key, filters[key]); Vue.filter(key, filters[key]);
}); });
@ -19,10 +29,20 @@ Object.keys(filters).forEach((key) => {
Vue.prototype.$store = store; Vue.prototype.$store = store;
Vue.use(uView); Vue.use(uView);
Vue.config.productionTip = false; Vue.config.productionTip = false;
/**
* 注意！
* 此处将常用的颜色嵌入到原型链上面
* 颜色使用驼峰命名对应 uni.scss中全局颜色变量名
* 如需更换主题请修改此处以及uni.scss中的全局颜色
*/
// 主题色 // 主题色
Vue.prototype.$mainColor = "#ff3c2a"; Vue.prototype.$mainColor = "#ff3c2a";
// 高亮主题色 // 高亮主题色
Vue.prototype.$lightColor = "#ff6b35"; Vue.prototype.$lightColor = "#ff6b35";
// 辅助高亮颜色
Vue.prototype.$aiderLightColor = "#ff9f28";
App.mpType = "app"; App.mpType = "app";

4
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "lili商城", "name" : "lili商城",
"appid" : "__UNI__C100675", "appid" : "__UNI__C100675",
"description" : "", "description" : "",
"versionName" : "4.0.29", "versionName" : "4.0.30",
"versionCode" : 4000029, "versionCode" : 4000030,
"transformPx" : false, "transformPx" : false,
"app-plus" : { "app-plus" : {
"compatible" : { "compatible" : {

8
pages/cart/payment/popup/goods.vue
View File

@ -322,10 +322,10 @@ export default {
} }
.active { .active {
background: $jd-light-color !important; background: $price-light-color !important;
border: 2rpx solid $jd-color; border: 2rpx solid $price-color;
font-weight: bold; font-weight: bold;
color: $jd-color !important; color: $price-color !important;
box-sizing: border-box; box-sizing: border-box;
} }
@ -377,7 +377,7 @@ export default {
} }
.goods-price { .goods-price {
color: $jd-color; color: $price-color;
line-height: 80rpx; line-height: 80rpx;
display: flex; display: flex;
} }

2
pages/cart/payment/popup/popup.scss
View File

@ -14,7 +14,7 @@
line-height: 80rpx; line-height: 80rpx;
height: 80rpx; height: 80rpx;
background: $jd-color; background: $price-color;
color: #fff; color: #fff;
border-radius: 200px; border-radius: 200px;
text-align: center; text-align: center;

10
pages/mine/deposit/withdrawal.vue
View File

@ -12,6 +12,10 @@
<view @click="handleAll" :style="{ color: $mainColor }">全部</view> <view @click="handleAll" :style="{ color: $mainColor }">全部</view>
<view style="font-size: 24rpx; color: #999">可提现金额<span>{{ walletNum | unitPrice }}</span>元</view> <view style="font-size: 24rpx; color: #999">可提现金额<span>{{ walletNum | unitPrice }}</span>元</view>
</view> </view>
</view>
<view class="tips">
最低提现金额为1.00元
</view> </view>
</view> </view>
@ -19,7 +23,7 @@
</view> </view>
</template> </template>
<script> <script>
import { getUserWallet,withdrawalApply } from "@/api/members"; import { getUserWallet, withdrawalApply } from "@/api/members";
export default { export default {
data() { data() {
return { return {
@ -67,4 +71,8 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "./style.scss"; @import "./style.scss";
.tips {
font-size: 24rpx;
color: #999;
}
</style> </style>

2
pages/mine/distribution/list.vue
View File

@ -454,7 +454,7 @@ export default {
overflow: hidden; overflow: hidden;
} }
> .-item-price { > .-item-price {
color: $jd-color; color: $price-color;
> span { > span {
font-size: 36rpx; font-size: 36rpx;
} }

2
pages/navigation/search/search.scss
View File

@ -1,7 +1,7 @@
.sort-active { .sort-active {
border: 1px solid $light-color; border: 1px solid $light-color;
color: $light-color; color: $light-color;
background: $jd-light-color !important; background: $price-light-color !important;
} }
.oldKeyList { .oldKeyList {

7
pages/order/invoice/invoiceDetail.vue
View File

@ -205,13 +205,6 @@ export default {
} }
} }
.btn {
font-size: 34rpx;
margin: 60rpx 20rpx;
&::after {
border: none;
}
}
.u-cell { .u-cell {
padding: 35rpx 20rpx; padding: 35rpx 20rpx;
height: 110rpx; height: 110rpx;

8
pages/passport/codeLogin.vue
View File

@ -9,12 +9,13 @@
<div style="display:flex; with:100%;"> <div style="display:flex; with:100%;">
<u-input maxlength="6" v-model="codeForm.code" placeholder="请输入验证码" /> <u-input maxlength="6" v-model="codeForm.code" placeholder="请输入验证码" />
<u-verification-code keep-running unique-key="page-login" :seconds="seconds" @end="end" @start="start" ref="uCode" @change="codeChange"></u-verification-code> <u-verification-code keep-running unique-key="page-login" :seconds="seconds" @end="end" @start="start" ref="uCode" @change="codeChange"></u-verification-code>
<view @tap="getCode" class="text-tips">{{ tips }}</view> <view @tap="getCode" :style="{color:aiderLightColor}" class="text-tips">{{ tips }}</view>
</div> </div>
</u-form-item> </u-form-item>
<view class="submit" @click="submit">登录</view> <view class="submit bg-linear-gradient" @click="submit">登录</view>
<view class="text-tips cell" @click="clickLogin">一键登录</view> <view :style="{color:aiderLightColor}" class="text-tips cell" @click="clickLogin">一键登录</view>
<myVerification v-if="codeFlag" @send="verification" class="verification" ref="verification" business="LOGIN" /> <myVerification v-if="codeFlag" @send="verification" class="verification" ref="verification" business="LOGIN" />
</u-form> </u-form>
</div> </div>
@ -34,6 +35,7 @@ export default {
props: ["status"], //是否勾选 《用户隐私》和《隐私政策》 props: ["status"], //是否勾选 《用户隐私》和《隐私政策》
data() { data() {
return { return {
aiderLightColor: this.$aiderLightColor,
uuid, uuid,
flage: false, //是否验证码验证 flage: false, //是否验证码验证
codeFlag: true, //验证开关，用于是否展示验证码 codeFlag: true, //验证开关，用于是否展示验证码

4
pages/passport/login.scss
View File

@ -6,7 +6,6 @@
margin: 40rpx 0; margin: 40rpx 0;
} }
.login-ball { .login-ball {
background-image: linear-gradient(25deg, #fa123b, #ff6b35, #ff9f28, #ffcc03);
border-bottom-left-radius: 300rpx; border-bottom-left-radius: 300rpx;
height: 400rpx; height: 400rpx;
position: relative; position: relative;
@ -43,8 +42,6 @@ span {
.submit { .submit {
height: 80rpx; height: 80rpx;
line-height: 80rpx; line-height: 80rpx;
background-image: linear-gradient(90deg, #ff6b35, #ff9f28, #ffcc03);
color: #fff; color: #fff;
text-align: center; text-align: center;
font-size: 30rpx; font-size: 30rpx;
@ -61,7 +58,6 @@ span {
} }
.text-tips { .text-tips {
text-align: center; text-align: center;
color: #ff9f28;
} }
.tips { .tips {
position: absolute; position: absolute;

6
pages/passport/login.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<view v-if="mpWechatLogin"> <view v-if="mpWechatLogin">
<!-- 背景 --> <!-- 背景 -->
<view class="login-ball small"></view> <view class="login-ball bg-linear-gradient small"></view>
<view class="logo-cell"> <view class="logo-cell">
<image class="logo" src="/static/logo.png" mode="aspectFit"></image> <image class="logo" src="/static/logo.png" mode="aspectFit"></image>
@ -17,7 +17,7 @@
<!-- 隐私政策 --> <!-- 隐私政策 -->
<div class="privacy"> <div class="privacy">
<u-checkbox-group :icon-size="24" width="45rpx"> <u-checkbox-group :icon-size="24" width="45rpx">
<u-checkbox v-model="value" active-color="rgb(255, 107, 53)"></u-checkbox> <u-checkbox v-model="value" :active-color="lightColor"></u-checkbox>
</u-checkbox-group> </u-checkbox-group>
同意<span @click="handleClick('user')">《用户协议》</span>和<span @click="handleClick('privacy')">《隐私政策》</span> 同意<span @click="handleClick('user')">《用户协议》</span>和<span @click="handleClick('privacy')">《隐私政策》</span>
@ -32,6 +32,7 @@ import storage from "@/utils/storage.js";
import { loginCallback } from "@/api/connect.js"; import { loginCallback } from "@/api/connect.js";
import { webConnect } from "@/api/connect.js"; import { webConnect } from "@/api/connect.js";
export default { export default {
onShow() { onShow() {
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
this.mpWechatLogin = false; this.mpWechatLogin = false;
@ -64,6 +65,7 @@ export default {
}, },
data() { data() {
return { return {
lightColor:this.$lightColor,
mpWechatLogin: true, //是否加载微信登录 mpWechatLogin: true, //是否加载微信登录
value: true, //隐私政策 value: true, //隐私政策
loginData: { loginData: {

3
pages/passport/mp-codeLogin.scss
View File

@ -1,5 +1,4 @@
.verification {
}
/deep/ .u-form-item { /deep/ .u-form-item {
margin: 40rpx 0 !important; margin: 40rpx 0 !important;
padding: 40rpx 0 !important; padding: 40rpx 0 !important;

3
pages/passport/onClickLogin.vue
View File

@ -7,7 +7,7 @@
<u-icon :color="item.color" size="80" :name="item.icon" @click="navigateLogin(item)"></u-icon> <u-icon :color="item.color" size="80" :name="item.icon" @click="navigateLogin(item)"></u-icon>
</div> </div>
</div> </div>
<view class="text-tips cell" @click="clickCodeLogin">账号密码登录</view> <view :style="{color:aiderLightColor}" class="text-tips cell" @click="clickCodeLogin">账号密码登录</view>
</u-form> </u-form>
</div> </div>
</template> </template>
@ -22,6 +22,7 @@ import api from "@/config/api.js";
export default { export default {
data() { data() {
return { return {
aiderLightColor: this.$aiderLightColor,
loginList: [ loginList: [
{ {
icon: "weixin-circle-fill", icon: "weixin-circle-fill",

6
pages/passport/wechatMPLogin.vue
View File

@ -223,15 +223,11 @@ text.shop {
} }
.register { .register {
color: #00a327 !important; color: $weChat-color !important;
border: none !important; border: none !important;
background: #fff !important; background: #fff !important;
} }
.btn {
width: 100%;
text-align: center;
}
.btn-auth { .btn-auth {
width: 92%; width: 92%;

2
pages/product/product/goods/-goods-intro.vue
View File

@ -125,7 +125,7 @@ export default {
width: 52rpx; width: 52rpx;
height: 6rpx; 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 { > .goods-detail-item {

2
pages/product/product/goods/-goods-recommend.vue
View File

@ -148,7 +148,7 @@ export default {
white-space: nowrap; white-space: nowrap;
font-size: 26rpx; font-size: 26rpx;
text-align: left; text-align: left;
color: $jd-color; color: $price-color;
line-height: 23px; line-height: 23px;
font-weight: bold; font-weight: bold;
> span { > span {

2
pages/product/product/popup/address.vue
View File

@ -144,7 +144,7 @@ export default {
font-size: 28rpx; font-size: 28rpx;
} }
.checked { .checked {
background: $jd-color; background: $price-color;
} }
.active { .active {
color: #fff; color: #fff;

8
pages/product/product/popup/goods.vue
View File

@ -322,10 +322,10 @@ export default {
} }
.active { .active {
background: $jd-light-color !important; background: $price-light-color !important;
border: 2rpx solid $jd-color; border: 2rpx solid $price-color;
font-weight: bold; font-weight: bold;
color: $jd-color !important; color: $price-color !important;
box-sizing: border-box; box-sizing: border-box;
} }
@ -377,7 +377,7 @@ export default {
} }
.goods-price { .goods-price {
color: $jd-color; color: $price-color;
line-height: 80rpx; line-height: 80rpx;
display: flex; display: flex;
} }

2
pages/product/product/popup/popup.scss
View File

@ -14,7 +14,7 @@
line-height: 80rpx; line-height: 80rpx;
height: 80rpx; height: 80rpx;
background: $jd-color; background: $price-color;
color: #fff; color: #fff;
border-radius: 200px; border-radius: 200px;
text-align: center; text-align: center;

2
pages/product/product/product.scss
View File

@ -23,7 +23,7 @@
padding-left: 14rpx; padding-left: 14rpx;
position: relative; position: relative;
&::before { &::before {
background-image: linear-gradient(180deg, $jd-color, $jd-light-color); background-image: linear-gradient(180deg, $price-color, $price-light-color);
content: ""; content: "";
position: absolute; position: absolute;
left: 0; left: 0;

4
pages/product/product/promotion/-promotion.vue
View File

@ -94,9 +94,9 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.deg_tag { .deg_tag {
color: $jd-color; color: $price-color;
padding: 0 4rpx; padding: 0 4rpx;
border: 2rpx solid $jd-color; border: 2rpx solid $price-color;
font-size: 22rpx; font-size: 22rpx;
} }

2
pages/product/product/promotion/group.scss
View File

@ -73,7 +73,7 @@
} }
.promotion { .promotion {
font-size: 22rpx; font-size: 22rpx;
border: 2rpx solid $jd-light-color; border: 2rpx solid $price-light-color;
padding: 2rpx 6rpx; padding: 2rpx 6rpx;
margin-left: 10rpx; margin-left: 10rpx;
line-height: 1; line-height: 1;

2
pages/product/product/shop/-shop.vue
View File

@ -209,7 +209,7 @@ export default {
white-space: nowrap; white-space: nowrap;
margin: 18rpx 0; margin: 18rpx 0;
font-size: 22rpx; font-size: 22rpx;
color: $jd-color; color: $price-color;
} }
.recommend-list-con { .recommend-list-con {

8
pages/product/product/style.scss
View File

@ -1,5 +1,5 @@
.red { .red {
color: $jd-color; color: $price-color;
} }
page { page {
background: #fff; background: #fff;
@ -10,8 +10,8 @@ page {
top: 5rpx; top: 5rpx;
padding: 2rpx 6rpx; padding: 2rpx 6rpx;
border-top: 4rpx; border-top: 4rpx;
border: 2rpx solid $jd-color; border: 2rpx solid $price-color;
color: $jd-color; color: $price-color;
font-size: 22rpx; font-size: 22rpx;
border-radius: 200px; border-radius: 200px;
line-height: 18rpx; line-height: 18rpx;
@ -82,7 +82,7 @@ page {
} }
.-goods-price { .-goods-price {
flex: 8; flex: 8;
color: $jd-color; color: $price-color;
font-size: 32rpx; font-size: 32rpx;
line-height: 1; line-height: 1;
/deep/ .price { /deep/ .price {

42
uni.scss
View File

@ -26,11 +26,12 @@ $uni-color-warning: #f0ad4e;
$uni-color-error: #dd524d; $uni-color-error: #dd524d;
/*主题颜色 具体参考 https://ant.design/docs/spec/colors-cn */ /*主题颜色 具体参考 https://ant.design/docs/spec/colors-cn */
/**微信登录按钮颜色 */
$weChat-color:#00a327;
/**主颜色*/ /**主颜色*/
$main-color: #ff3c2a; $main-color: #ff3c2a;
/*用于金钱等颜色 */ /*用于金钱等颜色 */
$jd-color: #ff3c2a; $price-color: #ff3c2a;
/*主题高亮颜色*/ /*主题高亮颜色*/
$light-color: #ff6b35; $light-color: #ff6b35;
/*辅助高亮颜色*/ /*辅助高亮颜色*/
@ -38,8 +39,8 @@ $aider-light-color: #ff9f28;
/*主题高亮背景颜色*/ /*主题高亮背景颜色*/
$main-light-color: #edfcf7; $main-light-color: #edfcf7;
/*京东红高亮背景颜色*/ /*价格红高亮背景颜色*/
$jd-light-color: #fcedeb; $price-light-color: #fcedeb;
/*辅助色*/ /*辅助色*/
$aider-color-red: #ff6262; $aider-color-red: #ff6262;
@ -64,40 +65,23 @@ $font-weight: 400;
} }
.bg-light-color { .bg-light-color {
background-color: $light-color !important; background-color: $light-color !important;
/deep/ *{ /deep/ * {
background-color: $light-color !important; background-color: $light-color !important;
} }
} }
.bg-main-color { .bg-main-color {
background-color: $main-color !important; background-color: $main-color !important;
} }
// 渐变主题颜色
.bg-linear-gradient {
background-image: linear-gradient(25deg, #fa123b, #ff6b35, #ff9f28, #ffcc03);
}
.uni-tabbar .uni-tabbar__icon { .uni-tabbar .uni-tabbar__icon {
width: 20px; width: 20px;
height: 18px; height: 18px;
} }
// 大标题
.h1 {
font-weight: $font-weight-b;
font-style: normal;
font-size: 24px;
}
// 大标题
.h2 {
font-weight: $font-weight-b;
font-style: normal;
font-size: 20px;
}
// 一级标题
.h3 {
font-weight: $font-weight-b;
font-style: normal;
font-size: 18px;
}
.h4 {
font-weight: $font-weight-b;
font-style: normal;
font-size: 16px;
}
.flex { .flex {
display: flex; display: flex;
} }
@ -181,4 +165,4 @@ $font-weight: 400;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
overflow: hidden; overflow: hidden;
} }