更改提交

api/user.js

@@ -35,7 +35,7 @@ let request = new Request().http
  }
  //微信小程序登录
  export function loginByMiniApp(data) {
- 	 return request('/app/wx/miniapp/loginByMa',data,'POST','application/json;charset=UTF-8');
+ 	 return request('/course_uniapp/app/wx/miniapp/loginByMa',data,'POST','application/json;charset=UTF-8');
  }
  
  //微信小程序查询用户信息

common/request.js

@@ -17,7 +17,7 @@ export default class Request {
 		// let path = 'http://x8489c8e.natappfree.cc'//
 		 
 		// let path = 'https://userapp.fbylive.com'//福本源
-		// let path = 'https://userapp.zkhj6.com'//中康
+		let path = 'https://userapp.zkhj6.com'//中康
 		// let path = 'https://company.h5.test.ylrztop.com/api'//云融融智
 		// let path = 'https://userapp.ashyisheng.com'//蜂巢快药
 		// let path = 'https://userapp.whhm.ylrzcloud.com/prod-api'//惠名大药房
@@ -25,7 +25,7 @@ export default class Request {
 		// let path = 'https://userapp.liangmiaoedu.com'//良苗
 		// let path = 'https://usercourse.beliyostore.com'//倍力优
 		// let path = 'https://userapp.bainian1000y.cn/prod-api'//百年康城
-		let path = 'https://userapp.drkzyy.cn/prod-api'//青岛市德瑞康
+		// let path = 'https://userapp.drkzyy.cn/prod-api'//青岛市德瑞康
 		// let path = 'https://companyapp.gjh2024.com/apis'//金康键
 		
 		// let path = 'https://userapp.cqsft.vip'//四福堂
@@ -45,7 +45,7 @@ export default class Request {
 			// // path = 'https://scrm.gjh2024.com'//金康键
 			//张玉朋
 			// let path = 'http://192.168.10.158:7014'//
-			// path = 'https://userapp.zkhj6.com'//中康
+			path = 'https://userapp.zkhj6.com'//中康
 			// path = 'https://company.h5.test.ylrztop.com/api'//云融融智
 			// path = 'https://userapp.ashyisheng.com'//蜂巢快药（爱上嘉园）
 			// path = 'https://userapp.liangmiaoedu.com'//良苗
@@ -53,7 +53,7 @@ export default class Request {
 			// path = 'https://userapp.bainian1000y.cn/prod-api'//百年康城
 			// path = 'https://userapp.whhm.ylrzcloud.com/prod-api'//惠名大药房
 			// path = 'https://userapp.cqsft.vip'//四福堂
-			path = 'https://userapp.drkzyy.cn/prod-api'//青岛市德瑞康
+			// path = 'https://userapp.drkzyy.cn/prod-api'//青岛市德瑞康
 			// path = 'https://userapp.gjh2024.com/apis'//金康键
 			// path = 'http://192.168.10.131:7014'
 			//#ifdef MP-WEIXIN

components/enterpriseimg.vue

@@ -19,13 +19,13 @@
 		data() {
 			return {
 				statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
-				enterpriseimg:'',
+				enterpriseimg:'	https://zkzh-2025.oss-cn-beijing.aliyuncs.com/fs/20250717/452fd8fedf0240538a6a0670596bca11.png',
 			};
 		},
 		mounted() {
 			console.log(this.$store.state.imgpath)
 			const imgs = []
-			this.getenterprise()
+			// this.getenterprise()
 		},
 		methods: {
 			getenterprise(){

components/liveCourse.vue

@@ -1,28 +1,6 @@
 <template>
 	<view class="container">
 		<view class="headbox">
-			<!-- <view class="headnav x-bc">
-				<view :class="activeTab == 0 ? 'headnav-item headnav-active':'headnav-item'" @click="handleNav(0)">
-					<view>直播计划</view>
-					<view class="headnav-num">3</view>
-					<image :src="imgPath+'/app/images/idle.png'" mode="aspectFill"></image>
-				</view>
-				<view :class="activeTab == 1? 'headnav-item headnav-active':'headnav-item'" @click="handleNav(1)">
-					<view>今日直播</view>
-					<view class="headnav-num">3</view>
-					<image :src="imgPath+'/app/images/streaming.png'" mode="aspectFill"></image>
-				</view>
-				<view :class="activeTab == 2 ? 'headnav-item headnav-active':'headnav-item'" @click="handleNav(2)">
-					<view>往日直播</view>
-					<view class="headnav-num">3</view>
-					<image :src="imgPath+'/app/images/finished.png'" mode="aspectFill"></image>
-				</view>
-			</view> -->
-			<!-- <view class="x-bc">
-				<view :class="searchbarNav == index ? 'searchbar x-c searchbar-active':'searchbar x-c'" v-for="(item,index) in searchbar" :key="index" @click="clickSearchbar(index)">
-					<text>{{item.name}}</text><u-icon class="arrow-down" name="arrow-down" :color="searchbarNav == index ?'#1677ff':'#999'" size="12"></u-icon>
-				</view>
-			</view> -->
 			<dropdownPanel :filterData='filterData' @onChange="onChange" @confirm="confirm" @reset="reset"
 			@onClick="selindex">
 			<!-- <view class="justify-center align-center">

manifest.json

@@ -109,7 +109,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx29d26f63f836be7f",
+        "appid" : "wx414427b10866c04e",
         "setting" : {
             "urlCheck" : true,
             "postcss" : true

note.txt

@@ -7,6 +7,7 @@
 蜂巢快药（爱上嘉园）：wx903d9aee9cffb320
 好宜生佳园（蜂巢）：wxa843c1c3e52efbf8
 中康未来智慧：wxedde588767b358b1
+中康（新）：wx414427b10866c04e
 同顺堂：wx6fbd7f185732fd95
 良苗：wx80dc06697b583cd9
 倍力优看课：wx301ab2fad04c658a

pages/auth/wxlogin.vue

@@ -112,7 +112,7 @@ export default {
 		getWxCode() {
 			//在微信公众号请求用户网页授权之前，开发者需要先到公众平台官网中的“开发 - 接口权限 - 网页服务 - 网页帐号 - 网页授权获取用户基本信息”的配置选项中，修改授权回调域名。请注意，这里填写的是域名（是一个字符串），而不是URL，因此请勿加 http:// 等协议头； 
 			//http://shequ.natapp1.cc/#/pages/index/index?deviceId=8
-			var appId="wx29d26f63f836be7f";
+			var appId="wx414427b10866c04e";
 			var url="https://company.h5.test.ylrztop.com";
 			window.location.href ='https://open.weixin.qq.com/connect/oauth2/authorize?appid='+appId+'&redirect_uri=' +encodeURIComponent(url+"/#/pages/auth/wxLogin") +'&response_type=code&scope=snsapi_userinfo&state=JeffreySu-954&connect_redirect=1#wechat_redirect';
 			//console.log('https://open.weixin.qq.com/connect/oauth2/authorize?appid='+appId+'&redirect_uri=' +encodeURIComponent("http://shequ.natapp1.cc/#/pages/index/index?deviceId="+this.deviceId) +'&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect')

pages/courseManage/manage/lableSetup.vue

@@ -157,6 +157,8 @@
 							icon: 'none',
 							title: '标签删除成功'
 						})
+						this.isSelectAll=false
+						this.selectedCount=0
 						this.getcompanylabel()
 					}else {
 						uni.showToast({
@@ -256,6 +258,7 @@
 						checked: this.isSelectAll
 					}
 				})
+				this.selectidAll = this.companylabel.filter(item => item.checked).map(item => item.tagId)
 				const seletnum = this.companylabel.filter(item => item.checked).map(item => item.tagId)
 				this.selectedCount=seletnum.length
 				console.log(this.companylabel)

pages/courseManage/statistics.vue

@@ -152,7 +152,7 @@
 										<view style="flex: 1;overflow: hidden;display: flex;">
 											<text class="list-item-name one-t">{{item.nickName}}</text>
 											<image class="list-item-copy" :src="imgPath+'/app/images/copy_icon.png'"
-												mode="aspectFill"></image>
+												mode="aspectFill" @click="copyId(item.nickName)"></image>
 										</view>
 										<view class="list-item-re">
 											注册时间：{{item.createTime?item.createTime.substring(0,10):'--'}}</view>
@@ -428,16 +428,18 @@
 					this.changetag=this.companytag
 				})
 			},
-			copyId() {
-				uni.setClipboardData({
-					data: this.info.courseName,
-					success: () => {
-						uni.showToast({
-							title: '复制课程标题成功',
-							icon: 'none'
-						})
-					}
-				});
+			copyId(name) {
+				setTimeout(()=>{
+					uni.setClipboardData({
+						data: name,
+						success: () => {
+							uni.showToast({
+								title: '用户昵称复制成功',
+								icon: 'none'
+							})
+						}
+					});
+				},100)
 			},
 			clickTab(e) {
 				this.current = e.index

pages/customer/index.vue

@@ -660,7 +660,7 @@
 					if (res.code == 200) {
 						this.pageOptions.pageNum = 1
 						// console.log(this.pageOptions.pageNum)
-						this.getfsuserListdata()
+						this.getfsuserListdata('refresh')
 						// 创建一个在**秒后执行的定时器
 						const timer = setTimeout(function() {
 							uni.showToast({
@@ -670,6 +670,7 @@
 						}, 200);
 						this.getvipListnum()
 						this.isShowSelectAll = false
+						this.isSelectAll =false
 					} else {
 						uni.showToast({
 							icon: 'none',
@@ -976,13 +977,15 @@
 				changeLable(params).then(res => {
 					if (res.code == 200) {
 						this.userList = []
-						this.getfsuserListdata()
+						this.getfsuserListdata('refresh')
 						const timer = setTimeout(function() {
 							uni.showToast({
 								icon: 'none',
 								title: '标签更改成功'
 							})
 						}, 500);
+						this.isSelectAll=false
+						this.selectedCount=0
 					} else {
 						uni.showToast({
 							icon: 'none',
@@ -1103,7 +1106,7 @@
 				Addblacklist(this.selectidAll).then(res => {
 					if (res.code == 200) {
 						this.pageOptions.pageNum = 1
-						this.getfsuserListdata()
+						this.getfsuserListdata('refresh')
 						// 创建一个在**秒后执行的定时器
 						const timer = setTimeout(function() {
 							uni.showToast({
@@ -1112,7 +1115,8 @@
 							})
 						}, 200);
 						this.getvipListnum()
-						this.isShowSelectAll = false
+						// this.isShowSelectAll = false
+						this.isSelectAll =false
 					} else {
 						uni.showToast({
 							icon: 'none',
@@ -1167,18 +1171,18 @@
 					this.registerTimeIndex = ''
 					this.endTime = ''
 					this.startTime = ''
-					this.getfsuserListdata()
+					this.getfsuserListdata('refresh')
 					// console.log(this.getfsuserListdata())
 				} else if (type == 'watchStatus') {
 					this.watchStatusIndex = 0
-					this.getfsuserListdata()
+					this.getfsuserListdata('refresh')
 				} else if (type == 'userStatus') {
 					this.userStatusIndex = 0
 					this.salesid = ''
-					this.getfsuserListdata()
+					this.getfsuserListdata('refresh')
 				} else if (type == 'courseStatus') {
 					this.courseStatusIndex = 0
-					this.getfsuserListdata()
+					this.getfsuserListdata('refresh')
 				} else {
 
 				}
@@ -1192,25 +1196,25 @@
 					if (value == 0) {
 						this.startTime = ''
 						this.endTime = ''
-						this.getfsuserListdata()
+						this.getfsuserListdata('refresh')
 					} else if (value == 1) {
 						this.startTime = this.todayday + ' 00:00:00'
 						this.endTime = this.todayday + ' 23:59:59'
-						this.getfsuserListdata()
+						this.getfsuserListdata('refresh')
 					} else if (value == 2) {
 						let yesterday = new Date();
 						yesterday.setDate(yesterday.getDate() - 1);
 						this.startTime = uni.$u.timeFormat(yesterday, 'yyyy-mm-dd') + ' 00:00:00'
 						this.endTime = uni.$u.timeFormat(yesterday, 'yyyy-mm-dd') + ' 23:59:59'
-						this.getfsuserListdata()
+						this.getfsuserListdata('refresh')
 					} else if (value == 3) {
 						let yesterday = new Date();
 						yesterday.setDate(yesterday.getDate() - 6);
 						this.startTime = uni.$u.timeFormat(yesterday, 'yyyy-mm-dd') + ' 00:00:00'
 						this.endTime = this.todayday + ' 23:59:59'
-						this.getfsuserListdata()
+						this.getfsuserListdata('refresh')
 					} else {
-						this.getfsuserListdata()
+						this.getfsuserListdata('refresh')
 					}
 				} else if (type == 'watchStatus') {
 					// this.watchStatusIndex=value
@@ -1220,13 +1224,13 @@
 				} else if (type == 'userStatus') {
 					if (this.userStatusIndex == 0) {
 						this.salesid = ''
-						this.getfsuserListdata()
+						this.getfsuserListdata('refresh')
 					} else {
-						this.getfsuserListdata()
+						this.getfsuserListdata('refresh')
 					}
 					// console.log(this.userStatusIndex)
 				} else if (type == 'courseStatus') {
-					this.getfsuserListdata()
+					this.getfsuserListdata('refresh')
 					console.log(this.courseStatusIndex)
 				}
 				// this.mescroll.resetUpScroll()

pages/index/index.vue

@@ -74,15 +74,16 @@
 		</view>
 		<view class="">
 			<u-calendar :show="showCalendar" :mode="mode" @confirm="confirmCalendar" style="flex: 0; overflow: hidden;"
-				@close="closeCalendar"></u-calendar>
+				@close="closeCalendar" :minDate="new Date().getTime()-(3600*1000*24*60)" :maxDate="new Date().getTime()"
+				></u-calendar>
 		</view>
 		<view class="statistics pb120" :style="{height: contentH}">
 			<u-collapse :border='false' :value='collapseValue' @change="changeCollapse">
 				<!-- #ifdef MP-WEIXIN -->
 				<u-collapse-item name="course" title="课程统计">
 				<!-- #endif -->
-				<!-- #ifndef MP-WEIXIN -->
-				<u-collapse-item name="course">
+					<!-- #ifndef MP-WEIXIN -->
+					<u-collapse-item name="course">
 						<text slot="title" class="statistics-title">课程统计</text>
 						<!-- #endif -->
 						<text slot="value"
@@ -93,11 +94,14 @@
 						<view class="collapse-content x-ac">
 							<view class="collapse-content-item">
 								<view class="collapse-content-title">观看人数</view>
-								<view class="collapse-content-num"><text>{{courseCount.courseWatchNum?courseCount.courseWatchNum:'0' }}</text>人
+								<view class="collapse-content-num">
+									<text>{{courseCount.courseWatchNum?courseCount.courseWatchNum:'0' }}</text>人
 								</view>
 								<view style="color: #1677ff;" v-show="queryParam.type == 0">
-									较昨天持平{{compare(courseCount.courseWatchNum,yesterdayVO.courseWatchNum?yesterdayVO.courseWatchNum:'0')}}</view>
-								<view v-show="queryParam.type == 0">昨天{{yesterdayVO.courseWatchNum?yesterdayVO.courseWatchNum:'0'}}</view>
+									较昨天持平{{compare(courseCount.courseWatchNum,yesterdayVO.courseWatchNum?yesterdayVO.courseWatchNum:'0')}}
+								</view>
+								<view v-show="queryParam.type == 0">
+									昨天{{yesterdayVO.courseWatchNum?yesterdayVO.courseWatchNum:'0'}}</view>
 							</view>
 							<view class="collapse-content-item">
 								<view class="collapse-content-title">完播人数</view>
@@ -198,26 +202,6 @@
 											</view>
 										</view>
 									</view>
-									<!-- <view class="collapse-content x-ac" style="padding: 8px 0;">
-							<view class="collapse-content-item">
-								<view class="collapse-content-title">新会员奖励数</view>
-								<view class="collapse-content-num"><text>{{redPacketCount.newCount || 0}}</text>个</view>
-								<view style="color: #1677ff;" v-show="queryParam.type == 0">
-									较昨天持平{{compare(redPacketCount.newCount,redPacketCount.yesterdayNewCount)}}</view>
-								<view v-show="queryParam.type == 0">昨天{{redPacketCount.yesterdayNewCount || 0}}</view>
-							</view>
-							<view class="collapse-content-item">
-								<view class="collapse-content-title">新会员奖励金额</view>
-								<view class="collapse-content-num">
-									<text>{{redPacketCount.totalAmount || '0.00'}}</text>元
-								</view>
-								<view style="color: #1677ff;" v-show="queryParam.type == 0">
-									较昨天持平{{compare(redPacketCount.totalAmount,redPacketCount.yesterdayTotalAmount,1)}}
-								</view>
-								<view v-show="queryParam.type == 0">昨天{{redPacketCount.yesterdayTotalAmount || '0.00'}}
-								</view>
-							</view>
-						</view> -->
 								</view>
 							</u-collapse-item>
 							<!-- #ifdef MP-WEIXIN -->
@@ -326,7 +310,7 @@
 			</u-collapse>
 		</view>
 		<u-loading-page :loading="viewload" iconSize="32" loadingColor="#3c9cff" fontSize="20"
-		:loading-text="loadingtext"></u-loading-page>
+			:loading-text="loadingtext"></u-loading-page>
 	</view>
 </template>
 
@@ -346,8 +330,8 @@
 		},
 		data() {
 			return {
-				viewload:true,
-				loadingtext:'数据加载中...',
+				viewload: true,
+				loadingtext: '数据加载中...',
 				list1: [{
 					name: '按完播率',
 				}, {
@@ -455,7 +439,7 @@
 				// this.startTime = this.todayday
 				// this.endTime = this.todayday
 				// this.resetDate()
-				
+
 				const params = {
 					endTime: this.endTime + ' 23:59:59',
 					startTime: this.startTime + ' 00:00:00',
@@ -509,7 +493,7 @@
 					if (res.code == 200) {
 						this.ratelistState = res.data.every(item => item.value === 0);
 						this.getrateimg = res
-						console.log('漏斗',this.getrateimg)
+						console.log('漏斗', this.getrateimg)
 					} else {
 						uni.showToast({
 							icon: 'none',
@@ -590,7 +574,7 @@
 						this.companyUserUserCount = res.data.userTotal || 0
 						this.lablelistnum = res.data.tagList
 						this.$nextTick(() => {
-							this.viewload=false
+							this.viewload = false
 							this.$refs.pydameinvRef.init()
 						})
 					} else {
@@ -611,7 +595,7 @@
 			getCourseCounts(param) {
 				getCourseCount(param).then(res => {
 					if (res.code == 200) {
-						console.log('课程统计',res)
+						console.log('课程统计', res)
 						this.courseCount = res.data
 						this.yesterdayVO = res.data.yesterdayVO
 					} else {

pages_course/videovip.vue

@@ -163,7 +163,7 @@
 				<view class="errQuesbox" v-if="errQues&&errQues.length>0">
 					<view class="errQuesbox-item textOne" v-for="(it,index) in errQues" :key="index">{{it.title}}</view>
 				</view>
-				<view class="answerPopup-btn" v-if="errTitle == '恭喜你，回答正确'" @click="closeAnswerPopup">确认</view>
+				<view class="answerPopup-btn" v-if="errTitle == '恭喜你，回答正确'" @click="closeAnswerPopup">点击领取红包</view>
 				<view class="tipsPopup-btn-box" v-else
 					:style="{marginTop: errQues&&errQues.length>0 ? '40rpx':'54rpx'}">
 					<view class="tipsPopup-btn" @click="closeAnswerPopup">{{remain > 0 ? '重新答题': '确认'}}</view>
@@ -1270,11 +1270,19 @@
 									this.answerPopup=true
 								}
 							} else {
-								// 答题成功
 								this.errTitle = "恭喜你，回答正确"
+								uni.login({
+									provider: 'weixin',
+									success: async loginRes => {
+										console.log(loginRes)
+										var code=loginRes
+										this.closeAnswerPopup(loginRes.code)
+									}
+								})
+								// 答题成功
 								// this.errDesc = `请选择奖励`
 								// this.$refs.answerPopup.open("center")
-								this.answerPopup=true
+								// this.answerPopup=true
 							}
 						} else {
 							if (res.msg == "该课题到达答错次数限制") {
@@ -1297,7 +1305,7 @@
 			rewardChange(e) {
 				this.currentReward = e.detail.value
 			},
-			closeAnswerPopup() {
+			closeAnswerPopup(code) {
 				// this.$refs.answerPopup.close()
 				uni.showLoading({
 					title: "加载中..."
@@ -1308,12 +1316,13 @@
 						userId:this.userInfo.userId,
 						// rewardType: Number(this.currentReward),
 						source: 2, // 小程序
-						appId: this.appid
+						appId: this.appid,
+						code:code
 					}
 					sendReward(param).then(res => {
 						if(res.code == 200) {
 							uni.hideLoading()
-							this.answerPopup=!this.answerPopup
+							// this.answerPopup=!this.answerPopup
 							console.log('红包',res)
 							if(res.isNew&&res.isNew==1) {
 								console.log('红包配置',res)

pages_manage/manageDetail.vue

@@ -688,7 +688,7 @@
 			},
 			confirm() {
 				this.getcout()
-				this.getredbaglist()
+				// this.getredbaglist()
 				this.courselist = []
 				this.getcoursegroup()
 			},

project.config.json

@@ -26,5 +26,5 @@
     "ignore": [],
     "include": []
   },
-  "appid": "wx29d26f63f836be7f"
+  "appid": "wx414427b10866c04e"
 }

router/router.js

@@ -17,6 +17,9 @@ export default new Vuex.Store({
 	// imgpath: 'https://zkzh-2025.oss-cn-beijing.aliyuncs.com',//中康图片请求地址
 	// logoname:'中康未来智慧',
 	// appid:'wxedde588767b358b1',
+	imgpath: 'https://zkzh-2025.oss-cn-beijing.aliyuncs.com',//新中康图片请求地址
+	logoname:'中康未来智慧',
+	appid:'wx414427b10866c04e',
 	// imgpath: 'https://fc-1361520560.cos.ap-beijing.myqcloud.com',//蜂巢快药图片请求地址
 	// logoname:'蜂巢快药',
 	// appid:'wx903d9aee9cffb320',////蜂巢快药
@@ -35,9 +38,9 @@ export default new Vuex.Store({
 	// imgpath: 'https://bnkc-1323137866.cos.ap-chongqing.myqcloud.com',//百年康城图片请求地址
 	// logoname:'百年康成',
 	// appid:'wx0d021524695f1943'//h5,
-	imgpath: 'https://drk-1363981074.cos.ap-chongqing.myqcloud.com',//德瑞康图片请求地址
-	logoname:'青岛市德瑞康',
-	appid:'wx76cb55db092a41ae',
+	// imgpath: 'https://drk-1363981074.cos.ap-chongqing.myqcloud.com',//德瑞康图片请求地址
+	// logoname:'青岛市德瑞康',
+	// appid:'wx29d26f63f836be7f',
 	// imgpath: 'https://jkjobs.ylrztop.com',//金慷建图片请求地址
 	// logoname:'金慷建',
 	// appid:'wxa73f0d48f1f2f66c',