lilei 7 months ago
parent
commit
236fab2a40

+ 2 - 2
App.vue

@@ -1,8 +1,8 @@
 <script>
 <script>
 	export default {
 	export default {
 		globalData: {
 		globalData: {
-			baseUrl: 'http://192.168.2.131:7002/saas/clz/', // 本地
-			// baseUrl: 'https://md.test.zyucgj.com/saas/clz/', // 预发布
+			// baseUrl: 'http://192.168.2.131:7002/saas/clz/', // 本地
+			baseUrl: 'https://md.test.zyucgj.com/saas/clz/', // 预发布
 			// baseUrl: 'https://car.zyucgj.com/saas/clz/' // 生产
 			// baseUrl: 'https://car.zyucgj.com/saas/clz/' // 生产
 		},
 		},
 		onLaunch: function() {
 		onLaunch: function() {

+ 68 - 59
pagesA/digitalShelf/choosePart.vue

@@ -102,8 +102,8 @@
 				</scroll-view>
 				</scroll-view>
 			</div>
 			</div>
 		</div>
 		</div>
-		<!-- 底部提交按钮 -->
 		<sklineFooter></sklineFooter>
 		<sklineFooter></sklineFooter>
+		<!-- 底部提交按钮 -->
 		<div class="cpb_footer flex align-center flex_column" :style="{zIndex:hideFooter?0:10}">
 		<div class="cpb_footer flex align-center flex_column" :style="{zIndex:hideFooter?0:10}">
 			<view class="flex align-center">
 			<view class="flex align-center">
 				<div>
 				<div>
@@ -123,6 +123,56 @@
 			</view>
 			</view>
 			<view :style="{height:safeAreaBottom+'px'}"></view>
 			<view :style="{height:safeAreaBottom+'px'}"></view>
 		</div>
 		</div>
+		<!-- 去认证 -->
+		<uni-popup ref="showPopup" type="center" :is-mask-click="false">
+			<view class="popu-modal">
+				<view class="popu-close" @click="closePopup"><uni-icons type="closeempty" size="28"></uni-icons></view>
+				<image width="533" height="415" style="width: 533rpx;height: 415rpx;" src="/static/authimg.jpg"></image>
+				<view style="padding-top:1rem;" class="flex justify_center">
+					<button @click="toAuthStore()" type="primary" :style="{background:'#066cff',color:'#fff',width:'350rpx',borderRadius:'100px'}">开始认证</button>
+				</view>
+			</view>
+		</uni-popup>
+		<!-- 价格查看 -->
+		<uni-popup ref="showPriceModal" type="center" @change="e=>{e.show?1:hideFooter = false}">
+			<view class="show-price-modal popu-modal" v-if="tempData">
+				<view class="popu-close" @click="closePriceModal"><uni-icons type="closeempty" size="28"></uni-icons></view>
+				<view class="itemlist">
+					<text>产品编码</text>
+					<text>{{tempData.code||'--'}}</text>
+				</view>
+				<view class="itemlist" v-if="tempData.productTypeSn=='543766811373752320'">
+					<text>原厂编码</text>
+					<text>{{tempData.origCode||'--'}}</text>
+				</view>
+				<view class="itemlist">
+					<text>产品名称</text>
+					<text>{{tempData.name||'--'}}</text>
+				</view>
+				<view v-if="tempData.affiliation=='SHELF'">
+					<view class="itemlist" v-if="configPrice&&configPrice.shelf_cost_show == '1'">
+						<text>进货价</text>
+						<text>{{tempData.cost?'¥'+tempData.cost:'暂无价格'}}</text>
+					</view>
+					<view class="itemlist" v-if="configPrice&&configPrice.shelf_price_show == '1'">
+						<text>车主价</text>
+						<text>{{tempData.price?'¥'+tempData.price:'暂无价格'}}</text>
+					</view>
+				</view>
+				<view v-else>
+					<view class="itemlist" v-if="configPrice&&configPrice.non_shelf_cost_show == '1'">
+						<text>进货价</text>
+						<text>{{tempData.cost?'¥'+tempData.cost:'暂无价格'}}</text>
+					</view>
+					<view class="itemlist" v-if="configPrice&&configPrice.non_shelf_price_show == '1'">
+						<text>车主价</text>
+						<text>{{tempData.price?'¥'+tempData.price:'暂无价格'}}</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<!-- 购物车动画 -->
+		<uni-cart-animation ref="cartAnimation"></uni-cart-animation>
 		<!-- 已选配件 购物车 -->
 		<!-- 已选配件 购物车 -->
 		<page-container
 		<page-container
 		:show="showCart" 
 		:show="showCart" 
@@ -146,13 +196,16 @@
 						<view class="item-info uni-col-10">
 						<view class="item-info uni-col-10">
 							<view class="item-name">
 							<view class="item-name">
 								<text class="item-tempPart" v-if="!item.currentInven">急送</text>
 								<text class="item-tempPart" v-if="!item.currentInven">急送</text>
-								<text>{{item.name}}</text>
+								<text class="item-name-text" :max-lines="2" overflow="ellipsis">{{item.name}}</text>
 							</view>
 							</view>
 							<view class="item-detail">
 							<view class="item-detail">
 								<view class="item-detail-info">
 								<view class="item-detail-info">
 									<view class="flex justify_between">
 									<view class="flex justify_between">
-										<text class="item-detail-text flex_1">{{item.code}}</text>
-										<text class="item-detail-text" v-if="item.affiliation!='NON_SHELF'">库存:{{item.currentInven?item.currentInven:0}} {{item.unit}}</text>
+										<view class="flex align_center">
+											<text class="item-detail-text flex_1">{{item.code}}</text>
+											<uni-tag v-if="commonPartCodeList.includes(item.code)" size="small" style="margin-left: 5px;" text="通用" :circle="true" type="success"></uni-tag>
+										</view>
+										<text class="item-detail-text" style="width: 50%;text-align: right;" v-if="item.affiliation!='NON_SHELF'">库存:{{item.currentInven?item.currentInven:0}} {{item.unit}}</text>
 									</view>
 									</view>
 									<view class="flex" v-if="item.productTypeSn=='543766811373752320'" style="padding-bottom: 5px;">
 									<view class="flex" v-if="item.productTypeSn=='543766811373752320'" style="padding-bottom: 5px;">
 										<uni-tag :text="item.origCode" inverted :circle="true" type="success"></uni-tag>
 										<uni-tag :text="item.origCode" inverted :circle="true" type="success"></uni-tag>
@@ -178,56 +231,6 @@
 				<sklineFooter></sklineFooter>
 				<sklineFooter></sklineFooter>
 			</div>
 			</div>
 		</page-container>
 		</page-container>
-		<!-- 去认证 -->
-		<uni-popup ref="showPopup" type="center" :is-mask-click="false">
-			<view class="popu-modal">
-				<view class="popu-close" @click="closePopup"><uni-icons type="closeempty" size="28"></uni-icons></view>
-				<image width="533" height="415" style="width: 533rpx;height: 415rpx;" src="/static/authimg.jpg"></image>
-				<view style="padding-top:1rem;" class="flex justify_center">
-					<button @click="toAuthStore()" type="primary" :style="{background:'#066cff',color:'#fff',width:'350rpx',borderRadius:'100px'}">开始认证</button>
-				</view>
-			</view>
-		</uni-popup>
-		<!-- 价格查看 -->
-		<uni-popup ref="showPriceModal" type="center" @change="e=>{e.show?1:hideFooter = false}">
-			<view class="show-price-modal popu-modal" v-if="tempData">
-				<view class="popu-close" @click="closePriceModal"><uni-icons type="closeempty" size="28"></uni-icons></view>
-				<view class="itemlist">
-					<text>产品编码</text>
-					<text>{{tempData.code||'--'}}</text>
-				</view>
-				<view class="itemlist" v-if="tempData.productTypeSn=='543766811373752320'">
-					<text>原厂编码</text>
-					<text>{{tempData.origCode||'--'}}</text>
-				</view>
-				<view class="itemlist">
-					<text>产品名称</text>
-					<text>{{tempData.name||'--'}}</text>
-				</view>
-				<view v-if="tempData.affiliation=='SHELF'">
-					<view class="itemlist" v-if="configPrice&&configPrice.shelf_cost_show == '1'">
-						<text>进货价</text>
-						<text>{{tempData.cost?'¥'+tempData.cost:'暂无价格'}}</text>
-					</view>
-					<view class="itemlist" v-if="configPrice&&configPrice.shelf_price_show == '1'">
-						<text>车主价</text>
-						<text>{{tempData.price?'¥'+tempData.price:'暂无价格'}}</text>
-					</view>
-				</view>
-				<view v-else>
-					<view class="itemlist" v-if="configPrice&&configPrice.non_shelf_cost_show == '1'">
-						<text>进货价</text>
-						<text>{{tempData.cost?'¥'+tempData.cost:'暂无价格'}}</text>
-					</view>
-					<view class="itemlist" v-if="configPrice&&configPrice.non_shelf_price_show == '1'">
-						<text>车主价</text>
-						<text>{{tempData.price?'¥'+tempData.price:'暂无价格'}}</text>
-					</view>
-				</view>
-			</view>
-		</uni-popup>
-		<!-- 购物车动画 -->
-		<uni-cart-animation ref="cartAnimation"></uni-cart-animation>
 	</view>
 	</view>
 </template>
 </template>
 
 
@@ -1020,12 +1023,20 @@
 			}
 			}
 			.item-name{
 			.item-name{
 				font-size: 30rpx;
 				font-size: 30rpx;
+				display: flex;
+				align-items: center;
 				.item-tempPart{
 				.item-tempPart{
-					background: #0055ff;
+					background: #F44336;
 					color: #fff;
 					color: #fff;
 					border-radius: 1em;
 					border-radius: 1em;
-					font-size: 0.8em;
+					font-size: 20rpx;
 					padding: 0 0.5em;
 					padding: 0 0.5em;
+					display: inline-block;
+					margin-right: 5px;
+				}
+				.item-name-text{
+					width:50%;
+					flex-grow: 1;
 				}
 				}
 			}
 			}
 			.item-info{
 			.item-info{
@@ -1038,9 +1049,7 @@
 					padding: 10upx 0 4upx;
 					padding: 10upx 0 4upx;
 					/deep/ .uni-tag{
 					/deep/ .uni-tag{
 						word-break: break-all;
 						word-break: break-all;
-						font-size: 28rpx;
-						color: #0fab04eee;
-						border: 0;
+						font-size: 24rpx;
 						padding: 0.2rem 0.3rem;
 						padding: 0.2rem 0.3rem;
 					}
 					}
 					> view{
 					> view{

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

@@ -210,9 +210,7 @@
 					padding: 10upx 0 4upx;
 					padding: 10upx 0 4upx;
 					/deep/ .uni-tag{
 					/deep/ .uni-tag{
 						word-break: break-all;
 						word-break: break-all;
-						font-size: 28rpx;
-						color: #0fab04eee;
-						border: 0;
+						font-size: 24rpx;
 						padding: 0.2rem 0.3rem;
 						padding: 0.2rem 0.3rem;
 					}
 					}
 					> view{
 					> view{

+ 2 - 1
pagesB/procureOrder/creatOrder.vue

@@ -214,7 +214,7 @@
 								productSn:item.productSn,
 								productSn:item.productSn,
 								productCode: item.productCode,
 								productCode: item.productCode,
 								qty: item.qty,
 								qty: item.qty,
-								price:0.02,
+								price: item.price,
 								promoSn: item.promoSn
 								promoSn: item.promoSn
 							}
 							}
 						})
 						})
@@ -275,6 +275,7 @@
 								bizSn:res.data.purchaseSn,
 								bizSn:res.data.purchaseSn,
 								bizNo:res.data.purchaseNo,
 								bizNo:res.data.purchaseNo,
 								bizType:'PURCHASE',
 								bizType:'PURCHASE',
+								payUserOpenId: this.$store.state.vuex_openid || uni.getStorageSync('openid')
 							}).then(res=>{
 							}).then(res=>{
 								this.showPopu = true
 								this.showPopu = true
 								this.payData = res.data?res.data.payRequestRest:null
 								this.payData = res.data?res.data.payRequestRest:null

+ 1 - 0
pagesB/procureOrder/orderDetail.vue

@@ -303,6 +303,7 @@
 				bizSn:item.purchaseSn,
 				bizSn:item.purchaseSn,
 				bizNo:item.purchaseNo,
 				bizNo:item.purchaseNo,
 				bizType:'PURCHASE',
 				bizType:'PURCHASE',
+				payUserOpenId: this.$store.state.vuex_openid || uni.getStorageSync('openid')
 			}).then(res=>{
 			}).then(res=>{
 				this.showPopu = true
 				this.showPopu = true
 				this.payData = res.data?res.data.payRequestRest:null
 				this.payData = res.data?res.data.payRequestRest:null

+ 1 - 0
pagesB/procureOrder/orderList.vue

@@ -240,6 +240,7 @@
 					bizSn:item.purchaseSn,
 					bizSn:item.purchaseSn,
 					bizNo:item.purchaseNo,
 					bizNo:item.purchaseNo,
 					bizType:'PURCHASE',
 					bizType:'PURCHASE',
+					payUserOpenId: this.$store.state.vuex_openid || uni.getStorageSync('openid')
 				}).then(res=>{
 				}).then(res=>{
 					this.showPopu = true
 					this.showPopu = true
 					this.payData = res.data?res.data.payRequestRest:null
 					this.payData = res.data?res.data.payRequestRest:null