This commit is contained in:
zmj 2024-07-11 16:46:19 +08:00
parent 55e5572005
commit ae7660e239
5 changed files with 14 additions and 15 deletions

View File

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

View File

@ -8,7 +8,7 @@
<up-input v-model="storePhone" placeholder="请输入门店手机号"></up-input>
</up-form-item>
</up-form>
<up-form labelPosition="left" label-width="100rpx">
<!-- <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"
@ -16,7 +16,7 @@
<up-radio activeColor="#20b128" label="商户" :name="4"></up-radio>
</up-radio-group>
</up-form-item>
</up-form>
</up-form> -->
</view>
</up-modal>
</view>
@ -382,7 +382,7 @@
name: '已开通列表'
},
]);
const vipList = reactive([1, 2, 3, 5, 6, 7, 8])
const vipList = reactive([1, 2, 3, 4, 5, 6, 7, 8])
const tabsChange = (e) => {
currentTab.value = e.index
@ -534,7 +534,7 @@
mobile: formData.mobile
})
formData2.mobile = formData.mobile
if (data.user_ship == 4 || data.user_ship == 0) return;
if (data.user_ship == 0) return;
if (Role.value == 1) {
uni.$u.toast('该用户已是会员请使用追加经营资金进行收款')
currentTab.value = 1

View File

@ -294,7 +294,7 @@
} from "@/api/multipleShop.js";
import useUserStore from "@/store/user";
const vipList = reactive([1, 2, 3, 5, 6, 7, 8])
const vipList = reactive([1, 2, 3, 4, 5, 6, 7, 8])
const userStore = useUserStore();
const STORE_INFO = reactive({
id: '',

View File

@ -24,7 +24,7 @@
<template>
<view style="flex-grow: 1;overflow-y: auto;">
<view class="user-info"
:style="{backgroundImage: [0,4].includes(userInfo.user_ship)?'url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e3a7b202404261113002322.webp)':'url(https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/aace1202407021022357574.png)' }">
:style="{backgroundImage: [0].includes(userInfo.user_ship)?'url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e3a7b202404261113002322.webp)':'url(https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/aace1202407021022357574.png)' }">
<view class="u-card">
<view style="display: flex;" @click="updataInfp">
<up-image :src="userInfo.avatar" mode="aspectFill" width="112rpx" height="112rpx"
@ -36,7 +36,7 @@
<view style="margin:0 20rpx;">
{{userInfo.id}}
</view>
<view v-if="![0,4].includes(userInfo.user_ship)"
<view v-if="![0].includes(userInfo.user_ship)"
style="display: flex;align-items: center;background-color: #F6EECD;padding: 4rpx 10rpx;border-radius: 20rpx;">
<view style="margin-right: 10rpx;">
<up-icon
@ -117,8 +117,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 title="预约记录" :isLink="true" url="/pageQuota/asset/lists"></up-cell>
<!-- <up-cell title="我的资产" :isLink="true" url="/pageQuota/asset/index"></up-cell>
<up-cell title="预约记录" :isLink="true" url="/pageQuota/asset/lists"></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>
@ -227,7 +227,6 @@
const showPop = ref(false)
const updataInfp = () => {
console.log(5454)
showPop.value = true
}
@ -292,7 +291,7 @@
userInfo.value = res.data;
formData.avatar = res.data.avatar
formData.nick_name = res.data.nickname
if (![0, 4].includes(res.data.user_ship)) {
if (![0].includes(res.data.user_ship)) {
uni.setNavigationBarColor({
frontColor: "#000000",
backgroundColor: "#EAFFE1"

View File

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