加购权益

components/form-builder/form-builder.vue

@@ -204,14 +204,15 @@
 						<view v-if="item.type === 10" style="width: 100%" :class="item.bg ? 'bg' : 'notbg'">
 							<view class="as-layout-horizontal" style="align-items: center">
 
-								<picker mode="region" @change="handleGetRegion($event, item)" :value="item.region">
+								<picker mode="region" @change="handleGetRegion($event, item)" :value="item.region"
+									disabled>
 									<view class="uni-input">
 										{{item.region?item.region[0]+item.region[1]+item.region[2]:""}}
 									</view>
 								</picker>
-								<image class="arror" v-if="state.sysType == 'WECHAT'"
+								<!-- <image class="arror" v-if="state.sysType == 'WECHAT'"
 									:src="`${$imgUrl}common/arror-right.png`" mode="aspectFill">
-								</image>
+								</image> -->
 							</view>
 						</view>
 
@@ -590,13 +591,16 @@
 				let newMsg = data.title.replace(reg, "");
 				if (data.value.indexOf(",") != -1 && data.type === 8) {
 					if (!data[data.value.split(",")[0]]) {
+						console.log("1111")
 						showToast(data.emptyHint ? data.emptyHint : `${data.hint1}不能为空`);
 						return;
 					} else if (!data[data.value.split(",")[1]]) {
+						console.log("2222")
 						showToast(data.emptyHint ? data.emptyHint : `${data.hint2}不能为空`);
 						return;
 					}
 				} else if (!data[data.value]) {
+					console.log("3333", data[data.value], data)
 					showToast(data.emptyHint ? data.emptyHint : `${newMsg}不能为空`);
 					return;
 				}

pages.json

