init

App.vue

@@ -1,7 +1,10 @@
 <script>
 	export default {
-		onLaunch: function() {
-
+		onLaunch: function(option) {
+		uni.showModal({
+			title: '提示',
+			content: option
+		})
 			
 		},
 		methods: {

common/httpList/login.js

@@ -28,6 +28,14 @@ export default {
 			noToken: true
 		})
 	},
+	//查询等级列表
+	gradelist(data) {
+		return myRequest({
+			url: '/grade/list',
+			method: 'get',
+			data: data
+		})
+	},
 	refreshUserInfo() {
 		this.getInfo().then(resdata => {
 			if(resdata.data.code == 200){

components/home.vue

@@ -56,7 +56,7 @@
 								<u-subsection
 									@change="sectionChange"
 									height="54"
-									button-color="#2F4379"
+									button-color="rgba(47,67,121,0.6)"
 									bg-color="#F8F9FF"
 									active-color="#FFFFFF"
 									inactive-color="#636A75"

components/my.vue

@@ -11,10 +11,10 @@
 				<u-col span="6">
 					<view style="display: flex;">
 						<navigator class="name" url="/pages2/wd/avatar" hover-class="none">{{ userInfo.nickname }}</navigator>
-						<navigator class="tag" url="/pages2/wd/level" hover-class="none">初出茅庐</navigator>
+						<navigator class="tag" url="/pages2/wd/level" hover-class="none">{{levelList[userInfo.userLevel -1]}}</navigator>
 					</view>
 					<navigator url="/pages2/wd/level" hover-class="none" style="position: relative;margin-top: 20rpx;">
-						<view class="progress_text">0/1000</view>
+						<view class="progress_text">{{userInfo.integral}}/{{userLevelList[userInfo.userLevel -1]}}</view>
 						<u-line-progress height="8" active-color="#2F4379" :percent="0" :show-percent="false"></u-line-progress>
 					</navigator>
 				</u-col>
@@ -124,12 +124,23 @@ export default {
 			show: false,
 			collectTotal: 0,
 			rank: 0,
-			issue: 0
+			issue: 0,
+			levelList: ['初出茅庐','崭露头角','自成一派','小有名气','惊艳四座','初露锋芒'],
+			userLevelList: []
 		};
 	},
 	mounted() {
+		
 	},
 	methods: {
+		getLevel(){
+			var self = this
+			this.$api.gradelist().then(res => {
+				res.data.rows.forEach((item,index) => {
+					self.userLevelList.push(item.needIntegralEnd)
+				})
+			})
+		},
 		qd() {
 			var self = this
 			var data = {
@@ -149,6 +160,7 @@ export default {
 		},
 		init() {
 			this.getInfoAttached();
+			this.getLevel()
 		},
 		jumpPopup() {
 			this.show = true;

pages/index/index.vue

@@ -10,7 +10,7 @@
 <script>
 import home from '@/components/home.vue';
 import my from '@/components/my.vue';
-import { mapState, mapMutations } from 'vuex';
+	import {mapGetters} from 'vuex';
 export default {
 	components: {
 		home,
@@ -38,25 +38,9 @@ export default {
 	onLoad(option) {},
 	onShow() {},
 	onShareAppMessage: function(res) {
-		var self = this;
 		return {
 			title: '中正',
-			path: `/pages/index/index`,
-			success(res) {
-				if (self.$store.state.userInfo !== null) {
-					console.log('已登录');
-					var data = {
-						taskType: 3
-					};
-					self.$api.taskShare(data).then(result => {});
-				}
-			},
-			fail(res) {
-				uni.showToast({
-					title: '分享失败',
-					icon: 'none'
-				});
-			}
+			path: `/pages/index/index?inviteCode`
 		};
 	},
 	methods: {
@@ -78,7 +62,7 @@ export default {
 	},
 	onReachBottom() {},
 	onPullDownRefresh() {},
-	computed: { ...mapState(['login']) }
+	computed: {...mapGetters(['userInfo'])}
 };
 </script>
 

pages2/bank/detail.vue

@@ -194,10 +194,10 @@
 					<image :src="collecStatus ? '/static/star.png' : '/static/sc.png'" class="sc"></image>
 					<view class="sc_t">收藏</view>
 				</view>
-				<view class="buy" v-if="payStatus === 0" @click="buyTK">
+				<view class="buy" v-if="payStatus === 1" @click="buyTK">
 					立即购买
 				</view>
-				<view class="buy" v-if="payStatus === 1" @click="jumpExam">模拟考试</view>
+				<view class="buy" v-if="payStatus === 0" @click="jumpExam">模拟考试</view>
 			</view>
 		</view>
 		<u-popup v-model="showBox" mode="bottom" border-radius="14">

pages2/bank/question.vue

@@ -200,6 +200,11 @@ export default {
 		if (option.examId) {
 			this.examId = option.examId;
 		}
+		if(option.sc === 'false' && option.ct === 'false'){
+			if(option.examId){
+				console.log(option.examId,15235)
+			}
+		}
 		this.titleListFn(option);
 	},
 	methods: {
@@ -509,7 +514,6 @@ export default {
 					});
 					return;
 				}
-				console.log(option);
 				self.$api.questiondetailList(data).then(res => {
 					if (res.data.rows.length) {
 						res.data.rows.forEach((items, indexs) => {

pages2/plan/detail.vue

@@ -2,16 +2,16 @@
 	<view style="padding: 30rpx;">
 		<view class="card" v-if="havePlan">
 			<view class="date_t1">
-				<u-icon name="arrow-left"  size="28" v-if="havePreviousMonth" @click="swipeMonth(-1)"></u-icon>
-			<text style="padding: 0 15rpx;">{{calendarStudyVo.year}}年 {{calendarStudyVo.month}}月</text>
-			<u-icon name="arrow-right"  size="28" v-if="haveNextMonth" @click="swipeMonth(1)"></u-icon>
+				<u-icon name="arrow-left" size="28" v-if="havePreviousMonth" @click="swipeMonth(-1)"></u-icon>
+				<text style="padding: 0 15rpx;">{{ calendarStudyVo.year }}年 {{ calendarStudyVo.month }}月</text>
+				<u-icon name="arrow-right" size="28" v-if="haveNextMonth" @click="swipeMonth(1)"></u-icon>
 			</view>
 			<view style="width: 100%;display: flex;justify-content:center;margin-top: 20rpx;">
 				<view v-for="(item, index) in date" :key="index" class="card_date">{{ item }}</view>
 			</view>
 			<view style="width: 100%;margin-top: 20rpx;">
 				<view v-for="(item, index) in showDayList" :key="index" class="date_num">
-					<view v-if="item.color == 0" class="date_num_color0" v-show="item.date>0">
+					<view v-if="item.color == 0" class="date_num_color0" v-show="item.date > 0">
 						{{ item.date }}
 						<view v-if="item.note > 0" class="date_note">{{ item.note }}</view>
 						<view v-if="item.dot" class="date_dot"></view>
@@ -79,7 +79,7 @@
 				</uni-swipe-action-item>
 			</uni-swipe-action>
 		</view>
-		
+
 		<view class="newPlan" @click="newPlan()">新建计划</view>
 	</view>
 </template>
@@ -88,10 +88,10 @@
 export default {
 	data() {
 		return {
-			monthIndex:0,
-			haveNextMonth:false,
-			havePreviousMonth:false,
-			showDayList:[],
+			monthIndex: 0,
+			haveNextMonth: false,
+			havePreviousMonth: false,
+			showDayList: [],
 			workList: [],
 			calendarStudyVo: {},
 			index: 0,
@@ -157,94 +157,93 @@ export default {
 					}
 				}
 			],
-			dayStudyList:[],
-			listItem:{},
-			currentMonth:0,
-			havePlan:false
+			dayStudyList: [],
+			listItem: {},
+			currentMonth: 0,
+			havePlan: false
 		};
 	},
 	onLoad(option) {
 		this.date_use = this.date_num;
-		
-		this.getList();
 	},
 	onShow() {
-		
+		this.getList();
 	},
 	methods: {
 		//删除计划
-		delWorker(option){
+		delWorker(option) {
 			var data = {
 				planId: option.planId,
 				status: 0
-			}
+			};
 			this.$api.planupdateGenerate(data).then(res => {
-				this.getList()
-			})
+				this.getList();
+			});
 		},
-		swipeMonth(index){
+		swipeMonth(index) {
 			this.isOpen = false;
-			this.haveNextMonth = false
-			this.havePreviousMonth = false
-			this.monthIndex = this.monthIndex + index
-			this.currentMonth = this.currentMonth + index
-			 let item = this.listItem.calendarStudyVo[this.monthIndex]
-			 this.calendarStudyVo = item
-			 this.workList = this.calendarStudyVo.coursePlanVo;
-			 if(this.monthIndex>0){
-			 	this.havePreviousMonth = true
-			 }
-			 if(this.monthIndex<this.listItem.calendarStudyVo.length-1){
-			 	this.haveNextMonth = true
-			 }
-			 this.dealDayList()
+			this.haveNextMonth = false;
+			this.havePreviousMonth = false;
+			this.monthIndex = this.monthIndex + index;
+			this.currentMonth = this.currentMonth + index;
+			let item = this.listItem.calendarStudyVo[this.monthIndex];
+			this.calendarStudyVo = item;
+			this.workList = this.calendarStudyVo.coursePlanVo;
+			if (this.monthIndex > 0) {
+				this.havePreviousMonth = true;
+			}
+			if (this.monthIndex < this.listItem.calendarStudyVo.length - 1) {
+				this.haveNextMonth = true;
+			}
+			this.dealDayList();
 		},
-		dealMonth(){
+		dealMonth() {
 			let date = new Date();
-			let currentMonth = date.getMonth()+1;
-			this.haveNextMonth = false
-			this.havePreviousMonth = false
-			for(let i=0;i<this.listItem.calendarStudyVo.length;i++){
-				 let item = this.listItem.calendarStudyVo[i]
-				if(item.month==currentMonth){
-					this.monthIndex = i
-					this.calendarStudyVo = item
-					this.workList = this.calendarStudyVo.coursePlanVo;
-					if(i>0){
-						this.havePreviousMonth = true
-					}
-					if(i<this.listItem.calendarStudyVo.length-1){
-						this.haveNextMonth = true
+			let currentMonth = date.getMonth() + 1;
+			this.haveNextMonth = false;
+			this.havePreviousMonth = false;
+			if (this.listItem !== undefined) {
+				for (let i = 0; i < this.listItem.calendarStudyVo.length; i++) {
+					let item = this.listItem.calendarStudyVo[i];
+					if (item.month == currentMonth) {
+						this.monthIndex = i;
+						this.calendarStudyVo = item;
+						this.workList = this.calendarStudyVo.coursePlanVo;
+						if (i > 0) {
+							this.havePreviousMonth = true;
+						}
+						if (i < this.listItem.calendarStudyVo.length - 1) {
+							this.haveNextMonth = true;
+						}
 					}
 				}
-				
+				this.dealDayList();
 			}
-			this.dealDayList()
 		},
-		openEdit(item){
-			this.listItem = item
+		openEdit(item) {
+			this.listItem = item;
 			this.isOpen = false;
-			this.dealMonth()
+			this.dealMonth();
 		},
-		dealDayList(){
-			let firstItem = this.calendarStudyVo.dayStudyList[0]
-			this.calendarStudyVo.miniDayStudyList = [] //创建缩放的数组
+		dealDayList() {
+			let firstItem = this.calendarStudyVo.dayStudyList[0];
+			this.calendarStudyVo.miniDayStudyList = []; //创建缩放的数组
 			let date = new Date();
 			let num = date.getDate();
-			for(let i = 0; i < firstItem.studyDay; i++) {
-				this.calendarStudyVo.dayStudyList.unshift({date:0})
+			for (let i = 0; i < firstItem.studyDay; i++) {
+				this.calendarStudyVo.dayStudyList.unshift({ date: 0 });
 			}
 			let todayIndex;
 			let todayItem;
-			for(let i = 0; i < this.calendarStudyVo.dayStudyList.length; i++) {
-			    let item = this.calendarStudyVo.dayStudyList[i]
-				item.color = 0
+			for (let i = 0; i < this.calendarStudyVo.dayStudyList.length; i++) {
+				let item = this.calendarStudyVo.dayStudyList[i];
+				item.color = 0;
 				if (item.date == num) {
-					if(date.getMonth()+1 ==this.calendarStudyVo.month){
+					if (date.getMonth() + 1 == this.calendarStudyVo.month) {
 						item.color = 3;
 					}
-					todayIndex = i
-					todayItem = item
+					todayIndex = i;
+					todayItem = item;
 				}
 				if (item.perform == 1) {
 					item.color = 1;
@@ -252,14 +251,14 @@ export default {
 				if (item.perform == 2) {
 					item.color = 2;
 				}
-				item.note = item.studyCourseKnob
-				if(item.note>0){
-					item.dot = true
+				item.note = item.studyCourseKnob;
+				if (item.note > 0) {
+					item.dot = true;
 				}
 			}
-			let start = todayIndex - todayItem.studyDay
-			this.calendarStudyVo.miniDayStudyList = this.calendarStudyVo.dayStudyList.slice(start,start+7)
-			this.showDayList = this.calendarStudyVo.miniDayStudyList
+			let start = todayIndex - todayItem.studyDay;
+			this.calendarStudyVo.miniDayStudyList = this.calendarStudyVo.dayStudyList.slice(start, start + 7);
+			this.showDayList = this.calendarStudyVo.miniDayStudyList;
 		},
 		jumpDetail(item) {
 			this.$navTo.togo('/pages2/course/detail', {
@@ -297,13 +296,13 @@ export default {
 					item.show = 'none';
 				});
 				self.list = result.data.data;
-				self.listItem = self.list[0]
-				self.dealMonth()
-	//			self.calendarStudyVo = result.data.data[0].calendarStudyVo[1];
-				if(self.list.length>0){
-					self.listItem = self.list[0]
-					self.dealMonth()
-					self.havePlan = true
+				self.listItem = self.list[0];
+				self.dealMonth();
+				//			self.calendarStudyVo = result.data.data[0].calendarStudyVo[1];
+				if (self.list.length > 0) {
+					self.listItem = self.list[0];
+					self.dealMonth();
+					self.havePlan = true;
 				}
 			});
 		},
@@ -327,11 +326,11 @@ export default {
 		},
 		close_calendar() {
 			this.isOpen = false;
-			this.showDayList = this.calendarStudyVo.miniDayStudyList
+			this.showDayList = this.calendarStudyVo.miniDayStudyList;
 		},
 		oepn_calendar() {
 			this.isOpen = true;
-			this.showDayList = this.calendarStudyVo.dayStudyList
+			this.showDayList = this.calendarStudyVo.dayStudyList;
 		},
 		random(min, max) {
 			return Math.floor(Math.random() * (max - min)) + min;
@@ -340,7 +339,6 @@ export default {
 };
 </script>
 
-
 <style scope>
 .newPlan {
 	width: 200rpx;
@@ -515,7 +513,6 @@ export default {
 	width: 100%;
 	text-align: center;
 	padding: 20rpx 0;
-
 }
 .card {
 	width: 100%;

pages2/plan/edit.vue

@@ -2,7 +2,7 @@
 	<view style="padding: 30rpx;">
 		<view class="list_box">
 			<view class="item" v-for="(item, index) in list" :key="index">
-				<image :src="item.coverUrl"></image>
+				<image :src="$method.splitImgHost(item.coverUrl)"></image>
 				<text>{{ item.courseName }}</text>
 				<view class="del_icon"><u-icon name="minus-circle-fill" color="#EB4D3D" size="40" @click="delItem(index)"></u-icon></view>
 			</view>

pages2/wd/coupon.vue

@@ -1,170 +1,112 @@
 <template>
-	<view  >
+	<view>
 		<view class="box_head">
-			<uni-segmented-control :current="current" :values="items" @clickItem="onClickItem" styleType="button" activeColor="#2F4379"></uni-segmented-control>       
+			<uni-segmented-control :current="current" :values="items" @clickItem="onClickItem" styleType="button" activeColor="#2F4379"></uni-segmented-control>
 		</view>
 		<view class="box">
-			<view >
-			    <view v-show="current === 0">
-			        <view class="content" v-for="(item,index) in list1" :key="index">
+			<view>
+				<view v-show="current === 0">
+					<view class="content" v-for="(item, index) in list1" :key="index">
 						<view>
-							<u-row >
-								<u-col span="4" >
+							<u-row>
+								<u-col span="4">
 									<view class="price_box">
-										<text class="price_num">{{item.price}}</text>
+										<text class="price_num">{{ item.price }}</text>
 										<text class="price_unit">元</text>
 									</view>
 								</u-col>
-								<u-col span="8" >
+								<u-col span="8">
 									<view style="margin-top: 20rpx;">
-										<u-row >
-											<u-col span="6" >
-												<view class="coupon_title">
-													课程现金券
-												</view>
-											</u-col>
-											<u-col span="4" offset="2">
-												<view class="coupon_btn">
-													立即使用
-												</view>
-											</u-col>
+										<u-row>
+											<u-col span="6"><view class="coupon_title">课程现金券</view></u-col>
+											<u-col span="4" offset="2"><view class="coupon_btn">立即使用</view></u-col>
 										</u-row>
 									</view>
-									<view class="date">
-										有效期：
-									</view>
-									<view class="time">
-										{{ $method.timestampToTime(item.createTime) }} ~ {{ $method.timestampToTime(item.endTime) }}
+									<view class="date">有效期：</view>
+									<view class="time">{{ $method.timestampToTime(item.createTime) }} ~ {{ $method.timestampToTime(item.endTime) }}</view>
+									<view class="tip">仅部分课程使用</view>
+								</u-col>
+							</u-row>
+						</view>
+					</view>
+				</view>
+				<view v-show="current === 1">
+					<view class="content" v-for="(item, index) in list2" :key="index">
+						<view>
+							<u-row>
+								<u-col span="4">
+									<view class="price_box">
+										<text class="price_num">{{ item.price }}</text>
+										<text class="price_unit">折</text>
 									</view>
-									<view class="tip">
-										仅部分课程使用
+								</u-col>
+								<u-col span="8">
+									<view style="margin-top: 20rpx;">
+										<u-row>
+											<u-col span="6"><view class="coupon_title">课程折扣券</view></u-col>
+											<u-col span="4" offset="2"><view class="coupon_btn">立即使用</view></u-col>
+										</u-row>
 									</view>
+									<view class="date">有效期：</view>
+									<view class="time">{{ $method.timestampToTime(item.createTime) }} ~ {{ $method.timestampToTime(item.endTime) }}</view>
+									<view class="tip">仅部分课程可使用</view>
 								</u-col>
 							</u-row>
 						</view>
 					</view>
-			    </view>
-			    <view v-show="current === 1">
-			        <view class="content" v-for="(item,index) in list2" :key="index">
-			        	<view>
-			        		<u-row >
-			        			<u-col span="4" >
-			        				<view class="price_box">
-			        					<text class="price_num">{{item.price}}</text>
-			        					<text class="price_unit">折</text>
-			        				</view>
-			        			</u-col>
-			        			<u-col span="8" >
-			        				<view style="margin-top: 20rpx;">
-			        					<u-row >
-			        						<u-col span="6" >
-			        							<view class="coupon_title">
-			        								课程折扣券
-			        							</view>
-			        						</u-col>
-			        						<u-col span="4" offset="2">
-			        							<view class="coupon_btn">
-			        								立即使用
-			        							</view>
-			        						</u-col>
-			        					</u-row>
-			        				</view>
-			        				<view class="date">
-			        					有效期：
-			        				</view>
-			        				<view class="time">
-			        					{{ $method.timestampToTime(item.createTime) }} ~ {{ $method.timestampToTime(item.endTime) }}
-			        				</view>
-			        				<view class="tip">
-			        					仅部分课程可使用
-			        				</view>
-			        			</u-col>
-			        		</u-row>
-			        	</view>
-			        </view>
-			    </view>
-			</view>
-		</view>
-		<view class="footer">
-			<view class="footer_btn" @click="openPopup">
-				失效券
+				</view>
 			</view>
 		</view>
+		<view class="footer"><view class="footer_btn" @click="openPopup">失效券</view></view>
 		<u-popup v-model="show" mode="bottom" :safe-area-inset-bottom="true">
-			<view class="popup_box" >
-				<scroll-view scroll-y="true" class="popup_list" >
-				<view class="content" v-for="(item,index) in list3" :key="index" v-show="current === 0">
-					<view style="position: relative;">
-						<u-row >
-							<u-col span="4" >
-								<view class="price_box">
-									<text class="price_num">20</text>
-									<text class="price_unit">元</text>
-								</view>
-							</u-col>
-							<u-col span="8" >
-								<view style="margin-top: 20rpx;">
-									<u-row >
-										<u-col span="6" >
-											<view class="coupon_title">
-												课程现金券
-											</view>
-										</u-col>
-										
-									</u-row>
-								</view>
-								<view class="date">
-									有效期：
-								</view>
-								<view class="time">
-									{{ $method.timestampToTime(item.createTime) }} ~ {{ $method.timestampToTime(item.endTime) }}
-								</view>
-								<view class="tip">
-									仅部分课程可使用
-								</view>
-							</u-col>
-						</u-row>
-						<view>
-							<image :src="item" class="status_img"></image>
+			<view class="popup_box">
+				<scroll-view scroll-y="true" class="popup_list">
+					<view class="content" v-for="(item, index) in list3" :key="index" v-show="current === 0">
+						<view style="position: relative;">
+							<u-row>
+								<u-col span="4">
+									<view class="price_box">
+										<text class="price_num">20</text>
+										<text class="price_unit">元</text>
+									</view>
+								</u-col>
+								<u-col span="8">
+									<view style="margin-top: 20rpx;">
+										<u-row>
+											<u-col span="6"><view class="coupon_title">课程现金券</view></u-col>
+										</u-row>
+									</view>
+									<view class="date">有效期：</view>
+									<view class="time">{{ $method.timestampToTime(item.createTime) }} ~ {{ $method.timestampToTime(item.endTime) }}</view>
+									<view class="tip">仅部分课程可使用</view>
+								</u-col>
+							</u-row>
+							<view><image :src="item" class="status_img"></image></view>
 						</view>
 					</view>
-				</view>
-				<view class="content" v-for="(item,index) in list4" :key="index" v-show="current === 1">
-					<view style="position: relative;">
-						<u-row >
-							<u-col span="4" >
-								<view class="price_box">
-									<text class="price_num">5.5</text>
-									<text class="price_unit">折</text>
-								</view>
-							</u-col>
-							<u-col span="8" >
-								<view style="margin-top: 20rpx;">
-									<u-row >
-										<u-col span="6" >
-											<view class="coupon_title">
-												课程折扣券
-											</view>
-										</u-col>
-										
-									</u-row>
-								</view>
-								<view class="date">
-									有效期：
-								</view>
-								<view class="time">
-									{{ $method.timestampToTime(item.createTime) }} ~ {{ $method.timestampToTime(item.endTime) }}
-								</view>
-								<view class="tip">
-									仅部分课程可使用
-								</view>
-							</u-col>
-						</u-row>
-						<view>
-							<image :src="item" class="status_img"></image>
+					<view class="content" v-for="(item, index) in list4" :key="index" v-show="current === 1">
+						<view style="position: relative;">
+							<u-row>
+								<u-col span="4">
+									<view class="price_box">
+										<text class="price_num">5.5</text>
+										<text class="price_unit">折</text>
+									</view>
+								</u-col>
+								<u-col span="8">
+									<view style="margin-top: 20rpx;">
+										<u-row>
+											<u-col span="6"><view class="coupon_title">课程折扣券</view></u-col>
+										</u-row>
+									</view>
+									<view class="date">有效期：</view>
+									<view class="time">{{ $method.timestampToTime(item.createTime) }} ~ {{ $method.timestampToTime(item.endTime) }}</view>
+									<view class="tip">仅部分课程可使用</view>
+								</u-col>
+							</u-row>
+							<view><image :src="item" class="status_img"></image></view>
 						</view>
 					</view>
-				</view>
 				</scroll-view>
 			</view>
 		</u-popup>
@@ -172,303 +114,295 @@
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				items: [
-					'现金券（0）', 
-					'折扣券（0）'
-				],
-				list:[],
-				current:0,
-				show:false,
-				list2:[],
-				list1:['/static/coupon/overdue.png',
-				'/static/coupon/used.png','/static/coupon/used.png',
-				'/static/coupon/overdue.png','/static/coupon/overdue.png'],
-				paramList: [
-					{
-						pageNum: 1,
-						pageSize: 10,
-						total: 0,
-						showStatus: 0,
-						couponType:0,
-						userStatus:0
-					},
-					{
-						pageNum: 1,
-						pageSize: 10,
-						total: 0,
-						showStatus: 0,
-						couponType:1,
-						userStatus:0
-					}
-				],
-				list1: [],
-				list2: [],
-				list3: [],
-				list4: [],
-				userParamList: [
-					{
-						pageNum: 1,
-						pageSize: 10,
-						total: 0,
-						couponType:0,
-						userStatus:2
-					},
-					{
-						pageNum: 1,
-						pageSize: 10,
-						total: 0,
-						couponType:1,
-						userStatus:2
-					}
-				],
-			}
+export default {
+	data() {
+		return {
+			items: ['现金券（0）', '折扣券（0）'],
+			list: [],
+			current: 0,
+			show: false,
+			list2: [],
+			list1: ['/static/coupon/overdue.png', '/static/coupon/used.png', '/static/coupon/used.png', '/static/coupon/overdue.png', '/static/coupon/overdue.png'],
+			paramList: [
+				{
+					pageNum: 1,
+					pageSize: 10,
+					total: 0,
+					showStatus: 0,
+					couponType: 0,
+					userStatus: 0
+				},
+				{
+					pageNum: 1,
+					pageSize: 10,
+					total: 0,
+					showStatus: 0,
+					couponType: 1,
+					userStatus: 0
+				}
+			],
+			list1: [],
+			list2: [],
+			list3: [],
+			list4: [],
+			userParamList: [
+				{
+					pageNum: 1,
+					pageSize: 10,
+					total: 0,
+					couponType: 0,
+					userStatus: 2
+				},
+				{
+					pageNum: 1,
+					pageSize: 10,
+					total: 0,
+					couponType: 1,
+					userStatus: 2
+				}
+			]
+		};
+	},
+	onReachBottom() {
+		console.log(32423);
+	},
+	onLoad(option) {
+		this.getList1();
+		this.getList2();
+		this.getList3();
+		this.getList4();
+	},
+	onShow() {},
+	methods: {
+		getList1() {
+			let self = this;
+			let param = this.paramList[0];
+			self.$api.configurationlistCoupon(param).then(res => {
+				self.list1 = res.data.rows;
+				self.paramList[0].total = res.data.total;
+				self.items[0] = '现金券（' + res.data.total + '）';
+			});
 		},
-		onReachBottom() {
-			console.log(32423)
+		getList2() {
+			let self = this;
+			let param = this.paramList[1];
+			self.$api.configurationlistCoupon(param).then(res => {
+				self.list2 = res.data.rows;
+				self.paramList[1].total = res.data.total;
+				self.items[1] = '折扣券（' + res.data.total + '）';
+			});
 		},
-		onLoad(option) {
-			this.getList1()
-			this.getList2()
-			this.getList3()
-			this.getList4()
+		getList3() {
+			let self = this;
+			let param = this.userParamList[0];
+			self.$api.configurationlistCoupon(param).then(res => {
+				self.list3 = res.data.rows;
+				self.userParamList[0].total = res.data.total;
+			});
 		},
-		onShow(){
+		getList4() {
+			let self = this;
+			let param = this.userParamList[1];
+			self.$api.configurationlistCoupon(param).then(res => {
+				self.list4 = res.data.rows;
+				self.userParamList[1].total = res.data.total;
+			});
 		},
-		methods: {
-			getList1(){
-				let self = this
-				let param = this.paramList[0]
-				self.$api.configurationlistCoupon(param).then(res => {
-					self.list1 = res.data.rows;
-					self.paramList[0].total = res.data.total;
-					self.items[0] = '现金券（'+res.data.total+'）'
-				});
-			},
-			getList2(){
-				let self = this
-				let param = this.paramList[1]
-				self.$api.configurationlistCoupon(param).then(res => {
-					self.list2 = res.data.rows;
-					self.paramList[1].total = res.data.total;
-					self.items[1] = '折扣券（'+res.data.total+'）'
-				});
-			},
-			getList3(){
-				let self = this
-				let param = this.userParamList[0]
-				self.$api.configurationlistCoupon(param).then(res => {
-					self.list3 = res.data.rows;
-					self.userParamList[0].total = res.data.total;
-				});
-			},
-			getList4(){
-				let self = this
-				let param = this.userParamList[1]
-				self.$api.configurationlistCoupon(param).then(res => {
-					self.list4 = res.data.rows;
-					self.userParamList[1].total = res.data.total;
-				});
-			},
-			onClickItem(e){
-				this.current = e.currentIndex
-			},
-			openPopup(){
-				this.show = true
-			}
-		
+		onClickItem(e) {
+			this.current = e.currentIndex;
 		},
-		
+		openPopup() {
+			this.show = true;
+		}
 	}
+};
 </script>
 <style>
-	::-webkit-scrollbar{
-		width: 0;
-		height: 0;
-		color: transparent;
-	}
-	.u-drawer-content-visible{
-		border-radius: 32rpx 32rpx 0rpx 0rpx;
-		overflow: hidden;
-	}
+::-webkit-scrollbar {
+	width: 0;
+	height: 0;
+	color: transparent;
+}
+.u-drawer-content-visible {
+	border-radius: 32rpx 32rpx 0rpx 0rpx;
+	overflow: hidden;
+}
 </style>
 <style scope>
-	.status_img{
-		width: 161rpx;
-		height: 161rpx;
-		position: absolute;
-		top: 40rpx;
-		left: 20%;
-	}
-	.popup_list{
-		border-radius: 32rpx 32rpx 0rpx 0rpx;
-		height: 580rpx;
-		margin-bottom: 20rpx;
-	}
-	.popup_box{
-		height: 600rpx;
-		box-shadow: 0rpx 0rpx 16rpx 4rpx rgba(145, 156, 178, 0.1);
-		border-radius: 32rpx 32rpx 0rpx 0rpx;
-		background: #F2F3F6;
-		padding-left: 20rpx;
-		padding-right: 20rpx;
-	}
-	.footer_btn{
-		width: 686rpx;
-		height: 88rpx;
-		background: #FFFFFF;
-		box-shadow: 0rpx 0rpx 16rpx 4rpx rgba(145, 156, 178, 0.1);
-		border-radius: 32rpx;
-		text-align: center;
-		line-height: 88rpx;
-		margin: 0 auto;
-		margin-top: 10rpx;
-	}
-	.footer{
-		position: fixed;
-		bottom: 0;
-		width: 100%;
-		height: 120rpx;
-		background: #F2F3F6;
-		text-align: center;
-	}
-	.price_box view{
-		padding: 0;
-	}
-	.date{
-		font-size: 20rpx;
-		color: #636A75;
-		margin-top: 20rpx;
-	}
-	.time{
-		font-size: 20rpx;
-		color: #636A75;
-		margin-top: 20rpx;
-	}
-	.tip{
-		font-size: 20rpx;
-		color: #636A75;
-		opacity: 0.5;
-		margin-top: 20rpx;
-	}
-	.coupon_btn{
-		width: 112rpx;
-		height: 48rpx;
-		background: #32467B;
-		border-radius: 16rpx;
-		line-height: 48rpx;
-		text-align: center;
-		font-size: 20rpx;
-		color: #FFFFFF;
-	}
-	.coupon_title{
-		width: 140rpx;
-		height: 48rpx;
-		background: #FFFFFF;
-		border: 2rpx solid #32467B;
-		border-radius: 16rpx;
-		font-size: 24rpx;
-		color: #636A75;
-		line-height: 48rpx;
-		text-align: center;
-	}
-	.price_box{
-		text-align: center;
-		vertical-align: middle;
-		height: 240rpx;
-		border-right:1px dashed #EEEEEE;
-	}
-	.price_unit{
-		font-size: 24rpx;
-		color: #636A75;
-	}
-	.price_num{
-		font-size: 88rpx;
-		font-family: Impact;
-		font-weight: bold;
-		color: #32467B;
-		line-height: 240rpx;
-	}
-	.box_head{
-		z-index: 999;
-		padding: 20rpx 100rpx;
-		height: 96rpx;
-		position: fixed;
-		width: 100%;
-		background-color: #F2F3F6;
-		text-align: center;
-	}
-	.box{
-		padding-top: 96rpx;
-		padding-left: 20rpx;
-		padding-right: 20rpx;
-		padding-bottom: 120rpx;
-		overflow-x: hidden;
-		overflow-y: auto;
-	}
-	.c_log{
-		font-size: 20rpx;
-		font-family: PingFang SC;
-		font-weight: 400;
-		color: #2F4379;
-		position: absolute;
-		bottom: 10rpx;
-	}
-	.c_title{
-		font-size: 30rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #2F4379;
-		padding-top: 10rpx;
-	}
-	.c_img{
-		width: 278rpx;
-		height: 134rpx;
-	}
-	.c_t1{
-		font-size: 20rpx;
-		color: #2F4379;
-		padding: 15rpx;
-	}
-	.content{
-		margin-top: 20rpx;
-		width: 100%;
-		height: 240rpx;
-		background: #FFFFFF;
-		border-radius: 32rpx;	
-		position: relative;
-	}
-	.content:after {
-	    content: '';
-	    position: absolute;
-	    top: 0px;
-	    bottom: 0px;
-	    left: -35rpx;
-	    width: 70rpx;
-	    height: 100%;
-	    background: radial-gradient(circle, #F2F3F6, #F2F3F6 30rpx, transparent 35rpx);
-	}
-	.content:before {
-	    content: '';
-	    position: absolute;
-	    top: 0px;
-	    bottom: 0px;
-	    right: -35rpx;
-	    width: 70rpx;
-	    height: 100%;
-	    background: radial-gradient(circle, #F2F3F6, #F2F3F6 30rpx, transparent 35rpx);
-	}
-	.segmented-control__text{
-		font-size: 24rpx !important;
-	}
-	.segmented-control{
-		height: 56rpx !important;
-		background-color: #F8F9FF;
-	}
-	
+.status_img {
+	width: 161rpx;
+	height: 161rpx;
+	position: absolute;
+	top: 40rpx;
+	left: 20%;
+}
+.popup_list {
+	border-radius: 32rpx 32rpx 0rpx 0rpx;
+	height: 580rpx;
+	margin-bottom: 20rpx;
+}
+.popup_box {
+	height: 600rpx;
+	box-shadow: 0rpx 0rpx 16rpx 4rpx rgba(145, 156, 178, 0.1);
+	border-radius: 32rpx 32rpx 0rpx 0rpx;
+	background: #f2f3f6;
+	padding-left: 20rpx;
+	padding-right: 20rpx;
+}
+.footer_btn {
+	width: 686rpx;
+	height: 88rpx;
+	background: #ffffff;
+	box-shadow: 0rpx 0rpx 16rpx 4rpx rgba(145, 156, 178, 0.1);
+	border-radius: 32rpx;
+	text-align: center;
+	line-height: 88rpx;
+	margin: 0 auto;
+	margin-top: 10rpx;
+}
+.footer {
+	position: fixed;
+	bottom: 0;
+	width: 100%;
+	height: 120rpx;
+	background: #f2f3f6;
+	text-align: center;
+}
+.price_box view {
+	padding: 0;
+}
+.date {
+	font-size: 20rpx;
+	color: #636a75;
+	margin-top: 20rpx;
+}
+.time {
+	font-size: 20rpx;
+	color: #636a75;
+	margin-top: 20rpx;
+}
+.tip {
+	font-size: 20rpx;
+	color: #636a75;
+	opacity: 0.5;
+	margin-top: 20rpx;
+}
+.coupon_btn {
+	width: 112rpx;
+	height: 48rpx;
+	background: #32467b;
+	border-radius: 16rpx;
+	line-height: 48rpx;
+	text-align: center;
+	font-size: 20rpx;
+	color: #ffffff;
+}
+.coupon_title {
+	width: 140rpx;
+	height: 48rpx;
+	background: #ffffff;
+	border: 2rpx solid #32467b;
+	border-radius: 16rpx;
+	font-size: 24rpx;
+	color: #636a75;
+	line-height: 48rpx;
+	text-align: center;
+}
+.price_box {
+	text-align: center;
+	vertical-align: middle;
+	height: 240rpx;
+	border-right: 1px dashed #eeeeee;
+}
+.price_unit {
+	font-size: 24rpx;
+	color: #636a75;
+}
+.price_num {
+	font-size: 88rpx;
+	font-family: Impact;
+	font-weight: bold;
+	color: #32467b;
+	line-height: 240rpx;
+}
+.box_head {
+	z-index: 999;
+	padding: 20rpx 100rpx;
+	height: 96rpx;
+	position: fixed;
+	width: 100%;
+	background-color: #f2f3f6;
+	text-align: center;
+}
+.box {
+	padding-top: 96rpx;
+	padding-left: 20rpx;
+	padding-right: 20rpx;
+	padding-bottom: 120rpx;
+	overflow-x: hidden;
+	overflow-y: auto;
+}
+.c_log {
+	font-size: 20rpx;
+	font-family: PingFang SC;
+	font-weight: 400;
+	color: #2f4379;
+	position: absolute;
+	bottom: 10rpx;
+}
+.c_title {
+	font-size: 30rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #2f4379;
+	padding-top: 10rpx;
+}
+.c_img {
+	width: 278rpx;
+	height: 134rpx;
+}
+.c_t1 {
+	font-size: 20rpx;
+	color: #2f4379;
+	padding: 15rpx;
+}
+.content {
+	margin-top: 20rpx;
+	width: 100%;
+	height: 240rpx;
+	background: #ffffff;
+	border-radius: 32rpx;
+	position: relative;
+}
+.content:after {
+	content: '';
+	position: absolute;
+	top: 0px;
+	bottom: 0px;
+	left: -35rpx;
+	width: 70rpx;
+	height: 100%;
+	background: radial-gradient(circle, #f2f3f6, #f2f3f6 30rpx, transparent 35rpx);
+}
+.content:before {
+	content: '';
+	position: absolute;
+	top: 0px;
+	bottom: 0px;
+	right: -35rpx;
+	width: 70rpx;
+	height: 100%;
+	background: radial-gradient(circle, #f2f3f6, #f2f3f6 30rpx, transparent 35rpx);
+}
+.segmented-control__text {
+	font-size: 24rpx !important;
+}
+.segmented-control {
+	height: 56rpx !important;
+	background-color: #f8f9ff;
+}
+
 page {
-		background: #F2F3F6;
-	}
-</style>
+	background: #f2f3f6;
+}
+</style>

pages2/wd/help.vue

@@ -8,7 +8,7 @@
 					<view>{{ item.activityName }}</view>
 					<view><u-icon name="info-circle" color="#2F4379" size="28" @click="openActivesList(item)"></u-icon></view>
 				</view>
-				<view><image :src="$method.splitImgHost()" style="width: 100%;height: 330rpx;"></image></view>
+				<view><image :src="$method.splitImgHost(item.liveAdress)" style="width: 100%;height: 330rpx;"></image></view>
 				<u-row>
 					<u-col span="6">
 						<view class="box_title">{{ $method.timestampToTime(item.startTime) }}至{{ $method.timestampToTime(item.endTime) }}</view>

pages2/wd/level.vue

@@ -21,7 +21,7 @@
 			<scroll-view class="r_sliper" scroll-x="true" >
 				<view v-for="(item,index) in list" :key="index" class="sv_item_box item_bac1" :style="'background:'+item.bac">
 					<view style="display: flex;">
-						<view class="left_t" >
+						<view class="left_t" v-if="userInfo.userLevel -1 === index">
 							当前等级
 						</view>
 						<view style="position: relative;">
@@ -32,9 +32,9 @@
 						</view>
 					</view>
 					<view class="progress_box">
-						<view class="progress_text">0/1000</view>
+						<view class="progress_text">{{userInfo.integral}}/{{userLevelList[index].needIntegralEnd}}</view>
 						<u-line-progress height="8" inactive-color="rgba(47, 67, 121, 0.1)" :active-color="item.title_color" :percent="0" :show-percent="false"></u-line-progress>
-						<view class="tip">{{item.tip}}</view>
+						<view class="tip">还需 {{userLevelList[index].needIntegralEnd - userInfo.integral}} 经验可升级成为{{item.tip}}</view>
 					</view>
 				</view>
 			</scroll-view>
@@ -116,7 +116,7 @@
 								<view class="box_qd">观看课程视频5分钟</view>
 							</u-col>
 							<u-col offset="2" span="3" text-align="right">
-								<view class="box2_btn" v-if="taskType4 === 0">去完成</view>
+								<view class="box2_btn" v-if="taskType4 === 0" @click="jumpmenu(4)">去完成</view>
 								<view class="box3_btn" v-if="taskType4 === 1">
 									已完成
 								</view>
@@ -156,7 +156,8 @@
 								<view class="box_qd">转发分享给好友</view>
 							</u-col>
 							<u-col offset="2" span="3" text-align="right">
-								<view class="box2_btn" v-if="taskType3 === 0">去完成</view>
+								<button class="box2_btn" open-type="share" v-if="taskType3 === 0" >去完成</button>
+								<!-- <view class="box2_btn" v-if="taskType3 === 0" @click="jumpPagesz">去完成</view> -->
 								<view class="box3_btn" v-if="taskType3 === 1">
 									已完成
 								</view>
@@ -197,35 +198,35 @@
 						title_color:'#0046AB',
 						name:'初出茅庐',
 						img:'/static/level/flower_1.png',
-						tip:'还需 651 经验可升级成为「崭露头角」',
+						tip:'「崭露头角」',
 						bac:'linear-gradient(45deg, rgba(99, 163, 255, 0.8), rgba(182, 220, 255, 0.8), rgba(114, 190, 255, 0.8));'
 					},
 					{
 						title_color:'#6724BD',
 						name:'崭露头角',
 						img:'/static/level/flower_2.png',
-						tip:'还需 651 经验可升级成为「自成一派」',
+						tip:'「自成一派」',
 						bac:'linear-gradient(45deg, rgba(152, 14, 188, 0.4), rgba(173, 108, 254, 0.4));'
 					},
 					{
 						title_color:'#27BA27',
 						name:'自成一派',
 						img:'/static/level/flower_3.png',
-						tip:'还需 651 经验可升级成为「小有名气」',
+						tip:'「小有名气」',
 						bac:'linear-gradient(45deg, rgba(8, 202, 96, 0.4), rgba(66, 254, 64, 0.4));'
 					},
 					{
 						title_color:'#E17713',
 						name:'小有名气',
 						img:'/static/level/flower_4.png',
-						tip:'还需 651 经验可升级成为「惊艳四座」',
+						tip:'「惊艳四座」',
 						bac:'linear-gradient(45deg, rgba(231, 105, 45, 0.4), rgba(255, 169, 90, 0.4));'
 					},
 					{
 						title_color:'#C21A7A',
 						name:'惊艳四座',
 						img:'/static/level/flower_5.png',
-						tip:'还需 651 经验可升级成为「初露锋芒」',
+						tip:'「初露锋芒」',
 						bac:'linear-gradient(45deg, rgba(148, 38, 117, 0.4), rgba(228, 83, 165, 0.4));'
 					},
 					{
@@ -242,16 +243,27 @@
 				taskType2: 0,
 				taskType3: 0,
 				taskType4: 0,
-				
+				userLevelList: []
 			}
 		},
 		onLoad(option) {
 			this.getInit()
 			this.getInitList()
+			this.getLevel()
 		},
-		onShow(){
+		onShareAppMessage: function(res) {
+			return {
+				title: '中正',
+				path: `/pages/index/index?inviteCode=${this.userInfo.userAccout}`
+			};
 		},
 		methods: {
+			getLevel(){
+				var self = this
+				this.$api.gradelist().then(res => {
+					self.userLevelList = res.data.rows
+				})
+			},
 			qd() {
 				var self = this
 				var data = {
@@ -260,6 +272,11 @@
 				self.$api.taskSignIn(data).then(res => {
 					if(res.data.code === 200){
 						self.getInit()
+						self.$api.refreshUserInfo()
+						uni.showToast({
+							title: '签到成功',
+							icon: 'none'
+						})
 					}
 				})
 			},