浏览代码

新加key 新加建议零售价

Qukatie 2 月之前
父节点
当前提交
74263da5d0

+ 7 - 0
api/tabBar/shoppingCart.js

@@ -110,4 +110,11 @@ export function generateOrderPoints(data) {
 		method: 'POST',
 		data
 	})
+}
+export function getPaymentType(data) {
+	return http.request({
+		url: '/blade-sales-part/shoppingCart//getPaymentType',
+		method: 'POST',
+		data
+	})
 }

+ 1 - 1
common/setting.js

@@ -10,7 +10,7 @@ module.exports = {
 	version: '1.0.0',
 	// 开发环境接口Url
 	// devUrl: 'http://192.168.0.111:1080',
-	// devUrl: 'http://192.168.8.103:1080',
+	// devUrl: 'http://192.168.8.102:1080',
 	// devUrl: 'https://td.echepei.com/api', 
 	devUrl: 'https://lt.echepei.com/api',   // 鑫畅途的
 	// devUrl: 'http://jxy.natapp1.cc/api',

+ 1 - 1
manifest.json

@@ -125,7 +125,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxc08fe60dd3bf316d",
+        "appid" : "wxf37f32ee0d3a10a7",
         "setting" : {
             "urlCheck" : false,
             "postcss" : true,

+ 6 - 2
pages/integralMall/buyGoods/commodityDetails.vue

@@ -96,9 +96,12 @@
 				商品详情
 			</view>
 		</view>
-		<view style="width: 100%;background-color: #fff;" class="text-bottom">
+		<view style="width: 100%;background-color: #fff;" >
 			<view v-html="form.detailsText"></view>
 		</view>
+		<view class="text-bottom">
+			
+		</view>
 		<view style="width: 100%;position: fixed;bottom: 0;background-color: #fff;border-top:2rpx #F2F2F2 solid;"
 			class="dynamic-bottom">
 			<view style="display: flex;justify-content: space-around;align-items: center;">
@@ -311,6 +314,7 @@
 	}
 
 	.text-bottom {
-		margin-bottom: calc(env(safe-area-inset-bottom) + 126rpx);
+		height: calc(env(safe-area-inset-bottom) + 126rpx);
 	}
+	
 </style>

+ 42 - 21
pages/tabBar/classification.vue

@@ -18,8 +18,8 @@
 				</view>
 				<view class="recentSearches-text">
 					<u-tag v-for="(item,index) in recentSearches" :key="index" :text="item" bgColor="#EFEFEF"
-						color="#414141" borderColor="#EFEFEF" size="medium" closable :show="item" @close="tagClose(index)"
-						shape="circle" @click.stop="tagSearches(item)"></u-tag>
+						color="#414141" borderColor="#EFEFEF" size="medium" closable :show="item"
+						@close="tagClose(index)" shape="circle" @click.stop="tagSearches(item)"></u-tag>
 				</view>
 				<u-modal :show="searchDeleteShow" content="确认删除搜索记录吗?" showCancelButton @confirm="searchDeletefun"
 					@cancel="searchDeleteShow = false" ref="uModal" :asyncClose="true">
@@ -48,13 +48,20 @@
 					</image>
 					<view class="">
 						<view style="display: flex;align-items: center;">
-							<view class="cardName">
-								{{item.cname}}
+							<view class="cardTitle">
+								<view class="cardName">
+									{{item.cname}}
+								</view>
+								<view class="cardRetailPrice">
+									<view v-if="item.suggestedRetailPrice">
+										建议零售价:¥{{item.suggestedRetailPrice}}
+									</view>
+									
+								</view>
 							</view>
 							<image src="/static/images/tabBar/carIcon@2x.png" @click.stop="shoppingCartfun(item)"
 								style="width: 54rpx;height: 54rpx;margin-left: 32rpx;" mode="scaleToFill">
 							</image>
-
 						</view>
 
 						<view style="display: flex;align-items: center;">
@@ -275,7 +282,7 @@
 								}
 							});
 						});
-			
+
 						updateManager.onUpdateFailed(function() {
 							// 新的版本下载失败
 							uni.showModal({
@@ -286,7 +293,7 @@
 					}
 				});
 			},
-			opensalesman(){
+			opensalesman() {
 				if (this.checkStatus != '通过') {
 					uni.showToast({
 						title: "当前用户未授权,请联系客服",
@@ -295,14 +302,14 @@
 					});
 					return
 				}
-				this.salesmanShow=true
+				this.salesmanShow = true
 			},
 			openBrand() {
 				if (this.checkStatus != '通过') {
 					uni.showToast({
 						title: "当前用户未授权,请联系客服",
 						icon: "none",
-						mask:true
+						mask: true
 					});
 					return
 				}
@@ -363,7 +370,7 @@
 					uni.showToast({
 						title: "当前用户未授权,请联系客服",
 						icon: "none",
-						mask:true
+						mask: true
 					});
 					return
 				}
@@ -397,7 +404,7 @@
 					uni.showToast({
 						title: "当前用户未授权,请联系客服",
 						icon: "none",
-						mask:true
+						mask: true
 					});
 					return
 				}
