Merge remote-tracking branch 'origin/master'

subpackage/orders/choice-product.vue

 
 			<view class="as-layout-horizontal">
 				<view v-for="(item, index) in state.radiolist1" :key="index" :label="item.disabled" :name="item.name"
-					@click="radioChange" style="width: 100%;display: flex;align-items: center;margin-bottom: 30rpx;">
+					@click="radioChange(item.name)" style="width: 100%;display: flex;align-items: center;margin-bottom: 30rpx;">
 					<view class="as-layout-vertical as-gravity-center">
 						<image style="width: 140rpx; height: 100rpx; border-radius: 20rpx;margin-right: 20rpx;"
 							:src="`${$imgUrl}card2.png`" mode="aspectFill"></image>
 		setItem("isValueCard", val.isValueCard);
 		state.isSign = val.isSign;
 		// 判断是几张卡
+		console.log("val.cardTypeArr.split(",")",val.cardTypeArr.split(","))
 		if (val.cardTypeArr.split(",").length == 1) {
 			if (val.cardTypeArr.split(",")[0] == "记账卡") {
 				state.isValueCard = 2

subpackage/orders/opening-account-people.vue

 		state.type=option.type;
 		//state.fromOrder = option.fromOrder //是否来自订单-修改资料
 		getGlobalParam(); //全局配置数据
+		console.log("option",option)
 	});
 	
 	//监听页面滚动