Browse Source

充值卡列表

lilei 4 months ago
parent
commit
a392001c00

+ 2 - 2
App.vue

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

+ 17 - 0
api/recharge.js

@@ -0,0 +1,17 @@
+import request from './request';
+// 充值详情
+export const rechargeDetail = param => {
+  return request({
+    url: `rechargeRule/findBySn/${param.sn}`,
+    method: 'get'
+  })
+}
+
+// 充值卡列表
+export const rechargeList = params => {
+  return request({
+    url: 'rechargeRule/queryList',
+    data: params,
+    method: 'POST'
+  })
+}

+ 8 - 8
pages/index/index.vue

@@ -837,13 +837,13 @@
 			},
 			// 查询是有红包活动
 			getRedPacketRule(){
-				findCurrentRewardRule().then(res => {
-					this.$store.state.vuex_rewardRule = res.data;
-					// 商城未开通时调用
-					if(res.data && !this.hasShopiing){
-						this.getRedScroll()
-					}
-				})
+				// findCurrentRewardRule().then(res => {
+				// 	this.$store.state.vuex_rewardRule = res.data;
+				// 	// 商城未开通时调用
+				// 	if(res.data && !this.hasShopiing){
+				// 		this.getRedScroll()
+				// 	}
+				// })
 			},
 			// 红包奖励信息
 			getRedScroll(){
@@ -1031,7 +1031,7 @@
 			top:0;
 			position: fixed;
 			background: #066cff;
-			/deep/ .uni-searchbar{
+			::v-deep .uni-searchbar{
 				padding: 0;
 				.uni-searchbar__box{
 					height: 30px;

+ 1 - 1
pagesA/digitalShelf/choosePart.vue

@@ -1047,7 +1047,7 @@
 			.item-detail{
 				.item-detail-info{
 					padding: 10upx 0 4upx;
-					/deep/ .uni-tag{
+					::v-deep .uni-tag{
 						word-break: break-all;
 						font-size: 24rpx;
 						padding: 0.2rem 0.3rem;

+ 1 - 1
pagesA/digitalShelf/components/otherPartItem.vue

@@ -204,7 +204,7 @@
 				.item-detail-info {
 					padding: 10upx 0 4upx;
 
-					/deep/ .uni-tag {
+					::v-deep .uni-tag {
 						word-break: break-all;
 						font-size: 28rpx;
 						color: #0fab04eee;

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

@@ -208,7 +208,7 @@
 			.item-detail{
 				.item-detail-info{
 					padding: 10upx 0 4upx;
-					/deep/ .uni-tag{
+					::v-deep .uni-tag{
 						word-break: break-all;
 						font-size: 24rpx;
 						padding: 0.2rem 0.3rem;

+ 1 - 1
pagesA/digitalShelf/orderDetail.vue

@@ -390,7 +390,7 @@
 				&:last-child{
 					border: none;
 				}
-				/deep/ .u-tag{
+				::v-deep .u-tag{
 					word-break: break-all;
 				}
 				> view{

+ 1 - 1
pagesA/digitalShelf/orderList.vue

@@ -316,7 +316,7 @@
 				.check-row{
 					display: flex;
 					font-size: 28upx;
-					/deep/ .u-tag{
+					::v-deep .u-tag{
 						word-break: break-all;
 					}
 					&:first-child{

+ 1 - 1
pagesA/digitalShelf/tempOrderList/orderDetail.vue

@@ -321,7 +321,7 @@
 				&:last-child{
 					border: none;
 				}
-				/deep/ .u-tag{
+				::v-deep .u-tag{
 					word-break: break-all;
 				}
 				> view{

+ 1 - 1
pagesA/qualityPolicy/creatCarInfo.vue

@@ -226,7 +226,7 @@
 		z-index: 90;
 		border-top: 1px solid #eee;
 		justify-content: space-around;
-		/deep/ .u-btn{
+		::v-deep .u-btn{
 			width: 7rem;
 		}
 	}

+ 2 - 2
pagesA/qualityPolicy/creatCustomInfo.vue

@@ -314,7 +314,7 @@
 		z-index: 90;
 		border-top: 1px solid #eee;
 		justify-content: space-around;
-		/deep/ .u-btn{
+		::v-deep .u-btn{
 			width: 7rem;
 		}
 	}
@@ -332,7 +332,7 @@
 		.links{
 			color: #55aaff;
 		}
-		/deep/.u-checkbox__label{
+		::v-deep.u-checkbox__label{
 			margin-right: 0;
 		}
 	}

+ 1 - 1
pagesA/qualityPolicy/creatOrder.vue

@@ -154,7 +154,7 @@
 	.tags-box{
 		flex-grow: 1;
 		padding: 1rem;
-		/deep/ .u-tag{
+		::v-deep .u-tag{
 			margin: 0.5rem 1rem;
 		}
 	}

+ 1 - 1
pagesA/qualityPolicy/orderDetail.vue

@@ -190,7 +190,7 @@
 		z-index: 10000;
 		border-top: 1px solid #eee;
 		justify-content: space-around;
-		/deep/ .u-btn{
+		::v-deep .u-btn{
 			width: 15rem;
 		}
 	}

+ 1 - 1
pagesA/qualityPolicy/resultOrder.vue

@@ -81,7 +81,7 @@
 		z-index: 10000;
 		border-top: 1px solid #eee;
 		justify-content: space-around;
-		/deep/ .u-btn{
+		::v-deep .u-btn{
 			width: 8rem;
 		}
 	}

+ 4 - 4
pagesA/queryByCode/confirmQh.vue

@@ -143,7 +143,7 @@
 		.item-detail-text{
 			color: #999;
 		}
-		/deep/ .u-tag{
+		::v-deep .u-tag{
 			word-break: break-all;
 		}
 		> view{
@@ -186,16 +186,16 @@
 			border-radius: 50rpx;
 			padding: 0 12rpx;
 		}
-		/deep/ .u-icon-disabled{
+		::v-deep .u-icon-disabled{
 			background: #fff!important;
 		}
-		/deep/ .u-number-input{
+		::v-deep .u-number-input{
 			margin: 0 2rpx;
 			border: 2rpx solid #eee;
 			border-top: 0;
 			border-bottom: 0;
 		}
-		/deep/ .u-icon-plus, /deep/ .u-icon-minus{
+		::v-deep .u-icon-plus, ::v-deep .u-icon-minus{
 			border-radius: 50rpx;
 		}
 	}

+ 1 - 1
pagesA/queryByCode/queryByCode.vue

@@ -253,7 +253,7 @@
 					flex-grow: 1;
 					padding-left: 20rpx;
 					width: 80%;
-					/deep/ .uni-tag{
+					::v-deep .uni-tag{
 						word-break: break-all;
 						font-size: 28rpx;
 						color: #0fab04eee;

+ 13 - 16
pagesB/accountBalance/accountBalance.vue

@@ -18,11 +18,11 @@
         :key="idx"
       >
         <view class="recharge-val flex align_center justify_center">
-			<text>¥{{ opt.amount }}</text>
+			<text>¥{{ opt.rechargeAmount }}</text>
 		</view>
         <view class="recharge-option-content flex_1">
-			<view><text class="gift-text">充值{{ opt.amount }}元送{{ opt.gift }}元抵扣</text></view>
-			<view class="gift-remark">{{opt.remark}}</view>
+			<view><text class="gift-text">充值{{ opt.rechargeAmount }}元送{{ opt.giveAmount }}元抵扣</text></view>
+			<view class="gift-remark">{{opt.remarks}}</view>
 		</view>
 		<view class="recharge-btn flex align_center justify_center" @tap="handleRecharge(opt)">
 			<text>去充值</text>
@@ -37,6 +37,7 @@
 </template>
 
 <script>
+import {rechargeDetail,rechargeList} from '../../api/recharge.js'
 import {
 	    mapState,
 	    mapMutations,
@@ -53,19 +54,7 @@ export default {
 			{ label: '充值余额', value: '10000.00' },
 			{ label: '抵扣余额', value: '1000.00' }
 		  ],
-		  rechargeOptions: [
-			{ amount: 1000, gift: 50, remark:'抵扣仅限机油产品' },
-			{ amount: 1500, gift: 75, remark:'抵扣仅限刹车片产品' },
-			{ amount: 2000, gift: 100, remark:'抵扣仅限轮胎产品' },
-			{ amount: 3000, gift: 150, remark:'抵扣仅限滤清器产品' },
-			{ amount: 5000, gift: 250, remark:'抵扣仅限滤清器产品' },
-			{ amount: 10000, gift: 500, remark:'抵扣仅限滤清器产品' },
-			{ amount: 15000, gift: 750, remark:'抵扣仅限滤清器产品' },
-			{ amount: 30000, gift: 1100, remark:'抵扣仅限滤清器产品' },
-			{ amount: 50000, gift: 2500, remark:'抵扣仅限滤清器产品' },
-			{ amount: 100000, gift: 5000, remark:'抵扣仅限滤清器产品' },
-			{ amount: 150000, gift: 7500, remark:'抵扣仅限滤清器产品' }
-		  ],
+		  rechargeOptions: [],
     }
   },
   computed: {
@@ -93,7 +82,15 @@ export default {
   		return this.$store.state.vuex_tempOrderData
   	}
   },
+  onShow() {
+	  this.getList()
+  },
   methods: {
+	getList(){
+		rechargeList({dealerSn:this.shelfInfo.dealerSn}).then(res => {
+			this.rechargeOptions = res.data||[]
+		})
+	},
 	// 消费记录
 	viewRecord(item){
 		uni.navigateTo({

+ 2 - 2
pagesB/components/czPayModal.vue

@@ -13,10 +13,10 @@
 			</view>
 			<view class="pupu-box-pay-item">
 				<view class="popu-content-amount flex align_center justify_center">
-					<view>¥{{payInfo.amount}}</view>
+					<view>¥{{payInfo.rechargeAmount}}</view>
 				</view>
 				<view class="flex align_center justify_center">
-					充值{{ payInfo.amount }}元送{{ payInfo.gift }}元抵扣</text>
+					充值{{ payInfo.rechargeAmount }}元送{{ payInfo.giveAmount }}元抵扣</text>
 				</view>
 				<view style="height: 10px;"></view>
 				<view class="flex align_center justify_between" v-if="shelfInfo">

+ 1 - 1
pagesB/shopShow/shopShow.vue

@@ -145,7 +145,7 @@
 			}
 		}
 		.set-item {
-			/deep/ .u-radio__label{
+			::v-deep .u-radio__label{
 				flex: 1;
 			}
 		}

+ 1 - 1
pagesB/shopiing/productDetail.vue

@@ -842,7 +842,7 @@
 										&::after{
 											border:none;
 										}
-										/deep/ .u-icon{
+										::v-deep .u-icon{
 											margin-right: 3px;
 										}
 									}

+ 1 - 1
pagesB/shopiing/searchProduct.vue

@@ -297,7 +297,7 @@
 		.uni-searchbar{
 			background-color: #FFFFFF;
 		}
-		/deep/ .choose-product-item{
+		::v-deep .choose-product-item{
 			background-color: #FFFFFF;
 			margin: 6px 10px;
 			border-radius: 6px;

+ 3 - 3
pagesB/shopiing/shopProduct.vue

@@ -362,7 +362,7 @@
 	}
 	.search-head{
 		background-color: #FFFFFF;
-		/deep/ .uni-searchbar{
+		::v-deep .uni-searchbar{
 			padding: 5px 6px;
 		}
 	}
@@ -391,7 +391,7 @@
 				.uni-searchbar{
 					background-color: #FFFFFF;
 				}
-				/deep/ .choose-product-item{
+				::v-deep .choose-product-item{
 					background-color: #FFFFFF;
 					margin: 6px 10px;
 					border-radius: 6px;
@@ -455,7 +455,7 @@
 				}
 			}
 			.right-item{
-				/deep/ .choose-product-item{
+				::v-deep .choose-product-item{
 					margin: 5px 8px;
 					.choose-product-item-img{
 						height: 130rpx;

+ 1 - 1
pagesB/stockQuery/stockQuery.vue

@@ -118,7 +118,7 @@
 	.list-box{
 		flex-grow: 1;
 		overflow: auto;
-		/deep/ .u-tag{
+		::v-deep .u-tag{
 			word-break: break-all;
 		}
 	}