Merge pull request 'feat: 修改配置文件和页面逻辑,优化商品采购和订单获取功能' (#4) from dev into product
Reviewed-on: #4
This commit is contained in:
commit
d404316141
|
@ -17,7 +17,7 @@ switch (env) {
|
||||||
WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull'
|
WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull'
|
||||||
break;
|
break;
|
||||||
case 'local':
|
case 'local':
|
||||||
BASE_URL = 'http://192.168.1.22:8545';
|
BASE_URL = 'http://192.168.1.5:8545';
|
||||||
WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull'
|
WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull'
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -19,10 +19,6 @@
|
||||||
</style>
|
</style>
|
||||||
<template>
|
<template>
|
||||||
<view class="content">
|
<view class="content">
|
||||||
<view class="share-btn"
|
|
||||||
:style="{ height: btns.height + 'px', top: btns.top + 'px', left: (btns.left - 40) + 'px' }">
|
|
||||||
<up-button icon="share-square" openType="share" plain size="large" loadingSize="100" />
|
|
||||||
</view>
|
|
||||||
<view class="navbar">
|
<view class="navbar">
|
||||||
<view style="width: 400rpx;">
|
<view style="width: 400rpx;">
|
||||||
<up-search placeholder="请输入商品" @search="searchKeyword" @clear="searchKeyword" v-model="keyword"
|
<up-search placeholder="请输入商品" @search="searchKeyword" @clear="searchKeyword" v-model="keyword"
|
||||||
|
@ -688,13 +684,13 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.navbar {
|
.navbar {
|
||||||
padding: 0 20rpx;
|
padding: 20rpx;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
font-size: 22rpx;
|
font-size: 22rpx;
|
||||||
color: #777;
|
color: #777;
|
||||||
margin-top: 40rpx;
|
// margin-top: 40rpx;
|
||||||
|
|
||||||
.nav-item {
|
.nav-item {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
Loading…
Reference in New Issue