Skip to content

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

Merge branch 'dev' of http://47.110.145.204:8085/lixingjian/hs-app-project into dev

parents 9cd5b870 a943b2a4
Hide whitespace changes
Inline Side-by-side
Showing with 174 additions and 131 deletions
src/config/store/modules/base.js
View file @ fe440f6e
...@@ -205,7 +205,7 @@ const actions = { ...@@ -205,7 +205,7 @@ const actions = {
'brand','sale_season','material_position','technolog_type','technology_point', 'brand','sale_season','material_position','technolog_type','technology_point',
'production_type','style_type','sale_type','year','series','wave','pattern','base_unit', 'production_type','style_type','sale_type','year','series','wave','pattern','base_unit',
'material_node','cloth_width_unit','fabric_width_unit','development_rules','production_list', 'material_node','cloth_width_unit','fabric_width_unit','development_rules','production_list',
'price_fixed','age_fixed','style_fixed','customer_type' 'price_fixed','age_fixed','style_fixed','customer_type','express'
]; ];
http('base.dictionary',{codeList}).then(res => { http('base.dictionary',{codeList}).then(res => {
let { code, data } = res; let { code, data } = res;
......
src/pages/fabricModeling/modelingOrder.vue
View file @ fe440f6e
...@@ -275,7 +275,7 @@ export default { ...@@ -275,7 +275,7 @@ export default {
this.loadStatus = 'loading'; this.loadStatus = 'loading';
let { current, size } = this.pages; let { current, size } = this.pages;
this.$http( this.$http(
'modelingtask.selectModelingTaskPage', 'modeling.selectModelingTaskPage',
{ {
materialName: this.value ? this.value : null, materialName: this.value ? this.value : null,
status: this.status, status: this.status,
......
src/pages/home/detail.vue
View file @ fe440f6e
...@@ -83,8 +83,8 @@ ...@@ -83,8 +83,8 @@
watch: { watch: {
id: { id: {
handler() { handler() {
this.materialDetail() // this.materialDetail()
this.detail() // this.detail()
} }
} }
}, },
...@@ -108,11 +108,11 @@ ...@@ -108,11 +108,11 @@
this.materialDetail() this.materialDetail()
this.detail() this.detail()
}, },
created() { // created() {
this.materialDetail() // this.materialDetail()
this.detail() // this.detail()
this.id = this.$route.query.id // this.id = this.$route.query.id
}, // },
methods: { methods: {
materialDetail() { materialDetail() {
this.$http('materialinfo.getMaterialById', this.id).then(res => { this.$http('materialinfo.getMaterialById', this.id).then(res => {
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
} }
} }
} }
} }
} }
</style> </style>
\ No newline at end of file
src/pages/index/canvas.js
View file @ fe440f6e
...@@ -247,17 +247,26 @@ export default { ...@@ -247,17 +247,26 @@ export default {
resolve( resolve(
Promise.all(fileList) Promise.all(fileList)
.then((images) =>{ .then((images) =>{
console.log(images)
// Draw images to canvas // Draw images to canvas
images.forEach((image) => { images.forEach((image) => {
this.ctx.globalAlpha = image.opacity ? image.opacity : 1; this.ctx.globalAlpha = image.opacity ? image.opacity : 1;
return this.ctx.drawImage(image, 0, 0 ,this.canvas_width, this.canvas_height); return this.ctx.drawImage(image, 0, 0);
}); });
this.ctx.draw(); this.ctx.draw();
}) })
) )
}) })
}, },
scaleImage(){
let config = {
};
return {
width: this.compatibilitySize(parseFloat(config.w)*this.scale),
height: this.compatibilitySize(parseFloat(config.h)*this.scale))
}
},
drawImage(config){ drawImage(config){
return new Promise(async (resolve,reject)=>{ return new Promise(async (resolve,reject)=>{
if(config.url){ if(config.url){
......
src/pages/material/createMaterial.vue
View file @ fe440f6e
...@@ -17,21 +17,21 @@ ...@@ -17,21 +17,21 @@
<!-- <u-image height="750rpx" :src="`${$IMG_URL}${detail.originalImageCode}`"></u-image>--> <!-- <u-image height="750rpx" :src="`${$IMG_URL}${detail.originalImageCode}`"></u-image>-->
<view> <view>
<!--新增 初始化的时候显示 部位编辑的时候不显示--> <!--新增 初始化的时候显示 部位编辑的时候不显示-->
<e-canvas ref="eCanvas" v-show="!isPartEdit && isEditMode"></e-canvas> <e-canvas ref="eCanvas" v-show="isEditMode"></e-canvas>
<!--调试--> <!--调试-->
<!--<e-canvas ref="eCanvasHelp" ></e-canvas>--> <!--<e-canvas ref="eCanvasHelp" ></e-canvas>-->
<e-canvas ref="eCanvasHelp" style="position: fixed;top: -100000px;"></e-canvas> <e-canvas ref="eCanvasHelp" style="position: fixed;top: -100000px;"></e-canvas>
<!--部位编辑的时候显示 --> <!--部位编辑的时候显示 -->
<image <!-- <image-->
v-show="isPartEdit || !isEditMode" <!-- v-show="isPartEdit || !isEditMode"-->
:style="{ <!-- :style="{-->
'--src': `url(${activeBgPic})`, <!-- '&#45;&#45;src': `url(${activeBgPic})`,-->
'--transform': `rotate(${angle}deg)`, <!-- '&#45;&#45;transform': `rotate(${angle}deg)`,-->
}" <!-- }"-->
:src="`${activePartPicCode}`" <!-- :src="`${activePartPicCode}`"-->
mode="heightFix" <!-- mode="heightFix"-->
class="height-750rpx view" <!-- class="height-750rpx view"-->
></image> <!-- ></image>-->
</view> </view>
<view v-if="!isEdit"> <view v-if="!isEdit">
<view <view
...@@ -47,31 +47,33 @@ ...@@ -47,31 +47,33 @@
>下一款</view >下一款</view
> >
</view> </view>
<view <!--角度调整-->
:class="[!isEdit ? 'hide' : 'active']" <!-- <view-->
class="u-absolute step u-p-r-30 u-p-l-30" <!-- :class="[!isEdit ? 'hide' : 'active']"-->
> <!-- class="u-absolute step u-p-r-30 u-p-l-30"-->
<view class="step-main u-p-r-20 u-p-l-20 u-flex"> <!-- >-->
<text class="width_100">{{ angle }}°</text> <!-- <view class="step-main u-p-r-20 u-p-l-20 u-flex">-->
<view class="u-relative u-flex-1"> <!-- <text class="width_100">{{ angle }}°</text>-->
<view class="line" id="line"> <!-- <view class="u-relative u-flex-1">-->
<view class="line-center"></view> <!-- <view class="line" id="line">-->
<view <!-- <view class="line-center"></view>-->
class="line-step" <!-- <view-->
id="line-step" <!-- class="line-step"-->
:style="{ <!-- id="line-step"-->
left: <!-- :style="{-->
((offset.x - lineOffset.left) / lineWidth) * 100 + '%', <!-- left:-->
}" <!-- ((offset.x - lineOffset.left) / lineWidth) * 100 + '%',-->
@touchmove="touchMove" <!-- }"-->
@touchend="touchEnd" <!-- @touchmove="touchMove"-->
@touchstart="touchStart" <!-- @touchend="touchEnd"-->
/> <!-- @touchstart="touchStart"-->
</view> <!-- />-->
</view> <!-- </view>-->
<text class="u-m-l-24" @click="resetStep">重置</text> <!-- </view>-->
</view> <!-- <text class="u-m-l-24" @click="resetStep">重置</text>-->
</view> <!-- </view>-->
<!-- </view>-->
<!--角度调整-->
</view> </view>
<view class=""> <view class="">
<!--可调整部位--> <!--可调整部位-->
...@@ -111,11 +113,11 @@ ...@@ -111,11 +113,11 @@
:class="[selectedMaterial.id === color.id ? 'active' : '']" :class="[selectedMaterial.id === color.id ? 'active' : '']"
v-for="color in MaterialList" v-for="color in MaterialList"
> >
<image :src="`${$IMG_URL}${color}`" style="width: 100%; height: 100%"></image> <image :src="`${$IMG_URL}${color.colourFileCode}`" style="width: 100%; height: 100%"></image>
<view class="image-tip u-line-1">{{ color.materialName }}</view> <view class="image-tip u-line-1">{{ color.materialName }}</view>
</view> </view>
</view> </view>
<view class="overflow" v-if="selectedMaterialItemColors.length > 0"> <view class="overflow u-p-t-30 u-p-b-30" v-if="selectedMaterialItemColors.length > 0">
<u-image <u-image
:src="`${$IMG_URL}${item.fileCode}`" :src="`${$IMG_URL}${item.fileCode}`"
width="80rpx" width="80rpx"
...@@ -128,18 +130,18 @@ ...@@ -128,18 +130,18 @@
class="u-m-r-20 inline-block color-item" class="u-m-r-20 inline-block color-item"
></u-image> ></u-image>
</view> </view>
<view class="u-p-t-30 u-p-b-20 text-right"> <!-- <view class="u-p-t-30 u-p-b-20 text-right">-->
<view <!-- <view-->
class="button inline-block button-plain button-plain-default" <!-- class="button inline-block button-plain button-plain-default"-->
@click="cancelMaterialItem" <!-- @click="cancelMaterialItem"-->
>取消</view <!-- >取消</view-->
> <!-- >-->
<view <!-- <view-->
@click="setMaterialItem" <!-- @click="setMaterialItem"-->
class="button inline-block button-default" <!-- class="button inline-block button-default"-->
>确定</view <!-- >确定</view-->
> <!-- >-->
</view> <!-- </view>-->
</view> </view>
</view> </view>
<!--颜色选择--> <!--颜色选择-->
...@@ -155,7 +157,7 @@ ...@@ -155,7 +157,7 @@
<view <view
class="image u-m-r-10" class="image u-m-r-10"
:class="[ :class="[
activeMainPartBodyColorId === color.mdmMaterialColourId activeMainPartBodyColorId === color.id
? 'active' ? 'active'
: '', : '',
]" ]"
...@@ -196,7 +198,7 @@ ...@@ -196,7 +198,7 @@
:class="[ :class="[
mainPartOtherColor mainPartOtherColor
.map((item) => item.mdmMaterialColourId) .map((item) => item.mdmMaterialColourId)
.indexOf(color.mdmMaterialColourId) > -1 .indexOf(color.id) > -1
? 'active' ? 'active'
: '', : '',
]" ]"
...@@ -602,17 +604,29 @@ export default { ...@@ -602,17 +604,29 @@ export default {
setMaterialItem() { setMaterialItem() {
if (this.activePartIndex === 0) { if (this.activePartIndex === 0) {
this.materialDetail = this.selectedMaterialItem; this.materialDetail = this.selectedMaterialItem;
this.colorSelect(this.activeColor, this.selectedMaterialItemColors,this.toggleCanvasEditCallback); if(this.activeColor.colourId){
this.colorSelect(
this.activeColor,
this.selectedMaterialItemColors,
this.toggleCanvasEditCallback
);
}
this.isEdit = false;
} else { } else {
this.ontherPartTrigger( if(this.activeColor.colourId){
this.activeColor, this.ontherPartTrigger(
this.selectedMaterialItemColors this.activeColor,
); this.selectedMaterialItemColors
);
this.isEdit = false;
}else{
this.$refs.uToast.show({
title: '请选择一个颜色'
});
}
} }
this.activeColor = {}; this.activeColor = {};
this.isEdit = false;
this.isPartEdit = false; this.isPartEdit = false;
}, },
cancelMaterialItem() { cancelMaterialItem() {
this.isEdit = false; this.isEdit = false;
...@@ -623,6 +637,7 @@ export default { ...@@ -623,6 +637,7 @@ export default {
materialId: this.selectedMaterialItem.id, materialId: this.selectedMaterialItem.id,
mdmMaterialColourId: color.id, mdmMaterialColourId: color.id,
}; };
this.setMaterialItem()
}, },
pageReload() { pageReload() {
this.$Router.replace({ this.$Router.replace({
......
src/pages/material/entrustManagement.vue
View file @ fe440f6e
...@@ -26,8 +26,12 @@ ...@@ -26,8 +26,12 @@
</view> </view>
</view> </view>
</view> </view>
<view id="body" class="body u-p-r-30 u-p-l-30" :style="{ bottom: footerHeight + 'px', top: headerHeight+ 'px'}"> <!-- todo-->
<view v-if="activeStatus === 0"> <view id="body" >
<scroll-view v-if="activeStatus === 0"
class="body u-p-r-30 u-p-l-30" :style="{ bottom: footerHeight + 'px', top: headerHeight+ 'px'}"
:scroll-y="true"
@scrolltolower="loadMore">
<view class="u-p-t-24 u-p-b-24">待上架：{{ pageOptions.pages }}款</view> <view class="u-p-t-24 u-p-b-24">待上架：{{ pageOptions.pages }}款</view>
<view class="entrust bg-fff u-p-30" <view class="entrust bg-fff u-p-30"
v-for="(item,index) in computedList"> v-for="(item,index) in computedList">
...@@ -83,8 +87,11 @@ ...@@ -83,8 +87,11 @@
</view> </view>
</view> </view>
</view> </view>
</view> </scroll-view>
<view v-if="activeStatus === 1"> <scroll-view v-if="activeStatus === 1"
class="body u-p-r-30 u-p-l-30" :style="{ top: headerHeight+ 'px'}"
:scroll-y="true"
@scrolltolower="loadMore">
<view class="u-p-t-24 u-p-b-24">已上架：{{ pageOptions.pages }}款</view> <view class="u-p-t-24 u-p-b-24">已上架：{{ pageOptions.pages }}款</view>
<view class="entrust bg-fff u-p-30" v-for="(item,index) in computedList" > <view class="entrust bg-fff u-p-30" v-for="(item,index) in computedList" >
<view class="entrust-title u-flex"> <view class="entrust-title u-flex">
...@@ -97,40 +104,44 @@ ...@@ -97,40 +104,44 @@
@click="triggerToggle(index)" @click="triggerToggle(index)"
/> />
</view> </view>
<view class="u-flex u-p-t-30" v-for="item in item.children"> <view v-if="checkToggle(index)">
<view class="item u-flex-1 u-flex u-p-l-30" @click="goItem(item)"> <view class="u-flex u-p-t-30" v-for="item in item.children">
<view class="item-img"> <view class="item u-flex-1 u-flex u-p-l-30" @click="goItem(item)">
<u-image <view class="item-img">
width="100%" height="100%" <u-image
:src="`${$IMG_URL}${item.originalImageCode}`"></u-image> width="100%" height="100%"
</view> :src="`${$IMG_URL}${item.originalImageCode}`"></u-image>
<view class="u-flex-1 u-p-l-20">
<view class="item-title u-line-1 u-font-28">{{ item.materialName }}</view>
<view class="u-flex u-m-t-6 u-m-b-6">
<view class="u-m-r-40 label u-font-24">款号</view>
<view class="u-line-1 u-flex-1 content u-font-24">
{{ item.styleCode }}
</view>
</view> </view>
<view class="u-flex u-m-t-6 u-m-b-6"> <view class="u-flex-1 u-p-l-20">
<view class="u-m-r-40 label u-font-24">所选面料</view> <view class="item-title u-line-1 u-font-28">{{ item.materialName }}</view>
<view class="u-line-1 u-flex-1 content u-font-24"> <view class="u-flex u-m-t-6 u-m-b-6">
{{ item.materialName }} <view class="u-m-r-40 label u-font-24">款号</view>
<view class="u-line-1 u-flex-1 content u-font-24">
{{ item.styleCode }}
</view>
</view> </view>
</view> <view class="u-flex u-m-t-6 u-m-b-6">
<view class="item-tags"> <view class="u-m-r-40 label u-font-24">所选面料</view>
<view class="item-tag u-font-20" :key="tag.id" <view class="u-line-1 u-flex-1 content u-font-24">
v-for="(tag) in item.styleLibraryTagVOList"> {{ item.materialName }}
{{ tag.materialTagName }} </view>
</view>
<view class="item-tags">
<view class="item-tag u-font-20" :key="tag.id"
v-for="(tag) in item.styleLibraryTagVOList">
{{ tag.materialTagName }}
</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </scroll-view>
<view v-if="activeStatus === 2"> <scroll-view v-if="activeStatus === 2"
class="body u-p-r-30 u-p-l-30" :style="{ top: headerHeight+ 'px'}"
:scroll-y="true"
@scrolltolower="loadMore">
<view class="u-p-t-24 u-p-b-24">全部：{{ pageOptions.pages }}款</view> <view class="u-p-t-24 u-p-b-24">全部：{{ pageOptions.pages }}款</view>
<view v-for="item in list" @click="goItem(item)" :key="item.id"> <view v-for="item in list" @click="goItem(item)" :key="item.id">
...@@ -177,7 +188,7 @@ ...@@ -177,7 +188,7 @@
</view> </view>
</view> </view>
</view> </scroll-view>
</view> </view>
<view id="footer" class="footer" v-if="activeStatus === 0"> <view id="footer" class="footer" v-if="activeStatus === 0">
<view class="footer-btn"> <view class="footer-btn">
...@@ -368,13 +379,16 @@ export default { ...@@ -368,13 +379,16 @@ export default {
} }
}, },
// 触底加载更多 // 触底加载更多
onReachBottom() { loadMore() {
if (this.pageOptions.current < this.pageOptions.pages) { if (this.pageOptions.current < this.pageOptions.pages) {
this.pageOptions.current += 1; this.pageOptions.current += 1;
this.getList(); this.getList(false);
} }
}, },
getList(isReload = false){ getList(isReload = false){
uni.showLoading({
mask: true
})
this.$http("stylelibraryorder.getToShelvesManagerList",{ this.$http("stylelibraryorder.getToShelvesManagerList",{
status: this.statusList[this.activeStatus].value, status: this.statusList[this.activeStatus].value,
...this.pageOptions ...this.pageOptions
...@@ -387,12 +401,15 @@ export default { ...@@ -387,12 +401,15 @@ export default {
this.pageOptions.pages = data.total; this.pageOptions.pages = data.total;
this.loadStatus = this.list.length < data.total ? 'loadmore' : 'nomore'; this.loadStatus = this.list.length < data.total ? 'loadmore' : 'nomore';
}else{ }else{
this.list = []; this.list = this.list.concat([]);
this.pageOptions.pages = 0; this.pageOptions.pages = 0;
this.loadStatus = 'nomore'; this.loadStatus = 'nomore';
} }
} }
}) })
.then(res =>{
uni.hideLoading()
})
}, },
goEntrustList(){ goEntrustList(){
this.$Router.push({ this.$Router.push({
...@@ -520,7 +537,7 @@ $main-color: #fff; ...@@ -520,7 +537,7 @@ $main-color: #fff;
right: 0; right: 0;
bottom: 0; bottom: 0;
top: 0; top: 0;
overflow-y: auto; //overflow-y: auto;
} }
.footer { .footer {
......
src/pages/material/entrustManagementItem.vue
View file @ fe440f6e
...@@ -66,10 +66,19 @@ export default { ...@@ -66,10 +66,19 @@ export default {
}, },
computed:{ computed:{
mainPic(){ mainPic(){
return this.item.colourApiList.filter((item) => item.isMain)[0] // return this.item.colourApiList.filter((item) => item.isMain)[0];
return this.item.colourApiList.length > 0 ?
this.item.colourApiList.filter((item) => item.isMain)[0]:
{
fileCode: ''
}
}, },
subPic(){ subPic(){
return this.item.colourApiList.filter((item) => !item.isMain) return this.item.colourApiList.length > 0 ?
this.item.colourApiList.filter((item) => !item.isMain):
{
fileCode: ''
}
}, },
materialInfo(){ materialInfo(){
let item = this.item.materialInfo || {}; let item = this.item.materialInfo || {};
......
src/pages/material/list.vue
View file @ fe440f6e
...@@ -19,7 +19,10 @@ ...@@ -19,7 +19,10 @@
</view> </view>
</view> </view>
<!-- 列表 确定--> <!-- 列表 确定-->
<view class="u-p-30 body" :style="{ bottom: footerHeight+ 'px', top: headerHeight + 'px' }"> <scroll-view class="u-p-30 body"
:scroll-y="true"
@scrolltolower="loadMore"
:style="{ bottom: footerHeight+ 'px', top: headerHeight + 'px' }">
<view v-for="(item, index) in computedList" :key="item.id" class="u-flex u-m-b-20"> <view v-for="(item, index) in computedList" :key="item.id" class="u-flex u-m-b-20">
<view class="u-m-r-30"> <view class="u-m-r-30">
<u-icon :name="index === selectedIndex ? 'checkmark-circle-fill': 'checkmark-circle'" <u-icon :name="index === selectedIndex ? 'checkmark-circle-fill': 'checkmark-circle'"
...@@ -33,7 +36,7 @@ ...@@ -33,7 +36,7 @@
<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="没有数据"></hs-empty> <hs-empty v-if="isEmpty" tipText="没有数据"></hs-empty>
</view> </scroll-view>
<!-- 底部按钮 确定--> <!-- 底部按钮 确定-->
...@@ -80,7 +83,7 @@ export default { ...@@ -80,7 +83,7 @@ export default {
materialCategory: this.categoryDictionary.find(($item) =>{ materialCategory: this.categoryDictionary.find(($item) =>{
return item.category == $item.value return item.category == $item.value
})?.label, })?.label,
materialDoorWidth: item.fabricWidth, materialDoorWidth: item.clothWidth,
materialElement: item.saoriStandard, materialElement: item.saoriStandard,
} }
}) })
...@@ -90,14 +93,14 @@ export default { ...@@ -90,14 +93,14 @@ export default {
} }
}, },
onLoad(){ onLoad(){
this.getList(); this.getList(false);
}, },
methods:{ methods:{
// 触底加载更多 // 触底加载更多
onReachBottom() { loadMore() {
if (this.pageOptions.current < this.pageOptions.pages) { if (this.pageOptions.current < this.pageOptions.pages) {
this.pageOptions.current += 1; this.pageOptions.current += 1;
this.getData(); this.getList(false);
} }
}, },
search(){ search(){
...@@ -105,12 +108,13 @@ export default { ...@@ -105,12 +108,13 @@ export default {
current: 1, current: 1,
size: 10, size: 10,
} }
this.getList(); this.getList(true);
}, },
getList(){ getList(isReload){
this.loadStatus = 'loading'; this.loadStatus = 'loading';
this.$http('materialinfo.getMaterialList', { this.$http('materialinfo.getMaterialList', {
"codeAndName": this.keyword, "codeAndName": this.keyword,
"isFilter": true,
"isDisabled": false, "isDisabled": false,
"materialCode": "", "materialCode": "",
"materialType": "面料", "materialType": "面料",
...@@ -118,7 +122,8 @@ export default { ...@@ -118,7 +122,8 @@ export default {
}).then(res => { }).then(res => {
let { code, data } = res; let { code, data } = res;
if (code == 200) { if (code == 200) {
this.list = data.page.records; this.list = isReload ? data.page.records :
this.list.concat(data.page.records || []);
this.pageOptions.pages = data.page.total; this.pageOptions.pages = data.page.total;
this.loadStatus = this.list.length < data.page.total ? 'loadmore' : 'nomore'; this.loadStatus = this.list.length < data.page.total ? 'loadmore' : 'nomore';
} }
......
src/pages/material/mixins/material.js
View file @ fe440f6e
...@@ -14,6 +14,7 @@ export default { ...@@ -14,6 +14,7 @@ export default {
getMaterialList(){ getMaterialList(){
this.$http("materialinfo.getMaterialList",{ this.$http("materialinfo.getMaterialList",{
isDisabled: false, isDisabled: false,
isFilter: true,
materialType: "面料", materialType: "面料",
current: 1, current: 1,
size: 10, size: 10,
......
src/pages/modeling/addItem.vue
View file @ fe440f6e
...@@ -634,19 +634,6 @@ export default { ...@@ -634,19 +634,6 @@ export default {
}, },
submit(type){ submit(type){
let {modelingTaskPictureDTOList, ...onther} = this.detail; let {modelingTaskPictureDTOList, ...onther} = this.detail;
console.log(this.detail.modelingTaskMaterialColourList)
console.log(
Object.assign({},
onther,
{
designAgencyColourQuantity: this.designAgencyColourQuantity,
operationType:type,
modelingTaskPictureDTOList: modelingTaskPictureDTOList.concat(this.delModelingTaskPictureDTOList)}
)
)
return
this.$http("modeling.submit",Object.assign({}, this.$http("modeling.submit",Object.assign({},
onther, onther,
{ {
......
src/pages/order/item.vue
View file @ fe440f6e
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<!--选款--> <!--选款-->
<u-navbar title="客户详情" <u-navbar title="客户详情"
:border-bottom="false" :border-bottom="false"
:background="{backgroundColor: 'transparent'}"> :background="{backgroundColor: 'whitesmoke'}">
</u-navbar> </u-navbar>
<view class="u-p-30"> <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="border-radius-8 bg-fff u-p-r-30 u-p-l-30 u-m-b-20">
......
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