Browse Source

Merge branch 'develop_yh_pay' of http://git.chelingzhu.com/jianguan-web/repairYimatong-mini-html into develop_yh_54

# Conflicts:
#	pagesA/digitalShelf/choosePart.vue
lilei 3 months ago
parent
commit
edbeaf75d0

+ 2 - 2
App.vue

@@ -2,8 +2,8 @@
 	export default {
 		globalData: {
 			// baseUrl: 'http://192.168.2.100:9110/saas/clz/', // 本地
-			baseUrl: 'https://md.test.zyucgj.com/saas/clz/', // 预发布
-			// baseUrl: 'https://car.zyucgj.com/saas/clz/' // 生产
+			// baseUrl: 'https://md.test.zyucgj.com/saas/clz/', // 预发布
+			baseUrl: 'https://car.zyucgj.com/saas/clz/' // 生产
 		},
 		onLaunch: function() {
 			console.log('App Launch');

+ 1 - 0
manifest.json

@@ -5,6 +5,7 @@
     "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,
+	"sassImplementationName": "node-sass",
     /* 5+App特有相关 */
     "app-plus" : {
         "usingComponents" : true,

+ 1 - 0
pagesA/digitalShelf/choosePart.vue

@@ -940,6 +940,7 @@
 				height: 50px;
 				align-items: center;
 				.submitBtn{
+					padding: 0 10px;
 					border-radius: 100rpx;
 					height: 35px;
 				}

+ 3 - 0
pagesA/digitalShelf/components/otherPartItem.vue

@@ -8,6 +8,9 @@
 				style="width:100rpx;height:100rpx;border-radius: 30rpx;background-color: #EBEBEB;"
 				>
 				</image>
+				<view class="flex align_center justify_center" v-if="item.shelfPlaceCode">
+					<uni-badge :text="item.shelfPlaceCode" :custom-style="{fontSize:'16px',background:'#ff9800'}" circle type="error" />
+				</view>
 			</view>
 			<view class="item-info uni-col-10">
 				<view class="item-name">

+ 3 - 0
pagesA/digitalShelf/components/vinPartItem.vue

@@ -8,6 +8,9 @@
 				style="width:100rpx;height:100rpx;border-radius: 30rpx;background-color: #EBEBEB;"
 				>
 				</image>
+				<view class="flex align_center justify_center" v-if="item.shelfPlaceCode">
+					<uni-badge :text="item.shelfPlaceCode" :custom-style="{fontSize:'16px',background:'#ff9800'}" circle type="error" />
+				</view>
 			</view>
 			<view class="item-info uni-col-10">
 				<view class="item-name">