Commit 4d2cb2d0 authored by 罗超's avatar 罗超

Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp into master

parents dec37243 442ea7d6
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
.listsignUp { .listsignUp {
width: 100%; width: 100%;
height: 100vh; height: 100vh;
/* overflow-y: auto; */ overflow-y: auto;
background: #F6F6F6; background: #F6F6F6;
padding: 18px;
} }
.listsignUp .single_Phone { .listsignUp .single_Phone {
...@@ -40,37 +40,40 @@ ...@@ -40,37 +40,40 @@
} }
</style> </style>
<template> <template>
<view class="listsignUp" v-if="!loading"> <view class="listsignUp" v-if="!loading">
<view style="width: 100%;padding: 15px;border-radius: 15px;background: #FFF;"> <view style="width: 100%;height: 100%;padding: 18px;">
<view> <view style="width: 100%;padding: 15px;border-radius: 15px;background: #FFF;">
<view class="single_Phone" style="margin-top: 0;"> <view>
<span style="color:red;margin-right:5rpx;" >*</span>参与品牌/载体 <view class="single_Phone" style="margin-top: 0;">
</view> <span style="color:red;margin-right:5rpx;" >*</span>参与品牌/载体
<view class="single_Input" @click="show=true" style="width: 100%;display: flex;align-items: center;justify-content: space-between;"> </view>
<input style="width: 90%" v-model="ObjectName" :disabled="true" placeholder="请选择" /> <view class="single_Input" @click="show=true" style="width: 100%;display: flex;align-items: center;justify-content: space-between;">
<u-icon name="arrow" color="#909399" size="36" ></u-icon> <input style="width: 90%" v-model="ObjectName" :disabled="true" placeholder="请选择" />
<u-icon name="arrow" color="#909399" size="36" ></u-icon>
</view>
<u-picker v-model="show" mode="selector" :range="CarrierList" range-key="Name" @confirm='confirm'></u-picker>
</view> </view>
<u-picker v-model="show" mode="selector" :range="CarrierList" range-key="Name" @confirm='confirm'></u-picker> <template v-for="(item,index) in dataList">
</view> <singleText v-if="item.CompKey=='SingleLineText'" :CompData="item.CompData" :index='index'
<template v-for="(item,index) in dataList"> @success="datasuccess()"></singleText>
<singleText v-if="item.CompKey=='SingleLineText'" :CompData="item.CompData" :index='index' <multipleText v-if="item.CompKey=='MultiLineText'" :CompData="item.CompData" :index='index'
@success="datasuccess()"></singleText> @success="datasuccess()"></multipleText>
<multipleText v-if="item.CompKey=='MultiLineText'" :CompData="item.CompData" :index='index' <selectChoice v-if="item.CompKey=='DorpDownList'" :CompData="item.CompData" :index='index'
@success="datasuccess()"></multipleText> @success="datasuccess()"></selectChoice>
<selectChoice v-if="item.CompKey=='DorpDownList'" :CompData="item.CompData" :index='index' <pictureUpload v-if="item.CompKey=='ImageUploadComp'" :CompData="item.CompData" :index='index'
@success="datasuccess()"></selectChoice> @success="datasuccess()"></pictureUpload>
<pictureUpload v-if="item.CompKey=='ImageUploadComp'" :CompData="item.CompData" :index='index' <videoUpload v-if="item.CompKey=='VideoUploadComp'" :CompData="item.CompData" :index='index'
@success="datasuccess()"></pictureUpload> @success="datasuccess()"></videoUpload>
<videoUpload v-if="item.CompKey=='VideoUploadComp'" :CompData="item.CompData" :index='index' <fileType v-if="item.CompKey=='CommonUploadComp'" :CompData="item.CompData" :index='index'
@success="datasuccess()"></videoUpload> @success="datasuccess()"></fileType>
<fileType v-if="item.CompKey=='CommonUploadComp'" :CompData="item.CompData" :index='index' </template>
@success="datasuccess()"></fileType> <view class="btn" @click="setapply()">
</template> 提交申请
<view class="btn" @click="setapply()"> </view>
提交申请 </view>
</view> </view>
</view>
<u-modal <u-modal
v-model="rzshow" v-model="rzshow"
content="还未进行认证,现在去认证" content="还未进行认证,现在去认证"
...@@ -290,8 +293,8 @@ ...@@ -290,8 +293,8 @@
} }
let dataList = JSON.parse((JSON.stringify(this.dataList))) let dataList = JSON.parse((JSON.stringify(this.dataList)))
dataList.map(x => { dataList.map(x => {
if (show == true) { if (show == true) {
return return
} }
if(x.CompKey=='DorpDownList' && x.CompData.IsMultiple==true){ if(x.CompKey=='DorpDownList' && x.CompData.IsMultiple==true){
if(Array.isArray(x.CompData.OptionValue)){ if(Array.isArray(x.CompData.OptionValue)){
...@@ -313,13 +316,17 @@ ...@@ -313,13 +316,17 @@
uni.showToast({ uni.showToast({
title: '请选择' + x.CompData.Name, title: '请选择' + x.CompData.Name,
icon: 'none' icon: 'none'
}) })
show = true
return return
} }
} }
}) })
console.log('调用接口') if (show == true) {
return
}
this.addMsg.Content = JSON.stringify(dataList) this.addMsg.Content = JSON.stringify(dataList)
let that = this let that = this
......
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