diff --git a/antis-app-siberian/components/yz-audio/index.scss b/antis-app-siberian/components/yz-audio/index.scss
index 89be3db..598d377 100644
--- a/antis-app-siberian/components/yz-audio/index.scss
+++ b/antis-app-siberian/components/yz-audio/index.scss
@@ -17,8 +17,10 @@
 	}
 }
 .imt-audio{
-	background: #ccc;
+	// background: #f2e2ac;
+	
 	width: 100%;
+	margin-top: -90rpx;
 	overflow: hidden;
 	display: flex;
 	box-sizing: border-box;
@@ -37,11 +39,11 @@
 
 		.titlebox {
 			display: flex;
-			line-height: 100rpx;
+			line-height: 138rpx;
 			margin-bottom: 10rpx;
 			.title {
 				font-size: 30rpx;
-				max-width: 60%;
+				max-width: 100%;
 				@include textoverflow;
 			}
 
@@ -69,10 +71,10 @@
 	}
 	.audio-slider {
 		padding-top: 10rpx;
-		margin-left: 150rpx;
+		// margin-left: 150rpx;
 		position: absolute;
 		bottom: 40rpx;		
-		width: 75vw;
+		width: 90vw;
 		left: 0;
 		padding: 0;
 	}
diff --git a/antis-app-siberian/components/yz-audio/yz-audio.vue b/antis-app-siberian/components/yz-audio/yz-audio.vue
index 33c3f35..ce0857d 100644
--- a/antis-app-siberian/components/yz-audio/yz-audio.vue
+++ b/antis-app-siberian/components/yz-audio/yz-audio.vue
@@ -1,7 +1,7 @@
 <template>
-	<view class="imt-audio" >
+	<view class="imt-audio">
 		<template>
-			<view class="top">
+			<!-- <view class="top">
 				<view class="audio-control-wrapper">
 					<image :src="poster" mode="aspectFill" class="cover"></image>					
 					<image :src="require('./static/loading.png')" v-if="playState=='loading'" class="play loading"></image>
@@ -10,30 +10,41 @@
 						<image :src="require('./static/pausebtn.png')" alt="pause" @click="pause" class="play" v-else></image>
 					</template>
 				</view>
-			</view>
+			</view> -->
+
 			<view class="audio-wrapper">
 				<view class="titlebox">
-					<view class="title">{{name}}</view>
-					<view class="singer">{{singer}}</view>
-				</view>
-				<view class="slidebox">
-					<view>{{formatSeconds(currentTime)}}/{{formatSeconds(duration)}}</view>					
-					<view>
-						<slot name="extraCtrls">
-							<text class="hItem extrButton" @click="$emit('Button1Click')" v-show="isButton1Visible">{{button1Text}}</text>
-							<text class="hItem extrButton"  @click="$emit('Button2Click')" v-show="isButton2Visible">{{button2Text}}</text>
-							<text class="hItem extrButton"  @click="$emit('Button3Click')" v-show="isButton3Visible">{{button3Text}}</text>									
-						</slot>
+					<!-- <view class="title" style="margin-bottom: 20rpx;">{{name}}</view>
+					<view class="singer">{{singer}}</view> -->
+					<view
+						style="font-weight: bold;font-size: 45rpx;margin: 0 auto;padding-bottom: 30rpx;display: flex;align-items: center;justify-content: center;">
+						<view style="color:#FC5F52;">{{formatSeconds(currentTime)}}</view>
+						<view style="margin-left: 10rpx;margin-right: 10rpx;color:black;">/</view>
+							<view style="color:black">{{formatSeconds(duration)}}</view>
+						</view>
 					</view>
-				</view>			
-			</view>
-			<!--video在ios中不能完全隐藏，否则无法播放-->
-			<video id="videoPlayer" :src="src" autoplay="true" :muted="false"
-			    style="width: 10rpx;height:10rpx;" @play="playerOnPlay" @pause="playerOnPause"
-				@ended="playerOnEnded" @timeupdate="playerOnTimeupdate" 
-				@waiting="playerOnWaiting" @error="playerOnError"></video>
-			<slider class="audio-slider" block-size="12" :max="duration" :value="currentTime"
-			 @change="sliderChange" @changing="sliderChanging"></slider>
+					<view class="slidebox">
+						<!-- <view>{{formatSeconds(currentTime)}}/{{formatSeconds(duration)}}</view> -->
+						<view>
+							<slot name="extraCtrls">
+								<text class="hItem extrButton" @click="$emit('Button1Click')"
+									v-show="isButton1Visible">{{button1Text}}</text>
+								<text class="hItem extrButton" @click="$emit('Button2Click')"
+									v-show="isButton2Visible">{{button2Text}}</text>
+								<text class="hItem extrButton" @click="$emit('Button3Click')"
+									v-show="isButton3Visible">{{button3Text}}</text>
+							</slot>
+						</view>
+					</view>
+				</view>
+
+				<!--video在ios中不能完全隐藏，否则无法播放-->
+				<video id="videoPlayer" :src="src" :autoplay="false" :muted="false" style="width: 10rpx;height:10rpx;"
+					@play="playerOnPlay" @pause="playerOnPause" @ended="playerOnEnded" @timeupdate="playerOnTimeupdate"
+					@waiting="playerOnWaiting" @error="playerOnError"></video>
+				<slider class="audio-slider" block-size="12" :max="duration" :value="currentTime" @change="sliderChange"
+					@changing="sliderChanging"></slider>
+
 		</template>
 	</view>
 </template>
@@ -45,7 +56,7 @@
 	因此这里只能用video来实现，video能倍速播放，不能熄屏播放、不能后台播放。而且避免了用createInnerAudioContext()实现的跳转到别的页面，还在播放的问题
 	因此应用程序可以在需要后台播放的时候（需要用户操作触发），再暂停这个控件的播放，然后自己用getBackgroundAudioManager实现后台播放
 	*/
-	
+
 	import Vue from 'vue';
 	export default {
 		props: {
@@ -73,124 +84,119 @@
 				type: String,
 				default: ''
 			},
-		},		
+		},
 		data() {
 			return {
-				src:"",
-				poster:"",
-				name:"...",
-				singer:"...",
-				duration:0,
-				currentTime:0,
-				playState:"pause",//"loading"/"playing"/"pause"
-				isSliderChanging:false,
+				src: "",
+				poster: "",
+				name: "...",
+				singer: "...",
+				duration: 0,
+				currentTime: 0,
+				playState: "pause", //"loading"/"playing"/"pause"
+				isSliderChanging: false,
+				time: 0,
+				videoCtx: undefined
 			};
 		},
-		created:function(){		
+		created() {
 			//自定义组件，需要传递第二个参数为this，否则后续的pause等操作不起作用
-			this.videoCtx = uni.createVideoContext("videoPlayer",this);
-		}
-		,
-		methods:{
-			setSrc:function(value)
-			{
+			this.videoCtx = uni.createVideoContext("videoPlayer", this);
+		},
+
+		methods: {
+			setSrc: function(value) {
 				this.src = value;
 			},
-			setPoster:function(value)
-			{
+			setPoster: function(value) {
 				this.poster = value;
 			},
-			setName:function(value)
-			{
+			setName: function(value) {
 				this.name = value;
 			},
-			setSinger:function(value)
-			{
+			setSinger: function(value) {
 				this.singer = value;
 			},
-			playerOnPlay:function(e)
-			{
-			  this.playState="playing";
-			  this.$emit("play");
+			playerOnPlay: function(e) {
+				this.playState = "playing";
+				this.$emit("play");
 			},
-			playerOnPause:function(e)
-			{
-				this.playState="pause";
+			playerOnPause: function(e) {
+				this.playState = "pause";
 				this.$emit("pause");
 			},
-			playerOnEnded:function(e)
-			{	
-				this.playState="pause";
+			playerOnEnded: function(e) {
+				this.playState = "pause";
 				this.$emit("ended");
 			},
-			playerOnTimeupdate:function(e)
-			{
-				this.playState="playing";
+			playerOnTimeupdate: function(e) {
+				this.playState = "playing";
 				this.duration = e.detail.duration;
 				this.currentTime = e.detail.currentTime;
-				this.$emit("timeUpdate",e.detail);
+				this.$emit("timeUpdate", e.detail);
 			},
-			playerOnWaiting:function(e)
-			{
-				this.playState="loading";
+			playerOnWaiting: function(e) {
+				this.playState = "loading";
 			},
-			playerOnError:function(e)
-			{
+			playerOnError: function(e) {
+				console.log('音频爆发错误', e)
 				uni.showToast({
-					title:"播放出错"+e
-				});	
-				this.playState="pause";
-				this.$emit("error",e);				
+					title: "播放出错" + e
+				});
+				this.playState = "pause";
+				this.$emit("error", e);
 			},
-			formatSeconds:function(seconds){
+			formatSeconds: function(seconds) {
 				var result = typeof seconds === "string" ? parseFloat(seconds) : seconds;
 				if (isNaN(result))
 					return "";
-				let h = Math.floor(result / 3600) < 10
-					? "0" + Math.floor(result / 3600)
-					: Math.floor(result / 3600);
-				let m = Math.floor((result / 60) % 60) < 10
-					? "0" + Math.floor((result / 60) % 60)
-					: Math.floor((result / 60) % 60) + h * 60;
-				let s = Math.floor(result % 60) < 10
-					? "0" + Math.floor(result % 60)
-					: Math.floor(result % 60);
-				return `${m}:${s}`;				
-			},
-			stop:function()
-			{
+				let h = Math.floor(result / 3600) < 10 ?
+					"0" + Math.floor(result / 3600) :
+					Math.floor(result / 3600);
+				let m = Math.floor((result / 60) % 60) < 10 ?
+					"0" + Math.floor((result / 60) % 60) :
+					Math.floor((result / 60) % 60) + h * 60;
+				let s = Math.floor(result % 60) < 10 ?
+					"0" + Math.floor(result % 60) :
+					Math.floor(result % 60);
+				return `${m}:${s}`;
+			},
+			stop: function() {
 				this.videoCtx.stop();
-			}
-			,
-			seek:function(t){
+			},
+			seek: function(t) {
+				console.log('这是seek', this.time)
 				this.videoCtx.seek(t);
 			},
-			play:function(){
+			play: function() {
 				var that = this;
-				this.videoCtx.play();//在有的H5浏览器里，如果play不是用户触发的，则play()会报错
-
+				this.videoCtx.play(); //在有的H5浏览器里，如果play不是用户触发的，则play()会报错
 			},
-			pause:function(){
+			pause: function() {
 				this.videoCtx.pause();
 			},
-			playbackRate:function(value){
+			playbackRate: function(value) {
+				// this.$nextTick(()=>{
 				this.videoCtx.playbackRate(value);
 				//playbackRate不能在play之前或者之后立即调用，否则只有很少几率会成功
+				// })
+				// this.$forceUpdate()
 			},
-			sliderChange:function(e){
+			sliderChange: function(e) {
 				this.isSliderChanging = false;
+				this.time = e.detail.value
+				console.log('滚动条的时间', this.time)
 				//要通过e.detail.value获取，否则如果通过dom去读取slider的value
 				//就会存在滚动条拖不动的情况
 				this.videoCtx.seek(e.detail.value);
 			},
-			sliderChanging:function()
-			{
+			sliderChanging: function() {
 				this.isSliderChanging = true;
-			},	
+			},
 		},
 	}
 </script>
 
 <style lang="scss">
-@import './index.scss';    
+	@import './index.scss';
 </style>
diff --git a/antis-app-siberian/package.json b/antis-app-siberian/package.json
index cd40522..24cdcbd 100644
--- a/antis-app-siberian/package.json
+++ b/antis-app-siberian/package.json
@@ -7,4 +7,4 @@
         "音频播放器",
         "变速"
     ]
-}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/pages.json b/antis-app-siberian/pages.json
index c043352..ff269d3 100644
--- a/antis-app-siberian/pages.json
+++ b/antis-app-siberian/pages.json
@@ -1,5 +1,15 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+
+
+
+
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "首页"
+			}
+		},
 		{
 			"path": "pages/video/index",
 			"style": {
@@ -7,11 +17,23 @@
 			}
 		},
 		{
-			"path": "pages/index/index",
+			"path": "pages/CDKEY/index",
 			"style": {
-				"navigationBarTitleText": "首页"
+				"navigationBarTitleText": "模考兑换码"
 			}
 		},
+		
+
+		
+
+
+
+
+
+
+
+
+
 		{
 			"path": "pages/payResult/index",
 			"style": {
@@ -24,7 +46,7 @@
 				"navigationBarTitleText": "登录"
 			}
 		},
-		
+
 		{
 			"path": "pages/Report/result",
 			"style": {
@@ -86,14 +108,14 @@
 				"navigationBarTitleText": "专属二维码"
 			}
 		},
-		
+
 		{
 			"path": "pages/Report/index",
 			"style": {
 				"navigationBarTitleText": "在线报备"
 			}
 		},
-		
+
 		{
 			"path": "pages/my/info",
 			"style": {
@@ -204,7 +226,7 @@
 		"list": [{
 			"text": "首页",
 			"selectedIconPath": "static/tab/yesindex.png",
-			"pagePath":"pages/index/index",
+			"pagePath": "pages/index/index",
 			"iconPath": "static/tab/noindex.png"
 		}, {
 			"text": "资料",
diff --git a/antis-app-siberian/pages/CDKEY/index.vue b/antis-app-siberian/pages/CDKEY/index.vue
new file mode 100644
index 0000000..cf8f2ad
--- /dev/null
+++ b/antis-app-siberian/pages/CDKEY/index.vue
@@ -0,0 +1,160 @@
+<template>
+	<view class="container" style="width: 100%;height: 100%;">
+		<image :src="model.isDefault=='1'?'../../static/mkBg.png':BASE_URL+model.banner[0].url" mode="scaleToFill"
+			class="background"></image>
+		<view style="position: absolute;bottom: 100rpx;left: 150rpx;">
+			<view
+				style="border: 2px solid pink;min-width:400rpx;height: 50rpx;padding: 15rpx;border-radius: 20rpx;margin-bottom: 30rpx;">
+				<input placeholder="请输入姓名" style="width: 100%;height: 100%;" placeholder-style="color:pink;"
+					v-model="form.name" />
+			</view>
+			<view
+				style="border: 2px solid pink;min-width:400rpx;height: 50rpx;padding: 15rpx;border-radius: 20rpx;margin-bottom: 30rpx;">
+				<input placeholder="请输入Email地址" style="width: 100%;height: 100%;" placeholder-style="color:pink;"
+					v-model="form.email" />
+			</view>
+			<view
+				style="border: 2px solid pink;min-width:400rpx;height: 50rpx;padding: 15rpx;border-radius: 20rpx;margin-bottom: 30rpx;">
+				<input placeholder="请输入手机号码" style="width: 100%;height: 100%;" placeholder-style="color:pink;"
+					v-model="form.phone" />
+			</view>
+			<view style="text-align: center;">
+				<view
+					style="border: 2px solid pink;padding: 20rpx;border-radius: 20rpx;color:white;font-weight: bold;background-color: pink;"
+					@click="Confirm">立即兑换</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import BASE_URL from '../../common/config.js'
+	import service from '../../service/service.js'
+	export default {
+		onShareAppMessage(res) {
+			// let data = res.target.dataset.item;
+			if (res.from === 'button') { // 来自页面内分享按钮
+				console.log(res.target)
+			}
+			// let datas={
+			// 	avt:this.activity.avt,
+			// 	type:1
+			// }
+			let datas = 'avt=' + this.activity.avt.toString() + '&type=' + 1
+			let scene = encodeURIComponent(JSON.stringify(datas))
+			console.log('点击分享得信息' + scene)
+			return {
+				title: `朗思官方模考领取`, //分享的名称
+				path: `/pages/login/index?scene=${scene}`,
+				mpId: 'wx94f3d523457fc388', //此处配置微信小程序的AppId
+				imageUrl: 'https://ls.lcwuhan.com/api/File/Image/annexpic/mkbanner.png'
+			}
+		},
+		data() {
+			return {
+				BASE_URL,
+				model: undefined,
+				form: {
+					"email": "",
+					"phone": "",
+					"userId": "",
+					"activityId": "",
+					"name":""
+				},
+				activity: {
+					avt: '',
+					type: 1
+				}
+			}
+		},
+		onLoad() {
+			this.GetInfo()
+		},
+		methods: {
+			GetInfo() {
+				this.activity.avt = uni.getStorageSync('activity')
+				this.API.GetActivityInfo(this.activity.avt).then(res => {
+					if (res.code == 200) {
+						this.model = res.data
+						console.log('这是获取的信息', this.model)
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+				})
+			},
+			Checked() {
+				let bl = true
+				if (this.form.name == '') {
+					uni.showToast({
+						title: '请输入姓名',
+						icon: 'none'
+					})
+					bl = false
+				} else
+				if (this.form.email == '') {
+					uni.showToast({
+						title: '请输入Email',
+						icon: 'none'
+					})
+					bl = false
+				} else if (this.form.phone == '') {
+					uni.showToast({
+						title: '请输入手机号',
+						icon: 'none'
+					})
+					bl = false
+				} else if (/^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/.test(this.form.email) == false) {
+					uni.showToast({
+						title: '请输入正确的Email格式',
+						icon: 'none'
+					})
+					bl = false
+				} else if (/^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/.test(this.form
+						.phone) == false) {
+					uni.showToast({
+						title: '请输入正确的手机号格式',
+						icon: 'none'
+					})
+					bl = false
+				}
+				return bl
+			},
+			// 立即兑换
+			Confirm() {
+				if (this.Checked()) {
+					this.form.userId = service.getUser().id
+					this.form.activityId = this.activity.avt
+					this.API.ConfirmConversion(this.form).then(res => {
+						console.log('这是兑换的参数', res)
+						if (res.code == 200) {
+							uni.showToast({
+								title: '兑换成功',
+								icon: 'success'
+							})
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none'
+							})
+						}
+					})
+				}
+
+			}
+		}
+	}
+</script>
+
+<style>
+	/* 背景图片 */
+	.background {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		background-size: 100% 100%;
+		z-index: -1;
+	}
+</style>
diff --git a/antis-app-siberian/pages/InvitedOrder/index.vue b/antis-app-siberian/pages/InvitedOrder/index.vue
index b7cbab7..f5d9c0c 100644
--- a/antis-app-siberian/pages/InvitedOrder/index.vue
+++ b/antis-app-siberian/pages/InvitedOrder/index.vue
@@ -49,7 +49,7 @@
 	                    </view>
 	                    <view>
 	                        <text style="color:gray;font-size:23rpx;">合计</text>
-	                        <text style="color:red;">{{'￥'+item.totalMoney}}</text>
+	                        <text style="color:red;">{{'￥'+item.totalMoneys}}</text>
 	                    </view>
 	                </view>
 	            </view>
diff --git a/antis-app-siberian/pages/Report/index.vue b/antis-app-siberian/pages/Report/index.vue
index 86feb77..0241f9d 100644
--- a/antis-app-siberian/pages/Report/index.vue
+++ b/antis-app-siberian/pages/Report/index.vue
@@ -349,6 +349,7 @@
 				that.model.topCard=[]
 					uni.chooseImage({
 						count:1,
+						sourceType:['album','camera'],
 						success(res) {
 							console.log('这是成功',res)
 							uni.uploadFile({
@@ -366,7 +367,7 @@
 									let info=JSON.parse(e.data)
 									let file={
 										"name": info.data.name,
-										"fileId": res.tempFilePaths[0],
+										"fileId": info.data.name,
 										"url": info.data.url
 									}
 									that.model.topCard.push(file)
@@ -411,7 +412,7 @@
 									let info=JSON.parse(e.data)
 									let file={
 										"name": info.data.name,
-										"fileId": res.tempFilePaths[0],
+										"fileId": info.data.name,
 										"url": info.data.url
 									}
 									that.model.bottomCard.push(file)
diff --git a/antis-app-siberian/pages/Report/newIndex.vue b/antis-app-siberian/pages/Report/newIndex.vue
index 89faeb5..8db79ae 100644
--- a/antis-app-siberian/pages/Report/newIndex.vue
+++ b/antis-app-siberian/pages/Report/newIndex.vue
@@ -215,6 +215,7 @@
 				that.form.orderImg=[]
 					uni.chooseImage({
 						count:1,
+						sourceType:['album','camera'],
 						success(res) {
 							console.log('这是成功',res)
 							uni.uploadFile({
diff --git a/antis-app-siberian/pages/comfirmorder/index.vue b/antis-app-siberian/pages/comfirmorder/index.vue
index c7c5578..e5bd4b6 100644
--- a/antis-app-siberian/pages/comfirmorder/index.vue
+++ b/antis-app-siberian/pages/comfirmorder/index.vue
@@ -139,6 +139,11 @@
 						v-model="form.orderinfo.email"></input>
 				</view>
 			</view>
+			<view style="padding:20rpx;color:red;font-size: 25rpx;" >
+				请注意，下单后将会及时发送考试兑换Voucher
+				我们遵循统一的退款政策：购买Voucher后14自然日内，同时距离考试时间开始大于48小时可以联系客服提出退款申请。
+				退款有可能会收取一定的行政费用，详情请参见退款政策。
+			</view>
 		</view>
 		<view
 			style="position:fixed;bottom:0;background-color:white;width:100%;height:120rpx;box-shadow:0px -10px 20px -5px #e0e0e0;">
@@ -294,14 +299,7 @@
 						icon: 'none'
 					})
 					bl = false
-				} else if (!(/^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/
-						.test(this.form.orderinfo.email))) {
-					uni.showToast({
-						title: '请输入正确得邮箱格式',
-						icon: 'none'
-					})
-					bl = false
-				} else if (!this.form.orderinfo.email) {
+				}  else if (!this.form.orderinfo.email) {
 					uni.showToast({
 						title: '请输入邮箱',
 						icon: 'none'
@@ -320,6 +318,7 @@
 			},
 			// 提交支付
 			Confirm() {
+				console.log('Ceshi')
 				let that = this;
 				uni.requestSubscribeMessage({
 					tmplIds: ['kRVg7meiHm-R1EMxtXDepwT_4cb0YXMpJfAdae9qH5k'],
@@ -338,6 +337,9 @@
 								icon: 'none'
 							})
 						}
+					},
+					fail(error){
+						console.log('信息',error)
 					}
 				})
 			},
diff --git a/antis-app-siberian/pages/index/index.vue b/antis-app-siberian/pages/index/index.vue
index f3296f2..2c100e9 100644
--- a/antis-app-siberian/pages/index/index.vue
+++ b/antis-app-siberian/pages/index/index.vue
@@ -2,11 +2,11 @@
 	<view class="container">
 		<view>
 			<view style="position:relative;top:0px;">
-				<image src="../../static/newimage.png" style="height:780rpx;width:100%;z-index:-1;"></image>
+				<image src="../../static/banner.png" style="height:780rpx;width:100%;z-index:-1;"></image>
 			</view>
 			<view style="position:absolute;top:530rpx;left:30rpx;color:white;font-weight:bold;">
 				<view style="font-size:50rpx;margin-left:-30rpx;letter-spacing:10rpx;">【朗思测评考试中心】</view>
-				<view style="letter-spacing:5rpx;margin-top:10rpx;">郎思官方报名中心|郎思官方SELT考试中心</view>
+				<view style="letter-spacing:5rpx;margin-top:10rpx;">朗思官方报名中心|朗思官方SELT考试中心</view>
 				<view style="letter-spacing:5rpx;margin-top:5rpx;">广受考试好评考试中心</view>
 			</view>
 		</view>
@@ -14,15 +14,15 @@
 			style="border-top-left-radius:40rpx;border-top-right-radius:40rpx;z-index:1;min-height:600rpx;width:100%;background-color:white;position:absolute;top:735rpx;">
 			<view style="width:100%;">
 				<view style="text-align:center;margin-top:30rpx;">
-					<image @click="RedirectMean"
-						src="../../static/apply.png" style="width:90%;height:200rpx;border-radius:20rpx;"></image>
+					<image @click="RedirectMean" src="../../static/apply.png"
+						style="width:90%;height:200rpx;border-radius:20rpx;"></image>
 				</view>
 				<view
 					style="display:flex;align-items:center;justify-content:space-around;flex-wrap:wrap;margin-top:20rpx;">
 					<view>
 						<view style="position:relative;top:0px;">
-							<image @click="RedirectSchool"
-								src="../../static/school.png" style="width:300rpx;height:150rpx;border-radius:20rpx;">
+							<image @click="RedirectSchool" src="../../static/school.png"
+								style="width:300rpx;height:150rpx;border-radius:20rpx;">
 							</image>
 							<view style="position:absolute;top:40rpx;left:20rpx;font-weight:bold;color:white;">认可院校
 							</view>
@@ -30,8 +30,8 @@
 					</view>
 					<view>
 						<view style="position:relative;top:0px;">
-							<image @click="RedirectZL"
-								src="../../static/zl.png" style="width:300rpx;height:150rpx;border-radius:20rpx;">
+							<image @click="RedirectZL" src="../../static/zl.png"
+								style="width:300rpx;height:150rpx;border-radius:20rpx;">
 							</image>
 							<view style="position:absolute;top:40rpx;left:20rpx;font-weight:bold;color:white;">备考资料
 							</view>
@@ -39,8 +39,8 @@
 					</view>
 					<view style="margin-top:20rpx;">
 						<view style="position:relative;top:0px;">
-							<image @click="RedirectZSKD"
-								src="../../static/zs.png" style="width:300rpx;height:150rpx;border-radius:20rpx;">
+							<image @click="RedirectZSKD" src="../../static/zs.png"
+								style="width:300rpx;height:150rpx;border-radius:20rpx;">
 							</image>
 							<view style="position:absolute;top:40rpx;left:20rpx;font-weight:bold;color:white;">证件报备
 							</view>
@@ -69,36 +69,49 @@
 
 <script>
 	import BASE_URL from '../../common/config.js'
-	export default{
-		data(){
-			return{
+	export default {
+		onShareAppMessage(res) {
+			if (res.from === 'button') { // 来自页面内分享按钮
+				console.log(res.target)
+			}
+			return {
+				title: '朗思测评官方报名小程序',
+				path: '/pages/login/index',
+				imageUrl: this.BASE_URL + '/api/File/Image/annexpic/20221222_375601989435786501.png'
+			}
+		},
+		data() {
+			return {
 				BASE_URL,
 			}
 		},
 		onLoad() {
-			
+
 		},
-		methods:{
-				RedirectMean(){
-					uni.switchTab({
-						url:'/pages/means/index'
-					})
-				},
-				RedirectSchool(){
-					uni.navigateTo({
-						url:'/pages/school/index'
-					})
-				},
-				RedirectZL(){
-					uni.navigateTo({
-						url:'/pages/index/bkzl'
-					})
-				},
-				RedirectZSKD(){
-					uni.navigateTo({
-						url:'zskd'
-					})
-				}
+		methods: {
+			RedirectMean() {
+				uni.switchTab({
+					url: '/pages/means/index'
+				})
+			},
+			RedirectSchool() {
+				uni.navigateTo({
+					url: '/pages/school/index'
+				})
+				// uni.navigateTo({
+				// 	url:'/pages/CDKEY/index'
+				// })
+			},
+			RedirectZL() {
+				uni.navigateTo({
+					url: '/pages/index/bkzl'
+				})
+			},
+			RedirectZSKD() {
+				uni.navigateTo({
+					url: '/pages/Report/index'
+				})
+			}
 		}
 	}
 </script>
diff --git a/antis-app-siberian/pages/login/index.vue b/antis-app-siberian/pages/login/index.vue
index fd9d1af..a57e00f 100644
--- a/antis-app-siberian/pages/login/index.vue
+++ b/antis-app-siberian/pages/login/index.vue
@@ -4,8 +4,8 @@
 			<view>
 				<view>
 					<view class="header" style="width: 100%;text-align: center;margin-top: 80rpx;margin-bottom: 20rpx;">
-						<image :src="BASE_URL+'/api/File/Image/annexpic/wx_login.png'" mode="aspectFit"
-							style="width: 250rpx;height: 250rpx;"></image>
+						<image :src="BASE_URL+'/api/File/Image/annexpic/logo.png'" mode="aspectFit"
+							style="width: 350rpx;height: 350rpx;"></image>
 					</view>
 					<view class="content"
 						style="font-size: 30rpx;border-top: 2px solid #e0e0e0;padding-top: 50rpx;margin-bottom: 20rpx;">
@@ -19,7 +19,7 @@
 			<view class="agreement" style="font-size: 25rpx;display: flex;align-items: center;margin-top: 20rpx;">
 				<view class="protocolIcon">
 					<checkbox-group @change="checkboxGroupChange">
-						<checkbox checked="false" style="transform:scale(0.6);" value="1"></checkbox>
+						<checkbox :checked="false" style="transform:scale(0.6);" value="1"></checkbox>
 					</checkbox-group>
 				</view>
 				<view class="writtenWords">我已阅读并同意<label @click="RedirectAgreement"
@@ -46,68 +46,144 @@
 				form: {
 					"invitedUserId": "",
 					"userId": ""
-				}
+				},
+				chekced: false,
+				// 1--跳转模考兑换码  2--正常跳转
+				type:2
 			}
 		},
 		onLoad(data) {
+			// avt={entity.Id}&type=1
 			console.log('跳转接收', data)
-			this.form.invitedUserId=data.scene
+			let urlDecode=decodeURIComponent(data.scene)
+			console.log('解码后的数据',urlDecode)
+			// uni.showModal({
+			// 	title:'提示',
+			// 	content:urlDecode,
+			// 	success() {
+					
+			// 	}
+			// })
+			if(urlDecode.includes('avt')){
+				// 模考兑换
+				// let info=
+				this.type=1
+				let activity=(urlDecode.split('&')[0]).split('=')[1]
+				console.log('这是activity',activity)
+				uni.setStorageSync('activity',activity)
+				// uni.showModal({
+				// 	title:'activity',
+				// 	content:activity,
+				// 	success() {
+						
+				// 	}
+				// })
+				// uni.showModal({
+				// 	title:'type',
+				// 	content:this.type,
+				// 	success() {
+						
+				// 	}
+				// })
+				
+			}else{
+					// uni.showModal({
+					// 	title:'提示啊',
+					// content:'进入绑定关系',
+					// success() {
+						
+					// }
+					// })
+				// 绑定关系
+				this.form.invitedUserId=data.scene
+				console.log('这是绑定关系',this.form.invitedUserId)
+			}
+			// this.type=data.scene.type
+			// console.log('接收参数',data.scene)
+			// if(this.type==1){
+			// 	uni.setStorageSync('activity',data.scene)
+			// 	console.log('存入缓存',data.scene)
+			// }else{
+			// 	console.log('参数不为1')
+			// 	this.form.invitedUserId = data.scene
+			// }
 		},
 		methods: {
-			Binding(userid){
-				this.form.userId=userid
-				this.API.BindingUser(this.form).then(res=>{
-					console.log('这是绑定信息',res)
+			checkboxGroupChange(e) {
+				console.log('操作', e)
+				this.chekced = e.detail.value.length > 0 ? true : false
+			},
+			Binding(userid) {
+				this.form.userId = userid
+				this.API.BindingUser(this.form).then(res => {
+					console.log('这是绑定信息', res)
 				})
 			},
 			// 微信登录
 			WxLogin() {
-				let that = this
-				uni.getUserProfile({
-					provider: 'weixin',
-					desc: '授权登录',
-					lang: 'zh_CN',
-					success(res) {
-						console.log('这是信息', res)
-						that.model.nickName = res.userInfo.nickName
-						that.model.HeadIcon = res.userInfo.avatarUrl
-						uni.login({
-							provider: 'weixin',
-							success(e) {
-								console.log('这是获取的信息', e)
-								that.model.code = e.code
-								console.log('所欲参数', that.model)
-								that.API.AppleteLogin(that.model).then(res => {
-									console.log('请求数据', res)
-									if (res.code == 200) {
-										console.log('信息绑定是否',that.form.invitedUserId)
-										if(that.form.invitedUserId){
-											that.Binding(res.data.user.id)
-										}
-										service.addToken(res.data.token)
-										service.saveUser(res.data.user)
-										uni.showToast({
-											title: '登录成功',
-											icon: 'success'
-										})
-										setTimeout(() => {
-											uni.reLaunch({
-												url: '/pages/index/index'
+				if (this.chekced == false) {
+					uni.showToast({
+						title: '请同意协议后登录',
+						icon: 'none'
+					})
+				} else {
+					let that = this
+					uni.getUserProfile({
+						provider: 'weixin',
+						desc: '授权登录',
+						lang: 'zh_CN',
+						success(res) {
+							console.log('这是信息', res)
+							that.model.nickName = res.userInfo.nickName
+							that.model.HeadIcon = res.userInfo.avatarUrl
+							uni.login({
+								provider: 'weixin',
+								success(e) {
+									console.log('这是获取的信息', e)
+									that.model.code = e.code
+									console.log('所欲参数', that.model)
+									that.API.AppleteLogin(that.model).then(res => {
+										console.log('请求数据', res)
+										if (res.code == 200) {
+											console.log('信息绑定是否', that.form.invitedUserId)
+											if (that.form.invitedUserId) {
+												that.Binding(res.data.user.id)
+											}
+											service.addToken(res.data.token)
+											service.saveUser(res.data.user)
+											uni.showToast({
+												title: '登录成功',
+												icon: 'success'
 											})
-										}, 1000)
-
-									} else {
-										uni.showToast({
-											title: '登录失败',
-											icon: 'none'
-										})
-									}
-								})
-							}
-						})
-					}
-				})
+											if(that.type==1){
+												// 跳转模考兑换页面
+												setTimeout(() => {
+													uni.reLaunch({
+														url: '/pages/CDKEY/index'
+													})
+												}, 1000)
+											}else{
+												// 正常跳转
+												setTimeout(() => {
+													uni.reLaunch({
+														url: '/pages/index/index'
+													})
+												}, 1000)
+											}
+											
 
+										} else {
+											uni.showToast({
+												title: '登录失败',
+												icon: 'none'
+											})
+										}
+									})
+								}
+							})
+						}
+					})
+				}
 			},
 			RedirectAgreement() {
 				uni.navigateTo({
diff --git a/antis-app-siberian/pages/means/index.vue b/antis-app-siberian/pages/means/index.vue
index 1acae98..cb1550f 100644
--- a/antis-app-siberian/pages/means/index.vue
+++ b/antis-app-siberian/pages/means/index.vue
@@ -36,30 +36,22 @@
 			<scroll-view class="scroll-Y" :scrollTop="scrollTop" scrollY="true" showScrollbar="true">
 				<view style="height:90vh;background-color:#F7F7F7;">
 					<view style="display:flex;flex-wrap:wrap;width:100%;">
-						<view
-							style="width:100%;display:flex;align-items:center;justify-content:center;flex-direction:column;"
-							v-if="list.length==0">
-							<image mode="aspectFit" :src="BASE_URL+'/api/File/Image/annexpic/nullImg.png'"
-								style="width:400rpx;height:400rpx;"></image>
+						<view style="width:100%;display:flex;align-items:center;justify-content:center;flex-direction:column;" v-if="list.length==0">
+							<image mode="aspectFit" :src="BASE_URL+'/api/File/Image/annexpic/nullImg.png'" style="width:400rpx;height:400rpx;"></image>
 							<text style="color:gray;font-size:30rpx;">暂无数据</text>
 						</view>
 						<block v-else>
-							<view @click="RedirectMeansDetail(item)"
-								style="width:44%;margin:5px;background-color:white;box-shadow:0 0 1em 0em #CDC7C7;padding:10rpx;border-radius:10px;"
-								v-for="(item,index) in list" :key="index">
+							<view @click="RedirectMeansDetail(item)" style="width:44%;margin:5px;background-color:white;box-shadow:0 0 1em 0em #CDC7C7;padding:10rpx;border-radius:10px;" v-for="(item,index) in list" :key="index">
 								<view>
-									<image :src="BASE_URL+item.banner[0].url"
-										style="width:100%;height:315rpx;border-top-left-radius:10px;border-top-right-radius:10px;">
+									<image :src="BASE_URL+item.banner[0].url" 	style="width:100%;height:315rpx;border-top-left-radius:10px;border-top-right-radius:10px;">
 									</image>
 								</view>
 								<view style="font-size:25rpx;">{{item.title}}</view>
-								<view
-									style="display:flex;align-items:center;justify-content:space-between;margin-top:5px;">
+								<view 	style="display:flex;align-items:center;justify-content:space-between;margin-top:5px;">
 									<view style="font-weight:bold;font-size:32rpx;color:red;">{{'￥'+item.startMoneys}}
 									</view>
 									<view>
-										<image :src="BASE_URL+'/api/File/Image/annexpic/shop.png'"
-											style="width:50rpx;height:50rpx;"></image>
+										<image :src="BASE_URL+'/api/File/Image/annexpic/shop.png'" style="width:50rpx;height:50rpx;"></image>
 									</view>
 								</view>
 							</view>
diff --git a/antis-app-siberian/pages/my/code.vue b/antis-app-siberian/pages/my/code.vue
index e313d02..55362e3 100644
--- a/antis-app-siberian/pages/my/code.vue
+++ b/antis-app-siberian/pages/my/code.vue
@@ -29,7 +29,7 @@
 				console.log(res.target)
 			}
 			return {
-				title: '朗思教育小程序',
+				title: '朗思测评官方报名小程序',
 				path: '/pages/login/index?scene=' + service.getUser().id,
 				imageUrl: this.BASE_URL + '/api/File/Image/annexpic/20221222_375601989435786501.png'
 			}
diff --git a/antis-app-siberian/pages/my/info.vue b/antis-app-siberian/pages/my/info.vue
index ecf4009..6fa9cae 100644
--- a/antis-app-siberian/pages/my/info.vue
+++ b/antis-app-siberian/pages/my/info.vue
@@ -1,14 +1,28 @@
 <template>
 	<view class="container" style="padding:20rpx;">
 		<view style="font-size:25rpx;">
+
+			<view
+				style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;">
+				<view>头像:</view>
+				<view>
+					<button type="balanced" open-type="chooseAvatar" @chooseavatar="onChooseavatar">
+						<image :src="model.headIcon" mode="aspectFit" class="refreshIcon"
+							style="width: 100rpx;height: 100rpx;border-radius: 50rpx;"></image>
+					</button>
+					<!-- <input placeholder="请输入用户名" style="text-align:right;" type="text" v-model="model.realName"></input> -->
+				</view>
+			</view>
 			<view
 				style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;">
 				<view>用户名:</view>
 				<view>
-					<input disabled="true" placeholder="请输入用户名" style="text-align:right;" type="text"
+					<input placeholder="请输入用户名" style="text-align:right;" type="nickname"
 						v-model="model.realName"></input>
 				</view>
 			</view>
+
+
 			<view
 				style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;">
 				<view>身份:</view>
@@ -25,14 +39,16 @@
 				style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;">
 				<view>手机号:</view>
 				<view>
-					<input placeholder="请输入手机号" style="text-align:right;" type="text" v-model="model.mobilePhone"></input>
+					<input placeholder="请输入手机号" style="text-align:right;" type="text"
+						v-model="model.mobilePhone"></input>
 				</view>
 			</view>
 			<view
 				style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;">
 				<view>地址:</view>
 				<view>
-					<input placeholder="请输入地址" style="text-align:right;" type="text" v-model="model.postalAddress"></input>
+					<input placeholder="请输入地址" style="text-align:right;" type="text"
+						v-model="model.postalAddress"></input>
 				</view>
 			</view>
 			<view
@@ -40,7 +56,7 @@
 				v-if="false">
 				<view>开户行:</view>
 				<view>
-					<input placeholder="请输入开户行,请准确填写" style="text-align:right;width:100%;" type="text" ></input>
+					<input placeholder="请输入开户行,请准确填写" style="text-align:right;width:100%;" type="text"></input>
 				</view>
 			</view>
 			<view
@@ -78,7 +94,8 @@
 					"email": "",
 					"mobilePhone": "",
 					"postalAddress": "",
-					"realName": ""
+					"realName": "",
+					"headIcon": ''
 				}
 			}
 		},
@@ -86,6 +103,46 @@
 			this.ShowInfo()
 		},
 		methods: {
+			onChooseavatar(url) {
+
+				let that = this
+				that.model.headIcon = url.detail.avatarUrl
+				console.log('选择的信息', that.model.headIcon)
+				this.$forceUpdate()
+
+				// uni.uploadFile({
+				// 	url: that.BASE_URL + '/api/file/Uploader/annexpic', // 仅为示例，非真实的接口地址
+				// 	filePath: [url.detail.avatarUrl],
+				// 	name: 'file',
+				// 	header: {
+				// 		Authorization: service.getToken()
+				// 	},
+				// 	formData: {
+				// 		user: 'test'
+				// 	},
+				// 	success(e) {
+				// 		console.log('上传成功', e)
+				// 		let info = JSON.parse(e.data)
+				// 		let file = {
+				// 			"name": info.data.name,
+				// 			"fileId": res.tempFilePaths[0],
+				// 			"url": info.data.url
+				// 		}
+				// 		that.model.headIcon = info.data.url
+				// 		console.log('头像',that.model.headIcon)
+				// 	},
+				// 	fail(err) {
+				// 		uni.showToast({
+				// 			title: err,
+				// 			icon: 'none'
+				// 		})
+				// 	}
+				// })
+
+
+
+
+			},
 			ShowInfo() {
 				this.API.GetCustomUserInfo(service.getUser().id).then(res => {
 					if (res.code == 200) {
@@ -99,24 +156,24 @@
 					}
 				})
 			},
-			Submit(){
-				this.API.UpdateCustomUserInfo(this.model).then(res=>{
+			Submit() {
+				this.API.UpdateCustomUserInfo(this.model).then(res => {
 					console.log('这是修改信息')
-						if(res.code==200){
-							uni.showToast({
-								title:'操作成功',
-								icon:'success'
-							})
-							setTimeout(()=>{
-								uni.navigateBack()
-							},1000)
-							
-						}else{
-							uni.showToast({
-								title:'操作失败',
-								icon:'none'
-							})
-						}
+					if (res.code == 200) {
+						uni.showToast({
+							title: '操作成功',
+							icon: 'success'
+						})
+						setTimeout(() => {
+							uni.navigateBack()
+						}, 1000)
+
+					} else {
+						uni.showToast({
+							title: '操作失败',
+							icon: 'none'
+						})
+					}
 				})
 			}
 		}
diff --git a/antis-app-siberian/pages/video/index.vue b/antis-app-siberian/pages/video/index.vue
index 1ef44ae..b030727 100644
--- a/antis-app-siberian/pages/video/index.vue
+++ b/antis-app-siberian/pages/video/index.vue
@@ -1,50 +1,247 @@
 <template>
 	<view>
-	    <image :src="BASE_URL+'/api/File/Image/annexpic/bgimage.jpeg'" style="width:100%;height:500rpx;"></image>
-	    <view style="height:100rpx;">
-	        <!-- <yz-audio bind:__l="__l" bind:ended="__e" class="vue-ref" data-event-opts="{{[ [ '^ended',[ ['End'] ] ] ]}}" data-ref="player1" isButton1Visible="true" isButton2Visible="true" isButton3Visible="true" vueId="26f4c051-1"></yz-audio> -->
-	    </view>
-	    <view style="padding:20rpx;">
-	        <view style="display:flex;align-items:center;justify-content:space-around;margin-top:30rpx;">
-	            <view>
-	                <image mode="aspectFit" :src="BASE_URL+'/api/File/Image/annexpic/left.png'" style="width:100rpx;height:100rpx;"></image>
-	            </view>
-	            <view>
-	                <image @click="ShowChange" mode="aspectFit" :src="BASE_URL+'/api/File/Image/annexpic/player.png'" style="width:100rpx;height:100rpx;" v-if="isshow==false"></image>
-	                <image @click="ShowChange" mode="aspectFit" :src="BASE_URL+'/api/File/Image/annexpic/stop.png'" style="width:100rpx;height:100rpx;" v-else></image>
-	            </view>
-	            <view>
-	                <image mode="aspectFit" :src="BASE_URL+'/api/File/Image/annexpic/rightaudio.png'" style="width:100rpx;height:100rpx;"></image>
-	            </view>
-	        </view>
-	        <view style="display:flex;align-items:center;justify-content:space-around;margin-top:50rpx;">
-	            <view  :class="current==1?'btn':''" @click="Change(1)" style="border:1px solid #e0e0e0;text-align:center;padding:20rpx;font-size:25rpx;border-radius:20rpx;">0.75倍</view>
-	            <view :class="current==2?'btn':''" @click="Change(2)" style="border:1px solid #e0e0e0;text-align:center;padding:20rpx;font-size:25rpx;border-radius:20rpx;">1倍(默认)</view>
-	            <view :class="current==3?'btn':''" @click="Change(3)" style="border:1px solid #e0e0e0;text-align:center;padding:20rpx;font-size:25rpx;border-radius:20rpx;">1.5倍</view>
-	        </view>
-	    </view>
-	    <view  class="centerview" @click="Submit">返回首页</view>
+		<image :src="BASE_URL+'/api/File/Image/annexpic/banner.png'" style="height:700rpx;width:100%;z-index:-1;"
+			mode="scaleToFill"></image>
+		<view style="text-align: center;position: absolute;top: 200rpx;left: 3%;">
+			<view
+				style="display: flex;align-items: center;flex-wrap: wrap;justify-content: center;font-size: 55rpx;font-weight: bold;color:white;">
+				{{txt}}
+			</view>
+		</view>
+		<view style="height:200rpx;background:white;
+  border-radius:10px;
+  box-shadow:0 0 30px white, 0 0 10px white, 0 0 15px white;position: relative;">
+			<yzaudio ref="player1" isButton1Visible="true" isButton2Visible="true" isButton3Visible="true"
+				@Button1Click="btn1Click" @error="Errors" v-if="hackReset">
+			</yzaudio>
+		</view>
+		<!-- <image :src="BASE_URL+'/api/File/Image/annexpic/bgimag
+		e.jpeg'" style="width:100%;height:500rpx;"></image> -->
+		<!-- <view> -->
+		<!-- <yzaudio ref="player1" isButton1Visible="true" isButton2Visible="true" isButton3Visible="true"
+				@Button1Click="btn1Click" @error="Errors" v-if="hackReset">
+			</yzaudio> -->
+		<!-- <yz-audio bind:__l="__l" bind:ended="__e" class="vue-ref" data-event-opts="{{[ [ '^ended',[ ['End'] ] ] ]}}" data-ref="player1" isButton1Visible="true" isButton2Visible="true" isButton3Visible="true" vueId="26f4c051-1"></yz-audio> -->
+		<!-- </view> -->
+		<view style="padding:20rpx;">
+			<view style="display:flex;align-items:center;justify-content:space-around;">
+				<view>
+					<image mode="aspectFit" :src="BASE_URL+'/api/File/Image/annexpic/left.png'"
+						style="width:100rpx;height:100rpx;"></image>
+				</view>
+				<view>
+					<image @click="ShowChange" mode="aspectFit" :src="BASE_URL+'/api/File/Image/annexpic/player.png'"
+						style="width:100rpx;height:100rpx;" v-if="isshow==false"></image>
+					<image @click="ShowChange" mode="aspectFit" :src="BASE_URL+'/api/File/Image/annexpic/stop.png'"
+						style="width:100rpx;height:100rpx;" v-else></image>
+				</view>
+				<view>
+					<image mode="aspectFit" :src="BASE_URL+'/api/File/Image/annexpic/rightaudio.png'"
+						style="width:100rpx;height:100rpx;"></image>
+				</view>
+			</view>
+			<view style="display:flex;align-items:center;justify-content:space-around;margin-top:50rpx;">
+				<view :class="current==1?'btn':''" @click="Change(1)"
+					style="border: 1px solid #e0e0e0; text-align:center;padding:20rpx;font-size:25rpx;border-radius:20rpx;">
+					0.75倍</view>
+				<view :class="current==2?'btn':''" @click="Change(2)"
+					style="border:1px solid #e0e0ee ;text-align:center;padding:20rpx;font-size:25rpx;border-radius:20rpx;">
+					1倍(默认)</view>
+				<view :class="current==3?'btn':''" @click="Change(3)"
+					style="border: 1px solid #e0e0e0;  text-align:center;padding:20rpx;font-size:25rpx;border-radius:20rpx;">
+					1.5倍</view>
+			</view>
+		</view>
+		<view class="centerview" @click="Submit">返回首页</view>
 	</view>
 
 </template>
 
 <script>
 	import BASE_URL from '../../common/config.js'
-	export default{
-		data(){
-			return{
+	import yzaudio from '../../components/yz-audio/yz-audio.vue'
+	export default {
+		components: {
+			yzaudio
+		},
+		data() {
+			return {
 				BASE_URL,
+				current: 2,
+				isshow: false,
+				player1: undefined,
+				info: {
+					url: '',
+					name: ''
+				},
+				hackReset: true,
+				txt: ''
 			}
 		},
 		onLoad(data) {
-			console.log('这是接收data',data)
+			console.log('这是接收data', data)
+			setTimeout(() => {
+				this.player1 = this.$refs.player1
+				this.player1.pause()
+				console.log('wwww', data.param)
+				console.log('jinru', data.param)
+				// data.param = 'test3'
+				switch (data.param) {
+					case 'test1':
+						this.player1.setSrc(
+							"https://ls.lcwuhan.com/api/File/Image/annex/Succeed_LanguageCert_Level_B2-Test_1.mp3"
+						);
+						this.txt = '朗思Succeed-B2-Practice Test 1'
+						this.player1.setName('朗思Succeed-B2-Practice Test 1');
+						this.info.url =
+							'https://ls.lcwuhan.com/api/File/Image/annex/Succeed_LanguageCert_Level_B2-Test_1.mp3'
+						this.info.name = '朗思Succeed-B2-Practice Test 1'
+						break;
+					case 'test2':
+						this.player1.setSrc(
+							"https://ls.lcwuhan.com/api/File/Image/annex/Succeed_LanguageCert_Level_B2-Test_2.mp3"
+						);
+						this.txt = '朗思Succeed-B2-Practice Test 2'
+						this.player1.setName('朗思Succeed-B2-Practice Test 2');
+						this.info.url =
+							'https://ls.lcwuhan.com/api/File/Image/annex/Succeed_LanguageCert_Level_B2-Test_2.mp3'
+						this.info.name = '朗思Succeed-B2-Practice Test 2'
+						break;
+					case 'test3':
+						this.player1.setSrc(
+							"https://ls.lcwuhan.com/api/File/Image/annex/Succeed_LanguageCert_Level_B2-Test_3.mp3"
+						);
+						this.player1.setName('朗思Succeed-B2-Practice Test 3');
+						this.txt = '朗思Succeed-B2-Practice Test 3'
+						this.info.url =
+							'https://ls.lcwuhan.com/api/File/Image/annex/Succeed_LanguageCert_Level_B2-Test_3.mp3'
+						this.info.name = '朗思Succeed-B2-Practice Test 3'
+						break;
+					case 'test4':
+						this.player1.setSrc(
+							"https://ls.lcwuhan.com/api/File/Image/annex/Succeed_LanguageCert_Level_B2-Test_4.mp3"
+						);
+						this.player1.setName('朗思Succeed-B2-Practice Test 4');
+						this.txt = '朗思Succeed-B2-Practice Test 4'
+						this.info.url =
+							'https://ls.lcwuhan.com/api/File/Image/annex/Succeed_LanguageCert_Level_B2-Test_4.mp3'
+						this.info.name = '朗思Succeed-B2-Practice Test 4'
+						break;
+					case 'test5':
+						this.player1.setSrc(
+							"https://ls.lcwuhan.com/api/File/Image/annex/Succeed_LanguageCert_Level_B2-Test_5.mp3"
+						);
+						this.player1.setName('朗思Succeed-B2-Practice Test 5');
+						this.txt = '朗思Succeed-B2-Practice Test 5'
+						this.info.url =
+							'https://ls.lcwuhan.com/api/File/Image/annex/Succeed_LanguageCert_Level_B2-Test_5.mp3'
+						this.info.name = '朗思Succeed-B2-Practice Test 5'
+						break;
+					case 'test6':
+						this.player1.setSrc(
+							"https://ls.lcwuhan.com/api/File/Image/annex/Succeed_LanguageCert_Level_C1-Test_1.mp3"
+						);
+						this.player1.setName('朗思Succeed-C1-Practice Test 1');
+						this.txt = '朗思Succeed-C1-Practice Test 1'
+						this.info.url =
+							'https://ls.lcwuhan.com/api/File/Image/annex/Succeed_LanguageCert_Level_C1-Test_1.mp3'
+						this.info.name = '朗思Succeed-C1-Practice Test 1'
+						break;
+					case 'test7':
+						this.player1.setSrc(
+							"https://ls.lcwuhan.com/api/File/Image/annex/Succeed_LanguageCert_Level_C1-Test_2.mp3"
+						);
+						this.txt = '朗思Succeed-C1-Practice Test 2'
+						this.player1.setName('朗思Succeed-C1-Practice Test 2');
+						this.info.url =
+							'https://ls.lcwuhan.com/api/File/Image/annex/Succeed_LanguageCert_Level_C1-Test_2.mp3'
+						this.info.name = '朗思Succeed-C1-Practice Test 2'
+						break;
+					case 'test8':
+						this.player1.setSrc(
+							"https://ls.lcwuhan.com/api/File/Image/annex/Succeed_LanguageCert_Level_C1-Test_3.mp3"
+						);
+						this.txt = '朗思Succeed-C1-Practice Test 3'
+						this.player1.setName('朗思Succeed-C1-Practice Test 3');
+						this.info.url =
+							'https://ls.lcwuhan.com/api/File/Image/annex/Succeed_LanguageCert_Level_C1-Test_3.mp3'
+						this.info.name = '朗思Succeed-C1-Practice Test 3'
+						break;
+					case 'test9':
+						this.player1.setSrc(
+							"https://ls.lcwuhan.com/api/File/Image/annex/Succeed_LanguageCert_Level_C1-Test_4.mp3"
+						);
+						this.txt = '朗思Succeed-C1-Practice Test 4'
+						this.player1.setName('朗思Succeed-C1-Practice Test 4');
+						this.info.url =
+							'https://ls.lcwuhan.com/api/File/Image/annex/Succeed_LanguageCert_Level_C1-Test_4.mp3'
+						this.info.name = '朗思Succeed-C1-Practice Test 4'
+						break;
+					case 'test10':
+						this.player1.setSrc(
+							"https://ls.lcwuhan.com/api/File/Image/annex/Succeed_LanguageCert_Level_C1-Test_5.mp3"
+						);
+						this.txt = '朗思Succeed-C1-Practice Test 5'
+						this.player1.setName('朗思Succeed-C1-Practice Test 5');
+						this.info.url =
+							'https://ls.lcwuhan.com/api/File/Image/annex/Succeed_LanguageCert_Level_C1-Test_5.mp3'
+						this.info.name = '朗思Succeed-C1-Practice Test 5'
+						break;
+					default:
+						uni.showToast({
+							title: '音频信息错误',
+							icon: 'none'
+						})
+						// this.player1.setSrc("https://ls.lcwuhan.com/api/File/Image/annex/Succeed_LanguageCert_Level_B2-Test 10-Part-1.mp3");
+						//  this.player1.setName('未知音频');
+						break;
+				}
+			}, 1000)
+
+			// this.$nextTick(()=>{
+			// 	this.player1.pause()
+			// })
+			// data.param='test1'
+			// 346472562420614405
+
+			// this.player1.setSrc("https://ls.lcwuhan.com/api/File/Image/annex/20221209_370580885373715717.mp4");
+			// this.player1.setName("致爱丽丝");//设置作品名字
+
 		},
-		methods:{
-				Submit(){
-					uni.reLaunch({
-						url:'/pages/index/index'
-					})
+		methods: {
+			Errors(e) {
+				this.hardReset = false
+				this.$nextTick(() => {
+					this.hardReset = true
+					this.player1.setSrc(this.info.url);
+					this.player1.setName(this.info.name);
+					this.player1.play()
+				});
+			},
+			// 播放暂停
+			ShowChange() {
+				this.isshow = !this.isshow
+				if (this.isshow) {
+					this.player1.play()
+				} else {
+					this.player1.pause()
 				}
+			},
+			Change(num) {
+				this.current = num
+				if (num == 1) {
+					this.player1.playbackRate(0.75)
+				} else if (num == 2) {
+					this.player1.playbackRate(1)
+				} else {
+					this.player1.playbackRate(1.5)
+				}
+			},
+			Submit() {
+				uni.reLaunch({
+					url: '/pages/index/index'
+				})
+			}
 		}
 	}
 </script>
@@ -52,7 +249,7 @@
 <style>
 	.centerview {
 		position: fixed;
-		bottom: 10px;
+		bottom: 0px;
 		margin: 0 auto;
 		width: 100%;
 		border: 1px solid #f2e2ac;
@@ -73,4 +270,9 @@
 		/*动画播放的次数*/
 		-webkit-animation-duration: 2s;
 	}
-</style>
\ No newline at end of file
+
+	.btn {
+		background-color: #F29086;
+		color: white;
+	}
+</style>
diff --git a/antis-app-siberian/static/audio-play.png b/antis-app-siberian/static/audio-play.png
new file mode 100644
index 0000000..9ff3a19
--- /dev/null
+++ b/antis-app-siberian/static/audio-play.png
diff --git a/antis-app-siberian/static/audio-stop.png b/antis-app-siberian/static/audio-stop.png
new file mode 100644
index 0000000..1627e98
--- /dev/null
+++ b/antis-app-siberian/static/audio-stop.png
diff --git a/antis-app-siberian/static/newimage.png b/antis-app-siberian/static/banner.png
index 8bd36da..8bd36da 100644
--- a/antis-app-siberian/static/newimage.png
+++ b/antis-app-siberian/static/banner.png
diff --git a/antis-app-siberian/static/icons/audio-pause.png b/antis-app-siberian/static/icons/audio-pause.png
new file mode 100644
index 0000000..7d654b3
--- /dev/null
+++ b/antis-app-siberian/static/icons/audio-pause.png
diff --git a/antis-app-siberian/static/icons/audio-play.png b/antis-app-siberian/static/icons/audio-play.png
new file mode 100644
index 0000000..23e798a
--- /dev/null
+++ b/antis-app-siberian/static/icons/audio-play.png
diff --git a/antis-app-siberian/static/icons/red-audio-pause.png b/antis-app-siberian/static/icons/red-audio-pause.png
new file mode 100644
index 0000000..e2caa1a
--- /dev/null
+++ b/antis-app-siberian/static/icons/red-audio-pause.png
diff --git a/antis-app-siberian/static/icons/red-audio-play.png b/antis-app-siberian/static/icons/red-audio-play.png
new file mode 100644
index 0000000..43f2a8b
--- /dev/null
+++ b/antis-app-siberian/static/icons/red-audio-play.png
diff --git a/antis-app-siberian/static/mkBg.png b/antis-app-siberian/static/mkBg.png
new file mode 100644
index 0000000..d36eb74
--- /dev/null
+++ b/antis-app-siberian/static/mkBg.png
diff --git a/antis-app-siberian/unpackage/dist/build/.automator/mp-weixin/.automator.json b/antis-app-siberian/unpackage/dist/build/.automator/mp-weixin/.automator.json
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/.automator/mp-weixin/.automator.json
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/app.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/app.json
new file mode 100644
index 0000000..c601fc8
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/app.json
@@ -0,0 +1,68 @@
+{
+  "pages": [
+    "pages/index/index",
+    "pages/video/index",
+    "pages/CDKEY/index",
+    "pages/payResult/index",
+    "pages/login/index",
+    "pages/Report/result",
+    "pages/index/bkzl",
+    "pages/Report/newIndex",
+    "pages/school/detail",
+    "pages/Policy/index",
+    "pages/school/index",
+    "pages/Info/indexOne",
+    "pages/Info/indexTwo",
+    "pages/index/zskd",
+    "pages/my/code",
+    "pages/Report/index",
+    "pages/my/info",
+    "pages/my/bank",
+    "pages/comment/index",
+    "pages/commentDetail/index",
+    "pages/ShopInfo/index",
+    "pages/means/index",
+    "pages/meansdetail/index",
+    "pages/order/order",
+    "pages/InvitedOrder/index",
+    "pages/orderdetail/index",
+    "pages/comfirmorder/index",
+    "pages/my/index",
+    "pages/address/index",
+    "pages/addressdetail/detail",
+    "pages/mycollect/index",
+    "pages/mytrack/index"
+  ],
+  "subPackages": [],
+  "window": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "朗思教育",
+    "navigationBarBackgroundColor": "#F8F8F8",
+    "backgroundColor": "#F8F8F8"
+  },
+  "tabBar": {
+    "selectedColor": "#FD0D0D",
+    "backgroundColor": "#ffffff",
+    "list": [
+      {
+        "text": "首页",
+        "selectedIconPath": "static/tab/yesindex.png",
+        "pagePath": "pages/index/index",
+        "iconPath": "static/tab/noindex.png"
+      },
+      {
+        "text": "资料",
+        "selectedIconPath": "static/tab/yesmeans.png",
+        "iconPath": "static/tab/nomeans.png",
+        "pagePath": "pages/means/index"
+      },
+      {
+        "text": "我的",
+        "selectedIconPath": "static/tab/yesmy.png",
+        "iconPath": "static/tab/nomy.png",
+        "pagePath": "pages/my/index"
+      }
+    ]
+  },
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/app.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/app.wxss
new file mode 100644
index 0000000..705b297
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/app.wxss
@@ -0,0 +1,3 @@
+@import './common/main.wxss';
+
+[data-custom-hidden="true"],[bind-data-custom-hidden="true"]{display: none !important;}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/common/main.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/common/main.wxss
new file mode 100644
index 0000000..c173c79
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/common/main.wxss
@@ -0,0 +1 @@
+page::after{position:fixed;content:'';left:-1000px;top:-1000px;-webkit-animation:shadow-preload .1s;-webkit-animation-delay:3s;animation:shadow-preload .1s;animation-delay:3s}@-webkit-keyframes shadow-preload{0%{background-image:url(https://cdn1.dcloud.net.cn/img/shadow-grey.png)}100%{background-image:url(https://cdn1.dcloud.net.cn/img/shadow-grey.png)}}@keyframes shadow-preload{0%{background-image:url(https://cdn1.dcloud.net.cn/img/shadow-grey.png)}100%{background-image:url(https://cdn1.dcloud.net.cn/img/shadow-grey.png)}}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/components/yz-audio/yz-audio.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/components/yz-audio/yz-audio.json
new file mode 100644
index 0000000..4575d1b
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/components/yz-audio/yz-audio.json
@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/components/yz-audio/yz-audio.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/components/yz-audio/yz-audio.wxml
new file mode 100644
index 0000000..910e4d7
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/components/yz-audio/yz-audio.wxml
@@ -0,0 +1 @@
+<view class="imt-audio"><view class="audio-wrapper"><view class="titlebox"><view style="font-weight:bold;font-size:45rpx;margin:0 auto;padding-bottom:30rpx;display:flex;align-items:center;justify-content:center;"><view style="color:#FC5F52;">{{$root.m0}}</view><view style="margin-left:10rpx;margin-right:10rpx;color:black;">/</view><view style="color:black;">{{$root.m1}}</view></view></view><view class="slidebox"><view><block wx:if="{{$slots.extraCtrls}}"><slot name="extraCtrls"></slot></block><block wx:else><text data-event-opts="{{[['tap',[['$emit',['Button1Click']]]]]}}" hidden="{{!(isButton1Visible)}}" class="hItem extrButton" bindtap="__e">{{button1Text}}</text><text data-event-opts="{{[['tap',[['$emit',['Button2Click']]]]]}}" hidden="{{!(isButton2Visible)}}" class="hItem extrButton" bindtap="__e">{{button2Text}}</text><text data-event-opts="{{[['tap',[['$emit',['Button3Click']]]]]}}" hidden="{{!(isButton3Visible)}}" class="hItem extrButton" bindtap="__e">{{button3Text}}</text></block></view></view></view><video style="width:10rpx;height:10rpx;" id="videoPlayer" src="{{src}}" autoplay="{{false}}" data-event-opts="{{[['play',[['playerOnPlay',['$event']]]],['pause',[['playerOnPause',['$event']]]],['ended',[['playerOnEnded',['$event']]]],['timeupdate',[['playerOnTimeupdate',['$event']]]],['waiting',[['playerOnWaiting',['$event']]]],['error',[['playerOnError',['$event']]]]]}}" muted="{{false}}" bindplay="__e" bindpause="__e" bindended="__e" bindtimeupdate="__e" bindwaiting="__e" binderror="__e"></video><slider class="audio-slider" block-size="12" max="{{duration}}" value="{{currentTime}}" data-event-opts="{{[['change',[['sliderChange',['$event']]]],['changing',[['sliderChanging',['$event']]]]]}}" bindchange="__e" bindchanging="__e"></slider></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/components/yz-audio/yz-audio.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/components/yz-audio/yz-audio.wxss
new file mode 100644
index 0000000..d14d3a2
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/components/yz-audio/yz-audio.wxss
@@ -0,0 +1 @@
+@-webkit-keyframes rowup{0%{-webkit-transform:translate(-50%,-50%) rotate(0deg);-webkit-transform-origin:center center;transform-origin:center center}100%{-webkit-transform:translate(-50%,-50%) rotate(1turn);-webkit-transform-origin:center center;transform-origin:center center}}@keyframes rowup{0%{-webkit-transform:translate(-50%,-50%) rotate(0deg);-webkit-transform-origin:center center;transform-origin:center center}100%{-webkit-transform:translate(-50%,-50%) rotate(1turn);-webkit-transform-origin:center center;transform-origin:center center}}.imt-audio{width:100%;margin-top:-90rpx;overflow:hidden;display:flex;box-sizing:border-box;position:relative}.imt-audio .top{width:140rpx;position:relative}.imt-audio .audio-wrapper{display:flex;flex-direction:column;flex:1;color:#fff;margin-left:20rpx}.imt-audio .audio-wrapper .titlebox{display:flex;line-height:138rpx;margin-bottom:10rpx}.imt-audio .audio-wrapper .titlebox .title{font-size:30rpx;max-width:100%;display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-box-orient:vertical;-webkit-line-clamp:1}.imt-audio .audio-wrapper .titlebox .singer{margin-left:20rpx;font-size:28rpx;max-width:50%;display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-box-orient:vertical;-webkit-line-clamp:1}.imt-audio .slidebox{display:flex;justify-content:space-between;width:96%}.imt-audio .uni-slider-tap-area{padding:0}.imt-audio .uni-slider-wrapper{min-height:0}.imt-audio .uni-slider-handle-wrapper{height:6px}.imt-audio .audio-slider{padding-top:10rpx;position:absolute;bottom:40rpx;width:90vw;left:0;padding:0}.imt-audio .cover{width:120rpx;height:120rpx;box-shadow:0 0 10px 0 rgba(0,0,0,.2);position:absolute;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);animation-fill-mode:forwards;-webkit-animation-fill-mode:forwards}.imt-audio .play{width:80rpx;height:80rpx;z-index:99;background:rgba(0,0,0,.4);border-radius:50%;position:absolute;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.imt-audio .play.loading{width:60rpx;height:60rpx;-webkit-animation:rotating_theme3 2s linear infinite;animation:rotating_theme3 2s linear infinite}@-webkit-keyframes rotating{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes rotating{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@-webkit-keyframes rotating_theme3{0%{-webkit-transform:translate(-50%,-50%) rotate(0deg);transform:translate(-50%,-50%) rotate(0deg)}100%{-webkit-transform:translate(-50%,-50%) rotate(1turn);transform:translate(-50%,-50%) rotate(1turn)}}@keyframes rotating_theme3{0%{-webkit-transform:translate(-50%,-50%) rotate(0deg);transform:translate(-50%,-50%) rotate(0deg)}100%{-webkit-transform:translate(-50%,-50%) rotate(1turn);transform:translate(-50%,-50%) rotate(1turn)}}.hItem{margin-left:16rpx}.extrButton{font-size:36rpx}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/CDKEY/index.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/CDKEY/index.json
new file mode 100644
index 0000000..c826cd3
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/CDKEY/index.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "模考兑换码",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/CDKEY/index.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/CDKEY/index.wxml
new file mode 100644
index 0000000..b4ffc79
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/CDKEY/index.wxml
@@ -0,0 +1 @@
+<view class="container" style="width:100%;height:100%;"><image class="background" src="{{model.isDefault=='1'?'../../static/mkBg.png':BASE_URL+model.banner[0].url}}" mode="scaleToFill"></image><view style="position:absolute;bottom:100rpx;left:150rpx;"><view style="border:2px solid pink;min-width:400rpx;height:50rpx;padding:15rpx;border-radius:20rpx;margin-bottom:30rpx;"><input style="width:100%;height:100%;" placeholder="请输入姓名" placeholder-style="color:pink;" data-event-opts="{{[['input',[['__set_model',['$0','name','$event',[]],['form']]]]]}}" value="{{form.name}}" bindinput="__e"/></view><view style="border:2px solid pink;min-width:400rpx;height:50rpx;padding:15rpx;border-radius:20rpx;margin-bottom:30rpx;"><input style="width:100%;height:100%;" placeholder="请输入Email地址" placeholder-style="color:pink;" data-event-opts="{{[['input',[['__set_model',['$0','email','$event',[]],['form']]]]]}}" value="{{form.email}}" bindinput="__e"/></view><view style="border:2px solid pink;min-width:400rpx;height:50rpx;padding:15rpx;border-radius:20rpx;margin-bottom:30rpx;"><input style="width:100%;height:100%;" placeholder="请输入手机号码" placeholder-style="color:pink;" data-event-opts="{{[['input',[['__set_model',['$0','phone','$event',[]],['form']]]]]}}" value="{{form.phone}}" bindinput="__e"/></view><view style="text-align:center;"><view data-event-opts="{{[['tap',[['Confirm',['$event']]]]]}}" style="border:2px solid pink;padding:20rpx;border-radius:20rpx;color:white;font-weight:bold;background-color:pink;" bindtap="__e">立即兑换</view></view></view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/CDKEY/index.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/CDKEY/index.wxss
new file mode 100644
index 0000000..7f19673
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/CDKEY/index.wxss
@@ -0,0 +1 @@
+.background{width:100%;height:100%;position:fixed;background-size:100% 100%;z-index:-1}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Info/indexOne.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Info/indexOne.json
new file mode 100644
index 0000000..84ae421
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Info/indexOne.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "用户协议",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Info/indexOne.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Info/indexOne.wxml
new file mode 100644
index 0000000..b14e0a9
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Info/indexOne.wxml
@@ -0,0 +1,13 @@
+<view class="container" style="padding:20rpx;"><view class="_p" style="font-weight:bold;text-align:center;">用户协议及隐私条款</view><view class="_p" style="font-size:28rpx;font-weight:bold;">用户协议:</view><view style="text-indent:5%;font-size:25rpx;"><view class="_p">尊敬的用户，欢迎使用由技术人员提供的服务。在使用前请您阅读如下服务协议，使用本应用即表示您同意接受本协议，本协议产生法律效力，特别涉及免除或者限制技术人责任的条款，请仔细阅读。如有任何问题，可向技术人咨询。
+			1. 服务条款的确认和接受
+			通过访问或使用本应用，表示用户同意接受本协议的所有条件和条款。<view class="_br"></view>2. 服务条款的变更和修改
+			技术人有权在必要时修改服务条款，服务条款一旦发生变更，将会在重要页面上提示修改内容。如果不同意所改动的内容，用户可以放弃获得的本应用信息服务。
+			如果用户继续享用本应用的信息服务，则视为接受服务条款的变更。本应用保留随时修改或中断服务而不需要通知用户的权利。 本应用行使修改或中断服务的权利，不需对用户或第三方负责。<view class="_br"></view>3. 用户行为<view class="_br"></view>3.1 用户账号、密码和安全<view class="_br"></view>用户一旦注册成功，便成为白犀牛的合法用户，将得到一个密码和帐号。同时，此账号密码可登录白犀牛的所有网页和APP。因此用户应采取合理措施维护其密码和帐号的安全。用户对利用该密码和帐号所进行的一切活动负全部责任；由该等活动所导致的任何损失或损害由用户承担，技术人不承担任何责任。
+			用户的密码和帐号遭到未授权的使用或发生其他任何安全问题，用户可以立即通知技术人，并且用户在每次连线结束，应结束帐号使用，否则用户可能得不到技术人的安全保护。对于用户长时间未使用的帐号，技术人有权予以关闭并注销其内容。
+			3.2 账号注册时的禁止行为<view class="_br"></view>（1）请勿以党和国家领导人或其他社会名人的真实姓名、字号、艺名、笔名注册；<view class="_br"></view>（2）冒充任何人或机构，或以虚伪不实的方式谎称或使人误认为与任何人或任何机构有关的名称；<view class="_br"></view>（3）请勿注册和其他网友之名相近、相仿的名字；<view class="_br"></view>（4）请勿注册不文明、不健康名字，或包含歧视、侮辱、猥亵类词语的名字；<view class="_br"></view>（5）请勿注册易产生歧义、引起他人误解的名字；<view class="_br"></view>3.3 用户在本应用上不得发布下列违法信息和照片：<view class="_br"></view>（1）反对宪法所确定的基本原则的；<view class="_br"></view>（2）危害国家安全，泄露国家秘密，颠覆国家政权，破坏国家统一的；<view class="_br"></view>（3）损害国家荣誉和利益的；<view class="_br"></view>4. 上传或发布的内容<view class="_br"></view>用户上传的内容是指用户在技术人上传或发布的视频或其它任何形式的内容包括文字、图片、音频等。除非技术人收到相关通知，否则技术人将用户视为其在本应用上传或发布的内容的版权拥有人。作为内容的发表者，需自行对所发表内容负责，因所发表内容引发的一切纠纷，由该内容的发表者承担全部法律及连带责任。技术人不承担任何法律及连带责任。
+			对于经由本应用而传送的内容，技术人不保证前述其合法性、正当性、准确性、完整性或品质。用户在使用本应用时，有可能会接触到令人不快、不适当或令人厌恶的内容。在任何情况下，技术人均不对任何内容承担任何责任，包括但不限于任何内容发生任何错误或纰漏以及衍生的任何损失或损害。技术人有权（但无义务）自行拒绝或删除经由本应用提供的任何内容。</view><view class="_p" style="font-size:28rpx;font-weight:bold;">隐私条款:</view><view class="_p" style="text-indent:5%;">1.用户信息公开情况说明</view>尊重用户个人隐私是技术人的一项基本政策。所以，技术人不会在未经合法用户授权时公开、编辑或透露其注册资料及保存在本应用中的非公开内容，除非有下列情况：<view class="_br"></view>（1）有关法律规定或技术人合法服务程序规定；<view class="_br"></view>（2）在紧急情况下，为维护用户及公众的权益；<view class="_br"></view>（3）为维护技术人的商标权、专利权及其他任何合法权益；<view class="_br"></view>2.用户信息收集<view class="_br"></view>（1）用户信息收集使用目的：技术人小程序会收集用户的手机号或邮箱进行账号的信息填写，技术人APP还会收集用户的公开微信头像名称，用来判别用户区分；<view class="_br"></view>（2）用户信息收集使用方式：技术人小程序通过用户自己注册填写时收集手机号或邮箱号；<view class="_br"></view>（3）用户信息收集使用范围：技术人小程序保证不会泄露用户信息；<view class="_br"></view>3.隐私权政策适用范围<view class="_br"></view>（1）用户在登录本应用服务器时留下的个人身份信息；<view class="_br"></view>（2）用户通过本应用服务器与其他用户或非用户之间传送的各种资讯；<view class="_br"></view>（3）本应用与商业伙伴共享的其他用户或非用户的各种信息；<view class="_br"></view>4.资讯公开与共享<view class="_br"></view>（1）用户本人同意与第三方共享信息和资讯;<view class="_br"></view>（2）只有透露用户的个人信息和资讯，才能提供用户所要求的某种产品和服务;<view class="_br"></view>（3）应代表本应用提供产品或服务的主体的要求提供（除非我们另行通知，否则该等主体无权<view class="_br"></view>将相关用户个人信息和资讯用于提供产品和服务之外的其他用途）：根据法律法规或行政命令的要求提供;因外部审计需要而提供;用户违反了本应用服务条款或任何其他产品及服务的使用规定;经本站评估，用户的帐户存在风险，需要加以保护。<view class="_br"></view>6.账户删除申请<view class="_br"></view>用户有权在任何时候编辑用户在技术人的帐户信息和资讯，用户也可以填写相关申请表格，要求删除个人帐户，但是用户无条件同意在你的帐户删除后，该帐户内及与该帐户相关的信息和资讯仍然保留在本网站档案记录中，除上述第三条规定的情况外，技术人将为用户保密。<view class="_br"></view>陕西省技术转移中心坚持以“技术转移引导创新，专业服 务创造价值”为宗旨，努力提高服务品质，积极探索服务模 式，着力打造技术转移创新服务平台，逐步形成了以科技型中小企业为主要服务对象，通过互联网有机融合涵盖企业、高校、
+		科研院所、管理机构以及服务机构等技术转移各参与方的创新型技术转移服务体系。
+		关于“技术人”
+		“技术人”技术转移互动平台是陕西省技术转移中心倾力打造的，基于社会化网络的，致力于实现技术研发者之间、技术研发者和应用者之间交流 与沟通的专业性技术转移互联网应用服务平台。
+		“技术人”以企业技术需求为导向，以互联网技术手段为支撑，将技术转 移与SNS（社交网络）有效结合，高效整合分散于各机构及个体的技术信息和服务资源，集成技术转移中介服务资源，并以此为依托建立起全社会共享
+		的技术转移网络互动服务平台，最终在大学、科研院所、企业之间，通过市场要素的整合，形成以网络为平台，以企业为主体，以市场为导向，促进技术研发者和应用者网上网下互动的有效技术供需交互机制，帮助解决技术转移过程中技术人员交流渠道少、技术转移信息有效性差及技术转移对接难等问题。<view class="_br"></view></view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Info/indexTwo.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Info/indexTwo.json
new file mode 100644
index 0000000..74279fa
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Info/indexTwo.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "隐私政策",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Info/indexTwo.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Info/indexTwo.wxml
new file mode 100644
index 0000000..4f9b3f8
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Info/indexTwo.wxml
@@ -0,0 +1 @@
+<view class="_div"></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/InvitedOrder/index.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/InvitedOrder/index.json
new file mode 100644
index 0000000..0d0d147
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/InvitedOrder/index.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "下级订单",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/InvitedOrder/index.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/InvitedOrder/index.wxml
new file mode 100644
index 0000000..01c3133
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/InvitedOrder/index.wxml
@@ -0,0 +1 @@
+<view class="container"><view style="background-color:#EFEFF4;min-height:100rpx;padding:20rpx;"><view style="width:95%;border-radius:30rpx;background-color:white;padding:20rpx;"><input maxlength="20" placeholder="订单号搜索" placeholderStyle="font-size:25rpx" type="text" data-event-opts="{{[['input',[['__set_model',['$0','orderNumber','$event',[]],['model']]]]]}}" value="{{model.orderNumber}}" bindinput="__e"/></view></view><view style="padding:20rpx;display:flex;align-items:center;justify-content:space-around;font-size:25rpx;"><view data-event-opts="{{[['tap',[['Change',[0]]]]]}}" class="{{[num==0?'btn':'']}}" style="padding-bottom:10rpx;" bindtap="__e">全部</view><view data-event-opts="{{[['tap',[['Change',[1]]]]]}}" class="{{[num==1?'btn':'']}}" style="padding-bottom:10rpx;" bindtap="__e">待付款</view><view data-event-opts="{{[['tap',[['Change',[2]]]]]}}" class="{{[num==2?'btn':'']}}" style="padding-bottom:10rpx;" bindtap="__e">待收货</view><view data-event-opts="{{[['tap',[['Change',[3]]]]]}}" class="{{[num==3?'btn':'']}}" style="padding-bottom:10rpx;" bindtap="__e">待评价</view><view data-event-opts="{{[['tap',[['Change',[4]]]]]}}" class="{{[num==4?'btn':'']}}" style="padding-bottom:10rpx;" bindtap="__e">已完成</view></view><view><block wx:if="{{list.length==0}}"><view style="width:100%;display:flex;align-items:center;justify-content:center;flex-direction:column;"><image style="width:400rpx;height:400rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/nullImg.png'}}"></image><text style="color:gray;font-size:30rpx;">暂无数据</text></view></block><block wx:else><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view style="margin:20rpx;background-color:white;border-radius:20rpx;padding:20rpx;"><view style="display:flex;align-items:center;justify-content:space-between;font-size:25rpx;border-bottom:1px solid #e0e0e0;padding-bottom:20rpx;"><view style="color:gray;"><text>{{'订单号:'+item.orderNumber}}</text></view><view style="{{(item.type=='1'?'color:red':'color:gray')}}">{{''+(item.type=='1'?'待付款':item.type=='2'?'待收货':item.type=='3'?'待评价':item.type=='4'?'已完成':item.type=='5'?'已取消':item.type=='6'?'售后中':'异常订单')+''}}</view></view><block wx:for="{{item.jsonDetail.arrayJsons}}" wx:for-item="childrenItem" wx:for-index="index" wx:key="index"><view style="display:flex;align-items:center;justify-content:space-between;margin:20rpx;"><view><view style="display:flex;"><view><image style="width:200rpx;height:200rpx;" src="{{childrenItem.goods!=null?childrenItem.goods.banner[0].url==undefined?BASE_URL+childrenItem.goods.Banner[0].url:BASE_URL+childrenItem.goods.banner[0].url:''}}"></image></view><view style="font-size:25rpx;margin-left:20rpx;line-height:50rpx;"><view style="font-size:28rpx;">{{childrenItem.goods&&childrenItem.goods.title}}</view><view style="color:GRAY;">{{'规格:'+(childrenItem.jsonDetail&&childrenItem.jsonDetail.Title)+''}}</view><view style="color:gray;">{{'x'+childrenItem.count}}</view><view style="color:gray;">{{'下单时间:'+item.creatorTime}}</view><view style="color:gray;">{{'下单用户:'+(item.user&&item.user.RealName)}}</view></view></view></view><view style="font-size:25rpx;">{{'￥'+childrenItem.count*childrenItem.jsonDetail.Moneys+''}}</view></view></block><view style="display:flex;align-items:center;justify-content:space-between;"><view><text style="color:gray;font-size:23rpx;">上级分润金额</text><text style="color:red;">{{'￥'+item.ParentMoney}}</text></view><view><text style="color:gray;font-size:23rpx;">合计</text><text style="color:red;">{{'￥'+item.totalMoneys}}</text></view></view></view></block></block></view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/InvitedOrder/index.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/InvitedOrder/index.wxss
new file mode 100644
index 0000000..1440a78
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/InvitedOrder/index.wxss
@@ -0,0 +1 @@
+.btn{border-bottom:2px solid red;color:red}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Policy/index.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Policy/index.json
new file mode 100644
index 0000000..9136f43
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Policy/index.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "退款政策",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Policy/index.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Policy/index.wxml
new file mode 100644
index 0000000..ec59404
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Policy/index.wxml
@@ -0,0 +1 @@
+<view class="container" style="padding:10rpx;"><block wx:for="{{Info[0].banner}}" wx:for-item="item" wx:for-index="index" wx:key="index"><image style="width:100%;border-radius:20rpx;" src="{{BASE_URL+item.url}}"></image></block></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/index.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/index.json
new file mode 100644
index 0000000..0d57a6e
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/index.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "在线报备",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/index.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/index.wxml
new file mode 100644
index 0000000..cc6976c
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/index.wxml
@@ -0,0 +1 @@
+<view class="container" style="padding:20rpx;"><view><view style="color:gray;font-size:35rpx;">选择类型<text style="color:red;">*</text></view><view style="background-color:#F1F5F7;padding:20rpx;border-radius:20rpx;margin-top:20rpx;"><view style="display:flex;align-items:center;justify-content:space-between;"><view><picker range="{{list}}" rangeKey="title" value="{{index}}" data-event-opts="{{[['change',[['bindPickerChange',['$event']]]]]}}" bindchange="__e"><view class="uni-input">{{list[index].title}}</view></picker></view><view><image style="width:50rpx;height:50rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/bottomblack.png'}}"></image></view></view></view></view><block wx:if="{{index==0}}"><view style="margin-top:50rpx;margin-bottom:30rpx;"><view><view style="color:gray;font-size:35rpx;margin-top:50rpx;">证件姓名<text style="color:red;">*</text><view style="background-color:#F1F5F7;padding:20rpx;border-radius:20rpx;margin-top:20rpx;"><input maxlength="10" placeholder="请输入证件姓名" type="text" data-event-opts="{{[['input',[['__set_model',['$0','cardName','$event',[]],['model']]]]]}}" value="{{model.cardName}}" bindinput="__e"/></view></view></view><view><view style="color:gray;font-size:35rpx;margin-top:50rpx;">证件号码<text style="color:red;">*</text><view style="background-color:#F1F5F7;padding:20rpx;border-radius:20rpx;margin-top:20rpx;"><input maxlength="30" placeholder="请输入证件号码" type="text" data-event-opts="{{[['input',[['__set_model',['$0','cardID','$event',[]],['model']]]]]}}" value="{{model.cardID}}" bindinput="__e"/></view></view></view><view style="border:1px solid #e0e0e0;border-radius:20rpx;padding:20rpx;margin-top:50rpx;"><view><view>Candidate Number(请在官网"Login in"朗思账户后,Overview右侧My profile-Personal Details处查询)：<text style="color:red;">*</text></view><view style="margin-top:10rpx;"><input maxlength="20" placeholder="998开头,不是身份证号" placeholderStyle="color:gray" type="text" data-event-opts="{{[['input',[['__set_model',['$0','candidateNumber','$event',[]],['model']],['AllChange',['$event']]]]]}}" value="{{model.candidateNumber}}" bindinput="__e"/></view><view style="display:flex;align-items:center;justify-content:flex-end;">{{''+CandidateNum+'/20'+''}}</view></view></view><view style="margin-top:50rpx;"><view style="color:gray;font-size:35rpx;">上传身份证<text style="color:red;">*</text></view><view style="display:flex;align-items:center;justify-content:space-between;margin-top:30rpx;width:100%;"><view style="width:49%;"><block wx:if="{{!(model.topCard.length>0)}}"><image style="width:100%;height:200rpx;border-radius:20rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/cardbottom.PNG'}}" data-event-opts="{{[['tap',[['TopCardUpload',['$event']]]]]}}" bindtap="__e"></image></block><block wx:else><image style="width:100%;height:200rpx;border-radius:20rpx;" src="{{BASE_URL+model.topCard[0].url}}" data-event-opts="{{[['tap',[['TopCardUpload',['$event']]]]]}}" bindtap="__e"></image></block></view><view style="width:49%;"><block wx:if="{{!(model.bottomCard.length>0)}}"><image style="width:100%;height:200rpx;border-radius:20rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/cardtop.PNG'}}" data-event-opts="{{[['tap',[['BottomCardUpload',['$event']]]]]}}" bindtap="__e"></image></block><block wx:else><image style="width:100%;height:200rpx;border-radius:20rpx;" src="{{BASE_URL+model.bottomCard[0].url}}" data-event-opts="{{[['tap',[['BottomCardUpload',['$event']]]]]}}" bindtap="__e"></image></block></view></view></view></view></block><block wx:if="{{index==1}}"><view style="margin-top:50rpx;"><view style="border:1px solid #e0e0e0;border-radius:20rpx;padding:20rpx;"><view><view>如果账户姓名错误:请先发邮件(描述问题并将证件照片放入正文内)至:customerservice@peoplecert.org随后请将取得的CAS编号填写在这里<text style="color:red;">*</text></view><view style="margin-top:30rpx;"><textarea maxlength="200" placeholder="请输入CAS编号" data-event-opts="{{[['input',[['__set_model',['$0','cas','$event',[]],['model']],['AllChange',['$event']]]]]}}" value="{{model.cas}}" bindinput="__e"></textarea></view><view style="display:flex;align-items:center;justify-content:flex-end;">{{''+CandidateNum+'/200'+''}}</view></view></view><view><view style="color:gray;font-size:35rpx;margin-top:50rpx;">注册郎思账户时的邮箱<text style="color:red;">*</text><view style="background-color:#F1F5F7;padding:20rpx;border-radius:20rpx;margin-top:20rpx;"><input maxlength="30" placeholder="请输入邮箱" type="text" data-event-opts="{{[['input',[['__set_model',['$0','emai','$event',[]],['model']]]]]}}" value="{{model.emai}}" bindinput="__e"/></view></view></view><view><view style="color:gray;font-size:35rpx;margin-top:50rpx;">添加证件照片<text style="color:red;">*</text><view style="background-color:#F1F5F7;padding:20rpx;border-radius:20rpx;margin-top:20rpx;display:flex;align-items:center;justify-content:space-between;"><view><block wx:if="{{!(form.papers.length>0)}}"><image style="width:100rpx;height:100rpx;border-radius:20rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/papersimg.PNG'}}" data-event-opts="{{[['tap',[['PapersUpload',['$event']]]]]}}" bindtap="__e"></image></block><block wx:else><image style="width:100rpx;height:100rpx;border-radius:20rpx;" src="{{BASE_URL+form.papers[0].url}}" data-event-opts="{{[['tap',[['PapersUpload',['$event']]]]]}}" bindtap="__e"></image></block></view><view style="font-size:25rpx;">最多上传1张</view></view><view style="font-size:25rpx;color:red;margin-top:20rpx;">温馨提示:如果一个工作日内没有反馈,请联系客服</view></view></view></view></block><block wx:if="{{index==2}}"><view style="margin-top:50rpx;"><view style="background-color:#F1F5F7;border-radius:20rpx;padding:20rpx;"><view>填写错误代码<text style="color:red;">*</text></view><view style="margin-top:30rpx;"><textarea maxlength="200" placeholder="错误代码" data-event-opts="{{[['input',[['__set_model',['$0','errorCode','$event',[]],['model']],['AllChange',['$event']]]]]}}" value="{{model.errorCode}}" bindinput="__e"></textarea></view><view style="display:flex;align-items:center;justify-content:flex-end;">{{''+CandidateNum+'/200'+''}}</view></view><view style="color:gray;font-size:35rpx;margin-top:50rpx;">提交错误页面<text style="color:red;">*</text><view style="background-color:#F1F5F7;padding:20rpx;border-radius:20rpx;margin-top:20rpx;"><input maxlength="30" placeholder="错误页面" type="text" data-event-opts="{{[['input',[['__set_model',['$0','errorPage','$event',[]],['model']]]]]}}" value="{{model.errorPage}}" bindinput="__e"/></view></view><view style="color:gray;font-size:35rpx;margin-top:50rpx;">描述错误问题<text style="color:red;">*</text><view style="background-color:#F1F5F7;padding:20rpx;border-radius:20rpx;margin-top:20rpx;"><input maxlength="30" placeholder="错误问题" type="text" data-event-opts="{{[['input',[['__set_model',['$0','errorRemark','$event',[]],['model']]]]]}}" value="{{model.errorRemark}}" bindinput="__e"/></view></view><view style="font-size:25rpx;color:red;margin-top:20rpx;">温馨提示：考生Log in等问题，务必立即与LiveChat进行联系</view></view></block><block wx:if="{{index==3}}"><view style="margin-top:50rpx;"><view style="color:gray;font-size:35rpx;margin-top:50rpx;">描述遇到的问题<text style="color:red;">*</text><view style="background-color:#F1F5F7;padding:20rpx;border-radius:20rpx;margin-top:20rpx;"><input maxlength="30" placeholder="问题简述" type="text" data-event-opts="{{[['input',[['__set_model',['$0','otherError','$event',[]],['model']]]]]}}" value="{{model.otherError}}" bindinput="__e"/></view></view></view></block><view data-event-opts="{{[['tap',[['Submit',['$event']]]]]}}" class="centerview" style="color:white;" bindtap="__e">提交</view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/index.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/index.wxss
new file mode 100644
index 0000000..32620a8
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/index.wxss
@@ -0,0 +1 @@
+.centerview{position:fixed;bottom:10rpx;margin:0 auto;width:90%;border:1px solid #ff4544;border-radius:10px;background-color:#ff4544;text-align:center;z-index:99999999999;height:40px;line-height:40px;color:#000;-webkit-animation:scaleDrawC 2s;animation:scaleDrawC 2s;-webkit-transform-origin:50% 50%;transform-origin:50% 50%;-webkit-animation-name:scaleDrawC!important;-webkit-animation-timing-function:ease-in-out;-webkit-animation-iteration-count:infinite;-webkit-animation-duration:2s}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/newIndex.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/newIndex.json
new file mode 100644
index 0000000..f552e4c
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/newIndex.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "新用户报备",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/newIndex.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/newIndex.wxml
new file mode 100644
index 0000000..0e41a41
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/newIndex.wxml
@@ -0,0 +1 @@
+<view class="container" style="padding:20rpx;"><view style="margin-top:50rpx;"><view><view style="color:gray;font-size:35rpx;margin-top:50rpx;">用户编码<text style="color:red;">*</text><view style="background-color:#F1F5F7;padding:20rpx;border-radius:20rpx;margin-top:20rpx;"><input maxlength="30" placeholder="请输入用户编码" type="text" data-event-opts="{{[['input',[['__set_model',['$0','coding','$event',[]],['form']]]]]}}" value="{{form.coding}}" bindinput="__e"/></view></view></view><view><view style="color:gray;font-size:35rpx;margin-top:50rpx;">订单信息<text style="color:red;">*</text><view style="background-color:#F1F5F7;padding:20rpx;border-radius:20rpx;margin-top:20rpx;display:flex;align-items:center;justify-content:space-between;"><view><block wx:if="{{!(form.orderImg.length>0)}}"><image style="width:100rpx;height:100rpx;border-radius:20rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/papersimg.PNG'}}" data-event-opts="{{[['tap',[['OrderUpload',['$event']]]]]}}" bindtap="__e"></image></block><block wx:else><image style="width:100rpx;height:100rpx;border-radius:20rpx;" src="{{BASE_URL+form.orderImg[0].url}}" data-event-opts="{{[['tap',[['OrderUpload',['$event']]]]]}}" bindtap="__e"></image></block></view><view style="font-size:25rpx;">最多上传1张</view></view></view></view><view><view style="color:gray;font-size:35rpx;margin-top:50rpx;">客户信息<text style="color:red;">*</text><view style="background-color:#F1F5F7;padding:20rpx;border-radius:20rpx;margin-top:20rpx;display:flex;align-items:center;justify-content:space-between;"><view><block wx:if="{{!(form.clientImg.length>0)}}"><image style="width:100rpx;height:100rpx;border-radius:20rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/papersimg.PNG'}}" data-event-opts="{{[['tap',[['ClientUpload',['$event']]]]]}}" bindtap="__e"></image></block><block wx:else><image style="width:100rpx;height:100rpx;border-radius:20rpx;" src="{{BASE_URL+form.clientImg[0].url}}" data-event-opts="{{[['tap',[['ClientUpload',['$event']]]]]}}" bindtap="__e"></image></block></view><view style="font-size:25rpx;">最多上传1张</view></view></view></view><view><view style="color:gray;font-size:35rpx;margin-top:50rpx;">其他信息<text style="color:red;"></text><view style="background-color:#F1F5F7;padding:20rpx;border-radius:20rpx;margin-top:20rpx;display:flex;align-items:center;justify-content:space-between;"><view><block wx:if="{{!(form.otherImg.length>0)}}"><image style="width:100rpx;height:100rpx;border-radius:20rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/papersimg.PNG'}}" data-event-opts="{{[['tap',[['OtherUpload',['$event']]]]]}}" bindtap="__e"></image></block><block wx:else><image style="width:100rpx;height:100rpx;border-radius:20rpx;" src="{{BASE_URL+form.otherImg[0].url}}" data-event-opts="{{[['tap',[['OtherUpload',['$event']]]]]}}" bindtap="__e"></image></block></view><view style="font-size:25rpx;">最多上传1张</view></view></view></view></view><view data-event-opts="{{[['tap',[['Submit',['$event']]]]]}}" class="centerview" style="color:white;" bindtap="__e">提交</view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/newIndex.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/newIndex.wxss
new file mode 100644
index 0000000..ebac13a
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/newIndex.wxss
@@ -0,0 +1 @@
+.centerview{position:fixed;bottom:10px;margin:0 auto;width:90%;border:1px solid #ff4544;border-radius:10px;background-color:#ff4544;text-align:center;z-index:99999999999;height:40px;line-height:40px;color:#000;-webkit-animation:scaleDrawC 2s;animation:scaleDrawC 2s;-webkit-transform-origin:50% 50%;transform-origin:50% 50%;-webkit-animation-name:scaleDrawC!important;-webkit-animation-timing-function:ease-in-out;-webkit-animation-iteration-count:infinite;-webkit-animation-duration:2s}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/result.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/result.json
new file mode 100644
index 0000000..891f8ff
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/result.json
@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "报备结果",
+  "navigationStyle": "default",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/result.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/result.wxml
new file mode 100644
index 0000000..ba57438
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/result.wxml
@@ -0,0 +1 @@
+<view class="container"><view style="text-align:center;width:90%;background-color:white;padding:30rpx;border-radius:30rpx;"><view><image style="width:200rpx;height:200rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/reportResult.PNG'}}"></image></view><view><view style="font-weight:bold;font-size:48rpx;">提交成功</view><view style="margin-top:20rpx;font-size:25rpx;">感谢您的提交</view><view style="margin-top:20rpx;font-size:25rpx;color:red;">温馨提示:请关注公众号后才能收到报备信息通知(如果登录过后未点击过关注却已经关注,请取消关注重新关注)！</view></view><view style="border-top:1px solid #e0e0e0;font-size:25rpx;margin-bottom:100rpx;margin-top:100rpx;"><view style="border-bottom:1px solid #e0e0e0;margin:20rpx;padding-bottom:20rpx;">公众号入口如下:</view><view><image style="border-radius:20rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/qrcode.jpg'}}" data-event-opts="{{[['tap',[['Priview',[BASE_URL+'/api/File/Image/annexpic/qrcode.jpg']]]]]}}" bindtap="__e"></image></view></view><view data-event-opts="{{[['tap',[['Submit',['$event']]]]]}}" class="centerview" style="color:white;" bindtap="__e">完成</view></view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/result.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/result.wxss
new file mode 100644
index 0000000..a17767d
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/Report/result.wxss
@@ -0,0 +1 @@
+.centerview{position:fixed;bottom:10px;margin:0 auto;width:90%;border:1px solid #f2e2ac;border-radius:10px;background-color:#f2e2ac;text-align:center;z-index:99999999999;height:40px;line-height:40px;color:#000;-webkit-animation:scaleDrawC 2s;animation:scaleDrawC 2s;-webkit-transform-origin:50% 50%;transform-origin:50% 50%;-webkit-animation-name:scaleDrawC!important;-webkit-animation-timing-function:ease-in-out;-webkit-animation-iteration-count:infinite;-webkit-animation-duration:2s}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/ShopInfo/index.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/ShopInfo/index.json
new file mode 100644
index 0000000..0f7cbbf
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/ShopInfo/index.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "我的购物车",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/ShopInfo/index.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/ShopInfo/index.wxml
new file mode 100644
index 0000000..bbdb270
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/ShopInfo/index.wxml
@@ -0,0 +1,3 @@
+<view class="container"><view style="background-color:white;width:100%;height:30rpx;padding:20rpx;"><view style="display:flex;align-items:center;justify-content:space-between;width:90%;"><view style="font-size:25rpx;color:gray;">商品库存有限,请尽快下单</view><view data-event-opts="{{[['tap',[['EditShop',['$event']]]]]}}" style="font-size:25rpx;" bindtap="__e">{{''+(Status?'编辑':'完成')+''}}</view></view></view><view style="background-color:white;width:100%;padding:20rpx;margin-top:20rpx;"><view style="padding-bottom:20rpx;border-bottom:1px solid #e0e0e0;"><label class="radio" style="color:gray;font-size:27rpx;"><checkbox-group data-event-opts="{{[['change',[['selectAll',['$event']]]]]}}" style="margin-left:-20px;" bindchange="__e"><checkbox style="transform:scale(0.8);" checked="{{allChecked}}">LanguageCert
+						ESOL
+						Registration</checkbox></checkbox-group></label></view><block wx:if="{{list.length==0}}"><view style="width:100%;display:flex;align-items:center;justify-content:center;flex-direction:column;"><image style="width:300rpx;height:300rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/nullImg.png'}}"></image><text style="color:gray;font-size:30rpx;">暂无数据</text></view></block><block wx:else><block><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view style="display:flex;align-items:center;margin-bottom:20rpx;margin-top:20rpx;width:100%;padding-bottom:20rpx;border-bottom:1px solid #e0e0e0;"><view style="width:8%;"><checkbox-group data-event-opts="{{[['change',[['changeitem',['$0'],[[['list','',index]]]]]]]}}" style="margin:0 auto;" bindchange="__e"><checkbox style="transform:scale(0.8);" checked="{{item.checked}}" value="{{item.jsonDetail&&item.jsonDetail.Moneys}}"></checkbox></checkbox-group></view><view style="display:flex;align-items:center;width:90%;"><view style="width:30%;"><image style="width:220rpx;height:220rpx;" mode="aspectFit" src="{{item.goods!=null?BASE_URL+item.goods.Banner[0].url:'https://gw.alicdn.com/imgextra/i3/O1CN01DKaORe1dcIHH0eMRx_!!6000000003756-55-tps-164-142.svg'}}" data-event-opts="{{[['tap',[['RedirectGoddsInfo',[index]]]]]}}" catchtap="__e"></image></view><view style="font-size:25rpx;line-height:80rpx;width:65%;padding-left:40rpx;"><view>{{item.goods&&item.goods.Title}}</view><view style="color:gray;">{{'规格: '+(item.jsonDetail&&item.jsonDetail.Title)}}</view><view style="display:flex;align-items:center;justify-content:space-between;width:100%;"><view style="color:red;font-size:28rpx;width:30%;">{{''+('￥'+(item.jsonDetail&&item.jsonDetail.PurPrice))+''}}</view><view style="display:flex;align-items:center;justify-content:space-around;width:50%;"><view style="display:flex;justify-content:center;"><image style="width:50rpx;height:50rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/jiannum.png'}}" data-event-opts="{{[['tap',[['AddOrReduceStock',[2,'$0'],[[['list','',index]]]]]]]}}" catchtap="__e"></image></view><view>{{item.count}}</view><view style="display:flex;justify-content:center;"><image style="width:50rpx;height:50rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/addnum.png'}}" data-event-opts="{{[['tap',[['AddOrReduceStock',[1,'$0'],[[['list','',index]]]]]]]}}" catchtap="__e"></image></view></view></view></view></view></view></block></block></block></view><view style="width:100%;margin-top:20rpx;text-align:center;"><image style="width:300rpx;height:50rpx;text-align:center;" src="{{BASE_URL+'/api/File/Image/annexpic/likeimage.PNG'}}"></image></view><view style="border-radius:20rpx;padding:25rpx;margin-bottom:80rpx;"><view style="display:flex;flex-wrap:wrap;width:100%;"><block wx:if="{{likelist.length==0}}"><view style="width:100%;display:flex;align-items:center;justify-content:center;flex-direction:column;"><image style="width:400rpx;height:400rpx;" mode="aspectFit" src="../../static/nullImg.png"></image><text style="color:gray;font-size:30rpx;">暂无数据</text></view></block><block wx:else><block wx:for="{{likelist}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['RedirectMeansDetail',[index]]]]]}}" style="width:48%;background-color:white;box-shadow:0 0 1em 0em #CDC7C7;border-radius:10px;margin:1%;" bindtap="__e"><view><image style="width:100%;height:290rpx;border-top-left-radius:10px;border-top-right-radius:10px;" src="{{BASE_URL+item.banner[0].url}}"></image></view><view style="font-size:25rpx;padding:10rpx 20rpx 10rpx 20rpx;">{{item.title}}</view><view style="display:flex;align-items:center;justify-content:space-between;margin-top:5px;padding:0rpx 20rpx 0rpx 20rpx;"><view style="font-weight:bold;font-size:32rpx;color:red;">{{'￥'+item.startMoneys}}</view><view><image style="width:50rpx;height:50rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/shop.png'}}"></image></view></view></view></block></block></view></view><view style="background-color:white;height:50rpx;position:fixed;bottom:0px;padding:20rpx;width:100%;"><view style="display:flex;align-items:center;justify-content:space-between;width:90%;"><view style="display:flex;align-items:center;width:70%;font-size:25rpx;"><view style="display:flex;align-items:center;"><view><checkbox-group data-event-opts="{{[['change',[['selectAll',['$event']]]]]}}" bindchange="__e"><checkbox style="transform:scale(0.8);" checked="{{allChecked}}">全选</checkbox></checkbox-group></view></view><block wx:if="{{Status}}"><view style="color:red;margin-left:20rpx;">{{'总计：￥'+totalPrice+''}}</view></block></view><view style="width:50%;"><block wx:if="{{Status}}"><view data-event-opts="{{[['tap',[['ConfirmOrder',['$event']]]]]}}" style="{{('color:white;padding:10rpx;width:100%;text-align:center;'+(IsStyle?'background-color:#40ff00;font-weight:bold':'background-color: #CDC7C7; '))}}" bindtap="__e">去结算</view></block><block wx:else><view data-event-opts="{{[['tap',[['settlement',['$event']]]]]}}" style="background-color:orangered;color:white;border:1px solid orangered;padding:10rpx;width:100%;text-align:center;" bindtap="__e">删除</view></block></view></view></view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/ShopInfo/index.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/ShopInfo/index.wxss
new file mode 100644
index 0000000..3dc71db
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/ShopInfo/index.wxss
@@ -0,0 +1 @@
+.container{background-color:#f7f7f7;height:100%;width:100%}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/address/index.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/address/index.json
new file mode 100644
index 0000000..95c58ec
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/address/index.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "收获地址",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/address/index.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/address/index.wxml
new file mode 100644
index 0000000..e5fb57d
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/address/index.wxml
@@ -0,0 +1 @@
+<view class="container" style="background-color:#F7F7F7;background-size:100% 100%;z-index:-1;"><view style="background-color:#EFEFF4;height:100rpx;"><view style="border-radius:20px;background-color:white;padding:10rpx 10rpx 10rpx 20rpx;margin:10px;display:flex;align-items:center;justify-content:space-between;"><view><input style="width:100%;" placeholder="请输入收货人或联系电话搜索" placeholderStyle="color:gray;font-size:25rpx;" type="text"/></view><view><image style="width:50rpx;height:50rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/newsearch.png'}}"></image></view></view></view><block wx:for="{{6}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view style="margin:20px;background-color:white;border-radius:10px;padding:10px;font-size:28rpx;"><view style="display:flex;align-items:center;justify-content:space-between;"><view style="display:flex;align-items:center;"><view>收货人：</view><view>张三</view></view><view><text>19983732010</text></view></view><view style="margin-top:20rpx;margin-bottom:30rpx;">收获地址：四川省成都市金牛区茶店子</view><view style="border-top:1px solid #e0e0e0;padding:10px;"><view style="display:flex;align-items:center;justify-content:space-between;width:100%;"><view style="width:60%;"><view><label class="radio"><radio style="transform:scale(0.8);" checked="true" value="1"></radio>已设为默认</label></view></view><view style="width:40%;display:flex;align-items:center;justify-content:space-between;"><view style="display:flex;align-items:center;"><view><image style="width:35rpx;height:35rpx;margin-top:5px;margin-right:5px;" src="{{BASE_URL+'/api/File/Image/annexpic/edit.png'}}"></image></view><view style="color:gray;">编辑</view></view><view style="display:flex;align-items:center;"><view><image style="width:35rpx;height:35rpx;margin-top:5px;margin-right:5px;" src="{{BASE_URL+'/api/File/Image/annexpic/delete.png'}}"></image></view><view style="color:gray;">编辑</view></view></view></view></view></view></block><view style="display:flex;align-items:center;margin:0 auto;width:100%;position:fixed;bottom:0px;"><view data-event-opts="{{[['tap',[['RedirectDetail',['$event']]]]]}}" style="background-color:red;padding:10px;display:flex;align-items:center;width:45%;justify-content:center;" bindtap="__e"><view><image style="width:50rpx;height:50rpx;margin-top:6px;margin-right:10px;" src="{{BASE_URL+'/api/File/Image/annexpic/add.png'}}"></image></view><view style="color:white;">手动添加</view></view><view style="background-color:#08F83B;padding:10px;display:flex;align-items:center;width:45%;justify-content:center;"><view><image style="width:50rpx;height:50rpx;margin-top:8px;margin-right:10px;" src="{{BASE_URL+'/api/File/Image/annexpic/gets.png'}}"></image></view><view style="color:white;">自动获取</view></view></view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/addressdetail/detail.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/addressdetail/detail.json
new file mode 100644
index 0000000..c534206
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/addressdetail/detail.json
@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "设置地址",
+  "usingComponents": {
+    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup"
+  }
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/addressdetail/detail.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/addressdetail/detail.wxml
new file mode 100644
index 0000000..b351f45
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/addressdetail/detail.wxml
@@ -0,0 +1 @@
+<view class="container" style="background-color:#F7F7F7;background-size:100% 100%;z-index:-1;"><view style="background-color:white;border-radius:10px;padding:10px;margin:20rpx;"><view style="display:flex;align-items:center;border-bottom:1px solid #e0e0e0;padding:10px;"><view style="font-size:30rpx;">收货人</view><view style="margin-left:10px;"><input maxlength="20" placeholderStyle="font-size:30rpx;" type="text"/></view></view><view style="display:flex;align-items:center;border-bottom:1px solid #e0e0e0;padding:10px;"><view style="font-size:30rpx;">联系电话</view><view style="margin-left:10px;"><input maxlength="20" placeholderStyle="font-size:30rpx" type="text"/></view></view><view style="display:flex;align-items:center;border-bottom:1px solid #e0e0e0;padding:10px;justify-content:space-between;"><view style="font-size:30rpx;">所在地区</view><view data-event-opts="{{[['tap',[['openPicker',['$event']]]]]}}" style="margin-left:10px;" bindtap="__e"><block wx:if="{{isshow}}"><view style="display:flex;align-items:center;"><view style="color:gray;">请选择</view><view><image style="width:20px;height:20px;margin-top:6px;" src="{{BASE_URL+'/api/File/Image/annexpic/right.png'}}"></image></view></view></block><view wx:else>{{''+text+''}}</view></view></view><view style="display:flex;border-bottom:1px solid #e0e0e0;padding:10px;width:100%;"><view style="font-size:30rpx;width:25%;">详情地址</view><view style="margin-left:10px;width:75%;"><textarea style="min-height:200rpx;"></textarea></view></view></view><view style="background-color:white;border-radius:10px;padding:10px;margin:20rpx;"><textarea style="min-height:200rpx;" autoHeight="{{true}}" placeholder="复制收获信息(姓名前后请输入空格)"></textarea><view style="width:200rpx;height:50rpx;border:1px solid red;padding:10rpx;border-radius:10px;text-align:center;color:red;margin:0 auto;">自动识别</view></view><view style="background-color:#FF4544;width:90%;border-radius:20px;padding:10px;text-align:center;margin:0 auto;color:white;">保存地址</view><uni-popup class="vue-ref vue-ref" vue-id="6179d8b2-1" maskClick="{{true}}" data-ref="popup" bind:__l="__l" vue-slots="{{['default']}}"><lotus-address vue-id="{{('6179d8b2-2')+','+('6179d8b2-1')}}" bind:__l="__l"></lotus-address></uni-popup></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/comfirmorder/index.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/comfirmorder/index.json
new file mode 100644
index 0000000..0a34759
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/comfirmorder/index.json
@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "订单结算",
+  "usingComponents": {
+    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup",
+    "uni-popup-dialog": "/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog"
+  }
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/comfirmorder/index.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/comfirmorder/index.wxml
new file mode 100644
index 0000000..8f5d4ad
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/comfirmorder/index.wxml
@@ -0,0 +1,3 @@
+<view class="container" style="padding-bottom:70rpx;"><view style="padding:20rpx;margin:20rpx;background-color:white;border-radius:20rpx;"><view style="display:flex;align-items:center;"><view><image style="width:40rpx;height:40rpx;margin-top:10rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/rooms.png'}}"></image></view><view style="font-size:28rpx;font-weight:bold;margin-left:20rpx;">LanguageCert ESOL Registration</view></view><view style="display:flex;align-items:center;justify-content:space-between;padding-bottom:20rpx;border-bottom:1px solid #e0e0e0;"><view style="display:flex;align-items:center;"><view><image style="width:40rpx;height:40rpx;margin-top:15rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/navigations.png'}}"></image></view><view style="font-size:28rpx;font-weight:bold;margin-left:20rpx;width:300rpx;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;">LanguageCert ESOL Registration</view><view><image style="width:40rpx;height:40rpx;margin-top:12rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/right.png'}}"></image></view></view><view style="display:flex;align-items:center;"><view><image style="width:40rpx;height:40rpx;margin-top:13rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/positons.png'}}"></image></view><view style="font-size:26rpx;colro:gray;">距离您986.53km</view></view></view><view style="color:gray;font-size:28rpx;margin-top:20rpx;">中国湖北省武汉市武昌区松竹路汉街总部国际F座郎思测评考试中心</view></view><view style="padding:20rpx;margin:20rpx;background-color:white;border-radius:20rpx;"><view style="display:flex;align-items:center;"><view><image style="width:40rpx;height:40rpx;margin-top:10rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/methods.png'}}"></image></view><view style="font-size:28rpx;margin-left:10rpx;">配送方式</view></view><view style="background-color:gray;border-radius:20rpx;width:50%;text-align:center;padding:10rpx 20rpx 10rpx 20rpx;color:white;margin-top:20rpx;">无需物流</view><block wx:for="{{model.arrayJsons}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view style="display:flex;align-items:center;justify-content:space-between;margin:20rpx;padding-bottom:20rpx;border-bottom:1px solid #e0e0e0;"><view><view style="display:flex;"><view><image style="width:200rpx;height:200rpx;" src="{{item.goods!=null?BASE_URL+item.goods.Banner[0].url:''}}"></image></view><view style="font-size:25rpx;margin-left:20rpx;line-height:50rpx;"><view style="font-size:28rpx;">{{item.goods&&item.goods.Title}}</view><view style="color:GRAY;">{{'规格:'+(item.jsonDetail&&item.jsonDetail.Title)}}</view><view style="color:gray;">{{'x'+item.count}}</view></view></view></view><view style="font-size:25rpx;">{{''+('￥'+(item.jsonDetail!=null?item.jsonDetail.Moneys*item.count:'金额计算中....')+'')+''}}</view></view></block><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #e0e0e0;"><view style="display:flex;align-items:center;"><view><image style="width:40rpx;height:40rpx;margin-top:10rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/coupon1.png'}}"></image></view><view style="margin-left:10rpx;font-size:28rpx;">兑换码</view></view><view style="display:flex;align-items:center;"><view data-event-opts="{{[['tap',[['OpenCode',['$event']]]]]}}" style="font-size:30rpx;color:gray;" bindtap="__e">{{value?value:'使用兑换码'}}</view><view><image style="margin-top:10rpx;width:30rpx;height:30rpx;margin-left:10rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/right.png'}}"></image></view></view></view><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #e0e0e0;"><view style="font-size:28rpx;">运费</view><view style="color:red;font-size:26rpx;">￥0.00</view></view><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;"><view style="font-size:28rpx;"></view><view style="color:red;font-size:26rpx;">{{'共'+model.arrayJsons.length+'件'}}<text style="font-weight:bold;color:black;margin-left:10rpx;">小计:<text style="color:red;margin-left:10rpx;">{{'￥'+model.totalMoneys}}</text></text></view></view></view><view style="padding:20rpx;margin:20rpx;background-color:white;border-radius:20rpx;margin-bottom:100rpx;"><view style="font-size:28rpx;padding:20rpx;border-bottom:1px solid #e0e0e0;">提交注册信息</view><view style="padding:20rpx;border-bottom:1px solid #e0e0e0;"><view style="margin-bottom:10rpx;color:red;">*<text style="color:gray;">请选择</text></view><view style="display:flex;align-items:center;margin-top:20rpx;"><view class="{{[current==1?'selected':'noselected']}}" style="padding:10rpx 20rpx 10rpx 20rpx;font-size:25rpx;font-weight:bold;border-radius:20rpx;">线上考试OLP</view></view></view><view style="padding:20rpx;border-bottom:1px solid #e0e0e0;"><view style="margin-bottom:10rpx;color:red;">*<text style="color:gray;">姓(拼音)</text></view><view style="margin-top:20rpx;"><input style="font-size:25rpx;" placeholder="请输入姓拼音" placeholderStyle="font-size:25rpx" type="text" data-event-opts="{{[['input',[['__set_model',['$0','surname','$event',[]],['form.orderinfo']]]]]}}" value="{{form.orderinfo.surname}}" bindinput="__e"/></view></view><view style="padding:20rpx;border-bottom:1px solid #e0e0e0;"><view style="margin-bottom:10rpx;color:red;">*<text style="color:gray;">名(拼音)</text></view><view style="margin-top:20rpx;"><input style="font-size:25rpx;" placeholder="请输入名拼音" placeholderStyle="font-size:25rpx" type="text" data-event-opts="{{[['input',[['__set_model',['$0','name','$event',[]],['form.orderinfo']]]]]}}" value="{{form.orderinfo.name}}" bindinput="__e"/></view></view><view style="padding:20rpx;border-bottom:1px solid #e0e0e0;"><view style="margin-bottom:10rpx;color:red;">*<text style="color:gray;">电话</text></view><view style="margin-top:20rpx;"><input style="font-size:25rpx;" placeholder="请输入电话" placeholderStyle="font-size:25rpx" type="text" data-event-opts="{{[['input',[['__set_model',['$0','phone','$event',[]],['form.orderinfo']]]]]}}" value="{{form.orderinfo.phone}}" bindinput="__e"/></view></view><view style="padding:20rpx;border-bottom:1px solid #e0e0e0;"><view style="margin-bottom:10rpx;color:red;">*<text style="color:gray;">邮箱</text></view><view style="margin-top:20rpx;"><input style="font-size:25rpx;" placeholder="请输入邮箱" placeholderStyle="font-size:25rpx" type="text" data-event-opts="{{[['input',[['__set_model',['$0','email','$event',[]],['form.orderinfo']]]]]}}" value="{{form.orderinfo.email}}" bindinput="__e"/></view></view><view style="padding:20rpx;color:red;font-size:25rpx;">请注意，下单后将会及时发送考试兑换Voucher
+			我们遵循统一的退款政策：购买Voucher后14自然日内，同时距离考试时间开始大于48小时可以联系客服提出退款申请。
+			退款有可能会收取一定的行政费用，详情请参见退款政策。</view></view><view style="position:fixed;bottom:0;background-color:white;width:100%;height:120rpx;box-shadow:0px -10px 20px -5px #e0e0e0;"><view style="margin:20rpx 20rpx 0rpx 20rpx;display:flex;align-items:center;justify-content:space-between;padding-bottom:20rpx;"><view><text style="font-size:20rpx;font-weight:bold;color:red;">合计:￥</text><text style="font-size:50rpx;color:red;font-weight:bold;">{{model.totalMoneys}}</text></view><view data-event-opts="{{[['tap',[['Confirm',['$event']]]]]}}" style="background-color:red;border-radius:20rpx;padding:20rpx;font-weight:bold;color:white;" bindtap="__e">提交订单</view></view></view><uni-popup class="vue-ref" vue-id="d83e6e0a-1" type="dialog" data-ref="inputDialog" bind:__l="__l" vue-slots="{{['default']}}"><uni-popup-dialog class="vue-ref" vue-id="{{('d83e6e0a-2')+','+('d83e6e0a-1')}}" mode="input" title="请输入兑换码" value="" placeholder="请输入兑换码" data-ref="inputClose" data-event-opts="{{[['^confirm',[['dialogInputConfirm']]],['^close',[['dialogInputExsit']]]]}}" bind:confirm="__e" bind:close="__e" bind:__l="__l"></uni-popup-dialog></uni-popup></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/comfirmorder/index.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/comfirmorder/index.wxss
new file mode 100644
index 0000000..5d71d31
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/comfirmorder/index.wxss
@@ -0,0 +1 @@
+.selected{color:#fff;background-color:red}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/comment/index.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/comment/index.json
new file mode 100644
index 0000000..6380d74
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/comment/index.json
@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "评价",
+  "usingComponents": {
+    "uni-rate": "/uni_modules/uni-rate/components/uni-rate/uni-rate",
+    "uni-file-picker": "/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker"
+  }
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/comment/index.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/comment/index.wxml
new file mode 100644
index 0000000..5ce8df4
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/comment/index.wxml
@@ -0,0 +1 @@
+<view class="container"><view class="background"></view><view class="header" style="display:flex;align-items:center;padding:10px;background-color:white;width:100%;margin:0 auto;"><view class="tx"><image style="width:50px;height:50px;border:1px solid white;border-radius:20rpx;" src="{{user.headicon}}"></image></view><view class="info" style="display:block;"><view style="color:black;font-size:12px;">昵称:<text style="margin-left:5px;">{{user.realName}}</text></view><view style="color:black;font-size:12px;">ID:<text style="margin-left:5px;">{{user.id}}</text></view></view></view><view class="centerView"><view class="comm" style="display:flex;justify-content:center;align-items:center;margin:10px 0px 20px 0px;"><view style="color:white;">我的评价</view><view><uni-rate vue-id="10357bad-1" max="{{3}}" margin="{{10}}" data-event-opts="{{[['^change',[['onChange']]]]}}" bind:change="__e" bind:__l="__l"></uni-rate></view></view><view class="contentView" style="border:1px solid white;width:90%;height:100px;margin:0 auto;padding:10px;border-radius:10px;background-color:white;"><textarea style="color:gray;font-size:25rpx;" maxlength="100" placeholder="请输入评价内容(不得高于60字)" placeholderClass="area" data-event-opts="{{[['input',[['__set_model',['$0','txt','$event',[]],['form']]]]]}}" value="{{form.txt}}" bindinput="__e"></textarea></view></view><view class="uploadView"><view style="display:flex;justify-content:center;align-items:center;margin:10px 0px 20px 0px;"><view style="color:white;">图片上传</view></view><view style="border:1px solid white;width:90%;height:118px;margin:0 auto;padding:10px;border-radius:10px;background-color:white;"><view class="fileview"><uni-file-picker style="transform:scale(0.5);" vue-id="10357bad-2" limit="3" mode="grid" data-event-opts="{{[['^select',[['select']]],['^delete',[['delBanner']]]]}}" bind:select="__e" bind:delete="__e" bind:__l="__l"></uni-file-picker></view></view></view><view class="btnSubmit" style="margin-top:20px;"><view style="margin:0 auto;border:1px solid white;padding:10px;text-align:center;color:black;border-radius:10px;background-color:white;width:90%;" hoverClass="SubmitHover" data-event-opts="{{[['tap',[['SubmitBtn',['$event']]]]]}}" bindtap="__e">提交评价</view></view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/comment/index.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/comment/index.wxss
new file mode 100644
index 0000000..6d60dd5
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/comment/index.wxss
@@ -0,0 +1 @@
+.container{margin:0;background-color:#8dccff;background-size:100% 100%;height:100%;min-height:100vh}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/commentDetail/index.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/commentDetail/index.json
new file mode 100644
index 0000000..cd1c1e1
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/commentDetail/index.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "详情评价",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/commentDetail/index.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/commentDetail/index.wxml
new file mode 100644
index 0000000..65e9479
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/commentDetail/index.wxml
@@ -0,0 +1 @@
+<view class="container"><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx 50rpx 20rpx 50rpx;border-bottom:1px solid #e0e0e0;"><view data-event-opts="{{[['tap',[['Change',[0]]]]]}}" class="{{[(num==0)?'btn':'']}}" style="font-size:25rpx;" bindtap="__e">全部</view><view data-event-opts="{{[['tap',[['Change',[1]]]]]}}" class="{{[(num==1)?'btn':'']}}" style="font-size:25rpx;" bindtap="__e">好评</view><view data-event-opts="{{[['tap',[['Change',[2]]]]]}}" class="{{[(num==2)?'btn':'']}}" style="font-size:25rpx;" bindtap="__e">中评</view><view data-event-opts="{{[['tap',[['Change',[3]]]]]}}" class="{{[(num==3)?'btn':'']}}" style="font-size:25rpx;" bindtap="__e">差评</view></view><block wx:for="{{coomentlist}}" wx:for-item="item" wx:for-index="index"><view style="background-color:white;border-radius:20rpx;padding:20rpx 20rpx 20rpx 20rpx;margin-bottom:20rpx;" wx:key="index"><view style="display:flex;align-items:center;justify-content:space-between;"><view style="display:flex;align-items:center;"><view><image style="width:50rpx;height:50rpx;border-radius:100px;" src="{{item.user&&item.user.HeadIcon}}"></image></view><view style="margin-left:30rpx;color:gray;font-size:25rpx;">{{''+(item.user&&item.user.RealName)+''}}</view></view><view style="color:gray;font-size:25rpx;">{{''+item.creatorTime+''}}</view></view><view style="font-size:28rpx;margin:20rpx;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;line-clamp:2;-webkit-box-orient:vertical;">{{''+item.txt+''}}</view><block wx:if="{{item.banner.length>0}}"><view><view style="display:flex;align-items:center;flex-wrap:wrap;"><block wx:for="{{item.banner}}" wx:for-item="row" wx:for-index="index" wx:key="index"><view><image style="width:200rpx;height:200rpx;margin:10rpx;" mode="aspectFit" src="{{BASE_URL+row.url}}" data-event-opts="{{[['tap',[['ShowPriview',[BASE_URL+row.url]]]]]}}" bindtap="__e"></image></view></block></view></view></block><view style="font-size:25rpx;margin:20rpx;color:gray;">{{'规格：'+item.title}}</view></view></block></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/commentDetail/index.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/commentDetail/index.wxss
new file mode 100644
index 0000000..e4c04d0
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/commentDetail/index.wxss
@@ -0,0 +1 @@
+.btn{color:red;border:1px solid red;border-radius:20rpx;padding:10rpx}.container{background-color:#f7f7f7}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/bkzl.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/bkzl.json
new file mode 100644
index 0000000..75fd1b3
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/bkzl.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "备考资料",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/bkzl.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/bkzl.wxml
new file mode 100644
index 0000000..c2dd3fb
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/bkzl.wxml
@@ -0,0 +1 @@
+<view style="padding:20rpx;"><view class="content" style="width:100%;overflow:hidden;"><rich-text class="rich-val"><rich-text nodes="{{model.info}}"></rich-text></rich-text></view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/bkzl.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/bkzl.wxss
new file mode 100644
index 0000000..6e9e6ed
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/bkzl.wxss
@@ -0,0 +1 @@
+.rich-val{word-break:break-all;white-space:pre-line}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/index.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/index.json
new file mode 100644
index 0000000..a860429
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/index.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "首页",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/index.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/index.wxml
new file mode 100644
index 0000000..7d4e95e
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/index.wxml
@@ -0,0 +1 @@
+<view class="container"><view><view style="position:relative;top:0px;"><image style="height:780rpx;width:100%;z-index:-1;" src="../../static/banner.png"></image></view><view style="position:absolute;top:530rpx;left:30rpx;color:white;font-weight:bold;"><view style="font-size:50rpx;margin-left:-30rpx;letter-spacing:10rpx;">【朗思测评考试中心】</view><view style="letter-spacing:5rpx;margin-top:10rpx;">朗思官方报名中心|朗思官方SELT考试中心</view><view style="letter-spacing:5rpx;margin-top:5rpx;">广受考试好评考试中心</view></view></view><view style="border-top-left-radius:40rpx;border-top-right-radius:40rpx;z-index:1;min-height:600rpx;width:100%;background-color:white;position:absolute;top:735rpx;"><view style="width:100%;"><view style="text-align:center;margin-top:30rpx;"><image style="width:90%;height:200rpx;border-radius:20rpx;" src="../../static/apply.png" data-event-opts="{{[['tap',[['RedirectMean',['$event']]]]]}}" bindtap="__e"></image></view><view style="display:flex;align-items:center;justify-content:space-around;flex-wrap:wrap;margin-top:20rpx;"><view><view style="position:relative;top:0px;"><image style="width:300rpx;height:150rpx;border-radius:20rpx;" src="../../static/school.png" data-event-opts="{{[['tap',[['RedirectSchool',['$event']]]]]}}" bindtap="__e"></image><view style="position:absolute;top:40rpx;left:20rpx;font-weight:bold;color:white;">认可院校</view></view></view><view><view style="position:relative;top:0px;"><image style="width:300rpx;height:150rpx;border-radius:20rpx;" src="../../static/zl.png" data-event-opts="{{[['tap',[['RedirectZL',['$event']]]]]}}" bindtap="__e"></image><view style="position:absolute;top:40rpx;left:20rpx;font-weight:bold;color:white;">备考资料</view></view></view><view style="margin-top:20rpx;"><view style="position:relative;top:0px;"><image style="width:300rpx;height:150rpx;border-radius:20rpx;" src="../../static/zs.png" data-event-opts="{{[['tap',[['RedirectZSKD',['$event']]]]]}}" bindtap="__e"></image><view style="position:absolute;top:40rpx;left:20rpx;font-weight:bold;color:white;">证件报备</view></view></view><view style="margin-top:20rpx;"><button style="padding:0px;margin:0px;display:flex;align-items:center;border:0px;" openType="contact" plain="true" type="default"><view style="position:relative;top:5px;"><image style="width:300rpx;height:150rpx;border-radius:20rpx;" src="../../static/lw.png"></image><view style="position:absolute;top:20rpx;left:20rpx;font-weight:bold;color:white;">客服</view></view></button></view></view></view></view><view style="position:fixed;bottom:0px;width:100%;z-index:1;display:flex;align-items:center;"><image style="width:100%;height:50rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/bottom.png'}}"></image></view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/zskd.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/zskd.json
new file mode 100644
index 0000000..29dd32f
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/zskd.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "纸质证书邮寄",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/zskd.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/zskd.wxml
new file mode 100644
index 0000000..b7ddee3
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/zskd.wxml
@@ -0,0 +1,2 @@
+<view style="padding:20rpx;"><view style="margin-top:50rpx;margin-bottom:180rpx;"><view style="color:gray;font-size:25rpx;margin-top:50rpx;margin-bottom:30rpx;margin-left:20rpx;">收件人<text style="color:red;">*</text></view><view style="background-color:#F1F5F7;border-radius:20rpx;padding:20rpx;"><view><input maxlength="30" placeholder="收件人" placeholderStyle="font-size: 25rpx;" type="text" data-event-opts="{{[['input',[['__set_model',['$0','consigneeUser','$event',[]],['model']]]]]}}" value="{{model.consigneeUser}}" bindinput="__e"/></view></view><view style="color:gray;font-size:25rpx;margin-top:50rpx;margin-bottom:30rpx;margin-left:20rpx;">联系电话<text style="color:red;">*</text></view><view style="background-color:#F1F5F7;border-radius:20rpx;padding:20rpx;"><view><input maxlength="30" placeholder="联系电话" placeholderStyle="font-size: 25rpx;" type="text" data-event-opts="{{[['input',[['__set_model',['$0','phone','$event',[]],['model']]]]]}}" value="{{model.phone}}" bindinput="__e"/></view></view><view style="color:gray;font-size:25rpx;margin-top:50rpx;margin-bottom:30rpx;margin-left:20rpx;">详细地址(请务必写明地址,否则无法寄出)<text style="color:red;">*</text></view><view style="background-color:#F1F5F7;border-radius:20rpx;padding:20rpx;"><view><textarea maxlength="50" placeholder="详情地址" placeholderStyle="font-size: 25rpx;" data-event-opts="{{[['input',[['__set_model',['$0','addressDetail','$event',[]],['model']],['ChangeDetail',['$event']]]]]}}" value="{{model.addressDetail}}" bindinput="__e"></textarea></view><view style="display:flex;align-items:center;justify-content:flex-end;">{{''+CandidateDetailNum+'/50'}}</view></view><view style="color:gray;font-size:25rpx;margin-top:50rpx;margin-bottom:30rpx;margin-left:20rpx;">Exam
+			ID不是成绩单上的Exam Session ID,Exam ID可在您预约考试成功时收到的邮件内查到。请阅读以上内容后在此栏填写：已确认<text style="color:red;">*</text></view><view style="background-color:#F1F5F7;border-radius:20rpx;padding:20rpx;"><view><input maxlength="10" placeholder="信息" placeholderStyle="font-size: 25rpx;" data-event-opts="{{[['input',[['__set_model',['$0','confirmInfo','$event',[]],['model']],['ChangeInfo',['$event']]]]]}}" value="{{model.confirmInfo}}" bindinput="__e"/></view><view style="display:flex;align-items:center;justify-content:flex-end;font-size:20rpx;">{{''+(''+CandidateInfoNum+'/10')+''}}</view></view><view style="color:gray;font-size:25rpx;margin-top:50rpx;">Exam ID<text style="color:red;">*</text><view style="background-color:#F1F5F7;padding:20rpx;border-radius:20rpx;margin-top:20rpx;"><input maxlength="30" placeholder="不是成绩单上的Exam Session ID" placeholderStyle="font-size: 25rpx;" type="text" data-event-opts="{{[['input',[['__set_model',['$0','examId','$event',[]],['model']]]]]}}" value="{{model.examId}}" bindinput="__e"/></view></view><view style="font-size:25rpx;color:red;margin-top:20rpx;">温馨提示：1.纸质证书并非成绩单，没有小分；2.纸质证书从海外总部寄出到收到需要8-12周，收到后消杀，录入需5个工作日。查询请联系考务老师。</view></view><view data-event-opts="{{[['tap',[['Submit',['$event']]]]]}}" class="centerview" style="color:white;" bindtap="__e">提交</view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/zskd.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/zskd.wxss
new file mode 100644
index 0000000..ebac13a
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/zskd.wxss
@@ -0,0 +1 @@
+.centerview{position:fixed;bottom:10px;margin:0 auto;width:90%;border:1px solid #ff4544;border-radius:10px;background-color:#ff4544;text-align:center;z-index:99999999999;height:40px;line-height:40px;color:#000;-webkit-animation:scaleDrawC 2s;animation:scaleDrawC 2s;-webkit-transform-origin:50% 50%;transform-origin:50% 50%;-webkit-animation-name:scaleDrawC!important;-webkit-animation-timing-function:ease-in-out;-webkit-animation-iteration-count:infinite;-webkit-animation-duration:2s}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/login/index.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/login/index.json
new file mode 100644
index 0000000..e301e43
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/login/index.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "登录",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/login/index.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/login/index.wxml
new file mode 100644
index 0000000..bd9d640
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/login/index.wxml
@@ -0,0 +1 @@
+<view class="container" style="padding:20rpx;"><view><view><view><view class="header" style="width:100%;text-align:center;margin-top:80rpx;margin-bottom:20rpx;"><image style="width:350rpx;height:350rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/logo.png'}}" mode="aspectFit"></image></view><view class="content" style="font-size:30rpx;border-top:2px solid #e0e0e0;padding-top:50rpx;margin-bottom:20rpx;"><view style="font-weight:bold;color:black;margin-bottom:30rpx;">申请获取以下权限</view><text style="color:gray;">获得你的公开信息(昵称，头像、地区等)</text></view><button style="margin-top:50rpx;background-color:#2B9BFA;" type="primary" data-event-opts="{{[['tap',[['WxLogin',['$event']]]]]}}" bindtap="__e">授权登录</button></view></view><view class="agreement" style="font-size:25rpx;display:flex;align-items:center;margin-top:20rpx;"><view class="protocolIcon"><checkbox-group data-event-opts="{{[['change',[['checkboxGroupChange',['$event']]]]]}}" bindchange="__e"><checkbox style="transform:scale(0.6);" checked="{{false}}" value="1"></checkbox></checkbox-group></view><view class="writtenWords">我已阅读并同意<label data-event-opts="{{[['tap',[['RedirectAgreement',['$event']]]]]}}" style="color:#2B9BFA;" bindtap="__e">《朗思英语测评使用协议和隐私协议》</label></view></view></view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/means/index.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/means/index.json
new file mode 100644
index 0000000..628b733
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/means/index.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "资料",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/means/index.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/means/index.wxml
new file mode 100644
index 0000000..0c732f1
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/means/index.wxml
@@ -0,0 +1 @@
+<view><view><view style="background-color:#F7F7F7;border-radius:30px;padding:10rpx;"><view style="display:flex;align-items:center;"><view style="width:95%;border-radius:30rpx;background-color:white;padding:20rpx;color:gray;font-size:25rpx;"><input style="width:100%;" maxlength="20" placeholder="商品名称搜索" placeholderStyle="color:gray" type="text" data-event-opts="{{[['blur',[['ChangeSearch',['$event']]]],['input',[['__set_model',['$0','title','$event',[]],['model']]]]]}}" value="{{model.title}}" bindblur="__e" bindinput="__e"/></view></view></view><view style="display:flex;align-items:center;justify-content:space-around;margin-top:10px;font-size:26rpx;"><view data-event-opts="{{[['tap',[['Change',[0]]]]]}}" class="{{[num==0?'btns':'']}}" bindtap="__e">综合</view><view data-event-opts="{{[['tap',[['Change',[1]]]]]}}" class="{{[num==1?'btns':'']}}" bindtap="__e">最新</view><view data-event-opts="{{[['tap',[['Change',[2]]]]]}}" class="{{[num==2?'btns':'']}}" style="display:flex;align-items:center;" bindtap="__e"><view>价格</view><view style="margin-left:2px;margin-top:2px;"><image style="width:10px;height:10px;vertical-align:bottom;" src="{{ismoney?BASE_URL+'/api/File/Image/annexpic/topblack.png':BASE_URL+'/api/File/Image/annexpic/topred.png'}}"></image><view class="_br"></view><image style="width:10px;height:10px;vertical-align:top;" src="{{ismoney==false?BASE_URL+'/api/File/Image/annexpic/bottomblack.png':BASE_URL+'/api/File/Image/annexpic/bottomred.png'}}"></image></view></view><view data-event-opts="{{[['tap',[['Change',[3]]]]]}}" class="{{[num==3?'btns':'']}}" bindtap="__e">销量</view><view><image style="width:23px;height:23px;margin-top:5px;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/flexone.png'}}"></image></view></view></view><view><scroll-view class="scroll-Y" scrollTop="{{scrollTop}}" scrollY="true" showScrollbar="true"><view style="height:90vh;background-color:#F7F7F7;"><view style="display:flex;flex-wrap:wrap;width:100%;"><block wx:if="{{list.length==0}}"><view style="width:100%;display:flex;align-items:center;justify-content:center;flex-direction:column;"><image style="width:400rpx;height:400rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/nullImg.png'}}"></image><text style="color:gray;font-size:30rpx;">暂无数据</text></view></block><block wx:else><block><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['RedirectMeansDetail',['$0'],[[['list','',index]]]]]]]}}" style="width:44%;margin:5px;background-color:white;box-shadow:0 0 1em 0em #CDC7C7;padding:10rpx;border-radius:10px;" bindtap="__e"><view><image style="width:100%;height:315rpx;border-top-left-radius:10px;border-top-right-radius:10px;" src="{{BASE_URL+item.banner[0].url}}"></image></view><view style="font-size:25rpx;">{{item.title}}</view><view style="display:flex;align-items:center;justify-content:space-between;margin-top:5px;"><view style="font-weight:bold;font-size:32rpx;color:red;">{{'￥'+item.startMoneys+''}}</view><view><image style="width:50rpx;height:50rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/shop.png'}}"></image></view></view></view></block></block></block></view></view></scroll-view></view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/means/index.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/means/index.wxss
new file mode 100644
index 0000000..a3ba649
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/means/index.wxss
@@ -0,0 +1 @@
+.btns{color:red}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/meansdetail/index.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/meansdetail/index.json
new file mode 100644
index 0000000..09817e9
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/meansdetail/index.json
@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "商品详情",
+  "usingComponents": {
+    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup",
+    "uni-badge": "/uni_modules/uni-badge/components/uni-badge/uni-badge"
+  }
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/meansdetail/index.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/meansdetail/index.wxml
new file mode 100644
index 0000000..ade0d44
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/meansdetail/index.wxml
@@ -0,0 +1 @@
+<view class="container"><swiper class="swiper" autoplay="{{autoplay}}" circular="{{true}}" duration="{{duration}}" indicatorDots="{{indicatorDots}}" interval="{{interval}}"><swiper-item><view class="swiper-item uni-bg-red" style="height:700rpx;"><block wx:for="{{model.banner}}" wx:for-item="item" wx:for-index="index" wx:key="index"><image style="width:100%;height:100%;" mode="aspectFill" src="{{BASE_URL+item.url}}"></image></block></view></swiper-item></swiper><view style="background-color:white;border-radius:20rpx;margin:20rpx;padding:25rpx;"><view style="font-weight:bold;color:red;font-size:45rpx;">{{'￥'+model.startMoneys+'-'+model.endMoneys+''+''}}</view><view style="margin-top:20rpx;font-size:28rpx;">{{''+model.title+''}}</view></view><view data-event-opts="{{[['tap',[['OpenGoods',['$event']]]]]}}" style="background-color:white;border-radius:20rpx;margin:20rpx;padding:25rpx;" bindtap="__e"><view style="display:flex;align-items:center;justify-content:space-between;"><view style="display:flex;align-items:center;font-size:28rpx;"><view style="color:gray;">选择</view><view style="margin-left:20rpx;">请选择规格</view></view><view><image style="width:40rpx;height:40rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/right.png'}}"></image></view></view><view style="display:flex;align-items:center;justify-content:center;margin-top:10rpx;"><block wx:for="{{cardlist}}" wx:for-item="item" wx:for-index="index" wx:key="index"><block wx:if="{{index<2}}"><view style="padding:10rpx 20rpx;color:gray;background-color:#F7F7F7;font-size:27rpx;margin-right:5rpx;">{{''+item.Title+''}}</view></block></block><view style="padding:10rpx 20rpx;color:gray;background-color:#F7F7F7;font-size:27rpx;">{{''+('共'+cardlist.length+'个规格可选')+''}}</view></view></view><view style="background-color:white;border-radius:20rpx;margin:20rpx;padding:25rpx;"><view style="display:flex;align-items:center;justify-content:space-between;"><view>{{'商品评价（'+commenttotal+'）'}}</view><view style="display:flex;align-items:center;color:red;"><view data-event-opts="{{[['tap',[['ShowCommentDetail',['$event']]]]]}}" style="font-size:25rpx;" bindtap="__e">查看全部</view><view><image style="width:30rpx;height:30rpx;margin-top:9rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/redright.png'}}"></image></view></view></view><block wx:for="{{coomentlist}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view><view style="display:flex;align-items:center;justify-content:space-between;margin-top:50rpx;"><view style="display:flex;align-items:center;"><view><image style="width:50rpx;height:50rpx;border-radius:100px;" src="{{item.user!=null?item.user.HeadIcon:''}}"></image></view><view style="margin-left:30rpx;color:gray;font-size:25rpx;">{{''+(''+(item.user&&item.user.RealName)+'')+''}}</view></view><view style="color:gray;font-size:25rpx;">{{''+item.creatorTime+''}}</view></view><view style="font-size:28rpx;margin:20rpx;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;line-clamp:2;-webkit-box-orient:vertical;">{{''+(''+item.txt+'')+''}}</view><view style="font-size:25rpx;margin:20rpx;color:gray;">{{item.title}}</view></view></block></view><view style="background-color:white;border-radius:20rpx;margin:20rpx;padding:25rpx;"><view style="width:100%;margin:0 auto;"><image style="width:100%;height:50rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/imagedetail.PNG'}}"></image></view><swiper style="height:300rpx;width:300rpx;margin-top:20rpx;" autoplay="{{autoplay}}" circular="true" duration="{{duration}}" indicatorDots="{{indicatorDots}}" interval="{{interval}}"><swiper-item><view class="swiper-item uni-bg-red" style="background-color:pink;height:300rpx;"><block wx:for="{{model.banner}}" wx:for-item="item" wx:for-index="index" wx:key="index"><image style="width:100%;height:100%;" src="{{BASE_URL+item.url}}"></image></block></view></swiper-item></swiper></view><view style="width:100%;margin-top:20rpx;text-align:center;"><image style="width:280rpx;height:60rpx;text-align:center;" src="{{BASE_URL+'/api/File/Image/annexpic/likeimage.PNG'}}"></image></view><view style="border-radius:20rpx;padding:10rpx;margin-bottom:100rpx;"><view style="display:flex;flex-wrap:wrap;width:100%;"><block wx:if="{{likelist.length==0}}"><view style="width:100%;display:flex;align-items:center;justify-content:center;flex-direction:column;"><image style="width:400rpx;height:400rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/nullImg.png'}}"></image><text style="color:gray;font-size:30rpx;">暂无数据</text></view></block><block wx:for="{{likelist}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['RedirectMeansDetail',['$0'],[[['likelist','',index]]]]]]]}}" style="width:45%;background-color:white;margin:5rpx;box-shadow:0 0 1em 0em #CDC7C7;padding:10rpx;border-radius:10px;" bindtap="__e"><view><image style="width:100%;height:290rpx;border-top-left-radius:10px;border-top-right-radius:10px;" src="{{BASE_URL+item.banner[0].url}}"></image></view><view style="font-size:25rpx;">{{item.title}}</view><view style="display:flex;align-items:center;justify-content:space-between;margin-top:5px;"><view style="font-weight:bold;font-size:32rpx;color:red;">{{'￥'+item.startMoneys}}</view><view><image style="width:50rpx;height:50rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/shop.png'}}"></image></view></view></view></block></view></view><uni-popup class="vue-ref" style="margin:0px !important;" vue-id="57302e6d-1" data-ref="goodspopup" bind:__l="__l" vue-slots="{{['default']}}"><view style="background-color:white;border-radius:20rpx;padding:20rpx;"><view style="display:flex;justify-content:space-between;padding-bottom:20rpx;border-bottom:1px solid #e0e0e0;"><view style="display:flex;align-items:center;"><view><image style="width:120rpx;height:120rpx;" src="{{BASE_URL+model.banner[0].url}}"></image></view><view style="margin-left:20rpx;"><view style="font-weight:bold;font-size:35rpx;color:red;">{{'￥'+moneys}}</view><view style="color:gray;font-size:25rpx;"></view></view></view><view><image style="width:50rpx;height:50rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/dels.png'}}" data-event-opts="{{[['tap',[['ClosePopup',['$event']]]]]}}" bindtap="__e"></image></view></view><view><view style="font-size:28rpx;color:gray;padding:20rpx;">规格</view><view style="display:flex;align-items:center;flex-wrap:wrap;font-size:25rpx;"><block wx:for="{{cardlist}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['CurrentChange',['$0',index],[[['cardlist','',index]]]]]]]}}" class="{{[currentIndex==index?'checked':'']}}" style="background-color:#F7F7F7;padding:10rpx 25rpx;border-radius:10rpx;margin:20rpx;" bindtap="__e">{{''+item.Title+''}}</view></block></view></view><view style="padding:20rpx;display:flex;align-items:center;justify-content:space-between;padding-bottom:20rpx;border-bottom:1px solid #e0e0e0;"><view>数量</view><view style="display:flex;align-items:center;"><view data-event-opts="{{[['tap',[['Reduce',['$event']]]]]}}" style="background-color:#F7F7F7;width:50rpx;height:50rpx;padding:10rpx;text-align:center;display:flex;align-items:center;justify-content:center;" bindtap="__e"><image style="width:30rpx;height:30rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/jian.png'}}"></image></view><view style="display:flex;align-items:center;justify-content:center;background-color:#F7F7F7;width:80rpx;height:50rpx;padding:10rpx;text-align:center;margin:0px 5rpx 0px 5rpx;color:#CDC7C7;">{{''+(''+number+'')+''}}</view><view data-event-opts="{{[['tap',[['Add',['$event']]]]]}}" style="background-color:#F7F7F7;width:50rpx;height:50rpx;padding:10rpx;text-align:center;display:flex;align-items:center;justify-content:center;" bindtap="__e"><image style="width:35rpx;height:35rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/jia.png'}}"></image></view></view></view><view style="margin-top:20rpx;"><view style="display:flex;align-items:center;justify-content:space-between;width:100%;"><view data-event-opts="{{[['tap',[['ConfirmShop',['$event']]]]]}}" style="background-color:#F6B241;padding:20rpx 30rpx 20rpx 30rpx;width:40%;border-radius:20rpx;text-align:center;color:white;font-weight:bold;font-size:28rpx;" bindtap="__e">加入购物车</view><view data-event-opts="{{[['tap',[['ConfirmOrder',['$event']]]]]}}" style="background-color:#FF6E6D;padding:20rpx 30rpx 20rpx 30rpx;width:40%;border-radius:20rpx;text-align:center;font-weight:bold;color:white;font-size:28rpx;" bindtap="__e">立即购买</view></view></view></view></uni-popup><view style="background-color:white;position:fixed;bottom:0px;width:100%;height:60rpx;padding:20rpx;display:flex;align-items:center;justify-content:space-around;"><view data-event-opts="{{[['tap',[['RedirectIndex',['$event']]]]]}}" style="width:10%;text-align:center;" bindtap="__e"><view style="text-align:center;"><image style="width:28rpx;height:28rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/house.png'}}"></image></view><view style="font-size:20rpx;color:gray;">首页</view></view><view style="width:10%;text-align:center;"><view style="text-align:center;display:flex;align-items:center;justify-content:center;"><button style="padding:0px;margin:0px;height:45rpx;display:flex;align-items:center;border:0px;" openType="contact" plain="true" type="default"><image style="width:25rpx;height:25rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/message.png'}}"></image></button></view><view style="font-size:20rpx;color:gray;">客服</view></view><view data-event-opts="{{[['tap',[['ChangeCollect',['$event']]]]]}}" style="width:10%;text-align:center;" bindtap="__e"><view style="text-align:center;"><block wx:if="{{isshow}}"><image style="width:40rpx;height:40rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/yesaixin.png'}}"></image></block><block wx:else><image style="width:28rpx;height:28rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/noaixin.png'}}"></image></block></view><view style="font-size:20rpx;color:gray;">收藏</view></view><view style="display:flex;align-items:center;font-size:20rpx;width:70%;margin-left:30rpx;"><view data-event-opts="{{[['tap',[['JoinGWC',['$event']]]]]}}" style="border-bottom-left-radius:20rpx;border-top-left-radius:20rpx;padding:10rpx;color:white;background-color:#F6B241;width:40%;height:40rpx;line-height:40rpx;text-align:center;" bindtap="__e">加入购物车</view><view data-event-opts="{{[['tap',[['Buy',['$event']]]]]}}" style="border-bottom-right-radius:20rpx;border-top-right-radius:20rpx;padding:10rpx;color:white;background-color:#FF6E6D;width:40%;height:40rpx;line-height:40rpx;text-align:center;" bindtap="__e">立即购买</view></view></view><view style="position:fixed;bottom:150px;right:20px;"><block wx:if="{{ShopStock>0}}"><uni-badge vue-id="57302e6d-2" size="small" text="{{ShopStock}}" type="success" absolute="rightTop" bind:__l="__l" vue-slots="{{['default']}}"><view data-event-opts="{{[['tap',[['RedirectShop',['$event']]]]]}}" style="background-color:white;border-radius:50px;text-align:center;padding:10rpx;box-shadow:0px -10px 20px -5px #FD96E6;" bindtap="__e"><image style="width:45rpx;height:45rpx;border-radius:50px;" mode="aspectFill" src="{{BASE_URL+'/api/File/Image/annexpic/shopimg.png'}}"></image></view></uni-badge></block><block wx:else><view data-event-opts="{{[['tap',[['RedirectShop',['$event']]]]]}}" style="background-color:white;border-radius:50px;text-align:center;padding:10rpx;box-shadow:0px -10px 20px -5px #FD96E6;" bindtap="__e"><image style="width:45rpx;height:45rpx;border-radius:50px;" mode="aspectFill" src="{{BASE_URL+'/api/File/Image/annexpic/shopimg.png'}}"></image></view></block></view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/meansdetail/index.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/meansdetail/index.wxss
new file mode 100644
index 0000000..ed6566e
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/meansdetail/index.wxss
@@ -0,0 +1 @@
+.swiper{height:700rpx}.container{background-color:#f7f7f7}.checked{color:#fff;background-color:pink!important}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/bank.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/bank.json
new file mode 100644
index 0000000..d7206f6
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/bank.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "银行选择",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/bank.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/bank.wxml
new file mode 100644
index 0000000..4f9b3f8
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/bank.wxml
@@ -0,0 +1 @@
+<view class="_div"></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/code.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/code.json
new file mode 100644
index 0000000..40d3d93
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/code.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "专属二维码",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/code.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/code.wxml
new file mode 100644
index 0000000..921124f
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/code.wxml
@@ -0,0 +1 @@
+<view style="width:100%;background-color:#F7F7F7;min-height:100vh;background-size:100% 100%;padding-top:30%;"><view style="height:500rpx;width:500rpx;display:flex;align-items:center;justify-content:center;text-align:center;border:1px solid gray;background-color:white;border-radius:20rpx;margin:0 auto;"><view style="margin-top:20rpx;"><view><image style="width:300rpx;height:300rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/'+imgsrc}}" show-menu-by-longpress="true"></image></view><view style="margin-top:50rpx;"><text>{{'分享人:'+user.realName}}</text></view></view></view><view class="centerview" style="margin-top:20rpx;"><button openType="share" type="primary">分享小程序</button></view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/index.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/index.json
new file mode 100644
index 0000000..c0a8251
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/index.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "我的",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/index.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/index.wxml
new file mode 100644
index 0000000..776b8be
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/index.wxml
@@ -0,0 +1 @@
+<view class="container"><image style="width:100%;height:500rpx;position:fixed;top:0;z-index:-1;" src="{{BASE_URL+'/api/File/Image/annexpic/bgimage.jpeg'}}"></image><view style="display:flex;align-items:center;justify-content:space-between;"><view style="display:flex;align-items:center;padding:40rpx;"><view><image style="border-radius:50%;width:100rpx;height:100rpx;border:2px solid white;" src="{{user.headIcon}}"></image></view><view style="margin-left:10px;font-size:45rpx;color:white;"><text>{{user.realName}}</text></view></view><view><view data-event-opts="{{[['tap',[['RedirectInfo',['$event']]]]]}}" style="display:flex;align-items:center;border:1px solid white;padding:5rpx 20rpx 5rpx 20rpx;border-top-left-radius:20px;border-bottom-left-radius:20px;border-right:0px;margin-top:10rpx;" bindtap="__e"><view style="margin-right:5px;margin-top:5px;"><image style="width:32rpx;height:32rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/address.png'}}"></image></view><view style="font-size:30rpx;color:white;">个人资料</view></view></view></view><view style="width:100%;display:flex;align-items:center;margin-top:20px;"><view style="width:50%;text-align:center;border-right:1px solid white;color:white;"><view data-event-opts="{{[['tap',[['RedirectMyCollect',['$event']]]]]}}" bindtap="__e"><text>{{collectCount}}</text><view style="display:flex;align-items:center;justify-content:center;"><view><image style="width:50rpx;height:50rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/collect.png'}}"></image></view><view style="margin-left:5px;">我的收藏</view></view></view></view><view style="width:50%;text-align:center;color:white;"><view data-event-opts="{{[['tap',[['RedirectOrder',[0]]]]]}}" style="width:100%;text-align:center;" bindtap="__e"><view><text>{{orderCount}}</text><view style="display:flex;align-items:center;justify-content:center;"><view><image style="width:50rpx;height:50rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/track.png'}}"></image></view><view style="margin-left:5px;">我的订单</view></view></view></view></view></view><view style="margin:100rpx 20rpx 0rpx 20rpx;"><view style="background-color:white;border-radius:10px;padding:10px;box-shadow:0px 0px 1em 0.5em #e0e0e0;"><view style="display:flex;align-items:center;justify-content:space-between;"><view style="font-weight:bold;font-size:38rpx;">我的订单</view><view style="display:flex;align-items:center;font-size:28rpx;"><view data-event-opts="{{[['tap',[['RedirectOrder',[0]]]]]}}" style="color:gray;" bindtap="__e">查看更多</view><view><image style="width:20rpx;height:20rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/right.png'}}"></image></view></view></view><view style="display:flex;align-items:center;justify-content:space-around;margin-top:20rpx;"><view data-event-opts="{{[['tap',[['RedirectOrder',[1]]]]]}}" bindtap="__e"><view style="text-align:center;"><image style="width:50rpx;height:50rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/nopayment.png'}}"></image></view><view><text style="color:gray;font-size:25rpx;">待付款</text></view></view><view data-event-opts="{{[['tap',[['RedirectOrder',[2]]]]]}}" bindtap="__e"><view style="text-align:center;"><image style="width:50rpx;height:50rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/awaitdiliver.png'}}"></image></view><view><text style="color:gray;font-size:25rpx;">待收货</text></view></view><view data-event-opts="{{[['tap',[['RedirectOrder',[3]]]]]}}" bindtap="__e"><view style="text-align:center;"><image style="width:60rpx;height:60rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/awaitreap.png'}}"></image></view><view><text style="color:gray;font-size:25rpx;">待评价</text></view></view><view data-event-opts="{{[['tap',[['RedirectOrder',[4]]]]]}}" bindtap="__e"><view style="text-align:center;"><image style="width:50rpx;height:50rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/alreadyok.png'}}"></image></view><view><text style="color:gray;font-size:25rpx;">已完成</text></view></view></view></view></view><view style="margin-top:20px;"><view style="font-weight:bold;font-size:35rpx;padding-left:10px;">菜单栏</view><block wx:if="{{user.type=='1'||user.type=='2'}}"><view data-event-opts="{{[['tap',[['RedirectInvited',['$event']]]]]}}" style="display:flex;align-items:center;justify-content:space-between;padding:10px;margin-left:15px;" bindtap="__e"><view style="display:flex;align-items:center;"><view style="margin-top:5px;"><image style="width:40rpx;height:40rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/number1.png'}}"></image></view><view style="margin-left:10px;color:#40403C;">下级订单</view></view><view><image style="width:30rpx;height:30rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/right.png'}}"></image></view></view></block><block wx:if="{{user.type=='1'||user.type=='2'}}"><view data-event-opts="{{[['tap',[['ReportNewDetail',['$event']]]]]}}" style="display:flex;align-items:center;justify-content:space-between;padding:10px;margin-left:15px;" bindtap="__e"><view style="display:flex;align-items:center;"><view style="margin-top:5px;"><image style="width:40rpx;height:40rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/number1.png'}}"></image></view><view style="margin-left:10px;color:#40403C;">新用户报备</view></view><view><image style="width:30rpx;height:30rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/right.png'}}"></image></view></view></block><view data-event-opts="{{[['tap',[['ReportDetail',['$event']]]]]}}" style="display:flex;align-items:center;justify-content:space-between;padding:10px;margin-left:15px;" bindtap="__e"><view style="display:flex;align-items:center;"><view style="margin-top:5px;"><image style="width:40rpx;height:40rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/number1.png'}}"></image></view><view style="margin-left:10px;color:#40403C;">在线报备</view></view><view><image style="width:30rpx;height:30rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/right.png'}}"></image></view></view><view data-event-opts="{{[['tap',[['RedirectZSYJ',['$event']]]]]}}" style="display:flex;align-items:center;justify-content:space-between;padding:10px;margin-left:15px;" bindtap="__e"><view style="display:flex;align-items:center;"><view style="margin-top:5px;"><image style="width:40rpx;height:40rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/number1.png'}}"></image></view><view style="margin-left:10px;color:#40403C;">纸质证书邮寄信息</view></view><view><image style="width:30rpx;height:30rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/right.png'}}"></image></view></view><block wx:if="{{user.type=='1'||user.type=='2'}}"><view data-event-opts="{{[['tap',[['RedirectCode',['$event']]]]]}}" style="display:flex;align-items:center;justify-content:space-between;padding:10px;margin-left:15px;" bindtap="__e"><view style="display:flex;align-items:center;"><view style="margin-top:5px;"><image style="width:40rpx;height:40rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/number1.png'}}"></image></view><view style="margin-left:10px;color:#40403C;">专属二维码</view></view><view><image style="width:30rpx;height:30rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/right.png'}}"></image></view></view></block><view style="display:flex;align-items:center;justify-content:space-between;padding:10px;margin-left:15px;"><view data-event-opts="{{[['tap',[['RedirectPolicy',['$event']]]]]}}" style="display:flex;align-items:center;" bindtap="__e"><view style="margin-top:5px;"><image style="width:40rpx;height:40rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/number1.png'}}"></image></view><view style="margin-left:10px;color:#40403C;">退款政策</view></view><view><image style="width:30rpx;height:30rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/right.png'}}"></image></view></view><view style="display:flex;align-items:center;justify-content:space-between;padding:10px;margin-left:15px;"><view style="display:flex;align-items:center;"><button style="padding:0px;margin:0px;height:45rpx;display:flex;align-items:center;border:0px;" openType="contact" plain="true" type="default"><view style="margin-top:13px;"><image style="width:50rpx;height:50rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/kf.png'}}"></image></view><view style="margin-left:10px;color:#40403C;">客服</view></button></view><view><image style="width:30rpx;height:30rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/right.png'}}"></image></view></view></view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/info.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/info.json
new file mode 100644
index 0000000..5abf709
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/info.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "个人信息",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/info.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/info.wxml
new file mode 100644
index 0000000..c0ddda4
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/info.wxml
@@ -0,0 +1 @@
+<view class="container" style="padding:20rpx;"><view style="font-size:25rpx;"><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>头像:</view><view><button type="balanced" open-type="chooseAvatar" data-event-opts="{{[['chooseavatar',[['onChooseavatar',['$event']]]]]}}" bindchooseavatar="__e"><image class="refreshIcon" style="width:100rpx;height:100rpx;border-radius:50rpx;" src="{{model.headIcon}}" mode="aspectFit"></image></button></view></view><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>用户名:</view><view><input style="text-align:right;" placeholder="请输入用户名" type="nickname" data-event-opts="{{[['input',[['__set_model',['$0','realName','$event',[]],['model']]]]]}}" value="{{model.realName}}" bindinput="__e"/></view></view><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>身份:</view><view>{{''+(model.type=='1'?'代理':'普通用户')+''}}</view></view><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>邮箱:</view><view><input style="text-align:right;" placeholder="请输入邮箱" type="text" data-event-opts="{{[['input',[['__set_model',['$0','email','$event',[]],['model']]]]]}}" value="{{model.email}}" bindinput="__e"/></view></view><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>手机号:</view><view><input style="text-align:right;" placeholder="请输入手机号" type="text" data-event-opts="{{[['input',[['__set_model',['$0','mobilePhone','$event',[]],['model']]]]]}}" value="{{model.mobilePhone}}" bindinput="__e"/></view></view><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>地址:</view><view><input style="text-align:right;" placeholder="请输入地址" type="text" data-event-opts="{{[['input',[['__set_model',['$0','postalAddress','$event',[]],['model']]]]]}}" value="{{model.postalAddress}}" bindinput="__e"/></view></view><block wx:if="{{false}}"><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>开户行:</view><view><input style="text-align:right;width:100%;" placeholder="请输入开户行,请准确填写" type="text"/></view></view></block><block wx:if="{{false}}"><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>开户姓名:</view><view><input style="text-align:right;" placeholder="请输入开户姓名,请准确填写" type="text"/></view></view></block><block wx:if="{{false}}"><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>卡号:</view><view><input style="text-align:right;" placeholder="请输入卡号,请准确填写" type="text"/></view></view></block></view><view data-event-opts="{{[['tap',[['Submit',['$event']]]]]}}" class="centerview" style="margin-top:20rpx;" bindtap="__e">确认</view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/info.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/info.wxss
new file mode 100644
index 0000000..26af42d
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/info.wxss
@@ -0,0 +1 @@
+.centerview{margin:0 auto;width:90%;border:1px solid #f2e2ac;border-radius:10px;background-color:#f2e2ac;text-align:center;z-index:99999999999;height:40px;line-height:40px;color:#000;-webkit-animation:scaleDrawC 2s;animation:scaleDrawC 2s;-webkit-transform-origin:50% 50%;transform-origin:50% 50%;-webkit-animation-name:scaleDrawC!important;-webkit-animation-timing-function:ease-in-out;-webkit-animation-iteration-count:infinite;-webkit-animation-duration:2s}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/mycollect/index.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/mycollect/index.json
new file mode 100644
index 0000000..c1b3d78
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/mycollect/index.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "我的收藏",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/mycollect/index.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/mycollect/index.wxml
new file mode 100644
index 0000000..b6df246
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/mycollect/index.wxml
@@ -0,0 +1 @@
+<view class="container"><view style="display:flex;align-items:center;justify-content:space-between;font-size:40rpx;border-bottom:1px solid #e0e0e0;padding-bottom:10px;background-color:white;padding:20rpx;"><view data-event-opts="{{[['tap',[['change',[1]]]]]}}" class="{{[num==1?'btn':'']}}" bindtap="__e">商品</view><view data-event-opts="{{[['tap',[['ChangeInfo',['$event']]]]]}}" style="font-size:25rpx;" bindtap="__e">{{IsStyle==false?'管理':'完成'}}</view></view><block wx:if="{{num==1}}"><view><view style="margin-top:20rpx;"><block wx:if="{{list.length==0}}"><view style="width:100%;display:flex;align-items:center;justify-content:center;flex-direction:column;"><image style="width:400rpx;height:400rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/nullImg.png'}}"></image><text style="color:gray;font-size:30rpx;">暂无数据</text></view></block><block wx:else><block><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view style="display:flex;align-items:center;background-color:white;padding:10rpx;margin:20rpx 0rpx 20rpx 0rpx;"><block wx:if="{{IsStyle}}"><view><checkbox-group data-event-opts="{{[['change',[['changeitem',['$0'],[[['list','',index]]]]]]]}}" style="margin:0 auto;" bindchange="__e"><checkbox style="transform:scale(0.8);" checked="{{item.checked}}"></checkbox></checkbox-group></view></block><view data-event-opts="{{[['tap',[['RedirectDetail',['$0'],[[['list','',index]]]]]]]}}" style="display:flex;align-items:center;" bindtap="__e"><view><image style="width:200rpx;height:200rpx;" src="{{item.goods!=null?BASE_URL+item.goods.Banner[0].url:''}}"></image></view><view style="margin-left:20rpx;display:flex;flex-direction:column;height:200rpx;justify-content:space-evenly;"><view>{{item.goods&&item.goods.Title}}</view><view><text style="color:red;font-size:20rpx;">￥</text><text style="color:red;font-weight:bold;">{{item.goods&&item.goods.StartMoneys}}</text></view></view></view></view></block></block></block></view></view></block><block wx:if="{{IsStyle}}"><view style="background-color:white;padding:20rpx;display:flex;align-items:center;position:fixed;bottom:0px;width:100%;border-top:1px solid #e0e0e0;"><view style="width:50%;"><label><checkbox-group data-event-opts="{{[['change',[['selectAll',['$event']]]]]}}" style="margin:0 auto;" bindchange="__e"><checkbox style="transform:scale(0.8);" checked="{{allChecked}}"></checkbox><text style="margin-top:5rpx;font-size:25rpx;">全选</text></checkbox-group></label></view><view style="width:50%;"><view data-event-opts="{{[['tap',[['DelCollectGoods',['$event']]]]]}}" style="padding:20rpx;border-radius:20rpx;border:1px solid #e0e0e0;width:30%;text-align:center;margin:0 auto;" bindtap="__e"><text>删除</text></view></view></view></block></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/mytrack/index.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/mytrack/index.json
new file mode 100644
index 0000000..8e84c6c
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/mytrack/index.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "我的足迹",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/mytrack/index.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/mytrack/index.wxml
new file mode 100644
index 0000000..faeceb8
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/mytrack/index.wxml
@@ -0,0 +1 @@
+<view class="container"></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/order/order.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/order/order.json
new file mode 100644
index 0000000..aa73fde
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/order/order.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "我的订单",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/order/order.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/order/order.wxml
new file mode 100644
index 0000000..90d4c28
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/order/order.wxml
@@ -0,0 +1 @@
+<view class="container"><view style="background-color:#EFEFF4;min-height:100rpx;padding:20rpx;"><view style="width:95%;border-radius:30rpx;background-color:white;padding:20rpx;"><input maxlength="20" placeholder="订单号搜索" placeholderStyle="font-size:25rpx" type="text" data-event-opts="{{[['blur',[['Search',['$event']]]],['input',[['__set_model',['$0','orderNumber','$event',[]],['model']]]]]}}" value="{{model.orderNumber}}" bindblur="__e" bindinput="__e"/></view></view><view style="padding:20rpx;display:flex;align-items:center;justify-content:space-around;font-size:25rpx;"><view data-event-opts="{{[['tap',[['Change',[0]]]]]}}" class="{{[num==0?'btn':'']}}" style="padding-bottom:10rpx;" bindtap="__e">全部</view><view data-event-opts="{{[['tap',[['Change',[1]]]]]}}" class="{{[num==1?'btn':'']}}" style="padding-bottom:10rpx;" bindtap="__e">待付款</view><view data-event-opts="{{[['tap',[['Change',[2]]]]]}}" class="{{[num==2?'btn':'']}}" style="padding-bottom:10rpx;" bindtap="__e">待收货</view><view data-event-opts="{{[['tap',[['Change',[3]]]]]}}" class="{{[num==3?'btn':'']}}" style="padding-bottom:10rpx;" bindtap="__e">待评价</view><view data-event-opts="{{[['tap',[['Change',[4]]]]]}}" class="{{[num==4?'btn':'']}}" style="padding-bottom:10rpx;" bindtap="__e">已完成</view></view><view><block wx:if="{{list.length==0}}"><view style="width:100%;display:flex;align-items:center;justify-content:center;flex-direction:column;"><image style="width:400rpx;height:400rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/nullImg.png'}}"></image><text style="color:gray;font-size:30rpx;">暂无数据</text></view></block><block wx:else><block><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['RedirectDetail',['$0'],[[['list','',index]]]]]]]}}" style="margin:20rpx;background-color:white;border-radius:20rpx;padding:20rpx;" catchtap="__e"><view style="display:flex;align-items:center;justify-content:space-between;font-size:25rpx;border-bottom:1px solid #e0e0e0;padding-bottom:20rpx;"><view style="color:gray;">{{'订单号:'+item.orderNumber+''}}</view><view style="{{(item.type=='1'?'color:red':'color:gray')}}">{{''+(''+(item.type=='1'?'待付款':item.type=='2'?'待收货':item.type=='3'?'待评价':item.type=='4'?'已完成':item.type=='5'?'已取消':item.type=='6'?'售后中':'异常订单')+'')+''}}</view></view><block wx:for="{{item.jsonDetail.arrayJsons}}" wx:for-item="childrenItem" wx:for-index="index" wx:key="index"><view style="display:flex;align-items:center;justify-content:space-between;margin:20rpx;"><view><view style="display:flex;"><view><image style="width:200rpx;height:200rpx;" src="{{childrenItem.goods!=null?childrenItem.goods.banner[0].url==undefined?BASE_URL+childrenItem.goods.Banner[0].url:BASE_URL+childrenItem.goods.banner[0].url:''}}"></image></view><view style="font-size:25rpx;margin-left:20rpx;line-height:50rpx;"><view style="font-size:28rpx;">{{(childrenItem.goods&&childrenItem.goods.Title?childrenItem.goods.Title:childrenItem.goods&&childrenItem.goods.title)+''}}</view><view style="color:GRAY;">{{''+('规格:'+(childrenItem.jsonDetail&&childrenItem.jsonDetail.Title)+'')+''}}</view><view style="color:gray;">{{'x'+childrenItem.count}}</view></view></view></view><view style="font-size:25rpx;">{{'￥'+childrenItem.count*childrenItem.jsonDetail.Moneys+''+''}}</view></view></block><view style="display:flex;align-items:center;justify-content:space-between;"><view style="color:gray;font-size:23rpx;">{{''+(''+((item.user&&item.user.BankNumber)==null?'暂无效验码':item.user&&item.user.BankNumber)+'')+''}}</view><view><text style="color:gray;font-size:23rpx;">合计</text><text style="color:red;">{{'￥'+item.totalMoneys}}</text></view></view><view style="display:flex;align-items:center;justify-content:flex-end;margin-top:20rpx;width:100%;"><view></view><view style="display:flex;align-items:center;font-size:25rpx;justify-content:space-around;"><block wx:if="{{item.type=='1'}}"><view data-event-opts="{{[['tap',[['ExsitOrder',['$0'],[[['list','',index]]]]]]]}}" style="border:1px solid #e0e0e0;padding:10rpx 20rpx 10rpx 20rpx;border-radius:100rpx;background-color:#e0e0e0;color:black;margin-right:10rpx;" catchtap="__e">取消订单</view></block><block wx:if="{{item.type=='1'}}"><view data-event-opts="{{[['tap',[['CofirmPay',['$0'],[[['list','',index]]]]]]]}}" style="border:1px solid red;padding:10rpx 20rpx 10rpx 20rpx;border-radius:100rpx;background-color:#FF3401;color:white;margin-right:10rpx;" catchtap="__e">立即付款</view></block><block wx:if="{{item.type=='2'}}"><view data-event-opts="{{[['tap',[['ConfrimYes',['$0'],[[['list','',index]]]]]]]}}" style="border:1px solid green;padding:10rpx 20rpx 10rpx 20rpx;border-radius:100rpx;background-color:seagreen;color:white;margin-right:10rpx;" catchtap="__e">确认收货</view></block><block wx:if="{{item.type=='3'}}"><view data-event-opts="{{[['tap',[['StartComment',['$0'],[[['list','',index]]]]]]]}}" style="border:1px solid gray;color:black;padding:10rpx 20rpx 10rpx 20rpx;border-radius:100rpx;background-color:white;margin-right:10rpx;" catchtap="__e">立即评价</view></block><block wx:if="{{item.type=='4'||item.type=='5'}}"><view data-event-opts="{{[['tap',[['DelOrder',['$0'],[[['list','',index]]]]]]]}}" style="padding:10rpx 20rpx 10rpx 20rpx;border-radius:100rpx;background-color:orangered;color:white;margin-right:10rpx;" catchtap="__e">删除订单</view></block></view></view></view></block></block></block></view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/order/order.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/order/order.wxss
new file mode 100644
index 0000000..d13553b
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/order/order.wxss
@@ -0,0 +1 @@
+.btn{border-bottom:2px solid red;color:red}.container{background-color:#f7f7f7;min-height:100vh}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/orderdetail/index.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/orderdetail/index.json
new file mode 100644
index 0000000..95c7a35
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/orderdetail/index.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "订单详情",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/orderdetail/index.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/orderdetail/index.wxml
new file mode 100644
index 0000000..3b0dd6e
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/orderdetail/index.wxml
@@ -0,0 +1 @@
+<view class="container"><view style="{{('padding:40rpx;'+'background-image:url('+BASE_URL+'/api/File/Image/annexpic/bgimage.jpeg)')}}"><view style="display:flex;align-items:center;justify-content:center;"><view><image style="width:50rpx;height:50rpx;margin-top:10rpx;margin-right:10rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/dates.png'}}"></image></view><view style="color:white;font-size:28rpx;">{{''+(model.type=='1'?'待付款':model.type=='2'?'待收货':model.type=='3'?'待评价':model.type=='4'?'已完成':model.type=='5'?'已取消':model.type=='6'?'售后中':'异常订单')+''}}</view></view></view><view style="background-color:white;padding:20rpx;border-radius:20rpx;"><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #e0e0e0;"><view style="display:flex;align-items:center;"><view><image style="width:50rpx;height:50rpx;margin-top:10rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/rooms.png'}}"></image></view><view style="font-size:28rpx;color:black;margin-left:10rpx;">朗思测评教育</view></view><view><image style="width:30rpx;height:30rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/right.png'}}"></image></view></view><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #e0e0e0;font-size:25rpx;"><view style="font-size:25rpx;color:black;margin-left:10rpx;">联系方式</view><view style="color:gray;">17798297507</view></view><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #e0e0e0;font-size:25rpx;"><view style="font-size:25rpx;color:black;margin-left:10rpx;">发货方式</view><view style="color:gray;">无需物流</view></view><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #e0e0e0;font-size:25rpx;"><view style="font-size:25rpx;color:black;margin-left:10rpx;">下单信息</view><view style="color:gray;">{{''+model.orderName+'+'+model.orderPhone+''}}</view></view></view><view style="margin:20rpx;background-color:white;padding:20rpx;border-radius:20rpx;"><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #e0e0e0;"><view style="font-size:30rpx;color:black;margin-left:10rpx;">订单信息</view><view></view></view><view style="display:flex;align-items:center;justify-content:space-between;padding-left:15rpx;margin-top:20rpx;"><view style="font-size:28rpx;color:black;margin-left:10rpx;">订单编号：<text>{{model.orderNumber}}</text></view><view data-event-opts="{{[['tap',[['Copy',['$event']]]]]}}" style="border-radius:40rpx;border:1px solid #e0e0e0;padding:8rpx 25rpx;font-size:20rpx;color:gray;" bindtap="__e">复制</view></view><view style="display:flex;align-items:center;justify-content:space-between;padding-left:15rpx;"><view style="font-size:28rpx;color:black;margin-left:10rpx;">下单时间：<text>{{model.creatorTime}}</text></view></view><view style="display:flex;align-items:center;justify-content:space-between;padding-left:15rpx;"><view style="font-size:28rpx;color:black;margin-left:10rpx;">支付方式：<text>微信支付</text></view></view><view style="display:flex;align-items:center;justify-content:space-between;padding-left:15rpx;"><view style="font-size:28rpx;color:black;margin-left:10rpx;">效验码：<text>{{(model.user&&model.user.BankNumber)==null?'暂无效验码':model.user&&model.user.BankNumber}}</text></view></view><view style="display:flex;align-items:center;justify-content:space-between;padding-left:15rpx;"><view style="{{('font-size:28rpx;margin-left:10rpx;'+model.type=='1'?'color:red;':'color:black')}}">订单状态：<text>{{model.type=='1'?'待付款':model.type=='2'?'待收货':model.type=='3'?'待评价':model.type=='4'?'已完成':model.type=='5'?'已取消':model.type=='6'?'售后中':'异常订单'}}</text></view></view></view><view style="margin:20rpx;background-color:white;padding:20rpx;border-radius:20rpx;"><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #e0e0e0;"><view style="font-size:30rpx;color:black;margin-left:10rpx;">平台自营</view><view></view></view><block wx:for="{{model.jsonDetail.arrayJsons}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view style="display:flex;align-items:center;justify-content:space-between;margin:20rpx;"><view><view style="display:flex;"><view><image style="width:200rpx;height:200rpx;" src="{{item.goods!=null?item.goods.banner[0].url==undefined?BASE_URL+item.goods.Banner[0].url:BASE_URL+item.goods.banner[0].url:''}}"></image></view><view style="font-size:25rpx;margin-left:20rpx;line-height:50rpx;"><view style="font-size:28rpx;">{{item.goods.Title}}</view><view style="color:GRAY;">{{'规格:'+item.jsonDetail.Title}}</view><view style="color:gray;">{{"x"+item.count}}</view></view></view></view><view style="font-size:25rpx;">{{'￥'+item.count*(item.jsonDetail&&item.jsonDetail.Moneys)+''}}</view></view></block><view style="display:flex;align-items:center;justify-content:space-between;"><view></view><view><text style="color:gray;font-size:25rpx;">合计</text><text style="color:red;">{{'￥'+model.jsonDetail.totalMoneys}}</text></view></view></view><view style="margin:20rpx;background-color:white;padding:20rpx;border-radius:20rpx;margin-bottom:150rpx;"><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #e0e0e0;"><view style="font-size:30rpx;color:black;margin-left:10rpx;">其他信息</view><view></view></view><view style="display:flex;align-items:center;justify-content:space-between;padding-left:15rpx;margin-top:20rpx;"><view style="font-size:28rpx;color:black;margin-left:10rpx;">选择内容：<text>{{model.classType}}</text></view></view><view style="display:flex;align-items:center;justify-content:space-between;padding-left:15rpx;margin-top:20rpx;"><view style="font-size:28rpx;color:black;margin-left:10rpx;">姓(拼音)：<text>{{model.surname}}</text></view></view><view style="display:flex;align-items:center;justify-content:space-between;padding-left:15rpx;margin-top:20rpx;"><view style="font-size:28rpx;color:black;margin-left:10rpx;">名(拼音)：<text>{{model.name}}</text></view></view><view style="display:flex;align-items:center;justify-content:space-between;padding-left:15rpx;margin-top:20rpx;"><view style="font-size:28rpx;color:black;margin-left:10rpx;">电话：<text>{{model.phone}}</text></view></view><view style="display:flex;align-items:center;justify-content:space-between;padding-left:15rpx;margin-top:20rpx;"><view style="font-size:28rpx;color:black;margin-left:10rpx;">邮箱：<text>{{model.email}}</text></view></view></view><block wx:if="{{model.type=='1'}}"><view style="position:fixed;bottom:0;background-color:white;width:100%;height:120rpx;box-shadow:0px -10px 20px -5px #e0e0e0;"><view style="margin:20rpx 20rpx 0rpx 20rpx;display:flex;align-items:center;justify-content:space-between;padding-bottom:20rpx;"><view><text style="font-size:20rpx;font-weight:bold;color:red;">合计:￥</text><text style="font-size:50rpx;color:red;font-weight:bold;">{{model.jsonDetail.totalMoneys}}</text></view><view data-event-opts="{{[['tap',[['Confirm',['$event']]]]]}}" style="background-color:red;border-radius:20rpx;padding:20rpx;font-weight:bold;color:white;" bindtap="__e">提交订单</view></view></view></block></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/payResult/index.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/payResult/index.json
new file mode 100644
index 0000000..5a85422
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/payResult/index.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "支付结果",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/payResult/index.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/payResult/index.wxml
new file mode 100644
index 0000000..f496385
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/payResult/index.wxml
@@ -0,0 +1 @@
+<view style="padding:20px;"><view style="text-align:center;margin-top:10%;"><view><image style="width:200rpx;height:200rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/success.png'}}"></image></view><view><text style="font-weight:bold;font-size:30rpx;">支付成功</text></view><view style="text-align:center;"><text style="font-weight:bold;font-size:100rpx;">{{'￥'+model.money}}</text></view><view style="padding:5px;border-top:1px solid #e0e0e0;border-bottom:1px solid #e0e0e0;margin-top:100rpx;display:flex;align-items:center;justify-content:space-between;font-size:25rpx;"><view>订单号</view><view style="display:flex;align-items:center;"><view style="margin-top:5px;margin-right:5px;"><image style="width:26px;height:26px;" mode="aspectFit" src="../../static/alipay.png"></image></view><view style="color:gray;">{{model.orderNumber}}</view></view></view><view style="padding:5px;border-top:1px solid #e0e0e0;border-bottom:1px solid #e0e0e0;display:flex;align-items:center;justify-content:space-between;font-size:25rpx;"><view>效验码</view><view style="display:flex;align-items:center;"><view style="margin-top:5px;margin-right:5px;"><image style="width:26px;height:26px;" mode="aspectFit" src="../../static/alipay.png"></image></view><view style="color:gray;">{{user.bankNumber}}</view></view></view><view style="padding:5px;border-top:1px solid #e0e0e0;border-bottom:1px solid #e0e0e0;display:flex;align-items:center;justify-content:space-between;font-size:25rpx;"><view>下单时间</view><view style="display:flex;align-items:center;"><view style="margin-top:5px;margin-right:5px;"><image style="width:26px;height:26px;" mode="aspectFit" src="../../static/alipay.png"></image></view><view style="color:gray;">{{model.orderTime}}</view></view></view><view style="border-top:1px solid #e0e0e0;font-size:25rpx;margin-bottom:100rpx;"><view style="border-bottom:1px solid #e0e0e0;margin:20rpx;padding-bottom:20rpx;">如需查看更多功能请关注公众号</view><view><image style="border-radius:20rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/qrcode.jpg'}}"></image></view></view></view><view style="position:fixed;bottom:10rpx;width:90%;"><view data-event-opts="{{[['tap',[['Confirm',['$event']]]]]}}" style="text-align:center;margin:0 auto;background-color:deepskyblue;padding:20rpx;color:white;font-weight:bold;border-radius:10px;font-size:26rpx;" bindtap="__e">完成</view></view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/school/detail.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/school/detail.json
new file mode 100644
index 0000000..1179275
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/school/detail.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "学校简介",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/school/detail.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/school/detail.wxml
new file mode 100644
index 0000000..094d8ef
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/school/detail.wxml
@@ -0,0 +1 @@
+<view class="container" style="padding:50rpx;"><view class="_p" style="text-align:center;font-size:30rpx;font-weight:bold;">{{model.remarkTitle}}</view><view style="font-size:25rpx;text-indent:5%;line-height:40rpx;margin-top:30rpx;">{{''+model.remark+''}}</view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/school/index.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/school/index.json
new file mode 100644
index 0000000..2dd71e5
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/school/index.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "认可院校",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/school/index.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/school/index.wxml
new file mode 100644
index 0000000..def570d
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/school/index.wxml
@@ -0,0 +1 @@
+<view class="container"><view style="background-color:#F7F7F7;border-radius:30px;padding:10rpx;margin-bottom:40rpx;"><view style="display:flex;align-items:center;"><view style="width:95%;border-radius:30rpx;background-color:white;padding:20rpx;color:gray;font-size:25rpx;"><input style="width:100%;" maxlength="20" placeholder="学校搜索" placeholderStyle="color:gray" type="text" data-event-opts="{{[['blur',[['ChangeTitle',['$event']]]],['input',[['__set_model',['$0','title','$event',[]],['model']]]]]}}" value="{{model.title}}" bindblur="__e" bindinput="__e"/></view></view></view><view style="padding:10rpx;margin:10rpx;"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['RedirectDetail',['$0'],[[['list','',index]]]]]]]}}" style="display:flex;align-items:center;background-color:white;padding:10rpx;margin-top:15rpx;" bindtap="__e"><view><image style="width:250rpx;height:250rpx;border-radius:20rpx;" src="{{BASE_URL+item.banner[0].url}}"></image></view><view style="margin-left:10rpx;line-height:90rpx;font-size:22rpx;"><view style="font-weight:bold;font-size:28rpx;">{{item.title}}</view><view>{{item.ftitle}}</view><view>{{item.sign}}</view></view></view></block></view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/video/index.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/video/index.json
new file mode 100644
index 0000000..7a3a522
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/video/index.json
@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "音频文件",
+  "usingComponents": {
+    "yzaudio": "/components/yz-audio/yz-audio"
+  }
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/video/index.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/video/index.wxml
new file mode 100644
index 0000000..1f7e7da
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/video/index.wxml
@@ -0,0 +1 @@
+<view><image style="height:700rpx;width:100%;z-index:-1;" src="{{BASE_URL+'/api/File/Image/annexpic/banner.png'}}" mode="scaleToFill"></image><view style="text-align:center;position:absolute;top:200rpx;left:3%;"><view style="display:flex;align-items:center;flex-wrap:wrap;justify-content:center;font-size:55rpx;font-weight:bold;color:white;">{{''+txt+''}}</view></view><view style="height:200rpx;background:white;border-radius:10px;box-shadow:0 0 30px white, 0 0 10px white, 0 0 15px white;position:relative;"><block wx:if="{{hackReset}}"><yzaudio class="vue-ref" vue-id="26f4c051-1" isButton1Visible="true" isButton2Visible="true" isButton3Visible="true" data-ref="player1" data-event-opts="{{[['^Button1Click',[['btn1Click']]],['^error',[['Errors']]]]}}" bind:Button1Click="__e" bind:error="__e" bind:__l="__l"></yzaudio></block></view><view style="padding:20rpx;"><view style="display:flex;align-items:center;justify-content:space-around;"><view><image style="width:100rpx;height:100rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/left.png'}}"></image></view><view><block wx:if="{{isshow==false}}"><image style="width:100rpx;height:100rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/player.png'}}" data-event-opts="{{[['tap',[['ShowChange',['$event']]]]]}}" bindtap="__e"></image></block><block wx:else><image style="width:100rpx;height:100rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/stop.png'}}" data-event-opts="{{[['tap',[['ShowChange',['$event']]]]]}}" bindtap="__e"></image></block></view><view><image style="width:100rpx;height:100rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/rightaudio.png'}}"></image></view></view><view style="display:flex;align-items:center;justify-content:space-around;margin-top:50rpx;"><view data-event-opts="{{[['tap',[['Change',[1]]]]]}}" class="{{[current==1?'btn':'']}}" style="border:1px solid #e0e0e0;text-align:center;padding:20rpx;font-size:25rpx;border-radius:20rpx;" bindtap="__e">0.75倍</view><view data-event-opts="{{[['tap',[['Change',[2]]]]]}}" class="{{[current==2?'btn':'']}}" style="border:1px solid #e0e0ee;text-align:center;padding:20rpx;font-size:25rpx;border-radius:20rpx;" bindtap="__e">1倍(默认)</view><view data-event-opts="{{[['tap',[['Change',[3]]]]]}}" class="{{[current==3?'btn':'']}}" style="border:1px solid #e0e0e0;text-align:center;padding:20rpx;font-size:25rpx;border-radius:20rpx;" bindtap="__e">1.5倍</view></view></view><view data-event-opts="{{[['tap',[['Submit',['$event']]]]]}}" class="centerview" bindtap="__e">返回首页</view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/video/index.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/video/index.wxss
new file mode 100644
index 0000000..f384f53
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/video/index.wxss
@@ -0,0 +1 @@
+.centerview{position:fixed;bottom:0;margin:0 auto;width:100%;border:1px solid #f2e2ac;border-radius:10px;background-color:#f2e2ac;text-align:center;z-index:99999999999;height:40px;line-height:40px;color:#000;-webkit-animation:scaleDrawC 2s;animation:scaleDrawC 2s;-webkit-transform-origin:50% 50%;transform-origin:50% 50%;-webkit-animation-name:scaleDrawC!important;-webkit-animation-timing-function:ease-in-out;-webkit-animation-iteration-count:infinite;-webkit-animation-duration:2s}.btn{background-color:#f29086;color:#fff}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/project.config.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/project.config.json
new file mode 100644
index 0000000..9ab50d7
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/project.config.json
@@ -0,0 +1,29 @@
+{
+  "description": "项目配置文件。",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "setting": {
+    "urlCheck": false,
+    "es6": true,
+    "postcss": false,
+    "minified": false,
+    "newFeature": true,
+    "bigPackageSizeSupport": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    }
+  },
+  "compileType": "miniprogram",
+  "libVersion": "2.29.1",
+  "appid": "wx94f3d523457fc388",
+  "projectname": "antis-app-siberian",
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  }
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/static/apply.png b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/apply.png
new file mode 100644
index 0000000..7515243
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/apply.png
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/static/audio-play.png b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/audio-play.png
new file mode 100644
index 0000000..9ff3a19
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/audio-play.png
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/static/audio-stop.png b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/audio-stop.png
new file mode 100644
index 0000000..1627e98
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/audio-stop.png
diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/newimage.png b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/banner.png
index 8bd36da..8bd36da 100644
--- a/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/newimage.png
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/banner.png
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/static/icons/audio-pause.png b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/icons/audio-pause.png
new file mode 100644
index 0000000..7d654b3
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/icons/audio-pause.png
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/static/icons/audio-play.png b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/icons/audio-play.png
new file mode 100644
index 0000000..23e798a
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/icons/audio-play.png
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/static/icons/red-audio-pause.png b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/icons/red-audio-pause.png
new file mode 100644
index 0000000..e2caa1a
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/icons/red-audio-pause.png
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/static/icons/red-audio-play.png b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/icons/red-audio-play.png
new file mode 100644
index 0000000..43f2a8b
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/icons/red-audio-play.png
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/static/logo.png b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/logo.png
new file mode 100644
index 0000000..b5771e2
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/logo.png
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/static/lw.png b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/lw.png
new file mode 100644
index 0000000..73ddf83
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/lw.png
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/static/mkBg.png b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/mkBg.png
new file mode 100644
index 0000000..d36eb74
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/mkBg.png
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/static/nullImg.png b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/nullImg.png
new file mode 100644
index 0000000..2784c67
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/nullImg.png
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/static/school.png b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/school.png
new file mode 100644
index 0000000..a6ef905
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/school.png
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/static/tab/noindex.png b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/tab/noindex.png
new file mode 100644
index 0000000..9fe63a8
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/tab/noindex.png
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/static/tab/nomeans.png b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/tab/nomeans.png
new file mode 100644
index 0000000..fbac22a
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/tab/nomeans.png
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/static/tab/nomy.png b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/tab/nomy.png
new file mode 100644
index 0000000..dcb66fd
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/tab/nomy.png
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/static/tab/yesindex.png b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/tab/yesindex.png
new file mode 100644
index 0000000..4d2d7f4
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/tab/yesindex.png
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/static/tab/yesmeans.png b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/tab/yesmeans.png
new file mode 100644
index 0000000..f5caf98
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/tab/yesmeans.png
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/static/tab/yesmy.png b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/tab/yesmy.png
new file mode 100644
index 0000000..7ee8a20
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/tab/yesmy.png
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/static/zl.png b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/zl.png
new file mode 100644
index 0000000..445ea3e
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/zl.png
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/static/zs.png b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/zs.png
new file mode 100644
index 0000000..0edac7b
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/zs.png
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.json
new file mode 100644
index 0000000..4575d1b
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.json
@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.wxml
new file mode 100644
index 0000000..b1b7da8
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.wxml
@@ -0,0 +1 @@
+<view class="uni-badge--x"><slot></slot><block wx:if="{{text}}"><text data-event-opts="{{[['tap',[['onClick']]]]}}" class="{{['uni-badge',classNames]}}" style="{{$root.s0}}" bindtap="__e">{{displayValue}}</text></block></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.wxss
new file mode 100644
index 0000000..b810605
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.wxss
@@ -0,0 +1 @@
+.uni-badge--x{display:inline-block;position:relative}.uni-badge--absolute{position:absolute}.uni-badge--small{-webkit-transform:scale(.8);transform:scale(.8);-webkit-transform-origin:center center;transform-origin:center center}.uni-badge{display:flex;overflow:hidden;box-sizing:border-box;justify-content:center;flex-direction:row;height:20px;min-width:20px;padding:0 4px;line-height:18px;color:#fff;border-radius:100px;background-color:#909399;background-color:initial;border:1px solid #fff;text-align:center;font-family:Helvetica Neue,Helvetica,sans-serif;-webkit-font-feature-settings:"tnum";font-feature-settings:"tnum";font-size:12px}.uni-badge--info{color:#fff;background-color:#909399}.uni-badge--primary{background-color:#2979ff}.uni-badge--success{background-color:#4cd964}.uni-badge--warning{background-color:#f0ad4e}.uni-badge--error{background-color:#dd524d}.uni-badge--inverted{padding:0 5px 0 0;color:#909399}.uni-badge--info-inverted{color:#909399;background-color:initial}.uni-badge--primary-inverted{color:#2979ff;background-color:initial}.uni-badge--success-inverted{color:#4cd964;background-color:initial}.uni-badge--warning-inverted{color:#f0ad4e;background-color:initial}.uni-badge--error-inverted{color:#dd524d;background-color:initial}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.json
new file mode 100644
index 0000000..ebae341
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.json
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "upload-image": "/uni_modules/uni-file-picker/components/uni-file-picker/upload-image",
+    "upload-file": "/uni_modules/uni-file-picker/components/uni-file-picker/upload-file"
+  }
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.wxml
new file mode 100644
index 0000000..f609559
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.wxml
@@ -0,0 +1 @@
+<view class="uni-file-picker"><block wx:if="{{title}}"><view class="uni-file-picker__header"><text class="file-title">{{title}}</text><text class="file-count">{{filesList.length+"/"+limitLength}}</text></view></block><block wx:if="{{fileMediatype==='image'&&showType==='grid'}}"><upload-image vue-id="ddc11690-1" readonly="{{readonly}}" image-styles="{{imageStyles}}" files-list="{{filesList}}" limit="{{limitLength}}" disablePreview="{{disablePreview}}" delIcon="{{delIcon}}" data-event-opts="{{[['^uploadFiles',[['uploadFiles']]],['^choose',[['choose']]],['^delFile',[['delFile']]]]}}" bind:uploadFiles="__e" bind:choose="__e" bind:delFile="__e" bind:__l="__l" vue-slots="{{['default']}}"><block wx:if="{{$slots.default}}"><slot></slot></block><block wx:else><view class="is-add"><view class="icon-add"></view><view class="icon-add rotate"></view></view></block></upload-image></block><block wx:if="{{fileMediatype!=='image'||showType!=='grid'}}"><upload-file vue-id="ddc11690-2" readonly="{{readonly}}" list-styles="{{listStyles}}" files-list="{{filesList}}" showType="{{showType}}" delIcon="{{delIcon}}" data-event-opts="{{[['^uploadFiles',[['uploadFiles']]],['^choose',[['choose']]],['^delFile',[['delFile']]]]}}" bind:uploadFiles="__e" bind:choose="__e" bind:delFile="__e" bind:__l="__l" vue-slots="{{['default']}}"><block wx:if="{{$slots.default}}"><slot></slot></block><block wx:else><button type="primary" size="mini">选择文件</button></block></upload-file></block></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.wxss
new file mode 100644
index 0000000..3e9911f
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.wxss
@@ -0,0 +1 @@
+.uni-file-picker{box-sizing:border-box;overflow:hidden;width:100%;flex:1}.uni-file-picker__header{padding-top:5px;padding-bottom:10px;display:flex;justify-content:space-between}.file-title{font-size:14px;color:#333}.file-count{font-size:14px;color:#999}.is-add{display:flex;align-items:center;justify-content:center}.icon-add{width:50px;height:5px;background-color:#f1f1f1;border-radius:2px}.rotate{position:absolute;-webkit-transform:rotate(90deg);transform:rotate(90deg)}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.json
new file mode 100644
index 0000000..4575d1b
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.json
@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.wxml
new file mode 100644
index 0000000..5d53645
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.wxml
@@ -0,0 +1 @@
+<view class="uni-file-picker__files"><block wx:if="{{!readonly}}"><view data-event-opts="{{[['tap',[['choose',['$event']]]]]}}" class="files-button" bindtap="__e"><slot></slot></view></block><block wx:if="{{list.length>0}}"><view class="uni-file-picker__lists is-text-box" style="{{(borderStyle)}}"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="{{['uni-file-picker__lists-box',(index!==0&&styles.dividline)?'files-border':'']}}" style="{{(index!==0&&styles.dividline&&borderLineStyle)}}"><view class="uni-file-picker__item"><view class="files__name">{{item.name}}</view><block wx:if="{{delIcon&&!readonly}}"><view data-event-opts="{{[['tap',[['delFile',[index]]]]]}}" class="icon-del-box icon-files" bindtap="__e"><view class="icon-del icon-files"></view><view class="icon-del rotate"></view></view></block></view><block wx:if="{{item.progress&&item.progress!==100||item.progress===0}}"><view class="file-picker__progress"><progress class="file-picker__progress-item" percent="{{item.progress===-1?0:item.progress}}" stroke-width="4" backgroundColor="{{item.errMsg?'#ff5a5f':'#EBEBEB'}}"></progress></view></block><block wx:if="{{item.status==='error'}}"><view data-event-opts="{{[['tap',[['uploadFiles',['$0',index],[[['list','',index]]]]]]]}}" class="file-picker__mask" catchtap="__e">点击重试</view></block></view></block></view></block></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.wxss
new file mode 100644
index 0000000..a5cd66f
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.wxss
@@ -0,0 +1 @@
+.uni-file-picker__files{display:flex;flex-direction:column;justify-content:flex-start}.uni-file-picker__lists{position:relative;margin-top:5px;overflow:hidden}.file-picker__mask{display:flex;justify-content:center;align-items:center;position:absolute;right:0;top:0;bottom:0;left:0;color:#fff;font-size:14px;background-color:rgba(0,0,0,.4)}.uni-file-picker__lists-box{position:relative}.uni-file-picker__item{display:flex;align-items:center;padding:8px 10px;padding-right:5px;padding-left:10px}.files-border{border-top:1px #eee solid}.files__name{flex:1;font-size:14px;color:#666;margin-right:25px;word-break:break-all;word-wrap:break-word}.icon-files{position:static;background-color:initial}.is-list-card{border:1px #eee solid;margin-bottom:5px;border-radius:5px;box-shadow:0 0 2px 0 rgba(0,0,0,.1);padding:5px}.files__image{width:40px;height:40px;margin-right:10px}.header-image{width:100%;height:100%}.is-text-box{border:1px #eee solid;border-radius:5px}.is-text-image{width:25px;height:25px;margin-left:5px}.rotate{position:absolute;-webkit-transform:rotate(90deg);transform:rotate(90deg)}.icon-del-box{display:flex;margin:auto 0;align-items:center;justify-content:center;position:absolute;top:0;bottom:0;right:5px;height:26px;width:26px;z-index:2;-webkit-transform:rotate(-45deg);transform:rotate(-45deg)}.icon-del{width:15px;height:1px;background-color:#333}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.json
new file mode 100644
index 0000000..4575d1b
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.json
@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.wxml
new file mode 100644
index 0000000..9dd888e
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.wxml
@@ -0,0 +1 @@
+<view class="uni-file-picker__container"><block wx:for="{{filesList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="file-picker__box" style="{{(boxStyle)}}"><view class="file-picker__box-content" style="{{(borderStyle)}}"><image class="file-image" src="{{item.url}}" mode="aspectFill" data-event-opts="{{[['tap',[['prviewImage',['$0',index],[[['filesList','',index]]]]]]]}}" catchtap="__e"></image><block wx:if="{{delIcon&&!readonly}}"><view data-event-opts="{{[['tap',[['delFile',[index]]]]]}}" class="icon-del-box" catchtap="__e"><view class="icon-del"></view><view class="icon-del rotate"></view></view></block><block wx:if="{{item.progress&&item.progress!==100||item.progress===0}}"><view class="file-picker__progress"><progress class="file-picker__progress-item" percent="{{item.progress===-1?0:item.progress}}" stroke-width="4" backgroundColor="{{item.errMsg?'#ff5a5f':'#EBEBEB'}}"></progress></view></block><block wx:if="{{item.errMsg}}"><view data-event-opts="{{[['tap',[['uploadFiles',['$0',index],[[['filesList','',index]]]]]]]}}" class="file-picker__mask" catchtap="__e">点击重试</view></block></view></view></block><block wx:if="{{filesList.length<limit&&!readonly}}"><view class="file-picker__box" style="{{(boxStyle)}}"><view data-event-opts="{{[['tap',[['choose',['$event']]]]]}}" class="file-picker__box-content is-add" style="{{(borderStyle)}}" bindtap="__e"><block wx:if="{{$slots.default}}"><slot></slot></block><block wx:else><view class="icon-add"></view><view class="icon-add rotate"></view></block></view></view></block></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.wxss
new file mode 100644
index 0000000..f4f927e
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.wxss
@@ -0,0 +1 @@
+.uni-file-picker__container{display:flex;box-sizing:border-box;flex-wrap:wrap;margin:-5px}.file-picker__box{position:relative;width:33.3%;height:0;padding-top:33.33%;box-sizing:border-box}.file-picker__box-content{position:absolute;top:0;right:0;bottom:0;left:0;margin:5px;border:1px #eee solid;border-radius:5px;overflow:hidden}.file-picker__progress{position:absolute;bottom:0;left:0;right:0;z-index:2}.file-picker__progress-item{width:100%}.file-picker__mask{display:flex;justify-content:center;align-items:center;position:absolute;right:0;top:0;bottom:0;left:0;color:#fff;font-size:12px;background-color:rgba(0,0,0,.4)}.file-image{width:100%;height:100%}.is-add{display:flex;align-items:center;justify-content:center}.icon-add{width:50px;height:5px;background-color:#f1f1f1;border-radius:2px}.rotate{position:absolute;-webkit-transform:rotate(90deg);transform:rotate(90deg)}.icon-del-box{display:flex;align-items:center;justify-content:center;position:absolute;top:3px;right:3px;height:26px;width:26px;border-radius:50%;background-color:rgba(0,0,0,.5);z-index:2;-webkit-transform:rotate(-45deg);transform:rotate(-45deg)}.icon-del{width:15px;height:2px;background-color:#fff;border-radius:2px}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.json
new file mode 100644
index 0000000..4575d1b
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.json
@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.wxml
new file mode 100644
index 0000000..807bb06
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.wxml
@@ -0,0 +1 @@
+<text data-event-opts="{{[['tap',[['_onClick',['$event']]]]]}}" class="{{['uni-icons','uniui-'+type,customPrefix,customPrefix?type:'']}}" style="{{'color:'+(color)+';'+('font-size:'+(iconSize)+';')}}" bindtap="__e"></text>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.wxss
new file mode 100644
index 0000000..9eca8bf
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.wxss
@@ -0,0 +1 @@
+.uniui-color:before{content:"\e6cf"}.uniui-wallet:before{content:"\e6b1"}.uniui-settings-filled:before{content:"\e6ce"}.uniui-auth-filled:before{content:"\e6cc"}.uniui-shop-filled:before{content:"\e6cd"}.uniui-staff-filled:before{content:"\e6cb"}.uniui-vip-filled:before{content:"\e6c6"}.uniui-plus-filled:before{content:"\e6c7"}.uniui-folder-add-filled:before{content:"\e6c8"}.uniui-color-filled:before{content:"\e6c9"}.uniui-tune-filled:before{content:"\e6ca"}.uniui-calendar-filled:before{content:"\e6c0"}.uniui-notification-filled:before{content:"\e6c1"}.uniui-wallet-filled:before{content:"\e6c2"}.uniui-medal-filled:before{content:"\e6c3"}.uniui-gift-filled:before{content:"\e6c4"}.uniui-fire-filled:before{content:"\e6c5"}.uniui-refreshempty:before{content:"\e6bf"}.uniui-location-filled:before{content:"\e6af"}.uniui-person-filled:before{content:"\e69d"}.uniui-personadd-filled:before{content:"\e698"}.uniui-back:before{content:"\e6b9"}.uniui-forward:before{content:"\e6ba"}.uniui-arrow-right:before{content:"\e6bb"}.uniui-arrowthinright:before{content:"\e6bb"}.uniui-arrow-left:before{content:"\e6bc"}.uniui-arrowthinleft:before{content:"\e6bc"}.uniui-arrow-up:before{content:"\e6bd"}.uniui-arrowthinup:before{content:"\e6bd"}.uniui-arrow-down:before{content:"\e6be"}.uniui-arrowthindown:before{content:"\e6be"}.uniui-bottom:before{content:"\e6b8"}.uniui-arrowdown:before{content:"\e6b8"}.uniui-right:before{content:"\e6b5"}.uniui-arrowright:before{content:"\e6b5"}.uniui-top:before{content:"\e6b6"}.uniui-arrowup:before{content:"\e6b6"}.uniui-left:before{content:"\e6b7"}.uniui-arrowleft:before{content:"\e6b7"}.uniui-eye:before{content:"\e651"}.uniui-eye-filled:before{content:"\e66a"}.uniui-eye-slash:before{content:"\e6b3"}.uniui-eye-slash-filled:before{content:"\e6b4"}.uniui-info-filled:before{content:"\e649"}.uniui-reload:before{content:"\e6b2"}.uniui-micoff-filled:before{content:"\e6b0"}.uniui-map-pin-ellipse:before{content:"\e6ac"}.uniui-map-pin:before{content:"\e6ad"}.uniui-location:before{content:"\e6ae"}.uniui-starhalf:before{content:"\e683"}.uniui-star:before{content:"\e688"}.uniui-star-filled:before{content:"\e68f"}.uniui-calendar:before{content:"\e6a0"}.uniui-fire:before{content:"\e6a1"}.uniui-medal:before{content:"\e6a2"}.uniui-font:before{content:"\e6a3"}.uniui-gift:before{content:"\e6a4"}.uniui-link:before{content:"\e6a5"}.uniui-notification:before{content:"\e6a6"}.uniui-staff:before{content:"\e6a7"}.uniui-vip:before{content:"\e6a8"}.uniui-folder-add:before{content:"\e6a9"}.uniui-tune:before{content:"\e6aa"}.uniui-auth:before{content:"\e6ab"}.uniui-person:before{content:"\e699"}.uniui-email-filled:before{content:"\e69a"}.uniui-phone-filled:before{content:"\e69b"}.uniui-phone:before{content:"\e69c"}.uniui-email:before{content:"\e69e"}.uniui-personadd:before{content:"\e69f"}.uniui-chatboxes-filled:before{content:"\e692"}.uniui-contact:before{content:"\e693"}.uniui-chatbubble-filled:before{content:"\e694"}.uniui-contact-filled:before{content:"\e695"}.uniui-chatboxes:before{content:"\e696"}.uniui-chatbubble:before{content:"\e697"}.uniui-upload-filled:before{content:"\e68e"}.uniui-upload:before{content:"\e690"}.uniui-weixin:before{content:"\e691"}.uniui-compose:before{content:"\e67f"}.uniui-qq:before{content:"\e680"}.uniui-download-filled:before{content:"\e681"}.uniui-pyq:before{content:"\e682"}.uniui-sound:before{content:"\e684"}.uniui-trash-filled:before{content:"\e685"}.uniui-sound-filled:before{content:"\e686"}.uniui-trash:before{content:"\e687"}.uniui-videocam-filled:before{content:"\e689"}.uniui-spinner-cycle:before{content:"\e68a"}.uniui-weibo:before{content:"\e68b"}.uniui-videocam:before{content:"\e68c"}.uniui-download:before{content:"\e68d"}.uniui-help:before{content:"\e679"}.uniui-navigate-filled:before{content:"\e67a"}.uniui-plusempty:before{content:"\e67b"}.uniui-smallcircle:before{content:"\e67c"}.uniui-minus-filled:before{content:"\e67d"}.uniui-micoff:before{content:"\e67e"}.uniui-closeempty:before{content:"\e66c"}.uniui-clear:before{content:"\e66d"}.uniui-navigate:before{content:"\e66e"}.uniui-minus:before{content:"\e66f"}.uniui-image:before{content:"\e670"}.uniui-mic:before{content:"\e671"}.uniui-paperplane:before{content:"\e672"}.uniui-close:before{content:"\e673"}.uniui-help-filled:before{content:"\e674"}.uniui-paperplane-filled:before{content:"\e675"}.uniui-plus:before{content:"\e676"}.uniui-mic-filled:before{content:"\e677"}.uniui-image-filled:before{content:"\e678"}.uniui-locked-filled:before{content:"\e668"}.uniui-info:before{content:"\e669"}.uniui-locked:before{content:"\e66b"}.uniui-camera-filled:before{content:"\e658"}.uniui-chat-filled:before{content:"\e659"}.uniui-camera:before{content:"\e65a"}.uniui-circle:before{content:"\e65b"}.uniui-checkmarkempty:before{content:"\e65c"}.uniui-chat:before{content:"\e65d"}.uniui-circle-filled:before{content:"\e65e"}.uniui-flag:before{content:"\e65f"}.uniui-flag-filled:before{content:"\e660"}.uniui-gear-filled:before{content:"\e661"}.uniui-home:before{content:"\e662"}.uniui-home-filled:before{content:"\e663"}.uniui-gear:before{content:"\e664"}.uniui-smallcircle-filled:before{content:"\e665"}.uniui-map-filled:before{content:"\e666"}.uniui-map:before{content:"\e667"}.uniui-refresh-filled:before{content:"\e656"}.uniui-refresh:before{content:"\e657"}.uniui-cloud-upload:before{content:"\e645"}.uniui-cloud-download-filled:before{content:"\e646"}.uniui-cloud-download:before{content:"\e647"}.uniui-cloud-upload-filled:before{content:"\e648"}.uniui-redo:before{content:"\e64a"}.uniui-images-filled:before{content:"\e64b"}.uniui-undo-filled:before{content:"\e64c"}.uniui-more:before{content:"\e64d"}.uniui-more-filled:before{content:"\e64e"}.uniui-undo:before{content:"\e64f"}.uniui-images:before{content:"\e650"}.uniui-paperclip:before{content:"\e652"}.uniui-settings:before{content:"\e653"}.uniui-search:before{content:"\e654"}.uniui-redo-filled:before{content:"\e655"}.uniui-list:before{content:"\e644"}.uniui-mail-open-filled:before{content:"\e63a"}.uniui-hand-down-filled:before{content:"\e63c"}.uniui-hand-down:before{content:"\e63d"}.uniui-hand-up-filled:before{content:"\e63e"}.uniui-hand-up:before{content:"\e63f"}.uniui-heart-filled:before{content:"\e641"}.uniui-mail-open:before{content:"\e643"}.uniui-heart:before{content:"\e639"}.uniui-loop:before{content:"\e633"}.uniui-pulldown:before{content:"\e632"}.uniui-scan:before{content:"\e62a"}.uniui-bars:before{content:"\e627"}.uniui-cart-filled:before{content:"\e629"}.uniui-checkbox:before{content:"\e62b"}.uniui-checkbox-filled:before{content:"\e62c"}.uniui-shop:before{content:"\e62f"}.uniui-headphones:before{content:"\e630"}.uniui-cart:before{content:"\e631"}@font-face{font-family:uniicons;src:url(data:font/ttf;base64,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5nkAAOZ5AAAAVQAA5noAAOZ6AAAAVgAA5nsAAOZ7AAAAVwAA5nwAAOZ8AAAAWAAA5n0AAOZ9AAAAWQAA5n4AAOZ+AAAAWgAA5n8AAOZ/AAAASAAA5oAAAOaAAAAASQAA5oEAAOaBAAAASgAA5oIAAOaCAAAASwAA5oMAAOaDAAAAKgAA5oQAAOaEAAAATAAA5oUAAOaFAAAATQAA5oYAAOaGAAAATgAA5ocAAOaHAAAATwAA5ogAAOaIAAAAKwAA5okAAOaJAAAAUAAA5ooAAOaKAAAAUQAA5osAAOaLAAAAUgAA5owAAOaMAAAAUwAA5o0AAOaNAAAAVAAA5o4AAOaOAAAARQAA5o8AAOaPAAAALAAA5pAAAOaQAAAARgAA5pEAAOaRAAAARwAA5pIAAOaSAAAAPwAA5pMAAOaTAAAAQAAA5pQAAOaUAAAAQQAA5pUAAOaVAAAAQgAA5pYAAOaWAAAAQwAA5pcAAOaXAAAARAAA5pgAAOaYAAAAFQAA5pkAAOaZAAAAOQAA5poAAOaaAAAAOgAA5psAAOabAAAAOwAA5pwAAOacAAAAPAAA5p0AAOadAAAAFAAA5p4AAOaeAAAAPQAA5p8AAOafAAAAPgAA5qAAAOagAAAALQAA5qEAAOahAAAALgAA5qIAAOaiAAAALwAA5qMAAOajAAAAMAAA5qQAAOakAAAAMQAA5qUAAOalAAAAMgAA5qYAAOamAAAAMwAA5qcAAOanAAAANAAA5qgAAOaoAAAANQAA5qkAAOapAAAANgAA5qoAAOaqAAAANwAA5qsAAOarAAAAOAAA5qwAAOasAAAAJwAA5q0AAOatAAAAKAAA5q4AAOauAAAAKQAA5q8AAOavAAAAEwAA5rAAAOawAAAAJgAA5rEAAOaxAAAAAgAA5rIAAOayAAAAJQAA5rMAAOazAAAAIgAA5rQAAOa0AAAAIwAA5rUAAOa1AAAAHQAA5rYAAOa2AAAAHgAA5rcAAOa3AAAAHwAA5rgAAOa4AAAAHAAA5rkAAOa5AAAAFgAA5roAAOa6AAAAFwAA5rsAAOa7AAAAGAAA5rwAAOa8AAAAGQAA5r0AAOa9AAAAGgAA5r4AAOa+AAAAGwAA5r8AAOa/AAAAEgAA5sAAAObAAAAADAAA5sEAAObBAAAADQAA5sIAAObCAAAADgAA5sMAAObDAAAADwAA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ZWQLc2hvcC1maWxsZWQMc3RhZmYtZmlsbGVkCnZpcC1maWxsZWQLcGx1cy1maWxsZWQRZm9sZGVyLWFkZC1maWxsZWQMeWFuc2UtZmlsbGVkC3R1bmUtZmlsbGVkD2NhbGVuZGFyLWZpbGxlZBNub3RpZmljYXRpb24tZmlsbGVkDXdhbGxldC1maWxsZWQMbWVkYWwtZmlsbGVkC2dpZnQtZmlsbGVkC2ZpcmUtZmlsbGVkDHJlZnJlc2hlbXB0eQ9sb2NhdGlvbi1maWxsZWQNcGVyc29uLWZpbGxlZBBwZXJzb25hZGQtZmlsbGVkBGJhY2sHZm9yd2FyZAthcnJvdy1yaWdodAphcnJvdy1sZWZ0CGFycm93LXVwCmFycm93LWRvd24GYm90dG9tBXJpZ2h0A3RvcARsZWZ0A2V5ZQpleWUtZmlsbGVkCWV5ZS1zbGFzaBBleWUtc2xhc2gtZmlsbGVkC2luZm8tZmlsbGVkBnJlbG9hZA1taWNvZmYtZmlsbGVkD21hcC1waW4tZWxsaXBzZQdtYXAtcGluCGxvY2F0aW9uCHN0YXJoYWxmBHN0YXILc3Rhci1maWxsZWQIY2FsZW5kYXIEZmlyZQVtZWRhbARmb250BGdpZnQEbGluawxub3RpZmljYXRpb24Fc3RhZmYDdmlwCmZvbGRlci1hZGQEdHVuZQRhdXRoBnBlcnNvbgxlbWFpbC1maWxsZWQMcGhvbmUtZmlsbGVkBXBob25lBWVtYWlsCXBlcnNvbmFkZBBjaGF0Ym94ZXMtZmlsbGVkB2NvbnRhY3QRY2hhdGJ1YmJsZS1maWxsZWQOY29udGFjdC1maWxsZWQJY2hhdGJveGVzCmNoYXRidWJibGUNdXBsb2FkLWZpbGxlZAZ1cGxvYWQGd2VpeGluB2NvbXBvc2UCcXEPZG93bmxvYWQtZmlsbGVkA3B5cQVzb3VuZAx0cmFzaC1maWxsZWQMc291bmQtZmlsbGVkBXRyYXNoD3ZpZGVvY2FtLWZpbGxlZA1zcGlubmVyLWN5Y2xlBXdlaWJvCHZpZGVvY2FtCGRvd25sb2FkBGhlbHAPbmF2aWdhdGUtZmlsbGVkCXBsdXNlbXB0eQtzbWFsbGNpcmNsZQxtaW51cy1maWxsZWQGbWljb2ZmCmNsb3NlZW1wdHkFY2xlYXIIbmF2aWdhdGUFbWludXMFaW1hZ2UDbWljCnBhcGVycGxhbmUFY2xvc2ULaGVscC1maWxsZWQRcGFwZXJwbGFuZS1maWxsZWQEcGx1cwptaWMtZmlsbGVkDGltYWdlLWZpbGxlZA1sb2NrZWQtZmlsbGVkBGluZm8GbG9ja2VkDWNhbWVyYS1maWxsZWQLY2hhdC1maWxsZWQGY2FtZXJhBmNpcmNsZQ5jaGVja21hcmtlbXB0eQRjaGF0DWNpcmNsZS1maWxsZWQEZmxhZwtmbGFnLWZpbGxlZAtnZWFyLWZpbGxlZARob21lC2hvbWUtZmlsbGVkBGdlYXISc21hbGxjaXJjbGUtZmlsbGVkCm1hcC1maWxsZWQDbWFwDnJlZnJlc2gtZmlsbGVkB3JlZnJlc2gMY2xvdWQtdXBsb2FkFWNsb3VkLWRvd25sb2FkLWZpbGxlZA5jbG91ZC1kb3dubG9hZBNjbG91ZC11cGxvYWQtZmlsbGVkBHJlZG8NaW1hZ2VzLWZpbGxlZAt1bmRvLWZpbGxlZARtb3JlC21vcmUtZmlsbGVkBHVuZG8GaW1hZ2VzCXBhcGVyY2xpcAhzZXR0aW5ncwZzZWFyY2gLcmVkby1maWxsZWQEbGlzdBBtYWlsLW9wZW4tZmlsbGVkEGhhbmQtZG93bi1maWxsZWQJaGFuZC1kb3duDmhhbmQtdXAtZmlsbGVkB2hhbmQtdXAMaGVhcnQtZmlsbGVkCW1haWwtb3BlbgVoZWFydARsb29wCHB1bGxkb3duBHNjYW4EYmFycwtjYXJ0LWZpbGxlZAhjaGVja2JveA9jaGVja2JveC1maWxsZWQEc2hvcApoZWFkcGhvbmVzBGNhcnQAAAAA) format("truetype")}.uni-icons{font-family:uniicons;text-decoration:none;text-align:center}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.json
new file mode 100644
index 0000000..4575d1b
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.json
@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.wxml
new file mode 100644
index 0000000..2e24ba5
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.wxml
@@ -0,0 +1 @@
+<view class="uni-popup-dialog"><view class="uni-dialog-title"><text class="{{['uni-dialog-title-text','uni-popup__'+dialogType]}}">{{titleText}}</text></view><block wx:if="{{mode==='base'}}"><view class="uni-dialog-content"><block wx:if="{{$slots.default}}"><slot></slot></block><block wx:else><text class="uni-dialog-content-text">{{content}}</text></block></view></block><block wx:else><view class="uni-dialog-content"><block wx:if="{{$slots.default}}"><slot></slot></block><block wx:else><input class="uni-dialog-input" type="text" placeholder="{{placeholderText}}" focus="{{focus}}" data-event-opts="{{[['input',[['__set_model',['','val','$event',[]]]]]]}}" value="{{val}}" bindinput="__e"/></block></view></block><view class="uni-dialog-button-group"><view data-event-opts="{{[['tap',[['closeDialog',['$event']]]]]}}" class="uni-dialog-button" bindtap="__e"><text class="uni-dialog-button-text">{{closeText}}</text></view><view data-event-opts="{{[['tap',[['onOk',['$event']]]]]}}" class="uni-dialog-button uni-border-left" bindtap="__e"><text class="uni-dialog-button-text uni-button-color">{{okText}}</text></view></view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.wxss
new file mode 100644
index 0000000..b269688
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.wxss
@@ -0,0 +1 @@
+.uni-popup-dialog{width:300px;border-radius:11px;background-color:#fff}.uni-dialog-title{display:flex;flex-direction:row;justify-content:center;padding-top:25px}.uni-dialog-title-text{font-size:16px;font-weight:500}.uni-dialog-content{display:flex;flex-direction:row;justify-content:center;align-items:center;padding:20px}.uni-dialog-content-text{font-size:14px;color:#6c6c6c}.uni-dialog-button-group{display:flex;flex-direction:row;border-top-color:#f5f5f5;border-top-style:solid;border-top-width:1px}.uni-dialog-button{display:flex;flex:1;flex-direction:row;justify-content:center;align-items:center;height:45px}.uni-border-left{border-left-color:#f0f0f0;border-left-style:solid;border-left-width:1px}.uni-dialog-button-text{font-size:16px;color:#333}.uni-button-color{color:#007aff}.uni-dialog-input{flex:1;font-size:14px;border:1px #eee solid;height:40px;padding:0 10px;border-radius:5px;color:#555}.uni-popup__success{color:#4cd964}.uni-popup__warn{color:#f0ad4e}.uni-popup__error{color:#dd524d}.uni-popup__info{color:#909399}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.json
new file mode 100644
index 0000000..0496f60
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.json
@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "uni-transition": "/uni_modules/uni-transition/components/uni-transition/uni-transition"
+  },
+  "component": true
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxml
new file mode 100644
index 0000000..c8dbf13
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxml
@@ -0,0 +1 @@
+<block wx:if="{{showPopup}}"><view class="{{['uni-popup',popupstyle,isDesktop?'fixforpc-z-index':'']}}"><view data-event-opts="{{[['touchstart',[['touchstart',['$event']]]]]}}" bindtouchstart="__e"><block wx:if="{{maskShow}}"><uni-transition vue-id="0c37304b-1" name="mask" mode-class="fade" styles="{{maskClass}}" duration="{{duration}}" show="{{showTrans}}" data-event-opts="{{[['^click',[['onTap']]]]}}" bind:click="__e" bind:__l="__l"></uni-transition></block><uni-transition vue-id="0c37304b-2" mode-class="{{ani}}" name="content" styles="{{transClass}}" duration="{{duration}}" show="{{showTrans}}" data-event-opts="{{[['^click',[['onTap']]]]}}" bind:click="__e" bind:__l="__l" vue-slots="{{['default']}}"><view data-event-opts="{{[['tap',[['clear',['$event']]]]]}}" class="{{['uni-popup__wrapper',popupstyle]}}" style="{{'background-color:'+(bg)+';'}}" bindtap="__e"><slot></slot></view></uni-transition></view></view></block>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxss
new file mode 100644
index 0000000..251fb2a
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxss
@@ -0,0 +1 @@
+.uni-popup{position:fixed;z-index:99}.uni-popup.top, .uni-popup.left, .uni-popup.right{top:0}.uni-popup .uni-popup__wrapper{display:block;position:relative}.uni-popup .uni-popup__wrapper.left, .uni-popup .uni-popup__wrapper.right{padding-top:0;flex:1}.fixforpc-z-index{z-index:999}.fixforpc-top{top:0}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-rate/components/uni-rate/uni-rate.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-rate/components/uni-rate/uni-rate.json
new file mode 100644
index 0000000..edb20a7
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-rate/components/uni-rate/uni-rate.json
@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  },
+  "component": true
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-rate/components/uni-rate/uni-rate.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-rate/components/uni-rate/uni-rate.wxml
new file mode 100644
index 0000000..1077be7
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-rate/components/uni-rate/uni-rate.wxml
@@ -0,0 +1 @@
+<view><view data-ref="uni-rate" class="uni-rate vue-ref"><block wx:for="{{stars}}" wx:for-item="star" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['touchstart',[['touchstart',['$event']]]],['touchmove',[['touchmove',['$event']]]],['mousedown',[['mousedown',['$event']]]],['mousemove',[['mousemove',['$event']]]],['mouseleave',[['mouseleave',['$event']]]]]}}" class="{{['uni-rate__icon',(disabled)?'uni-cursor-not-allowed':'']}}" style="{{'margin-right:'+(marginNumber+'px')+';'}}" catchtouchstart="__e" catchtouchmove="__e" catchmousedown="__e" catchmousemove="__e" bindmouseleave="__e"><uni-icons vue-id="{{'59bffe5a-1-'+index}}" color="{{color}}" size="{{size}}" type="{{isFill?'star-filled':'star'}}" bind:__l="__l"></uni-icons><view class="uni-rate__icon-on" style="{{'width:'+(star.activeWitch)+';'}}"><uni-icons vue-id="{{'59bffe5a-2-'+index}}" color="{{disabled?disabledColor:activeColor}}" size="{{size}}" type="star-filled" bind:__l="__l"></uni-icons></view></view></block></view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-rate/components/uni-rate/uni-rate.wxss b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-rate/components/uni-rate/uni-rate.wxss
new file mode 100644
index 0000000..3571bbe
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-rate/components/uni-rate/uni-rate.wxss
@@ -0,0 +1 @@
+.uni-rate{display:flex;line-height:1;font-size:0;flex-direction:row}.uni-rate__icon{position:relative;line-height:1;font-size:0}.uni-rate__icon-on{overflow:hidden;position:absolute;top:0;left:0;line-height:1;text-align:left}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.json
new file mode 100644
index 0000000..4575d1b
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.json
@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.wxml
new file mode 100644
index 0000000..35c38da
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.wxml
@@ -0,0 +1 @@
+<block wx:if="{{isShow}}"><view class="{{['vue-ref',customClass]}}" style="{{(transformStyles)}}" animation="{{animationData}}" data-ref="ani" data-event-opts="{{[['tap',[['onClick',['$event']]]]]}}" bindtap="__e"><slot></slot></view></block>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/app.json b/antis-app-siberian/unpackage/dist/dev/mp-weixin/app.json
index 0f07ead..c601fc8 100644
--- a/antis-app-siberian/unpackage/dist/dev/mp-weixin/app.json
+++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/app.json
@@ -1,7 +1,8 @@
 {
   "pages": [
-    "pages/video/index",
     "pages/index/index",
+    "pages/video/index",
+    "pages/CDKEY/index",
     "pages/payResult/index",
     "pages/login/index",
     "pages/Report/result",
diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/components/yz-audio/yz-audio.json b/antis-app-siberian/unpackage/dist/dev/mp-weixin/components/yz-audio/yz-audio.json
new file mode 100644
index 0000000..4575d1b
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/components/yz-audio/yz-audio.json
@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/components/yz-audio/yz-audio.wxml b/antis-app-siberian/unpackage/dist/dev/mp-weixin/components/yz-audio/yz-audio.wxml
new file mode 100644
index 0000000..910e4d7
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/components/yz-audio/yz-audio.wxml
@@ -0,0 +1 @@
+<view class="imt-audio"><view class="audio-wrapper"><view class="titlebox"><view style="font-weight:bold;font-size:45rpx;margin:0 auto;padding-bottom:30rpx;display:flex;align-items:center;justify-content:center;"><view style="color:#FC5F52;">{{$root.m0}}</view><view style="margin-left:10rpx;margin-right:10rpx;color:black;">/</view><view style="color:black;">{{$root.m1}}</view></view></view><view class="slidebox"><view><block wx:if="{{$slots.extraCtrls}}"><slot name="extraCtrls"></slot></block><block wx:else><text data-event-opts="{{[['tap',[['$emit',['Button1Click']]]]]}}" hidden="{{!(isButton1Visible)}}" class="hItem extrButton" bindtap="__e">{{button1Text}}</text><text data-event-opts="{{[['tap',[['$emit',['Button2Click']]]]]}}" hidden="{{!(isButton2Visible)}}" class="hItem extrButton" bindtap="__e">{{button2Text}}</text><text data-event-opts="{{[['tap',[['$emit',['Button3Click']]]]]}}" hidden="{{!(isButton3Visible)}}" class="hItem extrButton" bindtap="__e">{{button3Text}}</text></block></view></view></view><video style="width:10rpx;height:10rpx;" id="videoPlayer" src="{{src}}" autoplay="{{false}}" data-event-opts="{{[['play',[['playerOnPlay',['$event']]]],['pause',[['playerOnPause',['$event']]]],['ended',[['playerOnEnded',['$event']]]],['timeupdate',[['playerOnTimeupdate',['$event']]]],['waiting',[['playerOnWaiting',['$event']]]],['error',[['playerOnError',['$event']]]]]}}" muted="{{false}}" bindplay="__e" bindpause="__e" bindended="__e" bindtimeupdate="__e" bindwaiting="__e" binderror="__e"></video><slider class="audio-slider" block-size="12" max="{{duration}}" value="{{currentTime}}" data-event-opts="{{[['change',[['sliderChange',['$event']]]],['changing',[['sliderChanging',['$event']]]]]}}" bindchange="__e" bindchanging="__e"></slider></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/components/yz-audio/yz-audio.wxss b/antis-app-siberian/unpackage/dist/dev/mp-weixin/components/yz-audio/yz-audio.wxss
new file mode 100644
index 0000000..1bc1f82
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/components/yz-audio/yz-audio.wxss
@@ -0,0 +1,192 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+@-webkit-keyframes rowup {
+0% {
+    -webkit-transform: translate(-50%, -50%) rotate(0deg);
+    -webkit-transform-origin: center center;
+            transform-origin: center center;
+}
+100% {
+    -webkit-transform: translate(-50%, -50%) rotate(360deg);
+    -webkit-transform-origin: center center;
+            transform-origin: center center;
+}
+}
+@keyframes rowup {
+0% {
+    -webkit-transform: translate(-50%, -50%) rotate(0deg);
+    -webkit-transform-origin: center center;
+            transform-origin: center center;
+}
+100% {
+    -webkit-transform: translate(-50%, -50%) rotate(360deg);
+    -webkit-transform-origin: center center;
+            transform-origin: center center;
+}
+}
+.imt-audio {
+  width: 100%;
+  margin-top: -90rpx;
+  overflow: hidden;
+  display: flex;
+  box-sizing: border-box;
+  position: relative;
+}
+.imt-audio .top {
+  width: 140rpx;
+  position: relative;
+}
+.imt-audio .audio-wrapper {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  color: #fff;
+  margin-left: 20rpx;
+}
+.imt-audio .audio-wrapper .titlebox {
+  display: flex;
+  line-height: 138rpx;
+  margin-bottom: 10rpx;
+}
+.imt-audio .audio-wrapper .titlebox .title {
+  font-size: 30rpx;
+  max-width: 100%;
+  display: -webkit-box;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+}
+.imt-audio .audio-wrapper .titlebox .singer {
+  margin-left: 20rpx;
+  font-size: 28rpx;
+  max-width: 50%;
+  display: -webkit-box;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+}
+.imt-audio .slidebox {
+  display: flex;
+  justify-content: space-between;
+  width: 96%;
+}
+.imt-audio .uni-slider-tap-area {
+  padding: 0;
+}
+.imt-audio .uni-slider-wrapper {
+  min-height: 0;
+}
+.imt-audio .uni-slider-handle-wrapper {
+  height: 6px;
+}
+.imt-audio .audio-slider {
+  padding-top: 10rpx;
+  position: absolute;
+  bottom: 40rpx;
+  width: 90vw;
+  left: 0;
+  padding: 0;
+}
+.imt-audio .cover {
+  width: 120rpx;
+  height: 120rpx;
+  box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  -webkit-transform: translate(-50%, -50%);
+          transform: translate(-50%, -50%);
+  animation-fill-mode: forwards;
+  -webkit-animation-fill-mode: forwards;
+}
+.imt-audio .play {
+  width: 80rpx;
+  height: 80rpx;
+  z-index: 99;
+  background: rgba(0, 0, 0, 0.4);
+  border-radius: 50%;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  -webkit-transform: translate(-50%, -50%);
+          transform: translate(-50%, -50%);
+}
+.imt-audio .play.loading {
+  width: 60rpx;
+  height: 60rpx;
+  -webkit-animation: rotating_theme3 2s linear infinite;
+          animation: rotating_theme3 2s linear infinite;
+}
+@-webkit-keyframes rotating {
+0% {
+    -webkit-transform: rotateZ(0deg);
+            transform: rotateZ(0deg);
+}
+100% {
+    -webkit-transform: rotateZ(360deg);
+            transform: rotateZ(360deg);
+}
+}
+@keyframes rotating {
+0% {
+    -webkit-transform: rotateZ(0deg);
+            transform: rotateZ(0deg);
+}
+100% {
+    -webkit-transform: rotateZ(360deg);
+            transform: rotateZ(360deg);
+}
+}
+@-webkit-keyframes rotating_theme3 {
+0% {
+    -webkit-transform: translate(-50%, -50%) rotateZ(0deg);
+            transform: translate(-50%, -50%) rotateZ(0deg);
+}
+100% {
+    -webkit-transform: translate(-50%, -50%) rotateZ(360deg);
+            transform: translate(-50%, -50%) rotateZ(360deg);
+}
+}
+@keyframes rotating_theme3 {
+0% {
+    -webkit-transform: translate(-50%, -50%) rotateZ(0deg);
+            transform: translate(-50%, -50%) rotateZ(0deg);
+}
+100% {
+    -webkit-transform: translate(-50%, -50%) rotateZ(360deg);
+            transform: translate(-50%, -50%) rotateZ(360deg);
+}
+}
+.hItem {
+  margin-left: 16rpx;
+}
+.extrButton {
+  font-size: 36rpx;
+}
+
diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/CDKEY/index.json b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/CDKEY/index.json
new file mode 100644
index 0000000..c826cd3
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/CDKEY/index.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "模考兑换码",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/CDKEY/index.wxml b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/CDKEY/index.wxml
new file mode 100644
index 0000000..b4ffc79
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/CDKEY/index.wxml
@@ -0,0 +1 @@
+<view class="container" style="width:100%;height:100%;"><image class="background" src="{{model.isDefault=='1'?'../../static/mkBg.png':BASE_URL+model.banner[0].url}}" mode="scaleToFill"></image><view style="position:absolute;bottom:100rpx;left:150rpx;"><view style="border:2px solid pink;min-width:400rpx;height:50rpx;padding:15rpx;border-radius:20rpx;margin-bottom:30rpx;"><input style="width:100%;height:100%;" placeholder="请输入姓名" placeholder-style="color:pink;" data-event-opts="{{[['input',[['__set_model',['$0','name','$event',[]],['form']]]]]}}" value="{{form.name}}" bindinput="__e"/></view><view style="border:2px solid pink;min-width:400rpx;height:50rpx;padding:15rpx;border-radius:20rpx;margin-bottom:30rpx;"><input style="width:100%;height:100%;" placeholder="请输入Email地址" placeholder-style="color:pink;" data-event-opts="{{[['input',[['__set_model',['$0','email','$event',[]],['form']]]]]}}" value="{{form.email}}" bindinput="__e"/></view><view style="border:2px solid pink;min-width:400rpx;height:50rpx;padding:15rpx;border-radius:20rpx;margin-bottom:30rpx;"><input style="width:100%;height:100%;" placeholder="请输入手机号码" placeholder-style="color:pink;" data-event-opts="{{[['input',[['__set_model',['$0','phone','$event',[]],['form']]]]]}}" value="{{form.phone}}" bindinput="__e"/></view><view style="text-align:center;"><view data-event-opts="{{[['tap',[['Confirm',['$event']]]]]}}" style="border:2px solid pink;padding:20rpx;border-radius:20rpx;color:white;font-weight:bold;background-color:pink;" bindtap="__e">立即兑换</view></view></view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/CDKEY/index.wxss b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/CDKEY/index.wxss
new file mode 100644
index 0000000..65a5ae3
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/CDKEY/index.wxss
@@ -0,0 +1,160 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/* 背景图片 */
+.background {
+	width: 100%;
+	height: 100%;
+	position: fixed;
+	background-size: 100% 100%;
+	z-index: -1;
+}
+
diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/InvitedOrder/index.wxml b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/InvitedOrder/index.wxml
index ea3a625..01c3133 100644
--- a/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/InvitedOrder/index.wxml
+++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/InvitedOrder/index.wxml
@@ -1 +1 @@
-<view class="container"><view style="background-color:#EFEFF4;min-height:100rpx;padding:20rpx;"><view style="width:95%;border-radius:30rpx;background-color:white;padding:20rpx;"><input maxlength="20" placeholder="订单号搜索" placeholderStyle="font-size:25rpx" type="text" data-event-opts="{{[['input',[['__set_model',['$0','orderNumber','$event',[]],['model']]]]]}}" value="{{model.orderNumber}}" bindinput="__e"/></view></view><view style="padding:20rpx;display:flex;align-items:center;justify-content:space-around;font-size:25rpx;"><view data-event-opts="{{[['tap',[['Change',[0]]]]]}}" class="{{[num==0?'btn':'']}}" style="padding-bottom:10rpx;" bindtap="__e">全部</view><view data-event-opts="{{[['tap',[['Change',[1]]]]]}}" class="{{[num==1?'btn':'']}}" style="padding-bottom:10rpx;" bindtap="__e">待付款</view><view data-event-opts="{{[['tap',[['Change',[2]]]]]}}" class="{{[num==2?'btn':'']}}" style="padding-bottom:10rpx;" bindtap="__e">待收货</view><view data-event-opts="{{[['tap',[['Change',[3]]]]]}}" class="{{[num==3?'btn':'']}}" style="padding-bottom:10rpx;" bindtap="__e">待评价</view><view data-event-opts="{{[['tap',[['Change',[4]]]]]}}" class="{{[num==4?'btn':'']}}" style="padding-bottom:10rpx;" bindtap="__e">已完成</view></view><view><block wx:if="{{list.length==0}}"><view style="width:100%;display:flex;align-items:center;justify-content:center;flex-direction:column;"><image style="width:400rpx;height:400rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/nullImg.png'}}"></image><text style="color:gray;font-size:30rpx;">暂无数据</text></view></block><block wx:else><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view style="margin:20rpx;background-color:white;border-radius:20rpx;padding:20rpx;"><view style="display:flex;align-items:center;justify-content:space-between;font-size:25rpx;border-bottom:1px solid #e0e0e0;padding-bottom:20rpx;"><view style="color:gray;"><text>{{'订单号:'+item.orderNumber}}</text></view><view style="{{(item.type=='1'?'color:red':'color:gray')}}">{{''+(item.type=='1'?'待付款':item.type=='2'?'待收货':item.type=='3'?'待评价':item.type=='4'?'已完成':item.type=='5'?'已取消':item.type=='6'?'售后中':'异常订单')+''}}</view></view><block wx:for="{{item.jsonDetail.arrayJsons}}" wx:for-item="childrenItem" wx:for-index="index" wx:key="index"><view style="display:flex;align-items:center;justify-content:space-between;margin:20rpx;"><view><view style="display:flex;"><view><image style="width:200rpx;height:200rpx;" src="{{childrenItem.goods!=null?childrenItem.goods.banner[0].url==undefined?BASE_URL+childrenItem.goods.Banner[0].url:BASE_URL+childrenItem.goods.banner[0].url:''}}"></image></view><view style="font-size:25rpx;margin-left:20rpx;line-height:50rpx;"><view style="font-size:28rpx;">{{childrenItem.goods&&childrenItem.goods.title}}</view><view style="color:GRAY;">{{'规格:'+(childrenItem.jsonDetail&&childrenItem.jsonDetail.Title)+''}}</view><view style="color:gray;">{{'x'+childrenItem.count}}</view><view style="color:gray;">{{'下单时间:'+item.creatorTime}}</view><view style="color:gray;">{{'下单用户:'+(item.user&&item.user.RealName)}}</view></view></view></view><view style="font-size:25rpx;">{{'￥'+childrenItem.count*childrenItem.jsonDetail.Moneys+''}}</view></view></block><view style="display:flex;align-items:center;justify-content:space-between;"><view><text style="color:gray;font-size:23rpx;">上级分润金额</text><text style="color:red;">{{'￥'+item.ParentMoney}}</text></view><view><text style="color:gray;font-size:23rpx;">合计</text><text style="color:red;">{{'￥'+item.totalMoney}}</text></view></view></view></block></block></view></view>
\ No newline at end of file
+<view class="container"><view style="background-color:#EFEFF4;min-height:100rpx;padding:20rpx;"><view style="width:95%;border-radius:30rpx;background-color:white;padding:20rpx;"><input maxlength="20" placeholder="订单号搜索" placeholderStyle="font-size:25rpx" type="text" data-event-opts="{{[['input',[['__set_model',['$0','orderNumber','$event',[]],['model']]]]]}}" value="{{model.orderNumber}}" bindinput="__e"/></view></view><view style="padding:20rpx;display:flex;align-items:center;justify-content:space-around;font-size:25rpx;"><view data-event-opts="{{[['tap',[['Change',[0]]]]]}}" class="{{[num==0?'btn':'']}}" style="padding-bottom:10rpx;" bindtap="__e">全部</view><view data-event-opts="{{[['tap',[['Change',[1]]]]]}}" class="{{[num==1?'btn':'']}}" style="padding-bottom:10rpx;" bindtap="__e">待付款</view><view data-event-opts="{{[['tap',[['Change',[2]]]]]}}" class="{{[num==2?'btn':'']}}" style="padding-bottom:10rpx;" bindtap="__e">待收货</view><view data-event-opts="{{[['tap',[['Change',[3]]]]]}}" class="{{[num==3?'btn':'']}}" style="padding-bottom:10rpx;" bindtap="__e">待评价</view><view data-event-opts="{{[['tap',[['Change',[4]]]]]}}" class="{{[num==4?'btn':'']}}" style="padding-bottom:10rpx;" bindtap="__e">已完成</view></view><view><block wx:if="{{list.length==0}}"><view style="width:100%;display:flex;align-items:center;justify-content:center;flex-direction:column;"><image style="width:400rpx;height:400rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/nullImg.png'}}"></image><text style="color:gray;font-size:30rpx;">暂无数据</text></view></block><block wx:else><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view style="margin:20rpx;background-color:white;border-radius:20rpx;padding:20rpx;"><view style="display:flex;align-items:center;justify-content:space-between;font-size:25rpx;border-bottom:1px solid #e0e0e0;padding-bottom:20rpx;"><view style="color:gray;"><text>{{'订单号:'+item.orderNumber}}</text></view><view style="{{(item.type=='1'?'color:red':'color:gray')}}">{{''+(item.type=='1'?'待付款':item.type=='2'?'待收货':item.type=='3'?'待评价':item.type=='4'?'已完成':item.type=='5'?'已取消':item.type=='6'?'售后中':'异常订单')+''}}</view></view><block wx:for="{{item.jsonDetail.arrayJsons}}" wx:for-item="childrenItem" wx:for-index="index" wx:key="index"><view style="display:flex;align-items:center;justify-content:space-between;margin:20rpx;"><view><view style="display:flex;"><view><image style="width:200rpx;height:200rpx;" src="{{childrenItem.goods!=null?childrenItem.goods.banner[0].url==undefined?BASE_URL+childrenItem.goods.Banner[0].url:BASE_URL+childrenItem.goods.banner[0].url:''}}"></image></view><view style="font-size:25rpx;margin-left:20rpx;line-height:50rpx;"><view style="font-size:28rpx;">{{childrenItem.goods&&childrenItem.goods.title}}</view><view style="color:GRAY;">{{'规格:'+(childrenItem.jsonDetail&&childrenItem.jsonDetail.Title)+''}}</view><view style="color:gray;">{{'x'+childrenItem.count}}</view><view style="color:gray;">{{'下单时间:'+item.creatorTime}}</view><view style="color:gray;">{{'下单用户:'+(item.user&&item.user.RealName)}}</view></view></view></view><view style="font-size:25rpx;">{{'￥'+childrenItem.count*childrenItem.jsonDetail.Moneys+''}}</view></view></block><view style="display:flex;align-items:center;justify-content:space-between;"><view><text style="color:gray;font-size:23rpx;">上级分润金额</text><text style="color:red;">{{'￥'+item.ParentMoney}}</text></view><view><text style="color:gray;font-size:23rpx;">合计</text><text style="color:red;">{{'￥'+item.totalMoneys}}</text></view></view></view></block></block></view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/comfirmorder/index.wxml b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/comfirmorder/index.wxml
index 8ab13c6..8f5d4ad 100644
--- a/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/comfirmorder/index.wxml
+++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/comfirmorder/index.wxml
@@ -1 +1,3 @@
-<view class="container" style="padding-bottom:70rpx;"><view style="padding:20rpx;margin:20rpx;background-color:white;border-radius:20rpx;"><view style="display:flex;align-items:center;"><view><image style="width:40rpx;height:40rpx;margin-top:10rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/rooms.png'}}"></image></view><view style="font-size:28rpx;font-weight:bold;margin-left:20rpx;">LanguageCert ESOL Registration</view></view><view style="display:flex;align-items:center;justify-content:space-between;padding-bottom:20rpx;border-bottom:1px solid #e0e0e0;"><view style="display:flex;align-items:center;"><view><image style="width:40rpx;height:40rpx;margin-top:15rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/navigations.png'}}"></image></view><view style="font-size:28rpx;font-weight:bold;margin-left:20rpx;width:300rpx;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;">LanguageCert ESOL Registration</view><view><image style="width:40rpx;height:40rpx;margin-top:12rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/right.png'}}"></image></view></view><view style="display:flex;align-items:center;"><view><image style="width:40rpx;height:40rpx;margin-top:13rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/positons.png'}}"></image></view><view style="font-size:26rpx;colro:gray;">距离您986.53km</view></view></view><view style="color:gray;font-size:28rpx;margin-top:20rpx;">中国湖北省武汉市武昌区松竹路汉街总部国际F座郎思测评考试中心</view></view><view style="padding:20rpx;margin:20rpx;background-color:white;border-radius:20rpx;"><view style="display:flex;align-items:center;"><view><image style="width:40rpx;height:40rpx;margin-top:10rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/methods.png'}}"></image></view><view style="font-size:28rpx;margin-left:10rpx;">配送方式</view></view><view style="background-color:gray;border-radius:20rpx;width:50%;text-align:center;padding:10rpx 20rpx 10rpx 20rpx;color:white;margin-top:20rpx;">无需物流</view><block wx:for="{{model.arrayJsons}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view style="display:flex;align-items:center;justify-content:space-between;margin:20rpx;padding-bottom:20rpx;border-bottom:1px solid #e0e0e0;"><view><view style="display:flex;"><view><image style="width:200rpx;height:200rpx;" src="{{item.goods!=null?BASE_URL+item.goods.Banner[0].url:''}}"></image></view><view style="font-size:25rpx;margin-left:20rpx;line-height:50rpx;"><view style="font-size:28rpx;">{{item.goods&&item.goods.Title}}</view><view style="color:GRAY;">{{'规格:'+(item.jsonDetail&&item.jsonDetail.Title)}}</view><view style="color:gray;">{{'x'+item.count}}</view></view></view></view><view style="font-size:25rpx;">{{''+('￥'+(item.jsonDetail!=null?item.jsonDetail.Moneys*item.count:'金额计算中....')+'')+''}}</view></view></block><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #e0e0e0;"><view style="display:flex;align-items:center;"><view><image style="width:40rpx;height:40rpx;margin-top:10rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/coupon1.png'}}"></image></view><view style="margin-left:10rpx;font-size:28rpx;">兑换码</view></view><view style="display:flex;align-items:center;"><view data-event-opts="{{[['tap',[['OpenCode',['$event']]]]]}}" style="font-size:30rpx;color:gray;" bindtap="__e">{{value?value:'使用兑换码'}}</view><view><image style="margin-top:10rpx;width:30rpx;height:30rpx;margin-left:10rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/right.png'}}"></image></view></view></view><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #e0e0e0;"><view style="font-size:28rpx;">运费</view><view style="color:red;font-size:26rpx;">￥0.00</view></view><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;"><view style="font-size:28rpx;"></view><view style="color:red;font-size:26rpx;">{{'共'+model.arrayJsons.length+'件'}}<text style="font-weight:bold;color:black;margin-left:10rpx;">小计:<text style="color:red;margin-left:10rpx;">{{'￥'+model.totalMoneys}}</text></text></view></view></view><view style="padding:20rpx;margin:20rpx;background-color:white;border-radius:20rpx;margin-bottom:100rpx;"><view style="font-size:28rpx;padding:20rpx;border-bottom:1px solid #e0e0e0;">提交注册信息</view><view style="padding:20rpx;border-bottom:1px solid #e0e0e0;"><view style="margin-bottom:10rpx;color:red;">*<text style="color:gray;">请选择</text></view><view style="display:flex;align-items:center;margin-top:20rpx;"><view class="{{[current==1?'selected':'noselected']}}" style="padding:10rpx 20rpx 10rpx 20rpx;font-size:25rpx;font-weight:bold;border-radius:20rpx;">线上考试OLP</view></view></view><view style="padding:20rpx;border-bottom:1px solid #e0e0e0;"><view style="margin-bottom:10rpx;color:red;">*<text style="color:gray;">姓(拼音)</text></view><view style="margin-top:20rpx;"><input style="font-size:25rpx;" placeholder="请输入姓拼音" placeholderStyle="font-size:25rpx" type="text" data-event-opts="{{[['input',[['__set_model',['$0','surname','$event',[]],['form.orderinfo']]]]]}}" value="{{form.orderinfo.surname}}" bindinput="__e"/></view></view><view style="padding:20rpx;border-bottom:1px solid #e0e0e0;"><view style="margin-bottom:10rpx;color:red;">*<text style="color:gray;">名(拼音)</text></view><view style="margin-top:20rpx;"><input style="font-size:25rpx;" placeholder="请输入名拼音" placeholderStyle="font-size:25rpx" type="text" data-event-opts="{{[['input',[['__set_model',['$0','name','$event',[]],['form.orderinfo']]]]]}}" value="{{form.orderinfo.name}}" bindinput="__e"/></view></view><view style="padding:20rpx;border-bottom:1px solid #e0e0e0;"><view style="margin-bottom:10rpx;color:red;">*<text style="color:gray;">电话</text></view><view style="margin-top:20rpx;"><input style="font-size:25rpx;" placeholder="请输入电话" placeholderStyle="font-size:25rpx" type="text" data-event-opts="{{[['input',[['__set_model',['$0','phone','$event',[]],['form.orderinfo']]]]]}}" value="{{form.orderinfo.phone}}" bindinput="__e"/></view></view><view style="padding:20rpx;border-bottom:1px solid #e0e0e0;"><view style="margin-bottom:10rpx;color:red;">*<text style="color:gray;">邮箱</text></view><view style="margin-top:20rpx;"><input style="font-size:25rpx;" placeholder="请输入邮箱" placeholderStyle="font-size:25rpx" type="text" data-event-opts="{{[['input',[['__set_model',['$0','email','$event',[]],['form.orderinfo']]]]]}}" value="{{form.orderinfo.email}}" bindinput="__e"/></view></view></view><view style="position:fixed;bottom:0;background-color:white;width:100%;height:120rpx;box-shadow:0px -10px 20px -5px #e0e0e0;"><view style="margin:20rpx 20rpx 0rpx 20rpx;display:flex;align-items:center;justify-content:space-between;padding-bottom:20rpx;"><view><text style="font-size:20rpx;font-weight:bold;color:red;">合计:￥</text><text style="font-size:50rpx;color:red;font-weight:bold;">{{model.totalMoneys}}</text></view><view data-event-opts="{{[['tap',[['Confirm',['$event']]]]]}}" style="background-color:red;border-radius:20rpx;padding:20rpx;font-weight:bold;color:white;" bindtap="__e">提交订单</view></view></view><uni-popup class="vue-ref" vue-id="d83e6e0a-1" type="dialog" data-ref="inputDialog" bind:__l="__l" vue-slots="{{['default']}}"><uni-popup-dialog class="vue-ref" vue-id="{{('d83e6e0a-2')+','+('d83e6e0a-1')}}" mode="input" title="请输入兑换码" value="" placeholder="请输入兑换码" data-ref="inputClose" data-event-opts="{{[['^confirm',[['dialogInputConfirm']]],['^close',[['dialogInputExsit']]]]}}" bind:confirm="__e" bind:close="__e" bind:__l="__l"></uni-popup-dialog></uni-popup></view>
\ No newline at end of file
+<view class="container" style="padding-bottom:70rpx;"><view style="padding:20rpx;margin:20rpx;background-color:white;border-radius:20rpx;"><view style="display:flex;align-items:center;"><view><image style="width:40rpx;height:40rpx;margin-top:10rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/rooms.png'}}"></image></view><view style="font-size:28rpx;font-weight:bold;margin-left:20rpx;">LanguageCert ESOL Registration</view></view><view style="display:flex;align-items:center;justify-content:space-between;padding-bottom:20rpx;border-bottom:1px solid #e0e0e0;"><view style="display:flex;align-items:center;"><view><image style="width:40rpx;height:40rpx;margin-top:15rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/navigations.png'}}"></image></view><view style="font-size:28rpx;font-weight:bold;margin-left:20rpx;width:300rpx;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;">LanguageCert ESOL Registration</view><view><image style="width:40rpx;height:40rpx;margin-top:12rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/right.png'}}"></image></view></view><view style="display:flex;align-items:center;"><view><image style="width:40rpx;height:40rpx;margin-top:13rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/positons.png'}}"></image></view><view style="font-size:26rpx;colro:gray;">距离您986.53km</view></view></view><view style="color:gray;font-size:28rpx;margin-top:20rpx;">中国湖北省武汉市武昌区松竹路汉街总部国际F座郎思测评考试中心</view></view><view style="padding:20rpx;margin:20rpx;background-color:white;border-radius:20rpx;"><view style="display:flex;align-items:center;"><view><image style="width:40rpx;height:40rpx;margin-top:10rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/methods.png'}}"></image></view><view style="font-size:28rpx;margin-left:10rpx;">配送方式</view></view><view style="background-color:gray;border-radius:20rpx;width:50%;text-align:center;padding:10rpx 20rpx 10rpx 20rpx;color:white;margin-top:20rpx;">无需物流</view><block wx:for="{{model.arrayJsons}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view style="display:flex;align-items:center;justify-content:space-between;margin:20rpx;padding-bottom:20rpx;border-bottom:1px solid #e0e0e0;"><view><view style="display:flex;"><view><image style="width:200rpx;height:200rpx;" src="{{item.goods!=null?BASE_URL+item.goods.Banner[0].url:''}}"></image></view><view style="font-size:25rpx;margin-left:20rpx;line-height:50rpx;"><view style="font-size:28rpx;">{{item.goods&&item.goods.Title}}</view><view style="color:GRAY;">{{'规格:'+(item.jsonDetail&&item.jsonDetail.Title)}}</view><view style="color:gray;">{{'x'+item.count}}</view></view></view></view><view style="font-size:25rpx;">{{''+('￥'+(item.jsonDetail!=null?item.jsonDetail.Moneys*item.count:'金额计算中....')+'')+''}}</view></view></block><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #e0e0e0;"><view style="display:flex;align-items:center;"><view><image style="width:40rpx;height:40rpx;margin-top:10rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/coupon1.png'}}"></image></view><view style="margin-left:10rpx;font-size:28rpx;">兑换码</view></view><view style="display:flex;align-items:center;"><view data-event-opts="{{[['tap',[['OpenCode',['$event']]]]]}}" style="font-size:30rpx;color:gray;" bindtap="__e">{{value?value:'使用兑换码'}}</view><view><image style="margin-top:10rpx;width:30rpx;height:30rpx;margin-left:10rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/right.png'}}"></image></view></view></view><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #e0e0e0;"><view style="font-size:28rpx;">运费</view><view style="color:red;font-size:26rpx;">￥0.00</view></view><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;"><view style="font-size:28rpx;"></view><view style="color:red;font-size:26rpx;">{{'共'+model.arrayJsons.length+'件'}}<text style="font-weight:bold;color:black;margin-left:10rpx;">小计:<text style="color:red;margin-left:10rpx;">{{'￥'+model.totalMoneys}}</text></text></view></view></view><view style="padding:20rpx;margin:20rpx;background-color:white;border-radius:20rpx;margin-bottom:100rpx;"><view style="font-size:28rpx;padding:20rpx;border-bottom:1px solid #e0e0e0;">提交注册信息</view><view style="padding:20rpx;border-bottom:1px solid #e0e0e0;"><view style="margin-bottom:10rpx;color:red;">*<text style="color:gray;">请选择</text></view><view style="display:flex;align-items:center;margin-top:20rpx;"><view class="{{[current==1?'selected':'noselected']}}" style="padding:10rpx 20rpx 10rpx 20rpx;font-size:25rpx;font-weight:bold;border-radius:20rpx;">线上考试OLP</view></view></view><view style="padding:20rpx;border-bottom:1px solid #e0e0e0;"><view style="margin-bottom:10rpx;color:red;">*<text style="color:gray;">姓(拼音)</text></view><view style="margin-top:20rpx;"><input style="font-size:25rpx;" placeholder="请输入姓拼音" placeholderStyle="font-size:25rpx" type="text" data-event-opts="{{[['input',[['__set_model',['$0','surname','$event',[]],['form.orderinfo']]]]]}}" value="{{form.orderinfo.surname}}" bindinput="__e"/></view></view><view style="padding:20rpx;border-bottom:1px solid #e0e0e0;"><view style="margin-bottom:10rpx;color:red;">*<text style="color:gray;">名(拼音)</text></view><view style="margin-top:20rpx;"><input style="font-size:25rpx;" placeholder="请输入名拼音" placeholderStyle="font-size:25rpx" type="text" data-event-opts="{{[['input',[['__set_model',['$0','name','$event',[]],['form.orderinfo']]]]]}}" value="{{form.orderinfo.name}}" bindinput="__e"/></view></view><view style="padding:20rpx;border-bottom:1px solid #e0e0e0;"><view style="margin-bottom:10rpx;color:red;">*<text style="color:gray;">电话</text></view><view style="margin-top:20rpx;"><input style="font-size:25rpx;" placeholder="请输入电话" placeholderStyle="font-size:25rpx" type="text" data-event-opts="{{[['input',[['__set_model',['$0','phone','$event',[]],['form.orderinfo']]]]]}}" value="{{form.orderinfo.phone}}" bindinput="__e"/></view></view><view style="padding:20rpx;border-bottom:1px solid #e0e0e0;"><view style="margin-bottom:10rpx;color:red;">*<text style="color:gray;">邮箱</text></view><view style="margin-top:20rpx;"><input style="font-size:25rpx;" placeholder="请输入邮箱" placeholderStyle="font-size:25rpx" type="text" data-event-opts="{{[['input',[['__set_model',['$0','email','$event',[]],['form.orderinfo']]]]]}}" value="{{form.orderinfo.email}}" bindinput="__e"/></view></view><view style="padding:20rpx;color:red;font-size:25rpx;">请注意，下单后将会及时发送考试兑换Voucher
+			我们遵循统一的退款政策：购买Voucher后14自然日内，同时距离考试时间开始大于48小时可以联系客服提出退款申请。
+			退款有可能会收取一定的行政费用，详情请参见退款政策。</view></view><view style="position:fixed;bottom:0;background-color:white;width:100%;height:120rpx;box-shadow:0px -10px 20px -5px #e0e0e0;"><view style="margin:20rpx 20rpx 0rpx 20rpx;display:flex;align-items:center;justify-content:space-between;padding-bottom:20rpx;"><view><text style="font-size:20rpx;font-weight:bold;color:red;">合计:￥</text><text style="font-size:50rpx;color:red;font-weight:bold;">{{model.totalMoneys}}</text></view><view data-event-opts="{{[['tap',[['Confirm',['$event']]]]]}}" style="background-color:red;border-radius:20rpx;padding:20rpx;font-weight:bold;color:white;" bindtap="__e">提交订单</view></view></view><uni-popup class="vue-ref" vue-id="d83e6e0a-1" type="dialog" data-ref="inputDialog" bind:__l="__l" vue-slots="{{['default']}}"><uni-popup-dialog class="vue-ref" vue-id="{{('d83e6e0a-2')+','+('d83e6e0a-1')}}" mode="input" title="请输入兑换码" value="" placeholder="请输入兑换码" data-ref="inputClose" data-event-opts="{{[['^confirm',[['dialogInputConfirm']]],['^close',[['dialogInputExsit']]]]}}" bind:confirm="__e" bind:close="__e" bind:__l="__l"></uni-popup-dialog></uni-popup></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/index/index.wxml b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
index a444a39..7d4e95e 100644
--- a/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
+++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
@@ -1 +1 @@
-<view class="container"><view><view style="position:relative;top:0px;"><image style="height:780rpx;width:100%;z-index:-1;" src="../../static/newimage.png"></image></view><view style="position:absolute;top:530rpx;left:30rpx;color:white;font-weight:bold;"><view style="font-size:50rpx;margin-left:-30rpx;letter-spacing:10rpx;">【朗思测评考试中心】</view><view style="letter-spacing:5rpx;margin-top:10rpx;">郎思官方报名中心|郎思官方SELT考试中心</view><view style="letter-spacing:5rpx;margin-top:5rpx;">广受考试好评考试中心</view></view></view><view style="border-top-left-radius:40rpx;border-top-right-radius:40rpx;z-index:1;min-height:600rpx;width:100%;background-color:white;position:absolute;top:735rpx;"><view style="width:100%;"><view style="text-align:center;margin-top:30rpx;"><image style="width:90%;height:200rpx;border-radius:20rpx;" src="../../static/apply.png" data-event-opts="{{[['tap',[['RedirectMean',['$event']]]]]}}" bindtap="__e"></image></view><view style="display:flex;align-items:center;justify-content:space-around;flex-wrap:wrap;margin-top:20rpx;"><view><view style="position:relative;top:0px;"><image style="width:300rpx;height:150rpx;border-radius:20rpx;" src="../../static/school.png" data-event-opts="{{[['tap',[['RedirectSchool',['$event']]]]]}}" bindtap="__e"></image><view style="position:absolute;top:40rpx;left:20rpx;font-weight:bold;color:white;">认可院校</view></view></view><view><view style="position:relative;top:0px;"><image style="width:300rpx;height:150rpx;border-radius:20rpx;" src="../../static/zl.png" data-event-opts="{{[['tap',[['RedirectZL',['$event']]]]]}}" bindtap="__e"></image><view style="position:absolute;top:40rpx;left:20rpx;font-weight:bold;color:white;">备考资料</view></view></view><view style="margin-top:20rpx;"><view style="position:relative;top:0px;"><image style="width:300rpx;height:150rpx;border-radius:20rpx;" src="../../static/zs.png" data-event-opts="{{[['tap',[['RedirectZSKD',['$event']]]]]}}" bindtap="__e"></image><view style="position:absolute;top:40rpx;left:20rpx;font-weight:bold;color:white;">证件报备</view></view></view><view style="margin-top:20rpx;"><button style="padding:0px;margin:0px;display:flex;align-items:center;border:0px;" openType="contact" plain="true" type="default"><view style="position:relative;top:5px;"><image style="width:300rpx;height:150rpx;border-radius:20rpx;" src="../../static/lw.png"></image><view style="position:absolute;top:20rpx;left:20rpx;font-weight:bold;color:white;">客服</view></view></button></view></view></view></view><view style="position:fixed;bottom:0px;width:100%;z-index:1;display:flex;align-items:center;"><image style="width:100%;height:50rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/bottom.png'}}"></image></view></view>
\ No newline at end of file
+<view class="container"><view><view style="position:relative;top:0px;"><image style="height:780rpx;width:100%;z-index:-1;" src="../../static/banner.png"></image></view><view style="position:absolute;top:530rpx;left:30rpx;color:white;font-weight:bold;"><view style="font-size:50rpx;margin-left:-30rpx;letter-spacing:10rpx;">【朗思测评考试中心】</view><view style="letter-spacing:5rpx;margin-top:10rpx;">朗思官方报名中心|朗思官方SELT考试中心</view><view style="letter-spacing:5rpx;margin-top:5rpx;">广受考试好评考试中心</view></view></view><view style="border-top-left-radius:40rpx;border-top-right-radius:40rpx;z-index:1;min-height:600rpx;width:100%;background-color:white;position:absolute;top:735rpx;"><view style="width:100%;"><view style="text-align:center;margin-top:30rpx;"><image style="width:90%;height:200rpx;border-radius:20rpx;" src="../../static/apply.png" data-event-opts="{{[['tap',[['RedirectMean',['$event']]]]]}}" bindtap="__e"></image></view><view style="display:flex;align-items:center;justify-content:space-around;flex-wrap:wrap;margin-top:20rpx;"><view><view style="position:relative;top:0px;"><image style="width:300rpx;height:150rpx;border-radius:20rpx;" src="../../static/school.png" data-event-opts="{{[['tap',[['RedirectSchool',['$event']]]]]}}" bindtap="__e"></image><view style="position:absolute;top:40rpx;left:20rpx;font-weight:bold;color:white;">认可院校</view></view></view><view><view style="position:relative;top:0px;"><image style="width:300rpx;height:150rpx;border-radius:20rpx;" src="../../static/zl.png" data-event-opts="{{[['tap',[['RedirectZL',['$event']]]]]}}" bindtap="__e"></image><view style="position:absolute;top:40rpx;left:20rpx;font-weight:bold;color:white;">备考资料</view></view></view><view style="margin-top:20rpx;"><view style="position:relative;top:0px;"><image style="width:300rpx;height:150rpx;border-radius:20rpx;" src="../../static/zs.png" data-event-opts="{{[['tap',[['RedirectZSKD',['$event']]]]]}}" bindtap="__e"></image><view style="position:absolute;top:40rpx;left:20rpx;font-weight:bold;color:white;">证件报备</view></view></view><view style="margin-top:20rpx;"><button style="padding:0px;margin:0px;display:flex;align-items:center;border:0px;" openType="contact" plain="true" type="default"><view style="position:relative;top:5px;"><image style="width:300rpx;height:150rpx;border-radius:20rpx;" src="../../static/lw.png"></image><view style="position:absolute;top:20rpx;left:20rpx;font-weight:bold;color:white;">客服</view></view></button></view></view></view></view><view style="position:fixed;bottom:0px;width:100%;z-index:1;display:flex;align-items:center;"><image style="width:100%;height:50rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/bottom.png'}}"></image></view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/login/index.wxml b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/login/index.wxml
index fd418ea..bd9d640 100644
--- a/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/login/index.wxml
+++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/login/index.wxml
@@ -1 +1 @@
-<view class="container" style="padding:20rpx;"><view><view><view><view class="header" style="width:100%;text-align:center;margin-top:80rpx;margin-bottom:20rpx;"><image style="width:250rpx;height:250rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/wx_login.png'}}" mode="aspectFit"></image></view><view class="content" style="font-size:30rpx;border-top:2px solid #e0e0e0;padding-top:50rpx;margin-bottom:20rpx;"><view style="font-weight:bold;color:black;margin-bottom:30rpx;">申请获取以下权限</view><text style="color:gray;">获得你的公开信息(昵称，头像、地区等)</text></view><button style="margin-top:50rpx;background-color:#2B9BFA;" type="primary" data-event-opts="{{[['tap',[['WxLogin',['$event']]]]]}}" bindtap="__e">授权登录</button></view></view><view class="agreement" style="font-size:25rpx;display:flex;align-items:center;margin-top:20rpx;"><view class="protocolIcon"><checkbox-group data-event-opts="{{[['change',[['checkboxGroupChange',['$event']]]]]}}" bindchange="__e"><checkbox style="transform:scale(0.6);" checked="false" value="1"></checkbox></checkbox-group></view><view class="writtenWords">我已阅读并同意<label data-event-opts="{{[['tap',[['RedirectAgreement',['$event']]]]]}}" style="color:#2B9BFA;" bindtap="__e">《朗思英语测评使用协议和隐私协议》</label></view></view></view></view>
\ No newline at end of file
+<view class="container" style="padding:20rpx;"><view><view><view><view class="header" style="width:100%;text-align:center;margin-top:80rpx;margin-bottom:20rpx;"><image style="width:350rpx;height:350rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/logo.png'}}" mode="aspectFit"></image></view><view class="content" style="font-size:30rpx;border-top:2px solid #e0e0e0;padding-top:50rpx;margin-bottom:20rpx;"><view style="font-weight:bold;color:black;margin-bottom:30rpx;">申请获取以下权限</view><text style="color:gray;">获得你的公开信息(昵称，头像、地区等)</text></view><button style="margin-top:50rpx;background-color:#2B9BFA;" type="primary" data-event-opts="{{[['tap',[['WxLogin',['$event']]]]]}}" bindtap="__e">授权登录</button></view></view><view class="agreement" style="font-size:25rpx;display:flex;align-items:center;margin-top:20rpx;"><view class="protocolIcon"><checkbox-group data-event-opts="{{[['change',[['checkboxGroupChange',['$event']]]]]}}" bindchange="__e"><checkbox style="transform:scale(0.6);" checked="{{false}}" value="1"></checkbox></checkbox-group></view><view class="writtenWords">我已阅读并同意<label data-event-opts="{{[['tap',[['RedirectAgreement',['$event']]]]]}}" style="color:#2B9BFA;" bindtap="__e">《朗思英语测评使用协议和隐私协议》</label></view></view></view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/my/info.wxml b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/my/info.wxml
index d0b4ec1..c0ddda4 100644
--- a/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/my/info.wxml
+++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/my/info.wxml
@@ -1 +1 @@
-<view class="container" style="padding:20rpx;"><view style="font-size:25rpx;"><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>用户名:</view><view><input style="text-align:right;" disabled="true" placeholder="请输入用户名" type="text" data-event-opts="{{[['input',[['__set_model',['$0','realName','$event',[]],['model']]]]]}}" value="{{model.realName}}" bindinput="__e"/></view></view><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>身份:</view><view>{{''+(model.type=='1'?'代理':'普通用户')+''}}</view></view><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>邮箱:</view><view><input style="text-align:right;" placeholder="请输入邮箱" type="text" data-event-opts="{{[['input',[['__set_model',['$0','email','$event',[]],['model']]]]]}}" value="{{model.email}}" bindinput="__e"/></view></view><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>手机号:</view><view><input style="text-align:right;" placeholder="请输入手机号" type="text" data-event-opts="{{[['input',[['__set_model',['$0','mobilePhone','$event',[]],['model']]]]]}}" value="{{model.mobilePhone}}" bindinput="__e"/></view></view><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>地址:</view><view><input style="text-align:right;" placeholder="请输入地址" type="text" data-event-opts="{{[['input',[['__set_model',['$0','postalAddress','$event',[]],['model']]]]]}}" value="{{model.postalAddress}}" bindinput="__e"/></view></view><block wx:if="{{false}}"><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>开户行:</view><view><input style="text-align:right;width:100%;" placeholder="请输入开户行,请准确填写" type="text"/></view></view></block><block wx:if="{{false}}"><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>开户姓名:</view><view><input style="text-align:right;" placeholder="请输入开户姓名,请准确填写" type="text"/></view></view></block><block wx:if="{{false}}"><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>卡号:</view><view><input style="text-align:right;" placeholder="请输入卡号,请准确填写" type="text"/></view></view></block></view><view data-event-opts="{{[['tap',[['Submit',['$event']]]]]}}" class="centerview" style="margin-top:20rpx;" bindtap="__e">确认</view></view>
\ No newline at end of file
+<view class="container" style="padding:20rpx;"><view style="font-size:25rpx;"><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>头像:</view><view><button type="balanced" open-type="chooseAvatar" data-event-opts="{{[['chooseavatar',[['onChooseavatar',['$event']]]]]}}" bindchooseavatar="__e"><image class="refreshIcon" style="width:100rpx;height:100rpx;border-radius:50rpx;" src="{{model.headIcon}}" mode="aspectFit"></image></button></view></view><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>用户名:</view><view><input style="text-align:right;" placeholder="请输入用户名" type="nickname" data-event-opts="{{[['input',[['__set_model',['$0','realName','$event',[]],['model']]]]]}}" value="{{model.realName}}" bindinput="__e"/></view></view><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>身份:</view><view>{{''+(model.type=='1'?'代理':'普通用户')+''}}</view></view><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>邮箱:</view><view><input style="text-align:right;" placeholder="请输入邮箱" type="text" data-event-opts="{{[['input',[['__set_model',['$0','email','$event',[]],['model']]]]]}}" value="{{model.email}}" bindinput="__e"/></view></view><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>手机号:</view><view><input style="text-align:right;" placeholder="请输入手机号" type="text" data-event-opts="{{[['input',[['__set_model',['$0','mobilePhone','$event',[]],['model']]]]]}}" value="{{model.mobilePhone}}" bindinput="__e"/></view></view><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>地址:</view><view><input style="text-align:right;" placeholder="请输入地址" type="text" data-event-opts="{{[['input',[['__set_model',['$0','postalAddress','$event',[]],['model']]]]]}}" value="{{model.postalAddress}}" bindinput="__e"/></view></view><block wx:if="{{false}}"><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>开户行:</view><view><input style="text-align:right;width:100%;" placeholder="请输入开户行,请准确填写" type="text"/></view></view></block><block wx:if="{{false}}"><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>开户姓名:</view><view><input style="text-align:right;" placeholder="请输入开户姓名,请准确填写" type="text"/></view></view></block><block wx:if="{{false}}"><view style="display:flex;align-items:center;justify-content:space-between;padding:20rpx;border-bottom:1px solid #FEF0F0;"><view>卡号:</view><view><input style="text-align:right;" placeholder="请输入卡号,请准确填写" type="text"/></view></view></block></view><view data-event-opts="{{[['tap',[['Submit',['$event']]]]]}}" class="centerview" style="margin-top:20rpx;" bindtap="__e">确认</view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/video/index.json b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/video/index.json
index a1f144b..7a3a522 100644
--- a/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/video/index.json
+++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/video/index.json
@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "音频文件",
-  "usingComponents": {}
+  "usingComponents": {
+    "yzaudio": "/components/yz-audio/yz-audio"
+  }
 }
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/video/index.wxml b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/video/index.wxml
index 4813e04..1f7e7da 100644
--- a/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/video/index.wxml
+++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/video/index.wxml
@@ -1 +1 @@
-<view><image style="width:100%;height:500rpx;" src="{{BASE_URL+'/api/File/Image/annexpic/bgimage.jpeg'}}"></image><view style="height:100rpx;"></view><view style="padding:20rpx;"><view style="display:flex;align-items:center;justify-content:space-around;margin-top:30rpx;"><view><image style="width:100rpx;height:100rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/left.png'}}"></image></view><view><block wx:if="{{isshow==false}}"><image style="width:100rpx;height:100rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/player.png'}}" data-event-opts="{{[['tap',[['ShowChange',['$event']]]]]}}" bindtap="__e"></image></block><block wx:else><image style="width:100rpx;height:100rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/stop.png'}}" data-event-opts="{{[['tap',[['ShowChange',['$event']]]]]}}" bindtap="__e"></image></block></view><view><image style="width:100rpx;height:100rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/rightaudio.png'}}"></image></view></view><view style="display:flex;align-items:center;justify-content:space-around;margin-top:50rpx;"><view data-event-opts="{{[['tap',[['Change',[1]]]]]}}" class="{{[current==1?'btn':'']}}" style="border:1px solid #e0e0e0;text-align:center;padding:20rpx;font-size:25rpx;border-radius:20rpx;" bindtap="__e">0.75倍</view><view data-event-opts="{{[['tap',[['Change',[2]]]]]}}" class="{{[current==2?'btn':'']}}" style="border:1px solid #e0e0e0;text-align:center;padding:20rpx;font-size:25rpx;border-radius:20rpx;" bindtap="__e">1倍(默认)</view><view data-event-opts="{{[['tap',[['Change',[3]]]]]}}" class="{{[current==3?'btn':'']}}" style="border:1px solid #e0e0e0;text-align:center;padding:20rpx;font-size:25rpx;border-radius:20rpx;" bindtap="__e">1.5倍</view></view></view><view data-event-opts="{{[['tap',[['Submit',['$event']]]]]}}" class="centerview" bindtap="__e">返回首页</view></view>
\ No newline at end of file
+<view><image style="height:700rpx;width:100%;z-index:-1;" src="{{BASE_URL+'/api/File/Image/annexpic/banner.png'}}" mode="scaleToFill"></image><view style="text-align:center;position:absolute;top:200rpx;left:3%;"><view style="display:flex;align-items:center;flex-wrap:wrap;justify-content:center;font-size:55rpx;font-weight:bold;color:white;">{{''+txt+''}}</view></view><view style="height:200rpx;background:white;border-radius:10px;box-shadow:0 0 30px white, 0 0 10px white, 0 0 15px white;position:relative;"><block wx:if="{{hackReset}}"><yzaudio class="vue-ref" vue-id="26f4c051-1" isButton1Visible="true" isButton2Visible="true" isButton3Visible="true" data-ref="player1" data-event-opts="{{[['^Button1Click',[['btn1Click']]],['^error',[['Errors']]]]}}" bind:Button1Click="__e" bind:error="__e" bind:__l="__l"></yzaudio></block></view><view style="padding:20rpx;"><view style="display:flex;align-items:center;justify-content:space-around;"><view><image style="width:100rpx;height:100rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/left.png'}}"></image></view><view><block wx:if="{{isshow==false}}"><image style="width:100rpx;height:100rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/player.png'}}" data-event-opts="{{[['tap',[['ShowChange',['$event']]]]]}}" bindtap="__e"></image></block><block wx:else><image style="width:100rpx;height:100rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/stop.png'}}" data-event-opts="{{[['tap',[['ShowChange',['$event']]]]]}}" bindtap="__e"></image></block></view><view><image style="width:100rpx;height:100rpx;" mode="aspectFit" src="{{BASE_URL+'/api/File/Image/annexpic/rightaudio.png'}}"></image></view></view><view style="display:flex;align-items:center;justify-content:space-around;margin-top:50rpx;"><view data-event-opts="{{[['tap',[['Change',[1]]]]]}}" class="{{[current==1?'btn':'']}}" style="border:1px solid #e0e0e0;text-align:center;padding:20rpx;font-size:25rpx;border-radius:20rpx;" bindtap="__e">0.75倍</view><view data-event-opts="{{[['tap',[['Change',[2]]]]]}}" class="{{[current==2?'btn':'']}}" style="border:1px solid #e0e0ee;text-align:center;padding:20rpx;font-size:25rpx;border-radius:20rpx;" bindtap="__e">1倍(默认)</view><view data-event-opts="{{[['tap',[['Change',[3]]]]]}}" class="{{[current==3?'btn':'']}}" style="border:1px solid #e0e0e0;text-align:center;padding:20rpx;font-size:25rpx;border-radius:20rpx;" bindtap="__e">1.5倍</view></view></view><view data-event-opts="{{[['tap',[['Submit',['$event']]]]]}}" class="centerview" bindtap="__e">返回首页</view></view>
\ No newline at end of file
diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/video/index.wxss b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/video/index.wxss
index 31ce167..36ff8d7 100644
--- a/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/video/index.wxss
+++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/video/index.wxss
@@ -1,7 +1,7 @@
 
 .centerview {
 	position: fixed;
-	bottom: 10px;
+	bottom: 0px;
 	margin: 0 auto;
 	width: 100%;
 	border: 1px solid #f2e2ac;
@@ -24,4 +24,8 @@
 	/*动画播放的次数*/
 	-webkit-animation-duration: 2s;
 }
+.btn {
+	background-color: #F29086;
+	color: white;
+}
 
diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/project.private.config.json b/antis-app-siberian/unpackage/dist/dev/mp-weixin/project.private.config.json
index 618a580..6539e36 100644
--- a/antis-app-siberian/unpackage/dist/dev/mp-weixin/project.private.config.json
+++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/project.private.config.json
@@ -41,6 +41,48 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/comfirmorder/index",
+          "query": "item=%257B%2522arrayJsons%2522%253A%255B%257B%2522goods%2522%253A%257B%2522id%2522%253A%2522337928640928941317%2522%252C%2522identy%2522%253A%2522A1%2522%252C%2522title%2522%253A%2522A1%2522%252C%2522startMoneys%2522%253A5%252C%2522endMoneys%2522%253A5%252C%2522creatorTime%2522%253A1662733668430%252C%2522lastModifyTime%2522%253A1664713981243%252C%2522banner%2522%253A%255B%257B%2522name%2522%253A%2522A1.jpg%2522%252C%2522fileId%2522%253A%252220221002_346234671593424133.jpg%2522%252C%2522url%2522%253A%2522%252Fapi%252FFile%252FImage%252Fannexpic%252F20221002_346234671593424133.jpg%2522%257D%255D%252C%2522sales%2522%253A2%252C%2522iscollect%2522%253A1%257D%252C%2522jsonDetail%2522%253A%257B%2522IdNo%2522%253A441540%252C%2522CardType%2522%253A820%252C%2522Title%2522%253A%2522A1%25E6%25B5%258B%25E8%25AF%2595%25E4%25B8%2593%25E7%2594%25A8(%25E5%258B%25BF%25E6%258B%258D)%2522%252C%2522RemainingCount%2522%253A2%252C%2522TotalCount%2522%253A9%252C%2522UsedCount%2522%253A7%252C%2522CreateTime%2522%253A1671428594000%252C%2522Moneys%2522%253A0.01%257D%252C%2522count%2522%253A1%257D%255D%252C%2522totalMoneys%2522%253A0.01%257D",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/video/index",
+          "query": "param=test1",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/comfirmorder/index",
+          "query": "item=%257B%2522arrayJsons%2522%253A%255B%257B%2522goods%2522%253A%257B%2522id%2522%253A%2522337928640928941317%2522%252C%2522identy%2522%253A%2522A1%2522%252C%2522title%2522%253A%2522A1%2522%252C%2522startMoneys%2522%253A420%252C%2522endMoneys%2522%253A420%252C%2522creatorTime%2522%253A1662733668430%252C%2522lastModifyTime%2522%253A1673107726743%252C%2522banner%2522%253A%255B%257B%2522name%2522%253A%2522A1.jpg%2522%252C%2522fileId%2522%253A%252220221002_346234671593424133.jpg%2522%252C%2522url%2522%253A%2522%252Fapi%252FFile%252FImage%252Fannexpic%252F20221002_346234671593424133.jpg%2522%257D%255D%252C%2522sales%2522%253A2%252C%2522iscollect%2522%253A1%257D%252C%2522jsonDetail%2522%253A%257B%2522IdNo%2522%253A441540%252C%2522CardType%2522%253A820%252C%2522Title%2522%253A%2522A1%25E6%25B5%258B%25E8%25AF%2595%25E4%25B8%2593%25E7%2594%25A8(%25E5%258B%25BF%25E6%258B%258D)%2522%252C%2522RemainingCount%2522%253A0%252C%2522TotalCount%2522%253A15%252C%2522UsedCount%2522%253A15%252C%2522CreateTime%2522%253A1671428594000%252C%2522Moneys%2522%253A0.01%257D%252C%2522count%2522%253A1%257D%255D%252C%2522totalMoneys%2522%253A0.01%257D",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/CDKEY/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/login/index",
+          "query": "scene=avt=397976385726973189&type=1",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/login/index",
+          "query": "scene=avt%3D409681011887047941%26type%3D1",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }
diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/audio-play.png b/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/audio-play.png
new file mode 100644
index 0000000..9ff3a19
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/audio-play.png
diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/audio-stop.png b/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/audio-stop.png
new file mode 100644
index 0000000..1627e98
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/audio-stop.png
diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/banner.png b/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/banner.png
new file mode 100644
index 0000000..8bd36da
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/banner.png
diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/icons/audio-pause.png b/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/icons/audio-pause.png
new file mode 100644
index 0000000..7d654b3
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/icons/audio-pause.png
diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/icons/audio-play.png b/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/icons/audio-play.png
new file mode 100644
index 0000000..23e798a
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/icons/audio-play.png
diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/icons/red-audio-pause.png b/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/icons/red-audio-pause.png
new file mode 100644
index 0000000..e2caa1a
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/icons/red-audio-pause.png
diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/icons/red-audio-play.png b/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/icons/red-audio-play.png
new file mode 100644
index 0000000..43f2a8b
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/icons/red-audio-play.png
diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/mkBg.png b/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/mkBg.png
new file mode 100644
index 0000000..d36eb74
--- /dev/null
+++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/mkBg.png
diff --git a/antis-ncc-admin/antis-ncc-admin/.env.production b/antis-ncc-admin/antis-ncc-admin/.env.production
index a561d20..68eac32 100644
--- a/antis-ncc-admin/antis-ncc-admin/.env.production
+++ b/antis-ncc-admin/antis-ncc-admin/.env.production
@@ -1,5 +1,5 @@
 #　生产默认配置
 ENV = 'production'
 
-VUE_APP_BASE_API = 'https://www.qjy01.com'
-VUE_APP_BASE_WSS = 'wss://www.qjy01.com/websocket'
+VUE_APP_BASE_API = 'https://ls.lcwuhan.com'
+VUE_APP_BASE_WSS = 'wss://ls.lcwuhan.com/websocket'
diff --git a/antis-ncc-admin/antis-ncc-admin/src/assets/images/copyCpdUrl.png b/antis-ncc-admin/antis-ncc-admin/src/assets/images/copyCpdUrl.png
new file mode 100644
index 0000000..d583ccf
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/assets/images/copyCpdUrl.png
diff --git a/antis-ncc-admin/antis-ncc-admin/src/assets/images/ncc1.png b/antis-ncc-admin/antis-ncc-admin/src/assets/images/ncc1.png
index 499af56..1c70bb3 100644
--- a/antis-ncc-admin/antis-ncc-admin/src/assets/images/ncc1.png
+++ b/antis-ncc-admin/antis-ncc-admin/src/assets/images/ncc1.png
diff --git a/antis-ncc-admin/antis-ncc-admin/src/assets/images/ncc2.png b/antis-ncc-admin/antis-ncc-admin/src/assets/images/ncc2.png
index 3fd9341..1c70bb3 100644
--- a/antis-ncc-admin/antis-ncc-admin/src/assets/images/ncc2.png
+++ b/antis-ncc-admin/antis-ncc-admin/src/assets/images/ncc2.png
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/login/index.vue b/antis-ncc-admin/antis-ncc-admin/src/views/login/index.vue
index 1199e79..d817346 100644
--- a/antis-ncc-admin/antis-ncc-admin/src/views/login/index.vue
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/login/index.vue
@@ -5,7 +5,7 @@
         <img src="../../assets/images/3.png" alt="" />
       </el-aside>
       <el-main>
-        <p>安第斯管理系统</p>
+        <p>朗思教育管理系统</p>
         <!-- <span>一体化协同服务</span> -->
         <el-form ref="loginForm" :model="loginForm" :rules="loginRules">
           <ul>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/permission/user/Form.vue b/antis-ncc-admin/antis-ncc-admin/src/views/permission/user/Form.vue
index f39658c..061de73 100644
--- a/antis-ncc-admin/antis-ncc-admin/src/views/permission/user/Form.vue
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/permission/user/Form.vue
@@ -16,11 +16,20 @@
 						<h2 class="bold">基础信息</h2>
 					</div>
 					<el-row :gutter="20" class="custom-row">
-						<!-- <el-col :sm="12" :xs="24">
-              <el-form-item label="账户" prop="account">
-                <el-input v-model="dataForm.account" placeholder="账户名称" />
-              </el-form-item>
-            </el-col> -->
+						<el-col :span="24">
+							<el-form-item label="头像" prop="headIcon">
+								<el-upload class="avatar-uploader" :action="define.comUploadUrl+'/userAvatar'"
+									:show-file-list="false" :on-success="handleAvatarSuccess" accept="image/*">
+									<img v-if="dataForm.headIcon" :src="define.comUrl+dataForm.headIcon" class="avatar">
+									<i v-else class="el-icon-plus avatar-uploader-icon" />
+								</el-upload>
+							</el-form-item>
+						</el-col>
+						<el-col :sm="12" :xs="24">
+							<el-form-item label="账户" prop="account">
+								<el-input v-model="dataForm.account" placeholder="账户名称" />
+							</el-form-item>
+						</el-col>
 						<el-col :sm="12" :xs="24">
 							<el-form-item label="姓名" prop="realName">
 								<el-input v-model="dataForm.realName" placeholder="真实姓名" />
@@ -42,156 +51,61 @@
 						<el-col :sm="12" :xs="24">
 							<el-form-item label="身份" prop="type">
 								<el-select v-model="dataForm.type" placeholder="选择性别">
-									<!-- <el-option v-for="item in genderTreeData" :key="item.enCode"
-                    :label="item.fullName" :value="item.enCode" /> -->
-									<el-option label="普通用户" value="3"></el-option>
-									<el-option label="销售人员" value="1"></el-option>
-									<el-option label="导游" value="2"></el-option>
+
+									<el-option label="普通用户" value="0"></el-option>
+									<el-option label="一级代理" value="1"></el-option>
+									<el-option label="二级代理" value="2"></el-option>
 								</el-select>
 							</el-form-item>
 						</el-col>
 						<el-col :sm="12" :xs="24">
-								<el-form-item label="上级信息" prop="invitedUserId">
-									<el-select v-model="dataForm.invitedUserId" placeholder="上级信息">
-										
-										<el-option v-for="(item,index) in UserList" :key="index" :label="item.realName" :value="item.id"></el-option>
-									</el-select>
-								</el-form-item>
-							</el-col>
-						<!-- <el-col :sm="12" :xs="24">
-              <el-form-item label="直属主管" prop="managerId">
-                <user-select v-model="dataForm.managerId" placeholder="选择直属主管" />
-              </el-form-item>
-            </el-col> -->
-						<!-- <el-col :sm="12" :xs="24">
-              <el-form-item label="岗位" prop="positionId">
-                <NCC-TreeSelect v-model="dataForm.positionId" :options="positionTreeData" multiple
-                  lastLevel lastLevelKey='type' lastLevelValue='position' placeholder="选择岗位"
-                  clearable />
-              </el-form-item>
-            </el-col> -->
-						<!-- <el-col :sm="12" :xs="24">
-              <el-form-item label="角色" prop="roleId">
-                <el-select v-model="roleId" multiple placeholder="请选择" @change="roleIdChange"
-                  filterable>
-                  <el-option-group v-for="group in roleTreeData" :key="group.id"
-                    :label="group.fullName+(group.num?'【'+group.num+'】':'')">
-                    <el-option v-for="item in group.children" :key="item.id" :label="item.fullName"
-                      :value="item.id">
-                    </el-option>
-                  </el-option-group>
-                </el-select>
-              </el-form-item>
-            </el-col> -->
-						<el-col :span="12">
-							<el-form-item label="排序" prop="sortCode">
-								<el-input-number :min="0" :max="9999" v-model="dataForm.sortCode"
-									controls-position="right" />
+							<el-form-item label="籍贯" prop="nativePlace">
+								<el-input v-model="dataForm.nativePlace" placeholder="籍贯" />
 							</el-form-item>
 						</el-col>
-						<el-col :span="12">
-							<el-form-item label="状态" prop="enabledMark">
-								<el-switch v-model="dataForm.enabledMark" :active-value="1" :inactive-value="0" />
+						<el-col :sm="12" :xs="24">
+							<el-form-item label="开户行" prop="bankOpenUserName">
+								<el-input v-model="dataForm.bankOpenUserName" placeholder="开户行" />
 							</el-form-item>
 						</el-col>
-						<el-col :span="24">
-							<el-form-item label="备注" prop="description">
-								<el-input v-model="dataForm.description" type="textarea" :rows="6" />
+						<el-col :sm="12" :xs="24">
+							<el-form-item label="卡号" prop="bankNumber">
+								<el-input v-model="dataForm.bankNumber" placeholder="卡号" />
 							</el-form-item>
 						</el-col>
-					</el-row>
-					<div class="NCC-common-title mb-20">
-						<h2 class="bold">扩展信息</h2>
-					</div>
-					<el-row :gutter="20" class="custom-row">
-						<el-col :span="24">
-							<el-form-item label="头像" prop="headIcon">
-								<el-upload class="avatar-uploader" :action="define.comUploadUrl+'/userAvatar'"
-									:show-file-list="false" :on-success="handleAvatarSuccess" accept="image/*">
-									<img v-if="dataForm.headIcon" :src="define.comUrl+dataForm.headIcon" class="avatar">
-									<i v-else class="el-icon-plus avatar-uploader-icon" />
-								</el-upload>
+						<el-col :sm="12" :xs="24">
+							<el-form-item label="开户名称" prop="bankUserName">
+								<el-input v-model="dataForm.bankUserName" placeholder="开户名称" />
 							</el-form-item>
 						</el-col>
-						<el-col :sm="12" :xs="24">
-							<el-form-item label="民族" prop="nation">
-								<el-select v-model="dataForm.nation" placeholder="选择民族" filterable>
-									<el-option v-for="item in nationTreeData" :key="item.id" :label="item.fullName"
-										:value="item.id" />
-								</el-select>
+						<el-col :span="24">
+							<el-form-item label="通讯地址" prop="postalAddress">
+								<el-input v-model="dataForm.postalAddress" type="textarea" :rows="6" />
 							</el-form-item>
 						</el-col>
 						<el-col :sm="12" :xs="24">
-							<el-form-item label="籍贯" prop="nativePlace">
-								<el-input v-model="dataForm.nativePlace" placeholder="籍贯" />
+							<el-form-item label="上级信息" prop="inviteeUserId">
+								<el-select v-model="dataForm.inviteeUserId" placeholder="上级信息">
+
+									<el-option v-for="(item,index) in UserList" :key="index" :label="item.realName"
+										:value="item.id"></el-option>
+								</el-select>
 							</el-form-item>
 						</el-col>
-						<!-- <el-col :sm="12" :xs="24">
-              <el-form-item label="入职时间" prop="entryDate">
-                <el-date-picker v-model="dataForm.entryDate" type="date" placeholder="选择入职时间"
-                  value-format="timestamp">
-                </el-date-picker>
-              </el-form-item>
-            </el-col> -->
-						<!-- <el-col :sm="12" :xs="24">
-              <el-form-item label="证件类型" prop="certificatesType">
-                <el-select v-model="dataForm.certificatesType" placeholder="选择证件类型">
-                  <el-option v-for="item in certificatesTypeTreeData" :key="item.id"
-                    :label="item.fullName" :value="item.id" />
-                </el-select>
-              </el-form-item>
-            </el-col> -->
-						<!-- <el-col :sm="12" :xs="24">
-              <el-form-item label="证件号码" prop="certificatesNumber">
-                <el-input v-model="dataForm.certificatesNumber" placeholder="证件号码" />
-              </el-form-item>
-            </el-col> -->
-						<!-- <el-col :sm="12" :xs="24">
-              <el-form-item label="文化程度" prop="education">
-                <el-select v-model="dataForm.education" placeholder="选择文化程度">
-                  <el-option v-for="item in educationTreeData" :key="item.id" :label="item.fullName"
-                    :value="item.id" />
-                </el-select>
-              </el-form-item>
-            </el-col> -->
-						<!-- <el-col :sm="12" :xs="24">
-              <el-form-item label="出生年月" prop="birthday">
-                <el-date-picker v-model="dataForm.birthday" type="date" placeholder="选择出生年月"
-                  value-format="timestamp">
-                </el-date-picker>
-              </el-form-item>
-            </el-col> -->
-						<!-- <el-col :sm="12" :xs="24">
-              <el-form-item label="办公电话" prop="telePhone">
-                <el-input v-model="dataForm.telePhone" placeholder="办公电话" />
-              </el-form-item>
-            </el-col>
-            <el-col :sm="12" :xs="24">
-              <el-form-item label="办公座机" prop="landline">
-                <el-input v-model="dataForm.landline" placeholder="办公座机" />
-              </el-form-item>
-            </el-col> -->
-						<el-col :sm="12" :xs="24">
-							<el-form-item label="手机号码" prop="mobilePhone">
-								<el-input v-model="dataForm.mobilePhone" placeholder="手机号码" />
+					
+						<el-col :span="12">
+							<el-form-item label="排序" prop="sortCode">
+								<el-input-number :min="0" :max="9999" v-model="dataForm.sortCode"
+									controls-position="right" />
 							</el-form-item>
 						</el-col>
-						<!-- <el-col :sm="12" :xs="24">
-              <el-form-item label="紧急联系" prop="urgentContacts">
-                <el-input v-model="dataForm.urgentContacts" placeholder="紧急联系人" />
-              </el-form-item>
-            </el-col>
-            <el-col :sm="12" :xs="24">
-              <el-form-item label="紧急电话" prop="urgentTelePhone">
-                <el-input v-model="dataForm.urgentTelePhone" placeholder="紧急联系人电话" />
-              </el-form-item>
-            </el-col> -->
 						<el-col :span="24">
-							<el-form-item label="通讯地址" prop="postalAddress">
-								<el-input v-model="dataForm.postalAddress" type="textarea" :rows="6" />
+							<el-form-item label="备注" prop="description">
+								<el-input v-model="dataForm.description" type="textarea" :rows="6" />
 							</el-form-item>
 						</el-col>
 					</el-row>
+					
 				</el-form>
 			</div>
 		</div>
@@ -220,6 +134,7 @@
 			return {
 				visible: false,
 				btnLoading: false,
+				
 				dataForm: {
 					id: '',
 					sortCode: 0,
@@ -227,7 +142,7 @@
 					account: '',
 					realName: '',
 					organizeId: '',
-					type: '3',
+					type: '0',
 					managerId: '',
 					positionId: '',
 					roleId: '',
@@ -248,8 +163,10 @@
 					urgentContacts: '',
 					urgentTelePhone: '',
 					postalAddress: '',
-					invitedUserId:'',
-					moneys:0
+					inviteeUserId: '',
+					"bankOpenUserName":'',
+					"bankUserName":'',
+					"bankNumber":''
 				},
 				roleId: [],
 				UserList: [],
@@ -279,11 +196,10 @@
 						}
 					],
 					type: [{
-							required: true,
-							message: '请选择角色',
-							trigger: 'blur'
-						}
-					],
+						required: true,
+						message: '请选择角色',
+						trigger: 'blur'
+					}],
 					realName: [{
 							required: true,
 							message: '请输入真实姓名',
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/permission/user/index.vue b/antis-ncc-admin/antis-ncc-admin/src/views/permission/user/index.vue
index f38d255..19f8693 100644
--- a/antis-ncc-admin/antis-ncc-admin/src/views/permission/user/index.vue
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/permission/user/index.vue
@@ -52,30 +52,45 @@
 					</div>
 				</div>
 				<NCC-table v-loading="listLoading" :data="tableData">
-					<el-table-column prop="account" label="账号" width="100" />
-					<el-table-column prop="realName" label="姓名" width="100" />
-					<el-table-column label="性别" width="90" align="center">
+					<el-table-column prop="RealName" label="上级用户">
 						<template slot-scope="scope" sortable>
-							<span>{{ scope.row.gender ==1 ? '男': ( scope.row.gender == 2 ? '女' : '保密') }}</span>
+							<span>{{ scope.row.invitee&&scope.row.invitee.RealName }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column prop="mobilePhone" label="手机" />
-					<el-table-column prop="RealName" label="上级用户">
-						<!-- invitedUser -->
+					<el-table-column prop="id" label="ID">
+						<template slot-scope="scope" sortable>
+							<span>{{ scope.row.id}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="account" label="账号" width="100" />
+					<el-table-column prop="realName" label="姓名" width="100" />
+					<el-table-column label="身份" width="90" align="center">
 						<template slot-scope="scope" sortable>
-							<span>{{ scope.row.invitedUser&&scope.row.invitedUser.RealName }}</span>
+							<span>{{ scope.row.type =='0' ? '普通用户': ( scope.row.type == '1' ? '一级代理' :scope.row.type=='2'?'二级代理':'未知') }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="角色类型" width="90" align="center">
+					<el-table-column label="头像" width="90" align="center">
 						<template slot-scope="scope" sortable>
-							<span>{{ scope.row.type ==1 ? '销售人员':(scope.row.type == 2 ? '导游' : '普通用户') }}</span>
+							<span>
+								<img src="scope.row.headIcon" style="width:60px;height:60px;" />
+							</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="余额" width="90" align="center">
+					<el-table-column label="性别" width="90" align="center">
 						<template slot-scope="scope" sortable>
-							<span>{{ scope.row.moneys}}$</span>
+							<span>
+								{{scope.row.gender=='1'?'男':'女'}}
+							</span>
 						</template>
 					</el-table-column>
+					<el-table-column prop="mobilePhone" label="手机" />
+					<el-table-column prop="email" label="邮箱" />
+					<el-table-column prop="address" label="通讯地址" />
+					<el-table-column prop="description" label="备注" />
+					<el-table-column prop="nativePlace" label="籍贯" />
+					<el-table-column prop="bankOpenUserName" label="开户行" />
+					<el-table-column prop="bankNumber" label="效验码" />
+					<el-table-column prop="bankUserName" label="开户名称" />
 					<el-table-column prop="creatorTime" label="创建时间" :formatter="ncc.tableDateFormat" width="120" />
 					<el-table-column prop="sortCode" label="排序" width="70" align="center" />
 					<el-table-column label="状态" width="70" align="center">
@@ -101,6 +116,7 @@
 										</el-dropdown-item>
 									</el-dropdown-menu>
 								</el-dropdown>
+								<el-button type="text" @click="CreateQrCode(scope.row.id)">生成专属二维码</el-button>
 							</tableOpts>
 						</template>
 					</el-table-column>
@@ -112,9 +128,20 @@
 		<Form v-show="formVisible" ref="Form" @close="removeForm" />
 		<Diagram v-if="diagramVisible" ref="Diagram" @close="diagramVisible = false" />
 		<ResetPwdForm v-if="resetFormVisible" ref="ResetPwdForm" @refreshDataList="initData" />
+		<el-dialog title="专属二维码" :visible.sync="dialogVisible" width="30%">
+			<img :src="srcimg" style="width:100px;height:100px;" />
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="dialogVisible = false">取 消</el-button>
+				<el-button type="primary" @click="downLoadUrl">下载</el-button>
+			</span>
+		</el-dialog>
 	</div>
 </template>
 <script>
+	import request from '@/utils/request'
+	import {
+		APIURl
+	} from '@/utils/define.js'
 	import {
 		getDepartmentSelector
 	} from '@/api/permission/department'
@@ -136,6 +163,9 @@
 		},
 		data() {
 			return {
+				srcimg: '',
+				APIURl,
+				dialogVisible: false,
 				keyword: '',
 				treeData: [],
 				tableData: [],
@@ -163,6 +193,39 @@
 			this.getOrganizeList()
 		},
 		methods: {
+			downloadUrl(url = '', fileName = '未知文件') {
+				const a = document.createElement('a');
+				a.style.display = 'none';
+				// a.setAttribute('target', '_blank');
+				a.setAttribute('download', '');
+				fileName && a.setAttribute('download', fileName);
+				a.href = url;
+				document.body.appendChild(a);
+				a.click();
+				document.body.removeChild(a);
+				this.dialogVisible = false
+				this.Time = undefined
+			},
+			downLoadUrl() {
+				this.downloadUrl(this.srcimg)
+			},
+			CreateQrCode(id) {
+				this.dialogVisible = true
+				request({
+					url: `/api/RequestAQS/requestaqs/GetQRCode??page=pages/login/index&scene=${id}`,
+					method: 'POST'
+				}).then(res => {
+					this.srcimg = this.APIURl + '/api/File/Image/annexpic/' + res.data
+					console.log('涂', this.srcimg)
+					this.$message({
+						type: 'success',
+						message: res.msg,
+						onClose: () => {
+							this.initData()
+						}
+					});
+				})
+			},
 			showDiagram() {
 				this.diagramVisible = true
 				this.$nextTick(() => {
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbActivity/ExportBox.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbActivity/ExportBox.vue
new file mode 100644
index 0000000..4fc5c07
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbActivity/ExportBox.vue
@@ -0,0 +1,66 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbActivity/Form.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbActivity/Form.vue
new file mode 100644
index 0000000..531abe6
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbActivity/Form.vue
@@ -0,0 +1,230 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false"
+		:visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+		<el-row :gutter="15" class="">
+			<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right"
+				:disabled="!!isDetail" :rules="rules">
+				<el-col :span="24">
+					<el-form-item label="活动标题" prop="title">
+						<el-input v-model="dataForm.title" placeholder="请输入" clearable required
+							:style='{"width":"100%"}'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="SKUIDS" prop="skuIds">
+						<el-select v-model="dataForm.skuIds" placeholder="请选择" clearable required
+							:style='{"width":"100%"}' multiple>
+							<el-option v-for="(item, index) in skuIdsOptions" :key="index" :label="item.Title"
+								:value="item.IdNo"></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="类型" prop="isDefault">
+						<el-select v-model="dataForm.isDefault" placeholder="请选择" clearable :style='{"width":"100%"}'>
+							<el-option v-for="(item, index) in isDefaultOptions" :key="index" :label="item.fullName"
+								:value="item.id"></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="是否下单" prop="isOrder">
+						<el-select v-model="dataForm.isOrder" placeholder="请选择" clearable required
+							:style='{"width":"100%"}'>
+							<el-option v-for="(item, index) in isOrderOptions" :key="index" :label="item.fullName"
+								:value="item.id"></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="背景图" prop="banner">
+						<NCC-UploadImg v-model="dataForm.banner" required :fileSize="5" sizeUnit="MB" :limit="1">
+						</NCC-UploadImg>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="二维码" prop="qrCode" v-if="false">
+						<NCC-UploadImg v-model="dataForm.qrCode" :fileSize="5" sizeUnit="MB" :limit="9">
+						</NCC-UploadImg>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" v-if="false">
+					<el-form-item label="创建时间" prop="creatorTime">
+						<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" v-if="false">
+					<el-form-item label="修改时间" prop="lastModifyTime">
+						<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly>
+						</el-input>
+					</el-form-item>
+				</el-col>
+			</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+	import request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import {
+		previewDataInterface
+	} from '@/api/systemData/dataInterface'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				loading: false,
+				visible: false,
+				isDetail: false,
+				dataForm: {
+					id: '',
+					skuIds: [],
+					title: undefined,
+
+					isDefault: undefined,
+					isOrder: undefined,
+
+					banner: [],
+					qrCode: [],
+					creatorTime: undefined,
+					lastModifyTime: undefined,
+				},
+				rules: {
+					title: [{
+						required: true,
+						message: '请输入活动标题',
+						trigger: 'blur'
+					}, ],
+					skuIds: [{
+						required: true,
+						message: '请输入SKUIDS',
+						trigger: 'change'
+					}, ],
+					isOrder: [{
+						required: true,
+						message: '请输入是否下单',
+						trigger: 'change'
+					}, ],
+					banner: [{
+						required: true,
+						message: '请输入背景图',
+						trigger: 'click'
+					}, ],
+				},
+				skuIdsOptions: [],
+				isDefaultOptions: [{
+					"fullName": "默认",
+					"id": "1"
+				}, {
+					"fullName": "定义",
+					"id": "2"
+				}],
+				isOrderOptions: [{
+					"fullName": "无需下单",
+					"id": "1"
+				}, {
+					"fullName": "需下单",
+					"id": "2"
+				}],
+
+
+			}
+		},
+		computed: {},
+		watch: {},
+		created() {
+			this.getskuIdsOptions();
+		},
+		mounted() {},
+		methods: {
+			// 查询卡种列表
+			getskuIdsOptions() {
+				let jsons = {
+					"pageIndex": 1,
+					"pageSize": 200,
+					"filterName": "",
+					"classId": 0
+				}
+				request({
+					url: '/api/RequestAQS/requestaqs/GetCardList' + this.dataForm.id,
+					method: 'post',
+					data: jsons
+				}).then(res => {
+					// let data = res.data.Data.List.filter(o => o.Title.includes('-'))
+					let data = res.data.Data.List
+					this.skuIdsOptions = data
+					console.log('赋值', this.skuIdsOptions)
+				})
+			},
+			goBack() {
+				this.$emit('refresh')
+			},
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+				this.visible = true;
+				this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						request({
+							url: '/api/Siberian/TbActivity/' + this.dataForm.id,
+							method: 'get'
+						}).then(res => {
+							this.dataForm = res.data;
+							if (!this.dataForm.banner) this.dataForm.banner = [];
+							if (!this.dataForm.qrCode) this.dataForm.qrCode = [];
+						})
+					}
+				})
+			},
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+					if (valid) {
+						if (!this.dataForm.id) {
+							request({
+								url: `/api/Siberian/TbActivity`,
+								method: 'post',
+								data: this.dataForm,
+							}).then((res) => {
+								this.$message({
+									message: res.msg,
+									type: 'success',
+									duration: 1000,
+									onClose: () => {
+										this.visible = false,
+											this.$emit('refresh', true)
+									}
+								})
+							})
+						} else {
+							request({
+								url: '/api/Siberian/TbActivity/' + this.dataForm.id,
+								method: 'PUT',
+								data: this.dataForm
+							}).then((res) => {
+								this.$message({
+									message: res.msg,
+									type: 'success',
+									duration: 1000,
+									onClose: () => {
+										this.visible = false
+										this.$emit('refresh', true)
+									}
+								})
+							})
+						}
+					}
+				})
+			},
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbActivity/index.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbActivity/index.vue
new file mode 100644
index 0000000..a5f7e6c
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbActivity/index.vue
@@ -0,0 +1,361 @@
+<template>
+	<div class="NCC-common-layout">
+		<div class="NCC-common-layout-center">
+			<el-row class="NCC-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="SKUIDS">
+							<el-select v-model="query.skuIds" placeholder="SKUIDS" clearable>
+								<!-- <el-option v-for="(item, index) in skuIdsOptions" :key="index" :label="item.fullName" :value="item.id"  /> -->
+								<el-option v-for="(item, index) in skuIdsOptions" :key="index" :label="item.Title"
+									:value="item.IdNo"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="类型">
+							<el-select v-model="query.isDefault" placeholder="类型 1--默认  2--定义" clearable>
+								<el-option v-for="(item, index) in isDefaultOptions" :key="index" :label="item.fullName"
+									:value="item.id" />
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="是否下单">
+							<el-select v-model="query.isOrder" placeholder="是否下单" clearable>
+								<el-option v-for="(item, index) in isOrderOptions" :key="index" :label="item.fullName"
+									:value="item.id" />
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<template v-if="showAll">
+						<el-col :span="6">
+							<el-form-item label="活动标题">
+								<el-input v-model="query.title" placeholder="活动标题" clearable />
+							</el-form-item>
+						</el-col>
+					</template>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+							<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">展开
+							</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="NCC-common-layout-main NCC-flex-main">
+				<div class="NCC-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
+						<el-button type="text" icon="el-icon-download" @click="exportData()">导出</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除</el-button>
+
+					</div>
+					<div class="NCC-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false"
+								@click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+				<NCC-table v-loading="listLoading" :data="list" has-c @selection-change="handleSelectionChange">
+					<el-table-column prop="id" label="ID" align="left" />
+					<el-table-column prop="title" label="活动标题" align="left" />
+
+					<el-table-column label="SKUIDS" prop="skuIds" align="left">
+						<template slot-scope="scope">{{ scope.row.skuIds | dynamicText(skuIdsOptions) }}</template>
+					</el-table-column>
+					<el-table-column label="类型 1--默认  2--定义" prop="isDefault" align="left">
+						<template
+							slot-scope="scope">{{ scope.row.isDefault | dynamicText(isDefaultOptions) }}</template>
+					</el-table-column>
+					<el-table-column label="是否下单" prop="isOrder" align="left">
+						<template slot-scope="scope">{{ scope.row.isOrder | dynamicText(isOrderOptions) }}</template>
+					</el-table-column>
+					<el-table-column prop="creatorTime" label="创建时间" align="left" :formatter="ncc.tableDateFormat" />
+					<el-table-column prop="lastModifyTime" label="修改时间" align="left" :formatter="ncc.tableDateFormat" />
+					<el-table-column label="操作" fixed="right" width="100">
+						<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑</el-button>
+							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn">删除
+							</el-button>
+							<el-button type="text" @click="ShowCode(scope.row)" class="NCC-table-delBtn">查看活动码
+							</el-button>
+							<!-- /api/File/Image/annexpic/ -->
+						</template>
+					</el-table-column>
+				</NCC-table>
+				<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+					@pagination="initData" />
+			</div>
+		</div>
+		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+		<el-dialog title="二维码" :visible.sync="dialogVisible" width="30%">
+			<img :src="APIURl+img" style="width:100px;height:100px" />
+			<div style="margin-top:30px">
+				<el-button type="success" @click="DonwLoadFile(APIURl+img)">下载二维码</el-button>
+			</div>
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="dialogVisible = false">取 消</el-button>
+				<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+			</span>
+		</el-dialog>
+	</div>
+</template>
+<script>
+	import request from '@/utils/request'
+	import {
+		APIURl
+	} from '@/utils/define'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import NCCForm from './Form'
+	import ExportBox from './ExportBox'
+	import {
+		previewDataInterface
+	} from '@/api/systemData/dataInterface'
+	export default {
+		components: {
+			NCCForm,
+			ExportBox
+		},
+		data() {
+			return {
+				showAll: false,
+
+				dialogVisible: false,
+				APIURl,
+				img: '',
+				query: {
+					skuIds: undefined,
+					isDefault: undefined,
+					isOrder: undefined,
+					title: undefined,
+
+
+				},
+				list: [],
+				listLoading: true,
+				multipleSelection: [],
+				total: 0,
+				listQuery: {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				},
+				formVisible: false,
+				exportBoxVisible: false,
+				columnList: [{
+						prop: 'skuIds',
+						label: 'SKUIDS'
+					},
+					{
+						prop: 'isDefault',
+						label: '类型 1--默认  2--定义'
+					},
+					{
+						prop: 'creatorTime',
+						label: '创建时间'
+					},
+					{
+						prop: 'lastModifyTime',
+						label: '修改时间'
+					},
+					{
+						prop: 'isOrder',
+						label: '是否下单'
+					},
+					{
+						prop: 'title',
+						label: '活动标题'
+					},
+
+
+				],
+				skuIdsOptions: [],
+				isOrderOptions: [{
+					"fullName": "无需下单",
+					"id": "1"
+				}, {
+					"fullName": "需下单",
+					"id": "2"
+				}],
+
+				isDefaultOptions: [{
+					"fullName": "默认",
+					"id": "1"
+				}, {
+					"fullName": "定义",
+					"id": "2"
+				}],
+			}
+		},
+		computed: {},
+		created() {
+			this.initData()
+			this.getskuIdsOptions();
+		},
+		methods: {
+			DonwLoadFile(url) {
+				window.location.href = url
+			},
+			ShowCode(item) {
+				console.log('活动信息', item)
+				this.dialogVisible = true
+				this.img = item.qrCodeList[0].url
+			},
+			// 查询卡种列表
+			getskuIdsOptions() {
+				let jsons = {
+					"pageIndex": 1,
+					"pageSize": 200,
+					"filterName": "",
+					"classId": 0
+				}
+				request({
+					url: '/api/RequestAQS/requestaqs/GetCardList' + this.dataForm.id,
+					method: 'post',
+					data: jsons
+				}).then(res => {
+					let data = res.data.Data.List.filter(o => o.Title.includes('-'))
+					this.skuIdsOptions = data
+					console.log('赋值', this.skuIdsOptions)
+				})
+			},
+			initData() {
+				this.listLoading = true;
+				let _query = {
+					...this.listQuery,
+					...this.query
+				};
+				let query = {}
+				for (let key in _query) {
+					if (Array.isArray(_query[key])) {
+						query[key] = _query[key].join()
+					} else {
+						query[key] = _query[key]
+					}
+				}
+				request({
+					url: `/api/Siberian/TbActivity`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					this.list = res.data.list
+					this.total = res.data.pagination.total
+					this.listLoading = false
+				})
+			},
+			handleDel(id) {
+				this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/Siberian/TbActivity/${id}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {});
+			},
+			handleSelectionChange(val) {
+				const res = val.map(item => item.id)
+				this.multipleSelection = res
+			},
+			handleBatchRemoveDel() {
+				if (!this.multipleSelection.length) {
+					this.$message({
+						type: 'error',
+						message: '请选择一条数据',
+						duration: 1500,
+					})
+					return
+				}
+				const ids = this.multipleSelection
+				this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/Siberian/TbActivity/batchRemove`,
+						method: 'POST',
+						data: ids,
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {})
+			},
+			addOrUpdateHandle(id, isDetail) {
+				this.formVisible = true
+				this.$nextTick(() => {
+					this.$refs.NCCForm.init(id, isDetail)
+				})
+			},
+			exportData() {
+				this.exportBoxVisible = true
+				this.$nextTick(() => {
+					this.$refs.ExportBox.init(this.columnList)
+				})
+			},
+			download(data) {
+				let query = {
+					...data,
+					...this.listQuery,
+					...this.query
+				}
+				request({
+					url: `/api/Siberian/TbActivity/Actions/Export`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					if (!res.data.url) return
+					window.location.href = this.define.comUrl + res.data.url
+					this.$refs.ExportBox.visible = false
+					this.exportBoxVisible = false
+				})
+			},
+			search() {
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			},
+			refresh(isrRefresh) {
+				this.formVisible = false
+				if (isrRefresh) this.reset()
+			},
+			reset() {
+				for (let key in this.query) {
+					this.query[key] = undefined
+				}
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			}
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbActivityLog/ExportBox.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbActivityLog/ExportBox.vue
new file mode 100644
index 0000000..4fc5c07
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbActivityLog/ExportBox.vue
@@ -0,0 +1,66 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbActivityLog/Form.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbActivityLog/Form.vue
new file mode 100644
index 0000000..1da64b6
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbActivityLog/Form.vue
@@ -0,0 +1,204 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false"
+		:visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+		<el-row :gutter="15" class="">
+			<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right"
+				:disabled="!!isDetail" :rules="rules">
+				<el-col :span="24">
+					<el-form-item label="活动信息" prop="activityId">
+						<el-select v-model="dataForm.activityId" placeholder="请选择" clearable required
+							:style='{"width":"100%"}'>
+							<el-option v-for="(item, index) in activityIdOptions" :key="index" :label="item.F_Title"
+								:value="item.F_Id"></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="用户" prop="userId">
+						<user-select v-model="dataForm.userId" placeholder="请选择" clearable required>
+						</user-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="姓名" prop="name">
+						<el-input v-model="dataForm.name" placeholder="请输入" clearable required
+							:style='{"width":"100%"}'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="邮箱" prop="email">
+						<el-input v-model="dataForm.email" placeholder="请输入" clearable required
+							:style='{"width":"100%"}'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="手机号码" prop="phone">
+						<el-input v-model="dataForm.phone" placeholder="请输入" clearable required
+							:style='{"width":"100%"}'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" v-if="false">
+					<el-form-item label="创建时间" prop="creatorTime">
+						<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" v-if="false">
+					<el-form-item label="修改时间" prop="lastModifyTime">
+						<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly>
+						</el-input>
+					</el-form-item>
+				</el-col>
+			</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+	import request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import {
+		previewDataInterface
+	} from '@/api/systemData/dataInterface'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				loading: false,
+				visible: false,
+				isDetail: false,
+				dataForm: {
+					id: '',
+					activityId: undefined,
+					userId: undefined,
+					email: undefined,
+					phone: undefined,
+					name: undefined,
+
+					creatorTime: undefined,
+					lastModifyTime: undefined,
+				},
+				rules: {
+					activityId: [{
+						required: true,
+						message: '请输入活动信息',
+						trigger: 'change'
+					}, ],
+					userId: [{
+						required: true,
+						message: '请输入用户',
+						trigger: 'change'
+					}, ],
+					name: [{
+						required: true,
+						message: '请输入姓名',
+						trigger: 'blur'
+					}, ],
+					email: [{
+							required: true,
+							message: '请输入邮箱',
+							trigger: 'blur'
+						},
+						{
+							pattern: /^[a-z0-9]+([._\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/,
+							message: '请输入正确的邮箱',
+							trigger: 'blur'
+						},
+					],
+					phone: [{
+							required: true,
+							message: '请输入手机号码',
+							trigger: 'blur'
+						},
+						{
+							pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
+							message: '请输入正确的联系方式',
+							trigger: 'blur'
+						},
+					],
+				},
+				activityIdOptions: [],
+			}
+		},
+		computed: {},
+		watch: {},
+		created() {
+			this.getactivityIdOptions();
+		},
+		mounted() {},
+		methods: {
+			getactivityIdOptions() {
+				previewDataInterface('382054940299756805').then(res => {
+					this.activityIdOptions = res.data
+				});
+			},
+			goBack() {
+				this.$emit('refresh')
+			},
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+				this.visible = true;
+				this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						request({
+							url: '/api/Siberian/TbActivityLog/' + this.dataForm.id,
+							method: 'get'
+						}).then(res => {
+							this.dataForm = res.data;
+						})
+					}
+				})
+			},
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+					if (valid) {
+						if (!this.dataForm.id) {
+							request({
+								url: `/api/Siberian/TbActivityLog`,
+								method: 'post',
+								data: this.dataForm,
+							}).then((res) => {
+								this.$message({
+									message: res.msg,
+									type: 'success',
+									duration: 1000,
+									onClose: () => {
+										this.visible = false,
+											this.$emit('refresh', true)
+									}
+								})
+							})
+						} else {
+							request({
+								url: '/api/Siberian/TbActivityLog/' + this.dataForm.id,
+								method: 'PUT',
+								data: this.dataForm
+							}).then((res) => {
+								this.$message({
+									message: res.msg,
+									type: 'success',
+									duration: 1000,
+									onClose: () => {
+										this.visible = false
+										this.$emit('refresh', true)
+									}
+								})
+							})
+						}
+					}
+				})
+			},
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbActivityLog/index.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbActivityLog/index.vue
new file mode 100644
index 0000000..7a37752
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbActivityLog/index.vue
@@ -0,0 +1,305 @@
+<template>
+	<div class="NCC-common-layout">
+		<div class="NCC-common-layout-center">
+			<el-row class="NCC-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="活动信息">
+							<el-select v-model="query.activityId" placeholder="活动信息" clearable>
+								<el-option v-for="(item, index) in activityIdOptions" :key="index" :label="item.F_Title"
+									:value="item.F_Id" />
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="用户">
+							<userSelect v-model="query.userId" placeholder="请选择用户" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="邮箱">
+							<el-input v-model="query.email" placeholder="邮箱" clearable />
+						</el-form-item>
+					</el-col>
+					<template v-if="showAll">
+						<el-col :span="6">
+							<el-form-item label="姓名">
+								<el-input v-model="query.name" placeholder="姓名" clearable />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="手机号码">
+								<el-input v-model="query.phone" placeholder="手机号码" clearable />
+							</el-form-item>
+						</el-col>
+					</template>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+							<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">展开
+							</el-button>
+							<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>收起</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="NCC-common-layout-main NCC-flex-main">
+				<div class="NCC-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
+						<el-button type="text" icon="el-icon-download" @click="exportData()">导出</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除</el-button>
+					</div>
+					<div class="NCC-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false"
+								@click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+				<NCC-table v-loading="listLoading" :data="list" has-c @selection-change="handleSelectionChange">
+					<el-table-column label="活动信息" prop="Title" align="left">
+						<template slot-scope="scope">{{ scope.row.activity&&scope.row.activity.Title}}</template>
+					</el-table-column>
+					<el-table-column prop="RealName" label="用户" align="left">
+						<template slot-scope="scope">
+							{{scope.row.user&&scope.row.user.RealName}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="name" label="姓名" align="left" />
+
+					<el-table-column prop="email" label="邮箱" align="left" />
+					<el-table-column prop="phone" label="手机号码" align="left" />
+					<el-table-column prop="creatorTime" label="创建时间" align="left" :formatter="ncc.tableDateFormat" />
+					<el-table-column prop="lastModifyTime" label="修改时间" align="left" :formatter="ncc.tableDateFormat" />
+					<el-table-column label="操作" fixed="right" width="100">
+						<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑</el-button>
+							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn">删除
+							</el-button>
+						</template>
+					</el-table-column>
+				</NCC-table>
+				<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+					@pagination="initData" />
+			</div>
+		</div>
+		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+	</div>
+</template>
+<script>
+	import request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import NCCForm from './Form'
+	import ExportBox from './ExportBox'
+	import {
+		previewDataInterface
+	} from '@/api/systemData/dataInterface'
+	export default {
+		components: {
+			NCCForm,
+			ExportBox
+		},
+		data() {
+			return {
+				showAll: false,
+				query: {
+					activityId: undefined,
+					userId: undefined,
+					email: undefined,
+					phone: undefined,
+					name: undefined,
+
+				},
+				list: [],
+				listLoading: true,
+				multipleSelection: [],
+				total: 0,
+				listQuery: {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				},
+				formVisible: false,
+				exportBoxVisible: false,
+				columnList: [{
+						prop: 'activityId',
+						label: '活动信息'
+					},
+					{
+						prop: 'userId',
+						label: '用户'
+					},
+					{
+						prop: 'email',
+						label: '邮箱'
+					},
+					{
+						prop: 'phone',
+						label: '手机号码'
+					},
+					{
+						prop: 'creatorTime',
+						label: '创建时间'
+					},
+					{
+						prop: 'lastModifyTime',
+						label: '修改时间'
+					},
+					{
+						prop: 'name',
+						label: '姓名'
+					},
+
+				],
+				activityIdOptions: [],
+			}
+		},
+		computed: {},
+		created() {
+			this.initData()
+			this.getactivityIdOptions();
+		},
+		methods: {
+			getactivityIdOptions() {
+				previewDataInterface('382054940299756805').then(res => {
+					this.activityIdOptions = res.data
+				});
+			},
+			initData() {
+				this.listLoading = true;
+				let _query = {
+					...this.listQuery,
+					...this.query
+				};
+				let query = {}
+				for (let key in _query) {
+					if (Array.isArray(_query[key])) {
+						query[key] = _query[key].join()
+					} else {
+						query[key] = _query[key]
+					}
+				}
+				request({
+					url: `/api/Siberian/TbActivityLog`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					this.list = res.data.list
+					this.total = res.data.pagination.total
+					this.listLoading = false
+				})
+			},
+			handleDel(id) {
+				this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/Siberian/TbActivityLog/${id}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {});
+			},
+			handleSelectionChange(val) {
+				const res = val.map(item => item.id)
+				this.multipleSelection = res
+			},
+			handleBatchRemoveDel() {
+				if (!this.multipleSelection.length) {
+					this.$message({
+						type: 'error',
+						message: '请选择一条数据',
+						duration: 1500,
+					})
+					return
+				}
+				const ids = this.multipleSelection
+				this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/Siberian/TbActivityLog/batchRemove`,
+						method: 'POST',
+						data: ids,
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {})
+			},
+			addOrUpdateHandle(id, isDetail) {
+				this.formVisible = true
+				this.$nextTick(() => {
+					this.$refs.NCCForm.init(id, isDetail)
+				})
+			},
+			exportData() {
+				this.exportBoxVisible = true
+				this.$nextTick(() => {
+					this.$refs.ExportBox.init(this.columnList)
+				})
+			},
+			download(data) {
+				let query = {
+					...data,
+					...this.listQuery,
+					...this.query
+				}
+				request({
+					url: `/api/Siberian/TbActivityLog/Actions/Export`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					if (!res.data.url) return
+					window.location.href = this.define.comUrl + res.data.url
+					this.$refs.ExportBox.visible = false
+					this.exportBoxVisible = false
+				})
+			},
+			search() {
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			},
+			refresh(isrRefresh) {
+				this.formVisible = false
+				if (isrRefresh) this.reset()
+			},
+			reset() {
+				for (let key in this.query) {
+					this.query[key] = undefined
+				}
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			}
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbAwaitOrder/ExportBox.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbAwaitOrder/ExportBox.vue
new file mode 100644
index 0000000..4fc5c07
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbAwaitOrder/ExportBox.vue
@@ -0,0 +1,66 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbAwaitOrder/Form.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbAwaitOrder/Form.vue
new file mode 100644
index 0000000..fc5c8c7
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbAwaitOrder/Form.vue
@@ -0,0 +1,201 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+		<el-row :gutter="15" class="" >
+				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
+					<el-col :span="24">
+						<el-form-item label="用户" prop="userId">
+							<user-select v-model="dataForm.userId" placeholder="请选择" clearable required >
+							</user-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="商品" prop="goodsId">
+							<el-select v-model="dataForm.goodsId" placeholder="请选择" clearable required :style='{"width":"100%"}' >
+								<el-option v-for="(item, index) in goodsIdOptions" :key="index" :label="item.F_Title" :value="item.F_Id" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="补发状态" prop="type">
+							<el-select v-model="dataForm.type" placeholder="请选择" clearable required :style='{"width":"100%"}' >
+								<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="预发出数量" prop="count">
+							<el-input-number v-model="dataForm.count" placeholder="数量" required :step="1" :min="1" >
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="待发来源订单" prop="orderNumber">
+							<el-select v-model="dataForm.orderNumber" placeholder="请选择" clearable :style='{"width":"100%"}' >
+								<el-option v-for="(item, index) in orderNumberOptions" :key="index" :label="item.F_Id" :value="item.F_OrderNumber" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="规格信息(单个)" prop="jsonInfo">
+							<el-input v-model="dataForm.jsonInfo" placeholder="请输入" clearable :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="创建时间" prop="creatorTime">
+							<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="修改时间" prop="lastModifyTime">
+							<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+	import request from '@/utils/request'
+	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				loading: false,
+				visible: false,
+				isDetail: false,
+				dataForm: {
+					id:'',
+					userId:undefined,
+					goodsId:undefined,
+					type:undefined,
+					count:1,
+					orderNumber:undefined,
+					jsonInfo:undefined,
+					creatorTime:undefined,
+					lastModifyTime:undefined,
+				},
+				rules: {
+					userId:[
+						{
+							required:true,
+							message:'请输入用户',
+							trigger:'change'
+						},
+					],
+					goodsId:[
+						{
+							required:true,
+							message:'请输入商品',
+							trigger:'change'
+						},
+					],
+					type:[
+						{
+							required:true,
+							message:'请输入补发状态',
+							trigger:'change'
+						},
+					],
+					count:[
+						{
+							required:true,
+							message:'请输入预发出数量',
+							trigger:["blur","change"]
+						},
+					],
+				},
+				goodsIdOptions : [],
+				typeOptions:[{"fullName":"待发出","id":"1"},{"fullName":"自动发出成功","id":"2"},{"fullName":"手动发出成功","id":"3"}],
+				orderNumberOptions : [],
+			}
+		},
+		computed: {},
+        watch: {},
+        created() {
+			this.getgoodsIdOptions();
+			this.getorderNumberOptions();
+		},
+		mounted() {
+        },
+		methods: {
+			getgoodsIdOptions(){
+				previewDataInterface('337130169200280837').then(res => {
+					this.goodsIdOptions = res.data
+				});
+			},
+			getorderNumberOptions(){
+				previewDataInterface('337944152299799813').then(res => {
+					this.orderNumberOptions = res.data
+				});
+			},
+			goBack() {
+                this.$emit('refresh')
+            },
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+                this.visible = true;
+                this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						request({
+							url: '/api/Siberian/TbAwaitOrder/' + this.dataForm.id,
+							method: 'get'
+						}).then(res =>{
+							this.dataForm = res.data;
+						})
+					}
+				})
+			},
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+                    if (valid) {
+                        if (!this.dataForm.id) {
+                            request({
+                                url: `/api/Siberian/TbAwaitOrder`,
+                                method: 'post',
+                                data: this.dataForm,
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false,
+                                            this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        } else {
+                            request({
+                                url: '/api/Siberian/TbAwaitOrder/' + this.dataForm.id,
+                                method: 'PUT',
+                                data: this.dataForm
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false
+                                        this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        }
+                    }
+                })
+			},
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbAwaitOrder/index.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbAwaitOrder/index.vue
new file mode 100644
index 0000000..db2e19f
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbAwaitOrder/index.vue
@@ -0,0 +1,322 @@
+<template>
+	<div class="NCC-common-layout">
+		<div class="NCC-common-layout-center">
+			<el-row class="NCC-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="用户">
+							<userSelect v-model="query.userId" placeholder="请选择用户" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="商品">
+							<el-select v-model="query.goodsId" placeholder="商品" clearable>
+								<el-option v-for="(item, index) in goodsIdOptions" :key="index" :label="item.F_Title"
+									:value="item.F_Id" />
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="补发状态">
+							<el-select v-model="query.type" placeholder="补发状态" clearable>
+								<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName"
+									:value="item.id" />
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<template v-if="showAll">
+						<el-col :span="6">
+							<el-form-item label="待发来源订单">
+								<el-select v-model="query.orderNumber" placeholder="待发来源订单" clearable>
+									<el-option v-for="(item, index) in orderNumberOptions" :key="index"
+										:label="item.F_Id" :value="item.F_OrderNumber" />
+								</el-select>
+							</el-form-item>
+						</el-col>
+					</template>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+							<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">展开
+							</el-button>
+							<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>收起</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="NCC-common-layout-main NCC-flex-main">
+				<div class="NCC-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
+					</div>
+					<div class="NCC-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false"
+								@click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+				<NCC-table v-loading="listLoading" :data="list">
+					<el-table-column prop="RealName" label="用户" align="left">
+						<template slot-scope="scope">
+							{{scope.row.user&&scope.row.user.RealName}}
+						</template>
+					</el-table-column>
+					<el-table-column label="商品" prop="Title" align="left">
+						<template slot-scope="scope">{{ scope.row.goods&&scope.row.goods.Title}}</template>
+					</el-table-column>
+					<el-table-column label="补发状态" prop="type" align="left">
+						<template slot-scope="scope">{{ scope.row.type | dynamicText(typeOptions) }}</template>
+					</el-table-column>
+					<el-table-column prop="count" label="预发出数量" align="left" />
+					<el-table-column prop="jsonInfo" label="规格信息(单个)" align="left" width="120">
+						<template slot-scope="scope">
+							<el-button type="success" @click="ShowGoodsInfo(scope.row.jsonInfo)">查看规格信息</el-button>
+
+						</template>
+					</el-table-column>
+					<el-table-column prop="creatorTime" label="创建时间" align="left" :formatter="ncc.tableDateFormat"/>
+					<el-table-column prop="lastModifyTime" label="修改时间" align="left" :formatter="ncc.tableDateFormat"/>
+					<el-table-column label="待发来源订单" prop="orderNumber" align="left">
+						<template
+							slot-scope="scope">{{ scope.row.orderNumber | dynamicText(orderNumberOptions) }}</template>
+					</el-table-column>
+					<el-table-column label="操作" fixed="right" width="120">
+						<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑</el-button>
+							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn">删除
+							</el-button>
+							<el-button type="text" @click="ConfirmSend(scope.row.id)">确认发卡</el-button>
+						</template>
+					</el-table-column>
+				</NCC-table>
+				<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+					@pagination="initData" />
+			</div>
+		</div>
+		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+		<el-dialog title="规格" :visible.sync="dialogVisibleS">
+
+			<el-card class="box-card">
+				<div slot="header" class="clearfix">
+					<span>{{dataInfo&&dataInfo.Title}}</span>
+				</div>
+				<div class="text item">
+					<div style="font-size: 15px;display:flex;align:center;"
+						>
+						<div style="margin-top:5px;margin-left:5px;">卡种ID:{{dataInfo&&dataInfo.IdNo}}</div>
+						<div style="margin-top:5px;margin-left:5px;">总数:{{dataInfo&&dataInfo.TotalCount}}</div>
+						<div style="margin-top:5px;margin-left:5px;">使用数:{{dataInfo&&dataInfo.UsedCount}}</div>
+						<div style="margin-top:5px;margin-left:5px;">价格:{{dataInfo&&dataInfo.Moneys}}</div>
+					</div>
+				</div>
+			</el-card>
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="dialogVisibleS = false">取 消</el-button>
+				<el-button type="primary" @click="dialogVisibleS = false">确 定</el-button>
+			</span>
+		</el-dialog>
+	</div>
+</template>
+<script>
+	import request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import NCCForm from './Form'
+	import ExportBox from './ExportBox'
+	import {
+		previewDataInterface
+	} from '@/api/systemData/dataInterface'
+	export default {
+		components: {
+			NCCForm,
+			ExportBox
+		},
+		data() {
+			return {
+				showAll: false,
+				dialogVisibleS: false,
+				dataInfo: undefined,
+				query: {
+					userId: undefined,
+					goodsId: undefined,
+					type: undefined,
+					orderNumber: undefined,
+				},
+				list: [],
+				listLoading: true,
+				multipleSelection: [],
+				total: 0,
+				listQuery: {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				},
+				formVisible: false,
+				exportBoxVisible: false,
+				columnList: [{
+						prop: 'userId',
+						label: '用户'
+					},
+					{
+						prop: 'goodsId',
+						label: '商品'
+					},
+					{
+						prop: 'type',
+						label: '补发状态'
+					},
+					{
+						prop: 'count',
+						label: '预发出数量'
+					},
+					{
+						prop: 'jsonInfo',
+						label: '规格信息(单个)'
+					},
+					{
+						prop: 'creatorTime',
+						label: '创建时间'
+					},
+					{
+						prop: 'lastModifyTime',
+						label: '修改时间'
+					},
+					{
+						prop: 'orderNumber',
+						label: '待发来源订单'
+					},
+				],
+				goodsIdOptions: [],
+				typeOptions: [{
+					"fullName": "待发出",
+					"id": "1"
+				}, {
+					"fullName": "自动发出成功",
+					"id": "2"
+				}, {
+					"fullName": "手动发出成功",
+					"id": "3"
+				}],
+				orderNumberOptions: [],
+			}
+		},
+		computed: {},
+		created() {
+			this.initData()
+			this.getgoodsIdOptions();
+			this.getorderNumberOptions();
+		},
+		methods: {
+			ConfirmSend(id){
+				request({
+					url: `/api/Siberian/tborderinfo/HandSendCard?id=${id}`,
+					method: 'POST'
+				}).then(res => {
+					this.$message({
+						type: 'success',
+						message: res.msg,
+						onClose: () => {
+							this.initData()
+						}
+					});
+				})
+			},
+			// 显示商品信息
+			ShowGoodsInfo(item) {
+				console.log('这是信息', item)
+				this.dataInfo=JSON.parse(item)
+				console.log('赋值规格',this.dataInfo)
+				this.dialogVisibleS=true
+			},
+			getgoodsIdOptions() {
+				previewDataInterface('337130169200280837').then(res => {
+					this.goodsIdOptions = res.data
+				});
+			},
+			getorderNumberOptions() {
+				previewDataInterface('337944152299799813').then(res => {
+					this.orderNumberOptions = res.data
+				});
+			},
+			initData() {
+				this.listLoading = true;
+				let _query = {
+					...this.listQuery,
+					...this.query
+				};
+				let query = {}
+				for (let key in _query) {
+					if (Array.isArray(_query[key])) {
+						query[key] = _query[key].join()
+					} else {
+						query[key] = _query[key]
+					}
+				}
+				request({
+					url: `/api/Siberian/TbAwaitOrder`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					this.list = res.data.list
+					this.total = res.data.pagination.total
+					this.listLoading = false
+				})
+			},
+			handleDel(id) {
+				this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/Siberian/TbAwaitOrder/${id}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {});
+			},
+			addOrUpdateHandle(id, isDetail) {
+				this.formVisible = true
+				this.$nextTick(() => {
+					this.$refs.NCCForm.init(id, isDetail)
+				})
+			},
+			search() {
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			},
+			refresh(isrRefresh) {
+				this.formVisible = false
+				if (isrRefresh) this.reset()
+			},
+			reset() {
+				for (let key in this.query) {
+					this.query[key] = undefined
+				}
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			}
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbBrowse/ExportBox.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbBrowse/ExportBox.vue
new file mode 100644
index 0000000..4fc5c07
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbBrowse/ExportBox.vue
@@ -0,0 +1,66 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbBrowse/Form.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbBrowse/Form.vue
new file mode 100644
index 0000000..0a6fed3
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbBrowse/Form.vue
@@ -0,0 +1,149 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+		<el-row :gutter="15" class="" >
+				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
+					<el-col :span="24">
+						<el-form-item label="用户" prop="userId">
+							<user-select v-model="dataForm.userId" placeholder="请选择" clearable required >
+							</user-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="商品" prop="goodsId">
+							<el-select v-model="dataForm.goodsId" placeholder="请选择" clearable required :style='{"width":"100%"}' >
+								<el-option v-for="(item, index) in goodsIdOptions" :key="index" :label="item.F_Title" :value="item.F_Id" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="创建时间" prop="creatorTime">
+							<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="修改时间" prop="lastModifyTime">
+							<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+	import request from '@/utils/request'
+	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				loading: false,
+				visible: false,
+				isDetail: false,
+				dataForm: {
+					id:'',
+					userId:undefined,
+					goodsId:undefined,
+					creatorTime:undefined,
+					lastModifyTime:undefined,
+				},
+				rules: {
+					userId:[
+						{
+							required:true,
+							message:'请输入用户',
+							trigger:'change'
+						},
+					],
+					goodsId:[
+						{
+							required:true,
+							message:'请输入商品',
+							trigger:'change'
+						},
+					],
+				},
+				goodsIdOptions : [],
+			}
+		},
+		computed: {},
+        watch: {},
+        created() {
+			this.getgoodsIdOptions();
+		},
+		mounted() {
+        },
+		methods: {
+			getgoodsIdOptions(){
+				previewDataInterface('337130169200280837').then(res => {
+					this.goodsIdOptions = res.data
+				});
+			},
+			goBack() {
+                this.$emit('refresh')
+            },
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+                this.visible = true;
+                this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						request({
+							url: '/api/Siberian/TbBrowse/' + this.dataForm.id,
+							method: 'get'
+						}).then(res =>{
+							this.dataForm = res.data;
+						})
+					}
+				})
+			},
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+                    if (valid) {
+                        if (!this.dataForm.id) {
+                            request({
+                                url: `/api/Siberian/TbBrowse`,
+                                method: 'post',
+                                data: this.dataForm,
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false,
+                                            this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        } else {
+                            request({
+                                url: '/api/Siberian/TbBrowse/' + this.dataForm.id,
+                                method: 'PUT',
+                                data: this.dataForm
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false
+                                        this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        }
+                    }
+                })
+			},
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbBrowse/index.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbBrowse/index.vue
new file mode 100644
index 0000000..ba0aaea
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbBrowse/index.vue
@@ -0,0 +1,184 @@
+<template>
+	<div class="NCC-common-layout">
+		<div class="NCC-common-layout-center">
+			<el-row class="NCC-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="用户">
+							<userSelect v-model="query.userId" placeholder="请选择用户" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="商品">
+							<el-select v-model="query.goodsId" placeholder="商品" clearable >
+								<el-option v-for="(item, index) in goodsIdOptions" :key="index" :label="item.F_Title" :value="item.F_Id"  />
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="NCC-common-layout-main NCC-flex-main">
+				<div class="NCC-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
+					</div>
+					<div class="NCC-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false" @click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+                <NCC-table v-loading="listLoading" :data="list">
+					<el-table-column prop="RealName" label="用户" align="left" >
+						<template slot-scope="scope">
+							{{scope.row.user&&scope.row.user.RealName}}
+						</template>
+					</el-table-column>
+					<el-table-column label="商品" prop="Title" align="left">
+							<template slot-scope="scope">{{ scope.row.goods&&scope.row.goods.Title}}</template>
+					</el-table-column>
+					<el-table-column prop="creatorTime" label="创建时间" align="left" :formatter="ncc.tableDateFormat" />
+					<el-table-column prop="lastModifyTime" label="修改时间" align="left" :formatter="ncc.tableDateFormat" />
+					<el-table-column label="操作" fixed="right" width="100">
+							<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
+							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
+						</template>
+					</el-table-column>
+				</NCC-table>
+                <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
+            </div>
+        </div>
+		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+	</div>
+</template>
+<script>
+    import request from '@/utils/request'
+    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+    import NCCForm from './Form'
+    import ExportBox from './ExportBox'
+    import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+        components: { NCCForm, ExportBox },
+        data() {
+            return {
+				query: {
+                    userId:undefined,
+                    goodsId:undefined,
+				},
+                list: [],
+                listLoading: true,
+                multipleSelection: [], total: 0,
+                listQuery: {
+                    currentPage: 1,
+                    pageSize: 20,
+					sort: "desc",
+                    sidx: "",
+                },
+                formVisible: false,
+                exportBoxVisible: false,
+                columnList: [
+                    { prop: 'userId', label: '用户' },
+                    { prop: 'goodsId', label: '商品' },
+                    { prop: 'creatorTime', label: '创建时间' },
+                    { prop: 'lastModifyTime', label: '修改时间' },
+				],
+				goodsIdOptions : [],
+			}
+        },
+		computed: {},
+		created() {
+			this.initData()
+			this.getgoodsIdOptions();
+		},
+		methods: {
+			getgoodsIdOptions(){
+				previewDataInterface('337130169200280837').then(res => {
+					this.goodsIdOptions = res.data
+				});
+			},
+			initData() {
+                this.listLoading = true;
+                let _query = {
+                    ...this.listQuery,
+                    ...this.query
+                };
+                let query = {}
+                for (let key in _query) {
+                    if (Array.isArray(_query[key])) {
+                        query[key] = _query[key].join()
+                    } else {
+                        query[key] = _query[key]
+                    }
+                }
+                request({
+                    url: `/api/Siberian/TbBrowse`,
+                    method: 'GET',
+                    data: query
+                }).then(res => {
+                    this.list = res.data.list
+                    this.total = res.data.pagination.total
+                    this.listLoading = false
+                })
+            },
+			handleDel(id) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    request({
+                        url: `/api/Siberian/TbBrowse/${id}`,
+                        method: 'DELETE'
+                    }).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            onClose: () => {
+                                this.initData()
+                            }
+                        });
+                    })
+                }).catch(() => {
+                });
+            },
+			addOrUpdateHandle(id, isDetail) {
+                this.formVisible = true
+                this.$nextTick(() => {
+                    this.$refs.NCCForm.init(id, isDetail)
+                })
+            },
+			search() {
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            },
+            refresh(isrRefresh) {
+                this.formVisible = false
+                if (isrRefresh) this.reset()
+            },
+            reset() {
+                for (let key in this.query) {
+                    this.query[key] = undefined
+                }
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            }
+		}
+    }
+</script>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbCode/ExportBox.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbCode/ExportBox.vue
new file mode 100644
index 0000000..4fc5c07
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbCode/ExportBox.vue
@@ -0,0 +1,66 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbCode/Form.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbCode/Form.vue
new file mode 100644
index 0000000..4c84419
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbCode/Form.vue
@@ -0,0 +1,185 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+		<el-row :gutter="15" class="" >
+				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
+					<el-col :span="24">
+						<el-form-item label="卡种ID" prop="idNo">
+							<el-input v-model="dataForm.idNo" placeholder="请输入卡种ID" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="标题" prop="title">
+							<el-input v-model="dataForm.title" placeholder="请输入" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="兑换码" prop="sercret">
+							<el-input v-model="dataForm.sercret" placeholder="请输入" clearable readonly required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="优惠金额" prop="moneys">
+							<el-input v-model="dataForm.moneys" placeholder="请输入金额" clearable :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="状态" prop="type">
+							<el-select v-model="dataForm.type" placeholder="请选择" clearable required :style='{"width":"100%"}' >
+								<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="创建时间" prop="creatorTime">
+							<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="修改时间" prop="lastModifyTime">
+							<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+	import request from '@/utils/request'
+	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				loading: false,
+				visible: false,
+				isDetail: false,
+				dataForm: {
+					id:'',
+					idNo:undefined,
+					title:undefined,
+					sercret:undefined,
+					moneys:undefined,
+					type:undefined,
+					creatorTime:undefined,
+					lastModifyTime:undefined,
+				},
+				rules: {
+					idNo:[
+						{
+							required:true,
+							message:'请输入卡种ID',
+							trigger:'blur'
+						},
+					],
+					title:[
+						{
+							required:true,
+							message:'请输入标题',
+							trigger:'blur'
+						},
+					],
+					sercret:[
+						{
+							required:true,
+							message:'请输入兑换码',
+							trigger:'blur'
+						},
+					],
+					moneys:[
+						{
+							pattern:/^[1-9]\d*\.\d*|0\.\d*[1-9]\d*|0?\.0+|0$/,
+							message:'请输入正确的金额',
+							trigger:'blur'
+						},
+					],
+					type:[
+						{
+							required:true,
+							message:'请输入状态',
+							trigger:'change'
+						},
+					],
+				},
+				typeOptions:[{"fullName":"未使用","id":"1"},{"fullName":"已使用","id":"2"}],
+			}
+		},
+		computed: {},
+        watch: {},
+        created() {
+		},
+		mounted() {
+        },
+		methods: {
+			goBack() {
+                this.$emit('refresh')
+            },
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+                this.visible = true;
+                this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						request({
+							url: '/api/Siberian/TbCode/' + this.dataForm.id,
+							method: 'get'
+						}).then(res =>{
+							this.dataForm = res.data;
+						})
+					}
+				})
+			},
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+                    if (valid) {
+                        if (!this.dataForm.id) {
+                            request({
+                                url: `/api/Siberian/TbCode`,
+                                method: 'post',
+                                data: this.dataForm,
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false,
+                                            this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        } else {
+                            request({
+                                url: '/api/Siberian/TbCode/' + this.dataForm.id,
+                                method: 'PUT',
+                                data: this.dataForm
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false
+                                        this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        }
+                    }
+                })
+			},
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbCode/index.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbCode/index.vue
new file mode 100644
index 0000000..63f84af
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbCode/index.vue
@@ -0,0 +1,455 @@
+<template>
+	<div class="NCC-common-layout">
+		<div class="NCC-common-layout-center">
+			<el-row class="NCC-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="兑换码">
+							<el-input v-model="query.sercret" placeholder="兑换码" clearable />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="状态">
+							<el-select v-model="query.type" placeholder="状态" clearable>
+								<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName"
+									:value="item.id" />
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="标题">
+							<el-input v-model="query.title" placeholder="标题" clearable />
+						</el-form-item>
+					</el-col>
+					<template v-if="showAll">
+						<el-col :span="6">
+							<el-form-item label="卡种ID">
+								<el-input v-model="query.idNo" placeholder="卡种ID" clearable />
+							</el-form-item>
+						</el-col>
+					</template>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+							<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">展开
+							</el-button>
+							<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>收起</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="NCC-common-layout-main NCC-flex-main">
+				<div class="NCC-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
+						<el-button type="text" icon="el-icon-download" @click="exportData()">导出</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="CreateIDS()">批量生成</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="dialogVisibleImport=true">批量导入</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="ConfirmDownLoad()">导出模板请在此下载</el-button>
+					</div>
+					<div class="NCC-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false"
+								@click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+				<NCC-table v-loading="listLoading" :data="list" has-c @selection-change="handleSelectionChange">
+					<el-table-column prop="sercret" label="兑换码" align="left" />
+					<el-table-column prop="moneys" label="优惠金额" align="left" />
+					<el-table-column prop="creatorTime" label="创建时间" align="left" :formatter="ncc.tableDateFormat" />
+					<el-table-column prop="lastModifyTime" label="修改时间" align="left" :formatter="ncc.tableDateFormat" />
+					<el-table-column label="状态" prop="type" align="left">
+						<template slot-scope="scope">{{ scope.row.type | dynamicText(typeOptions) }}</template>
+					</el-table-column>
+					<el-table-column prop="title" label="标题" align="left" />
+					<el-table-column prop="idNo" label="卡种ID" align="left" />
+					<el-table-column label="操作" fixed="right" width="100">
+						<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑</el-button>
+							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn">删除
+							</el-button>
+						</template>
+					</el-table-column>
+				</NCC-table>
+				<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+					@pagination="initData" />
+			</div>
+		</div>
+		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+		<el-dialog title="生成信息" :visible.sync="dialogVisibleS">
+
+			<el-form ref="dataForm" :model="dataForm" label-width="80px">
+				<el-form-item label="卡种信息">
+					<el-select v-model="dataForm.idNo"  placeholder="请选择">
+						<el-option :label="row.Title" :value="row.IdNo" v-for="(row,num) in idnoList" :key="num">
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="优惠金额">
+					<el-input v-model="dataForm.moneys"></el-input>
+				</el-form-item>
+				<el-form-item label="生成数量">
+					<el-col :span="11">
+						<el-input-number v-model="dataForm.num" :min="1" :max="500" label="数字">
+						</el-input-number>
+					</el-col>
+				</el-form-item>
+			</el-form>
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="dialogVisibleS = false">取 消</el-button>
+				<el-button type="primary" @click="ConfirmCreate">确 定</el-button>
+			</span>
+		</el-dialog>
+		<el-dialog title="批量导入" :visible.sync="dialogVisibleImport">
+
+			<el-form ref="mutinueModel" :model="mutinueModel" label-width="80px">
+				<el-form-item label="卡种信息">
+					<el-select v-model="mutinueModel.MutinueIdNo" multiple placeholder="请选择">
+						<el-option :label="row.Title" :value="row.IdNo" v-for="(row,num) in idnoList" :key="num">
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="EXCEL文件">
+					<el-upload class="upload-demo" :action="APIURl+'/api/file/Uploader/annexpic'" multiple :limit="3"
+						:on-success="SuccessImport">
+						<el-button size="small" type="primary">点击上传</el-button>
+						<div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+					</el-upload>
+				</el-form-item>
+			</el-form>
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="dialogVisibleImport = false">取 消</el-button>
+				<el-button type="primary" @click="ConfirmImport">确 定</el-button>
+			</span>
+		</el-dialog>
+	</div>
+</template>
+<script>
+	import request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import {
+		APIURl
+	} from '@/utils/define'
+	import NCCForm from './Form'
+	import ExportBox from './ExportBox'
+	import {
+		previewDataInterface
+	} from '@/api/systemData/dataInterface'
+	export default {
+		components: {
+			NCCForm,
+			ExportBox
+		},
+		data() {
+			return {
+				APIURl,
+				dialogVisibleImport: false,
+				showAll: false,
+				dialogVisibleS: false,
+				idnoList: [],
+				query: {
+					sercret: undefined,
+					type: undefined,
+					title: undefined,
+					idNo: undefined,
+				},
+				list: [],
+				listLoading: true,
+				multipleSelection: [],
+				total: 0,
+				listQuery: {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				},
+				formVisible: false,
+				exportBoxVisible: false,
+				columnList: [{
+						prop: 'sercret',
+						label: '兑换码'
+					},
+					{
+						prop: 'moneys',
+						label: '优惠金额'
+					},
+					{
+						prop: 'creatorTime',
+						label: '创建时间'
+					},
+					{
+						prop: 'lastModifyTime',
+						label: '修改时间'
+					},
+					{
+						prop: 'type',
+						label: '状态'
+					},
+					{
+						prop: 'title',
+						label: '标题'
+					},
+					{
+						prop: 'idNo',
+						label: '卡种ID'
+					},
+				],
+				typeOptions: [{
+					"fullName": "未使用",
+					"id": "1"
+				}, {
+					"fullName": "已使用",
+					"id": "2"
+				}],
+				dataForm: {
+					"idNo": "",
+					"moneys": 0,
+					"num": 0
+				},
+				mutinueModel:{
+					MutinueIdNo:[],
+					filename:''
+				}
+			}
+		},
+		computed: {},
+		created() {
+			this.initData()
+			this.ShowIdno()
+		},
+		methods: {
+			SuccessImport(res, file) {
+				console.log('哈哈哈返回', res)
+				console.log('这是文件信息', file)
+				if (res.code == 200) {
+					this.mutinueModel.filename = res.data.name
+				} else {
+					this.$message.error('上传失败')
+				}
+			},
+			// 确认导入
+			ConfirmImport() {
+				if(this.mutinueModel.MutinueIdNo.length==0){
+					this.$message.error('请选择卡种')
+				}else if(this.mutinueModel.filename==''){
+					this.$message.error('请选择文件')
+				}else{
+					request({
+						url: `/api/Siberian/tbcode/ImPortExcelToData`,
+						method: 'POST',
+						data: this.mutinueModel
+					}).then(res => {
+						if (res.code == 200) {
+							this.$message.success('导入成功')
+							this.dialogVisibleImport=false
+							this.mutinueModel.MutinueIdNo=[]
+							this.mutinueModel.filename=''
+							this.initData()
+						} else {
+							this.$message.error(res.msg)
+						}
+					})
+				}
+			},
+			downloadUrl(url = '', fileName = '未知文件') {
+				const a = document.createElement('a');
+				a.style.display = 'none';
+				// a.setAttribute('target', '_blank');
+				a.setAttribute('download', '');
+				fileName && a.setAttribute('download', fileName);
+				a.href = url;
+				document.body.appendChild(a);
+				a.click();
+				document.body.removeChild(a);
+				this.dialogVisible = false
+				this.Time = undefined
+			},
+			ConfirmDownLoad() {
+				this.downloadUrl(this.APIURl + '/api/File/Image/annexpic/dhmmb.xlsx', '模板下载')
+			},
+			CreateIDS() {
+				this.dialogVisibleS = true
+				// dhmmb.xlsx
+			},
+			// 查询卡种列表
+			ShowIdno() {
+				let dataInfo = {
+					"pageIndex": 1,
+					"pageSize": 3000,
+					"filterName": "",
+					"classId": 0
+				}
+				request({
+					url: `/api/RequestAQS/requestaqs/GetCardList`,
+					method: 'POST',
+					data: dataInfo
+				}).then(res => {
+					if (res.code == 200) {
+						this.idnoList = res.data.Data.List
+					} else {
+						this.$message.error(res.msg)
+					}
+				})
+			},
+			ConfirmCreate() {
+				if (this.dataForm.idNo == '') {
+					this.$message.error('请传入卡种ID')
+				} else if (this.dataForm.moneys == '') {
+					this.$message.error('请传入优惠金额')
+				} else if (this.dataForm.num == 0) {
+					this.$message.error('请输入数量')
+				} else {
+					request({
+						url: `/api/Siberian/tbcode/BatchCreate`,
+						method: 'POST',
+						data: this.dataForm
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+								this.dialogVisibleS = false
+							}
+						});
+					})
+				}
+			},
+			initData() {
+				this.listLoading = true;
+				let _query = {
+					...this.listQuery,
+					...this.query
+				};
+				let query = {}
+				for (let key in _query) {
+					if (Array.isArray(_query[key])) {
+						query[key] = _query[key].join()
+					} else {
+						query[key] = _query[key]
+					}
+				}
+				request({
+					url: `/api/Siberian/TbCode`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					this.list = res.data.list
+					this.total = res.data.pagination.total
+					this.listLoading = false
+				})
+			},
+			handleDel(id) {
+				this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/Siberian/TbCode/${id}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {});
+			},
+			handleSelectionChange(val) {
+				const res = val.map(item => item.id)
+				this.multipleSelection = res
+			},
+			handleBatchRemoveDel() {
+				if (!this.multipleSelection.length) {
+					this.$message({
+						type: 'error',
+						message: '请选择一条数据',
+						duration: 1500,
+					})
+					return
+				}
+				const ids = this.multipleSelection
+				this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/Siberian/TbCode/batchRemove`,
+						method: 'POST',
+						data: ids,
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {})
+			},
+			addOrUpdateHandle(id, isDetail) {
+				this.formVisible = true
+				this.$nextTick(() => {
+					this.$refs.NCCForm.init(id, isDetail)
+				})
+			},
+			exportData() {
+				this.exportBoxVisible = true
+				this.$nextTick(() => {
+					this.$refs.ExportBox.init(this.columnList)
+				})
+			},
+			download(data) {
+				let query = {
+					...data,
+					...this.listQuery,
+					...this.query
+				}
+				request({
+					url: `/api/Siberian/TbCode/Actions/Export`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					if (!res.data.url) return
+					window.location.href = this.define.comUrl + res.data.url
+					this.$refs.ExportBox.visible = false
+					this.exportBoxVisible = false
+				})
+			},
+			search() {
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			},
+			refresh(isrRefresh) {
+				this.formVisible = false
+				if (isrRefresh) this.reset()
+			},
+			reset() {
+				for (let key in this.query) {
+					this.query[key] = undefined
+				}
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			}
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbCodeLog/ExportBox.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbCodeLog/ExportBox.vue
new file mode 100644
index 0000000..4fc5c07
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbCodeLog/ExportBox.vue
@@ -0,0 +1,66 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbCodeLog/Form.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbCodeLog/Form.vue
new file mode 100644
index 0000000..3fbd101
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbCodeLog/Form.vue
@@ -0,0 +1,191 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+		<el-row :gutter="15" class="" >
+				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
+					<el-col :span="24">
+						<el-form-item label="用户" prop="userId">
+							<user-select v-model="dataForm.userId" placeholder="请选择" clearable required >
+							</user-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="商品" prop="goodsId">
+							<el-select v-model="dataForm.goodsId" placeholder="请选择" clearable required :style='{"width":"100%"}' >
+								<el-option v-for="(item, index) in goodsIdOptions" :key="index" :label="item.F_Title" :value="item.F_Id" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="卡种ID" prop="idNo">
+							<el-input v-model="dataForm.idNo" placeholder="请输入" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="卡种名称" prop="idNoName">
+							<el-input v-model="dataForm.idNoName" placeholder="请输入" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="卡种数量" prop="idNoNumber">
+							<el-input-number v-model="dataForm.idNoNumber" placeholder="数字文本" required :step="1" >
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="创建时间" prop="creatorTime">
+							<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="修改时间" prop="lastModifyTime">
+							<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+	import request from '@/utils/request'
+	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				loading: false,
+				visible: false,
+				isDetail: false,
+				dataForm: {
+					id:'',
+					userId:undefined,
+					goodsId:undefined,
+					idNo:undefined,
+					idNoName:undefined,
+					idNoNumber:1,
+					creatorTime:undefined,
+					lastModifyTime:undefined,
+				},
+				rules: {
+					userId:[
+						{
+							required:true,
+							message:'请输入用户',
+							trigger:'change'
+						},
+					],
+					goodsId:[
+						{
+							required:true,
+							message:'请输入商品',
+							trigger:'change'
+						},
+					],
+					idNo:[
+						{
+							required:true,
+							message:'请输入卡种ID',
+							trigger:'blur'
+						},
+					],
+					idNoName:[
+						{
+							required:true,
+							message:'请输入卡种名称',
+							trigger:'blur'
+						},
+					],
+					idNoNumber:[
+						{
+							required:true,
+							message:'请输入卡种数量',
+							trigger:["blur","change"]
+						},
+					],
+				},
+				goodsIdOptions : [],
+			}
+		},
+		computed: {},
+        watch: {},
+        created() {
+			this.getgoodsIdOptions();
+		},
+		mounted() {
+        },
+		methods: {
+			getgoodsIdOptions(){
+				previewDataInterface('337130169200280837').then(res => {
+					this.goodsIdOptions = res.data
+				});
+			},
+			goBack() {
+                this.$emit('refresh')
+            },
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+                this.visible = true;
+                this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						request({
+							url: '/api/Siberian/TbCodeLog/' + this.dataForm.id,
+							method: 'get'
+						}).then(res =>{
+							this.dataForm = res.data;
+						})
+					}
+				})
+			},
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+                    if (valid) {
+                        if (!this.dataForm.id) {
+                            request({
+                                url: `/api/Siberian/TbCodeLog`,
+                                method: 'post',
+                                data: this.dataForm,
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false,
+                                            this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        } else {
+                            request({
+                                url: '/api/Siberian/TbCodeLog/' + this.dataForm.id,
+                                method: 'PUT',
+                                data: this.dataForm
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false
+                                        this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        }
+                    }
+                })
+			},
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbCodeLog/index.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbCodeLog/index.vue
new file mode 100644
index 0000000..7b88a1b
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbCodeLog/index.vue
@@ -0,0 +1,207 @@
+<template>
+	<div class="NCC-common-layout">
+		<div class="NCC-common-layout-center">
+			<el-row class="NCC-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="用户">
+							<userSelect v-model="query.userId" placeholder="请选择用户" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="商品">
+							<el-select v-model="query.goodsId" placeholder="商品" clearable >
+								<el-option v-for="(item, index) in goodsIdOptions" :key="index" :label="item.F_Title" :value="item.F_Id"  />
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="卡种ID">
+							<el-input v-model="query.idNo" placeholder="卡种ID" clearable />	
+						</el-form-item>
+					</el-col>
+					<template v-if="showAll">
+					<el-col :span="6">
+						<el-form-item label="卡种名称">
+							<el-input v-model="query.idNoName" placeholder="卡种名称" clearable />	
+						</el-form-item>
+					</el-col>
+					</template>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+							<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">展开</el-button>
+							<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>收起</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="NCC-common-layout-main NCC-flex-main">
+				<div class="NCC-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
+					</div>
+					<div class="NCC-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false" @click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+                <NCC-table v-loading="listLoading" :data="list">
+					<el-table-column prop="RealName" label="用户" align="left" >
+						<template slot-scope="scope">
+							{{scope.row.user&&scope.row.user.RealName}}
+						</template>
+					</el-table-column>
+					<el-table-column label="商品" prop="Title" align="left">
+							<template slot-scope="scope">{{ scope.row.goods&&scope.row.goods.Title }}</template>
+					</el-table-column>
+					<el-table-column prop="idNo" label="卡种ID" align="left" />
+					<el-table-column prop="idNoName" label="卡种名称" align="left" />
+					<el-table-column prop="idNoNumber" label="卡种数量" align="left" />
+					<el-table-column prop="creatorTime" label="创建时间" align="left" :formatter="ncc.tableDateFormat"/>
+					<el-table-column prop="lastModifyTime" label="修改时间" align="left" :formatter="ncc.tableDateFormat"/>
+					<el-table-column label="操作" fixed="right" width="100">
+							<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
+							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
+						</template>
+					</el-table-column>
+				</NCC-table>
+                <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
+            </div>
+        </div>
+		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+	</div>
+</template>
+<script>
+    import request from '@/utils/request'
+    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+    import NCCForm from './Form'
+    import ExportBox from './ExportBox'
+    import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+        components: { NCCForm, ExportBox },
+        data() {
+            return {
+                showAll: false,
+				query: {
+                    userId:undefined,
+                    goodsId:undefined,
+                    idNo:undefined,
+                    idNoName:undefined,
+				},
+                list: [],
+                listLoading: true,
+                multipleSelection: [], total: 0,
+                listQuery: {
+                    currentPage: 1,
+                    pageSize: 20,
+					sort: "desc",
+                    sidx: "",
+                },
+                formVisible: false,
+                exportBoxVisible: false,
+                columnList: [
+                    { prop: 'userId', label: '用户' },
+                    { prop: 'goodsId', label: '商品' },
+                    { prop: 'idNo', label: '卡种ID' },
+                    { prop: 'idNoName', label: '卡种名称' },
+                    { prop: 'idNoNumber', label: '卡种数量' },
+                    { prop: 'creatorTime', label: '创建时间' },
+                    { prop: 'lastModifyTime', label: '修改时间' },
+				],
+				goodsIdOptions : [],
+			}
+        },
+		computed: {},
+		created() {
+			this.initData()
+			this.getgoodsIdOptions();
+		},
+		methods: {
+			getgoodsIdOptions(){
+				previewDataInterface('337130169200280837').then(res => {
+					this.goodsIdOptions = res.data
+				});
+			},
+			initData() {
+                this.listLoading = true;
+                let _query = {
+                    ...this.listQuery,
+                    ...this.query
+                };
+                let query = {}
+                for (let key in _query) {
+                    if (Array.isArray(_query[key])) {
+                        query[key] = _query[key].join()
+                    } else {
+                        query[key] = _query[key]
+                    }
+                }
+                request({
+                    url: `/api/Siberian/TbCodeLog`,
+                    method: 'GET',
+                    data: query
+                }).then(res => {
+                    this.list = res.data.list
+                    this.total = res.data.pagination.total
+                    this.listLoading = false
+                })
+            },
+			handleDel(id) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    request({
+                        url: `/api/Siberian/TbCodeLog/${id}`,
+                        method: 'DELETE'
+                    }).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            onClose: () => {
+                                this.initData()
+                            }
+                        });
+                    })
+                }).catch(() => {
+                });
+            },
+			addOrUpdateHandle(id, isDetail) {
+                this.formVisible = true
+                this.$nextTick(() => {
+                    this.$refs.NCCForm.init(id, isDetail)
+                })
+            },
+			search() {
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            },
+            refresh(isrRefresh) {
+                this.formVisible = false
+                if (isrRefresh) this.reset()
+            },
+            reset() {
+                for (let key in this.query) {
+                    this.query[key] = undefined
+                }
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            }
+		}
+    }
+</script>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbExamInfo/ExportBox.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbExamInfo/ExportBox.vue
new file mode 100644
index 0000000..4fc5c07
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbExamInfo/ExportBox.vue
@@ -0,0 +1,66 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbExamInfo/Form.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbExamInfo/Form.vue
new file mode 100644
index 0000000..a2d7c74
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbExamInfo/Form.vue
@@ -0,0 +1,127 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+		<el-row :gutter="15" class="" >
+				<el-form ref="elForm" :model="dataForm" size="medium" label-width="100px" label-position="top" :disabled="!!isDetail" :rules="rules">
+					<el-col :span="24">
+						<el-form-item label="备考资料信息" prop="info">
+							<NCC-Quill v-model="dataForm.info" placeholder="请输入内容..." required >
+							</NCC-Quill>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="创建时间" prop="creatorTime">
+							<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="修改时间" prop="lastModifyTime">
+							<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+	import request from '@/utils/request'
+	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				loading: false,
+				visible: false,
+				isDetail: false,
+				dataForm: {
+					id:'',
+					info:undefined,
+					creatorTime:undefined,
+					lastModifyTime:undefined,
+				},
+				rules: {
+					info:[
+						{
+							required:true,
+							message:'请输入备考资料信息',
+							trigger:'blur'
+						},
+					],
+				},
+			}
+		},
+		computed: {},
+        watch: {},
+        created() {
+		},
+		mounted() {
+        },
+		methods: {
+			goBack() {
+                this.$emit('refresh')
+            },
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+                this.visible = true;
+                this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						request({
+							url: '/api/Siberian/TbExamInfo/' + this.dataForm.id,
+							method: 'get'
+						}).then(res =>{
+							this.dataForm = res.data;
+						})
+					}
+				})
+			},
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+                    if (valid) {
+                        if (!this.dataForm.id) {
+                            request({
+                                url: `/api/Siberian/TbExamInfo`,
+                                method: 'post',
+                                data: this.dataForm,
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false,
+                                            this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        } else {
+                            request({
+                                url: '/api/Siberian/TbExamInfo/' + this.dataForm.id,
+                                method: 'PUT',
+                                data: this.dataForm
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false
+                                        this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        }
+                    }
+                })
+			},
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbExamInfo/index.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbExamInfo/index.vue
new file mode 100644
index 0000000..0fb3d0b
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbExamInfo/index.vue
@@ -0,0 +1,153 @@
+<template>
+	<div class="NCC-common-layout">
+		<div class="NCC-common-layout-center">
+			<el-row class="NCC-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="NCC-common-layout-main NCC-flex-main">
+				<div class="NCC-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
+					</div>
+					<div class="NCC-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false" @click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+                <NCC-table v-loading="listLoading" :data="list">
+					<el-table-column prop="creatorTime" label="创建时间" align="left" :formatter="ncc.tableDateFormat" />
+					<el-table-column prop="lastModifyTime" label="修改时间" align="left" :formatter="ncc.tableDateFormat" />
+					<el-table-column label="操作" fixed="right" width="100">
+							<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
+							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
+						</template>
+					</el-table-column>
+				</NCC-table>
+                <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
+            </div>
+        </div>
+		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+	</div>
+</template>
+<script>
+    import request from '@/utils/request'
+    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+    import NCCForm from './Form'
+    import ExportBox from './ExportBox'
+    import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+        components: { NCCForm, ExportBox },
+        data() {
+            return {
+				query: {
+				},
+                list: [],
+                listLoading: true,
+                multipleSelection: [], total: 0,
+                listQuery: {
+                    currentPage: 1,
+                    pageSize: 20,
+					sort: "desc",
+                    sidx: "",
+                },
+                formVisible: false,
+                exportBoxVisible: false,
+                columnList: [
+                    { prop: 'creatorTime', label: '创建时间' },
+                    { prop: 'lastModifyTime', label: '修改时间' },
+				],
+			}
+        },
+		computed: {},
+		created() {
+			this.initData()
+		},
+		methods: {
+			initData() {
+                this.listLoading = true;
+                let _query = {
+                    ...this.listQuery,
+                    ...this.query
+                };
+                let query = {}
+                for (let key in _query) {
+                    if (Array.isArray(_query[key])) {
+                        query[key] = _query[key].join()
+                    } else {
+                        query[key] = _query[key]
+                    }
+                }
+                request({
+                    url: `/api/Siberian/TbExamInfo`,
+                    method: 'GET',
+                    data: query
+                }).then(res => {
+                    this.list = res.data.list
+                    this.total = res.data.pagination.total
+                    this.listLoading = false
+                })
+            },
+			handleDel(id) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    request({
+                        url: `/api/Siberian/TbExamInfo/${id}`,
+                        method: 'DELETE'
+                    }).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            onClose: () => {
+                                this.initData()
+                            }
+                        });
+                    })
+                }).catch(() => {
+                });
+            },
+			addOrUpdateHandle(id, isDetail) {
+                this.formVisible = true
+                this.$nextTick(() => {
+                    this.$refs.NCCForm.init(id, isDetail)
+                })
+            },
+			search() {
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            },
+            refresh(isrRefresh) {
+                this.formVisible = false
+                if (isrRefresh) this.reset()
+            },
+            reset() {
+                for (let key in this.query) {
+                    this.query[key] = undefined
+                }
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            }
+		}
+    }
+</script>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodInfo/ExportBox.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodInfo/ExportBox.vue
new file mode 100644
index 0000000..4fc5c07
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodInfo/ExportBox.vue
@@ -0,0 +1,66 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodInfo/Form.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodInfo/Form.vue
new file mode 100644
index 0000000..1961866
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodInfo/Form.vue
@@ -0,0 +1,185 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false"
+		:visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+		<el-row :gutter="15" class="">
+			<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right"
+				:disabled="!!isDetail" :rules="rules">
+
+				<el-col :span="24">
+					<el-form-item label="标识信息" prop="identy">
+						<el-input v-model="dataForm.identy" placeholder="请输入标识信息" required show-word-limit
+							:style='{"width":"100%"}' type='textarea' :autosize='{"minRows":4,"maxRows":4}'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="商品标题" prop="title">
+						<el-input v-model="dataForm.title" placeholder="请输入商品标题" clearable required
+							:style='{"width":"100%"}'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="商品图片" prop="banner">
+						<NCC-UploadImg v-model="dataForm.banner" required :fileSize="5" sizeUnit="MB" :limit="9">
+						</NCC-UploadImg>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="开始金额" prop="title">
+						<el-input v-model="dataForm.title" placeholder="请输入开始金额" clearable required
+							:style='{"width":"100%"}'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="结束金额" prop="title">
+						<el-input v-model="dataForm.title" placeholder="请输入结束金额" clearable required
+							:style='{"width":"100%"}'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+
+				<el-col :span="24" v-if="false">
+					<el-form-item label="创建时间" prop="creatorTime">
+						<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" v-if="false">
+					<el-form-item label="修改时间" prop="lastModifyTime">
+						<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly>
+						</el-input>
+					</el-form-item>
+				</el-col>
+			</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+	import request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import {
+		previewDataInterface
+	} from '@/api/systemData/dataInterface'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				loading: false,
+				visible: false,
+				isDetail: false,
+				dataForm: {
+					"id":'',
+					"title": "",
+					"identy": "",
+					"banner": [],
+					"startMoneys": 0,
+					"endMoneys": 0,
+					"creatorTime": "2023-02-21T14:08:44.781Z",
+					"lastModifyTime": "2023-02-21T14:08:44.781Z"
+				},
+				rules: {
+					identy: [{
+						required: true,
+						message: '请输入标识信息',
+						trigger: 'change'
+					}, ],
+					title: [{
+						required: true,
+						message: '请输入商品标题',
+						trigger: 'change'
+					}, ],
+					banner: [{
+						required: true,
+						message: '请上传商品图片',
+						trigger: 'blur'
+					}, ],
+					startMoneys: [{
+						required: true,
+						message: '请输入开始金额',
+						trigger: 'change'
+					}, ],
+					endMoneys: [{
+						required: true,
+						message: '请输入结束金额',
+						trigger: 'blur'
+					}, ],
+				},
+			}
+		},
+		computed: {},
+		watch: {},
+		created() {
+		},
+		mounted() {},
+		methods: {
+			goBack() {
+				this.$emit('refresh')
+			},
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+				this.visible = true;
+				this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						request({
+							url: '/api/Siberian/tbgoodinfo/' + this.dataForm.id,
+							method: 'get'
+						}).then(res => {
+							this.dataForm = res.data;
+							if (!this.dataForm.banner) this.dataForm.banner = [];
+						})
+					}
+				})
+			},
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+					if (valid) {
+						if (!this.dataForm.id) {
+							request({
+								url: `/api/Siberian/tbgoodinfo`,
+								method: 'post',
+								data: this.dataForm,
+							}).then((res) => {
+								this.$message({
+									message: res.msg,
+									type: 'success',
+									duration: 1000,
+									onClose: () => {
+										this.visible = false,
+											this.$emit('refresh', true)
+									}
+								})
+							})
+						} else {
+							request({
+								url: '/api/Siberian/tbgoodinfo/' + this.dataForm.id,
+								method: 'PUT',
+								data: this.dataForm
+							}).then((res) => {
+								this.$message({
+									message: res.msg,
+									type: 'success',
+									duration: 1000,
+									onClose: () => {
+										this.visible = false
+										this.$emit('refresh', true)
+									}
+								})
+							})
+						}
+					}
+				})
+			},
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodInfo/index.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodInfo/index.vue
new file mode 100644
index 0000000..97ad85a
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodInfo/index.vue
@@ -0,0 +1,191 @@
+<template>
+	<div class="NCC-common-layout">
+		<div class="NCC-common-layout-center">
+			<el-row class="NCC-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					
+					<el-col :span="6">
+						<el-form-item label="商品标题">
+							<el-input v-model="query.txt" placeholder="商品标题" />	
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="开始金额">
+							<el-input v-model="query.txt" placeholder="开始金额" />	
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="结束金额">
+							<el-input v-model="query.txt" placeholder="结束金额" />	
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="标识信息">
+							<el-input v-model="query.txt" placeholder="标识信息" />	
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+							<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">展开</el-button>
+							<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>收起</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="NCC-common-layout-main NCC-flex-main">
+				<div class="NCC-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
+					</div>
+					<div class="NCC-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false" @click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+                <NCC-table v-loading="listLoading" :data="list">
+					<el-table-column label="商品标题" prop="title" align="left">
+							<template slot-scope="scope">{{ scope.row.title }}</template>
+					</el-table-column>
+					<el-table-column prop="startMoneys" label="开始金额" align="left" />
+					<el-table-column prop="endMoneys" label="结束金额" align="left" />
+					<el-table-column prop="identy" label="标识信息" align="left" />
+					<el-table-column prop="creatorTime" label="创建时间" align="left" :formatter="ncc.tableDateFormat"/>
+					<el-table-column prop="lastModifyTime" label="修改时间" align="left" :formatter="ncc.tableDateFormat"/>
+					<el-table-column label="操作" fixed="right" width="100">
+							<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
+							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
+						</template>
+					</el-table-column>
+				</NCC-table>
+                <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
+            </div>
+        </div>
+		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+	</div>
+</template>
+<script>
+    import request from '@/utils/request'
+    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+    import NCCForm from './Form'
+    import ExportBox from './ExportBox'
+    import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+        components: { NCCForm, ExportBox },
+        data() {
+            return {
+                showAll: false,
+				query: {
+                    title:undefined,
+                    startMoneys:undefined,
+                    endMoneys:undefined,
+                    identy:undefined,
+				},
+                list: [],
+                listLoading: true,
+                multipleSelection: [], total: 0,
+                listQuery: {
+                    currentPage: 1,
+                    pageSize: 20,
+					sort: "desc",
+                    sidx: "",
+                },
+                formVisible: false,
+                exportBoxVisible: false,
+                columnList: [
+                    { prop: 'title', label: '商品标题' },
+                    { prop: 'startMoneys', label: '开始金额' },
+                    { prop: 'endMoneys', label: '结束金额' },
+                    { prop: 'identy', label: '标识信息' },
+                    { prop: 'creatorTime', label: '创建时间' },
+                    { prop: 'lastModifyTime', label: '修改时间' },
+				],
+			}
+        },
+		computed: {},
+		created() {
+			this.initData()
+		},
+		methods: {
+			initData() {
+                this.listLoading = true;
+                let _query = {
+                    ...this.listQuery,
+                    ...this.query
+                };
+                let query = {}
+                for (let key in _query) {
+                    if (Array.isArray(_query[key])) {
+                        query[key] = _query[key].join()
+                    } else {
+                        query[key] = _query[key]
+                    }
+                }
+                request({
+                    url: `/api/Siberian/tbgoodinfo`,
+                    method: 'GET',
+                    data: query
+                }).then(res => {
+                    this.list = res.data.list
+                    this.total = res.data.pagination.total
+                    this.listLoading = false
+                })
+            },
+			handleDel(id) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    request({
+                        url: `/api/Siberian/tbgoodinfo/${id}`,
+                        method: 'DELETE'
+                    }).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            onClose: () => {
+                                this.initData()
+                            }
+                        });
+                    })
+                }).catch(() => {
+                });
+            },
+			addOrUpdateHandle(id, isDetail) {
+                this.formVisible = true
+                this.$nextTick(() => {
+                    this.$refs.NCCForm.init(id, isDetail)
+                })
+            },
+			search() {
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            },
+            refresh(isrRefresh) {
+                this.formVisible = false
+                if (isrRefresh) this.reset()
+            },
+            reset() {
+                for (let key in this.query) {
+                    this.query[key] = undefined
+                }
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            }
+		}
+    }
+</script>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodsCollect/ExportBox.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodsCollect/ExportBox.vue
new file mode 100644
index 0000000..4fc5c07
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodsCollect/ExportBox.vue
@@ -0,0 +1,66 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodsCollect/Form.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodsCollect/Form.vue
new file mode 100644
index 0000000..4c0a7f4
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodsCollect/Form.vue
@@ -0,0 +1,149 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+		<el-row :gutter="15" class="" >
+				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
+					<el-col :span="24">
+						<el-form-item label="用户" prop="userId">
+							<user-select v-model="dataForm.userId" placeholder="请选择" clearable required >
+							</user-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="商品" prop="goodsId">
+							<el-select v-model="dataForm.goodsId" placeholder="请选择" clearable required :style='{"width":"100%"}' >
+								<el-option v-for="(item, index) in goodsIdOptions" :key="index" :label="item.F_Title" :value="item.F_Id" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="创建时间" prop="creatorTime">
+							<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="修改时间" prop="lastModifyTime">
+							<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+	import request from '@/utils/request'
+	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				loading: false,
+				visible: false,
+				isDetail: false,
+				dataForm: {
+					id:'',
+					userId:undefined,
+					goodsId:undefined,
+					creatorTime:undefined,
+					lastModifyTime:undefined,
+				},
+				rules: {
+					userId:[
+						{
+							required:true,
+							message:'请输入用户',
+							trigger:'change'
+						},
+					],
+					goodsId:[
+						{
+							required:true,
+							message:'请输入商品',
+							trigger:'change'
+						},
+					],
+				},
+				goodsIdOptions : [],
+			}
+		},
+		computed: {},
+        watch: {},
+        created() {
+			this.getgoodsIdOptions();
+		},
+		mounted() {
+        },
+		methods: {
+			getgoodsIdOptions(){
+				previewDataInterface('337130169200280837').then(res => {
+					this.goodsIdOptions = res.data
+				});
+			},
+			goBack() {
+                this.$emit('refresh')
+            },
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+                this.visible = true;
+                this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						request({
+							url: '/api/Siberian/TbGoodsCollect/' + this.dataForm.id,
+							method: 'get'
+						}).then(res =>{
+							this.dataForm = res.data;
+						})
+					}
+				})
+			},
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+                    if (valid) {
+                        if (!this.dataForm.id) {
+                            request({
+                                url: `/api/Siberian/TbGoodsCollect`,
+                                method: 'post',
+                                data: this.dataForm,
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false,
+                                            this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        } else {
+                            request({
+                                url: '/api/Siberian/TbGoodsCollect/' + this.dataForm.id,
+                                method: 'PUT',
+                                data: this.dataForm
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false
+                                        this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        }
+                    }
+                })
+			},
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodsCollect/index.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodsCollect/index.vue
new file mode 100644
index 0000000..8f9a374
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodsCollect/index.vue
@@ -0,0 +1,184 @@
+<template>
+	<div class="NCC-common-layout">
+		<div class="NCC-common-layout-center">
+			<el-row class="NCC-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="用户">
+							<userSelect v-model="query.userId" placeholder="请选择用户" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="商品">
+							<el-select v-model="query.goodsId" placeholder="商品" clearable >
+								<el-option v-for="(item, index) in goodsIdOptions" :key="index" :label="item.F_Title" :value="item.F_Id"  />
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="NCC-common-layout-main NCC-flex-main">
+				<div class="NCC-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
+					</div>
+					<div class="NCC-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false" @click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+                <NCC-table v-loading="listLoading" :data="list">
+					<el-table-column prop="RealName" label="用户" align="left" >
+						<template slot-scope="scope">
+							{{scope.row.user&&scope.row.user.RealName}}
+						</template>
+					</el-table-column>
+					<el-table-column label="商品" prop="goodsId" align="left">
+							<template slot-scope="scope">{{ scope.row.goods&&scope.row.Title }}</template>
+					</el-table-column>
+					<el-table-column prop="creatorTime" label="创建时间" align="left" :formatter="ncc.tableDateFormat" />
+					<el-table-column prop="lastModifyTime" label="修改时间" align="left" :formatter="ncc.tableDateFormat" />
+					<el-table-column label="操作" fixed="right" width="100">
+							<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
+							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
+						</template>
+					</el-table-column>
+				</NCC-table>
+                <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
+            </div>
+        </div>
+		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+	</div>
+</template>
+<script>
+    import request from '@/utils/request'
+    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+    import NCCForm from './Form'
+    import ExportBox from './ExportBox'
+    import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+        components: { NCCForm, ExportBox },
+        data() {
+            return {
+				query: {
+                    userId:undefined,
+                    goodsId:undefined,
+				},
+                list: [],
+                listLoading: true,
+                multipleSelection: [], total: 0,
+                listQuery: {
+                    currentPage: 1,
+                    pageSize: 20,
+					sort: "desc",
+                    sidx: "",
+                },
+                formVisible: false,
+                exportBoxVisible: false,
+                columnList: [
+                    { prop: 'userId', label: '用户' },
+                    { prop: 'goodsId', label: '商品' },
+                    { prop: 'creatorTime', label: '创建时间' },
+                    { prop: 'lastModifyTime', label: '修改时间' },
+				],
+				goodsIdOptions : [],
+			}
+        },
+		computed: {},
+		created() {
+			this.initData()
+			this.getgoodsIdOptions();
+		},
+		methods: {
+			getgoodsIdOptions(){
+				previewDataInterface('337130169200280837').then(res => {
+					this.goodsIdOptions = res.data
+				});
+			},
+			initData() {
+                this.listLoading = true;
+                let _query = {
+                    ...this.listQuery,
+                    ...this.query
+                };
+                let query = {}
+                for (let key in _query) {
+                    if (Array.isArray(_query[key])) {
+                        query[key] = _query[key].join()
+                    } else {
+                        query[key] = _query[key]
+                    }
+                }
+                request({
+                    url: `/api/Siberian/TbGoodsCollect`,
+                    method: 'GET',
+                    data: query
+                }).then(res => {
+                    this.list = res.data.list
+                    this.total = res.data.pagination.total
+                    this.listLoading = false
+                })
+            },
+			handleDel(id) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    request({
+                        url: `/api/Siberian/TbGoodsCollect/${id}`,
+                        method: 'DELETE'
+                    }).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            onClose: () => {
+                                this.initData()
+                            }
+                        });
+                    })
+                }).catch(() => {
+                });
+            },
+			addOrUpdateHandle(id, isDetail) {
+                this.formVisible = true
+                this.$nextTick(() => {
+                    this.$refs.NCCForm.init(id, isDetail)
+                })
+            },
+			search() {
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            },
+            refresh(isrRefresh) {
+                this.formVisible = false
+                if (isrRefresh) this.reset()
+            },
+            reset() {
+                for (let key in this.query) {
+                    this.query[key] = undefined
+                }
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            }
+		}
+    }
+</script>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodsComment/ExportBox.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodsComment/ExportBox.vue
new file mode 100644
index 0000000..4fc5c07
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodsComment/ExportBox.vue
@@ -0,0 +1,66 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodsComment/Form.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodsComment/Form.vue
new file mode 100644
index 0000000..2f09ac5
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodsComment/Form.vue
@@ -0,0 +1,224 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+		<el-row :gutter="15" class="" >
+				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
+					<el-col :span="24">
+						<el-form-item label="用户" prop="userId">
+							<user-select v-model="dataForm.userId" placeholder="请选择" clearable required >
+							</user-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="商品" prop="goodsId">
+							<el-select v-model="dataForm.goodsId" placeholder="请选择" clearable required :style='{"width":"100%"}' >
+								<el-option v-for="(item, index) in goodsIdOptions" :key="index" :label="item.F_Title" :value="item.F_Id" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="评价内容" prop="txt">
+							<el-input v-model="dataForm.txt" placeholder="请输入评价内容" required show-word-limit :style='{"width":"100%"}' type='textarea' :autosize='{"minRows":4,"maxRows":4}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="卡种" prop="idNo">
+							<el-select v-model="dataForm.idNo" placeholder="请选择" clearable required :style='{"width":"100%"}' >
+								<el-option v-for="(item, index) in idNoOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="卡种名称" prop="title">
+							<el-input v-model="dataForm.title" placeholder="请输入卡种名称" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="评论图片" prop="banner">
+							<NCC-UploadImg v-model="dataForm.banner" required :fileSize="5" sizeUnit="MB" :limit="9" >
+							</NCC-UploadImg>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="评价类型" prop="type">
+							<el-select v-model="dataForm.type" placeholder="请选择" clearable required :style='{"width":"100%"}' >
+								<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="创建时间" prop="creatorTime">
+							<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="修改时间" prop="lastModifyTime">
+							<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+	import request from '@/utils/request'
+	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				loading: false,
+				visible: false,
+				isDetail: false,
+				dataForm: {
+					id:'',
+					userId:undefined,
+					goodsId:undefined,
+					txt:undefined,
+					idNo:undefined,
+					title:undefined,
+					banner:[],
+					type:undefined,
+					creatorTime:undefined,
+					lastModifyTime:undefined,
+				},
+				rules: {
+					userId:[
+						{
+							required:true,
+							message:'请输入用户',
+							trigger:'change'
+						},
+					],
+					goodsId:[
+						{
+							required:true,
+							message:'请输入商品',
+							trigger:'change'
+						},
+					],
+					txt:[
+						{
+							required:true,
+							message:'请输入评价内容',
+							trigger:'blur'
+						},
+					],
+					idNo:[
+						{
+							required:true,
+							message:'请输入卡种',
+							trigger:'change'
+						},
+					],
+					title:[
+						{
+							required:true,
+							message:'请输入卡种名称',
+							trigger:'blur'
+						},
+					],
+					banner:[
+						{
+							required:true,
+							message:'请输入评论图片',
+							trigger:'click'
+						},
+					],
+					type:[
+						{
+							required:true,
+							message:'请输入评价类型',
+							trigger:'change'
+						},
+					],
+				},
+				goodsIdOptions : [],
+				idNoOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
+				typeOptions:[{"fullName":"好评","id":"1"},{"fullName":"中评","id":"2"},{"fullName":"差评","id":"3"}],
+			}
+		},
+		computed: {},
+        watch: {},
+        created() {
+			this.getgoodsIdOptions();
+		},
+		mounted() {
+        },
+		methods: {
+			getgoodsIdOptions(){
+				previewDataInterface('337130169200280837').then(res => {
+					this.goodsIdOptions = res.data
+				});
+			},
+			goBack() {
+                this.$emit('refresh')
+            },
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+                this.visible = true;
+                this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						request({
+							url: '/api/Siberian/TbGoodsComment/' + this.dataForm.id,
+							method: 'get'
+						}).then(res =>{
+							this.dataForm = res.data;
+							if(!this.dataForm.banner)this.dataForm.banner=[];
+						})
+					}
+				})
+			},
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+                    if (valid) {
+                        if (!this.dataForm.id) {
+                            request({
+                                url: `/api/Siberian/TbGoodsComment`,
+                                method: 'post',
+                                data: this.dataForm,
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false,
+                                            this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        } else {
+                            request({
+                                url: '/api/Siberian/TbGoodsComment/' + this.dataForm.id,
+                                method: 'PUT',
+                                data: this.dataForm
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false
+                                        this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        }
+                    }
+                })
+			},
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodsComment/index.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodsComment/index.vue
new file mode 100644
index 0000000..313cf02
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbGoodsComment/index.vue
@@ -0,0 +1,225 @@
+<template>
+	<div class="NCC-common-layout">
+		<div class="NCC-common-layout-center">
+			<el-row class="NCC-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="用户">
+							<userSelect v-model="query.userId" placeholder="请选择用户" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="商品">
+							<el-select v-model="query.goodsId" placeholder="商品" clearable >
+								<el-option v-for="(item, index) in goodsIdOptions" :key="index" :label="item.F_Title" :value="item.F_Id"  />
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="评价内容">
+							<el-input v-model="query.txt" placeholder="评价内容" />	
+						</el-form-item>
+					</el-col>
+					<template v-if="showAll">
+					<el-col :span="6">
+						<el-form-item label="卡种">
+							<el-select v-model="query.idNo" placeholder="卡种" clearable >
+								<el-option v-for="(item, index) in idNoOptions" :key="index" :label="item.fullName" :value="item.id"  />
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="评价类型">
+							<el-select v-model="query.type" placeholder="评价类型" clearable >
+								<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName" :value="item.id"  />
+							</el-select>
+						</el-form-item>
+					</el-col>
+					</template>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+							<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">展开</el-button>
+							<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>收起</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="NCC-common-layout-main NCC-flex-main">
+				<div class="NCC-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
+					</div>
+					<div class="NCC-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false" @click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+                <NCC-table v-loading="listLoading" :data="list">
+					<el-table-column prop="RealName" label="用户" align="left" >
+						<template slot-scope="scope">
+							{{scope.row.user&&scope.row.user.RealName}}
+						</template>
+					</el-table-column>
+					<el-table-column label="商品" prop="Title" align="left">
+							<template slot-scope="scope">{{ scope.row.goods&&scope.row.goods.Title }}</template>
+					</el-table-column>
+					<el-table-column prop="txt" label="评价内容" align="left" />
+					<el-table-column label="卡种" prop="idNo" align="left">
+							<template slot-scope="scope">{{ scope.row.idNo | dynamicText(idNoOptions) }}</template>
+					</el-table-column>
+					<el-table-column prop="title" label="卡种名称" align="left" />
+					<el-table-column label="评价类型" prop="type" align="left">
+							<template slot-scope="scope">{{ scope.row.type | dynamicText(typeOptions) }}</template>
+					</el-table-column>
+					<el-table-column prop="creatorTime" label="创建时间" align="left" :formatter="ncc.tableDateFormat"/>
+					<el-table-column prop="lastModifyTime" label="修改时间" align="left" :formatter="ncc.tableDateFormat"/>
+					<el-table-column label="操作" fixed="right" width="100">
+							<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
+							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
+						</template>
+					</el-table-column>
+				</NCC-table>
+                <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
+            </div>
+        </div>
+		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+	</div>
+</template>
+<script>
+    import request from '@/utils/request'
+    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+    import NCCForm from './Form'
+    import ExportBox from './ExportBox'
+    import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+        components: { NCCForm, ExportBox },
+        data() {
+            return {
+                showAll: false,
+				query: {
+                    userId:undefined,
+                    goodsId:undefined,
+                    txt:undefined,
+                    idNo:undefined,
+                    type:undefined,
+				},
+                list: [],
+                listLoading: true,
+                multipleSelection: [], total: 0,
+                listQuery: {
+                    currentPage: 1,
+                    pageSize: 20,
+					sort: "desc",
+                    sidx: "",
+                },
+                formVisible: false,
+                exportBoxVisible: false,
+                columnList: [
+                    { prop: 'userId', label: '用户' },
+                    { prop: 'goodsId', label: '商品' },
+                    { prop: 'txt', label: '评价内容' },
+                    { prop: 'idNo', label: '卡种' },
+                    { prop: 'title', label: '卡种名称' },
+                    { prop: 'type', label: '评价类型' },
+                    { prop: 'creatorTime', label: '创建时间' },
+                    { prop: 'lastModifyTime', label: '修改时间' },
+				],
+				goodsIdOptions : [],
+				idNoOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
+				typeOptions:[{"fullName":"好评","id":"1"},{"fullName":"中评","id":"2"},{"fullName":"差评","id":"3"}],
+			}
+        },
+		computed: {},
+		created() {
+			this.initData()
+			this.getgoodsIdOptions();
+		},
+		methods: {
+			getgoodsIdOptions(){
+				previewDataInterface('337130169200280837').then(res => {
+					this.goodsIdOptions = res.data
+				});
+			},
+			initData() {
+                this.listLoading = true;
+                let _query = {
+                    ...this.listQuery,
+                    ...this.query
+                };
+                let query = {}
+                for (let key in _query) {
+                    if (Array.isArray(_query[key])) {
+                        query[key] = _query[key].join()
+                    } else {
+                        query[key] = _query[key]
+                    }
+                }
+                request({
+                    url: `/api/Siberian/TbGoodsComment`,
+                    method: 'GET',
+                    data: query
+                }).then(res => {
+                    this.list = res.data.list
+                    this.total = res.data.pagination.total
+                    this.listLoading = false
+                })
+            },
+			handleDel(id) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    request({
+                        url: `/api/Siberian/TbGoodsComment/${id}`,
+                        method: 'DELETE'
+                    }).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            onClose: () => {
+                                this.initData()
+                            }
+                        });
+                    })
+                }).catch(() => {
+                });
+            },
+			addOrUpdateHandle(id, isDetail) {
+                this.formVisible = true
+                this.$nextTick(() => {
+                    this.$refs.NCCForm.init(id, isDetail)
+                })
+            },
+			search() {
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            },
+            refresh(isrRefresh) {
+                this.formVisible = false
+                if (isrRefresh) this.reset()
+            },
+            reset() {
+                for (let key in this.query) {
+                    this.query[key] = undefined
+                }
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            }
+		}
+    }
+</script>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbMailSend/ExportBox.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbMailSend/ExportBox.vue
new file mode 100644
index 0000000..4fc5c07
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbMailSend/ExportBox.vue
@@ -0,0 +1,66 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbMailSend/Form.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbMailSend/Form.vue
new file mode 100644
index 0000000..2de4e44
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbMailSend/Form.vue
@@ -0,0 +1,202 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+		<el-row :gutter="15" class="" >
+				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
+					<el-col :span="24">
+						<el-form-item label="用户" prop="userId">
+							<user-select v-model="dataForm.userId" placeholder="请选择" clearable required >
+							</user-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="收件人" prop="consigneeUser">
+							<el-input v-model="dataForm.consigneeUser" placeholder="请输入收件人" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="联系电话" prop="phone">
+							<el-input v-model="dataForm.phone" placeholder="请输入联系电话" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="详细地址" prop="addressDetail">
+							<el-input v-model="dataForm.addressDetail" placeholder="请输入详情地址" required show-word-limit :style='{"width":"100%"}' type='textarea' :autosize='{"minRows":4,"maxRows":4}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="确认消息" prop="confirmInfo">
+							<el-input v-model="dataForm.confirmInfo" placeholder="请输入“已确认”" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="ExamID" prop="examId">
+							<el-input v-model="dataForm.examId" placeholder="请输入ExamID" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="创建时间" prop="creatorTime">
+							<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="修改时间" prop="lastModifyTime">
+							<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+	import request from '@/utils/request'
+	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				loading: false,
+				visible: false,
+				isDetail: false,
+				dataForm: {
+					id:'',
+					userId:undefined,
+					consigneeUser:undefined,
+					phone:undefined,
+					addressDetail:undefined,
+					confirmInfo:undefined,
+					examId:undefined,
+					creatorTime:undefined,
+					lastModifyTime:undefined,
+				},
+				rules: {
+					userId:[
+						{
+							required:true,
+							message:'请输入用户',
+							trigger:'change'
+						},
+					],
+					consigneeUser:[
+						{
+							required:true,
+							message:'请输入收件人',
+							trigger:'blur'
+						},
+					],
+					phone:[
+						{
+							required:true,
+							message:'请输入联系电话',
+							trigger:'blur'
+						},
+						{
+							pattern:/^1[3456789]\d{9}$/,
+							message:'请输入正确的手机号码',
+							trigger:'blur'
+						},
+					],
+					addressDetail:[
+						{
+							required:true,
+							message:'请输入详细地址',
+							trigger:'blur'
+						},
+					],
+					confirmInfo:[
+						{
+							required:true,
+							message:'请输入确认消息',
+							trigger:'blur'
+						},
+					],
+					examId:[
+						{
+							required:true,
+							message:'请输入ExamID',
+							trigger:'blur'
+						},
+					],
+				},
+			}
+		},
+		computed: {},
+        watch: {},
+        created() {
+		},
+		mounted() {
+        },
+		methods: {
+			goBack() {
+                this.$emit('refresh')
+            },
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+                this.visible = true;
+                this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						request({
+							url: '/api/Siberian/TbMailSend/' + this.dataForm.id,
+							method: 'get'
+						}).then(res =>{
+							this.dataForm = res.data;
+						})
+					}
+				})
+			},
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+                    if (valid) {
+                        if (!this.dataForm.id) {
+                            request({
+                                url: `/api/Siberian/TbMailSend`,
+                                method: 'post',
+                                data: this.dataForm,
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false,
+                                            this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        } else {
+                            request({
+                                url: '/api/Siberian/TbMailSend/' + this.dataForm.id,
+                                method: 'PUT',
+                                data: this.dataForm
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false
+                                        this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        }
+                    }
+                })
+			},
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbMailSend/index.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbMailSend/index.vue
new file mode 100644
index 0000000..0385cd4
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbMailSend/index.vue
@@ -0,0 +1,204 @@
+<template>
+	<div class="NCC-common-layout">
+		<div class="NCC-common-layout-center">
+			<el-row class="NCC-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="用户">
+							<userSelect v-model="query.userId" placeholder="请选择用户" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="收件人">
+							<el-input v-model="query.consigneeUser" placeholder="收件人" clearable />	
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="联系电话">
+							<el-input v-model="query.phone" placeholder="联系电话" clearable />	
+						</el-form-item>
+					</el-col>
+					<template v-if="showAll">
+					<el-col :span="6">
+						<el-form-item label="详细地址">
+							<el-input v-model="query.addressDetail" placeholder="详细地址" />	
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="ExamID">
+							<el-input v-model="query.examId" placeholder="ExamID" clearable />	
+						</el-form-item>
+					</el-col>
+					</template>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+							<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">展开</el-button>
+							<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>收起</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="NCC-common-layout-main NCC-flex-main">
+				<div class="NCC-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
+					</div>
+					<div class="NCC-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false" @click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+                <NCC-table v-loading="listLoading" :data="list">
+					<el-table-column prop="RealName" label="用户" align="left" >
+						<template slot-scope="scope">
+							{{scope.row.user&&scope.row.user.RealName}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="consigneeUser" label="收件人" align="left" />
+					<el-table-column prop="phone" label="联系电话" align="left" />
+					<el-table-column prop="addressDetail" label="详细地址" align="left" />
+					<el-table-column prop="confirmInfo" label="确认消息" align="left" />
+					<el-table-column prop="examId" label="ExamID" align="left" />
+					<el-table-column prop="creatorTime" label="创建时间" align="left" :formatter="ncc.tableDateFormat" />
+					<el-table-column prop="lastModifyTime" label="修改时间" align="left" :formatter="ncc.tableDateFormat" />
+					<el-table-column label="操作" fixed="right" width="100">
+							<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
+							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
+						</template>
+					</el-table-column>
+				</NCC-table>
+                <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
+            </div>
+        </div>
+		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+	</div>
+</template>
+<script>
+    import request from '@/utils/request'
+    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+    import NCCForm from './Form'
+    import ExportBox from './ExportBox'
+    import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+        components: { NCCForm, ExportBox },
+        data() {
+            return {
+                showAll: false,
+				query: {
+                    userId:undefined,
+                    consigneeUser:undefined,
+                    phone:undefined,
+                    addressDetail:undefined,
+                    examId:undefined,
+				},
+                list: [],
+                listLoading: true,
+                multipleSelection: [], total: 0,
+                listQuery: {
+                    currentPage: 1,
+                    pageSize: 20,
+					sort: "desc",
+                    sidx: "",
+                },
+                formVisible: false,
+                exportBoxVisible: false,
+                columnList: [
+                    { prop: 'userId', label: '用户' },
+                    { prop: 'consigneeUser', label: '收件人' },
+                    { prop: 'phone', label: '联系电话' },
+                    { prop: 'addressDetail', label: '详细地址' },
+                    { prop: 'confirmInfo', label: '确认消息' },
+                    { prop: 'examId', label: 'ExamID' },
+                    { prop: 'creatorTime', label: '创建时间' },
+                    { prop: 'lastModifyTime', label: '修改时间' },
+				],
+			}
+        },
+		computed: {},
+		created() {
+			this.initData()
+		},
+		methods: {
+			initData() {
+                this.listLoading = true;
+                let _query = {
+                    ...this.listQuery,
+                    ...this.query
+                };
+                let query = {}
+                for (let key in _query) {
+                    if (Array.isArray(_query[key])) {
+                        query[key] = _query[key].join()
+                    } else {
+                        query[key] = _query[key]
+                    }
+                }
+                request({
+                    url: `/api/Siberian/TbMailSend`,
+                    method: 'GET',
+                    data: query
+                }).then(res => {
+                    this.list = res.data.list
+                    this.total = res.data.pagination.total
+                    this.listLoading = false
+                })
+            },
+			handleDel(id) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    request({
+                        url: `/api/Siberian/TbMailSend/${id}`,
+                        method: 'DELETE'
+                    }).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            onClose: () => {
+                                this.initData()
+                            }
+                        });
+                    })
+                }).catch(() => {
+                });
+            },
+			addOrUpdateHandle(id, isDetail) {
+                this.formVisible = true
+                this.$nextTick(() => {
+                    this.$refs.NCCForm.init(id, isDetail)
+                })
+            },
+			search() {
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            },
+            refresh(isrRefresh) {
+                this.formVisible = false
+                if (isrRefresh) this.reset()
+            },
+            reset() {
+                for (let key in this.query) {
+                    this.query[key] = undefined
+                }
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            }
+		}
+    }
+</script>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbMkAwaitOrder/ExportBox.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbMkAwaitOrder/ExportBox.vue
new file mode 100644
index 0000000..4fc5c07
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbMkAwaitOrder/ExportBox.vue
@@ -0,0 +1,66 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbMkAwaitOrder/Form.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbMkAwaitOrder/Form.vue
new file mode 100644
index 0000000..2077b82
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbMkAwaitOrder/Form.vue
@@ -0,0 +1,257 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false"
+		:visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+		<el-row :gutter="15" class="">
+			<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right"
+				:disabled="!!isDetail" :rules="rules">
+				<el-col :span="24">
+					<el-form-item label="用户" prop="userId">
+						<user-select v-model="dataForm.userId" placeholder="请选择" clearable required>
+						</user-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="邮箱" prop="email">
+						<el-input v-model="dataForm.email" placeholder="请输入" clearable required
+							:style='{"width":"100%"}'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="手机号" prop="phone">
+						<el-input v-model="dataForm.phone" placeholder="请输入" clearable required
+							:style='{"width":"100%"}'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="卡种" prop="idNo">
+						<el-select v-model="dataForm.idNo" placeholder="请选择" clearable required
+							:style='{"width":"100%"}'>
+							<el-option v-for="(item, index) in skuIdsOptions" :key="index" :label="item.Title"
+								:value="item.IdNo"></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="补发状态" prop="status">
+						<el-select v-model="dataForm.status" placeholder="请选择" clearable required
+							:style='{"width":"100%"}'>
+							<el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName"
+								:value="item.id"></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="活动兑换记录" prop="activityLogId">
+						<el-select v-model="dataForm.activityLogId" placeholder="请选择" clearable required
+							:style='{"width":"100%"}'>
+							<el-option v-for="(item, index) in activityLogIdOptions" :key="index" :label="item.F_Email"
+								:value="item.F_Id"></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" v-if="false">
+					<el-form-item label="创建时间" prop="creatorTime">
+						<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" v-if="false">
+					<el-form-item label="修改时间" prop="lastModifyTime">
+						<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly>
+						</el-input>
+					</el-form-item>
+				</el-col>
+			</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+	import request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import {
+		previewDataInterface
+	} from '@/api/systemData/dataInterface'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				loading: false,
+				visible: false,
+				isDetail: false,
+				dataForm: {
+					id: '',
+					userId: undefined,
+					idNo: undefined,
+					activityLogId: undefined,
+					status: undefined,
+					email: undefined,
+					phone: undefined,
+					creatorTime: undefined,
+					lastModifyTime: undefined,
+				},
+				rules: {
+					userId: [{
+						required: true,
+						message: '请输入用户',
+						trigger: 'change'
+					}, ],
+					idNo: [{
+						required: true,
+						message: '请输入卡种',
+						trigger: 'change'
+					}, ],
+					status: [{
+						required: true,
+						message: '请输入补发状态',
+						trigger: 'change'
+					}, ],
+					activityLogId: [{
+						required: true,
+						message: '请输入活动兑换记录',
+						trigger: 'change'
+					}, ],
+					email: [{
+							required: true,
+							message: '请输入邮箱',
+							trigger: 'blur'
+						},
+						{
+							pattern: /^[a-z0-9]+([._\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/,
+							message: '请输入正确的邮箱',
+							trigger: 'blur'
+						},
+					],
+					phone: [{
+							required: true,
+							message: '请输入手机号',
+							trigger: 'blur'
+						},
+						{
+							pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
+							message: '请输入正确的联系方式',
+							trigger: 'blur'
+						},
+					],
+				},
+				idNoOptions: [{
+					"fullName": "选项一",
+					"id": "1"
+				}, {
+					"fullName": "选项二",
+					"id": "2"
+				}],
+				activityLogIdOptions: [],
+				skuIdsOptions: [],
+				statusOptions: [{
+					"fullName": "自动发出",
+					"id": "1"
+				}, {
+					"fullName": "手动发出",
+					"id": "2"
+				}, {
+					"fullName": "待发卡",
+					"id": "3"
+				}],
+			}
+		},
+		computed: {},
+		watch: {},
+		created() {
+			this.getactivityLogIdOptions()
+		},
+		mounted() {},
+		methods: {
+			// 查询卡种列表
+			getskuIdsOptions() {
+				let jsons = {
+					"pageIndex": 1,
+					"pageSize": 200,
+					"filterName": "",
+					"classId": 0
+				}
+				request({
+					url: '/api/RequestAQS/requestaqs/GetCardList',
+					method: 'post',
+					data: jsons
+				}).then(res => {
+					let data = res.data.Data.List.filter(o => o.Title.includes('-'))
+					this.skuIdsOptions = data
+					console.log('赋值', this.skuIdsOptions)
+				})
+			},
+			getactivityLogIdOptions() {
+				previewDataInterface('382335229269902597').then(res => {
+					this.activityLogIdOptions = res.data
+				});
+			},
+			goBack() {
+				this.$emit('refresh')
+			},
+			init(id, isDetail) {
+				this.getskuIdsOptions()
+				this.dataForm.id = id || 0;
+				this.visible = true;
+				this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						request({
+							url: '/api/Siberian/TbMkAwaitOrder/' + this.dataForm.id,
+							method: 'get'
+						}).then(res => {
+							this.dataForm = res.data;
+						})
+					}
+				})
+			},
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+					if (valid) {
+						if (!this.dataForm.id) {
+							request({
+								url: `/api/Siberian/TbMkAwaitOrder`,
+								method: 'post',
+								data: this.dataForm,
+							}).then((res) => {
+								this.$message({
+									message: res.msg,
+									type: 'success',
+									duration: 1000,
+									onClose: () => {
+										this.visible = false,
+											this.$emit('refresh', true)
+									}
+								})
+							})
+						} else {
+							request({
+								url: '/api/Siberian/TbMkAwaitOrder/' + this.dataForm.id,
+								method: 'PUT',
+								data: this.dataForm
+							}).then((res) => {
+								this.$message({
+									message: res.msg,
+									type: 'success',
+									duration: 1000,
+									onClose: () => {
+										this.visible = false
+										this.$emit('refresh', true)
+									}
+								})
+							})
+						}
+					}
+				})
+			},
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbMkAwaitOrder/index.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbMkAwaitOrder/index.vue
new file mode 100644
index 0000000..0d0c561
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbMkAwaitOrder/index.vue
@@ -0,0 +1,361 @@
+<template>
+	<div class="NCC-common-layout">
+		<div class="NCC-common-layout-center">
+			<el-row class="NCC-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="用户">
+							<userSelect v-model="query.userId" placeholder="请选择用户" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="卡种">
+							<el-select v-model="query.idNo" placeholder="卡种" clearable>
+								<el-option v-for="(item, index) in skuIdsOptions" :key="index" :label="item.Title"
+									:value="item.IdNo"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="活动兑换记录">
+							<el-select v-model="query.activityLogId" placeholder="活动兑换记录" clearable>
+								<el-option v-for="(item, index) in activityLogIdOptions" :key="index"
+									:label="item.F_Email" :value="item.F_Id" />
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<template v-if="showAll">
+						<el-col :span="6">
+							<el-form-item label="补发状态">
+								<el-select v-model="query.status" placeholder="补发状态" clearable>
+									<el-option v-for="(item, index) in statusOptions" :key="index"
+										:label="item.fullName" :value="item.id" />
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="邮箱">
+								<el-input v-model="query.email" placeholder="邮箱" clearable />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="手机号">
+								<el-input v-model="query.phone" placeholder="手机号" clearable />
+							</el-form-item>
+						</el-col>
+					</template>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+							<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">展开
+							</el-button>
+							<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>收起</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="NCC-common-layout-main NCC-flex-main">
+				<div class="NCC-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
+						<el-button type="text" icon="el-icon-download" @click="exportData()">导出</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除</el-button>
+					</div>
+					<div class="NCC-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false"
+								@click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+				<NCC-table v-loading="listLoading" :data="list" has-c @selection-change="handleSelectionChange">
+					<el-table-column prop="userId" label="用户" align="left" >
+						<template slot-scope="scope">
+							{{scope.row.user&&scope.row.user.RealName}}
+						</template>
+					</el-table-column>
+					<el-table-column label="卡种" prop="idNo" align="left">
+						<template slot-scope="scope">{{ scope.row.idNo | dynamicText(idNoOptions) }}</template>
+					</el-table-column>
+					<el-table-column label="活动兑换记录" prop="activityLogId" align="left">
+						<template
+							slot-scope="scope">{{ scope.row.activityLog&&scope.row.activityLog.Id}}</template>
+					</el-table-column>
+					<el-table-column label="补发状态" prop="status" align="left">
+						<template slot-scope="scope">{{ scope.row.status | dynamicText(statusOptions) }}</template>
+					</el-table-column>
+					<el-table-column prop="email" label="邮箱" align="left" />
+					<el-table-column prop="phone" label="手机号" align="left" />
+					<el-table-column prop="creatorTime" label="创建时间" align="left" :formatter="ncc.tableDateFormat" />
+					<el-table-column prop="lastModifyTime" label="修改时间" align="left" :formatter="ncc.tableDateFormat" />
+					<el-table-column label="操作" fixed="right" width="100">
+						<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑</el-button>
+							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn">删除
+							</el-button>
+						</template>
+					</el-table-column>
+				</NCC-table>
+				<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+					@pagination="initData" />
+			</div>
+		</div>
+		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+	</div>
+</template>
+<script>
+	import request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import NCCForm from './Form'
+	import ExportBox from './ExportBox'
+	import {
+		previewDataInterface
+	} from '@/api/systemData/dataInterface'
+	export default {
+		components: {
+			NCCForm,
+			ExportBox
+		},
+		data() {
+			return {
+				showAll: false,
+				query: {
+					userId: undefined,
+					idNo: undefined,
+					status: undefined,
+					email: undefined,
+					phone: undefined,
+					activityLogId: undefined,
+
+				},
+				list: [],
+				listLoading: true,
+				multipleSelection: [],
+				total: 0,
+				listQuery: {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				},
+				formVisible: false,
+				exportBoxVisible: false,
+				columnList: [{
+						prop: 'userId',
+						label: '用户'
+					},
+					{
+						prop: 'idNo',
+						label: '卡种'
+					},
+					{
+						prop: 'activityLogId',
+						label: '活动兑换记录'
+					},
+
+					{
+						prop: 'creatorTime',
+						label: '创建时间'
+					},
+					{
+						prop: 'lastModifyTime',
+						label: '修改时间'
+					},
+					{
+						prop: 'email',
+						label: '邮箱'
+					},
+					{
+						prop: 'phone',
+						label: '手机号'
+					},
+				],
+				idNoOptions: [{
+					"fullName": "选项一",
+					"id": "1"
+				}, {
+					"fullName": "选项二",
+					"id": "2"
+				}],
+				activityLogIdOptions: [],
+				skuIdsOptions: [],
+				statusOptions: [{
+					"fullName": "自动发出",
+					"id": "1"
+				}, {
+					"fullName": "手动发出",
+					"id": "2"
+				}, {
+					"fullName": "待发卡",
+					"id": "3"
+				}],
+
+			}
+		},
+		computed: {},
+		created() {
+			this.initData()
+			// this.getactivityIdOptions()
+			this.getskuIdsOptions()
+		},
+		methods: {
+			// 查询卡种列表
+			getskuIdsOptions() {
+				let jsons = {
+					"pageIndex": 1,
+					"pageSize": 200,
+					"filterName": "",
+					"classId": 0
+				}
+				request({
+					url: '/api/RequestAQS/requestaqs/GetCardList',
+					method: 'post',
+					data: jsons
+				}).then(res => {
+					let data = res.data.Data.List.filter(o => o.Title.includes('-'))
+					this.skuIdsOptions = data
+					console.log('赋值', this.skuIdsOptions)
+				})
+			},
+			getactivityLogIdOptions() {
+				previewDataInterface('382335229269902597').then(res => {
+					this.activityLogIdOptions = res.data
+				});
+			},
+			initData() {
+				this.listLoading = true;
+				let _query = {
+					...this.listQuery,
+					...this.query
+				};
+				let query = {}
+				for (let key in _query) {
+					if (Array.isArray(_query[key])) {
+						query[key] = _query[key].join()
+					} else {
+						query[key] = _query[key]
+					}
+				}
+				request({
+					url: `/api/Siberian/TbMkAwaitOrder`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					this.list = res.data.list
+					this.total = res.data.pagination.total
+					this.listLoading = false
+				})
+			},
+			handleDel(id) {
+				this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/Siberian/TbMkAwaitOrder/${id}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {});
+			},
+			handleSelectionChange(val) {
+				const res = val.map(item => item.id)
+				this.multipleSelection = res
+			},
+			handleBatchRemoveDel() {
+				if (!this.multipleSelection.length) {
+					this.$message({
+						type: 'error',
+						message: '请选择一条数据',
+						duration: 1500,
+					})
+					return
+				}
+				const ids = this.multipleSelection
+				this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/Siberian/TbMkAwaitOrder/batchRemove`,
+						method: 'POST',
+						data: ids,
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {})
+			},
+			addOrUpdateHandle(id, isDetail) {
+				this.formVisible = true
+				this.$nextTick(() => {
+					this.$refs.NCCForm.init(id, isDetail)
+				})
+			},
+			exportData() {
+				this.exportBoxVisible = true
+				this.$nextTick(() => {
+					this.$refs.ExportBox.init(this.columnList)
+				})
+			},
+			download(data) {
+				let query = {
+					...data,
+					...this.listQuery,
+					...this.query
+				}
+				request({
+					url: `/api/Siberian/TbMkAwaitOrder/Actions/Export`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					if (!res.data.url) return
+					window.location.href = this.define.comUrl + res.data.url
+					this.$refs.ExportBox.visible = false
+					this.exportBoxVisible = false
+				})
+			},
+			search() {
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			},
+			refresh(isrRefresh) {
+				this.formVisible = false
+				if (isrRefresh) this.reset()
+			},
+			reset() {
+				for (let key in this.query) {
+					this.query[key] = undefined
+				}
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			}
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbNewReport/ExportBox.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbNewReport/ExportBox.vue
new file mode 100644
index 0000000..4fc5c07
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbNewReport/ExportBox.vue
@@ -0,0 +1,66 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbNewReport/Form.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbNewReport/Form.vue
new file mode 100644
index 0000000..85c4d13
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbNewReport/Form.vue
@@ -0,0 +1,165 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+		<el-row :gutter="15" class="" >
+				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
+					<el-col :span="24">
+						<el-form-item label="用户" prop="userId">
+							<user-select v-model="dataForm.userId" placeholder="请选择" clearable required >
+							</user-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="用户编码" prop="coding">
+							<el-input v-model="dataForm.coding" placeholder="请输入" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="订单图片" prop="orderImg">
+							<NCC-UploadImg v-model="dataForm.orderImg" :fileSize="5" sizeUnit="MB" :limit="1" >
+							</NCC-UploadImg>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="客户微信图片" prop="clientImg">
+							<NCC-UploadImg v-model="dataForm.clientImg" :fileSize="5" sizeUnit="MB" :limit="1" >
+							</NCC-UploadImg>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="其他图片" prop="otherImg">
+							<NCC-UploadImg v-model="dataForm.otherImg" :fileSize="5" sizeUnit="MB" :limit="1" >
+							</NCC-UploadImg>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="创建时间" prop="creatorTime">
+							<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="修改时间" prop="lastModifyTime">
+							<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+	import request from '@/utils/request'
+	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				loading: false,
+				visible: false,
+				isDetail: false,
+				dataForm: {
+					id:'',
+					userId:undefined,
+					coding:undefined,
+					orderImg:[],
+					clientImg:[],
+					otherImg:[],
+					creatorTime:undefined,
+					lastModifyTime:undefined,
+				},
+				rules: {
+					userId:[
+						{
+							required:true,
+							message:'请输入用户',
+							trigger:'change'
+						},
+					],
+					coding:[
+						{
+							required:true,
+							message:'请输入用户编码',
+							trigger:'blur'
+						},
+					],
+				},
+			}
+		},
+		computed: {},
+        watch: {},
+        created() {
+		},
+		mounted() {
+        },
+		methods: {
+			goBack() {
+                this.$emit('refresh')
+            },
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+                this.visible = true;
+                this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						request({
+							url: '/api/Siberian/TbNewReport/' + this.dataForm.id,
+							method: 'get'
+						}).then(res =>{
+							this.dataForm = res.data;
+							if(!this.dataForm.orderImg)this.dataForm.orderImg=[];
+							if(!this.dataForm.clientImg)this.dataForm.clientImg=[];
+							if(!this.dataForm.otherImg)this.dataForm.otherImg=[];
+						})
+					}
+				})
+			},
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+                    if (valid) {
+                        if (!this.dataForm.id) {
+                            request({
+                                url: `/api/Siberian/TbNewReport`,
+                                method: 'post',
+                                data: this.dataForm,
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false,
+                                            this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        } else {
+                            request({
+                                url: '/api/Siberian/TbNewReport/' + this.dataForm.id,
+                                method: 'PUT',
+                                data: this.dataForm
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false
+                                        this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        }
+                    }
+                })
+			},
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbNewReport/index.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbNewReport/index.vue
new file mode 100644
index 0000000..00ba37f
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbNewReport/index.vue
@@ -0,0 +1,284 @@
+<template>
+	<div class="NCC-common-layout">
+		<div class="NCC-common-layout-center">
+			<el-row class="NCC-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="用户编码">
+							<el-input v-model="query.coding" placeholder="用户编码" clearable />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="用户">
+							<userSelect v-model="query.userId" placeholder="请选择用户" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="NCC-common-layout-main NCC-flex-main">
+				<div class="NCC-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
+						<el-button type="text" icon="el-icon-download" @click="exportData()">导出</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除</el-button>
+					</div>
+					<div class="NCC-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false"
+								@click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+				<NCC-table v-loading="listLoading" :data="list" has-c @selection-change="handleSelectionChange">
+					<el-table-column prop="coding" label="用户编码" align="left" />
+					<el-table-column prop="RealName" label="用户" align="left">
+						<template slot-scope="scope">
+							{{scope.row.user&&scope.row.user.RealName}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="status" label="状态" align="left">
+						<template slot-scope="scope">
+							<el-tag :type="scope.row.status=='1'?'warning':'success'">
+								{{scope.row.status=='1'?'未审核':'已审核'}}
+							</el-tag>
+						</template>
+					</el-table-column>
+					<!-- <el-table-column prop="status" label="状态" align="left">
+						<template slot-scope="scope">
+							{{scope.row.status=='2'}}
+							第二个{{scope.row.status=='1'}}
+						</template>
+					</el-table-column> -->
+					<el-table-column prop="creatorTime" label="创建时间" align="left" :formatter="ncc.tableDateFormat" />
+					<el-table-column prop="lastModifyTime" label="修改时间" align="left" :formatter="ncc.tableDateFormat" />
+
+					<el-table-column label="操作" fixed="right" width="150">
+						<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑</el-button>
+							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn">删除
+							</el-button>
+							<el-button type="text" @click="Confirm(scope.row.id)" v-if="scope.row.status='1'">确认审核</el-button>
+						</template>
+					</el-table-column>
+				</NCC-table>
+				<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+					@pagination="initData" />
+			</div>
+		</div>
+		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+	</div>
+</template>
+<script>
+	import request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import NCCForm from './Form'
+	import ExportBox from './ExportBox'
+	import {
+		previewDataInterface
+	} from '@/api/systemData/dataInterface'
+	export default {
+		components: {
+			NCCForm,
+			ExportBox
+		},
+		data() {
+			return {
+				query: {
+					coding: undefined,
+					userId: undefined,
+				},
+				list: [],
+				listLoading: true,
+				multipleSelection: [],
+				total: 0,
+				listQuery: {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				},
+				formVisible: false,
+				exportBoxVisible: false,
+				columnList: [{
+						prop: 'coding',
+						label: '用户编码'
+					},
+					{
+						prop: 'creatorTime',
+						label: '创建时间'
+					},
+					{
+						prop: 'lastModifyTime',
+						label: '修改时间'
+					},
+					{
+						prop: 'userId',
+						label: '用户'
+					},
+				],
+			}
+		},
+		computed: {},
+		created() {
+			this.initData()
+		},
+		methods: {
+			initData() {
+				this.listLoading = true;
+				let _query = {
+					...this.listQuery,
+					...this.query
+				};
+				let query = {}
+				for (let key in _query) {
+					if (Array.isArray(_query[key])) {
+						query[key] = _query[key].join()
+					} else {
+						query[key] = _query[key]
+					}
+				}
+				request({
+					url: `/api/Siberian/TbNewReport`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					this.list = res.data.list
+					this.total = res.data.pagination.total
+					this.listLoading = false
+				})
+			},
+			Confirm(id){
+				this.$confirm('此操作将永久确认审核该数据, 是否继续?', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/Siberian/tbnewreport/ConfirmReportStatus?id=`+id,
+						method: 'POST'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {});
+			},
+			handleDel(id) {
+				this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/Siberian/TbNewReport/${id}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {});
+			},
+			handleSelectionChange(val) {
+				const res = val.map(item => item.id)
+				this.multipleSelection = res
+			},
+			handleBatchRemoveDel() {
+				if (!this.multipleSelection.length) {
+					this.$message({
+						type: 'error',
+						message: '请选择一条数据',
+						duration: 1500,
+					})
+					return
+				}
+				const ids = this.multipleSelection
+				this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/Siberian/TbNewReport/batchRemove`,
+						method: 'POST',
+						data: ids,
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {})
+			},
+			addOrUpdateHandle(id, isDetail) {
+				this.formVisible = true
+				this.$nextTick(() => {
+					this.$refs.NCCForm.init(id, isDetail)
+				})
+			},
+			exportData() {
+				this.exportBoxVisible = true
+				this.$nextTick(() => {
+					this.$refs.ExportBox.init(this.columnList)
+				})
+			},
+			download(data) {
+				let query = {
+					...data,
+					...this.listQuery,
+					...this.query
+				}
+				request({
+					url: `/api/Siberian/TbNewReport/Actions/Export`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					if (!res.data.url) return
+					window.location.href = this.define.comUrl + res.data.url
+					this.$refs.ExportBox.visible = false
+					this.exportBoxVisible = false
+				})
+			},
+			search() {
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			},
+			refresh(isrRefresh) {
+				this.formVisible = false
+				if (isrRefresh) this.reset()
+			},
+			reset() {
+				for (let key in this.query) {
+					this.query[key] = undefined
+				}
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			}
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbOrderInfo/ExportBox.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbOrderInfo/ExportBox.vue
new file mode 100644
index 0000000..4fc5c07
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbOrderInfo/ExportBox.vue
@@ -0,0 +1,66 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbOrderInfo/Form.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbOrderInfo/Form.vue
new file mode 100644
index 0000000..09222b1
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbOrderInfo/Form.vue
@@ -0,0 +1,354 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+		<el-row :gutter="15" class="" >
+				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
+					<el-col :span="24">
+						<el-form-item label="用户" prop="userId">
+							<user-select v-model="dataForm.userId" placeholder="请选择" clearable required >
+							</user-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="渠道用户" prop="invitedUserId">
+							<user-select v-model="dataForm.invitedUserId" placeholder="请选择" clearable >
+							</user-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="发卡链接" prop="cpdUrl">
+							<el-input v-model="dataForm.cpdUrl" placeholder="请输入" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="兑换码ID" prop="codes">
+							<el-input v-model="dataForm.codes" placeholder="请输入" clearable :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<!-- <el-col :span="24">
+						<el-form-item label="商品信息包含规格Json数据" prop="jsonDetail">
+							<el-input v-model="dataForm.jsonDetail" placeholder="请输入" clearable :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col> -->
+					<el-col :span="24">
+						<el-form-item label="总金额" prop="moneys">
+							<el-input v-model="dataForm.moneys" placeholder="请输入总金额" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+				<!-- 	<el-col :span="24">
+						<el-form-item label="下单用户名称" prop="orderName">
+							<el-input v-model="dataForm.orderName" placeholder="请输入下单用户名称" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="下单用户电话号码" prop="orderPhone">
+							<el-input v-model="dataForm.orderPhone" placeholder="请输入电话号码" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col> -->
+					<el-col :span="24">
+						<el-form-item label="订单号" prop="orderNumber">
+							<el-input v-model="dataForm.orderNumber" placeholder="请输入订单号" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="订单类型" prop="type">
+							<el-select v-model="dataForm.type" placeholder="请选择" clearable required :style='{"width":"100%"}' >
+								<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="考试类型" prop="classType">
+							<el-select v-model="dataForm.classType" placeholder="请选择" clearable required :style='{"width":"100%"}' >
+								<el-option v-for="(item, index) in classTypeOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="姓氏" prop="surname">
+							<el-input v-model="dataForm.surname" placeholder="请输入" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="名称" prop="name">
+							<el-input v-model="dataForm.name" placeholder="请输入" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="电话号码" prop="phone">
+							<el-input v-model="dataForm.phone" placeholder="请输入电话号码" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="邮箱" prop="email">
+							<el-input v-model="dataForm.email" placeholder="请输入邮箱" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+				<!-- 	<el-col :span="24">
+						<el-form-item label="地址" prop="address">
+							<el-input v-model="dataForm.address" placeholder="请输入" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="身份证号码" prop="idCard">
+							<el-input v-model="dataForm.idCard" placeholder="请输入" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item -->>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="创建时间" prop="creatorTime">
+							<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="修改时间" prop="lastModifyTime">
+							<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+	import request from '@/utils/request'
+	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				loading: false,
+				visible: false,
+				isDetail: false,
+				dataForm: {
+					id:'',
+					userId:undefined,
+					invitedUserId:undefined,
+					cpdUrl:undefined,
+					codes:undefined,
+					jsonDetail:undefined,
+					moneys:undefined,
+					orderName:undefined,
+					orderPhone:undefined,
+					orderNumber:undefined,
+					type:undefined,
+					classType:undefined,
+					surname:undefined,
+					name:undefined,
+					phone:undefined,
+					email:undefined,
+					address:undefined,
+					idCard:undefined,
+					creatorTime:undefined,
+					lastModifyTime:undefined,
+				},
+				rules: {
+					userId:[
+						{
+							required:true,
+							message:'请输入用户',
+							trigger:'change'
+						},
+					],
+					cpdUrl:[
+						{
+							required:true,
+							message:'请输入发卡链接',
+							trigger:'blur'
+						},
+					],
+					// moneys:[
+					// 	{
+					// 		required:true,
+					// 		message:'请输入总金额',
+					// 		trigger:'blur'
+					// 	},
+					// 	{
+					// 		pattern:/^[1-9]\d*\.\d*|0\.\d*[1-9]\d*|0?\.0+|0$/,
+					// 		message:'请输入正确的金额',
+					// 		trigger:'blur'
+					// 	},
+					// ],
+					// orderName:[
+					// 	{
+					// 		required:true,
+					// 		message:'请输入下单用户名称',
+					// 		trigger:'blur'
+					// 	},
+					// ],
+					// orderPhone:[
+					// 	{
+					// 		required:true,
+					// 		message:'请输入下单用户电话号码',
+					// 		trigger:'blur'
+					// 	},
+					// ],
+					// orderNumber:[
+					// 	{
+					// 		required:true,
+					// 		message:'请输入订单号',
+					// 		trigger:'blur'
+					// 	},
+					// ],
+					// type:[
+					// 	{
+					// 		required:true,
+					// 		message:'请输入订单类型',
+					// 		trigger:'change'
+					// 	},
+					// ],
+					// classType:[
+					// 	{
+					// 		required:true,
+					// 		message:'请输入考试类型',
+					// 		trigger:'change'
+					// 	},
+					// ],
+					// surname:[
+					// 	{
+					// 		required:true,
+					// 		message:'请输入姓氏',
+					// 		trigger:'blur'
+					// 	},
+					// ],
+					// name:[
+					// 	{
+					// 		required:true,
+					// 		message:'请输入名称',
+					// 		trigger:'blur'
+					// 	},
+					// ],
+					// phone:[
+					// 	{
+					// 		required:true,
+					// 		message:'请输入电话号码',
+					// 		trigger:'blur'
+					// 	},
+					// 	{
+					// 		pattern:/^0\d{2,3}-?\d{7,8}$/,
+					// 		message:'请输入正确的电话号码',
+					// 		trigger:'blur'
+					// 	},
+					// ],
+					// email:[
+					// 	{
+					// 		required:true,
+					// 		message:'请输入邮箱',
+					// 		trigger:'blur'
+					// 	},
+					// 	{
+					// 		pattern:/^[a-z0-9]+([._\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/,
+					// 		message:'请输入正确的邮箱',
+					// 		trigger:'blur'
+					// 	},
+					// ],
+					// address:[
+					// 	{
+					// 		required:true,
+					// 		message:'请输入地址',
+					// 		trigger:'blur'
+					// 	},
+					// ],
+					// idCard:[
+					// 	{
+					// 		required:true,
+					// 		message:'请输入身份证号码',
+					// 		trigger:'blur'
+					// 	},
+					// 	{
+					// 		pattern:/^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+					// 		message:'请输入正确的身份证号码',
+					// 		trigger:'blur'
+					// 	},
+					// ],
+				},
+				typeOptions:[{"fullName":"待付款","id":"1"},{"fullName":"待发货","id":"2"},{"fullName":"待收货","id":"3"},{"fullName":"已完成","id":"4"},{"fullName":"已取消","id":"5"},{"fullName":"售后中","id":"6"}],
+				classTypeOptions:[{"fullName":" 线上考试OLP","id":" 线上考试OLP"},{"fullName":"线下考试","id":"线下考试"}],
+			}
+		},
+		computed: {},
+        watch: {},
+        created() {
+		},
+		mounted() {
+        },
+		methods: {
+			goBack() {
+                this.$emit('refresh')
+            },
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+                this.visible = true;
+                this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						request({
+							url: '/api/Siberian/TbOrderInfo/' + this.dataForm.id,
+							method: 'get'
+						}).then(res =>{
+							this.dataForm = res.data;
+						})
+					}
+				})
+			},
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+                    if (valid) {
+                        if (!this.dataForm.id) {
+                            request({
+                                url: `/api/Siberian/TbOrderInfo`,
+                                method: 'post',
+                                data: this.dataForm,
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false,
+                                            this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        } else {
+                            request({
+                                url: '/api/Siberian/TbOrderInfo/' + this.dataForm.id,
+                                method: 'PUT',
+                                data: this.dataForm
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false
+                                        this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        }
+                    }
+                })
+			},
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbOrderInfo/index.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbOrderInfo/index.vue
new file mode 100644
index 0000000..cbf50d9
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbOrderInfo/index.vue
@@ -0,0 +1,475 @@
+<template>
+	<div class="NCC-common-layout">
+		<div class="NCC-common-layout-center">
+			<el-row class="NCC-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="用户">
+							<userSelect v-model="query.userId" placeholder="请选择用户" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="下单用户名称">
+							<el-input v-model="query.orderName" placeholder="下单用户名称" clearable />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="下单用户电话号码">
+							<el-input v-model="query.orderPhone" placeholder="下单用户电话号码" clearable />
+						</el-form-item>
+					</el-col>
+					<template v-if="showAll">
+						<el-col :span="6">
+							<el-form-item label="订单号">
+								<el-input v-model="query.orderNumber" placeholder="订单号" clearable />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="订单类型">
+								<el-select v-model="query.type" placeholder="订单类型" clearable>
+									<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName"
+										:value="item.id" />
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="考试类型">
+								<el-select v-model="query.classType" placeholder="考试类型" clearable>
+									<el-option v-for="(item, index) in classTypeOptions" :key="index"
+										:label="item.fullName" :value="item.id" />
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="渠道用户">
+								<userSelect v-model="query.invitedUserId" placeholder="请选择渠道用户" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="创建时间">
+								<el-date-picker v-model="query.creatorTime" start-placeholder="开始日期"
+									end-placeholder="结束日期" value-format="timestamp" format="yyyy-MM-dd"
+									type="daterange" />
+							</el-form-item>
+						</el-col>
+					</template>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+							<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">展开
+							</el-button>
+							<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>收起</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="NCC-common-layout-main NCC-flex-main">
+				<div class="NCC-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
+						<el-button type="text" icon="el-icon-download" @click="exportData()">导出</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除</el-button>
+					</div>
+					<div class="NCC-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false"
+								@click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+				<NCC-table v-loading="listLoading" :data="list" has-c @selection-change="handleSelectionChange">
+					<el-table-column prop="id" label="ID" align="left">
+						<template slot-scope="scope">
+							{{scope.row.id}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="RealName" label="上级用户" align="left">
+						<template slot-scope="scope">
+							{{scope.row.invitedUser&&scope.row.invitedUser.RealName}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="userId" label="用户" align="left">
+						<template slot-scope="scope">
+							{{scope.row.user&&scope.row.user.RealName}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="txt" label="用户编码" align="left">
+						<template slot-scope="scope">
+							{{scope.row.user&&scope.row.user.BankNumber}}
+						</template>
+					</el-table-column>
+					
+					<el-table-column prop="jsonDetail" label="商品信息" align="left" width="130">
+						<template slot-scope="scope">
+							<el-button type="success" @click="ShowGoodsInfo(scope.row.jsonDetail)">查看规格信息</el-button>
+						</template>
+					</el-table-column>
+					<el-table-column prop="moneys" label="总金额" align="left" />
+					<!-- <el-table-column prop="orderName" label="下单用户名称" align="left" /> -->
+					<!-- <el-table-column prop="orderPhone" label="下单用户电话号码" align="left" /> -->
+					<el-table-column prop="orderNumber" label="订单号" align="left" />
+					<el-table-column label="订单类型" prop="type" align="left">
+						<template slot-scope="scope">{{ scope.row.type | dynamicText(typeOptions) }}</template>
+					</el-table-column>
+					<el-table-column label="考试类型" prop="classType" align="left">
+						<template
+							slot-scope="scope">{{ scope.row.classType | dynamicText(classTypeOptions) }}</template>
+					</el-table-column>
+					<el-table-column prop="surname" label="姓氏" align="left" />
+					<el-table-column prop="name" label="名称" align="left" />
+					<el-table-column prop="phone" label="电话号码" align="left" />
+					<el-table-column prop="email" label="邮箱" align="left" />
+			<!-- 		<el-table-column prop="address" label="地址" align="left" />
+					<el-table-column prop="idCard" label="身份证号码" align="left" /> -->
+					<el-table-column prop="creatorTime" label="创建时间" align="left" :formatter="ncc.tableDateFormat" />
+					<!-- <el-table-column prop="lastModifyTime" label="修改时间" align="left" :formatter="ncc.tableDateFormat" /> -->
+					<el-table-column prop="codes" label="兑换码ID" align="left" />
+					<!-- <el-table-column prop="invitedUserId" label="渠道用户" align="left">
+						<template slot-scope="scope">
+							{{scope.row.invitedUser&&scope.row.invitedUser.RealName}}
+						</template>
+					</el-table-column> -->
+					<el-table-column prop="cpdUrl" label="发卡链接" align="left">
+						<template slot-scope="scope">
+							<div id="copy" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;width:60px;">{{scope.row.cpdUrl}}</div>
+							<img src="@/assets/images/copyCpdUrl.png" style="width:20px;height:20px;"
+								@click="CopyTxt(scope.row.cpdUrl)" />
+						</template>
+					</el-table-column>
+					<el-table-column label="操作" fixed="right" width="100">
+						<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑</el-button>
+							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn">删除
+							</el-button>
+						</template>
+					</el-table-column>
+				</NCC-table>
+				<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+					@pagination="initData" />
+			</div>
+		</div>
+		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+		<el-dialog title="规格" :visible.sync="dialogVisibleS">
+
+			<el-card class="box-card">
+				<div slot="header" class="clearfix">
+					<span>总价：{{dataInfo&&dataInfo.totalMoneys}}</span>
+				</div>
+				<div class="text item">
+					<div style="font-size: 15px;display:flex;align:center;"
+						v-for="(item,index) in dataInfo&&dataInfo.arrayJsons">
+						<div style="margin-top:5px;">商品:{{item.goods&&item.goods.Title}}</div>
+						<div style="margin-top:5px;">规格:{{item.jsonDetail&&item.jsonDetail.Title}}</div>
+						<div style="margin-top:5px;">购买数:{{item.count}}</div>
+					</div>
+				</div>
+			</el-card>
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="dialogVisibleS = false">取 消</el-button>
+				<el-button type="primary" @click="dialogVisibleS = false">确 定</el-button>
+			</span>
+		</el-dialog>
+	</div>
+</template>
+<script>
+	import request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import NCCForm from './Form'
+	import ExportBox from './ExportBox'
+	import {
+		previewDataInterface
+	} from '@/api/systemData/dataInterface'
+	export default {
+		components: {
+			NCCForm,
+			ExportBox
+		},
+		data() {
+			return {
+				showAll: false,
+				dialogVisibleS: false,
+				dataInfo: undefined,
+				query: {
+					userId: undefined,
+					orderName: undefined,
+					orderPhone: undefined,
+					orderNumber: undefined,
+					type: undefined,
+					classType: undefined,
+					invitedUserId: undefined,
+					creatorTime: undefined,
+				},
+				list: [],
+				listLoading: true,
+				multipleSelection: [],
+				total: 0,
+				listQuery: {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				},
+				formVisible: false,
+				exportBoxVisible: false,
+				columnList: [{
+						prop: 'userId',
+						label: '用户'
+					},
+					{
+						prop: 'jsonDetail',
+						label: '商品信息包含规格Json数据'
+					},
+					{
+						prop: 'moneys',
+						label: '总金额'
+					},
+					{
+						prop: 'orderName',
+						label: '下单用户名称'
+					},
+					{
+						prop: 'orderPhone',
+						label: '下单用户电话号码'
+					},
+					{
+						prop: 'orderNumber',
+						label: '订单号'
+					},
+					{
+						prop: 'type',
+						label: '订单类型'
+					},
+					{
+						prop: 'classType',
+						label: '考试类型'
+					},
+					{
+						prop: 'surname',
+						label: '姓氏'
+					},
+					{
+						prop: 'name',
+						label: '名称'
+					},
+					{
+						prop: 'phone',
+						label: '电话号码'
+					},
+					{
+						prop: 'email',
+						label: '邮箱'
+					},
+					{
+						prop: 'address',
+						label: '地址'
+					},
+					{
+						prop: 'idCard',
+						label: '身份证号码'
+					},
+					{
+						prop: 'creatorTime',
+						label: '创建时间'
+					},
+					{
+						prop: 'lastModifyTime',
+						label: '修改时间'
+					},
+					{
+						prop: 'codes',
+						label: '兑换码ID'
+					},
+					{
+						prop: 'invitedUserId',
+						label: '渠道用户'
+					},
+					{
+						prop: 'cpdUrl',
+						label: '发卡链接'
+					},
+				],
+				typeOptions: [{
+					"fullName": "待付款",
+					"id": "1"
+				}, {
+					"fullName": "待发货",
+					"id": "2"
+				}, {
+					"fullName": "待收货",
+					"id": "3"
+				}, {
+					"fullName": "已完成",
+					"id": "4"
+				}, {
+					"fullName": "已取消",
+					"id": "5"
+				}, {
+					"fullName": "售后中",
+					"id": "6"
+				}],
+				classTypeOptions: [{
+					"fullName": " 线上考试OLP",
+					"id": " 线上考试OLP"
+				}, {
+					"fullName": "线下考试",
+					"id": "线下考试"
+				}],
+			}
+		},
+		computed: {},
+		created() {
+			this.initData()
+		},
+		methods: {
+			CopyTxt(txt) {
+				let oInput = document.createElement('input');
+				oInput.value = txt;
+				document.body.appendChild(oInput);
+				oInput.select();
+				document.execCommand('Copy');
+				this.$message.success('复制成功');
+				oInput.remove();
+			},
+			// 显示商品信息
+			ShowGoodsInfo(item) {
+				console.log('这是信息', item)
+				this.dataInfo = JSON.parse(item)
+				console.log('赋值规格', this.dataInfo)
+				this.dialogVisibleS = true
+			},
+			initData() {
+				this.listLoading = true;
+				let _query = {
+					...this.listQuery,
+					...this.query
+				};
+				let query = {}
+				for (let key in _query) {
+					if (Array.isArray(_query[key])) {
+						query[key] = _query[key].join()
+					} else {
+						query[key] = _query[key]
+					}
+				}
+				request({
+					url: `/api/Siberian/TbOrderInfo`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					this.list = res.data.list
+					this.total = res.data.pagination.total
+					this.listLoading = false
+				})
+			},
+			handleDel(id) {
+				this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/Siberian/TbOrderInfo/${id}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {});
+			},
+			handleSelectionChange(val) {
+				const res = val.map(item => item.id)
+				this.multipleSelection = res
+			},
+			handleBatchRemoveDel() {
+				if (!this.multipleSelection.length) {
+					this.$message({
+						type: 'error',
+						message: '请选择一条数据',
+						duration: 1500,
+					})
+					return
+				}
+				const ids = this.multipleSelection
+				this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/Siberian/TbOrderInfo/batchRemove`,
+						method: 'POST',
+						data: ids,
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {})
+			},
+			addOrUpdateHandle(id, isDetail) {
+				this.formVisible = true
+				this.$nextTick(() => {
+					this.$refs.NCCForm.init(id, isDetail)
+				})
+			},
+			exportData() {
+				this.exportBoxVisible = true
+				this.$nextTick(() => {
+					this.$refs.ExportBox.init(this.columnList)
+				})
+			},
+			download(data) {
+				let query = {
+					...data,
+					...this.listQuery,
+					...this.query
+				}
+				request({
+					url: `/api/Siberian/TbOrderInfo/Actions/Export`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					if (!res.data.url) return
+					window.location.href = this.define.comUrl + res.data.url
+					this.$refs.ExportBox.visible = false
+					this.exportBoxVisible = false
+				})
+			},
+			search() {
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			},
+			refresh(isrRefresh) {
+				this.formVisible = false
+				if (isrRefresh) this.reset()
+			},
+			reset() {
+				for (let key in this.query) {
+					this.query[key] = undefined
+				}
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			}
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbOrderInvitedLog/ExportBox.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbOrderInvitedLog/ExportBox.vue
new file mode 100644
index 0000000..4fc5c07
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbOrderInvitedLog/ExportBox.vue
@@ -0,0 +1,66 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbOrderInvitedLog/Form.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbOrderInvitedLog/Form.vue
new file mode 100644
index 0000000..49eb3c8
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbOrderInvitedLog/Form.vue
@@ -0,0 +1,163 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+		<el-row :gutter="15" class="" >
+				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
+					<el-col :span="24">
+						<el-form-item label="订单信息" prop="orderId">
+							<el-select v-model="dataForm.orderId" placeholder="请选择" clearable :style='{"width":"100%"}' >
+								<el-option v-for="(item, index) in orderIdOptions" :key="index" :label="item.F_OrderNumber" :value="item.F_Id" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="之前的归属用户" prop="beforeInviteUserId">
+							<user-select v-model="dataForm.beforeInviteUserId" placeholder="请选择" clearable required >
+							</user-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="更改成的归属用户" prop="afterInviteUserId">
+							<user-select v-model="dataForm.afterInviteUserId" placeholder="请选择" clearable required >
+							</user-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="备注" prop="remark">
+							<el-input v-model="dataForm.remark" placeholder="请输入" clearable :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="创建时间" prop="creatorTime">
+							<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="修改时间" prop="lastModifyTime">
+							<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+	import request from '@/utils/request'
+	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				loading: false,
+				visible: false,
+				isDetail: false,
+				dataForm: {
+					id:'',
+					orderId:undefined,
+					beforeInviteUserId:undefined,
+					afterInviteUserId:undefined,
+					remark:undefined,
+					creatorTime:undefined,
+					lastModifyTime:undefined,
+				},
+				rules: {
+					beforeInviteUserId:[
+						{
+							required:true,
+							message:'请输入之前的归属用户',
+							trigger:'change'
+						},
+					],
+					afterInviteUserId:[
+						{
+							required:true,
+							message:'请输入更改成的归属用户',
+							trigger:'change'
+						},
+					],
+				},
+				orderIdOptions : [],
+			}
+		},
+		computed: {},
+        watch: {},
+        created() {
+			this.getorderIdOptions();
+		},
+		mounted() {
+        },
+		methods: {
+			getorderIdOptions(){
+				previewDataInterface('337944152299799813').then(res => {
+					this.orderIdOptions = res.data
+				});
+			},
+			goBack() {
+                this.$emit('refresh')
+            },
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+                this.visible = true;
+                this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						request({
+							url: '/api/Siberian/TbOrderInvitedLog/' + this.dataForm.id,
+							method: 'get'
+						}).then(res =>{
+							this.dataForm = res.data;
+						})
+					}
+				})
+			},
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+                    if (valid) {
+                        if (!this.dataForm.id) {
+                            request({
+                                url: `/api/Siberian/TbOrderInvitedLog`,
+                                method: 'post',
+                                data: this.dataForm,
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false,
+                                            this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        } else {
+                            request({
+                                url: '/api/Siberian/TbOrderInvitedLog/' + this.dataForm.id,
+                                method: 'PUT',
+                                data: this.dataForm
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false
+                                        this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        }
+                    }
+                })
+			},
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbOrderInvitedLog/index.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbOrderInvitedLog/index.vue
new file mode 100644
index 0000000..a144a1f
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbOrderInvitedLog/index.vue
@@ -0,0 +1,232 @@
+<template>
+	<div class="NCC-common-layout">
+		<div class="NCC-common-layout-center">
+			<el-row class="NCC-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="订单信息">
+							<el-select v-model="query.orderId" placeholder="订单信息" clearable >
+								<el-option v-for="(item, index) in orderIdOptions" :key="index" :label="item.F_OrderNumber" :value="item.F_Id"  />
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="之前的归属用户">
+							<userSelect v-model="query.beforeInviteUserId" placeholder="请选择之前的归属用户" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="更改成的归属用户">
+							<userSelect v-model="query.afterInviteUserId" placeholder="请选择更改成的归属用户" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="NCC-common-layout-main NCC-flex-main">
+				<div class="NCC-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除</el-button>
+					</div>
+					<div class="NCC-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false" @click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+                <NCC-table v-loading="listLoading" :data="list" has-c @selection-change="handleSelectionChange">
+					<el-table-column label="订单信息" prop="orderId" align="left">
+							<template slot-scope="scope">{{ scope.row.orderId}}</template>
+					</el-table-column>
+					<el-table-column prop="RealName" label="之前的归属用户" align="left" >
+						<template slot-scope="scope">
+							{{scope.row.beforeInvitedUser&&scope.row.beforeInvitedUser.RealName}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="RealName" label="更改成的归属用户" align="left" >
+						<template slot-scope="scope">
+							{{scope.row.afterInvitedUser&&scope.row.afterInvitedUser.RealName}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="remark" label="备注" align="left" />
+					<el-table-column prop="creatorTime" label="创建时间" align="left" :formatter="ncc.tableDateFormat"/>
+					<el-table-column prop="lastModifyTime" label="修改时间" align="left" :formatter="ncc.tableDateFormat"/>
+					<el-table-column label="操作" fixed="right" width="100">
+							<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
+							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
+						</template>
+					</el-table-column>
+				</NCC-table>
+                <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
+            </div>
+        </div>
+		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+	</div>
+</template>
+<script>
+    import request from '@/utils/request'
+    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+    import NCCForm from './Form'
+    import ExportBox from './ExportBox'
+    import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+        components: { NCCForm, ExportBox },
+        data() {
+            return {
+                showAll: false,
+				query: {
+                    orderId:undefined,
+                    beforeInviteUserId:undefined,
+                    afterInviteUserId:undefined,
+				},
+                list: [],
+                listLoading: true,
+                multipleSelection: [], total: 0,
+                listQuery: {
+                    currentPage: 1,
+                    pageSize: 20,
+					sort: "desc",
+                    sidx: "",
+                },
+                formVisible: false,
+                exportBoxVisible: false,
+                columnList: [
+                    { prop: 'orderId', label: '订单信息' },
+                    { prop: 'beforeInviteUserId', label: '之前的归属用户' },
+                    { prop: 'afterInviteUserId', label: '更改成的归属用户' },
+                    { prop: 'remark', label: '备注' },
+                    { prop: 'creatorTime', label: '创建时间' },
+                    { prop: 'lastModifyTime', label: '修改时间' },
+				],
+				orderIdOptions : [],
+			}
+        },
+		computed: {},
+		created() {
+			this.initData()
+			this.getorderIdOptions();
+		},
+		methods: {
+			getorderIdOptions(){
+				previewDataInterface('337944152299799813').then(res => {
+					this.orderIdOptions = res.data
+				});
+			},
+			initData() {
+                this.listLoading = true;
+                let _query = {
+                    ...this.listQuery,
+                    ...this.query
+                };
+                let query = {}
+                for (let key in _query) {
+                    if (Array.isArray(_query[key])) {
+                        query[key] = _query[key].join()
+                    } else {
+                        query[key] = _query[key]
+                    }
+                }
+                request({
+                    url: `/api/Siberian/TbOrderInvitedLog`,
+                    method: 'GET',
+                    data: query
+                }).then(res => {
+                    this.list = res.data.list
+                    this.total = res.data.pagination.total
+                    this.listLoading = false
+                })
+            },
+			handleDel(id) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    request({
+                        url: `/api/Siberian/TbOrderInvitedLog/${id}`,
+                        method: 'DELETE'
+                    }).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            onClose: () => {
+                                this.initData()
+                            }
+                        });
+                    })
+                }).catch(() => {
+                });
+            },
+			handleSelectionChange(val) {
+                const res = val.map(item => item.id)
+                this.multipleSelection = res
+            },
+            handleBatchRemoveDel() {
+                if (!this.multipleSelection.length) {
+                    this.$message({
+                        type: 'error',
+                        message: '请选择一条数据',
+                        duration: 1500,
+                    })
+                    return
+                }
+                const ids = this.multipleSelection
+                this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    request({
+                        url: `/api/Siberian/TbOrderInvitedLog/batchRemove`,
+                        method: 'POST',
+                        data: ids ,
+                    }).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            onClose: () => {
+                                this.initData()
+                            }
+                        });
+                    })
+                }).catch(() => { })
+            },
+			addOrUpdateHandle(id, isDetail) {
+                this.formVisible = true
+                this.$nextTick(() => {
+                    this.$refs.NCCForm.init(id, isDetail)
+                })
+            },
+			search() {
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            },
+            refresh(isrRefresh) {
+                this.formVisible = false
+                if (isrRefresh) this.reset()
+            },
+            reset() {
+                for (let key in this.query) {
+                    this.query[key] = undefined
+                }
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            }
+		}
+    }
+</script>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbPolicy/ExportBox.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbPolicy/ExportBox.vue
new file mode 100644
index 0000000..4fc5c07
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbPolicy/ExportBox.vue
@@ -0,0 +1,66 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbPolicy/Form.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbPolicy/Form.vue
new file mode 100644
index 0000000..37d7b6f
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbPolicy/Form.vue
@@ -0,0 +1,128 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+		<el-row :gutter="15" class="" >
+				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
+					<el-col :span="24">
+						<el-form-item label="政策图片" prop="banner">
+							<NCC-UploadImg v-model="dataForm.banner" required :fileSize="5" sizeUnit="MB" :limit="9" >
+							</NCC-UploadImg>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="创建时间" prop="creatorTime">
+							<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="修改时间" prop="lastModifyTime">
+							<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+	import request from '@/utils/request'
+	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				loading: false,
+				visible: false,
+				isDetail: false,
+				dataForm: {
+					id:'',
+					banner:[],
+					creatorTime:undefined,
+					lastModifyTime:undefined,
+				},
+				rules: {
+					banner:[
+						{
+							required:true,
+							message:'请输入政策图片',
+							trigger:'click'
+						},
+					],
+				},
+			}
+		},
+		computed: {},
+        watch: {},
+        created() {
+		},
+		mounted() {
+        },
+		methods: {
+			goBack() {
+                this.$emit('refresh')
+            },
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+                this.visible = true;
+                this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						request({
+							url: '/api/Siberian/TbPolicy/' + this.dataForm.id,
+							method: 'get'
+						}).then(res =>{
+							this.dataForm = res.data;
+							if(!this.dataForm.banner)this.dataForm.banner=[];
+						})
+					}
+				})
+			},
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+                    if (valid) {
+                        if (!this.dataForm.id) {
+                            request({
+                                url: `/api/Siberian/TbPolicy`,
+                                method: 'post',
+                                data: this.dataForm,
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false,
+                                            this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        } else {
+                            request({
+                                url: '/api/Siberian/TbPolicy/' + this.dataForm.id,
+                                method: 'PUT',
+                                data: this.dataForm
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false
+                                        this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        }
+                    }
+                })
+			},
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbPolicy/index.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbPolicy/index.vue
new file mode 100644
index 0000000..4708cd5
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbPolicy/index.vue
@@ -0,0 +1,153 @@
+<template>
+	<div class="NCC-common-layout">
+		<div class="NCC-common-layout-center">
+			<el-row class="NCC-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="NCC-common-layout-main NCC-flex-main">
+				<div class="NCC-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
+					</div>
+					<div class="NCC-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false" @click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+                <NCC-table v-loading="listLoading" :data="list">
+					<el-table-column prop="creatorTime" label="创建时间" align="left" :formatter="ncc.tableDateFormat"/>
+					<el-table-column prop="lastModifyTime" label="修改时间" align="left" :formatter="ncc.tableDateFormat"/>
+					<el-table-column label="操作" fixed="right" width="100">
+							<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
+							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
+						</template>
+					</el-table-column>
+				</NCC-table>
+                <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
+            </div>
+        </div>
+		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+	</div>
+</template>
+<script>
+    import request from '@/utils/request'
+    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+    import NCCForm from './Form'
+    import ExportBox from './ExportBox'
+    import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+        components: { NCCForm, ExportBox },
+        data() {
+            return {
+				query: {
+				},
+                list: [],
+                listLoading: true,
+                multipleSelection: [], total: 0,
+                listQuery: {
+                    currentPage: 1,
+                    pageSize: 20,
+					sort: "desc",
+                    sidx: "",
+                },
+                formVisible: false,
+                exportBoxVisible: false,
+                columnList: [
+                    { prop: 'creatorTime', label: '创建时间' },
+                    { prop: 'lastModifyTime', label: '修改时间' },
+				],
+			}
+        },
+		computed: {},
+		created() {
+			this.initData()
+		},
+		methods: {
+			initData() {
+                this.listLoading = true;
+                let _query = {
+                    ...this.listQuery,
+                    ...this.query
+                };
+                let query = {}
+                for (let key in _query) {
+                    if (Array.isArray(_query[key])) {
+                        query[key] = _query[key].join()
+                    } else {
+                        query[key] = _query[key]
+                    }
+                }
+                request({
+                    url: `/api/Siberian/TbPolicy`,
+                    method: 'GET',
+                    data: query
+                }).then(res => {
+                    this.list = res.data.list
+                    this.total = res.data.pagination.total
+                    this.listLoading = false
+                })
+            },
+			handleDel(id) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    request({
+                        url: `/api/Siberian/TbPolicy/${id}`,
+                        method: 'DELETE'
+                    }).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            onClose: () => {
+                                this.initData()
+                            }
+                        });
+                    })
+                }).catch(() => {
+                });
+            },
+			addOrUpdateHandle(id, isDetail) {
+                this.formVisible = true
+                this.$nextTick(() => {
+                    this.$refs.NCCForm.init(id, isDetail)
+                })
+            },
+			search() {
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            },
+            refresh(isrRefresh) {
+                this.formVisible = false
+                if (isrRefresh) this.reset()
+            },
+            reset() {
+                for (let key in this.query) {
+                    this.query[key] = undefined
+                }
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            }
+		}
+    }
+</script>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbReportData/ExportBox.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbReportData/ExportBox.vue
new file mode 100644
index 0000000..4fc5c07
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbReportData/ExportBox.vue
@@ -0,0 +1,66 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbReportData/Form.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbReportData/Form.vue
new file mode 100644
index 0000000..2d1dfcd
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbReportData/Form.vue
@@ -0,0 +1,273 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+		<el-row :gutter="15" class="" >
+				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
+					<el-col :span="24">
+						<el-form-item label="用户" prop="userId">
+							<user-select v-model="dataForm.userId" placeholder="请选择" clearable required >
+							</user-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="报备类型" prop="reportId">
+							<el-select v-model="dataForm.reportId" placeholder="请选择" clearable required :style='{"width":"100%"}' >
+								<el-option v-for="(item, index) in reportIdOptions" :key="index" :label="item.F_Title" :value="item.F_Id" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="报备状态" prop="type">
+							<el-select v-model="dataForm.type" placeholder="请选择" clearable required :style='{"width":"100%"}' >
+								<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="证件姓名" prop="cardName">
+							<el-input v-model="dataForm.cardName" placeholder="请输入" clearable :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="证件号码" prop="cardID">
+							<el-input v-model="dataForm.cardID" placeholder="请输入" clearable :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<!-- <el-col :span="24">
+						<el-form-item label="公众号OpenId" prop="hopenId">
+							<el-input v-model="dataForm.hopenId" placeholder="请输入" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col> -->
+					<el-col :span="24">
+						<el-form-item label="CanDiDateNumber" prop="candidateNumber">
+							<el-input v-model="dataForm.candidateNumber" placeholder="请输入" clearable :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="身份证正面" prop="topCard">
+							<NCC-UploadImg v-model="dataForm.topCard" :fileSize="5" sizeUnit="MB" :limit="9" >
+							</NCC-UploadImg>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="身份证反面" prop="bottomCard">
+							<NCC-UploadImg v-model="dataForm.bottomCard" :fileSize="5" sizeUnit="MB" :limit="9" >
+							</NCC-UploadImg>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="CAS编号" prop="cas">
+							<el-input v-model="dataForm.cas" placeholder="请输入" clearable :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="朗思邮箱" prop="emai">
+							<el-input v-model="dataForm.emai" placeholder="请输入" clearable :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="证件照片" prop="papers">
+							<NCC-UploadImg v-model="dataForm.papers" :fileSize="5" sizeUnit="MB" :limit="9" >
+							</NCC-UploadImg>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="错误代码" prop="errorCode">
+							<el-input v-model="dataForm.errorCode" placeholder="请输入" clearable :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="错误页面" prop="errorPage">
+							<el-input v-model="dataForm.errorPage" placeholder="请输入" clearable :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="错误问题" prop="errorRemark">
+							<el-input v-model="dataForm.errorRemark" placeholder="请输入" clearable :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="遇到的问题" prop="otherError">
+							<el-input v-model="dataForm.otherError" placeholder="请输入" clearable :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="创建时间" prop="creatorTime">
+							<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="修改时间" prop="lastModifyTime">
+							<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+	import request from '@/utils/request'
+	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				loading: false,
+				visible: false,
+				isDetail: false,
+				dataForm: {
+					id:'',
+					userId:undefined,
+					reportId:undefined,
+					type:undefined,
+					hopenId:undefined,
+					cardID:'',
+					cardName:'',
+					candidateNumber:undefined,
+					topCard:[],
+					bottomCard:[],
+					cas:undefined,
+					emai:undefined,
+					papers:[],
+					errorCode:undefined,
+					errorPage:undefined,
+					errorRemark:undefined,
+					otherError:undefined,
+					creatorTime:undefined,
+					lastModifyTime:undefined,
+				},
+				rules: {
+					userId:[
+						{
+							required:true,
+							message:'请输入用户',
+							trigger:'change'
+						},
+					],
+					reportId:[
+						{
+							required:true,
+							message:'请输入报备类型',
+							trigger:'change'
+						},
+					],
+					type:[
+						{
+							required:true,
+							message:'请输入报备类型',
+							trigger:'change'
+						},
+					],
+					hopenId:[
+						{
+							required:true,
+							message:'请输入公众号OpenId',
+							trigger:'blur'
+						},
+					],
+					emai:[
+						{
+							pattern:/^[a-z0-9]+([._\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/,
+							message:'请输入正确的邮箱',
+							trigger:'blur'
+						},
+					],
+				},
+				reportIdOptions : [],
+				typeOptions:[{"fullName":"待反馈","id":"1"},{"fullName":"已反馈","id":"2"}],
+			}
+		},
+		computed: {},
+        watch: {},
+        created() {
+			this.getreportIdOptions();
+		},
+		mounted() {
+        },
+		methods: {
+			getreportIdOptions(){
+				previewDataInterface('339242356467303685').then(res => {
+					this.reportIdOptions = res.data
+				});
+			},
+			goBack() {
+                this.$emit('refresh')
+            },
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+                this.visible = true;
+                this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						request({
+							url: '/api/Siberian/TbReportData/' + this.dataForm.id,
+							method: 'get'
+						}).then(res =>{
+							this.dataForm = res.data;
+							if(!this.dataForm.topCard)this.dataForm.topCard=[];
+							if(!this.dataForm.bottomCard)this.dataForm.bottomCard=[];
+							if(!this.dataForm.papers)this.dataForm.papers=[];
+						})
+					}
+				})
+			},
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+                    if (valid) {
+                        if (!this.dataForm.id) {
+                            request({
+                                url: `/api/Siberian/TbReportData`,
+                                method: 'post',
+                                data: this.dataForm,
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false,
+                                            this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        } else {
+                            request({
+                                url: '/api/Siberian/TbReportData/' + this.dataForm.id,
+                                method: 'PUT',
+                                data: this.dataForm
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false
+                                        this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        }
+                    }
+                })
+			},
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbReportData/index.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbReportData/index.vue
new file mode 100644
index 0000000..0f4b869
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbReportData/index.vue
@@ -0,0 +1,401 @@
+<template>
+	<div class="NCC-common-layout">
+		<div class="NCC-common-layout-center">
+			<el-row class="NCC-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="用户">
+							<userSelect v-model="query.userId" placeholder="请选择用户" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="报备状态">
+							<el-select v-model="query.type" placeholder="报备状态" clearable>
+								<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName"
+									:value="item.id" />
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="报备类型">
+							<el-select v-model="query.reportId" placeholder="报备类型" clearable>
+								<el-option v-for="(item, index) in reportIdOptions" :key="index" :label="item.F_Title"
+									:value="item.F_Id" />
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<template v-if="showAll">
+						<el-col :span="6">
+							<el-form-item label="创建时间">
+								<el-date-picker v-model="query.creatorTime" start-placeholder="开始日期"
+									end-placeholder="结束日期" value-format="timestamp" format="yyyy-MM-dd"
+									type="daterange" />
+							</el-form-item>
+						</el-col>
+					</template>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+							<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">展开
+							</el-button>
+							<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>收起</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="NCC-common-layout-main NCC-flex-main">
+				<div class="NCC-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
+						<el-button type="text" icon="el-icon-download" @click="exportData()">导出</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除</el-button>
+					</div>
+					<div class="NCC-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false"
+								@click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+				<NCC-table v-loading="listLoading" :data="list" has-c @selection-change="handleSelectionChange">
+					<el-table-column prop="userId" label="用户" align="left" />
+					<!-- <el-table-column prop="hopenId" label="公众号OpenId" align="left" /> -->
+					<el-table-column label="报备状态" prop="type" align="left">
+						<template slot-scope="scope">{{ scope.row.type | dynamicText(typeOptions) }}</template>
+					</el-table-column>
+					<el-table-column label="报备类型" prop="reportId" align="left">
+						<template slot-scope="scope">{{ scope.row.reportId | dynamicText(reportIdOptions) }}</template>
+					</el-table-column>
+					<el-table-column label="身份证正面" prop="reportId" align="left" width="120">
+						<template slot-scope="scope">
+							<!-- {{scope.row.topCardList[0]}}--{{scope.row.topCardList[0]}} -->
+							<img :src="APIURl+scope.row.topCardList&&scope.row.topCardList[0]&&scope.row.topCardList[0].url" style="width:80px;height:60px;" />
+						</template>
+					</el-table-column>
+					<el-table-column label="身份证反面" prop="reportId" align="left" width="120">
+						<template slot-scope="scope">
+							<img :src="APIURl+scope.row.bottomCardList&&scope.row.bottomCardList[0]&&scope.row.bottomCardList[0].url" style="width:80px;height:60px;" />
+						</template>
+					</el-table-column>
+					<!-- <el-table-column label="证件照" prop="papersList" align="left" width="120">
+						<template slot-scope="scope">
+							<img :src="APIURl+scope.row.papersList[0].url" style="width:80px;height:60px;" />
+						</template>
+					</el-table-column> -->
+					<el-table-column prop="cardID" label="证件号码" align="left" />
+					<el-table-column prop="cardName" label="证件名称" align="left" />
+					<el-table-column prop="candidateNumber" label="CanDiDateNumber" align="left" />
+					<el-table-column prop="cas" label="CAS编号" align="left" />
+					<el-table-column prop="emai" label="朗思邮箱" align="left" />
+					<el-table-column prop="errorCode" label="错误代码" align="left" />
+					<el-table-column prop="errorPage" label="错误页面" align="left" />
+					<el-table-column prop="errorRemark" label="错误问题" align="left" />
+					<el-table-column prop="otherError" label="遇到的问题" align="left" />
+					<el-table-column prop="creatorTime" label="创建时间" align="left" :formatter="ncc.tableDateFormat" />
+					<el-table-column prop="lastModifyTime" label="修改时间" align="left" :formatter="ncc.tableDateFormat" />
+
+					<el-table-column label="操作" fixed="right" width="100">
+						<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑</el-button>
+							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn">删除
+							</el-button>
+							<el-button type="text" @click="Confirm(scope.row)" class="NCC-table-delBtn">确认反馈
+							</el-button>
+						</template>
+					</el-table-column>
+				</NCC-table>
+				<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+					@pagination="initData" />
+			</div>
+		</div>
+		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+		<el-dialog title="确认反馈" :visible.sync="dialogVisibleS">
+			<el-form ref="FModel" :model="FModel" label-width="80px">
+				<el-form-item label="First">
+					<el-input v-model="FModel.first" placeholder="First"></el-input>
+				</el-form-item>
+				<el-form-item label="Remark">
+					<el-input v-model="FModel.remark"  placeholder="Remark"></el-input>
+				</el-form-item>
+			</el-form>
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="dialogVisibleS = false">取 消</el-button>
+				<el-button type="primary" @click="ConfirmCreate">确 定</el-button>
+			</span>
+		</el-dialog>
+	</div>
+</template>
+<script>
+	import request from '@/utils/request'
+	import {
+		APIURl
+	} from '@/utils/define'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import NCCForm from './Form'
+	import ExportBox from './ExportBox'
+	import {
+		previewDataInterface
+	} from '@/api/systemData/dataInterface'
+	export default {
+		components: {
+			NCCForm,
+			ExportBox
+		},
+		data() {
+			return {
+				APIURl,
+				FModel: {
+					id: '',
+					first: '',
+					remark: ''
+				},
+				dialogVisibleS: false,
+				showAll: false,
+				query: {
+					userId: undefined,
+					type: undefined,
+					reportId: undefined,
+					creatorTime: undefined,
+				},
+				list: [],
+				listLoading: true,
+				multipleSelection: [],
+				total: 0,
+				listQuery: {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				},
+				formVisible: false,
+				exportBoxVisible: false,
+				columnList: [{
+						prop: 'userId',
+						label: '用户'
+					},
+					{
+						prop: 'hopenId',
+						label: '公众号OpenId'
+					},
+					{
+						prop: 'type',
+						label: '报备类型'
+					},
+					{
+						prop: 'candidateNumber',
+						label: 'CanDiDateNumber'
+					},
+					{
+						prop: 'cas',
+						label: 'CAS编号 修改姓名错误'
+					},
+					{
+						prop: 'emai',
+						label: '朗思邮箱  修改姓名错误'
+					},
+					{
+						prop: 'errorCode',
+						label: '错误代码  反馈技术问题'
+					},
+					{
+						prop: 'errorPage',
+						label: '错误页面  反馈技术问题'
+					},
+					{
+						prop: 'errorRemark',
+						label: '错误问题  反馈技术问题'
+					},
+					{
+						prop: 'otherError',
+						label: '遇到的问题  反馈其他问题'
+					},
+					{
+						prop: 'creatorTime',
+						label: '创建时间'
+					},
+					{
+						prop: 'lastModifyTime',
+						label: '修改时间'
+					},
+					{
+						prop: 'reportId',
+						label: '报备类型'
+					},
+				],
+				reportIdOptions: [],
+				typeOptions: [{
+					"fullName": "待反馈",
+					"id": "1"
+				}, {
+					"fullName": "已反馈",
+					"id": "2"
+				}],
+			}
+		},
+		computed: {},
+		created() {
+			this.initData()
+			this.getreportIdOptions();
+		},
+		methods: {
+			Confirm(item){
+			console.log('item',item)	
+			this.dialogVisibleS=true
+			this.FModel.id=item.id
+			},
+			ConfirmCreate(){
+				request({
+					url: `/api/Siberian/tbreportdata/ConfirmReport?id=${this.FModel.id}&first=${this.FModel.first}&remark=${this.FModel.remark}`,
+					method: 'POST'
+				}).then(res => {
+					this.$message({
+						type: 'success',
+						message: res.msg,
+						onClose: () => {
+							this.initData()
+							this.dialogVisibleS=false
+						}
+					});
+				})
+			},
+			getreportIdOptions() {
+				previewDataInterface('339242356467303685').then(res => {
+					this.reportIdOptions = res.data
+				});
+			},
+			initData() {
+				this.listLoading = true;
+				let _query = {
+					...this.listQuery,
+					...this.query
+				};
+				let query = {}
+				for (let key in _query) {
+					if (Array.isArray(_query[key])) {
+						query[key] = _query[key].join()
+					} else {
+						query[key] = _query[key]
+					}
+				}
+				request({
+					url: `/api/Siberian/TbReportData`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					this.list = res.data.list
+					this.total = res.data.pagination.total
+					this.listLoading = false
+				})
+			},
+			handleDel(id) {
+				this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/Siberian/TbReportData/${id}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {});
+			},
+			handleSelectionChange(val) {
+				const res = val.map(item => item.id)
+				this.multipleSelection = res
+			},
+			handleBatchRemoveDel() {
+				if (!this.multipleSelection.length) {
+					this.$message({
+						type: 'error',
+						message: '请选择一条数据',
+						duration: 1500,
+					})
+					return
+				}
+				const ids = this.multipleSelection
+				this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/Siberian/TbReportData/batchRemove`,
+						method: 'POST',
+						data: ids,
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {})
+			},
+			addOrUpdateHandle(id, isDetail) {
+				this.formVisible = true
+				this.$nextTick(() => {
+					this.$refs.NCCForm.init(id, isDetail)
+				})
+			},
+			exportData() {
+				this.exportBoxVisible = true
+				this.$nextTick(() => {
+					this.$refs.ExportBox.init(this.columnList)
+				})
+			},
+			download(data) {
+				let query = {
+					...data,
+					...this.listQuery,
+					...this.query
+				}
+				request({
+					url: `/api/Siberian/TbReportData/Actions/Export`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					if (!res.data.url) return
+					window.location.href = this.define.comUrl + res.data.url
+					this.$refs.ExportBox.visible = false
+					this.exportBoxVisible = false
+				})
+			},
+			search() {
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			},
+			refresh(isrRefresh) {
+				this.formVisible = false
+				if (isrRefresh) this.reset()
+			},
+			reset() {
+				for (let key in this.query) {
+					this.query[key] = undefined
+				}
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			}
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbRulesSetting/ExportBox.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbRulesSetting/ExportBox.vue
new file mode 100644
index 0000000..4fc5c07
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbRulesSetting/ExportBox.vue
@@ -0,0 +1,66 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbRulesSetting/Form.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbRulesSetting/Form.vue
new file mode 100644
index 0000000..f8847e3
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbRulesSetting/Form.vue
@@ -0,0 +1,143 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+		<el-row :gutter="15" class="" >
+				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
+					<el-col :span="24">
+						<el-form-item label="次数" prop="num">
+							<el-input-number v-model="dataForm.num" placeholder="次数" required :step="1" >
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="类型" prop="type">
+							<el-select v-model="dataForm.type" placeholder="请选择" clearable required :style='{"width":"100%"}' >
+								<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="创建时间" prop="creatorTime">
+							<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="修改时间" prop="lastModifyTime">
+							<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+	import request from '@/utils/request'
+	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				loading: false,
+				visible: false,
+				isDetail: false,
+				dataForm: {
+					id:'',
+					num:1,
+					type:undefined,
+					creatorTime:undefined,
+					lastModifyTime:undefined,
+				},
+				rules: {
+					num:[
+						{
+							required:true,
+							message:'请输入次数',
+							trigger:["blur","change"]
+						},
+					],
+					type:[
+						{
+							required:true,
+							message:'请输入类型',
+							trigger:'change'
+						},
+					],
+				},
+				typeOptions:[{"fullName":"日","id":"1"},{"fullName":"周","id":"2"},{"fullName":"月","id":"3"},{"fullName":"年","id":"4"}],
+			}
+		},
+		computed: {},
+        watch: {},
+        created() {
+		},
+		mounted() {
+        },
+		methods: {
+			goBack() {
+                this.$emit('refresh')
+            },
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+                this.visible = true;
+                this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						request({
+							url: '/api/Siberian/TbRulesSetting/' + this.dataForm.id,
+							method: 'get'
+						}).then(res =>{
+							this.dataForm = res.data;
+						})
+					}
+				})
+			},
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+                    if (valid) {
+                        if (!this.dataForm.id) {
+                            request({
+                                url: `/api/Siberian/TbRulesSetting`,
+                                method: 'post',
+                                data: this.dataForm,
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false,
+                                            this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        } else {
+                            request({
+                                url: '/api/Siberian/TbRulesSetting/' + this.dataForm.id,
+                                method: 'PUT',
+                                data: this.dataForm
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false
+                                        this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        }
+                    }
+                })
+			},
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbRulesSetting/index.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbRulesSetting/index.vue
new file mode 100644
index 0000000..6d4a599
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbRulesSetting/index.vue
@@ -0,0 +1,221 @@
+<template>
+	<div class="NCC-common-layout">
+		<div class="NCC-common-layout-center">
+			<el-row class="NCC-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="类型">
+							<el-select v-model="query.type" placeholder="类型" clearable >
+								<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName" :value="item.id"  />
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="NCC-common-layout-main NCC-flex-main">
+				<div class="NCC-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
+						<el-button type="text" icon="el-icon-download" @click="exportData()">导出</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除</el-button>
+					</div>
+					<div class="NCC-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false" @click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+                <NCC-table v-loading="listLoading" :data="list" has-c @selection-change="handleSelectionChange">
+					<el-table-column prop="num" label="次数" align="left" />
+					<el-table-column label="类型" prop="type" align="left">
+							<template slot-scope="scope">{{ scope.row.type | dynamicText(typeOptions) }}</template>
+					</el-table-column>
+					<el-table-column prop="creatorTime" label="创建时间" align="left" :formatter="ncc.tableDateFormat"/>
+					<el-table-column prop="lastModifyTime" label="修改时间" align="left" :formatter="ncc.tableDateFormat"/>
+					<el-table-column label="操作" fixed="right" width="100">
+							<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
+							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
+						</template>
+					</el-table-column>
+				</NCC-table>
+                <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
+            </div>
+        </div>
+		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+	</div>
+</template>
+<script>
+    import request from '@/utils/request'
+    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+    import NCCForm from './Form'
+    import ExportBox from './ExportBox'
+    import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+        components: { NCCForm, ExportBox },
+        data() {
+            return {
+				query: {
+                    type:undefined,
+				},
+                list: [],
+                listLoading: true,
+                multipleSelection: [], total: 0,
+                listQuery: {
+                    currentPage: 1,
+                    pageSize: 20,
+					sort: "desc",
+                    sidx: "",
+                },
+                formVisible: false,
+                exportBoxVisible: false,
+                columnList: [
+                    { prop: 'num', label: '次数' },
+                    { prop: 'type', label: '类型' },
+                    { prop: 'creatorTime', label: '创建时间' },
+                    { prop: 'lastModifyTime', label: '修改时间' },
+				],
+				typeOptions:[{"fullName":"日","id":"1"},{"fullName":"周","id":"2"},{"fullName":"月","id":"3"},{"fullName":"年","id":"4"}],
+			}
+        },
+		computed: {},
+		created() {
+			this.initData()
+		},
+		methods: {
+			initData() {
+                this.listLoading = true;
+                let _query = {
+                    ...this.listQuery,
+                    ...this.query
+                };
+                let query = {}
+                for (let key in _query) {
+                    if (Array.isArray(_query[key])) {
+                        query[key] = _query[key].join()
+                    } else {
+                        query[key] = _query[key]
+                    }
+                }
+                request({
+                    url: `/api/Siberian/TbRulesSetting`,
+                    method: 'GET',
+                    data: query
+                }).then(res => {
+                    this.list = res.data.list
+                    this.total = res.data.pagination.total
+                    this.listLoading = false
+                })
+            },
+			handleDel(id) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    request({
+                        url: `/api/Siberian/TbRulesSetting/${id}`,
+                        method: 'DELETE'
+                    }).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            onClose: () => {
+                                this.initData()
+                            }
+                        });
+                    })
+                }).catch(() => {
+                });
+            },
+			handleSelectionChange(val) {
+                const res = val.map(item => item.id)
+                this.multipleSelection = res
+            },
+            handleBatchRemoveDel() {
+                if (!this.multipleSelection.length) {
+                    this.$message({
+                        type: 'error',
+                        message: '请选择一条数据',
+                        duration: 1500,
+                    })
+                    return
+                }
+                const ids = this.multipleSelection
+                this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    request({
+                        url: `/api/Siberian/TbRulesSetting/batchRemove`,
+                        method: 'POST',
+                        data: ids ,
+                    }).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            onClose: () => {
+                                this.initData()
+                            }
+                        });
+                    })
+                }).catch(() => { })
+            },
+			addOrUpdateHandle(id, isDetail) {
+                this.formVisible = true
+                this.$nextTick(() => {
+                    this.$refs.NCCForm.init(id, isDetail)
+                })
+            },
+			exportData() {
+                this.exportBoxVisible = true
+                this.$nextTick(() => {
+                    this.$refs.ExportBox.init(this.columnList)
+                })
+            },
+            download(data) {
+                let query = { ...data, ...this.listQuery, ...this.query }
+                request({
+                    url: `/api/Siberian/TbRulesSetting/Actions/Export`,
+                    method: 'GET',
+                    data: query
+                }).then(res => {
+                    if (!res.data.url) return
+                    window.location.href = this.define.comUrl + res.data.url
+                    this.$refs.ExportBox.visible = false
+                    this.exportBoxVisible = false
+                })
+            },
+			search() {
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            },
+            refresh(isrRefresh) {
+                this.formVisible = false
+                if (isrRefresh) this.reset()
+            },
+            reset() {
+                for (let key in this.query) {
+                    this.query[key] = undefined
+                }
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            }
+		}
+    }
+</script>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbSchool/ExportBox.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbSchool/ExportBox.vue
new file mode 100644
index 0000000..4fc5c07
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbSchool/ExportBox.vue
@@ -0,0 +1,66 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbSchool/Form.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbSchool/Form.vue
new file mode 100644
index 0000000..e0fb321
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbSchool/Form.vue
@@ -0,0 +1,212 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+		<el-row :gutter="15" class="" >
+				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
+					<el-col :span="24">
+						<el-form-item label="学校名称" prop="title">
+							<el-input v-model="dataForm.title" placeholder="请输入" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="副名称" prop="ftitle">
+							<el-input v-model="dataForm.ftitle" placeholder="请输入" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="个性签名" prop="sign">
+							<el-input v-model="dataForm.sign" placeholder="请输入" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="简介标题" prop="remarkTitle">
+							<el-input v-model="dataForm.remarkTitle" placeholder="请输入" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="学校简介" prop="remark">
+							<el-input v-model="dataForm.remark" placeholder="请输入" required show-word-limit :style='{"width":"100%"}' type='textarea' :autosize='{"minRows":4,"maxRows":4}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="成立时间" prop="startDate">
+							<el-date-picker v-model="dataForm.startDate" placeholder="请选择" clearable required :style='{"width":"100%"}' type='date' format="yyyy-MM-dd" value-format="timestamp" >
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="学校图片" prop="banner">
+							<NCC-UploadImg v-model="dataForm.banner" required :fileSize="5" sizeUnit="MB" :limit="9" >
+							</NCC-UploadImg>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="创建时间" prop="creatorTime">
+							<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="修改时间" prop="lastModifyTime">
+							<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+	import request from '@/utils/request'
+	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				loading: false,
+				visible: false,
+				isDetail: false,
+				dataForm: {
+					id:'',
+					title:undefined,
+					ftitle:undefined,
+					sign:undefined,
+					remarkTitle:undefined,
+					remark:undefined,
+					startDate:undefined,
+					banner:[],
+					creatorTime:undefined,
+					lastModifyTime:undefined,
+				},
+				rules: {
+					title:[
+						{
+							required:true,
+							message:'请输入学校名称',
+							trigger:'blur'
+						},
+					],
+					ftitle:[
+						{
+							required:true,
+							message:'请输入副名称',
+							trigger:'blur'
+						},
+					],
+					sign:[
+						{
+							required:true,
+							message:'请输入个性签名',
+							trigger:'blur'
+						},
+					],
+					remarkTitle:[
+						{
+							required:true,
+							message:'请输入简介标题',
+							trigger:'blur'
+						},
+					],
+					remark:[
+						{
+							required:true,
+							message:'请输入学校简介',
+							trigger:'blur'
+						},
+					],
+					startDate:[
+						{
+							required:true,
+							message:'请输入成立时间',
+							trigger:'change'
+						},
+					],
+					banner:[
+						{
+							required:true,
+							message:'请输入学校图片',
+							trigger:'click'
+						},
+					],
+				},
+			}
+		},
+		computed: {},
+        watch: {},
+        created() {
+		},
+		mounted() {
+        },
+		methods: {
+			goBack() {
+                this.$emit('refresh')
+            },
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+                this.visible = true;
+                this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						request({
+							url: '/api/Siberian/TbSchool/' + this.dataForm.id,
+							method: 'get'
+						}).then(res =>{
+							this.dataForm = res.data;
+							if(!this.dataForm.banner)this.dataForm.banner=[];
+						})
+					}
+				})
+			},
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+                    if (valid) {
+                        if (!this.dataForm.id) {
+                            request({
+                                url: `/api/Siberian/TbSchool`,
+                                method: 'post',
+                                data: this.dataForm,
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false,
+                                            this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        } else {
+                            request({
+                                url: '/api/Siberian/TbSchool/' + this.dataForm.id,
+                                method: 'PUT',
+                                data: this.dataForm
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false
+                                        this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        }
+                    }
+                })
+			},
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbSchool/index.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbSchool/index.vue
new file mode 100644
index 0000000..e508847
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbSchool/index.vue
@@ -0,0 +1,194 @@
+<template>
+	<div class="NCC-common-layout">
+		<div class="NCC-common-layout-center">
+			<el-row class="NCC-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="学校名称">
+							<el-input v-model="query.title" placeholder="学校名称" clearable />	
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="副名称">
+							<el-input v-model="query.ftitle" placeholder="副名称" clearable />	
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="个性签名">
+							<el-input v-model="query.sign" placeholder="个性签名" clearable />	
+						</el-form-item>
+					</el-col>
+					<template v-if="showAll">
+					<el-col :span="6">
+						<el-form-item label="简介标题">
+							<el-input v-model="query.remarkTitle" placeholder="简介标题" clearable />	
+						</el-form-item>
+					</el-col>
+					</template>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+							<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">展开</el-button>
+							<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>收起</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="NCC-common-layout-main NCC-flex-main">
+				<div class="NCC-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
+					</div>
+					<div class="NCC-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false" @click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+                <NCC-table v-loading="listLoading" :data="list">
+					<el-table-column prop="title" label="学校名称" align="left" />
+					<el-table-column prop="ftitle" label="副名称" align="left" />
+					<el-table-column prop="sign" label="个性签名" align="left" />
+					<el-table-column prop="startDate" label="成立时间" align="left" :formatter="ncc.tableDateFormat"/>
+					<el-table-column prop="creatorTime" label="创建时间" align="left" :formatter="ncc.tableDateFormat"/>
+					<el-table-column prop="lastModifyTime" label="修改时间" align="left" :formatter="ncc.tableDateFormat"/>
+					<el-table-column prop="remark" label="学校简介" align="left" />
+					<el-table-column prop="remarkTitle" label="简介标题" align="left" />
+					<el-table-column label="操作" fixed="right" width="100">
+							<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
+							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
+						</template>
+					</el-table-column>
+				</NCC-table>
+                <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
+            </div>
+        </div>
+		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+	</div>
+</template>
+<script>
+    import request from '@/utils/request'
+    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+    import NCCForm from './Form'
+    import ExportBox from './ExportBox'
+    import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+        components: { NCCForm, ExportBox },
+        data() {
+            return {
+                showAll: false,
+				query: {
+                    title:undefined,
+                    ftitle:undefined,
+                    sign:undefined,
+                    remarkTitle:undefined,
+				},
+                list: [],
+                listLoading: true,
+                multipleSelection: [], total: 0,
+                listQuery: {
+                    currentPage: 1,
+                    pageSize: 20,
+					sort: "desc",
+                    sidx: "",
+                },
+                formVisible: false,
+                exportBoxVisible: false,
+                columnList: [
+                    { prop: 'title', label: '学校名称' },
+                    { prop: 'ftitle', label: '副名称' },
+                    { prop: 'sign', label: '个性签名' },
+                    { prop: 'startDate', label: '成立时间' },
+                    { prop: 'creatorTime', label: '创建时间' },
+                    { prop: 'lastModifyTime', label: '修改时间' },
+                    { prop: 'remark', label: '学校简介' },
+                    { prop: 'remarkTitle', label: '简介标题' },
+				],
+			}
+        },
+		computed: {},
+		created() {
+			this.initData()
+		},
+		methods: {
+			initData() {
+                this.listLoading = true;
+                let _query = {
+                    ...this.listQuery,
+                    ...this.query
+                };
+                let query = {}
+                for (let key in _query) {
+                    if (Array.isArray(_query[key])) {
+                        query[key] = _query[key].join()
+                    } else {
+                        query[key] = _query[key]
+                    }
+                }
+                request({
+                    url: `/api/Siberian/TbSchool`,
+                    method: 'GET',
+                    data: query
+                }).then(res => {
+                    this.list = res.data.list
+                    this.total = res.data.pagination.total
+                    this.listLoading = false
+                })
+            },
+			handleDel(id) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    request({
+                        url: `/api/Siberian/TbSchool/${id}`,
+                        method: 'DELETE'
+                    }).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            onClose: () => {
+                                this.initData()
+                            }
+                        });
+                    })
+                }).catch(() => {
+                });
+            },
+			addOrUpdateHandle(id, isDetail) {
+                this.formVisible = true
+                this.$nextTick(() => {
+                    this.$refs.NCCForm.init(id, isDetail)
+                })
+            },
+			search() {
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            },
+            refresh(isrRefresh) {
+                this.formVisible = false
+                if (isrRefresh) this.reset()
+            },
+            reset() {
+                for (let key in this.query) {
+                    this.query[key] = undefined
+                }
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            }
+		}
+    }
+</script>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbShareLog/ExportBox.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbShareLog/ExportBox.vue
new file mode 100644
index 0000000..4fc5c07
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbShareLog/ExportBox.vue
@@ -0,0 +1,66 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbShareLog/Form.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbShareLog/Form.vue
new file mode 100644
index 0000000..d40daf2
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbShareLog/Form.vue
@@ -0,0 +1,207 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+		<el-row :gutter="15" class="" >
+				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
+					<el-col :span="24">
+						<el-form-item label="分润用户" prop="userId">
+							<user-select v-model="dataForm.userId" placeholder="请选择" clearable required >
+							</user-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="下单用户" prop="orderUserId">
+							<user-select v-model="dataForm.orderUserId" placeholder="请选择" clearable required >
+							</user-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="订单" prop="orderId">
+							<el-select v-model="dataForm.orderId" placeholder="请选择" clearable :style='{"width":"100%"}' >
+								<el-option v-for="(item, index) in orderIdOptions" :key="index" :label="item.F_Id" :value="item.F_Id" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="分润金额" prop="moneys">
+							<el-input v-model="dataForm.moneys" placeholder="请输入" clearable required :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="状态" prop="type">
+							<el-select v-model="dataForm.type" placeholder="请选择" clearable required :style='{"width":"100%"}' >
+								<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="到账类型" prop="status">
+							<el-select v-model="dataForm.status" placeholder="请选择" clearable required :style='{"width":"100%"}' >
+								<el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="创建时间" prop="creatorTime">
+							<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="修改时间" prop="lastModifyTime">
+							<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+	import request from '@/utils/request'
+	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				loading: false,
+				visible: false,
+				isDetail: false,
+				dataForm: {
+					id:'',
+					userId:undefined,
+					orderUserId:undefined,
+					orderId:undefined,
+					moneys:undefined,
+					type:undefined,
+					status:undefined,
+					creatorTime:undefined,
+					lastModifyTime:undefined,
+				},
+				rules: {
+					userId:[
+						{
+							required:true,
+							message:'请输入分润用户',
+							trigger:'change'
+						},
+					],
+					orderUserId:[
+						{
+							required:true,
+							message:'请输入下单用户',
+							trigger:'change'
+						},
+					],
+					moneys:[
+						{
+							required:true,
+							message:'请输入分润金额',
+							trigger:'blur'
+						},
+						{
+							pattern:/^[1-9]\d*\.\d*|0\.\d*[1-9]\d*|0?\.0+|0$/,
+							message:'请输入正确的金额',
+							trigger:'blur'
+						},
+					],
+					type:[
+						{
+							required:true,
+							message:'请输入状态',
+							trigger:'change'
+						},
+					],
+					status:[
+						{
+							required:true,
+							message:'请输入到账类型',
+							trigger:'change'
+						},
+					],
+				},
+				orderIdOptions : [],
+				typeOptions:[{"fullName":"已分润","id":"1"},{"fullName":"未分润","id":"2"}],
+				statusOptions:[{"fullName":"付款到零钱","id":"1"},{"fullName":"付款到银行卡","id":"2"}],
+			}
+		},
+		computed: {},
+        watch: {},
+        created() {
+			this.getorderIdOptions();
+		},
+		mounted() {
+        },
+		methods: {
+			getorderIdOptions(){
+				previewDataInterface('337944152299799813').then(res => {
+					this.orderIdOptions = res.data
+				});
+			},
+			goBack() {
+                this.$emit('refresh')
+            },
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+                this.visible = true;
+                this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						request({
+							url: '/api/Siberian/TbShareLog/' + this.dataForm.id,
+							method: 'get'
+						}).then(res =>{
+							this.dataForm = res.data;
+						})
+					}
+				})
+			},
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+                    if (valid) {
+                        if (!this.dataForm.id) {
+                            request({
+                                url: `/api/Siberian/TbShareLog`,
+                                method: 'post',
+                                data: this.dataForm,
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false,
+                                            this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        } else {
+                            request({
+                                url: '/api/Siberian/TbShareLog/' + this.dataForm.id,
+                                method: 'PUT',
+                                data: this.dataForm
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false
+                                        this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        }
+                    }
+                })
+			},
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbShareLog/index.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbShareLog/index.vue
new file mode 100644
index 0000000..59f44e7
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbShareLog/index.vue
@@ -0,0 +1,221 @@
+<template>
+	<div class="NCC-common-layout">
+		<div class="NCC-common-layout-center">
+			<el-row class="NCC-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="分润用户">
+							<userSelect v-model="query.userId" placeholder="请选择分润用户" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="下单用户">
+							<userSelect v-model="query.orderUserId" placeholder="请选择下单用户" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="状态">
+							<el-select v-model="query.type" placeholder="状态" clearable >
+								<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName" :value="item.id"  />
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<template v-if="showAll">
+					<el-col :span="6">
+						<el-form-item label="到账类型">
+							<el-select v-model="query.status" placeholder="到账类型" clearable >
+								<el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id"  />
+							</el-select>
+						</el-form-item>
+					</el-col>
+					</template>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+							<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">展开</el-button>
+							<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>收起</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="NCC-common-layout-main NCC-flex-main">
+				<div class="NCC-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
+					</div>
+					<div class="NCC-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false" @click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+                <NCC-table v-loading="listLoading" :data="list">
+					<el-table-column prop="userId" label="分润用户" align="left" >
+						<template slot-scope="scope">
+							{{scope.row.user&&scope.row.user.RealName}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="RealName" label="下单用户" align="left" >
+						<template slot-scope="scope">
+							{{scope.row.orderUser&&scope.row.orderUser.RealName}}
+						</template>
+					</el-table-column>
+					<el-table-column label="订单" prop="orderId" align="left">
+							<template slot-scope="scope">{{ scope.row.orderId | dynamicText(orderIdOptions) }}</template>
+					</el-table-column>
+					<el-table-column prop="creatorTime" label="创建时间" align="left" :formatter="ncc.tableDateFormat"/>
+					<el-table-column prop="lastModifyTime" label="修改时间" align="left" :formatter="ncc.tableDateFormat"/>
+					<el-table-column prop="moneys" label="分润金额" align="left" />
+					<el-table-column label="状态" prop="type" align="left">
+							<template slot-scope="scope">{{ scope.row.type | dynamicText(typeOptions) }}</template>
+					</el-table-column>
+					<el-table-column label="到账类型" prop="status" align="left">
+							<template slot-scope="scope">{{ scope.row.status | dynamicText(statusOptions) }}</template>
+					</el-table-column>
+					<el-table-column label="操作" fixed="right" width="100">
+							<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
+							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
+						</template>
+					</el-table-column>
+				</NCC-table>
+                <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
+            </div>
+        </div>
+		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+	</div>
+</template>
+<script>
+    import request from '@/utils/request'
+    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+    import NCCForm from './Form'
+    import ExportBox from './ExportBox'
+    import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+        components: { NCCForm, ExportBox },
+        data() {
+            return {
+                showAll: false,
+				query: {
+                    userId:undefined,
+                    orderUserId:undefined,
+                    type:undefined,
+                    status:undefined,
+				},
+                list: [],
+                listLoading: true,
+                multipleSelection: [], total: 0,
+                listQuery: {
+                    currentPage: 1,
+                    pageSize: 20,
+					sort: "desc",
+                    sidx: "",
+                },
+                formVisible: false,
+                exportBoxVisible: false,
+                columnList: [
+                    { prop: 'userId', label: '分润用户' },
+                    { prop: 'orderUserId', label: '下单用户' },
+                    { prop: 'orderId', label: '订单' },
+                    { prop: 'creatorTime', label: '创建时间' },
+                    { prop: 'lastModifyTime', label: '修改时间' },
+                    { prop: 'moneys', label: '分润金额' },
+                    { prop: 'type', label: '状态' },
+                    { prop: 'status', label: '到账类型' },
+				],
+				orderIdOptions : [],
+				typeOptions:[{"fullName":"已分润","id":"1"},{"fullName":"未分润","id":"2"}],
+				statusOptions:[{"fullName":"付款到零钱","id":"1"},{"fullName":"付款到银行卡","id":"2"}],
+			}
+        },
+		computed: {},
+		created() {
+			this.initData()
+			this.getorderIdOptions();
+		},
+		methods: {
+			getorderIdOptions(){
+				previewDataInterface('337944152299799813').then(res => {
+					this.orderIdOptions = res.data
+				});
+			},
+			initData() {
+                this.listLoading = true;
+                let _query = {
+                    ...this.listQuery,
+                    ...this.query
+                };
+                let query = {}
+                for (let key in _query) {
+                    if (Array.isArray(_query[key])) {
+                        query[key] = _query[key].join()
+                    } else {
+                        query[key] = _query[key]
+                    }
+                }
+                request({
+                    url: `/api/Siberian/TbShareLog`,
+                    method: 'GET',
+                    data: query
+                }).then(res => {
+                    this.list = res.data.list
+                    this.total = res.data.pagination.total
+                    this.listLoading = false
+                })
+            },
+			handleDel(id) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    request({
+                        url: `/api/Siberian/TbShareLog/${id}`,
+                        method: 'DELETE'
+                    }).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            onClose: () => {
+                                this.initData()
+                            }
+                        });
+                    })
+                }).catch(() => {
+                });
+            },
+			addOrUpdateHandle(id, isDetail) {
+                this.formVisible = true
+                this.$nextTick(() => {
+                    this.$refs.NCCForm.init(id, isDetail)
+                })
+            },
+			search() {
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            },
+            refresh(isrRefresh) {
+                this.formVisible = false
+                if (isrRefresh) this.reset()
+            },
+            reset() {
+                for (let key in this.query) {
+                    this.query[key] = undefined
+                }
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            }
+		}
+    }
+</script>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbShareRatio/ExportBox.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbShareRatio/ExportBox.vue
new file mode 100644
index 0000000..4fc5c07
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbShareRatio/ExportBox.vue
@@ -0,0 +1,66 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbShareRatio/Form.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbShareRatio/Form.vue
new file mode 100644
index 0000000..7a94a48
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbShareRatio/Form.vue
@@ -0,0 +1,264 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false"
+		:visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+		<el-row :gutter="15" class="">
+			<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right"
+				:disabled="!!isDetail" :rules="rules">
+				<el-col :span="24">
+					<el-form-item label="卡种ID" prop="idNo">
+						<!-- <el-input v-model="dataForm.idNo" placeholder="请输入" clearable required :style='{"width":"100%"}' >
+							</el-input> -->
+						<el-select v-model="dataForm.idNo" multiple placeholder="请选择">
+							<el-option v-for="(item,index) in idnoList" :key="item.IdNo" :label="item.Title"
+								:value="item.IdNo">
+							</el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="一级代理" prop="oneUserId">
+						<user-select v-model="dataForm.oneUserId" placeholder="请选择" clearable required>
+						</user-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="二级代理" prop="twoUserId">
+						<user-select v-model="dataForm.twoUserId" placeholder="请选择" clearable required>
+						</user-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="报备前一级比例" prop="oneRatio">
+						<el-input v-model="dataForm.oneRatio" placeholder="请输入" clearable required
+							:style='{"width":"100%"}'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+
+				<el-col :span="12">
+					<el-form-item label="报备前二级比例" prop="twoRatio">
+						<el-input v-model="dataForm.twoRatio" placeholder="请输入" clearable required
+							:style='{"width":"100%"}'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="报备后一级比例" prop="afterOneRatio">
+						<el-input v-model="dataForm.afterOneRatio" placeholder="请输入" clearable required
+							:style='{"width":"100%"}'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+
+				<el-col :span="12">
+					<el-form-item label="报备后二级比例" prop="afterTwoRatio">
+						<el-input v-model="dataForm.afterTwoRatio" placeholder="请输入" clearable required
+							:style='{"width":"100%"}'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="最低金额" prop="underMoneys">
+						<el-input v-model="dataForm.underMoneys" placeholder="请输入" clearable required
+							:style='{"width":"100%"}'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" v-if="false">
+					<el-form-item label="创建时间" prop="creatorTime">
+						<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" v-if="false">
+					<el-form-item label="修改时间" prop="lastModifyTime">
+						<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly>
+						</el-input>
+					</el-form-item>
+				</el-col>
+			</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+	import request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import {
+		previewDataInterface
+	} from '@/api/systemData/dataInterface'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				loading: false,
+				visible: false,
+				isDetail: false,
+				dataForm: {
+					id: '',
+					idNo: undefined,
+					oneUserId: undefined,
+					twoUserId: undefined,
+					oneRatio: undefined,
+					twoRatio: undefined,
+					afterTwoRatio: undefined,
+					afterOneRatio: undefined,
+					underMoneys: undefined,
+					creatorTime: undefined,
+					lastModifyTime: undefined,
+				},
+				idnoList:[],
+				rules: {
+					idNo: [{
+						required: true,
+						message: '请输入卡种ID',
+						trigger: 'blur'
+					}, ],
+					// oneUserId: [{
+					// 	required: true,
+					// 	message: '请输入一级代理',
+					// 	trigger: 'change'
+					// }, ],
+					oneRatio: [{
+							required: true,
+							message: '请输入一级比例',
+							trigger: 'blur'
+						},
+						{
+							pattern: /^\d+$/,
+							message: '请输入正确的数字',
+							trigger: 'blur'
+						},
+					],
+					// twoUserId: [{
+					// 	required: true,
+					// 	message: '请输入二级代理',
+					// 	trigger: 'change'
+					// }, ],
+					twoRatio: [{
+							required: true,
+							message: '请输入二级比例',
+							trigger: 'blur'
+						},
+						{
+							pattern: /^\d+$/,
+							message: '请输入正确的数字',
+							trigger: 'blur'
+						},
+					],
+					underMoneys: [{
+							required: true,
+							message: '请输入最低金额',
+							trigger: 'blur'
+						},
+						{
+							pattern: /^\d+$/,
+							message: '请输入正确的数字',
+							trigger: 'blur'
+						},
+					],
+				},
+			}
+		},
+		computed: {},
+		watch: {},
+		created() {},
+		mounted() {},
+		methods: {
+			goBack() {
+				this.$emit('refresh')
+			},
+			// 查询卡种列表
+			ShowIdno() {
+				let dataInfo = {
+					"pageIndex": 1,
+					"pageSize": 3000,
+					"filterName": "",
+					"classId": 0
+				}
+				request({
+					url: `/api/RequestAQS/requestaqs/GetCardList`,
+					method: 'POST',
+					data: dataInfo
+				}).then(res => {
+					if (res.code == 200) {
+						this.idnoList = res.data.Data.List
+					} else {
+						this.$message.error(res.msg)
+					}
+				})
+			},
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+				this.visible = true;
+				this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.ShowIdno()
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						request({
+							url: '/api/Siberian/TbShareRatio/' + this.dataForm.id,
+							method: 'get'
+						}).then(res => {
+							// if(res.data.idNo){
+							// 	let info=JSON.parse(res.data.idNo)
+							// 	info.forEach((item,index)=>{
+							// 		item=item.toString()
+							// 	})
+							// 	res.data.idNo=JSON.stringify(info)
+							// 	console.log('组合',res.data.idNo)
+							// }
+							res.data.idNo=JSON.parse(res.data.idNo)
+							this.dataForm = res.data;
+						})
+					}
+				})
+			},
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+					if (valid) {
+						if (!this.dataForm.id) {
+							request({
+								url: `/api/Siberian/TbShareRatio`,
+								method: 'post',
+								data: this.dataForm,
+							}).then((res) => {
+								this.$message({
+									message: res.msg,
+									type: 'success',
+									duration: 1000,
+									onClose: () => {
+										this.visible = false,
+											this.$emit('refresh', true)
+									}
+								})
+							})
+						} else {
+							request({
+								url: '/api/Siberian/TbShareRatio/' + this.dataForm.id,
+								method: 'PUT',
+								data: this.dataForm
+							}).then((res) => {
+								this.$message({
+									message: res.msg,
+									type: 'success',
+									duration: 1000,
+									onClose: () => {
+										this.visible = false
+										this.$emit('refresh', true)
+									}
+								})
+							})
+						}
+					}
+				})
+			},
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbShareRatio/index.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbShareRatio/index.vue
new file mode 100644
index 0000000..76b1b71
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbShareRatio/index.vue
@@ -0,0 +1,274 @@
+<template>
+	<div class="NCC-common-layout">
+		<div class="NCC-common-layout-center">
+			<el-row class="NCC-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="卡种ID">
+							<el-input v-model="query.idNo" placeholder="卡种ID" clearable />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="一级代理">
+							<userSelect v-model="query.oneUserId" placeholder="请选择一级代理" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="二级代理">
+							<userSelect v-model="query.twoUserId" placeholder="请选择二级代理" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="NCC-common-layout-main NCC-flex-main">
+				<div class="NCC-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
+					</div>
+					<div class="NCC-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false"
+								@click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+				<NCC-table v-loading="listLoading" :data="list">
+					<el-table-column prop="idNo" label="卡种ID" align="left">
+						<template slot-scope="scope">
+							<el-button type="text" @click="Priview(scope.row.CardInfoList)">预览卡种</el-button>
+						</template>
+					</el-table-column>
+					<el-table-column prop="RealName" label="一级代理" align="left">
+						<template slot-scope="scope">
+							{{scope.row.oneUser&&scope.row.oneUser.RealName}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="RealName" label="二级代理" align="left">
+						<template slot-scope="scope">
+							{{scope.row.twoUser&&scope.row.twoUser.RealName}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="oneRatio" label="报备前一级比例" align="left" width="120">
+						<template slot-scope="scope">
+							{{scope.row.oneRatio}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="twoRatio" label="报备后二级比例" align="left" width="120">
+						<template slot-scope="scope">
+							{{scope.row.twoRatio}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="afterOneRatio" label="报备后一级比例" align="left" width="120">
+						<template slot-scope="scope">
+							{{scope.row.afterOneRatio}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="afterTwoRatio" label="报备后二级比例" align="left" width="120">
+						<template slot-scope="scope">
+							{{scope.row.afterTwoRatio}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="underMoneys" label="最低销售金额" align="left"  width="120">
+						<template slot-scope="scope">
+							{{scope.row.underMoneys}}$
+						</template>
+					</el-table-column>
+					
+					<el-table-column prop="creatorTime" label="创建时间" align="left" :formatter="ncc.tableDateFormat" />
+					<el-table-column prop="lastModifyTime" label="修改时间" align="left" :formatter="ncc.tableDateFormat" />
+					<el-table-column prop="underMoneys" label="最低金额" align="left" />
+
+
+					<el-table-column label="操作" fixed="right" width="100">
+						<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑</el-button>
+							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn">删除
+							</el-button>
+						</template>
+					</el-table-column>
+				</NCC-table>
+				<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+					@pagination="initData" />
+			</div>
+		</div>
+		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+		<el-dialog title="卡种信息" :visible.sync="dialogVisibleS">
+			<div style="display: flex;align-items: center;margin:10px;" v-for="(item,index) in arrays" :key="index">
+				<el-tag type="success">{{item.Title}}</el-tag>
+			</div>
+
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="dialogVisibleS = false">取 消</el-button>
+				<el-button type="primary" @click="dialogVisibleS = false">确 定</el-button>
+			</span>
+		</el-dialog>
+	</div>
+</template>
+<script>
+	import request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import NCCForm from './Form'
+	import ExportBox from './ExportBox'
+	import {
+		previewDataInterface
+	} from '@/api/systemData/dataInterface'
+	export default {
+		components: {
+			NCCForm,
+			ExportBox
+		},
+		data() {
+			return {
+				showAll: false,
+				dialogVisibleS: false,
+				query: {
+					idNo: undefined,
+					oneUserId: undefined,
+					twoUserId: undefined,
+				},
+				list: [],
+				arrays: [],
+				listLoading: true,
+				multipleSelection: [],
+				total: 0,
+				listQuery: {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				},
+				formVisible: false,
+				exportBoxVisible: false,
+				idnoList:[],
+				columnList: [{
+						prop: 'idNo',
+						label: '卡种ID'
+					},
+					{
+						prop: 'oneRatio',
+						label: '一级比例'
+					},
+					{
+						prop: 'twoRatio',
+						label: '二级比例'
+					},
+					{
+						prop: 'creatorTime',
+						label: '创建时间'
+					},
+					{
+						prop: 'lastModifyTime',
+						label: '修改时间'
+					},
+					{
+						prop: 'underMoneys',
+						label: '最低金额'
+					},
+					{
+						prop: 'oneUserId',
+						label: '一级代理'
+					},
+					{
+						prop: 'twoUserId',
+						label: '二级代理'
+					},
+				],
+			}
+		},
+		computed: {},
+		created() {
+			this.initData()
+		},
+		methods: {
+			
+			Priview(arr) {
+				console.log('信息', arr)
+				this.arrays = arr
+				this.dialogVisibleS = true
+			},
+			initData() {
+				this.listLoading = true;
+				let _query = {
+					...this.listQuery,
+					...this.query
+				};
+				let query = {}
+				for (let key in _query) {
+					if (Array.isArray(_query[key])) {
+						query[key] = _query[key].join()
+					} else {
+						query[key] = _query[key]
+					}
+				}
+				request({
+					url: `/api/Siberian/TbShareRatio`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					this.list = res.data.list
+					this.total = res.data.pagination.total
+					this.listLoading = false
+				})
+			},
+			handleDel(id) {
+				this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/Siberian/TbShareRatio/${id}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {});
+			},
+			addOrUpdateHandle(id, isDetail) {
+				this.formVisible = true
+				this.$nextTick(() => {
+					this.$refs.NCCForm.init(id, isDetail)
+				})
+			},
+			search() {
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			},
+			refresh(isrRefresh) {
+				this.formVisible = false
+				if (isrRefresh) this.reset()
+			},
+			reset() {
+				for (let key in this.query) {
+					this.query[key] = undefined
+				}
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			}
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbShop/ExportBox.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbShop/ExportBox.vue
new file mode 100644
index 0000000..4fc5c07
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbShop/ExportBox.vue
@@ -0,0 +1,66 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbShop/Form.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbShop/Form.vue
new file mode 100644
index 0000000..2d176c6
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbShop/Form.vue
@@ -0,0 +1,170 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+		<el-row :gutter="15" class="" >
+				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
+					<el-col :span="24">
+						<el-form-item label="用户" prop="userId">
+							<user-select v-model="dataForm.userId" placeholder="请选择" clearable required >
+							</user-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="商品" prop="goodsId">
+							<el-select v-model="dataForm.goodsId" placeholder="请选择" clearable required :style='{"width":"100%"}' >
+								<el-option v-for="(item, index) in goodsIdOptions" :key="index" :label="item.F_Title" :value="item.F_Id" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="规格信息" prop="jsonDetail">
+							<el-input v-model="dataForm.jsonDetail" placeholder="请输入规格信息" clearable :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="购买数量" prop="count">
+							<el-input-number v-model="dataForm.count" placeholder="数字文本" required :step="1" :min="1" >
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="创建时间" prop="creatorTime">
+							<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="修改时间" prop="lastModifyTime">
+							<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+	import request from '@/utils/request'
+	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				loading: false,
+				visible: false,
+				isDetail: false,
+				dataForm: {
+					id:'',
+					userId:undefined,
+					goodsId:undefined,
+					jsonDetail:undefined,
+					count:1,
+					creatorTime:undefined,
+					lastModifyTime:undefined,
+				},
+				rules: {
+					userId:[
+						{
+							required:true,
+							message:'请输入用户',
+							trigger:'change'
+						},
+					],
+					goodsId:[
+						{
+							required:true,
+							message:'请输入商品',
+							trigger:'change'
+						},
+					],
+					count:[
+						{
+							required:true,
+							message:'请输入购买数量',
+							trigger:["blur","change"]
+						},
+					],
+				},
+				goodsIdOptions : [],
+			}
+		},
+		computed: {},
+        watch: {},
+        created() {
+			this.getgoodsIdOptions();
+		},
+		mounted() {
+        },
+		methods: {
+			getgoodsIdOptions(){
+				previewDataInterface('337130169200280837').then(res => {
+					this.goodsIdOptions = res.data
+				});
+			},
+			goBack() {
+                this.$emit('refresh')
+            },
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+                this.visible = true;
+                this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						request({
+							url: '/api/Siberian/TbShop/' + this.dataForm.id,
+							method: 'get'
+						}).then(res =>{
+							this.dataForm = res.data;
+						})
+					}
+				})
+			},
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+                    if (valid) {
+                        if (!this.dataForm.id) {
+                            request({
+                                url: `/api/Siberian/TbShop`,
+                                method: 'post',
+                                data: this.dataForm,
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false,
+                                            this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        } else {
+                            request({
+                                url: '/api/Siberian/TbShop/' + this.dataForm.id,
+                                method: 'PUT',
+                                data: this.dataForm
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false
+                                        this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        }
+                    }
+                })
+			},
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbShop/index.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbShop/index.vue
new file mode 100644
index 0000000..6c2bcc8
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbShop/index.vue
@@ -0,0 +1,278 @@
+<template>
+	<div class="NCC-common-layout">
+		<div class="NCC-common-layout-center">
+			<el-row class="NCC-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="用户">
+							<userSelect v-model="query.userId" placeholder="请选择用户" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="商品">
+							<el-select v-model="query.goodsId" placeholder="商品" clearable>
+								<el-option v-for="(item, index) in goodsIdOptions" :key="index" :label="item.F_Title"
+									:value="item.F_Id" />
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="NCC-common-layout-main NCC-flex-main">
+				<div class="NCC-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
+					</div>
+					<div class="NCC-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false"
+								@click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+				<NCC-table v-loading="listLoading" :data="list">
+					<el-table-column prop="RealName" label="用户" align="left">
+						<template slot-scope="scope">
+							{{scope.row.user&&scope.row.user.RealName}}
+						</template>
+					</el-table-column>
+					<el-table-column label="商品" prop="Title" align="left">
+						<template slot-scope="scope">{{ scope.row.goods&&scope.row.goods.Title }}</template>
+					</el-table-column>
+					<el-table-column prop="jsonDetail" label="规格信息" align="left">
+						<template slot-scope="scope">
+							<el-button type="success" @click="ShowSku(scope.row.jsonDetail)">查看规格</el-button>
+						</template>
+					</el-table-column>
+					<el-table-column prop="count" label="购买数量" align="left" />
+					<el-table-column prop="creatorTime" label="创建时间" align="left" :formatter="ncc.tableDateFormat" />
+					<el-table-column prop="lastModifyTime" label="修改时间" align="left" :formatter="ncc.tableDateFormat" />
+					<el-table-column label="操作" fixed="right" width="100">
+						<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑</el-button>
+							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn">删除
+							</el-button>
+						</template>
+					</el-table-column>
+				</NCC-table>
+				<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+					@pagination="initData" />
+			</div>
+		</div>
+		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+		<el-dialog title="规格" :visible.sync="dialogVisibleS">
+
+			<el-card class="box-card">
+				<div slot="header" class="clearfix">
+					<span>{{dataInfo&&dataInfo.Title}}</span>
+				</div>
+				<div class="text item">
+					<div >
+						卡种ID:{{dataInfo&&dataInfo.IdNo}}
+					</div>
+					<div>
+						总数:{{dataInfo&&dataInfo.TotalCount}}
+					</div>
+					<div>
+						使用数:{{dataInfo&&dataInfo.UsedCount}}
+					</div>
+					<div>
+						价格:{{dataInfo&&dataInfo.PurPrice}}
+					</div>
+				</div>
+			</el-card>
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="dialogVisibleS = false">取 消</el-button>
+				<el-button type="primary" @click="dialogVisibleS = false">确 定</el-button>
+			</span>
+		</el-dialog>
+	</div>
+</template>
+<script>
+	import request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import NCCForm from './Form'
+	import ExportBox from './ExportBox'
+	import {
+		previewDataInterface
+	} from '@/api/systemData/dataInterface'
+	export default {
+		components: {
+			NCCForm,
+			ExportBox
+		},
+		data() {
+			return {
+				dialogVisibleS: false,
+				query: {
+					userId: undefined,
+					goodsId: undefined,
+				},
+				list: [],
+				listLoading: true,
+				multipleSelection: [],
+				total: 0,
+				listQuery: {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				},
+				formVisible: false,
+				exportBoxVisible: false,
+				columnList: [{
+						prop: 'userId',
+						label: '用户'
+					},
+					{
+						prop: 'goodsId',
+						label: '商品'
+					},
+					{
+						prop: 'jsonDetail',
+						label: '规格信息'
+					},
+					{
+						prop: 'count',
+						label: '购买数量'
+					},
+					{
+						prop: 'creatorTime',
+						label: '创建时间'
+					},
+					{
+						prop: 'lastModifyTime',
+						label: '修改时间'
+					},
+				],
+				goodsIdOptions: [],
+				dataInfo: undefined
+			}
+		},
+		computed: {},
+		created() {
+			this.initData()
+			this.getgoodsIdOptions();
+		},
+		methods: {
+			ShowSku(item) {
+				console.log('信息', item)
+				this.dialogVisibleS = true
+				this.dataInfo = JSON.parse(item)
+				console.log('data庶几乎', this.dataInfo)
+			},
+			getgoodsIdOptions() {
+				previewDataInterface('337130169200280837').then(res => {
+					this.goodsIdOptions = res.data
+				});
+			},
+			initData() {
+				this.listLoading = true;
+				let _query = {
+					...this.listQuery,
+					...this.query
+				};
+				let query = {}
+				for (let key in _query) {
+					if (Array.isArray(_query[key])) {
+						query[key] = _query[key].join()
+					} else {
+						query[key] = _query[key]
+					}
+				}
+				request({
+					url: `/api/Siberian/TbShop`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					this.list = res.data.list
+					this.total = res.data.pagination.total
+					this.listLoading = false
+				})
+			},
+			handleDel(id) {
+				this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/Siberian/TbShop/${id}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {});
+			},
+			addOrUpdateHandle(id, isDetail) {
+				this.formVisible = true
+				this.$nextTick(() => {
+					this.$refs.NCCForm.init(id, isDetail)
+				})
+			},
+			search() {
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			},
+			refresh(isrRefresh) {
+				this.formVisible = false
+				if (isrRefresh) this.reset()
+			},
+			reset() {
+				for (let key in this.query) {
+					this.query[key] = undefined
+				}
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			}
+		}
+	}
+</script>
+
+<style>
+	.text {
+		font-size: 14px;
+	}
+
+	.item {
+		margin-bottom: 18px;
+	}
+
+	.clearfix:before,
+	.clearfix:after {
+		display: table;
+		content: "";
+	}
+
+	.clearfix:after {
+		clear: both
+	}
+
+	.box-card {
+		width: 480px;
+	}
+</style>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbUserInviteLog/ExportBox.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbUserInviteLog/ExportBox.vue
new file mode 100644
index 0000000..4fc5c07
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbUserInviteLog/ExportBox.vue
@@ -0,0 +1,66 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbUserInviteLog/Form.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbUserInviteLog/Form.vue
new file mode 100644
index 0000000..fe32269
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbUserInviteLog/Form.vue
@@ -0,0 +1,162 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
+		<el-row :gutter="15" class="" >
+				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
+					<el-col :span="24">
+						<el-form-item label="用户" prop="userId">
+							<user-select v-model="dataForm.userId" placeholder="请选择" clearable required >
+							</user-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="之前归属用户" prop="beforeInviteUserId">
+							<user-select v-model="dataForm.beforeInviteUserId" placeholder="请选择" clearable required >
+							</user-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="更改为的归属用户" prop="afterInviteUserId">
+							<user-select v-model="dataForm.afterInviteUserId" placeholder="请选择" clearable required >
+							</user-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="备注" prop="remark">
+							<el-input v-model="dataForm.remark" placeholder="请输入" clearable :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="创建时间" prop="creatorTime">
+							<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="修改时间" prop="lastModifyTime">
+							<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+	import request from '@/utils/request'
+	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				loading: false,
+				visible: false,
+				isDetail: false,
+				dataForm: {
+					id:'',
+					userId:undefined,
+					beforeInviteUserId:undefined,
+					afterInviteUserId:undefined,
+					remark:undefined,
+					creatorTime:undefined,
+					lastModifyTime:undefined,
+				},
+				rules: {
+					userId:[
+						{
+							required:true,
+							message:'请输入用户',
+							trigger:'change'
+						},
+					],
+					beforeInviteUserId:[
+						{
+							required:true,
+							message:'请输入之前归属用户',
+							trigger:'change'
+						},
+					],
+					afterInviteUserId:[
+						{
+							required:true,
+							message:'请输入更改为的归属用户',
+							trigger:'change'
+						},
+					],
+				},
+			}
+		},
+		computed: {},
+        watch: {},
+        created() {
+		},
+		mounted() {
+        },
+		methods: {
+			goBack() {
+                this.$emit('refresh')
+            },
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+                this.visible = true;
+                this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						request({
+							url: '/api/Siberian/TbUserInviteLog/' + this.dataForm.id,
+							method: 'get'
+						}).then(res =>{
+							this.dataForm = res.data;
+						})
+					}
+				})
+			},
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+                    if (valid) {
+                        if (!this.dataForm.id) {
+                            request({
+                                url: `/api/Siberian/TbUserInviteLog`,
+                                method: 'post',
+                                data: this.dataForm,
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false,
+                                            this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        } else {
+                            request({
+                                url: '/api/Siberian/TbUserInviteLog/' + this.dataForm.id,
+                                method: 'PUT',
+                                data: this.dataForm
+                            }).then((res) => {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                    onClose: () => {
+                                        this.visible = false
+                                        this.$emit('refresh', true)
+                                    }
+                                })
+                            })
+                        }
+                    }
+                })
+			},
+		}
+	}
+</script>
diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbUserInviteLog/index.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbUserInviteLog/index.vue
new file mode 100644
index 0000000..8540e74
--- /dev/null
+++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbUserInviteLog/index.vue
@@ -0,0 +1,225 @@
+<template>
+	<div class="NCC-common-layout">
+		<div class="NCC-common-layout-center">
+			<el-row class="NCC-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="用户">
+							<userSelect v-model="query.userId" placeholder="请选择用户" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="之前归属用户">
+							<userSelect v-model="query.beforeInviteUserId" placeholder="请选择之前归属用户" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="更改为的归属用户">
+							<userSelect v-model="query.afterInviteUserId" placeholder="请选择更改为的归属用户" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="NCC-common-layout-main NCC-flex-main">
+				<div class="NCC-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除</el-button>
+					</div>
+					<div class="NCC-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false" @click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+                <NCC-table v-loading="listLoading" :data="list" has-c @selection-change="handleSelectionChange">
+					<el-table-column prop="userId" label="用户" align="left" >
+						<template slot-scope="scope">
+							{{scope.row.user&&scope.row.user.RealName}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="RealName" label="之前归属用户" align="left" >
+						<template slot-scope="scope">
+							{{scope.row.beforeInviteUser&&scope.row.beforeInviteUserId.RealName}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="afterInviteUserId" label="更改为的归属用户" align="left" >
+						<template slot-scope="scope">
+								{{scope.row.afterInviteUser&&scope.row.afterInviteUser.RealName}}
+							</template>
+						</el-table-column>
+					<el-table-column prop="remark" label="备注" align="left" />
+					<el-table-column prop="creatorTime" label="创建时间" align="left"  :formatter="ncc.tableDateFormat"/>
+					<el-table-column prop="lastModifyTime" label="修改时间" align="left"  :formatter="ncc.tableDateFormat"/>
+					<el-table-column label="操作" fixed="right" width="100">
+							<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
+							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
+						</template>
+					</el-table-column>
+				</NCC-table>
+                <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
+            </div>
+        </div>
+		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+	</div>
+</template>
+<script>
+    import request from '@/utils/request'
+    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+    import NCCForm from './Form'
+    import ExportBox from './ExportBox'
+    import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+        components: { NCCForm, ExportBox },
+        data() {
+            return {
+                showAll: false,
+				query: {
+                    userId:undefined,
+                    beforeInviteUserId:undefined,
+                    afterInviteUserId:undefined,
+				},
+                list: [],
+                listLoading: true,
+                multipleSelection: [], total: 0,
+                listQuery: {
+                    currentPage: 1,
+                    pageSize: 20,
+					sort: "desc",
+                    sidx: "",
+                },
+                formVisible: false,
+                exportBoxVisible: false,
+                columnList: [
+                    { prop: 'userId', label: '用户' },
+                    { prop: 'beforeInviteUserId', label: '之前归属用户' },
+                    { prop: 'afterInviteUserId', label: '更改为的归属用户' },
+                    { prop: 'remark', label: '备注' },
+                    { prop: 'creatorTime', label: '创建时间' },
+                    { prop: 'lastModifyTime', label: '修改时间' },
+				],
+			}
+        },
+		computed: {},
+		created() {
+			this.initData()
+		},
+		methods: {
+			initData() {
+                this.listLoading = true;
+                let _query = {
+                    ...this.listQuery,
+                    ...this.query
+                };
+                let query = {}
+                for (let key in _query) {
+                    if (Array.isArray(_query[key])) {
+                        query[key] = _query[key].join()
+                    } else {
+                        query[key] = _query[key]
+                    }
+                }
+                request({
+                    url: `/api/Siberian/TbUserInviteLog`,
+                    method: 'GET',
+                    data: query
+                }).then(res => {
+                    this.list = res.data.list
+                    this.total = res.data.pagination.total
+                    this.listLoading = false
+                })
+            },
+			handleDel(id) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    request({
+                        url: `/api/Siberian/TbUserInviteLog/${id}`,
+                        method: 'DELETE'
+                    }).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            onClose: () => {
+                                this.initData()
+                            }
+                        });
+                    })
+                }).catch(() => {
+                });
+            },
+			handleSelectionChange(val) {
+                const res = val.map(item => item.id)
+                this.multipleSelection = res
+            },
+            handleBatchRemoveDel() {
+                if (!this.multipleSelection.length) {
+                    this.$message({
+                        type: 'error',
+                        message: '请选择一条数据',
+                        duration: 1500,
+                    })
+                    return
+                }
+                const ids = this.multipleSelection
+                this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    request({
+                        url: `/api/Siberian/TbUserInviteLog/batchRemove`,
+                        method: 'POST',
+                        data: ids ,
+                    }).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            onClose: () => {
+                                this.initData()
+                            }
+                        });
+                    })
+                }).catch(() => { })
+            },
+			addOrUpdateHandle(id, isDetail) {
+                this.formVisible = true
+                this.$nextTick(() => {
+                    this.$refs.NCCForm.init(id, isDetail)
+                })
+            },
+			search() {
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            },
+            refresh(isrRefresh) {
+                this.formVisible = false
+                if (isrRefresh) this.reset()
+            },
+            reset() {
+                for (let key in this.query) {
+                    this.query[key] = undefined
+                }
+                this.listQuery = {
+                    currentPage: 1,
+                    pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            }
+		}
+    }
+</script>
\ No newline at end of file