@@ -109,6 +109,13 @@
 	"subPackages": [{
 			"root": "subpackage/after-sale", //售后相关 
 			"pages": [{
+					"path": "add-equity/add-equity",
+					"style": {
+						"navigationBarTitleText": "加购权益",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
 					"path": "ETC-product-status-list-query/ETC-product-status-list-query",
 					"style": {
 						"navigationBarTitleText": "ETC产品状态名单",

subpackage/after-sale/add-equity/add-equity.vue

@@ -0,0 +1,101 @@
+<template>
+	<view class="content">
+		<!-- <view class="item" v-for="(item,index) in state.list" :key='index'> -->
+		<view class="item">
+			<view class="title">
+				<view>
+					<!-- <text><text>{{item.productName}}</text>&nbsp;&nbsp;<text>¥{{item.discountPrice * 0.01}}</text></text> -->
+					<text><text>111</text>&nbsp;&nbsp;<text>¥11</text></text>
+				</view>
+				<text class="add">加购</text>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { onLoad, onShow } from "@dcloudio/uni-app";
+	import { reactive } from "vue";
+	import { equityProductsApi } from "@/utils/network/api.js";
+	import { stringToJson } from "@/utils/network/encryption";
+	import { request } from "@/utils/network/request";
+	import { etcQYAction } from "@/utils/network/api.js";
+	import { fileURL } from "@/datas/fileURL.js";
+	import navBar from "@/components/nav-bar/nav-bar2.vue";
+	import navBgCar from "./components/nav-bg-car4";
+	// import { setItem } from "@/utils/storage";
+	import { msg } from "@/utils/utils";
+	import {
+		checkOrderStatus,
+		wechatAppID,
+		wechatPayConfigId,
+		wechatSecret,
+		addProduct,
+		queryDetails,
+		getOpenidApi
+	} from "@/utils/network/api";
+	import {
+		getItem,
+		StorageKeys,
+		setItem
+	} from "@/utils/storage";
+	const imgURL = `${fileURL}image/`;
+
+	const state = reactive({
+		list: [],  //权益数据
+	})
+
+	onLoad((option : any) => {
+		// getList();
+
+		console.log("option", option)
+	})
+	const getList = () => {
+		const options = {
+			type: 2,
+			data: {
+				"promoteId": state.promoteId,
+			},
+			method: 'POST',
+			showLoading: true,
+		}
+		request(equityProductsApi, options).then((res) => {
+			const data = stringToJson(res.bizContent);
+			state.list = data.data
+			console.log("222", data.data)
+		})
+	}
+</script>
+
+<style scoped lang="scss">
+	.content {
+		width: 100%;
+	}
+
+	.item {
+		width: 90%;
+		margin: 20rpx auto;
+		background-color: rgb(41, 199, 207);
+		border-radius: 20rpx;
+		padding: 20rpx;
+		box-sizing: border-box;
+		color: white;
+		font-size: 32rpx;
+
+	}
+
+	.item>.title {
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.add {
+		background: white;
+		border-radius: 10rpx;
+		padding: 4rpx 6rpx;
+		color: #000;
+	}
+</style>

subpackage/after-sale/card-Renewal/renewal-confirm.vue

@@ -272,6 +272,7 @@
 
 	//去连接蓝牙
 	const toPage = () => {
+		console.log("getCurrentPages()", getCurrentPages())
 		navTo("/pages/bluetooth/bluetooth?routeType=5"); //去连接蓝牙
 	};
 

subpackage/orders/apply-ex-goods.vue

@@ -62,13 +62,14 @@
 				title: "换货方式:",
 				type: 7,
 				value: "exchangeMode",
+				exchangeMode: "ON_LINE",
 				star: true,
 				required: true,
 				divider: true,
 				emptyHint: "请选择换货方式",
 				itemData: [
 					{
-						checked: false,
+						checked: true,
 						value: "ON_LINE",
 						name: "线上",
 					},
@@ -341,7 +342,7 @@
 		}
 		if (state.exchangeMode === "MAIL") {
 			//MAIL-线上-邮寄
-			for (let i = 8; i < 14; i++) {
+			for (let i = 9; i < 14; i++) {
 				state.formData[i].hide = false;
 			}
 			// #ifdef MP-ALIPAY

subpackage/orders/interestsList.vue

@@ -92,58 +92,6 @@
 		uni.redirectTo({
 			url: `/subpackage/orders/essential-information?promoteId=${getItem("promoteId")}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}&totalAmount=${state.totalAmount}&equityId=${item.equityId}`,
 		});
-		return;
-		state.choiceValueComplete = [];
-		for (var i = 0; i < state.choiceValue.length; i++) {
-			state.choiceValueComplete.push(state.list[state.choiceValue[i]])
-		}
-		let items = encodeURIComponent(JSON.stringify(state.choiceValueComplete));
-
-		console.log("state.openid", state);
-		const data = JSON.parse(decodeURIComponent(items));
-		let productId = [];
-		state.productMoney = 0;
-		for (var i = 0; i < data.length; i++) {
-			data['isOpened'] = 'node';
-			state.productMoney += data[i]['discountPrice'] / 100;
-			productId.push(data[i]['equityId'])
-		}
-		const options = {
-			type: 2,
-			data: {
-				orderId: state.orderId, //订单编号	
-			},
-			method: "POST",
-			showLoading: true,
-		};
-		console.log("options", options);
-		request(queryDetails, options).then((res) => {
-			state.detailsObj = stringToJson(res.bizContent);
-			console.log("state.detailsObj", state.detailsObj)
-			let allMoney = (parseFloat(state.detailsObj.product.oncePrice * 0.01) + parseFloat(state.productMoney)).toFixed(2)
-
-			const optionss = {
-				type: 2,
-				data: {
-					orderId: state.orderId, //订单编号	
-					openId: getItem(StorageKeys.OpenId), //操作人 id
-					equityId: productId.toString(), //权益Id
-					totalAmount: allMoney * 100, //总金额
-					isRepeatPurchase: 0
-				},
-				method: "POST",
-				showLoading: true,
-			};
-			console.log("optionss", optionss);
-			request(addProduct, optionss).then((res) => {
-				// uni.redirectTo({
-				// 	url: `/subpackage/orders/product-detail?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}&&data=${items}&&isValueCard=${state.detailsObj.isValueCard}`,
-				// });
-				uni.redirectTo({
-					url: `/subpackage/orders/essential-information?promoteId=${getItem("promoteId")}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}`,
-				});
-			});
-		});
 	}
 
 

subpackage/personal-center/remind/components/evaluate-salesman-item.vue

@@ -8,12 +8,12 @@
 			</view>
 			<view class="time">{{item.insertTime}}</view>
 		</view>
-		
+
 		<view class="center">
 			<!-- <view class="type">这里是业务办理</view> -->
 			<view class="content">{{item.suggestion}}</view>
 		</view>
-		
+
 		<view class="bottom">
 			<view class="text good" v-if="item.evaluate === '好评'">好评</view>
 			<view class="text middle" v-if="item.evaluate === '中评'">中评</view>
@@ -21,14 +21,15 @@
 			<view class="score">{{item.score}}分</view>
 		</view>
 	</view>
+	<view v-if="dataList.length==0" class="no">暂无评价</view>
 </template>
 
 <script setup lang="ts">
 	defineProps({
 		//数据列表
-		dataList:{
-			type:Array,
-			default:()=>{
+		dataList: {
+			type: Array,
+			default: () => {
 				return [];
 			}
 		}
@@ -36,47 +37,51 @@
 </script>
 
 <style lang="scss" scoped>
-	.item-box{
+	.item-box {
 		background: #ffffff;
-		box-shadow: 0rpx 2rpx 6rpx 0rpx rgba(223,223,223,0.8);
+		box-shadow: 0rpx 2rpx 6rpx 0rpx rgba(223, 223, 223, 0.8);
 		border-radius: 20rpx;
 		margin-bottom: 30rpx;
-		.top{
+
+		.top {
 			min-height: 88rpx;
 			padding: 0rpx 30rpx;
 			border-bottom: 1rpx solid #DCDCDC;
-			image{
+
+			image {
 				width: 50rpx;
 				height: 50rpx;
 				background: #B2EEE1;
 				border-radius: 50%;
 			}
-			
-			text{
+
+			text {
 				margin-left: 20rpx;
 				font-size: 30rpx;
 				font-family: Noto Sans S Chinese;
 				font-weight: 400;
 				color: #333333;
 			}
-			.time{
+
+			.time {
 				font-size: 26rpx;
 				color: #333333;
 				text-align: right;
 			}
 		}
-		
-		.center{
+
+		.center {
 			padding: 28rpx 30rpx;
 			border-bottom: 1rpx solid #DCDCDC;
-			
-			.type{
+
+			.type {
 				font-size: 26rpx;
 				font-family: Noto Sans S Chinese;
 				font-weight: 400;
 				color: #999999;
 			}
-			.content{
+
+			.content {
 				ffont-size: 26rpx;
 				font-family: Noto Sans S Chinese;
 				font-weight: 400;
@@ -85,14 +90,15 @@
 				margin-top: 30rpx;
 			}
 		}
-		
-		.bottom{
+
+		.bottom {
 			padding: 15rpx 30rpx;
 			text-align: right;
 			display: flex;
 			justify-content: flex-end;
 			align-items: center;
-			.text{
+
+			.text {
 				width: 97rpx;
 				height: 36rpx;
 				line-height: 36rpx;
@@ -100,19 +106,23 @@
 				font-size: 26rpx;
 				text-align: center;
 			}
-			.good{
+
+			.good {
 				background: #FBD9D0;
 				color: #DD523E;
 			}
-			.middle{
+
+			.middle {
 				background: #FBECD0;
 				color: #FF9600;
 			}
-			.bad{
+
+			.bad {
 				background: #E1E1E1;
 				color: #999999;
 			}
-			.score{
+
+			.score {
 				font-size: 26rpx;
 				font-family: Noto Sans S Chinese;
 				font-weight: 400;
@@ -121,4 +131,8 @@
 			}
 		}
 	}
+
+	.no {
+		text-align: center;
+	}
 </style>

subpackage/personal-center/remind/evaluate-list.vue

@@ -116,6 +116,7 @@
 				"opId": getItem(StorageKeys.OpenId),
 				"pageNo": state.pageNo,
 				"pageSize": state.pageSize,
+				"loginSource": getItem("loginSource")
 			},
 			method: "POST",
 			showLoading: true,
@@ -147,7 +148,7 @@
 			} else {
 				state.dataList = []
 			}
-			console.log("stringToJson(res.bizContent)2", state.dataList)
+			console.log("stringToJson(res.bizContent)21", state.dataList)
 
 		})
 	};