Skip to content

M
mallapp
Commit 1c417703 authored by 黄奎's avatar 黄奎
Browse files
Options

样式调整

parent 8811c653
Show whitespace changes
Inline Side-by-side
Showing with 268 additions and 318 deletions
components/goods/goodsku.vue
View file @ 1c417703
......@@ -19,7 +19,8 @@
<scroll-view scroll-y class="sku-box">
<view class="sku-item" v-for="(x, i) in g.attr_groups" :key="i">
<view class="sku-title">{{ x.attr_group_name }}</view>
<!--x.isdateformat=1 改成日历模式 -->
<view class="sku-title">{{ x.attr_group_name }} </view>
<view>
<view class="sku-chi" :style="{
background: y.attr_id == x.checkId ? mc : '#eee',
......@@ -29,6 +30,7 @@
<image :src="y.pic_url" class="img" v-if="i == 0 && y.pic_url"></image>
<text class="val">{{ y.attr_name }}</text>
</view>
</view>
</view>
</scroll-view>
......
components/tabbar/index.vue
View file @ 1c417703
<style scoped>
.tabbarMain {
/* height: 150upx; */
.tabbarMain {
position: fixed;
z-index: 50;
flex: 1;
......@@ -11,17 +10,15 @@
border-top: 1upx solid #ddd;
padding-top: 20rpx;
background: #fff;
}
.tabbarMainIphone {
}
.tabbarMainIphone {
/* height: 156upx; */
/* padding-bottom: 64upx; */
}
.tabBtnMina {
}
.tabBtnMina {
width: 750upx;
/* height: 88upx; */
/* position: absolute;
z-index: 2;
bottom: 0; */
flex-direction: row;
/* #ifndef */
/* padding-bottom: constant(safe-area-inset-top);
......@@ -31,53 +28,59 @@
left: 0;
right: 0;
z-index: 99999;
}
.tabBtnMinaIphone {
}
.tabBtnMinaIphone {
/* height: 156upx; */
/* padding-bottom: 64upx; */
}
.imgse {
/* width: 48upx; */
}
.imgse {
height: 48upx;
width: auto;
}
.txtBtn {
}
.txtBtn {
font-size: 24upx;
color: #666666;
}
.txtBtnSel {
}
.txtBtnSel {
font-size: 24upx;
color: #333333;
}
.itmMain {
/* width: 250upx; */
}
.itmMain {
width: 150upx;
flex: 1;
justify-content: center;
align-items: center;
display: flex;
flex-direction: column;
}
.imgseTs {
}
.imgseTs {
width: 150upx;
height: 140upx;
margin-bottom: 90upx;
position: relative;
z-index: 1;
bottom: 0upx;
}
}
.btnfixMin {
.btnfixMin {
width: 750upx;
height: 178upx;
position: absolute;
z-index: 1;
bottom: 0;
}
.btnfixMinIphone {
}
.btnfixMinIphone {
bottom: 64upx;
}
.fixTpm {
}
.fixTpm {
width: 150upx;
height: 140upx;
flex-direction: row;
......@@ -85,112 +88,50 @@
align-items: center;
position: relative;
z-index: 0;
}
.imgseTsAnds {
}
.imgseTsAnds {
width: 150upx;
height: 150upx;
position: fixed;
z-index: 1;
bottom: 10upx;
border-radius: 150upx;
}
/* ----------------不显示图标导航样式-------------- */
.txtBtn2 {
}
/* ----------------不显示图标导航样式-------------- */
.txtBtn2 {
font-size: 26rpx;
font-family: PingFang SC;
font-weight: 500;
color: #b2b3b4;
}
.activeTxtBtn2 {
}
.activeTxtBtn2 {
font-size: 32rpx;
font-family: PingFang SC;
font-weight: 800;
/* color: #111111; */
}
}
</style>
<template>
<view>
<view v-if="isShowIcon === 1">
<view
class="tabbarMain"
:class="[flagTypeInfo ? 'tabbarMainIphone' : '']"
:style="{'position':'fixed','left':'0','right':'0','padding-bottom':paddingBottom + 'rpx'}"
v-if="navs && navs.length > 0"
>
<!-- 'height':height+'rpx', -->
<view
class="tabBtnMina"
mode=""
>
<!-- 'height':height+'upx', -->
<view
class="itmMain"
v-for="(x, i) in navs"
:key="i"
@click.stop="goUrl(x.url)"
>
<image
class="imgse"
:fade-show="false"
v-if="active != i"
mode="heightFix"
:src="x.icon"
></image>
<image
class="imgse"
:fade-show="false"
v-if="active === i"
mode="heightFix"
:src="x.active_icon"
></image>
<text
class="txtBtn"
:style="{ color: active == i ? x.active_color : x.color }"
>{{ x.text }}</text
>
<view class="tabbarMain" :class="[flagTypeInfo ? 'tabbarMainIphone' : '']" :style="{'position':'fixed','left':'0','right':'0','padding-bottom':paddingBottom + 'rpx'}"
v-if="navs && navs.length > 0">
<view class="tabBtnMina" mode="">
<view class="itmMain" v-for="(x, i) in navs" :key="i" @click.stop="goUrl(x.url)">
<image class="imgse" :fade-show="false" v-if="active != i" mode="heightFix" :src="x.icon"></image>
<image class="imgse" :fade-show="false" v-if="active === i" mode="heightFix" :src="x.active_icon"></image>
<text class="txtBtn" :style="{ color: active == i ? x.active_color : x.color }">{{ x.text }}</text>
</view>
</view>
</view>
</view>
<view v-if="isShowIcon === 0">
<view
class="tabbarMain"
:class="[flagTypeInfo ? 'tabbarMainIphone' : '']"
:style="{'padding-bottom':'64upx'}"
v-if="navs && navs.length > 0"
>
<view
class="tabBtnMina"
:class="[flagTypeInfo ? 'tabBtnMinaIphone' : '']"
mode=""
>
<view
class="itmMain"
v-for="(x, i) in navs"
:key="i"
@click.stop="goUrl(x.url)"
>
<!-- <image
class="imgse"
:fade-show="false"
v-if="active != i"
mode="heightFix"
:src="x.icon"
></image>
<image
class="imgse"
:fade-show="false"
v-if="active === i"
mode="heightFix"
:src="x.active_icon"
></image> -->
<text
class="txtBtn2"
:class="{ activeTxtBtn2: active == i }"
:style="{ color: active == i ? x.active_color : x.color }"
>{{ x.text }}</text
>
<view class="tabbarMain" :class="[flagTypeInfo ? 'tabbarMainIphone' : '']" :style="{'padding-bottom':'64upx'}" v-if="navs && navs.length > 0">
<view class="tabBtnMina" :class="[flagTypeInfo ? 'tabBtnMinaIphone' : '']" mode="">
<view class="itmMain" v-for="(x, i) in navs" :key="i" @click.stop="goUrl(x.url)">
<text class="txtBtn2" :class="{ activeTxtBtn2: active == i }" :style="{ color: active == i ? x.active_color : x.color }">{{ x.text }}</text>
</view>
</view>
</view>
......@@ -199,7 +140,7 @@
</template>
<script>
export default {
export default {
data() {
return {
active: 0,
......@@ -209,12 +150,11 @@ export default {
navs: [],
crtPath: "",
isShowIcon: 1,
paddingBottom:"",
height:""
paddingBottom: "",
height: ""
};
},
created() {
console.log("A join...");
let data = uni.getStorageSync("basedata");
if (data) {
this.isShowIcon = data.navbar.isShowIcon;
......@@ -223,11 +163,9 @@ export default {
}
},
mounted() {
console.log("B join...");
this.flagTypeInfo = this.$uiConfig.is_bang;
let tempSystem = uni.getSystemInfoSync();
this.platforms = tempSystem.platform;
this.$nextTick(() => {
// #ifdef APP-NVUE || APP-PLUS || APP-PLUS-NVUE ||APP-VUE
if (this.platforms == "android") {
......@@ -237,52 +175,28 @@ export default {
// #endif
});
if (uni.getStorageSync("navs")) {
this.navs = uni.getStorageSync("navs") ?? [];
this.navs = [];
if (uni.getStorageSync("navs")) {
this.navs = uni.getStorageSync("navs")
}
} else {
setTimeout(() => {
this.navs = uni.getStorageSync("navs") ?? [];
this.navs = [];
if (uni.getStorageSync("navs")) {
this.navs = uni.getStorageSync("navs")
}
this.activeHandler();
}, 3000);
}
this.activeHandler();
let that=this
let that = this
wx.getSystemInfo({
success(res) {
let lift=res.screenHeight-res.safeArea.bottom
that.paddingBottom = Number(lift)+20
let lift = res.screenHeight - res.safeArea.bottom
that.paddingBottom = Number(lift) + 20
}
})
// let port = uni.getSystemInfoSync().platform
// switch (port) {
// case 'android':
// this.height = '140'
// this.paddingBottom = '20'
// console.log('运行Android上',port);//android
// break;
// case 'ios':
// this.height = '160'
// this.paddingBottom = '58'
// console.log('运行iOS上',port);//ios
// break;
// default:
// this.height = '160'
// this.paddingBottom = '58'
// console.log('运行在开发者工具上');//devtools
// break;
// }
},
// activated(){
// if(uni.getStorageSync("navs")){
// this.navs = uni.getStorageSync("navs")??[];
// }else{
// setTimeout(()=>{
// this.navs = uni.getStorageSync("navs")??[];
// this.activeHandler();
// },3000)
// }
// this.activeHandler();
// },
methods: {
activeHandler() {
let t = getCurrentPages();
......@@ -314,5 +228,5 @@ export default {
}
},
},
};
};
</script>
pages/goods/goods.vue
View file @ 1c417703
......@@ -1273,8 +1273,8 @@
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
/* -webkit-line-clamp: 2;
-webkit-box-orient: vertical; */
font-size: 16px;
/* height: 45px; */
margin-bottom: 10rpx;
......
pages/order-submit/order-submit.vue
View file @ 1c417703
......@@ -118,15 +118,28 @@
</view>
<!--和平航旅联系人-->
<view class="goods" v-if="mallUserInfo.TenantId==29 && shanglvForm &&shanglvForm.length>0">
<view class="store">
<text style="margin-left: 10px;">联系人信息</text>
</view>
<view class="addcenter">
<template v-for="(sItem,sIndex) in shanglvForm">
<singleText v-if="sItem.CompKey=='SingleLineText'" :CompData="sItem.CompData" :index='sIndex' @success="datasuccess()"></singleText>
<multipleText v-if="sItem.CompKey=='MultiLineText'" :CompData="sItem.CompData" :index='sIndex' @success="datasuccess()"></multipleText>
<template v-if="sItem.CompKey=='SingleLineText'">
<view class="addcenter_item2">
<text><text style="color:red;width:5px;" v-show="sItem.CompData.IsRequire">*</text>{{sItem.CompData.Name}}</text>
<input class="uni-input inputM" v-model="sItem.CompData.TextValue" />
</view>
<view style="width: 100%;height: 1px;background: #f5f5f5;" />
</template>
<!-- <multipleText v-if="sItem.CompKey=='MultiLineText'" :CompData="sItem.CompData" :index='sIndex' @success="datasuccess()"></multipleText>
<selectChoice v-if="sItem.CompKey=='DorpDownList'" :CompData="sItem.CompData" :index='sIndex' @success="datasuccess()"></selectChoice>
<pictureUpload v-if="sItem.CompKey=='ImageUploadComp'" :CompData="sItem.CompData" :index='sIndex' @success="datasuccess()"></pictureUpload>
<videoUpload v-if="sItem.CompKey=='VideoUploadComp'" :CompData="sItem.CompData" :index='sIndex' @success="datasuccess()"></videoUpload>
<fileType v-if="sItem.CompKey=='CommonUploadComp'" :CompData="sItem.CompData" :index='sIndex' @success="datasuccess()"></fileType>
<fileType v-if="sItem.CompKey=='CommonUploadComp'" :CompData="sItem.CompData" :index='sIndex' @success="datasuccess()"></fileType> -->
</template>
</view>
</view>
<view class="discountbox">
<view class="filed">
<view class="left">优惠券</view>
......@@ -1075,4 +1088,25 @@
margin-right: 5rpx;
border-radius: 4px;
}
.ordersubmit .addcenter {
background: #FFFFFF;
}
.ordersubmit .addcenter_item2 {
width: 100%;
padding: 20rpx 28rpx;
color: #303133;
font-size: 28rpx;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.ordersubmit .inputM {
margin-left: 20rpx;
width: 70%;
text-align: right;
}
</style>
plugin/api.js
View file @ 1c417703
......@@ -4,7 +4,7 @@ export default {
//Vue.prototype.host2 = "http://192.168.10.128:8200"
//Vue.prototype.host3 = "http://192.168.10.128:8900"//本地
Vue.prototype.host2 = "https://mallApi.oytour.com" //测试
Vue.prototype.host2 = "http://192.168.10.68:5000"
//Vue.prototype.host2 = "http://192.168.10.68:8200"
//进阶思维后台地址
//Vue.prototype.host3 = "http://192.168.10.128:8900"//本地
Vue.prototype.host3 = "https://jjeduapi.oytour.com" //测试
......
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