@@ -498,7 +505,7 @@
 					uni.showToast({
 						title: "当前用户未授权,请联系客服",
 						icon: "none",
-						mask:true
+						mask: true
 					});
 					return
 				}
@@ -522,10 +529,10 @@
 			},
 			// 搜索
 			custom() {
-				if(this.userInfo.tenant_id=='000000'){
+				if (this.userInfo.tenant_id == '000000') {
 					uni.showToast({
 						title: '请点右下角<我的> 授权登录!',
-						icon :'none'
+						icon: 'none'
 					});
 					return
 				}
@@ -533,7 +540,7 @@
 					uni.showToast({
 						title: "当前用户未授权,请联系客服",
 						icon: "none",
-						mask:true
+						mask: true
 					});
 					return
 				}
@@ -685,7 +692,19 @@
 			-webkit-line-clamp: 2;
 			overflow: hidden;
 			text-overflow: ellipsis;
-			margin-bottom: 28rpx;
+			// margin-bottom: 28rpx;
+		}
+
+		.cardTitle {
+			font-weight: 400;
+			font-size: 24rpx;
+			width: 400rpx;
+			.cardRetailPrice {
+				display: flex;
+				color: #909399;
+				font-size: 22rpx;
+				height: 28rpx;
+			}
 		}
 
 		.cardTab {
@@ -712,29 +731,31 @@
 			font-weight: 500;
 		}
 	}
