Skip to content

S
self-support
Commit e6d01727 authored by 刘用法's avatar 刘用法
Browse files
Options

Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

parents 2d47aa07 94619abb
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 72 deletions
src/pages/index/learn.vue
View file @ e6d01727
...@@ -9,11 +9,11 @@ ...@@ -9,11 +9,11 @@
:current="current" @change="tabsChange" :is-scroll="false" swiperWidth="750"></u-tabs-swiper> :current="current" @change="tabsChange" :is-scroll="false" swiperWidth="750"></u-tabs-swiper>
</view> </view>
<swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" <swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish"
style="height: 755rpx;padding-top: 30rpx;"> style="height: 100%;padding-top: 30rpx;">
<swiper-item class="swiper-item"> <swiper-item class="swiper-item">
<scroll-view scroll-y style="height:796rpx;width:100%;" @scrolltolower="onreachBottom"> <scroll-view scroll-y style="height:796rpx;width:100%;" @scrolltolower="onreachBottom">
<view class="jf-currency-class"> <view class="jf-currency-class">
<view class="class1" @click="goToPrint"> <view class="class1" style="position: relative;" @click="goToPrint">
<image class="jf-img" :src="rule.pic" mode=""></image> <image class="jf-img" :src="rule.pic" mode=""></image>
<view class="right u-padding-top-10 u-padding-bottom-14 jf-right"> <view class="right u-padding-top-10 u-padding-bottom-14 jf-right">
<view class="u-font-32 font-bold u-margin-left-30 u-margin-top-30">充电桩交付规范</view> <view class="u-font-32 font-bold u-margin-left-30 u-margin-top-30">充电桩交付规范</view>
...@@ -776,7 +776,7 @@ ...@@ -776,7 +776,7 @@
.notice { .notice {
/* border: #808080 solid 2rpx; */ /* border: #808080 solid 2rpx; */
width: 100%; width: 100%;
height: 400rpx; height: 370rpx;
margin-top: 36rpx; margin-top: 36rpx;
overflow: hidden; overflow: hidden;
background-color: #ffffff; background-color: #ffffff;
...@@ -867,8 +867,8 @@ ...@@ -867,8 +867,8 @@
.jf-img { .jf-img {
width: 160rpx; width: 160rpx;
height: 200rpx; height: 200rpx;
position: fixed; position: absolute;
top: 20rpx; top: -45rpx;
left: 30rpx; left: 30rpx;
} }
......
src/pages/order/complete.vue
View file @ e6d01727
...@@ -5,76 +5,83 @@ ...@@ -5,76 +5,83 @@
<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">
<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"> <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 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>
</view> </scroll-view>
<view :scroll-top="scrollRightTop" scroll-y scroll-with-animation class="right-box" @scroll="rightScroll"> <view class="right-boxs">
<u-form :model="form" ref="uForm"> <scroll-view :scroll-top="scrollRightTop" scroll-y scroll-with-animation class="right-box" @scroll="rightScroll">
<template v-for="(groupItem, groupIndex) in (list.length>0?list[tabIndex].items:[])">
<view class="class-item" :key="groupIndex"> </scroll-view>
<view class="title" v-if="groupItem.name !== '基本信息'">{{groupItem.name}}</view>
<view class="class-bd"> <view class="form-list">
<u-form-item v-for="(item,itemIndex) in groupItem.items" :key="itemIndex" <u-form :model="form" ref="uForm">
label-position="top" :prop="item.fieldsName" :border-bottom="false"> <template v-for="(groupItem, groupIndex) in (list.length>0?list[tabIndex].items:[])">
<view :class="[{'label-bold': groupItem.name === '基本信息'}, 'label']" v-if="typeToComponentType(item.fieldsType)!=='location'"> <view class="class-item" :key="groupIndex" v-show="current == groupIndex">
<image class="item-image" :src="mixingImage" v-if="item.required"></image> <view class="title" v-if="groupItem.name !== '基本信息'">{{groupItem.name}}</view>
{{item.fieldsTitle}} <view class="class-bd">
</view> <u-form-item v-for="(item,itemIndex) in groupItem.items" :key="itemIndex"
<template v-if="item.fieldsType"> label-position="top" :prop="item.fieldsName" :border-bottom="false">
<xh-input v-if="typeToComponentType(item.fieldsType)==='input'" :groupIndex="groupIndex" <view :class="[{'label-bold': groupItem.name === '基本信息'}, 'label']" v-if="typeToComponentType(item.fieldsType)!=='location'">
:itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' @value-change="fieldValueChange"> <image class="item-image" :src="mixingImage" v-if="item.required"></image>
</xh-input> {{item.fieldsTitle}}
<xh-multi-input v-else-if="typeToComponentType(item.fieldsType)==='multiinput'" </view>
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' <template v-if="item.fieldsType">
@value-change="fieldValueChange"> <xh-input v-if="typeToComponentType(item.fieldsType)==='input'" :groupIndex="groupIndex"
</xh-multi-input> :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' @value-change="fieldValueChange">
<xh-radio v-else-if="typeToComponentType(item.fieldsType)==='radio'" </xh-input>
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' <xh-multi-input v-else-if="typeToComponentType(item.fieldsType)==='multiinput'"
@value-change="fieldValueChange"> :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
</xh-radio> @value-change="fieldValueChange">
<xh-checkbox v-else-if="typeToComponentType(item.fieldsType)==='checkbox'" </xh-multi-input>
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' <xh-radio v-else-if="typeToComponentType(item.fieldsType)==='radio'"
@value-change="fieldValueChange"> :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
</xh-checkbox> @value-change="fieldValueChange">
<xh-select v-else-if="typeToComponentType(item.fieldsType)==='select'" </xh-radio>
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' <xh-checkbox v-else-if="typeToComponentType(item.fieldsType)==='checkbox'"
@value-change="fieldValueChange"> :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
</xh-select> @value-change="fieldValueChange">
<xh-files v-else-if="typeToComponentType(item.fieldsType)==='file'" </xh-checkbox>
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || []' <xh-select v-else-if="typeToComponentType(item.fieldsType)==='select'"
@value-change="fieldValueChange"> :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
</xh-files> @value-change="fieldValueChange">
<xh-location v-else-if="typeToComponentType(item.fieldsType)==='location'" </xh-select>
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' <xh-files v-else-if="typeToComponentType(item.fieldsType)==='file'"
@value-change="fieldValueChange"> :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || []'
</xh-location> @value-change="fieldValueChange">
<xh-scan v-else-if="typeToComponentType(item.fieldsType)==='scan'" </xh-files>
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' <xh-location v-else-if="typeToComponentType(item.fieldsType)==='location'"
@value-change="fieldValueChange"> :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
</xh-scan> @value-change="fieldValueChange">
<xh-picker v-else-if="typeToComponentType(item.fieldsType)==='picker'" </xh-location>
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' <xh-scan v-else-if="typeToComponentType(item.fieldsType)==='scan'"
@value-change="fieldValueChange"> :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
</xh-picker> @value-change="fieldValueChange">
<xh-service-measure v-else-if="typeToComponentType(item.fieldsType)==='servicemeasure'" </xh-scan>
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :orderId="orderId" :categoryId="categoryId" <xh-picker v-else-if="typeToComponentType(item.fieldsType)==='picker'"
:orderServiceType="orderServiceType" :specificationId="form['specificationId'] || 0" :value="form[item.fieldsName]" :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
@value-change="fieldValueChange"> @value-change="fieldValueChange">
</xh-service-measure> </xh-picker>
<xh-time v-else-if="typeToComponentType(item.fieldsType)==='time'" <xh-service-measure v-else-if="typeToComponentType(item.fieldsType)==='servicemeasure'"
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :orderId="orderId" :categoryId="categoryId"
@value-change="fieldValueChange"> :orderServiceType="orderServiceType" :specificationId="form['specificationId'] || 0" :value="form[item.fieldsName]"
</xh-time> @value-change="fieldValueChange">
</template> </xh-service-measure>
</u-form-item> <xh-time v-else-if="typeToComponentType(item.fieldsType)==='time'"
</view> :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
</view> @value-change="fieldValueChange">
</template> </xh-time>
</u-form> </template>
</view> </u-form-item>
</view>
</view>
</template>
</u-form>
</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"
...@@ -692,7 +699,7 @@ ...@@ -692,7 +699,7 @@
height: 100%; height: 100%;
} }
.right-box { .right-box, .right-boxs {
// background-color: rgb(250, 250, 250); // background-color: rgb(250, 250, 250);
background-color: #FFFFFF; background-color: #FFFFFF;
overflow: auto; overflow: auto;
......
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