Skip to content

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

样式调整

parent 8811c653
Hide whitespace changes
Inline Side-by-side
Showing with 268 additions and 318 deletions
components/goods/goodsku.vue
View file @ 1c417703
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
<scroll-view scroll-y class="sku-box"> <scroll-view scroll-y class="sku-box">
<view class="sku-item" v-for="(x, i) in g.attr_groups" :key="i"> <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>
<view class="sku-chi" :style="{ <view class="sku-chi" :style="{
background: y.attr_id == x.checkId ? mc : '#eee', background: y.attr_id == x.checkId ? mc : '#eee',
...@@ -29,6 +30,7 @@ ...@@ -29,6 +30,7 @@
<image :src="y.pic_url" class="img" v-if="i == 0 && y.pic_url"></image> <image :src="y.pic_url" class="img" v-if="i == 0 && y.pic_url"></image>
<text class="val">{{ y.attr_name }}</text> <text class="val">{{ y.attr_name }}</text>
</view> </view>
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
......
components/tabbar/index.vue
View file @ 1c417703
<style scoped> <style scoped>
.tabbarMain { .tabbarMain {
/* height: 150upx; */ position: fixed;
position: fixed; z-index: 50;
z-index: 50; flex: 1;
flex: 1; bottom: 0;
bottom: 0; left: 0;
left: 0; right: 0;
right: 0; z-index: 99999999;
z-index: 99999999; border-top: 1upx solid #ddd;
border-top: 1upx solid #ddd; padding-top: 20rpx;
padding-top: 20rpx; background: #fff;
background: #fff; }
}
.tabbarMainIphone { .tabbarMainIphone {
/* height: 156upx; */ /* height: 156upx; */
/* padding-bottom: 64upx; */ /* padding-bottom: 64upx; */
} }
.tabBtnMina {
width: 750upx; .tabBtnMina {
/* height: 88upx; */ width: 750upx;
/* position: absolute; flex-direction: row;
z-index: 2; /* #ifndef */
bottom: 0; */ /* padding-bottom: constant(safe-area-inset-top);
flex-direction: row;
/* #ifndef */
/* padding-bottom: constant(safe-area-inset-top);
padding-bottom: env(safe-area-inset-top); */ padding-bottom: env(safe-area-inset-top); */
/* #endif */ /* #endif */
display: flex; display: flex;
left: 0; left: 0;
right: 0; right: 0;
z-index: 99999; z-index: 99999;
} }
.tabBtnMinaIphone {
/* height: 156upx; */ .tabBtnMinaIphone {
/* padding-bottom: 64upx; */ /* height: 156upx; */
} /* padding-bottom: 64upx; */
.imgse { }
/* width: 48upx; */
height: 48upx; .imgse {
width: auto; height: 48upx;
} width: auto;
.txtBtn { }
font-size: 24upx;
color: #666666; .txtBtn {
} font-size: 24upx;
.txtBtnSel { color: #666666;
font-size: 24upx; }
color: #333333;
} .txtBtnSel {
.itmMain { font-size: 24upx;
/* width: 250upx; */ color: #333333;
width: 150upx; }
flex: 1;
justify-content: center; .itmMain {
align-items: center; width: 150upx;
display: flex; flex: 1;
flex-direction: column; justify-content: center;
} align-items: center;
.imgseTs { display: flex;
width: 150upx; flex-direction: column;
height: 140upx; }
margin-bottom: 90upx;
position: relative; .imgseTs {
z-index: 1; width: 150upx;
bottom: 0upx; height: 140upx;
} margin-bottom: 90upx;
position: relative;
z-index: 1;
bottom: 0upx;
}
.btnfixMin { .btnfixMin {
width: 750upx; width: 750upx;
height: 178upx; height: 178upx;
position: absolute; position: absolute;
z-index: 1; z-index: 1;
bottom: 0; bottom: 0;
} }
.btnfixMinIphone {
bottom: 64upx; .btnfixMinIphone {
} bottom: 64upx;
.fixTpm { }
width: 150upx;
height: 140upx; .fixTpm {
flex-direction: row; width: 150upx;
justify-content: center; height: 140upx;
align-items: center; flex-direction: row;
position: relative; justify-content: center;
z-index: 0; align-items: center;
} position: relative;
.imgseTsAnds { z-index: 0;
width: 150upx; }
height: 150upx;
position: fixed; .imgseTsAnds {
z-index: 1; width: 150upx;
bottom: 10upx; height: 150upx;
border-radius: 150upx; position: fixed;
} z-index: 1;
/* ----------------不显示图标导航样式-------------- */ bottom: 10upx;
.txtBtn2 { border-radius: 150upx;
font-size: 26rpx; }
font-family: PingFang SC;
font-weight: 500; /* ----------------不显示图标导航样式-------------- */
color: #b2b3b4; .txtBtn2 {
} font-size: 26rpx;
.activeTxtBtn2 { font-family: PingFang SC;
font-size: 32rpx; font-weight: 500;
font-family: PingFang SC; color: #b2b3b4;
font-weight: 800; }
/* color: #111111; */
} .activeTxtBtn2 {
font-size: 32rpx;
font-family: PingFang SC;
font-weight: 800;
}
</style> </style>
<template> <template>
<view> <view>
<view v-if="isShowIcon === 1"> <view v-if="isShowIcon === 1">
<view <view class="tabbarMain" :class="[flagTypeInfo ? 'tabbarMainIphone' : '']" :style="{'position':'fixed','left':'0','right':'0','padding-bottom':paddingBottom + 'rpx'}"
class="tabbarMain" v-if="navs && navs.length > 0">
:class="[flagTypeInfo ? 'tabbarMainIphone' : '']" <view class="tabBtnMina" mode="">
:style="{'position':'fixed','left':'0','right':'0','padding-bottom':paddingBottom + 'rpx'}" <view class="itmMain" v-for="(x, i) in navs" :key="i" @click.stop="goUrl(x.url)">
v-if="navs && navs.length > 0" <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>
<!-- 'height':height+'rpx', --> <text class="txtBtn" :style="{ color: active == i ? x.active_color : x.color }">{{ x.text }}</text>
<view </view>
class="tabBtnMina" </view>
mode="" </view>
> </view>
<!-- 'height':height+'upx', --> <view v-if="isShowIcon === 0">
<view <view class="tabbarMain" :class="[flagTypeInfo ? 'tabbarMainIphone' : '']" :style="{'padding-bottom':'64upx'}" v-if="navs && navs.length > 0">
class="itmMain" <view class="tabBtnMina" :class="[flagTypeInfo ? 'tabBtnMinaIphone' : '']" mode="">
v-for="(x, i) in navs" <view class="itmMain" v-for="(x, i) in navs" :key="i" @click.stop="goUrl(x.url)">
:key="i" <text class="txtBtn2" :class="{ activeTxtBtn2: active == i }" :style="{ color: active == i ? x.active_color : x.color }">{{ x.text }}</text>
@click.stop="goUrl(x.url)" </view>
> </view>
<image </view>
class="imgse" </view>
:fade-show="false" </view>
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>
</view>
</view>
</view>
</view>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
active: 0, active: 0,
platforms: "", platforms: "",
leftWidth: 0, leftWidth: 0,
flagTypeInfo: false, flagTypeInfo: false,
navs: [], navs: [],
crtPath: "", crtPath: "",
isShowIcon: 1, isShowIcon: 1,
paddingBottom:"", paddingBottom: "",
height:"" height: ""
}; };
}, },
created() { created() {
console.log("A join..."); let data = uni.getStorageSync("basedata");
let data = uni.getStorageSync("basedata"); if (data) {
if (data) { this.isShowIcon = data.navbar.isShowIcon;
this.isShowIcon = data.navbar.isShowIcon; } else {
} else { this.isShowIcon = 1;
this.isShowIcon = 1; }
} },
}, mounted() {
mounted() { this.flagTypeInfo = this.$uiConfig.is_bang;
console.log("B join..."); let tempSystem = uni.getSystemInfoSync();
this.flagTypeInfo = this.$uiConfig.is_bang; this.platforms = tempSystem.platform;
let tempSystem = uni.getSystemInfoSync(); this.$nextTick(() => {
this.platforms = tempSystem.platform; // #ifdef APP-NVUE || APP-PLUS || APP-PLUS-NVUE ||APP-VUE
if (this.platforms == "android") {
this.$nextTick(() => { let temp = this.$refs.leftWidth;
// #ifdef APP-NVUE || APP-PLUS || APP-PLUS-NVUE ||APP-VUE this.leftWidth = tempSystem.screenWidth / 2;
if (this.platforms == "android") { }
let temp = this.$refs.leftWidth; // #endif
this.leftWidth = tempSystem.screenWidth / 2; });
} if (uni.getStorageSync("navs")) {
// #endif this.navs = [];
}); if (uni.getStorageSync("navs")) {
if (uni.getStorageSync("navs")) { this.navs = uni.getStorageSync("navs")
this.navs = uni.getStorageSync("navs") ?? []; }
} else { } else {
setTimeout(() => { setTimeout(() => {
this.navs = uni.getStorageSync("navs") ?? []; this.navs = [];
this.activeHandler(); if (uni.getStorageSync("navs")) {
}, 3000); this.navs = uni.getStorageSync("navs")
} }
this.activeHandler(); this.activeHandler();
let that=this }, 3000);
wx.getSystemInfo({ }
success(res) { this.activeHandler();
let lift=res.screenHeight-res.safeArea.bottom let that = this
that.paddingBottom = Number(lift)+20 wx.getSystemInfo({
success(res) {
} let lift = res.screenHeight - res.safeArea.bottom
}) that.paddingBottom = Number(lift) + 20
// let port = uni.getSystemInfoSync().platform }
// switch (port) { })
// case 'android': },
// this.height = '140' methods: {
// this.paddingBottom = '20' activeHandler() {
// console.log('运行Android上',port);//android let t = getCurrentPages();
// break; let query = t[t.length - 1].__displayReporter.query;
// case 'ios': let queryString = "";
// this.height = '160' for (var k in query) {
// this.paddingBottom = '58' queryString += `&${k}=${query[k]}`;
// console.log('运行iOS上',port);//ios }
// break; if (queryString != "") {
// default: queryString = "?" + queryString.substring(1, queryString.length);
// this.height = '160' }
// this.paddingBottom = '58' this.crtPath = "/" + t[t.length - 1].route + queryString;
// console.log('运行在开发者工具上');//devtools console.log(this.crtPath);
// break; this.navs.forEach((x, i) => {
// } if (x.url == this.crtPath) {
}, this.active = i;
// activated(){ }
// if(uni.getStorageSync("navs")){ });
// this.navs = uni.getStorageSync("navs")??[]; },
// }else{ goUrl(url) {
// setTimeout(()=>{ if (this.crtPath != url) {
// this.navs = uni.getStorageSync("navs")??[]; uni.redirectTo({
// this.activeHandler(); url: url,
// },3000) });
// } } else {
// this.activeHandler(); uni.reLaunch({
// }, url: url,
methods: { });
activeHandler() { }
let t = getCurrentPages(); },
let query = t[t.length - 1].__displayReporter.query; },
let queryString = ""; };
for (var k in query) {
queryString += `&${k}=${query[k]}`;
}
if (queryString != "") {
queryString = "?" + queryString.substring(1, queryString.length);
}
this.crtPath = "/" + t[t.length - 1].route + queryString;
console.log(this.crtPath);
this.navs.forEach((x, i) => {
if (x.url == this.crtPath) {
this.active = i;
}
});
},
goUrl(url) {
if (this.crtPath != url) {
uni.redirectTo({
url: url,
});
} else {
uni.reLaunch({
url: url,
});
}
},
},
};
</script> </script>
pages/goods/goods.vue
View file @ 1c417703
...@@ -1273,8 +1273,8 @@ ...@@ -1273,8 +1273,8 @@
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 2; /* -webkit-line-clamp: 2;
-webkit-box-orient: vertical; -webkit-box-orient: vertical; */
font-size: 16px; font-size: 16px;
/* height: 45px; */ /* height: 45px; */
margin-bottom: 10rpx; margin-bottom: 10rpx;
......
pages/order-submit/order-submit.vue
View file @ 1c417703
...@@ -118,14 +118,27 @@ ...@@ -118,14 +118,27 @@
</view> </view>
<!--和平航旅联系人--> <!--和平航旅联系人-->
<view class="goods" v-if="mallUserInfo.TenantId==29 && shanglvForm &&shanglvForm.length>0"> <view class="goods" v-if="mallUserInfo.TenantId==29 && shanglvForm &&shanglvForm.length>0">
<template v-for="(sItem,sIndex) in shanglvForm"> <view class="store">
<singleText v-if="sItem.CompKey=='SingleLineText'" :CompData="sItem.CompData" :index='sIndex' @success="datasuccess()"></singleText> <text style="margin-left: 10px;">联系人信息</text>
<multipleText v-if="sItem.CompKey=='MultiLineText'" :CompData="sItem.CompData" :index='sIndex' @success="datasuccess()"></multipleText> </view>
<view class="addcenter">
<template v-for="(sItem,sIndex) in shanglvForm">
<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> <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> <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> <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> </template>
</view>
</view> </view>
<view class="discountbox"> <view class="discountbox">
<view class="filed"> <view class="filed">
...@@ -1075,4 +1088,25 @@ ...@@ -1075,4 +1088,25 @@
margin-right: 5rpx; margin-right: 5rpx;
border-radius: 4px; 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> </style>
plugin/api.js
View file @ 1c417703
...@@ -4,7 +4,7 @@ export default { ...@@ -4,7 +4,7 @@ export default {
//Vue.prototype.host2 = "http://192.168.10.128:8200" //Vue.prototype.host2 = "http://192.168.10.128:8200"
//Vue.prototype.host3 = "http://192.168.10.128:8900"//本地 //Vue.prototype.host3 = "http://192.168.10.128:8900"//本地
Vue.prototype.host2 = "https://mallApi.oytour.com" //测试 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 = "http://192.168.10.128:8900"//本地
Vue.prototype.host3 = "https://jjeduapi.oytour.com" //测试 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