Skip to content

M
mallapp
Commit 51d54711 authored by zhengke's avatar zhengke
Browse files
Options

no message

parent a275ebbb
Hide whitespace changes
Inline Side-by-side
Showing with 205 additions and 81 deletions
components/uni-indexed-list/uni-indexed-list-item.vue
View file @ 51d54711
......@@ -18,7 +18,9 @@
<!-- mode="aspectFill" -->
<image :src="item.img" mode="scaleToFill"/>
</view>
<text class="uni-indexed-list__item-content">{{ item.name }}</text>
<view class="uni-indexed-list__item-content">
{{ item.name }}
</view>
</view>
</view>
</view>
......@@ -126,12 +128,14 @@
}
.uni-indexed-list__item-content {
width: 470rpx;
flex: 1;
font-size: 30rpx;
color: #191919;
font-weight:600;
font-family: -webkit-pictograph;
margin-left: 20rpx;
word-wrap: break-word;
}
.uni-indexed-list {
......@@ -159,19 +163,20 @@
.imgList{
display: flex;
flex-wrap: wrap;
/* background: #f7f7f7; */
}
.imgList view{
flex-shrink: 0;
width: 33.33%;
text-align: center;
padding: 20rpx 0 0 0;
text-align: center;
}
.imgList view image{
width: 200rpx;
height: 150rpx;
margin-right: 10rpx;
margin-left: 10rpx;
width: 100rpx;
height: 80rpx;
/* margin-right: 10rpx; */
/* margin-left: 10rpx; */
border-radius: 15rpx;
}
/* .imgList view:nth-child(3n) image{
......
components/uni-indexed-list/uni-indexed-list.vue
View file @ 51d54711
......@@ -6,9 +6,6 @@
<!-- #endif -->
<!-- #ifndef APP-NVUE -->
<scroll-view :scroll-into-view="scrollViewId" class="uni-indexed-list__scroll" scroll-y>
<!-- <view class="right-img">
<image :src="classObj.Image" style="width: 100%; height: 100%;" mode="aspectFill"/>
</view> -->
<template v-if="lists.length>0">
<view v-for="(list, idx) in lists" :key="idx" :id="'uni-indexed-list-' + idx">
......@@ -19,13 +16,6 @@
<!-- #ifndef APP-NVUE -->
</view>
</template>
<view v-else style="
height: calc(100vh - 50px);
width: calc(100vw - 20px);
padding-top: 0;
">
<u-empty text="没有找到相关品牌信息" font-size="30" mode="list"></u-empty>
</view>
</scroll-view>
<!-- #endif -->
<!-- #ifdef APP-NVUE -->
......@@ -107,12 +97,6 @@
},
emits: ['click'],
props: {
classObj:{
type: Object,
default () {
return {}
}
},
options: {
type: Array,
default () {
......@@ -316,7 +300,7 @@
display: flex;
/* #endif */
flex-direction: row;
height: 1116rpx;
height: 100vh;
}
.uni-indexed-list__scroll {
......@@ -324,11 +308,12 @@
}
.uni-indexed-list__menu {
width: 24px;
width: 44px;
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex-direction: column;
background: #f7f7f7;
}
.uni-indexed-list__menu-item {
......@@ -392,14 +377,4 @@
color: #fff;
background-color: rgba(0, 0, 0, 0.5);
}
.right-img{
width: 100%;
height: 200rpx;
}
.right-img image{
width: 100%;
height: 100%;
display: block;
}
</style>
node_modules/uview-ui/components/u-upload/u-upload.vue
View file @ 51d54711
......@@ -199,7 +199,7 @@
immediate: true,
handler(val) {
val.map(value => {
let data = {url: value.url?value.url:value.Path, error: false, progress: 100}
let data = {url: value.url, error: false, progress: 100}
this.lists.push(JSON.parse(JSON.stringify(data)));
})
}
......@@ -417,7 +417,6 @@
.u-upload {
display: flex;
flex-wrap: wrap;
align-items: center;
}
.u-list-item {
......@@ -431,6 +430,8 @@
display: inline-flex;
align-items: center;
justify-content: center;
margin-right: 20rpx;
margin-bottom: 20rpx;
}
.u-preview-wrap {
......
pages/Luxury/ClassList.vue
View file @ 51d54711
<template>
<div v-if="!isloading">
<view class="ctrl-box">
<u-searchB action-text="搜索" :focus="true" :clearabled="true" :show-action="false"
radius="40" v-model="Keywords"></u-searchB>
<u-searchB action-text="搜索" :focus="false" :clearabled="true" :show-action="false"
radius="40" v-model="Keywords" @chang="changeHandler"></u-searchB>
<!-- @search="searchHandler" @custom="searchHandler" @change="changeHandler" -->
</view>
<!-- <view class="search-box" :style="{ background: bg }" @click="goSearch">
......@@ -19,25 +19,29 @@
></u-search>
</view> -->
<div
:style="{ height: contentHeight + 'px' }"
style="ovoerflow: hidden; overflow-y: auto;background: #F7F7F7;"
>
<view class="ClassList-form">
<!-- <view class="form-left">
style="height: calc(100vh - 0px);width: calc(100vw);overflow: hidden;padding-bottom: 80px;">
<view class="right-box">
<uni-indexed-list :options="list" :show-select="true" @click="bindClick" />
<view style="height: calc(100vh - 50px); background: #fff;" v-if="list.length == 0">
<u-empty text="没有找到相关品牌信息" mode="order"></u-empty>
</view>
</view>
<!-- <view class="ClassList-form">
<view class="form-left">
<view v-for="(item,index) in classData" :key="index"
class="name-box" :class="{'active':classObj.Name==item.Name}"
@click="chooseType(item)">
<view></view>
<text>{{item.Name}}</text>
</view>
</view> -->
</view>
<view class="form-right">
<view class="right-box">
<uni-indexed-list :Image="classObj.Image" :options="list" :show-select="true" @click="bindClick" />
</view>
</view>
</view>
</view> -->
</div>
<auth
v-if="showAuth"
......@@ -237,16 +241,15 @@
this.isloading = false
this.showAuth = true;
} else {
this.getBrand()
}
},
mounted() {
this.contentHeightB = this.$utils.calcContentHeight(-40)+'px';
// this.contentHeightB = this.$utils.calcContentHeight(-40)+'px';
let currentPages = getCurrentPages();
// let c = this.$uiConfig.is_bang ? 80 : 52;
let c = this.$uiConfig.is_bang ? 0 : 0;
let c = this.$uiConfig.is_bang ? 80 : 52;
this.contentHeight = this.$utils.calcContentHeight(c);
let u = "/" + currentPages[currentPages.length - 1].route;
let pages = uni.getStorageSync("basedata")
......@@ -283,9 +286,9 @@
this.classObj = item
this.getBrand()
},
// changeHandler(){
// },
changeHandler(){
this.Keywords = ''
},
// searchHandler(){
// },
......@@ -304,7 +307,7 @@
res => {
this.isloading = false;
if(res.resultCode==1){
uni.hideLoading();
this.AllList = res.data
this.AllList.forEach(item=>{
this.list.forEach(i=>{
......@@ -319,6 +322,7 @@
}
})
})
uni.hideLoading();
}
uni.hideNavigationBarLoading();
}
......@@ -353,9 +357,9 @@
</script>
<style scoped>
.ClassList-form{
display: flex;
/* display: flex;
justify-content: space-between;
padding: 20rpx 0 0 0;
padding: 20rpx 0 0 0; */
}
.form-left{
border-top: 1rpx solid #E7E7E7;
......@@ -394,6 +398,6 @@
}
.ctrl-box{
padding: 20rpx 20rpx;
background: #f2f2f2;
background: #F7F7F7;
}
</style>
\ No newline at end of file
pages/Luxury/Valuation.vue
View file @ 51d54711
......@@ -136,12 +136,19 @@
</view>
</view>
</div>
<auth
v-if="showAuth"
@changeuserinfo="reloadUserinfo"
@gbAuth="gbAuth"
></auth>
</div>
</template>
<script>
import auth from "@/components/auth/index.vue";
export default {
data() {
return {
showAuth:false,
loading: true,
isloading: true,
pageTitle: "我要估价",
......@@ -162,9 +169,11 @@
data:{},
tmplIds:[],
showOpenSettingDialog:false,
u:{}
};
},
components: {
auth,
// search,
// tabbars,
// uniIndexedList
......@@ -179,9 +188,20 @@
if(option.BrandId){
this.msg.BrandId = option.BrandId
}
this.getDetails()
this.showOpenSettingDialog = uni.getStorageSync('showOpenSettingDialog') || false;
// this.subscription()
this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) {
this.u = {
nickName: "未登录",
avatarUrl: "",
};
this.isloading = false
this.showAuth = true;
} else {
this.getDetails()
this.showOpenSettingDialog = uni.getStorageSync('showOpenSettingDialog') || false;
this.subscription()
}
},
onShow() {
......@@ -206,7 +226,15 @@
});
},
methods: {
reloadUserinfo() {
this.u = uni.getStorageSync("mall_UserInfo");
// this.showAuth=false;
this.getDetails()
},
//关闭登录窗口
gbAuth() {
uni.navigateBack();
},
goBack(type){
uni.navigateBack({
delta: type
......@@ -471,11 +499,14 @@
}
.ValuationCenter-image{
display: flex;
justify-content: space-between;
flex-wrap: wrap;
/* justify-content: space-between; */
padding: 50rpx 20rpx;
}
.upload-comm-image{
/* width: 200rpx; */
margin-right: 10rpx;
margin-bottom: 20rpx;
}
.image-name{
display: block;
......@@ -556,4 +587,11 @@
margin: 0 !important;
margin-right: 20rpx;
}
.slot-btn{
width: 200rpx;
height: 200rpx;
display: flex;
justify-content: center;
align-items: center;
}
</style>
\ No newline at end of file
pages/Luxury/ValuationDetails.vue
View file @ 51d54711
......@@ -39,19 +39,21 @@
<view class="upload-comm-image" v-for="(item,index) in BrandImgList">
<view class="comm-image" style="height: 200rpx;"
:style="{'background':'url('+item.Path+')no-repeat rgba(48,49,60,.1)','background-size': '100% 100%'}">
<u-upload
<u-uploadB
class="uploadImg"
style="display: flex;align-items: center;justify-content: center; width: 200rpx;background: rgba(48,49,60,.4)"
style="display: flex;align-items: center;width: 200rpx;background: rgba(48,49,60,.4)"
:action="action"
:file-list="[msg.GoodsImgList[index]]"
:obj="item"
:indexs="index"
:showShanchu="showShanchu"
max-count="1" :custom-btn="true"
@on-success="uploadSuccessHandler"
@on-remove="onRemove">
<view slot="addBtn" class="slot-btn">
<u-icon name="photograph" size="40" color="#ffffff"></u-icon>
</view>
</u-upload>
</u-uploadB>
</view>
<text class="image-name">{{item.Name}}</text>
</view>
......@@ -73,11 +75,12 @@
<view class="ValuationCenter-image" style="padding: 50rpx 10rpx;">
<view class="upload-comm-image">
<view class="comm-image">
<u-upload
<u-uploadB
style="width: 660rpx;flex-wrap: wrap;"
class="uploadImg uploadImgb"
:action="action"
:file-list="msg.MoreImgList"
:showShanchu="showShanchu"
max-count="10"
:custom-btn="true"
@on-success="uploadSuccessHandlerB"
......@@ -86,7 +89,7 @@
<view slot="addBtn" class="slot-btn" style="width: 200rpx;height: 200rpx;background:rgba(48,49,60,.1);">
<u-icon name="photograph" size="40" color="#888" style="width: 200rpx;height: 200rpx;line-height: 200rpx;justify-content: center;"></u-icon>
</view>
</u-upload>
</u-uploadB>
</view>
</view>
</view>
......@@ -106,7 +109,26 @@
</view>
<view class="ValuationCenter-textarea">
<view class="textarea-box">
<textarea placeholder="描述" v-model="msg.Remark" maxlength="-1"></textarea>
<textarea v-if="showShanchu" placeholder="描述" v-model="msg.Remark" maxlength="-1"></textarea>
<text v-else>描述: {{msg.Remark}}</text>
</view>
</view>
</view>
<view class="cutOff"/>
<view v-if="!showShanchu" class="ValuationCenter-box">
<view class="Valuation_item">
<view class="class-title">
<view></view>
<text>回复</text>
<view class="optional"></view>
</view>
</view>
<!-- <view class="hint">
</view> -->
<view class="ValuationCenter-textarea" style="margin-top: 0;">
<view class="textarea-box">
<text>{{datas.ReplyContent}}</text>
</view>
</view>
</view>
......@@ -122,9 +144,15 @@
</view>
</view>
</div>
<auth
v-if="showAuth"
@changeuserinfo="reloadUserinfo"
@gbAuth="gbAuth"
></auth>
</div>
</template>
<script>
import auth from "@/components/auth/index.vue";
export default {
data() {
return {
......@@ -149,9 +177,12 @@
datas:{},
tmplIds:[],
showOpenSettingDialog:false,
showShanchu:false,
u:{}
};
},
components: {
auth,
// search,
// tabbars,
// uniIndexedList
......@@ -165,6 +196,12 @@
this.host2 + "/api/File/UploadTencent?MallBaseId=" + MallBaseId;
if(option.Obj){
this.datas = JSON.parse(option.Obj)
console.log(this.datas.ReplyDate,'---')
if(this.datas.ReplyDate){
this.showShanchu = false
}else{
this.showShanchu = true
}
this.msg.Id = this.datas.Id
this.msg.CategoryId = this.datas.CategoryId
this.msg.BrandId = this.datas.BrandId
......@@ -172,10 +209,21 @@
this.msg.GoodsImgList = this.datas.GoodsImgList
this.msg.MoreImgList = this.datas.MoreImgList
this.isloading = false
}
this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) {
this.u = {
nickName: "未登录",
avatarUrl: "",
};
this.isloading = false
this.showAuth = true;
} else {
this.getDetails()
this.showOpenSettingDialog = uni.getStorageSync('showOpenSettingDialog') || false;
this.subscription()
}
this.showOpenSettingDialog = uni.getStorageSync('showOpenSettingDialog') || false;
// this.subscription()
},
......@@ -211,7 +259,18 @@
},
// 提交
setMsg(){
if(this.msg.GoodsImgList.length==0||this.msg.GoodsImgList.length<this.GoodsImgList.length){
let arr = this.msg.GoodsImgList.map(item=>{
return item.Path
})
if(this.msg.GoodsImgList.length==0&&this.msg.GoodsImgList.length<this.BrandImgList.length){
uni.showToast({
title: "请上传商品图",
icon:'none'
});
return;
}
if(arr.indexOf(undefined)!=-1){
uni.showToast({
title: "请上传商品图",
icon:'none'
......@@ -229,7 +288,6 @@
},
res => {
if(res.resultCode==1){
this.loading = true
uni.hideLoading();
uni.showToast({
title: "提交成功",
......@@ -239,21 +297,29 @@
url: '/pages/Luxury/myValuation'
});
}
this.loading = true
uni.hideNavigationBarLoading();
}
);
},
onRemove(index) {
this.msg.GoodsImgList.splice(index, 1);
onRemove(index,lists,indexs) {
this.msg.GoodsImgList[indexs]={}
// this.msg.GoodsImgList.splice(indexs, 1);
},
uploadSuccessHandler(data, index, lists, obj) {
uploadSuccessHandler(data, index, lists, obj,indexs) {
let r = JSON.parse(data);
let datas = {
Sort:obj.Sort,
Name:obj.Name,
Path:r.data
}
this.msg.GoodsImgList.push(datas)
this.msg.GoodsImgList.forEach((item,i)=>{
if(i==indexs){
item.Sort=obj.Sort,
item.Name=obj.Name,
item.Path=r.data
}
})
},
onRemoveB(index) {
this.msg.MoreImgList.splice(index, 1);
......@@ -468,11 +534,14 @@
}
.ValuationCenter-image{
display: flex;
flex-wrap: wrap;
/* justify-content: space-between; */
padding: 50rpx 20rpx;
}
.upload-comm-image{
/* width: 200rpx; */
margin-right: 10rpx;
margin-bottom: 20rpx;
}
.image-name{
display: block;
......@@ -556,4 +625,11 @@
.uploadImgb .u-list-item{
margin-right: 20rpx;
}
.slot-btn{
width: 200rpx;
height: 200rpx;
display: flex;
justify-content: center;
align-items: center;
}
</style>
\ No newline at end of file
pages/Luxury/myValuation.vue
View file @ 51d54711
<template>
<view class="orderindexStyle" :style="{height: contentHeight,}">
<view style="padding: 10px 0; background: #fff;">
<!-- <view style="padding: 10px 0; background: #fff;"> -->
<!-- <u-tabs :list="headList" :current="current" name="Name" @change="change" :active-color="mainColor" bg-color="#FFF"
height="80"></u-tabs> -->
<view class="myValation-header">
<!-- <view class="myValation-header">
<view class="myValation-title" v-for="(item,index) in headList"
:class="{'active':headID==item.Id}" @click="choose(item)">
<text>{{item.name}}</text>
<view></view>
</view>
</view>
</view> -->
</view>
<!-- </view> -->
<view style="height: calc(100vh - 50px); background: #fff;" v-if="list.length == 0">
......@@ -42,9 +42,14 @@
</view>
</view>
</view>
<u-loadmore v-if="pageCount>1" :status="status" :load-text="loadText" :font-size="24" :margin-top="20" :margin-bottom="20" bg-color="#f3f4f6" />
<u-loadmore v-if="pageCount>1&&list.length>0" :status="status" :load-text="loadText" :font-size="24" :margin-top="20" :margin-bottom="20" bg-color="#f3f4f6" />
</scroll-view>
</view>
<auth
v-if="showAuth"
@changeuserinfo="reloadUserinfo"
@gbAuth="gbAuth"
></auth>
</view>
</template>
......@@ -67,7 +72,7 @@
// {name:'帮卖中',Id:3},
// {name:'已完成',Id:4},
],
pageTitle: "我的订单",
pageTitle: "估价列表",
current: 0,
list: [],
mainColor: "",
......@@ -116,6 +121,7 @@
loading: "努力加载中",
nomore: "没有更多了",
},
u:{}
};
},
created() {
......@@ -151,6 +157,15 @@
}
},
methods: {
reloadUserinfo() {
this.u = uni.getStorageSync("mall_UserInfo");
// this.showAuth=false;
this.init()
},
//关闭登录窗口
gbAuth() {
uni.navigateBack();
},
goDetails(item){
uni.navigateTo({
url: '/pages/Luxury/ValuationDetails?Obj='+JSON.stringify(item)
......@@ -267,12 +282,22 @@
width: 100%;
height: 100rpx;
}
.title-box text{
display: block;
margin-bottom: 10rpx;
}
.listBox_Reply{
width: 100%;
margin-top: 20rpx;
text-align: right;
background: #F6F6F6;
display: flex;
padding: 20rpx 30rpx;
}
.listBox_Reply text:first-child{
margin-right: 10rpx;
font-weight: 500;
color: black;
}.listBox_Reply text:last-child{
color: #191919;
}
</style>
\ No newline at end of file
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