Commit 7461e0df authored by 刘用法's avatar 刘用法
parents 7856decb 7054d9f0
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<view class="list u-flex u-row-between"> <view class="list u-flex u-row-between">
<image class="item-image" :src="mixingImage" v-if="item.required"></image> <image class="item-image" :src="mixingImage" v-if="item.required"></image>
<view class="u-m-r-20">{{item.fieldsTitle}}</view> <view class="u-m-r-20">{{item.fieldsTitle}}</view>
<view class="u-flex-1 location-name"> <view class="u-flex-1 location-name" @click="getLocation">
<u-icon name="map" color="#2979ff" size="30"></u-icon>自动定位 <u-icon name="map" color="#2979ff" size="30"></u-icon>自动定位
</view> </view>
</view> </view>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<view class="wrap"> <view class="wrap">
<swiper class="swiper-box" :current="swiperCurrent" @transition="transition" <swiper class="swiper-box" :current="swiperCurrent" @transition="transition"
@animationfinish="animationfinish"> @animationfinish="animationfinish">
<swiper-item class="swiper-item"> <swiper-item class="swiper-item" v-if="currentItem.main_point && currentItem.main_point.length > 0">
<view class="inner txt-inner" :style="{'background-image':'url(/static/photo/shadow-bg.png)'}"> <view class="inner txt-inner" :style="{'background-image':'url(/static/photo/shadow-bg.png)'}">
<view class="title"> <view class="title">
拍照要求 拍照要求
......
...@@ -231,7 +231,8 @@ ...@@ -231,7 +231,8 @@
"style": { "style": {
"navigationBarTitleText": "规范展示", "navigationBarTitleText": "规范展示",
"navigationBarBackgroundColor":"#FFFFFF", "navigationBarBackgroundColor":"#FFFFFF",
"backgroundColor":"#F4F5F7" "backgroundColor":"#F4F5F7",
"navigationStyle": "custom" // 隐藏系统导航栏
} }
} }
] ]
...@@ -390,7 +391,9 @@ ...@@ -390,7 +391,9 @@
{ {
"name": "完工配置", //模式名称 "name": "完工配置", //模式名称
"path": "pages/order/complete", //启动页面,必选 "path": "pages/order/complete", //启动页面,必选
"query": "" //启动参数,在页面的onLoad函数里面得到 "query": {
"id":11880091
} //启动参数,在页面的onLoad函数里面得到
}, },
{ {
"name": "资料信息", //模式名称 "name": "资料信息", //模式名称
......
...@@ -5,13 +5,13 @@ ...@@ -5,13 +5,13 @@
<u-navbar :background="{background: '#2272FF'}" back-icon-color="#fff" :title-size="32" title-color="#fff" :border-bottom="false" title="完工信息"></u-navbar> <u-navbar :background="{background: '#2272FF'}" back-icon-color="#fff" :title-size="32" title-color="#fff" :border-bottom="false" title="完工信息"></u-navbar>
<u-tabs-swiper class="order-tabs" ref="tabs" :current="tabIndex" name="panelName" :list="list" @change="tabsChange" :is-scroll="false" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="80" font-size="32"></u-tabs-swiper> <u-tabs-swiper class="order-tabs" ref="tabs" :current="tabIndex" name="panelName" :list="list" @change="tabsChange" :is-scroll="false" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="80" font-size="32"></u-tabs-swiper>
<view class="u-menu-wrap"> <view class="u-menu-wrap">
<scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop" :scroll-into-view="itemId" v-if="list[tabIndex].items.length > 1"> <view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop" :scroll-into-view="itemId" v-if="list[tabIndex].items.length > 1">
<view v-for="(item,index) in list[tabIndex].items" :key="index" class="u-tab-item" <view v-for="(item,index) in list[tabIndex].items" :key="index" class="u-tab-item"
:class="[current == index ? 'u-tab-item-active' : '']" @tap.stop="swichMenu(index)"> :class="[current == index ? 'u-tab-item-active' : '']" @tap.stop="swichMenu(index)">
<text class="u-line-1">{{item.name}}</text> <text class="u-line-1">{{item.name}}</text>
</view> </view>
</scroll-view> </view>
<scroll-view :scroll-top="scrollRightTop" scroll-y scroll-with-animation class="right-box" @scroll="rightScroll"> <view :scroll-top="scrollRightTop" scroll-y scroll-with-animation class="right-box" @scroll="rightScroll">
<u-form :model="form" ref="uForm"> <u-form :model="form" ref="uForm">
<template v-for="(groupItem, groupIndex) in (list.length>0?list[tabIndex].items:[])"> <template v-for="(groupItem, groupIndex) in (list.length>0?list[tabIndex].items:[])">
<view class="class-item" :key="groupIndex"> <view class="class-item" :key="groupIndex">
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</view> </view>
</template> </template>
</u-form> </u-form>
</scroll-view> </view>
</view> </view>
<view :class="['btn-wrap', 'flex-xc', {'btn-bottom': tabIndex > 0}]"> <view :class="['btn-wrap', 'flex-xc', {'btn-bottom': tabIndex > 0}]">
<u-button class="btn-submit" @click="saveComplete" <u-button class="btn-submit" @click="saveComplete"
...@@ -189,8 +189,8 @@ ...@@ -189,8 +189,8 @@
this.orderServiceType = decodeURIComponent(option.orderServiceType) this.orderServiceType = decodeURIComponent(option.orderServiceType)
this.inGuaranteePeriod = option.inGuaranteePeriod this.inGuaranteePeriod = option.inGuaranteePeriod
} else { } else {
this.orderId = 9708719 this.orderId = 11880091
this.categoryId = 88 this.categoryId = 1100000214
this.orderServiceType = '安装' this.orderServiceType = '安装'
this.inGuaranteePeriod = 'Y' this.inGuaranteePeriod = 'Y'
} }
...@@ -264,6 +264,14 @@ ...@@ -264,6 +264,14 @@
}) })
}) })
}) })
if (!param.base[0].fieldsValue) {
return this.$refs.uToast.show({
title: '请先选择产品规格',
type: 'error',
})
}
self.$u.api.saveCompleteData(param,self.orderId).then((res)=>{ self.$u.api.saveCompleteData(param,self.orderId).then((res)=>{
if (res.code == 200) { if (res.code == 200) {
this.$refs.uToast.show({ this.$refs.uToast.show({
...@@ -649,6 +657,7 @@ ...@@ -649,6 +657,7 @@
width: 200rpx; width: 200rpx;
height: 100%; height: 100%;
border: 4rpx solid #F4F5F7; border: 4rpx solid #F4F5F7;
overflow: auto;
} }
.u-tab-item { .u-tab-item {
...@@ -686,6 +695,8 @@ ...@@ -686,6 +695,8 @@
.right-box { .right-box {
// background-color: rgb(250, 250, 250); // background-color: rgb(250, 250, 250);
background-color: #FFFFFF; background-color: #FFFFFF;
overflow: auto;
width: 100%;
} }
.page-view { .page-view {
......
<template> <template>
<view class="backView"> <view class="backView">
<u-navbar :title-size="32" title-color="#000" :border-bottom="false" :title="title"></u-navbar>
<u-loading style="position: fixed;top: 50%;" :show="loading" size="36" mode="flower"></u-loading> <u-loading style="position: fixed;top: 50%;" :show="loading" size="36" mode="flower"></u-loading>
<view class="topView"> <view class="topView">
<view :class="['topItemView', {'active':activeTop===ikey}]" @click="handleTopItemChange(ikey,item)" <view :class="['topItemView', {'active':activeTop===ikey}]" @click="handleTopItemChange(ikey,item)"
...@@ -74,7 +75,8 @@ ...@@ -74,7 +75,8 @@
dataList: [], dataList: [],
loading: true, loading: true,
isPopShow: false, isPopShow: false,
userWatermark:{} userWatermark:{},
title: '规范展示'
} }
}, },
onLoad(e) { onLoad(e) {
...@@ -84,9 +86,7 @@ ...@@ -84,9 +86,7 @@
} }
if (e && e.brand) { if (e && e.brand) {
this.brand = decodeURIComponent(e.brand) this.brand = decodeURIComponent(e.brand)
uni.setNavigationBarTitle({ this.title = this.brand
title: this.brand
});
} }
if (e && e.orderId) { if (e && e.orderId) {
...@@ -351,7 +351,6 @@ ...@@ -351,7 +351,6 @@
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding-top: 100rpx;
padding-bottom: 50rpx; padding-bottom: 50rpx;
} }
......
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