Skip to content

H
hs-app-project
Commit f70f1c6e authored by 李星剑's avatar 李星剑
Browse files
Options

提交

parent 82fc9f6c
Show whitespace changes
Inline Side-by-side
Showing with 689 additions and 432 deletions
src/pages.json
View file @ f70f1c6e
......@@ -7,9 +7,9 @@
//pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
//品牌商首页
{
"path": "pages/brands/brands",
"path": "pages/home/tenantSelection",
"style": {
"navigationBarTitleText": "品牌商首页",
"navigationBarTitleText": "租户选择",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"navigationStyle": "custom",
......@@ -21,9 +21,9 @@
}
},
{
"path": "pages/home/tenantSelection",
"path": "pages/brands/brands",
"style": {
"navigationBarTitleText": "租户选择",
"navigationBarTitleText": "品牌商首页",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"navigationStyle": "custom",
......@@ -43,6 +43,15 @@
"navigationStyle": "custom"
}
},
{
"path": "pages/order/item",
"style": {
"navigationBarTitleText": "模拟登录",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "pages/user/center/index",
"style": {
......@@ -115,7 +124,6 @@
"navigationStyle": "custom"
}
},
{
"path": "pages/user/register/stepSelectType",
"style": {
......@@ -162,7 +170,6 @@
"enablePullDownRefresh": false
}
},
{
"path": "pages/designCommissioned/listSelectToAdd",
"style": {
......@@ -199,12 +206,11 @@
"navigationStyle": "custom"
}
},
{
"path": "pages/user/register/stepSelectType",
"style": {
"navigationBarTitleText": "完善信息",
// "navigationBarTextStyle": "white",
// "navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"mp-alipay": {
"transparentTitle": "always",
......@@ -217,7 +223,7 @@
"path": "pages/user/register/perfectInformation",
"style": {
"navigationBarTitleText": "完善信息",
// "navigationBarTextStyle": "white",
// "navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"mp-alipay": {
"transparentTitle": "always",
......@@ -230,7 +236,7 @@
"path": "pages/user/register/success",
"style": {
"navigationBarTitleText": "完善信息",
// "navigationBarTextStyle": "white",
// "navigationBarTextStyle": "white",
"enablePullDownRefresh": false,
"mp-alipay": {
"transparentTitle": "always",
......@@ -245,9 +251,7 @@
"navigationBarTitleText": "首页",
"enablePullDownRefresh": false
}
},
{
"path": "pages/designCommissioned/listSelectToAdd",
"style": {
......@@ -256,7 +260,6 @@
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "pages/designCommissioned/list",
......@@ -266,7 +269,6 @@
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "pages/designCommissioned/addItem",
......@@ -276,7 +278,6 @@
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "pages/designCommissioned/item",
......@@ -286,9 +287,7 @@
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "pages/designCommissioned/splitItem",
"style": {
......@@ -297,8 +296,8 @@
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
}, {
},
{
"path": "pages/home/index",
"style": {
"navigationBarTitleText": "首页",
......@@ -311,7 +310,8 @@
"allowsBounceVertical": "NO"
}
}
}, {
},
{
"path": "pages/home/search",
"style": {
"navigationBarTitleText": "搜索",
......
src/pages/home/index.vue
View file @ f70f1c6e
......@@ -4,13 +4,7 @@
<view id="header" class="back_img">
<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
></view>
<view @click="searchCli" class="u-m-r-24 search"><image class="hs-img" src="../../static/images/home/search@2x.png" mode=""></image></view>
</template>
</u-navbar>
</view>
......@@ -22,43 +16,26 @@
</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>
......@@ -66,29 +43,34 @@
<view class="home_con u-m-t-20">
<view class="home_con_tit">
<view>
<span class="u-font-32">我的订单</span>
<span class="u-m-l-10 color_000 u-font-24">MY FABRIC</span>
<span class="u-font-32">潜在客户</span>
<span class="u-m-l-10 color_000 u-font-24">MY ORDER</span>
</view>
<view class="u-font-24 color_d5aa7a">查看更多</view>
<!-- <view class="u-font-24 color_d5aa7a">查看更多</view>-->
</view>
<view class="home_con_order">
<view class="home_con_content_order u-m-t-24" v-for="item in 4">
<image
style="width: 160rpx; height: 160rpx"
src="../../static/images/home/2.png"
mode=""
></image>
<view class="order_tit">
<view class="u-font-32">加厚荷兰绒绒布布料备份</view>
<view class="u-font-24 u-m-t-20">
<span>针织</span>
｜
<span>180cm</span>
｜
<span>100%面备份</span>
</view>
<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="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" />
<!-- 缺省页 -->
<hs-empty v-if="isEmpty" tipText="没有数据"
marginTop="100rpx"
:image="emptyImage"></hs-empty>
</view>
</view>
......@@ -98,10 +80,11 @@
<script>
import HsTabBar from "../../components/hs-tab-bar/hs-tab-bar";
export default {
components: { HsTabBar },
components: {HsTabBar},
data() {
return {
background: { backgroundColor: "rgba(245,245,245,0)" },
emptyImage :require("@/static/images/components/empty/empty.png"),
background: { backgroundColor: 'rgba(245,245,245,0)' },
quantityNum: 0,
exceptionNum: 0,
abolishIds: [],
......@@ -109,20 +92,20 @@ export default {
fiabricList: [],
buts: [
{
name: "面料建模",
img: "../../static/images/home/fabricModeling@2x.png",
url: "/pages/fabricModeling/modelingOrder",
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/styleEntrustment@2x.png',
url: '/pages/material/list'
},
{
name: "上架管理",
img: "../../static/images/home/styleManageme@2x.png",
url: "/pages/material/entrustManagement",
},
name: '上架管理',
img: '../../static/images/home/styleManageme@2x.png',
url: '/pages/material/entrustManagement'
}
// TODO 旧版本 可能以后会用到
// {
// name: '面料建模',
......@@ -145,26 +128,77 @@ export default {
// url: ''
// }
],
keyWord: '',
loadStatus: 'loadmore',
pageOptions:{
current: 1,
size: 10,
},
list: []
};
},
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)";
this.background.backgroundColor = 'rgba(245,245,245,1)';
} else {
this.background.backgroundColor = "rgba(245,245,245,0)";
this.background.backgroundColor = 'rgba(245,245,245,0)';
}
},
methods: {
searchPotentialCustomers(){
this.pageOptions = {
current: 1,
size: 10,
};
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) => {
this.$http('orderTicket.toBeSelectedQuantity', {}).then(res => {
let { code, data } = res;
if (code == 200) {
this.quantityNum = data;
......@@ -173,7 +207,7 @@ export default {
},
// 异常总数
orderTicketExceptionNum() {
this.$http("orderTicket.orderTicketExceptionNum", {}).then((res) => {
this.$http('orderTicket.orderTicketExceptionNum', {}).then(res => {
let { code, data } = res;
if (code == 200) {
this.exceptionNum = data;
......@@ -182,7 +216,7 @@ export default {
},
// 寄样单总数
noSampleOrder() {
this.$http("orderTicket.noSampleOrder", {}).then((res) => {
this.$http('orderTicket.noSampleOrder', {}).then(res => {
let { code, data } = res;
if (code == 200) {
this.abolishIds = data;
......@@ -191,11 +225,11 @@ export default {
},
// 我的面料
materialList() {
this.$http("orderTicket.materialList", {
this.$http('orderTicket.materialList', {
size: 4,
materialCode: "",
materialName: "",
}).then((res) => {
materialCode: '',
materialName: ''
}).then(res => {
let { code, data } = res;
if (code == 200) {
this.fiabricList = data.data;
......@@ -204,33 +238,41 @@ export default {
},
searchCli() {
// 搜索面料===1 搜索建模===2
this.$Router.push("/pages/home/search");
this.$Router.push('/pages/home/search');
},
seeFabric() {
this.$Router.push("/pages/home/fabricList");
this.$Router.push('/pages/home/fabricList');
},
detailFabric(data) {
this.$Router.push("/pages/home/fabricDetails?id=" + data.id);
this.$Router.push('/pages/home/fabricDetails?id=' + data.id);
},
sampleConfirm() {
this.$Router.push(
"/pages/home/sampleConfirmation?abolishIds=" + this.abolishIds
);
this.$Router.push('/pages/home/sampleConfirmation?abolishIds=' + this.abolishIds);
},
goCli(url) {
if (url) {
this.$Router.push(url);
} else {
}else{
uni.showToast({
title: "该功能正在开发中...",
icon: "none",
});
title:'该功能正在开发中...',
icon: 'none'
})
}
}
}
},
},
};
</script>
<style lang="scss" scoped>
.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;
}
.back_img {
height: 486rpx;
width: 100%;
......
src/pages/modeling/addItem.vue
View file @ f70f1c6e
......@@ -25,7 +25,7 @@
</view>
</view>
<u-form-item label="面料门幅" prop="clothWidth">
<u-number-box v-model="detail.clothWidth" :step="0.1"></u-number-box>cm
<u-number-box v-model="detail.clothWidth" :step="0.1" :positive-integer="false"></u-number-box>cm
</u-form-item>
<u-form-item label="面料成分" prop="component" required>
<u-input v-model="detail.component" placeholder="请输入面料成分" />
......@@ -183,7 +183,7 @@
<view class="footer">
<view class="u-p-t-18 u-p-r-30 u-p-b-18 u-p-l-30">
<view class="u-flex">
<view class="u-flex-1">共填写{{detail.clothRowColourQuantity}}种颜色名称,请不要重名</view>
<view class="u-flex-1">请选择{{designAgencyColourQuantity}}种颜色名称</view>
<view class="custom-style-round-circle custom-style-btn custom-style dialog-btn">
<view class="custom-style-right" @click="submitColor">确定</view>
</view>
......@@ -300,7 +300,18 @@ export default {
expirationDate:{
required: true,
message: '请选择完成期限',
}
},
clothWidth:{
max: 20,
validate(rule, value, callback) {
let reg = new RegExp(/^(\\d+)(.\\d{0,2})?$/);
return reg.test(value);
},
message: '门幅应保留小数点后两位',
// 可以单个或者同时写两个触发验证方式
trigger: ['change','blur'],
},
},
// 暂存用的颜色组
modelingTaskColourDTOList: [],
......@@ -405,11 +416,13 @@ export default {
removeColor(){
let list = this.detail.modelingTaskMaterialColourList;
let checked = this.checkedList;
for (let i = 0; i < list.length; i++) {
if(checked.indexOf(list[i].id) > -1){
this.$set(list[i],'isDeleted',true)
for (const item of list) {
let index = checked.indexOf(item.id);
if(index > -1){
this.$set(item,'isDeleted',true)
}else{
list.splice(i,1)
list.splice(index,1)
}
}
},
......@@ -514,6 +527,7 @@ export default {
validate(callback){
this.$refs['uForm'].validate((res) =>{
if (res) {
return;
this.validateList(callback)
}
})
......
src/pages/order/item.vue 0 → 100644
View file @ f70f1c6e
<template>
<view class="body">
<!--选款-->
<u-navbar title="客户详情"
:border-bottom="false"
:background="{backgroundColor: 'transparent'}">
</u-navbar>
<view class="u-p-30">
<view class="border-radius-8 bg-fff u-p-r-30 u-p-l-30 u-m-b-20">
<view class="u-p-t-24 u-p-b-24 u-border-bottom">客户信息</view>
<view class="u-p-t-24 u-p-b-24 u-flex">
<view class="label">客户名称</view>
<view class="context">{{detail.fullName}}</view>
</view>
<view>
<view class=" u-p-b-24 u-flex">
<view class="label">联系人</view>
<view class="context">{{detail.contacts[0].name}}</view>
</view>
<view class=" u-p-b-24 u-flex">
<view class="label">联系方式</view>
<view class="context"
@click="uni.makePhoneCall(detail.contacts[0].phone)">
{{detail.contacts[0].phone}}
</view>
</view>
</view>
</view>
<view class="border-radius-8 bg-fff u-p-r-30 u-p-l-30 u-m-b-20">
<view class="tabBar u-flex u-border-bottom">
<view class="tabBar-item u-flex"
v-for="(item,index) in tarBars" @click="activeIndex = index"
:class="[activeIndex === index ? 'active': '']"
>
<text>{{ item.label }}</text>
<text class="tabBar-split u-m-r-30 u-m-l-30" v-if="index < tarBars.length -1"></text>
</view>
</view>
<view class="u-p-b-28">
<view class="item " v-for="group in groupByTime">
<view class="item-title u-m-t-28 u-m-b-28">{{group.label}}</view>
<view>
<view v-for="(item) in group.children" class="u-flex">
<view class="item-img u-relative">
<image :src="`${$IMG_URL}${item.styleLibraryTaskItemVO.originalImageCode}`" mode="fit" style="width:100%; height: 100%"></image>
</view>
<view class="u-flex-1 u-p-l-20 u-p-r-30 u-border-left">
<view class="item-title u-flex ">
<view class="u-flex-1 u-line-1 u-font-32 u-p-t-20 u-p-b-8">{{item.styleLibraryTaskItemVO.styleTag}}</view>
</view>
<view class="item-desc u-font-24">{{ item.styleLibraryTaskItemVO.materialName }}</view>
<view class="item-desc u-font-24">{{ item.styleLibraryTaskItemVO.styleCode }}</view>
<view class="item-tags u-p-b-24">
<view class="item-tag u-font-20"
:key="tag.id"
v-for="tag in item.styleLibraryTaskItemVO.styleLibraryTagVOList">
{{ tag.materialTagName }}
</view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
</template>
<script>
export default {
name: "item",
data(){
return {
activeIndex: 0,
tarBars: [
{ label: '采购意向记录'},
{ label: '浏览款式记录'},
],
item: {
styleLibraryMaterialProspectiveCustomerVOList: []
}
}
},
computed:{
detail(){
return this.item.basics || {contacts: [{name: '',phone: ''}]}
},
groupByTime(){
let map = Array.from(new Set(this.tarBarContent.map((item) => item.createTime))),
newList = [];
for (const item of this.tarBarContent) {
let name = item['createTime'],
index = map.indexOf(name);
if(newList[index]){
newList[index]['children'].push(item)
}else{
newList.push({
label: name,
children: [item]
})
}
}
console.log(newList)
return newList
},
tarBarContent(){
return (this.item.styleLibraryMaterialProspectiveCustomerVOList || [] )
// 1-采购意向记录、2-浏览款式记录
.filter((item) => item.type === this.activeIndex+1)
}
},
created() {
let {id} = this.$Route.query;
this.getItem(id)
},
methods:{
getItem(id){
this.$http("stylelibraryorder.potentialCustomersDetails",id)
.then(res => {
let { code, data } = res;
if(code === 200){
this.item = data;
}
})
}
}
}
</script>
<style scoped lang="scss">
$h-color: #AF8D66;
$color: rgba(175,141,102,0.10);
$main-color: #fff;
.item{
width: 100%;
margin-bottom: 40rpx;
&--round{
border-radius: 16rpx;
border: 1px solid rgba(0,0,0,0.10);
}
&--status{
left: 0;
top: 0;
position: absolute;
}
&-img{
width: 160rpx;
height: 160rpx;
//height: 100%
}
&-title{}
&-desc{}
&-tags{
}
&-tag{
padding: 6rpx 2px;
background: $color;
text-align: center;
color: $h-color;
display: inline-block;
margin-right: 10rpx;
}
}
.tabBar{
height: 88rpx;
&-item{
font-size: 24rpx;
&.active{
font-size: 28rpx;
}
}
&-split{
height: 28rpx;
width: 2rpx;
background: rgba(0,0,0,0.20);
display: inline-block;
}
}
.border-radius-8{
border-radius: 8rpx;
}
.bg-fff{
background: #fff;
}
.label{
color: rgba(0,0,0,0.40);
font-size: 28rpx;
min-width: 140rpx;
}
.context{
color: #000;
font-size: 28rpx;
}
</style>
src/pages/user/login/login.vue
View file @ f70f1c6e
......@@ -19,7 +19,10 @@ export default {
account: '18297959298',
password: 'e10adc3949ba59abbe56e057f20f883e'
});
// await this.$store.dispatch('login', {
// account: '13588828505',
// password: '10470c3b4b1fed12c3baac014be15fac67c6e815',
// });
// await this.$store.dispatch("getDictionary")
// await this.$store.dispatch("getSizeList")
// await this.$store.dispatch("getCategoryList")
......
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