Skip to content

M
mallapp
Commit 9bf91384 authored by 黄奎's avatar 黄奎
Browse files
Options

样式修改

parent d937e94f
Hide whitespace changes
Inline Side-by-side
Showing with 174 additions and 107 deletions
components/cats/style44.vue
View file @ 9bf91384
......@@ -84,7 +84,6 @@
v-if="cx.marketingLogo.iswords&&cx.marketingLogo.iswords==2&& cx.marketingLogo.ico!=''"
mode="heightFix" :src="cx.marketingLogo.ico"
style=" height: 12px;margin-right: 5px" />
<view
style="color: #FF4048;background: #fdf6ec;padding: 0 5px;display: inline-block;height: 32rpx;font-size: 20rpx;margin-right: 5rpx;"
v-if="cx.freeShippingFullMoneyPinkage>0 || cx.freeShippingFullNumPinkage>0">
......@@ -113,9 +112,7 @@
{{ cx.price_content }}
</div>
<div v-if="u.TenantId!=27" class="sell">{{ cx.sales }}</div>
</div>
<div v-if="u.TenantId!=27" @click.stop="showSkuHandler(cx)" class="right">
<!-- todo 点击加入购物车-->
<u-icon name="cart-circle-o" size="44" :color="mainColor" />
......@@ -144,8 +141,6 @@
</view>
</view>
</template>
</div>
<u-divider v-if="isover" :margin-top="20" :margin-bottom="20">没有更多商品了</u-divider>
</scroll-view>
......@@ -193,7 +188,6 @@
index2: -1,
index22: -1,
textColor: "#F0F0F0",
mask: false,
mainColor: "",
activeStyle: "",
......@@ -273,7 +267,7 @@
},
res => {
this.loading = false;
console.log("resggg4444444", res);
// console.log("resggg4444444", res);
if (res.resultCode == 1) {
this.subjectslist = res.data
}
......@@ -294,9 +288,6 @@
} else {
this.mask = false
}
// if (i == 1) {
// this.initlist(i)
// }
},
// 内容点击
// 年级不限
......@@ -398,6 +389,7 @@
} else {
uni.navigateTo({
url: "/pages/goods/goods?GoodsId=" + item.id
// url: "/pages/goods/goods?id="
});
}
}
......
pages/address/address2.vue
View file @ 9bf91384
<template>
<view style="position: relative;" class="view-box">
<view class="box">
<view class="box-img">
<!-- <view class="box-img">
<image style="width: 100rpx; height: 50rpx;;"
src='https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_713.png'
mode="aspectFill"></image>
</view>
</view> -->
<view class="box-bg">
<input class="uni-input inputM" style='margin-left: 10px;margin-top: 5px;' v-model="rules.StuName"
<view class="title">
学员姓名
</view>
<input class="uni-input inputM" placeholder-class="placeholderClass" v-model="rules.StuName"
placeholder="请输入学员姓名" maxlength="5" />
</view>
<view class="box-bg">
<view>性别</view>
<view class="gender-name">性别</view>
<view class="xingbie">
<text v-for="(item, i) in goodsist" :key="i" @click="gende(item,i)"
:class="[index==i?'gender':'gender2'] ">{{item.name}}</text>
</view>
</view>
<view class="box-bg" @click="formType(0)">
<input class="uni-input inputM" style='margin-left: 10px;margin-top: 5px;' v-model="rules.StuBirth"
placeholder="公历生日" />
<view class="title">
公历生日
</view>
<input class="uni-input inputM" placeholder-class="placeholderClass" v-model="rules.StuBirth"
placeholder="请选择" />
<view>
<u-icon name="arrow" color="#9F9F9F" size="20"></u-icon>
</view>
</view>
<view class="box-bg">
<input type="number" class="uni-input inputM" style='margin-left: 10px;margin-top: 5px;'
v-model="rules.StuTel" placeholder="请输入手机号" maxlength="11" />
<view class="title">
手机号码
</view>
<input type="number" placeholder-class="placeholderClass" class="uni-input inputM"
v-model="rules.StuTel" placeholder="输入11位手机号" maxlength="11" />
</view>
<view class="box-bg">
<input class="uni-input inputM" style='margin-left: 10px;margin-top: 5px;' v-model="rules.BaseCondition"
placeholder="就读学校" />
<view class="title">
就读学校
</view>
<input class="uni-input inputM" placeholder-class="placeholderClass" v-model="rules.BaseCondition"
placeholder="请选择" />
<view>
<u-icon @click="formType(1)" name="arrow" color="#9F9F9F" size="20"></u-icon>
</view>
</view>
<view class="box-bg" @click="formType(2)">
<input maxlength="0" disabled='true' class="uni-input inputM"
style='margin-left: 10px;margin-top: 5px;' v-model="rules.DemandPoint" placeholder="就读年级" />
<view class="title">
就读年级
</view>
<input maxlength="0" disabled='true' placeholder-class="placeholderClass" class="uni-input inputM"
v-model="rules.DemandPoint" placeholder="请选择" />
<view>
<u-icon name="arrow" color="#9F9F9F" size="20"></u-icon>
</view>
</view>
<view class="box-bg" @click="formType(3)">
<input maxlength="0" class="uni-input inputM" disabled='true'
style='margin-left: 10px;margin-top: 5px;' v-model="rules.School_Id" placeholder="报名校区" />
<view class="title">
报名校区
</view>
<input maxlength="0" placeholder-class="placeholderClass" class="uni-input inputM" disabled='true'
v-model="rules.School_Id" placeholder="请选择" />
<view>
<u-icon name="arrow" color="#9F9F9F" size="20"></u-icon>
</view>
</view>
<view class="box-bg">
<input class="uni-input inputM" style='margin-left: 10px;margin-top: 5px;'
v-model="rules.ConsultingResults" placeholder="如何知道进阶思维" />
<view class="box-bg2">
<view class="title">
如何知道进阶思维
</view>
<textarea class="uni-input2 inputM" type="textarea" placeholder-class="placeholderClass"
v-model="rules.ConsultingResults" placeholder="请输入" />
</view>
<!-- 日历弹窗 -->
<uni-calendar v-show="show" ref="calendar" :insert="false" @confirm="confirm" @close="close" />
......@@ -311,10 +332,37 @@
</script>
<style>
.gender-name{
font-size: 30rpx;
font-family: PingFang SC;
font-weight: 500;
color: #282828
}
.placeholderClass{
font-size: 30rpx;
font-family: PingFang SC;
font-weight: 500;
color: #C8C8C8;
}
.title{
padding-right: 51rpx;
font-size: 30rpx;
font-family: PingFang SC;
font-weight: 500;
color: #282828;
}
.uni-input {
margin-left: 0rpx !important;
flex:1;
font-size: 30rpx;
}
.uni-input2 {
height: 108rpx;
margin-left: 0rpx !important;
flex:1;
line-height: 40rpx;
font-size: 30rpx;
}
.school {
font-size: 22rpx;
}
......@@ -328,26 +376,29 @@
}
.view-box {
padding-top: 40rpx;
background-color: #EEF1FA;
/* padding-top: 40rpx; */
background-color: #F5F5F5;
min-height: 100vh;
padding-bottom: 59rpx;
}
.submit-box {
/* margin-top: 50rpx; */
width: 80%;
width: 280rpx;
height: 88rpx;
background: #C91727;
border-radius: 44px;
display: flex;
justify-content: center;
font-size: 22rpx;
color: #fff;
position: fixed;
bottom: 190rpx;
bottom: 60rpx;
left: 50%;
transform: translate(-50%, 0%);
background-color: #138BF9;
border-radius: 10rpx;
height: 60rpx;
align-items: center;
font-weight: 500;
font-size: 30rpx;
color: #FFF;
}
.list2 {
......@@ -366,14 +417,13 @@
}
.box {
width: 90%;
border-radius: 10rpx;
margin-top: 50rpx;
background: #FFFFFF;
padding-left: 20rpx;
padding-right: 20rpx;
/* width: 90%; */
padding-bottom: 110rpx;
padding-top: 63rpx;
padding-left: 50rpx;
padding-right: 50rpx;
margin: auto;
padding-bottom: 80rpx;
/* padding-bottom: 34rpx; */
border-radius: 20rpx;
}
......@@ -387,49 +437,71 @@
}
.xingbie {
width: 185rpx;
/* width: 185rpx; */
display: flex;
justify-content: space-between;
align-items: center;
margin-left: 110rpx;
width: 160rpx;
}
.gender {
border: 10rpx;
background-color: #E5F3FE;
width: 80rpx;
height: 20px;
font-size: 30rpx;
font-family: PingFang SC;
font-weight: 500;
color: #282828;
width: 55rpx;
height: 55rpx;
background: #16CFEA;
border-radius: 50%;
display: inline-block;
text-align: center;
line-height: 20px;
border-radius: 5rpx;
font-size: 22rpx;
line-height: 55rpx
}
.gender2 {
border: 10rpx;
background-color: #5455;
width: 80rpx;
height: 20px;
font-size: 30rpx;
font-family: PingFang SC;
font-weight: 500;
color: #C8C8C8;
width: 55rpx;
height: 55rpx;
background: #F5F5F5;
border-radius: 50%;
display: inline-block;
text-align: center;
line-height: 20px;
border-radius: 5rpx;
font-size: 22rpx;
line-height: 55rpx;
/* margin-left: 49rpx; */
}
.box-bg {
border-radius: 10rpx;
border: 1px solid #9F9F9F;
margin-bottom: 20rpx;
height: 60rpx;
line-height: 60rpx;
height: 88rpx;
line-height: 88rpx;
background: #FFFFFF;
border-radius: 44rpx;
margin-bottom: 42rpx;
display: flex;
align-items: center;
padding-left: 20rpx;
justify-content: space-between;
padding-right: 20rpx;
padding-left: 51rpx;
/* justify-content: space-between; */
padding-right: 52rpx;
}
.box-bg2 {
height: 224rpx;
line-height: 88rpx;
background: #FFFFFF;
border-radius: 44rpx;
margin-bottom: 42rpx;
/* display: flex;
align-items: center; */
padding-left: 51rpx;
/* justify-content: space-between; */
padding-right: 52rpx;
}
.box-img {
display: flex;
justify-content: center;
......
pages/goods/goods.vue
View file @ 9bf91384
......@@ -171,16 +171,18 @@
class="share-icon" />
<view class="teacher2">
<view class="teacher3">
<view class="teacher4" v-if='g.edu_data.TeacherName'>{{g.edu_data.TeacherName}}</view>
<view class="teacher5"><rich-text :nodes="g.edu_data.TeacherInfo"></rich-text></view>
<view class="teacher4" v-if='g.edu_data.TeacherName'>{{g.edu_data.TeacherName}}</view>
<view class="teacher5">
<rich-text :nodes="g.edu_data.TeacherInfo"></rich-text>
</view>
</view>
<!-- <view class="teacher4">
<!-- <view class="teacher4">
<u-icon name="arrow" :size="32" color="#111"></u-icon>
</view> -->
</view>
</view>
</view>
<!-- 内容2 -->
<!-- 内容2 -->
<view v-if="current==1">
<view class="introduce-box" style="margin-bottom: 20rpx;">
<text class="introduce" :style="{ 'background-color': mc }"></text>
......@@ -231,13 +233,14 @@
</view>
<!-- 切换结束 -->
<!-- 回到顶部 -->
<!-- <view class="the-top" @click="counter">
<!-- <view class="the-top" @click="counter">
<u-icon name="arrow" :size="32" color="#111"></u-icon>
</view> -->
</view>
<!-- id27结束 -->
<view class="sku-box u-skeleton-rect" style="margin: 0;padding: 10px;"
v-if="g.friendUrl!=null && g.friendUrl!=''&&setting.is_show_korea==0 &&u.TenantId!=27" @click="goCoiling(g.friendUrl)">
<view class="sku-box u-skeleton-rect" style="margin: 0;padding: 10px;"
v-if="g.friendUrl!=null && g.friendUrl!=''&&setting.is_show_korea==0 &&u.TenantId!=27"
@click="goCoiling(g.friendUrl)">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/goodsCoiling.png"
style="width: 100%;height: 68px;" />
</view>
......@@ -312,12 +315,14 @@
<view class="label">发货地</view>
<view class="content">{{g.sendArea }}</view>
</view>
<view class="sku-box u-skeleton-rect" v-if="setting.is_express == '1'&&setting.is_show_korea==0&&u.TenantId!=27">
<view class="sku-box u-skeleton-rect"
v-if="setting.is_express == '1'&&setting.is_show_korea==0&&u.TenantId!=27">
<view class="label">快递</view>
<view class="content">{{ g.express == '' ? '免运费' : '￥' + g.express }}</view>
</view>
<view class="sku-box u-skeleton-rect" style="margin-top: -10;" v-if="g.goods_marketing.shipping != ''&&u.TenantId!=27">
<view class="sku-box u-skeleton-rect" style="margin-top: -10;"
v-if="g.goods_marketing.shipping != ''&&u.TenantId!=27">
<view class="label">包邮</view>
<view class="content">{{ g.goods_marketing.shipping }}</view>
</view>
......@@ -364,7 +369,8 @@
<view class="ucontent">{{ comments[0].Content }}</view>
</view>
</view>
<u-divider v-if='u.TenantId!=27':margin-top="20" :margin-bottom="20" bg-color="transparent">商品详情</u-divider>
<u-divider v-if='u.TenantId!=27' :margin-top="20" :margin-bottom="20" bg-color="transparent">商品详情
</u-divider>
<view class="details" v-if='u.TenantId!=27'>
<h-parse v-if="AppletID!=5" :content="detailContent" @navigate="clickDescription"></h-parse>
<!-- 甲鹤等于5 -->
......@@ -398,8 +404,9 @@
<view class="goodComentBtn" @click="submitCommit">提交留言</view>
</view>
</template>
<u-divider v-if='u.TenantId!=27' :margin-top="20" :margin-bottom="20" bg-color="transparent">或许你喜欢</u-divider>
<view v-if='u.TenantId!=27' style="width: calc(100vw - 20px); margin-left: 10px; overflow: hidden;">
<u-divider v-if='u.TenantId!=27' :margin-top="20" :margin-bottom="20" bg-color="transparent">或许你喜欢
</u-divider>
<view v-if='u.TenantId!=27' style="width: calc(100vw - 20px); margin-left: 10px; overflow: hidden;">
<goodlist :list="recommend"></goodlist>
</view>
<u-skeleton v-if="loading" :loading="true" :animation="true" bgcolor="#FFF"></u-skeleton>
......@@ -413,27 +420,29 @@
:good-id="id" :total-stock="g.totalStock" :status="g.status" @buy="buy">
</kotragoodsaction>
</template>
<goodsku v-if="!loading && showSku&&u.TenantId!=27" border-radius="10" v-model="showSku" :mask-close-able="true"
:safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku" @close="closeSkuChosen">
<goodsku v-if="!loading && showSku&&u.TenantId!=27" border-radius="10" v-model="showSku"
:mask-close-able="true" :safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku"
@close="closeSkuChosen">
</goodsku>
<template v-if="u&&u.TenantId==27">
<goodsku2 v-if="!loading && showSku" border-radius="10" v-model="showSku" :mask-close-able="true"
:safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku" @close="closeSkuChosen">
</goodsku2>
</template>
<template v-else>
<goodsku v-if="!loading && showSku" border-radius="10" v-model="showSku" :mask-close-able="true"
:safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku" @close="closeSkuChosen">
</goodsku>
</template>
<goodsku2 v-if="!loading && showSku" border-radius="10" v-model="showSku" :mask-close-able="true"
:safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku"
@close="closeSkuChosen">
</goodsku2>
</template>
<template v-else>
<goodsku v-if="!loading && showSku" border-radius="10" v-model="showSku" :mask-close-able="true"
:safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku"
@close="closeSkuChosen">
</goodsku>
</template>
</view>
<u-empty text="没有找到商品，或商品已下架" mode="favor" v-if="!isExsitGoods"></u-empty>
<share :good-id="id" v-if="showShare" :good-name="g.name" :images="g.pic_url" :advertising="g.advertising"
@close="closeShare"></share>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
<coupon v-if="showCoupons" :coupon-message="couponMessage" @goLook="goLook" @closeBtn="closeBtn"></coupon>
</view>
</template>
......@@ -529,12 +538,11 @@
hParse
},
onPageScroll(e) {
this.scrollTop = e.scrollTop;
},
this.scrollTop = e.scrollTop;
},
onLoad(option) {
this.opTionObj = option;
console.log(option, "option");
if (option && option.id) {
this.id = option.id ? option.id : 29; //40887 59512 46942
} else {
......@@ -597,12 +605,9 @@
this.init();
this.initPage();
this.getVipId();
this.mc = this.$uiConfig.mainColor;
this.secondary = this.$uiConfig.secondary;
this.setting = uni.getStorageSync("basedata").mall.setting;
wx.showShareMenu({
withShareTicket: true,
menus: ["shareAppMessage", "shareTimeline"],
......@@ -672,8 +677,6 @@
setTimeout(() => {
this.initImages();
}, 3000);
},
methods: {
// counter() {
......@@ -1084,24 +1087,27 @@
</script>
<style>
.the-top{
.the-top {
position: absolute;
top: 82%;
right: 0%;
width: 50px;
height: 50px;
}
.information-list{
.information-list {
color: #999;
margin-bottom: 50rpx;
}
.information-list2{
.information-list2 {
margin-left: 50rpx;
}
.teacher {
display: flex;
justify-content: space-between;
/* align-items: center; */
/* align-items: center; */
margin-bottom: 50rpx;
}
......
pages/goods/goods2.vue
View file @ 9bf91384
......@@ -477,7 +477,6 @@ export default {
this.opTionObj = option;
console.log(option, "option");
if (option && option.id) {
this.id = option.id ? option.id : 29; //40887 59512 46942
} else {
......@@ -605,8 +604,6 @@ export default {
setTimeout(() => {
this.initImages();
}, 3000);
},
methods: {
clickDescription(e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment