mkm/purchase-let
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: mkm:master
Branches Tags
mkm:master
mkm:dev
mkm:batch
mkm:product
mkm:release
...
pull from: mkm:release
Branches Tags
mkm:dev
mkm:master
mkm:batch
mkm:product
mkm:release

8 Commits
master ... release

Author SHA1 Message Date
zmj
76daf934b1 add 2024-07-11 16:50:31 +08:00
zmj
3bf955d804 add 2024-07-06 18:26:46 +08:00
zmj
ecf2da62cf add 2024-07-06 13:51:24 +08:00
zmj
ec33cc6119 add 2024-07-04 13:46:05 +08:00
zmj
c899d8f472 Merge branch 'dev' of https://gitea.lihaink.cn/weipengfei/purchase-let into release 2024-07-03 09:14:27 +08:00
zmj
10664005c9 add 2024-06-29 09:12:20 +08:00
zmj
b115621925 add 2024-06-28 11:52:07 +08:00
zmj
4dfa00fa82 add 2024-06-28 10:29:48 +08:00
2 changed files with 865 additions and 863 deletions
Show Stats Expand all files Collapse all files

28
pageQuota/vipUser/index.vue
View File

@ -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>

4
pages/login/login.vue
View File

@ -34,8 +34,8 @@
<up-transition :show="!showWeixin">
<view class="form">
<view class="input">
<up-input :customStyle="{height: '100%'}" v-model="loginForm.phone" placeholderClass="place"
border="none" placeholder="请输入手机号" type="number">
<up-input :customStyle="{ height: '100%' }" v-model="loginForm.phone"
placeholderClass="place" border="none" placeholder="请输入手机号" type="number">
<template #prefix>
<image style="height: 40rpx;width: 40rpx;margin-top: 6rpx;"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/48491202404281006484208.png">