Przeglądaj źródła

修改字段查询

caojunjie 2 lat temu
rodzic
commit
dea5b8caa3

+ 1 - 1
App.vue

@@ -18,7 +18,7 @@
 	@import "uview-ui/index.scss";
 
 	page {
-		background-color: #f6f6f6;
+		background-color: #f2f2f2 !important;
 	}
 	uni-modal {
 		z-index: 19999 !important;

+ 1 - 1
api/views/product/createCompany.js

@@ -2,7 +2,7 @@ import http from '@/http/api.js'
 //字典
 export function customerType(params) {
   return http.request({
-    url: '/blade-system/dict-biz/list',
+    url: '/blade-system/dict-biz/listAll',
     method: 'get',
     params
   })

+ 2 - 2
common/setting.js

@@ -9,8 +9,8 @@ module.exports = {
 	// 版本号
 	version: '1.0.0',
 	// 开发环境接口Url
-	devUrl: 'http://192.168.1.120:1080',
-	// devUrl: 'http://121.37.83.47:10004',
+	// devUrl: 'http://192.168.1.120:1080',
+	devUrl: 'http://121.37.83.47:10004',
 	// 线上环境接口Url
 	prodUrl: 'http://121.37.83.47:10004',
 	// 后端数据的接收方式application/json;charset=UTF-8或者application/x-www-form-urlencoded;charset=UTF-8

+ 4 - 3
manifest.json

@@ -2,8 +2,8 @@
     "name" : "易车配批发精灵",
     "appid" : "__UNI__E1B82BE",
     "description" : "",
-    "versionName" : "1.0.20",
-    "versionCode" : 20,
+    "versionName" : "1.0.22",
+    "versionCode" : 22,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -23,7 +23,8 @@
         },
         /* 模块配置 */
         "modules" : {
-            "Maps" : {}
+            "Maps" : {},
+            "Bluetooth" : {}
         },
         /* 应用发布信息 */
         "distribute" : {

+ 2 - 1
pages/tabBar/home.vue

@@ -57,7 +57,8 @@
 					<text class="grid_text">{{item.text}}</text>
 				</u-grid-item>
 			</u-grid>
-		</view>
+		</view>
+		
 		<u-toast ref="uToast" />
 		<!-- 更新组件 force 是否强制更新    tabbar:页面是否有原生tabbar组件-->
 		<app-update ref="app_update" :force="false" :tabbar="true"></app-update>

+ 3 - 3
pages/views/salesSlip/salesOrderList.vue

@@ -84,9 +84,9 @@
 						<view style="font-size: 32rpx;">{{item.corpsName}}</view>
 						<view>{{item.businesDate?item.businesDate.slice(0,10):''}}</view>
 					</view>
-					<view class="textBox">
-						<view>{{item.orderAmount}}</view>
-						<view style="color: #FD4B09;font-size: 32rpx;">{{item.balanceAmount}}</view>
+					<view class="textBox">
+						<view>订单金额:¥{{item.orderAmount}}</view>
+						<view style="color: #FD4B09;font-size: 32rpx;">{{item.balanceAmount == 0?'已结清':'未收款:¥' + item.balanceAmount+'元'}}</view>
 					</view>
 				</view>
 			</view>

+ 2 - 2
pages/views/salesSlip/toBeCollectedlist.vue

@@ -103,8 +103,8 @@
 						<view>{{item.businesDate?item.businesDate.slice(0,10):''}}</view>
 					</view>
 					<view class="textBox">
-						<view>{{item.orderAmount}}</view>
-						<view style="color: #FD4B09;font-size: 32rpx;">{{item.balanceAmount}}</view>
+						<view>订单金额:¥{{item.orderAmount}}</view>
+						<view style="color: #FD4B09;font-size: 32rpx;">{{item.balanceAmount == 0?'已结清':'未收款:¥' + item.balanceAmount+'元'}}</view>
 					</view>
 				</view>
 			</view>

+ 3 - 3
pages/views/salesSlip/toBeCollectedlistBatch.vue

@@ -98,9 +98,9 @@
 						<view style="font-size: 32rpx;">{{item.corpsName}}</view>
 						<view>{{item.businesDate?item.businesDate.slice(0,10):''}}</view>
 					</view>
-					<view class="textBox">
-						<view>{{item.orderAmount}}</view>
-						<view style="color: #FD4B09;font-size: 32rpx;">{{item.balanceAmount}}</view>
+					<view class="textBox">
+						<view>订单金额:¥{{item.orderAmount}}</view>
+						<view style="color: #FD4B09;font-size: 32rpx;">{{item.balanceAmount == 0?'已结清':'未收款:¥' + item.balanceAmount+'元'}}</view>
 					</view>
 				</view>
 			</view>