Skip to content

H
hs-app-project
Commit 77364ced authored by Zheng Shang Jun's avatar Zheng Shang Jun
Browse files
Options

修改样式bug3

parent 5f571ba7
Hide whitespace changes
Inline Side-by-side
Showing with 419 additions and 369 deletions
.hbuilderx/launch.json
View file @ 77364ced
......@@ -2,6 +2,10 @@
// launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
"version": "0.0",
"configurations": [{
"app-plus" :
{
"launchtype" : "local"
},
"default" :
{
"launchtype" : "local"
......
src/pages.json
View file @ 77364ced
......@@ -518,5 +518,15 @@
"navigationBarTitleText": "uni-app",
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8"
}
},
"condition" : { //模式配置，仅开发期间生效
"current": 0, //当前激活的模式(list 的索引项)
"list": [
{
"name": "", //模式名称
"path": "", //启动页面，必选
"query": "" //启动参数，在页面的onLoad函数里面得到
}
]
}
}
src/pages/brands/brands.vue
View file @ 77364ced
......@@ -28,7 +28,7 @@
<image
v-for="(item, index) in dailyNewStyleList"
:key="index"
:src="`${imgUrl}${item.originalImageCode}`"
:src="`${imgUrl}${item.effectPictureCode}`"
mode="aspectFit"
></image>
</view>
......@@ -74,7 +74,7 @@ export default {
return {
fabricObj: "",
dailyNewStyleList: [], //每日上新的数据
hotStylePage: [{ id: 1 }], //款式的数据
hotStylePage: [], //款式的数据
imgUrl: this.$IMG_URL, // 图片前面的url
background: {
backgroundColor: "rgba(245,245,245,0)",
......
src/pages/brands/collection.vue
View file @ 77364ced
......@@ -120,11 +120,11 @@ export default {
// 底部占位符
.mask-template1 {
width: 100%;
height: 100rpx;
height: 150rpx;
}
.mask-template2 {
width: 100%;
height: 200rpx;
height: 250rpx;
}
.collect {
height: 100%;
......
src/pages/brands/components/browseItem.vue
View file @ 77364ced
......@@ -185,7 +185,7 @@ export default {
let idItem = this.selected.map((el) => {
return el.id;
});
this.unCollectionFn(...idItem);
this.unCollectionFn(idItem);
},
// 外部全选按钮
outsideChecked() {
......@@ -207,8 +207,8 @@ export default {
});
},
//取消款式接口
unCollectionFn(item) {
let param = [item];
unCollectionFn(param) {
// let param = [item];
this.$http("mobileBrand.cancelCollect", param).then((res) => {
if (res.code == 200) {
this.$emit("update");
......@@ -219,7 +219,7 @@ export default {
browerClick(item) {
if (item.isFavorite == true) {
this.$u.toast(`已取消收藏`);
this.unCollectionFn(item.id);
this.unCollectionFn([item.id]);
} else {
this.$u.toast(`已收藏款式`);
this.collectionFn(item.id);
......@@ -228,7 +228,7 @@ export default {
//滑动删除的东西
sliderClick(indexs, item) {
let itemId = item[indexs].id;
this.unCollectionFn(itemId);
this.unCollectionFn([itemId]);
},
// 如果打开一个的时候，不需要关闭其他，则无需实现本方法
// 没做目前没用
......
src/pages/brands/components/hotStyle.vue
View file @ 77364ced
......@@ -3,7 +3,7 @@
<view class="hots" v-for="(item, index) in recordsList" :key="index">
<image
class="indexhot"
:src="`${imgUrl}${item.originalImageCode}`"
:src="`${imgUrl}${item.effectPictureCode}`"
@click="tabdetail(item)"
mode="aspectFill"
></image>
......@@ -13,8 +13,8 @@
<view class="hotText2">
<image
class="iconhot"
:src="`${imgUrl}${item.originalImageCode}`"
mode="aspectFill"
:src="`${imgUrl}${item.effectPictureCode}`"
mode=""
></image>
<text class="wen">{{ item.materialName }}</text>
<image
......@@ -67,6 +67,7 @@ export default {
},
// 跳转到详情
tabdetail(item) {
console.log(1);
this.$Router.push("/pages/brands/detail?id=" + item.id);
},
//收藏款式接口
......@@ -101,6 +102,7 @@ export default {
width: 330rpx;
margin-bottom: 20rpx;
// margin-right: 16rpx;
border: 2rpx solid #e3e1e0;
.indexhot {
display: block;
......@@ -112,7 +114,7 @@ export default {
.hotborder {
height: 144rpx;
// width: 193rpx;
border: 2rpx solid #e3e1e0;
// border: 2rpx solid #e3e1e0;
// border-top: 0rpx !important;
border-radius: 0 0 10rpx 10rpx;
}
......@@ -122,7 +124,8 @@ export default {
font-family: PingFangSC, PingFangSC-Regular;
font-weight: 400;
color: rgba(0, 0, 0, 0.8);
margin: 24rpx 28rpx 0 20rpx;
margin: 24rpx 0rpx 0 0rpx;
padding: 0 28rpx 0rpx 28rpx;
width: 100%;
overflow: hidden;
......
src/pages/brands/detail.vue
View file @ 77364ced
......@@ -10,7 +10,7 @@
<view>
<u-image
height="750rpx"
:src="`${imgUrl}${tabledata.originalImageCode}`"
:src="`${imgUrl}${tabledata.effectPictureCode}`"
></u-image>
</view>
<view class="u-p-r-30 u-p-l-30">
......@@ -93,13 +93,13 @@ export default {
smapTelePhone: "", //联系人电话
};
},
watch: {
id: {
handler() {
this.detail();
},
},
},
// watch: {
// id: {
// handler() {
// this.detail();
// },
// },
// },
created() {
this.detail();
......
src/pages/home/index.vue
View file @ 77364ced
......@@ -5,7 +5,11 @@
<u-navbar title="" :border-bottom="false" :background="background">
<template slot="right">
<view @click="searchCli" class="u-m-r-24 search">
<image class="hs-img" src="../../static/images/home/search@2x.png" mode=""></image>
<image
class="hs-img"
src="../../static/images/home/search@2x.png"
mode=""
></image>
</view>
</template>
</u-navbar>
......@@ -18,26 +22,43 @@
</view>
</view>
<!-- 提示信息 -->
<view v-if="abolishIds.length > 0" class="u-m-t-20 tips background_d5aa7a u-font-28">
<view
v-if="abolishIds.length > 0"
class="u-m-t-20 tips background_d5aa7a u-font-28"
>
<view>
{{ abolishIds.length }}个委托单
<span class="color_fff">等待确认寄样，请尽快确认！</span>
</view>
<view class="color_fff btn u-p-l-10 u-p-r-10" @click="sampleConfirm">寄样确认</view>
<view class="color_fff btn u-p-l-10 u-p-r-10" @click="sampleConfirm"
>寄样确认</view
>
</view>
<!-- 具体内容 我的面料 -->
<view class="home_con u-m-t-20">
<view class="home_con_tit">
<view>
<span class="u-font-32">我的面料</span>
<span style="line-height: 0;" class="u-m-l-10 color_000 u-font-24">MY FABRIC</span>
<span style="line-height: 0" class="u-m-l-10 color_000 u-font-24"
>MY FABRIC</span
>
</view>
<view class="u-font-24 color_d5aa7a" @click="seeFabric">查看更多</view>
</view>
<view class="home_con_fabric">
<view class="home_con_content u-m-t-24" @click="detailFabric(item)" v-for="item in fiabricList">
<image class="hs-img" src="../../static/images/home/1@2x.png" mode=""></image>
<view class="home_con_content_font ov_hiden">{{ item.materialName }}</view>
<view
class="home_con_content u-m-t-24"
@click="detailFabric(item)"
v-for="item in fiabricList"
>
<image
class="hs-img"
src="../../static/images/home/1@2x.png"
mode=""
></image>
<view class="home_con_content_font ov_hiden">{{
item.materialName
}}</view>
</view>
</view>
</view>
......@@ -51,23 +72,47 @@
<!-- <view class="u-font-24 color_d5aa7a">查看更多</view>-->
</view>
<view class="home_con_order">
<view class="u-p-t-20 u-p-b-20 ">
<u-search placeholder="请输入客户名称" v-model="keyWord" border-color="#e1e1e1" height="76"
@search="searchPotentialCustomers" bg-color="#fff" :show-action="false"></u-search>
<view class="u-p-t-20 u-p-b-20">
<u-search
placeholder="请输入客户名称"
v-model="keyWord"
border-color="#e1e1e1"
height="76"
@search="searchPotentialCustomers"
bg-color="#fff"
:show-action="false"
></u-search>
</view>
<view class="item item--round" v-for="(item) in list" @click="$Router.push({
path: '/pages/order/item',
query:{
id: item.enterpriseId
}
})">
<view
class="item item--round"
v-for="item in list"
@click="
$Router.push({
path: '/pages/order/item',
query: {
id: item.enterpriseId,
},
})
"
>
<view class="u-font-32 u-m-b-8 u-line-1">{{ item.fullName }}</view>
<view class="u-font-24">更新时间：{{ item.createTime }}</view>
</view>
<!-- 加载更多 -->
<u-loadmore v-if="!isEmpty" height="80rpx" :status="loadStatus" icon-type="flower" color="#ccc" />
<u-loadmore
v-if="!isEmpty"
height="80rpx"
:status="loadStatus"
icon-type="flower"
color="#ccc"
/>
<!-- 缺省页 -->
<hs-empty v-if="isEmpty" tipText="没有数据" marginTop="100rpx" :image="emptyImage"></hs-empty>
<hs-empty
v-if="isEmpty"
tipText="没有数据"
marginTop="100rpx"
:image="emptyImage"
></hs-empty>
</view>
</view>
......@@ -75,373 +120,361 @@
</view>
</template>
<script>
import HsTabBar from "../../components/hs-tab-bar/hs-tab-bar";
export default {
components: {
HsTabBar
},
data() {
return {
emptyImage: require("@/static/images/components/empty/empty.png"),
background: {
backgroundColor: 'rgba(245,245,245,0)'
import HsTabBar from "../../components/hs-tab-bar/hs-tab-bar";
export default {
components: {
HsTabBar,
},
data() {
return {
emptyImage: require("@/static/images/components/empty/empty.png"),
background: {
backgroundColor: "rgba(245,245,245,0)",
},
quantityNum: 0,
exceptionNum: 0,
abolishIds: [],
// 我的面料
fiabricList: [],
buts: [
{
name: "面料建模",
img: "../../static/images/home/fabricModeling@2x.png",
url: "/pages/fabricModeling/modelingOrder",
},
quantityNum: 0,
exceptionNum: 0,
abolishIds: [],
// 我的面料
fiabricList: [],
buts: [{
name: '面料建模',
img: '../../static/images/home/fabricModeling@2x.png',
url: '/pages/fabricModeling/modelingOrder'
},
{
name: '搜款',
img: '../../static/images/home/styleEntrustment@2x.png',
url: '/pages/material/list'
},
{
name: '上架管理',
img: '../../static/images/home/styleManageme@2x.png',
url: '/pages/material/entrustManagement'
}
// TODO 旧版本 可能以后会用到
// {
// name: '面料建模',
// img: '../../static/images/home/fabricModeling@2x.png',
// url: '/pages/fabricModeling/modelingOrder'
// },
// {
// name: '款式委托',
// img: '../../static/images/home/styleEntrustment@2x.png',
// url: '/pages/home/styleEntrustment'
// },
// {
// name: '检测委托',
// img: '../../static/images/home/styleManageme@2x.png',
// url: ''
// },
// {
// name: '款式管理',
// img: '../../static/images/home/testCommission@2x.png',
// url: ''
// }
],
keyWord: '',
loadStatus: 'loadmore',
pageOptions: {
current: 1,
size: 10,
{
name: "搜款",
img: "../../static/images/home/styleEntrustment@2x.png",
url: "/pages/material/list",
},
list: []
};
{
name: "上架管理",
img: "../../static/images/home/styleManageme@2x.png",
url: "/pages/material/entrustManagement",
},
// TODO 旧版本 可能以后会用到
// {
// name: '面料建模',
// img: '../../static/images/home/fabricModeling@2x.png',
// url: '/pages/fabricModeling/modelingOrder'
// },
// {
// name: '款式委托',
// img: '../../static/images/home/styleEntrustment@2x.png',
// url: '/pages/home/styleEntrustment'
// },
// {
// name: '检测委托',
// img: '../../static/images/home/styleManageme@2x.png',
// url: ''
// },
// {
// name: '款式管理',
// img: '../../static/images/home/testCommission@2x.png',
// url: ''
// }
],
keyWord: "",
loadStatus: "loadmore",
pageOptions: {
current: 1,
size: 10,
},
list: [],
};
},
computed: {
isEmpty() {
return this.list.length === 0;
},
computed: {
isEmpty() {
return this.list.length === 0
}
},
onLoad() {
// this.toBeSelectedQuantity();
// this.orderTicketExceptionNum();
// this.noSampleOrder();
// this.materialList();
// 潜在客户
this.potentialCustomersPage();
},
onPageScroll(object) {
let height = 486 / 2;
if (object.scrollTop >= height) {
this.background.backgroundColor = "rgba(245,245,245,1)";
} else {
this.background.backgroundColor = "rgba(245,245,245,0)";
}
},
methods: {
pay() {
this.$Router.push({
path: "/pages/webview/index",
});
},
onLoad() {
// this.toBeSelectedQuantity();
// this.orderTicketExceptionNum();
// this.noSampleOrder();
// this.materialList();
// 潜在客户
searchPotentialCustomers() {
this.pageOptions = {
current: 1,
size: 10,
};
this.potentialCustomersPage();
},
onPageScroll(object) {
let height = 486 / 2;
if (object.scrollTop >= height) {
this.background.backgroundColor = 'rgba(245,245,245,1)';
} else {
this.background.backgroundColor = 'rgba(245,245,245,0)';
}
// 潜在客户
potentialCustomersPage() {
this.loadStatus = "loading";
this.$http("stylelibraryorder.potentialCustomersPage", {
...this.pageOptions,
customerName: this.keyWord,
status: 0,
}).then((res) => {
let { code, data } = res;
if (code === 200) {
if (Object.keys(data).length > 0) {
this.list = data.records;
this.pageOptions.pages = data.total;
this.loadStatus =
this.list.length < data.total ? "loadmore" : "nomore";
} else {
this.list = [];
this.loadStatus = "nomore";
}
}
});
},
methods: {
pay() {
this.$Router.push({
path: '/pages/webview/index'
})
},
searchPotentialCustomers() {
this.pageOptions = {
current: 1,
size: 10,
};
// 触底加载更多
onReachBottom() {
if (this.pageOptions.current < this.pageOptions.pages) {
this.pageOptions.current += 1;
this.potentialCustomersPage();
},
// 潜在客户
potentialCustomersPage() {
this.loadStatus = 'loading';
this.$http("stylelibraryorder.potentialCustomersPage", {
...this.pageOptions,
customerName: this.keyWord,
status: 0
})
.then(res => {
let {
code,
data
} = res;
if (code === 200) {
if (Object.keys(data).length > 0) {
this.list = data.records;
this.pageOptions.pages = data.total;
this.loadStatus = this.list.length < data.total ? 'loadmore' : 'nomore';
} else {
this.list = []
this.loadStatus = 'nomore';
}
}
})
},
// 触底加载更多
onReachBottom() {
if (this.pageOptions.current < this.pageOptions.pages) {
this.pageOptions.current += 1;
this.potentialCustomersPage();
}
},
// 选款总数
toBeSelectedQuantity() {
this.$http("orderTicket.toBeSelectedQuantity", {}).then((res) => {
let { code, data } = res;
if (code == 200) {
this.quantityNum = data;
}
},
// 选款总数
toBeSelectedQuantity() {
this.$http('orderTicket.toBeSelectedQuantity', {}).then(res => {
let {
code,
data
} = res;
if (code == 200) {
this.quantityNum = data;
}
});
},
// 异常总数
orderTicketExceptionNum() {
this.$http('orderTicket.orderTicketExceptionNum', {}).then(res => {
let {
code,
data
} = res;
if (code == 200) {
this.exceptionNum = data;
}
});
},
// 寄样单总数
noSampleOrder() {
this.$http('orderTicket.noSampleOrder', {}).then(res => {
let {
code,
data
} = res;
if (code == 200) {
this.abolishIds = data;
}
});
},
// 我的面料
materialList() {
this.$http('orderTicket.materialList', {
size: 4,
materialCode: '',
materialName: ''
}).then(res => {
let {
code,
data
} = res;
if (code == 200) {
this.fiabricList = data.data;
}
});
},
searchCli() {
// 搜索面料===1 搜索建模===2
this.$Router.push('/pages/home/search');
},
seeFabric() {
this.$Router.push('/pages/home/fabricList');
},
detailFabric(data) {
this.$Router.push('/pages/home/fabricDetails?id=' + data.id);
},
sampleConfirm() {
this.$Router.push('/pages/home/sampleConfirmation?abolishIds=' + this.abolishIds);
},
goCli(url) {
if (url) {
this.$Router.push(url);
} else {
uni.showToast({
title: '该功能正在开发中...',
icon: 'none'
})
});
},
// 异常总数
orderTicketExceptionNum() {
this.$http("orderTicket.orderTicketExceptionNum", {}).then((res) => {
let { code, data } = res;
if (code == 200) {
this.exceptionNum = data;
}
});
},
// 寄样单总数
noSampleOrder() {
this.$http("orderTicket.noSampleOrder", {}).then((res) => {
let { code, data } = res;
if (code == 200) {
this.abolishIds = data;
}
});
},
// 我的面料
materialList() {
this.$http("orderTicket.materialList", {
size: 4,
materialCode: "",
materialName: "",
}).then((res) => {
let { code, data } = res;
if (code == 200) {
this.fiabricList = data.data;
}
});
},
searchCli() {
// 搜索面料===1 搜索建模===2
this.$Router.push("/pages/home/search");
},
seeFabric() {
this.$Router.push("/pages/home/fabricList");
},
detailFabric(data) {
this.$Router.push("/pages/home/fabricDetails?id=" + data.id);
},
sampleConfirm() {
this.$Router.push(
"/pages/home/sampleConfirmation?abolishIds=" + this.abolishIds
);
},
goCli(url) {
if (url) {
this.$Router.push(url);
} else {
uni.showToast({
title: "该功能正在开发中...",
icon: "none",
});
}
}
};
},
},
};
</script>
<style lang="scss" scoped>
.item--round {
border-radius: 8rpx;
}
.item--round {
border-radius: 8rpx;
}
.item {
padding: 36rpx 30px;
height: 160rpx;
background: url(~@/static/images/home/exhibition.png) no-repeat;
background-size: 100% 100%;
margin-bottom: 20rpx;
color: #fff;
}
.item {
padding: 36rpx 30px;
height: 160rpx;
background: url(~@/static/images/home/exhibition.png) no-repeat;
background-size: 100% 100%;
margin-bottom: 20rpx;
color: #fff;
}
.back_img {
height: 486rpx;
width: 100%;
background: url(~@/static/images/home/exhibition.png) no-repeat;
background-size: 100% 100%;
}
.back_img {
height: 486rpx;
width: 100%;
background: url(~@/static/images/home/exhibition.png) no-repeat;
background-size: 100% 100%;
}
.home_top {
position: relative;
width: 100%;
height: 486rpx;
.home_top {
position: relative;
width: 100%;
height: 486rpx;
.home_top_out {
position: absolute;
top: 20rpx;
width: 100%;
padding: 0 20rpx;
display: flex;
justify-content: space-between;
align-items: center;
.home_top_out {
position: absolute;
top: 20rpx;
width: 100%;
padding: 0 20rpx;
display: flex;
justify-content: space-between;
align-items: center;
.out {
width: 32rpx;
height: 32rpx;
}
.out {
width: 32rpx;
height: 32rpx;
}
}
}
.search {
width: 60rpx;
height: 60rpx;
}
.search {
width: 60rpx;
height: 60rpx;
}
.tips {
display: flex;
height: 80rpx;
align-items: center;
justify-content: space-around;
padding: 0 20rpx;
}
.tips {
display: flex;
height: 80rpx;
align-items: center;
justify-content: space-around;
padding: 0 20rpx;
}
.home_btn {
width: 100%;
height: 180rpx;
display: flex;
justify-content: space-around;
align-items: center;
text-align: center;
background: #fff;
}
.home_con {
width: 100%;
box-sizing: border-box;
padding: 30rpx;
background: #fff;
.home_btn {
.home_con_tit {
width: 100%;
height: 180rpx;
display: flex;
justify-content: space-around;
align-items: center;
text-align: center;
background: #fff;
justify-content: space-between;
align-items: flex-end;
}
.home_con {
width: 100%;
box-sizing: border-box;
padding: 30rpx;
background: #fff;
.home_con_tit {
width: 100%;
display: flex;
justify-content: space-between;
align-items: flex-end;
}
.home_con_fabric {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
}
.home_con_fabric {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
}
.home_con_order {
// display: flex;
// flex-wrap: wrap;
// justify-content: space-between;
}
.home_con_order {
// display: flex;
// flex-wrap: wrap;
// justify-content: space-between;
}
}
.home_con_content {
position: relative;
width: 48%;
height: 160rpx;
border-radius: 8rpx;
overflow: hidden;
.home_con_content {
position: relative;
width: 48%;
height: 160rpx;
border-radius: 8rpx;
overflow: hidden;
// background-image: url(../../static/images/home/1@2x.png);
.home_con_content_font {
position: absolute;
bottom: 0;
width: 100%;
height: 60rpx;
line-height: 60rpx;
box-sizing: border-box;
padding: 0 10rpx;
background: rgba(255, 255, 255, 0.8);
}
// background-image: url(../../static/images/home/1@2x.png);
.home_con_content_font {
position: absolute;
bottom: 0;
width: 100%;
height: 60rpx;
line-height: 60rpx;
box-sizing: border-box;
padding: 0 10rpx;
background: rgba(255, 255, 255, 0.8);
}
}
.home_con_content_order {
display: flex;
align-items: center;
justify-content: space-between;
height: 160rpx;
border-radius: 8rpx;
overflow: hidden;
.home_con_content_order {
display: flex;
align-items: center;
justify-content: space-between;
height: 160rpx;
border-radius: 8rpx;
overflow: hidden;
.order_tit {
flex-direction: column;
display: flex;
justify-content: center;
padding: 20rpx;
flex: 1;
height: 100%;
background: rgba(172, 166, 166, 0.5);
}
.order_tit {
flex-direction: column;
display: flex;
justify-content: center;
padding: 20rpx;
flex: 1;
height: 100%;
background: rgba(172, 166, 166, 0.5);
}
}
.ov_hiden {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.ov_hiden {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.btn {
line-height: 50rpx;
text-align: center;
height: 50rpx;
border: 1rpx solid #fff;
}
.btn {
line-height: 50rpx;
text-align: center;
height: 50rpx;
border: 1rpx solid #fff;
}
.color_000 {
color: rgba(0, 0, 0, 0.2);
}
.color_000 {
color: rgba(0, 0, 0, 0.2);
}
.color_d5aa7a {
color: #d5aa7a;
}
.color_d5aa7a {
color: #d5aa7a;
}
.color_dda973 {
color: #dda973;
}
.color_dda973 {
color: #dda973;
}
.color_fff {
color: #fff;
}
.color_fff {
color: #fff;
}
.background_d5aa7a {
background: #d5aa7a;
}
</style>
\ No newline at end of file
.background_d5aa7a {
background: #d5aa7a;
}
</style>
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