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

add

This commit is contained in:
zmj 2024-07-06 16:20:28 +08:00
parent 77d4938aee
commit 801d2cb413
4 changed files with 855 additions and 853 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pageQuota/asset/index.vue
View File

@ -1,4 +1,5 @@
<template>
<block v-if="lists.length">
<view class="m-card m-good" v-for="(item, index) in lists" :key="index">
<view class="shop-check" @click="item.check=!item.check">
<image v-if="!item.check" src="@/static/icon/n-check.png"></image>
@ -22,6 +23,11 @@
</view>
</view>
</view>
</block>
<up-empty v-else mode="history" style="margin-top: 20vh;" text='没有更多内容了'>
</up-empty>
<view style="height: 200rpx;" />
<view class="bottom">

38
pageQuota/vipUser/index.vue
View File

@ -10,8 +10,7 @@
<up-form labelPosition="left" label-width="100rpx">
<up-form-item label="身份" borderBottom>
<up-radio-group v-model="Role" placement="row">
<up-radio activeColor="#20b128" label="行业会员" :name="1"
style="margin-right: 10rpx;"></up-radio>
<up-radio activeColor="#20b128" label="行业会员" :name="1" style="margin-right: 10rpx;"></up-radio>
<up-radio activeColor="#20b128" label="商户" :name="4"></up-radio>
</up-radio-group>
</up-form-item>
@ -22,8 +21,8 @@
<view v-else>
<up-sticky bgColor="#fff" style="padding: 20rpx;">
<up-tabs v-if="Role==1" :list="tabsLst" :itemStyle="{width:'33vw',paddingBottom:'20rpx'}"
lineColor='#50C758' :current='currentTab' @change="tabsChange"></up-tabs>
<up-tabs v-if="Role == 1" :list="tabsLst" :itemStyle="{ width: '33vw', paddingBottom: '20rpx' }" lineColor='#50C758'
:current='currentTab' @change="tabsChange"></up-tabs>
<up-tabs v-else :list="tabsLst2" :itemStyle="{ width: '50vw', paddingBottom: '20rpx' }" lineColor='#50C758'
:current='currentTab' @change="tabsChange1"></up-tabs>
</up-sticky>
@ -52,8 +51,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' }"
@ -88,8 +87,8 @@
点击查看礼品包内容
</view>
<view class="gift-pack">
<view class="gift-pack-li" :class="index==giftIndex&&'act-gift'"
v-for="(item,index) in rechargeList" :key="index" @click="choseGift(index)">
<view class="gift-pack-li" :class="index == giftIndex && 'act-gift'" v-for="(item, index) in rechargeList"
:key="index" @click="choseGift(index)">
<view class="gift-pack-li-top" :class="index == giftIndex && 'act-gift-top'">
<text style="font-size: 40rpx;">{{ item.money }}</text><text>元采购包</text>
</view>
@ -126,12 +125,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>
@ -151,8 +149,8 @@
<view class="store-info">
<view class="" style="width: 300rpx;margin: 0 auto;border-bottom: 1px solid #F3F3F3;">
<up-input inputAlign='center' placeholder="请输入金额" @focus="formData2.price = ''" color='#FF6B00'
:placeholderStyle="{fontSize:'28rpx'}" fontSize='20px' border="none"
v-model="formData2.price" type='digit' @blur='tofixedPrice(2)'></up-input>
:placeholderStyle="{ fontSize: '28rpx' }" fontSize='20px' border="none" v-model="formData2.price"
type='digit' @blur='tofixedPrice(2)'></up-input>
</view>
<view style="color: red;margin-top: 20rpx;font-size: 24rpx;"
v-if="formData2.label_limit && formData2.price < formData2.label_limit">
@ -273,8 +271,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>
@ -297,13 +295,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>
@ -318,7 +315,6 @@
{{ popPhone }}
</view>
</up-modal>
</template>
<script setup>
import {

4
pages/my/my.vue
View File

@ -116,8 +116,8 @@
<view class="card">
<up-cell-group>
<!-- <up-cell v-if="userInfo.user_ship==1" title="赠品区" :isLink="true" url="/pageQuota/Gifts/index"></up-cell>
<up-cell title="我的资产" :isLink="true" url="/pageQuota/asset/index"></up-cell> -->
<!-- <up-cell v-if="userInfo.user_ship==1" title="赠品区" :isLink="true" url="/pageQuota/Gifts/index"></up-cell> -->
<up-cell title="我的资产" :isLink="true" url="/pageQuota/asset/index"></up-cell>
<up-cell title="我的地址" :isLink="true" url="/pagesOrder/addressList/addressList"></up-cell>
<up-cell title="支付密码" :isLink="true" url="/pagesOrder/setPayPassword/index"></up-cell>
</up-cell-group>

6
pagesOrder/settle/settle.vue
View File

@ -98,7 +98,7 @@
<view class="row" v-if="[4,5,6].includes(userInfo.user_ship)" style="color: red;">
<view>优惠减免</view>
<view>
<text>-¥</text>{{ c_price(orderInfo.activity_price, 0) }}<text>.{{ c_price(orderInfo.activity_price, 1) }}</text>
<text>-¥</text>{{ c_price(orderInfo.frozen_money, 0) }}<text>.{{ c_price(orderInfo.frozen_money, 1) }}</text>
</view>
</view>
<view class="row" v-if="userInfo.user_ship==1 ">
@ -110,13 +110,13 @@
</view>
<view class="m-card order-remark">
<!-- <view style="display: flex;align-items: center;">
<view style="display: flex;align-items: center;">
<text style="margin-right: 20rpx;">是否存货</text>
<up-radio-group v-model="is_storage" placement="row">
<up-radio activeColor="#20b128" label="立即提货" :name="0" style="margin-right: 10rpx;"></up-radio>
<up-radio activeColor="#20b128" label="全部存货" :name="1"></up-radio>
</up-radio-group>
</view> -->
</view>
<view class="head-title" style="margin-top: 20rpx;">
<text>订单备注</text>
<text>{{formData.remark.length}}/140</text>