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-02 19:18:24 +08:00
parent 39cda88ba1
commit 30ad9dfce9
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/app.js
View File

@ -2,8 +2,8 @@ let BASE_URL
let WSS_URL let WSS_URL
import store from "@/store/user.js" import store from "@/store/user.js"
// 环境 // 环境
let env = "dev" // let env = "dev"
// let env = "prod" let env = "prod"
// let env = "release"; // let env = "release";
// let env = "local"; // let env = "local";

2
pageQuota/vipUser/index.vue
View File

@ -556,7 +556,7 @@
mobile: formData.mobile mobile: formData.mobile
}) })
formData2.mobile = formData.mobile formData2.mobile = formData.mobile
if (data.user_ship == 4) return; if (data.user_ship == 4 || data.user_ship == 0) return;
if (Role.value == 1) { if (Role.value == 1) {
uni.$u.toast('该用户已是会员请使用追加经营资金进行收款') uni.$u.toast('该用户已是会员请使用追加经营资金进行收款')
currentTab.value = 1 currentTab.value = 1

4
pages/login/login.vue
View File

@ -16,10 +16,10 @@
<up-button @click="weixinLogin" color="#20B128" size="large"><up-icon color="#fff" <up-button @click="weixinLogin" color="#20B128" size="large"><up-icon color="#fff"
size="28"></up-icon>手机号快捷登录</up-button> size="28"></up-icon>手机号快捷登录</up-button>
</view> </view>
<view class="btn"> <!-- <view class="btn">
<up-button @click="navgo('/pages/login/test')" color="#20B128" size="large"><up-icon <up-button @click="navgo('/pages/login/test')" color="#20B128" size="large"><up-icon
name="account-fill" color="#fff" size="28"></up-icon>真-手机号快捷登录</up-button> name="account-fill" color="#fff" size="28"></up-icon>真-手机号快捷登录</up-button>
</view> </view> -->
<!-- <view class="btn"> <!-- <view class="btn">
<up-button @click="officialCode" color="#20B128" size="large"><up-icon name="weixin-fill" color="#fff" <up-button @click="officialCode" color="#20B128" size="large"><up-icon name="weixin-fill" color="#fff"
size="28"></up-icon>公众号授权</up-button> size="28"></up-icon>公众号授权</up-button>

13
pagesOrder/settle/settle.vue
View File

@ -36,8 +36,8 @@
<view class="address-info" <view class="address-info"
style='display: flex;justify-content: space-between;width: 690rpx;align-items: center;'> style='display: flex;justify-content: space-between;width: 690rpx;align-items: center;'>
<view class="top" style="align-items: flex-start;"> <view class="top" style="align-items: flex-start;">
<view style="color: #333;width: 190rpx;"> <view style="color: #333;width: 200rpx;">
<view style="margin: 0 10rpx;color:#20B128;text-align: center;">推荐自提点</view> <view style="margin: 0 10rpx;color:#20B128;">推荐自提点</view>
<view class="isreser"> {{reservation?"次日可提":"当日可提" }} <view class="isreser"> {{reservation?"次日可提":"当日可提" }}
</view> </view>
</view> </view>
@ -110,13 +110,13 @@
</view> </view>
<view class="m-card order-remark"> <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> <text style="margin-right: 20rpx;">是否存货</text>
<up-radio-group v-model="is_storage" placement="row"> <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="0" style="margin-right: 10rpx;"></up-radio>
<up-radio activeColor="#20b128" label="全部存货" :name="1"></up-radio> <up-radio activeColor="#20b128" label="全部存货" :name="1"></up-radio>
</up-radio-group> </up-radio-group>
</view> </view> -->
<view class="head-title" style="margin-top: 20rpx;"> <view class="head-title" style="margin-top: 20rpx;">
<text>订单备注</text> <text>订单备注</text>
<text>{{formData.remark.length}}/140</text> <text>{{formData.remark.length}}/140</text>
@ -575,12 +575,13 @@
<style lang="scss"> <style lang="scss">
.isreser { .isreser {
// margin: 0 10rpx; // margin: 0 10rpx;
margin-top: 5rpx; // margin-top: 5rpx;
color: black; color: black;
background-color: #F6EECD; background-color: #F6EECD;
padding: 5rpx 10rpx; // padding: 5rpx 4rpx;
border-radius: 10rpx; border-radius: 10rpx;
text-align: center; text-align: center;
width: 95%;
} }
.m-card { .m-card {