Compare commits

..

No commits in common. "0f86686f8b71854f1c05c4fc86a15a7606f63329" and "89cd6cadb25c87bd5c35bf509187baadca9406f1" have entirely different histories.

2 changed files with 598 additions and 595 deletions

View File

@ -2,14 +2,16 @@ 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 = "liu"; // let env = "liu";
switch (env) { switch (env) {
case 'dev': case 'dev':
BASE_URL = 'https://test-multi-store.lihaink.cn'; // BASE_URL = 'https://test-multi-store.lihaink.cn';
WSS_URL = 'wss://test-multi-store.lihaink.cn/pull' // WSS_URL = 'wss://test-multi-store.lihaink.cn/pull'
BASE_URL = 'https://ceshi-multi-store.lihaink.cn';
WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull'
break; break;
case 'liu': case 'liu':
BASE_URL = 'https://ceshi-multi-store.lihaink.cn'; BASE_URL = 'https://ceshi-multi-store.lihaink.cn';

View File

@ -31,18 +31,19 @@
<up-form-item label=""> <up-form-item label="">
<up-input v-model="formData.real_name" border="none" prefixIcon="account" placeholder="请输入真实姓名" <up-input v-model="formData.real_name" border="none" prefixIcon="account" placeholder="请输入真实姓名"
:customStyle="{background:'#F3F3F3',padding:'20rpx','border-radius':'30rpx'}" :customStyle="{background:'#F3F3F3',padding:'20rpx','border-radius':'30rpx'}"
:placeholderStyle="{ color: '#444444' }" :prefixIconStyle="{ 'margin-right': '40rpx' }"></up-input> :placeholderStyle="{color:'#444444'}"
:prefixIconStyle="{'margin-right':'40rpx'}"></up-input>
</up-form-item> </up-form-item>
<up-form-item label=""> <up-form-item label="">
<up-input v-model="formData.mobile" border="none" prefixIcon="phone" placeholder="请输入电话号码" <up-input v-model="formData.mobile" border="none" prefixIcon="phone" placeholder="请输入电话号码"
:customStyle="{background:'#F3F3F3',padding:'20rpx','border-radius':'30rpx'}" :customStyle="{background:'#F3F3F3',padding:'20rpx','border-radius':'30rpx'}"
:placeholderStyle="{ color: '#444444' }" :prefixIconStyle="{ 'margin-right': '40rpx' }"></up-input> :placeholderStyle="{color:'#444444'}"
:prefixIconStyle="{'margin-right':'40rpx'}"></up-input>
</up-form-item> </up-form-item>
<up-form-item label=""> <up-form-item label="">
<view @click="showPop=true" style="width: 100%;"> <view @click="showPop=true" style="width: 100%;">
<up-input style="pointer-events: none" v-model="formData.address" border="none" prefixIcon="map" <up-input style="pointer-events: none" v-model="formData.address" border="none"
readonly placeholder="点击选择地址" :customStyle="{ prefixIcon="map" readonly placeholder="点击选择地址" :customStyle="{background:'#F3F3F3',padding:'20rpx',
background: '#F3F3F3', padding: '20rpx',
'border-radius':'30rpx' 'border-radius':'30rpx'
}" :placeholderStyle="{color:'#444444'}" :prefixIconStyle="{'margin-right':'40rpx'}" }" :placeholderStyle="{color:'#444444'}" :prefixIconStyle="{'margin-right':'40rpx'}"
suffixIcon='arrow-down'></up-input> suffixIcon='arrow-down'></up-input>
@ -52,8 +53,7 @@
<up-form-item label="" v-if='Role==1'> <up-form-item label="" v-if='Role==1'>
<view @click="showPop1=true" style="width: 100%;"> <view @click="showPop1=true" style="width: 100%;">
<up-input style="pointer-events: none" v-model="formData.label_name" border="none" <up-input style="pointer-events: none" v-model="formData.label_name" border="none"
prefixIcon="man-add" readonly placeholder="点击选择用户身份" :customStyle="{ prefixIcon="man-add" readonly placeholder="点击选择用户身份" :customStyle="{background:'#F3F3F3',padding:'20rpx',
background: '#F3F3F3', padding: '20rpx',
'border-radius':'30rpx' 'border-radius':'30rpx'
}" :placeholderStyle="{color:'#444444'}" :prefixIconStyle="{'margin-right':'40rpx'}" }" :placeholderStyle="{color:'#444444'}" :prefixIconStyle="{'margin-right':'40rpx'}"
suffixIcon='arrow-down'></up-input> suffixIcon='arrow-down'></up-input>
@ -63,8 +63,7 @@
<view style="width: 100%;display: flex;align-items: center;justify-content: space-between;"> <view style="width: 100%;display: flex;align-items: center;justify-content: space-between;">
<view class=""> <view class="">
<up-input v-model="formData.code" border="none" prefixIcon="tags" placeholder="请输入验证码" <up-input v-model="formData.code" border="none" prefixIcon="tags" placeholder="请输入验证码"
:customStyle="{ :customStyle="{background:'#F3F3F3',padding:'20rpx',
background: '#F3F3F3', padding: '20rpx',
'border-radius':'30rpx' 'border-radius':'30rpx'
}" :placeholderStyle="{color:'#444444'}" :prefixIconStyle="{'margin-right':'40rpx'}"></up-input> }" :placeholderStyle="{color:'#444444'}" :prefixIconStyle="{'margin-right':'40rpx'}"></up-input>
</view> </view>
@ -178,8 +177,9 @@
</view> </view>
</view> </view>
</up-popup> </up-popup>
<up-picker :show="showPop1" :columns="columns" @confirm='conformRole' @cancel='showPop1 = false' @close="showPop1 = false" <up-picker :show="showPop1" :columns="columns" @confirm='conformRole' @cancel='showPop1=false'
@open="showPop1 = true" keyName='label_name' confirmColor='#33B83A'></up-picker> @close="showPop1=false" @open="showPop1=true" keyName='label_name' confirmColor='#33B83A'></up-picker>
</template> </template>
<script setup> <script setup>
import { import {
@ -467,7 +467,8 @@ const submit = async () => {
uni.$u.toast('支付超时'); uni.$u.toast('支付超时');
}, 30000) }, 30000)
}) })
getCount()
getLists()
} }
}); });
} else { } else {