+
 	.recentSearches {
 		padding: 8rpx 12rpx;
 		background-color: #fff;
-	
+
 		.recentSearches-head {
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
 			color: #C4C4C4;
-	
+
 			.recentSearches-headLeft {
 				display: flex;
 				align-items: center;
 			}
-	
+
 			.recentSearches-headRight {}
 		}
-	
+
 		.recentSearches-text {
 			display: flex;
 			flex-wrap: wrap;
 			align-items: baseline;
-			::v-deep .u-tag__close{
+
+			::v-deep .u-tag__close {
 				z-index: 99 !important;
 			}
 		}

+ 12 - 2
pages/views/buyGoods/commodityDetails.vue

@@ -36,7 +36,10 @@
 
 				</view>
 			</view>
-			<view style="margin-top: 38rpx;">
+			<view class="retailPrice" v-if="form.suggestedRetailPrice">
+				建议零售价:¥{{form.suggestedRetailPrice}}
+			</view>
+			<view style="margin-top: 14rpx;">
 				<u--text :text="form.cname" size="26rpx" color='#797979' lines="2"></u--text>
 			</view>
 			<view style="display: flex;justify-content: space-between;margin-top: 8rpx;align-items: center;">
@@ -231,7 +234,7 @@
 			stockDescListfun() {
 				listShareV1({
 					code: uni.getStorageSync('whether_openShare') == 1 ? this.form.goodsCode : this.form.code,
-					id:this.form.id,
+					id: this.form.id,
 					whether: 0
 				}).then(res => {
 					this.inventoryDataForm = res.data
@@ -369,4 +372,11 @@
 	.text-bottom {
 		height: calc(env(safe-area-inset-bottom) + 126rpx);
 	}
+
+	.retailPrice {
+		display: flex;
+		color: #909399;
+		font-size: 22rpx;
+		height: 28rpx;
+	}
 </style>

+ 1 - 1
pages/views/salesSlip/index.vue

@@ -24,7 +24,7 @@
 					<view>
 						<view style="display: flex;" v-for="(ite,inde) in item.orderItemsList" :key="inde">
 							<view style="display: flex;width: 100%;align-items: center;margin-bottom: 20rpx;">
-								<image :url="ite.url" mode="scaleToFill"
+								<image :src="ite.url" mode="scaleToFill"
 									style="width:120rpx;height: 120rpx;border-radius: 10rpx;border: 2rpx solid #EEEEEE;margin-right: 27rpx;">
 								</image>
 								<view style="width:477rpx;">

+ 15 - 3
pages/views/salesSlip/obligation.vue

@@ -93,7 +93,9 @@
 		shoppingCartUpdate,
 		getCorpsAddr,
 		update,
-		paramserviceDetail
+		paramserviceDetail,
+		isProcurement,
+		getPaymentType
 	} from '@/api/tabBar/shoppingCart.js'
 	import {
 		registerRuntimeCompiler
@@ -123,7 +125,8 @@
 				totalPrice: 0.00,
 				totalFreight: 0.00,
 				addres: {},
-				isLoading: true
+				isLoading: true,
+				payType:null
 			}
 		},
 		watch: {
@@ -155,6 +158,10 @@
 		onShow() {
 			this.editDel = false
 			this.companyValue = []
+			getPaymentType().then(res => {
+				console.log(res.data,111);
+				this.payType=res.data
+			})
 			this.isLoading = true
 			uni.showLoading({
 				title: '加载中',
@@ -455,7 +462,12 @@
 			statistics(val, index, ind) {
 				let data = []
 				for (let it of val.list) {
-					data.push(it)
+					if (it.payType) {
+						data.push(it)
+					}else{
+						it.payType=this.payType
+						data.push(it)
+					}
 				}
 				this.totalPrice = 0
 				this.totalFreight = 0

+ 27 - 0
static/certificate/development/private.wx3b0887636909f1a9.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA2MgkeY/bB7RUIvXxRIfQum5k8ssMkvvd5ZVnn4u1UuxExCiU
+5X7INr0uJTrXn81houHo7j8Rb3mQ+uYDdXAW9fxGN7dwVHixqfQWenVFbIvWu8Rw
+zbBYKpDh6vI9umHcrqsAxp40rC/Gxzc1uyvyIjLAusx3amoPzaXpzXtax5x7kL2f
+aesTssi4usH/vG628wpi+GLgpTlWvNNbPrQ7spDJrjlnIxrtC4j5rS5CDNzkEG55
+7AfLrGVtP+cBi66eJx9QsBuUiKCgDPfcFoZPZzK9V/hmt9Y2KgkpVgVIGuGRpAVL
+igDP1s3M46uueKSzYcH1spbcFM8b1vItk9nXBwIDAQABAoIBAA1YzT4ayE6CIMgC
+QneIsSY5U8fLDpwiG7hd6YJeNKzFVTqKkRhMJQGRxjyOkeYJ3CAOLqw0f9tQLcf0
+z3O0kgVVIfGePrFEuROQrq2deMfFGFR5NMTFPbhpMS+o+Hn4OoEakDKqXO3ZBzEO
+yiUbAI5wd4NIwXVw0EZGF84J8T3m3IXpM/yKy06hDV3HZB8qqODchQH4+M+J6DyC
+eA1v03trntwiaOyei4auJtovh7z5j4RjHu/XiqcoiNC+x8MSrez8XY5XBNZreb6+
+ADM6oHP82iaCK8zMGYp/+X/l8psVTwgS/vbireVwmWO47jSyrGAxZ67Ag/1piW+a
+y1jsqgECgYEA7rxxk0Cxu/Lz7onQC9RZFqXOU2yATS/cD09rrSPCR+KdgYEQAbEv
+dcM0paYI2jOKsiS3sLWb7jjqeHKX4k81AIH3VP5Uk+8TDyjb7eVtMB91C3LJVEPO
+wx2N+xNBuL1QrAzzQhadNtHzpslQ2CXtPPGxV2eP5/uYjKVel+bdLQECgYEA6HVG
+J1TjUjPpmZpn5y6mJpTWryR4owiTB/TAZ17Gf3BVGJu6nimwlHPvu/4c2G52Apgd
+3QJ+O48RIcRDGUge9APMJOOLixJ1gonoGYKSgyq6MlkkA1r5iJT7Vt+ieShnlkJ/
+KN0MHwHGfePmGmxK52DJ4pz8P2mAOnxdBm9hnAcCgYEAj62V5PtgfC7ho8QJE7V+
+0GSFYivAo7OUCxrPQOpueHjoNhKIoZwTZhpPSwo79aZjaIc0jgMejyZt5oOA6VCm
+I2IUinBuUoHlxI/gnLIhHn8wH+27QR12CHN3CY4zVY2KSaGZnUKi52U/8DbkktFw
+j+cdxe6r6v++dZbo8R6eKgECgYEAxvbJyxRvVYa1ZRGx6UAWWmN+tX4D+5d1MZQd
+stx+Dcn6LAvu2T1ZtFbfVQsVaXJyc5n7xZVCsnur8DjqLZN7WuR9MP3KDIkKJ2ce
+T+dgvAAwSrPdjTmq52qNDjhv+j/JGeVkrXc1zrxYRpxv8SHLoutHIT248hW8+VJE
+1SM0arUCgYAfiL/too9aor22bhXF1+hCka2FQ4ICPOGQEe1ZxTpKnscNlPY0ldB9
+Iu4zYJD9FRamlFusIS3d4kFfISiyJh81NFa31c79QKqKA28FcuUvBZDlcy8C5I7U
+eJDsxTuPzvz39njjzGaInlanMc35DN35+QUiAVXbEINhOJcQpxgBTg==
+-----END RSA PRIVATE KEY-----