|
|
|
|
@ -55,8 +55,8 @@
|
|
|
|
|
</up-form-item>
|
|
|
|
|
<up-form-item label="">
|
|
|
|
|
<view @click="showPop = true" style="width: 100%;">
|
|
|
|
|
<up-input style="pointer-events: none" v-model="formData.address" border="none"
|
|
|
|
|
prefixIcon="map" readonly placeholder="点击选择地址" :customStyle="{
|
|
|
|
|
<up-input style="pointer-events: none" v-model="formData.address" border="none" prefixIcon="map"
|
|
|
|
|
readonly placeholder="点击选择地址" :customStyle="{
|
|
|
|
|
background: '#F3F3F3', padding: '20rpx',
|
|
|
|
|
'border-radius': '30rpx'
|
|
|
|
|
}" :placeholderStyle="{ color: '#444444' }" :prefixIconStyle="{ 'margin-right': '40rpx' }"
|
|
|
|
|
@ -131,12 +131,11 @@
|
|
|
|
|
<up-input v-model="formData2.real_name" disabled border="none" prefixIcon="account"
|
|
|
|
|
placeholder="系统自动获取" color='grey'
|
|
|
|
|
:customStyle="{ background: '#F3F3F3', padding: '20rpx', 'border-radius': '30rpx' }"
|
|
|
|
|
:placeholderStyle="{ color: 'grey' }"
|
|
|
|
|
:prefixIconStyle="{ 'margin-right': '40rpx' }"></up-input>
|
|
|
|
|
:placeholderStyle="{ color: 'grey' }" :prefixIconStyle="{ 'margin-right': '40rpx' }"></up-input>
|
|
|
|
|
</up-form-item>
|
|
|
|
|
<up-form-item label="">
|
|
|
|
|
<up-input style="pointer-events: none" v-model="formData2.address" border="none"
|
|
|
|
|
prefixIcon="map" readonly color='grey' placeholder="系统自动获取" :customStyle="{
|
|
|
|
|
<up-input style="pointer-events: none" v-model="formData2.address" border="none" prefixIcon="map"
|
|
|
|
|
readonly color='grey' placeholder="系统自动获取" :customStyle="{
|
|
|
|
|
background: '#F3F3F3', padding: '20rpx',
|
|
|
|
|
'border-radius': '30rpx'
|
|
|
|
|
}" :placeholderStyle="{ color: 'grey' }" :prefixIconStyle="{ 'margin-right': '40rpx' }"></up-input>
|
|
|
|
|
@ -186,7 +185,10 @@
|
|
|
|
|
</block>
|
|
|
|
|
<!-- 追加经营资金结束 -->
|
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD <!-- tabs2 -->
|
|
|
|
|
=======
|
|
|
|
|
<!-- 开通列表-会员 -->
|
|
|
|
|
>>>>>>> ae7660e239bd4c38b57ca2035f3e2b16b578f714
|
|
|
|
|
<block v-if="currentTab == 2 && Role == 1">
|
|
|
|
|
<view class="vip-card">
|
|
|
|
|
<text>当前已开通：</text>
|
|
|
|
|
@ -232,7 +234,8 @@
|
|
|
|
|
</block>
|
|
|
|
|
<!-- 开通列表-会员结束 -->
|
|
|
|
|
|
|
|
|
|
<!-- 开通列表-商户 -->
|
|
|
|
|
<<<<<<< HEAD=======<!-- 开通列表-商户 -->
|
|
|
|
|
>>>>>>> ae7660e239bd4c38b57ca2035f3e2b16b578f714
|
|
|
|
|
<block v-if="currentTab == 1 && Role == 4">
|
|
|
|
|
<view class="vip-card">
|
|
|
|
|
<text>当前已开通：</text>
|
|
|
|
|
@ -271,8 +274,8 @@
|
|
|
|
|
:activeStyle="{ color: '#20B128' }"></up-tabs>
|
|
|
|
|
<up-line style="margin-top:20rpx "></up-line>
|
|
|
|
|
<view class="address-content" v-if='currentAddressIndex == 0'>
|
|
|
|
|
<view class="address-li" :class='{ act: item.city_code == formData.city }'
|
|
|
|
|
v-for="item in addressList.city" :key="item.city_code" @click="addressLiClick(0, item)">
|
|
|
|
|
<view class="address-li" :class='{ act: item.city_code == formData.city }' v-for="item in addressList.city"
|
|
|
|
|
:key="item.city_code" @click="addressLiClick(0, item)">
|
|
|
|
|
<text>{{ item.city_name }}</text>
|
|
|
|
|
<up-icon name="arrow-right" :color="item.city_code == formData.city ? '#20B128' : '#777777'" />
|
|
|
|
|
</view>
|
|
|
|
|
@ -295,13 +298,12 @@
|
|
|
|
|
<view class="address-li" v-for="item in addressList.village" @click="addressLiClick(3, item)"
|
|
|
|
|
:key="item.village_code" :class='{ act: item.village_code == formData.village }'>
|
|
|
|
|
<text>{{ item.village_name }}</text>
|
|
|
|
|
<up-icon name="arrow-right"
|
|
|
|
|
:color="item.village_code == formData.village ? '#20B128' : '#777777'" />
|
|
|
|
|
<up-icon name="arrow-right" :color="item.village_code == formData.village ? '#20B128' : '#777777'" />
|
|
|
|
|
</view>
|
|
|
|
|
</view>
|
|
|
|
|
<view class="address-content" v-else-if='currentAddressIndex == 4'>
|
|
|
|
|
<view class="address-li" :class='{ act: item.id == formData.brigade }'
|
|
|
|
|
v-for="item in addressList.brigade" :key="item.id" @click="addressLiClick(4, item)">
|
|
|
|
|
<view class="address-li" :class='{ act: item.id == formData.brigade }' v-for="item in addressList.brigade"
|
|
|
|
|
:key="item.id" @click="addressLiClick(4, item)">
|
|
|
|
|
<text>{{ item.brigade_name }}</text>
|
|
|
|
|
<up-icon name="arrow-right" :color="item.id == formData.brigade ? '#20B128' : '#777777'" />
|
|
|
|
|
</view>
|
|
|
|
|
|
zmj