From f972ea9b9feb4c7cb563025c4991a6d82fd0eb5e Mon Sep 17 00:00:00 2001
From: lzx <2602107437@qq.com>
Date: Sun, 3 Sep 2023 23:02:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/active-card/address-list.vue |   2 +-
 components/active-card/order-list.vue   |  15 +-
 env.js                                  |  16 +-
 manifest.json                           |   2 +-
 pages.json                              |   9 +-
 pages/home/index.vue                    | 572 ++++++++++++++++++++++++++------
 pages/my/kanwudetails.vue               |  32 +-
 pages/my/kanwus.vue                     |  44 ++-
 pages/my/login-kehu.vue                 |  29 +-
 pages/my/orderdetails.vue               |  43 ++-
 pages/my/orders.vue                     |  54 ++-
 request/shopro.js                       |  29 +-
 12 files changed, 638 insertions(+), 209 deletions(-)

diff --git a/components/active-card/address-list.vue b/components/active-card/address-list.vue
index 0027f74..9d98d9f 100644
--- a/components/active-card/address-list.vue
+++ b/components/active-card/address-list.vue
@@ -2,7 +2,7 @@
 	<view class="active-card" @click="seeDetail">
 		<view class="active-title">{{item.name}}</view>
 		<view class="active-time flex align-center">
-			<text>{{item.text}}</text>
+			<text>【{{item.type}}】{{item.content}}</text>
 		</view>
 	</view>
 </template>
diff --git a/components/active-card/order-list.vue b/components/active-card/order-list.vue
index 3fd9ed9..c1a3539 100644
--- a/components/active-card/order-list.vue
+++ b/components/active-card/order-list.vue
@@ -1,21 +1,26 @@
 <template>
 	<view class="active-card">
 		
-		<view class="order-status">已退款</view>
+		<view class="order-status" v-if="item.orderStatus == '0'">未付款</view>
+		<view class="order-status" v-if="item.orderStatus == '1'">已付款</view>
+		<view class="order-status" v-if="item.orderStatus == '2'">已完成</view>
+		<view class="order-status" v-if="item.orderStatus == '3'">退款中</view>
+		<view class="order-status" v-if="item.orderStatus == '4'">已退款</view>
+		
 		
 		<view class="active-title">
-			<text class="font-32">订单编号：{{item.tranNo}}</text>
+			<text class="font-32">订单编号：{{item.orderCode}}</text>
 		</view>
 		<view class="active-time flex align-center">
-			<text>下单时间：2023-08-16 12:16:31</text>
+			<text>下单时间：{{item.createTime}}</text>
 		</view>
 		
 		
 		<view class="active-title">
-			<text>订购项目：数学+试卷</text>
+			<text>订购项目：{{item.subItems}}</text>
 		</view>
 		 <view class="active-time2 flex align-center">
-			<text>订单金额：¥0.01</text>
+			<text>订单金额：¥{{item.totalPrice}}</text>
 		</view>
 		
 		<view class="footer">
diff --git a/env.js b/env.js
index 89ad530..2fd5956 100644
--- a/env.js
+++ b/env.js
@@ -2,21 +2,21 @@
 // 不同环境访问不同的路径
 // import store from '@/common/store/index'
 const ENV_API_URL = {
-	development: 'https://jobadmin.java996.icu', //开发环境
-	production: 'https://jobadmin.java996.icu', //生产环境
+	development: 'https://cmbms.xzaiyp.top', //开发环境
+	production: 'https://cmbms.xzaiyp.top', //生产环境
 }
 const ENV_BASE_URL = {
-	development: 'https://jobadmin.java996.icu', //开发环境
-	production: 'https://jobadmin.java996.icu', //生产环境
+	development: 'https://cmbms.xzaiyp.top', //开发环境
+	production: 'https://cmbms.xzaiyp.top', //生产环境
 }
 
 // const ENV_API_URL = {
-// 	development: 'http://localhost:8091', //开发环境
-// 	production: 'http://localhost:8091', //生产环境
+// 	development: 'http://localhost:8090', //开发环境
+// 	production: 'http://localhost:8090', //生产环境
 // }
 // const ENV_BASE_URL = {
-// 	development: 'http://localhost:8091', //开发环境
-// 	production: 'http://localhost:8091', //生产环境
+// 	development: 'http://localhost:8090', //开发环境
+// 	production: 'http://localhost:8090', //生产环境
 // }
 
 
diff --git a/manifest.json b/manifest.json
index a7fde16..d980b17 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
 {
-    "name" : "兼兼街",
+    "name" : "汇智文化学苑",
     "appid" : "__UNI__278B20D",
     "description" : "",
     "versionName" : "1.0.0",
diff --git a/pages.json b/pages.json
index a64631e..95f491a 100644
--- a/pages.json
+++ b/pages.json
@@ -8,8 +8,13 @@
 			"path": "pages/home/index",
 			"name": "home",
 			"style": {
-				"navigationBarTitleText": "汇智文化学苑",
-				"enablePullDownRefresh": true
+				"navigationBarTitleText": "汇智文化学苑"
+			}
+		},
+		{
+			"path": "pages/my/login-kehu",
+			"style": {
+				"navigationBarTitleText": "汇智文化"
 			}
 		},
 		{
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 29b29f9..889242e 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1,120 +1,282 @@
 <template>
 	<view>
 		<view class="home-pages">
-			<view style="position: absolute;top: 0; left: 0; height: 188rpx; width: 100%; z-index: 100; background-color: #FFFFFF; box-shadow: 0px 15px 10px -15px #E8E8E8;">
+			<view
+				style="position: absolute;top: 0; left: 0; height: 188rpx; width: 100%; z-index: 100; background-color: #FFFFFF; box-shadow: 0px 15px 10px -15px #E8E8E8;">
 				<view style="margin: 28rpx 24rpx; display: flex;" @click="newDetail()">
-					<image :showLoading="true" :src="userInfo?userInfo.headImage : morenSrc" style="width: 148rpx;height: 148rpx;border-radius: 50%;"></image>
+					<image :showLoading="true" :src="userInfo?userInfo.headImage : morenSrc"
+						style="width: 148rpx;height: 148rpx;border-radius: 50%;"></image>
 					<view style="padding: 28rpx;">
 						<view style="font-size: 32rpx;font-weight: 600">{{userInfo?userInfo.nickName: '点击登录'}}</view>
+						<view style="margin-top: 30rpx;font-size: 28rpx;font-weight: 500">不积跬步 无以至千里</view>
+					</view>
+					<view style="padding: 28rpx;">
+						<view style="font-size: 30rpx;font-weight: 500">订阅记录 ></view>
 					</view>
 				</view>
 			</view>
-			
+
 			<view class="home-content">
 				<view class="pay-btn-2" @click="seeDetail()">
-					刊物介绍
+					<view style="margin-right: 110rpx;">刊物介绍</view>
+					<!-- <span  ></span> -->
+					
 				</view>
 				<view style="margin: 10rpx; font-weight: 200;">
-					<span >订阅申请</span>
+					<span>订阅申请</span>
 				</view>
-				
+
 				<view class="from">
-					
+
 					<view class="from-line">
-						<span class="label-class">姓名:</span>
-						<view><input v-model="release.name" placeholder="请输入学生姓名"/></view>
+						<span class="label-class"  style="margin-top: 20rpx;">姓名:</span>
+						<view><input style="margin-top: 20rpx;border-bottom: 1px solid #ccc;" v-model="release.userName"  placeholder="请输入学生姓名" /></view>
 					</view>
 					<view class="from-line">
 						<span class="label-class">电话:</span>
-						<view><input v-model="release.address" placeholder="请输入手机号码"/></view>
+						<view><input type="number" style="border-bottom: 1px solid #ccc;" v-model="release.mobilePhone"  placeholder="请输入手机号码" /></view>
+					</view>
+					
+					
+					
+					
+					<view class="from-line" >
+						<span class="label-class">省份:</span>
+						<view class="uni-list-cell-left" >
+							<picker @change="selectedSf" :range="provinceNames" range-key="name" >
+								<!-- {{release.provinceName ? release.provinceName:"请选择省份"}} -->
+								<view style="font-weight: bold;font-size: 20;color: #000;margin-top: 20rpx;">
+									<spen >{{release.provinceName?release.provinceName:'请选择省份'}}</spen>
+								</view>
+								<!-- <spen  :readonly="true" v-model="release.provinceName" style="font-weight: bold;font-size: 20;color: #000;" placeholder="请选择省份" >
+									
+									</spen> -->
+							</picker>
+						</view>
 					</view>
 					<view class="from-line">
-						<span class="label-class">地区:</span>
+						<span class="label-class">区域:</span>
 						<view class="uni-list-cell-left">
-							<picker @change="selectedVs" @columnchange="selectedVs" mode="multiSelector" :range="vsc">
-								<input v-model="release.vsClass" placeholder="请选择地区"/>
+							<picker @change="selectedQy" :range="regionNames" range-key="name">
+								<view style="font-weight: bold;font-size: 20;color: #000;margin-top: 20rpx;">
+									<spen >{{release.regionName?release.regionName:'请选择区域'}}</spen>
+								</view>
+								<!-- <input :readonly="true" v-model="release.regionName" style="font-weight: bold;font-size: 20;color: #000;" placeholder="请选择区域" /> -->
 							</picker>
 						</view>
 					</view>
+
 					<view class="from-line">
 						<span class="label-class">学历:</span>
-						<view class="uni-list-cell-left">	
-							<picker @change="selectedXl" :range="xls">
-								<input v-model="release.xl" placeholder="请选择学历"/>
+						<view class="uni-list-cell-left">
+							<picker @change="selectedXl" :range="schoolTypes">
+								<view style="font-weight: bold;font-size: 20;color: #000;margin-top: 20rpx;">
+									<spen >{{release.schoolType?release.schoolType:'请选择学历'}}</spen>
+								</view>
+								<!-- <input :readonly="true" v-model="release.schoolType" style="font-weight: bold;font-size: 20;color: #000;" placeholder="请选择学历" /> -->
 							</picker>
 						</view>
 					</view>
+					
+					
 					<view class="from-line">
 						<span class="label-class">学校:</span>
-						<view><input v-model="release.unit" placeholder="请选择学校"/></view>
+						<view class="uni-list-cell-left">
+							<picker @change="selectedXx"  :range="schoolNames" range-key="name">
+								<view style="font-weight: bold;font-size: 20;color: #000;margin-top: 20rpx;">
+									<spen >{{release.schoolName?release.schoolName:'请选择学校'}}</spen>
+								</view>
+								<!-- <input :readonly="true"  v-model="release.schoolName" style="font-weight: bold;font-size: 20;color: #000;" placeholder="请选择学校" /> -->
+							</picker>
+						</view>
+						
+						
+						
+						<!-- <view><input v-model="release.schoolName" placeholder="请选择学校" /></view> -->
 					</view>
 					<view class="from-line">
 						<span class="label-class">年级:</span>
-						<view><input v-model="release.unit" placeholder="请选择年级"/></view>
+						<view class="uni-list-cell-left">
+							<picker @change="selectedNj"  :range="gradeNames" range-key="name">
+								<view style="font-weight: bold;font-size: 20;color: #000;margin-top: 20rpx;">
+									<spen >{{release.gradeName?release.gradeName:'请选择年级'}}</spen>
+								</view>
+								<!-- <input :readonly="true" v-model="release.gradeName" style="font-weight: bold;font-size: 20;color: #000;" placeholder="请选择年级 " /> -->
+							</picker>
+						</view>
+						<!-- <view><input v-model="release.gradeName" placeholder="请选择年级" /></view> -->
 					</view>
 					<view class="from-line">
 						<span class="label-class">班级:</span>
-						<view><input v-model="release.unit" placeholder="请选择班级"/></view>
+						<view class="uni-list-cell-left">
+							<picker @change="selectedBj"  :range="classNames" range-key="name">
+								<view style="font-weight: bold;font-size: 20;color: #000;margin-top: 20rpx;">
+											<spen >{{release.className?release.className:'请选择班级'}}</spen>
+										</view>
+								<!-- <input :readonly="true" v-model="release.className" style="font-weight: bold;font-size: 20;color: #000;" placeholder="请选择班级" /> -->
+							</picker>
+						</view>
+						<!-- <view><input v-model="release.className" placeholder="请选择班级" /></view> -->
 					</view>
-					
-					<view class="home-modal" v-show="showj">
+
+					<view class="home-modal" v-show="showj == true">
+						<!-- :class="{'active': release.topid === item.id}" -->
 						<view class="title">订阅项目</view>
-						<view @click='clickLable(0)' class="label-class" :class="{'active': release.topid === 0}"> ￥43.88 语文 </view>
-						<view @click='clickLable(1)' class="label-class" :class="{'active': release.topid === 1}"> ￥43.88 数学 </view>
-						<view @click='clickLable(2)' class="label-class" :class="{'active': release.topid === 2}"> ￥43.88 英语 </view>
-						<view @click='clickLable(3)' class="label-class" :class="{'active': release.topid === 3}"> ￥43.88 化学 </view>
-						<view @click='clickLable(4)' class="label-class" :class="{'active': release.topid === 4}"> ￥43.88 物理 </view>
-						<view @click='clickLable(5)' class="label-class" :class="{'active': release.topid === 5}"> ￥43.88 历史 </view>
+						<view v-for="(item,index) in dianList" @click='clickLable(index)' class="label-class" :class="{'active': item.selected === true}">
+							￥{{item.price}} {{item.name}}</view>
 					</view>
 
 				</view>
-				<view class="pay-btn" @click="fabujianzhi()">
+				<view class="pay-btn" @click="getCreteClick()">
 					提交申请
 				</view>
 			</view>
-			
-			
-			
+
+
+
 		</view>
 	</view>
 </template>
 
 <script>
-	export default{
-		data(){
-			return{
-				isChecked:false,
-				morenSrc:require('@/static/img/logon-icon.png'),
-				userInfo:null,
+	export default {
+		data() {
+			return {
+				isChecked: false,
+				morenSrc: require('@/static/img/logon-icon.png'),
+				userInfo: null,
 				showj: false,
-				xls: ['小学','初中','高中'],
-				vsc: [['广东省','湖南省'], ['怀山区','广州区']],
-				release:{
-					name:"",
-					address:"",
-					vsClass:"",
-					money:"",
-					unit:"",
-					startTime:"",
-					endTime:"",
-					phone:"",
-					wx:"",
-					myValue:"",
-					xl:"",
+				provinceNames:[],
+				regionNames:[],
+				schoolTypes: ['小学', '初中', '高中'],
+				schoolNames:[],
+				dianList:[],
+				selectId: [],
+				gradeNames:[],
+				classNames:[],
+				clicked:false,
+				
+				
+				
+				vsc: [
+					['广东省', '湖南省'],
+					['怀山区', '广州区']
+				],
+				release: {
+					userName: "",
+					mobilePhone: "",
+					vsClass: "",
+					provinceName:"",
+					regionName:"",
+					schoolType: "",
+					schoolName: "",
+					gradeName: "",
+					className: "",
+					items: "",
+					totalPrice: 0.00,
+					schoolType: "",
 					topid: ""
 				}
 			}
 		},
 		onShow() {
-			
+			this.getmyInfo();
+			this.getProvinceNameList();
+			// this.getYerList();
+			this.getClassList();
 		},
 		onLoad() {
-			
+
 		},
+		// 隐藏微信h5的标题栏
 		onReady() {
 			this.$com.displayNav()
 		},
-		methods:{
+		methods: {
+			// stopKeyborad () {
+			//   this.$refs.scanTextbox.setAttribute('readonly', 'readonly');
+			//   setTimeout(() => {
+			//     this.$refs.scanTextbox.removeAttribute('readonly');
+			//   }, 200);
+			// },
+			//获取省
+			getProvinceNameList(){
+				this.$api('getProvinceNameList', {}).then(res => {
+					if(res.code == 200){
+						this.provinceNames =res.result;
+					}
+				})
+			},
+			//获取区域
+			getRegionNameList(provinceName){
+				this.$api('getRegionNameList', {"provinceName":provinceName}).then(res => {
+					console.log("---")
+					console.log(res)
+					if(res.code == 200){
+						this.regionNames = res.result;
+						console.log("regionNames2")
+						console.log(this.regionNames)
+					}
+				})
+				console.log("regionNames")
+				console.log(this.regionNames)
+			},
+			//获取学校
+			getSchoolList(provinceName,regionName,schoolType){
+				this.$api('getSchoolList', 
+					{
+						"provinceName":provinceName,
+						"regionName":regionName,
+						"schoolType":schoolType,
+					}).then(res => {
+					if(res.code == 200){
+						this.schoolNames =res.result;
+					}
+				})
+			},
+			//获取订阅信息
+			getDinList(provinceName,regionName,schoolType,schoolName,gradeName){
+				
+				this.$api('getDinList',
+					{
+						"provinceName":provinceName,
+						"regionName":regionName,
+						"schoolType":schoolType,
+						"schoolName":schoolName,
+						"gradeName":gradeName,
+					}).then(res => {
+					if(res.code == 200){
+						this.dianList =res.result;
+					}
+				})
+			},
+			//获取订阅信息
+			getYerList(schoolType){
+				this.$api('getYerList',
+					{
+						"schoolType":schoolType,
+					}).then(res => {
+					if(res.code == 200){
+						this.gradeNames =res.result;
+					}
+				})
+			},
+			//获取订阅信息
+			getClassList(){
+				this.$api('getClassList',
+					{
+						
+					}).then(res => {
+					if(res.code == 200){
+						this.classNames =res.result;
+					}
+				})
+			},
+			
+			
+			
+			
+			// 单个复选框事件
 			checkboxChange(e) {
 				let values = e.detail.value;
 				if (values[0] == 1) {
@@ -123,64 +285,243 @@
 					this.isChecked = false;
 				}
 			},
-	
-			getmyInfo(){
+			//提交创建订单
+			createOrder() {
+
+			},
+
+			getmyInfo() {
 				this.$api('myInfo')
-				.then(res=>{
-					if(res.code == 200){
+				.then(res => {
+					if (res.code == 200) {
 						this.role = res.result.role;
 						this.userInfo = res.result;
-						this.$store.commit('set_userInfo',res.result)
-					}else{
+						this.$store.commit('set_userInfo', res.result)
+					} else {
 						this.userInfo = null
 					}
+					if (!this.userInfo) {
+						uni.navigateTo({
+							url: "/pages/my/login-kehu"
+						})
+					}
 				})
 			},
 			//跳转刊物介绍
-			seeDetail(){
-				uni.navigateTo({
-					url:`/pages/my/kanwus`
-				})
+			seeDetail() {
+				if (!this.userInfo) {
+					uni.navigateTo({
+						url: "/pages/my/login-kehu"
+					})
+				} else {
+					uni.navigateTo({
+						url: "/pages/my/kanwus"
+					})
+				}
+			},
+			getCreteClick() {
+				let that = this;
+				if(that.clicked == true){
+					this.$Toast('请不要重复提交！');
+					setTimeout(()=>{
+						that.clicked = false;
+					},1500)
+					return
+				}
+				that.clicked = true;
+				
+				
+				this.$api('createShopOrder', {
+						"userName": this.release.userName,
+						"mobilePhone": this.release.mobilePhone,
+						"provinceName": this.release.provinceName,
+						"regionName": this.release.regionName,
+						"schoolType": this.release.schoolType,
+						"schoolName": this.release.schoolName,
+						"gradeName": this.release.gradeName,
+						"className": this.release.className,
+						"items": this.release.items,
+						// "totalPrice":  this.release.totalPrice,
+					})
+					.then(res => {
+						if(res.code == 500){
+							this.$Toast(res.message)
+						}
+						if (res.code == 200) {
+
+							that.$api('create', {
+									id: res.result.id
+								})
+								.then(res => {
+
+									console.log(res)
+									that.$jweixin.config({
+										debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+										appId: 'wx77fe1fcd6471ecbe', // 必填，公众号的唯一标识
+										timestamp: res.result.timestamp, // 必填，生成签名的时间戳
+										nonceStr: res.result.noncestr, // 必填，生成签名的随机串
+										signature: res.result.sgture, // 必填，签名
+										jsApiList: ['updateAppMessageShareData', 'updateTimelineShareData',
+											'onMenuShareTimeline', 'onMenuShareAppMessage',
+											'chooseWXPay'
+										]
+									});
+
+									that.$jweixin.chooseWXPay({
+										appId: 'wx77fe1fcd6471ecbe',
+										timestamp: res.result
+											.timeStamp, // 支付签名时间戳，注意微信 jssdk 中的所有使用 timestamp 字段均为小写。但最新版的支付后台生成签名使用的 timeStamp 字段名需大写其中的 S 字符
+										nonceStr: res.result.nonceStr, // 支付签名随机串，不长于 32 位
+										package: res.result
+											.packageValue, // 统一支付接口返回的prepay_id参数值，提交格式如：prepay_id=\*\*\*）
+										signType: res.result
+											.signType, // 微信支付V3的传入 RSA ,微信支付V2的传入格式与V2统一下单的签名格式保持一致
+										paySign: res.result.paySign, // 支付签名
+										success: function(res) {
+											that.erop = true;
+											that.clicked = false;
+											uni.navigateTo({
+												url: "/pages/my/orders"
+											})
+										}
+									});
+								})
+
+
+
+						}
+					})
+				
 			},
 			//跳转订阅记录
-			newDetail(){
-				uni.navigateTo({
-					url:`/pages/my/orders`
-				})
+			newDetail() {
+				console.log(":============订阅")
+				if (!this.userInfo) {
+					uni.navigateTo({
+						url: "/pages/my/login-kehu"
+					})
+				} else {
+					console.log(":============订阅订单")
+					uni.navigateTo({
+						url: "/pages/my/orders"
+					})
+				}
+
+			},
+			lower() {
+
 			},
-			lower(){
+			
+			//省份
+			selectedSf(event) {
+				console.log(event.detail.value)
+				// if (event.detail.value) {
+					this.release.provinceName = this.provinceNames[event.detail.value].name
+				// }
+				//清空值
+				this.release.regionName = "";
+				this.release.schoolType = "";
+				this.release.schoolName = "";
+				this.release.gradeName = "";
+				//得到区域
+				this.getRegionNameList(this.release.provinceName);
 				
 			},
-			selectedXl(event){
-				if(event.detail.value){
-					this.release.xl = this.xls[event.detail.value]
-					if(this.release.xl === '高中'){
-						this.showj = true
-					}
-				}
+			//区域
+			selectedQy(event) {
+				// if (event.detail.value) {
+					this.release.regionName = this.regionNames[event.detail.value].name
+					
+					this.release.schoolType = "";
+					this.release.schoolName = "";
+					this.release.gradeName = "";
+				// }
 			},
-			selectedVs(event){
-				if(event.type === 'columnchange'){
-					if(event.detail.column === 0){
+			//学历
+			selectedXl(event) {
+				// if (event.detail.value) {
+					this.release.schoolType = this.schoolTypes[event.detail.value]
+					this.getSchoolList(this.release.provinceName,this.release.regionName,this.release.schoolType);
+					this.getYerList(this.release.schoolType);
+					
+					
+					this.release.schoolName = "";
+					this.release.gradeName = "";
+					
+				// }
+			},
+			//学校
+			selectedXx(event) {
+				// if (event.detail.value) {
+					this.release.schoolName = this.schoolNames[event.detail.value].name
+				// }
+			},
+			
+			
+			
+			
+			
+			
+			
+			
+			selectedNj(event) {
+				// if (event.detail.value) {
+					this.release.gradeName = this.gradeNames[event.detail.value].name
+					this.getDinList(this.release.provinceName,this.release.regionName,this.release.schoolType,this.release.schoolName,this.release.gradeName);
+					this.showj = true
+				// }
+			},
+			
+			selectedBj(event) {
+				console.log(event.detail.value)
+				// if (event.detail.value) {
+					this.release.className = this.classNames[event.detail.value].name
+				// }
+			},
+			
+			
+			selectedVs(event) {
+				if (event.type === 'columnchange') {
+					if (event.detail.column === 0) {
 						const value = this.vsc[event.detail.column][event.detail.value];
 						console.log("选中：" + value);
-						if(1 === event.detail.value){
-							this.vsc[1] = ["永州教育区","长沙教育区"]
+						if (1 === event.detail.value) {
+							this.vsc[1] = ["永州教育区", "长沙教育区"]
 						}
 					}
 				} else {
-					if(event.detail){
+					if (event.detail) {
 						this.release.vsClass = ""
-						event.detail.value.forEach((v,k) => {
+						event.detail.value.forEach((v, k) => {
 							this.release.vsClass += (this.vsc[k][v] + " ");
 						})
 					}
 				}
 			},
-			clickLable(id){
-				this.release.topid = id
+			clickLable(index) {
+				// this.release.topid = item.id
+				// this.release.subItems = item.name
+				// this.release.totalPrice = item.price
+				let ids = "";
+				if (this.dianList[index].selected == true) {
+						this.dianList[index].selected = false;
+						//取消选中时删除数组中的值
+						for (var i = 0; i < this.selectId.length; i++) {
+							if (this.selectId[i] === this.dianList[index].id) {
+								this.selectId.splice(i, 1);
+								
+							}
+						}
+						console.log("选中的值", this.selectId)
+					} else {
+						this.dianList[index].selected = true;
+						this.selectId.push(this.dianList[index].id)
+						
+						console.log("选中的值", this.selectId)
+					}
+					this.release.items = this.selectId;
 			}
-			
+
 		}
 	}
 </script>
@@ -191,97 +532,109 @@
 			margin-top: 20rpx;
 			background-color: #F7F7F7;
 		}
+
 		.from-line {
 			height: 108rpx;
 			display: flex;
 			background-color: #FFFFFF;
-			.label-class{
+
+			.label-class {
 				text-align: justify;
 				text-align-last: justify;
 				line-height: 68rpx;
-				width: 88rpx;
+				width: 138rpx;
 				padding: 0 24rpx;
 			}
-			input{
+
+			input {
 				padding-left: 10rpx;
 				height: 68rpx;
-			}	
+			}
 		}
+
 		.from-line-box {
 			background-color: #FFFFFF;
 			height: 328rpx;
 			margin-right: 50rpx;
 			display: flex;
-			.label-class{
+
+			.label-class {
 				text-align: justify;
 				text-align-last: justify;
 				line-height: 128rpx;
-				width: 128rpx;
+				width: 168rpx;
 				padding: 0 24rpx;
 			}
-			input{
+
+			input {
 				padding-left: 20rpx;
-			}	
+			}
 		}
-		.pay-btn{
+
+		.pay-btn {
 			text-align: center;
 			border-radius: 12rpx;
 			line-height: 78rpx;
-			background-color:  #00CCCC;
+			background-color: #00CCCC;
 			color: #FFFFFF;
 		}
-		.pay-btn-2{
-			margin:10rpx auto;
-			text-align: center;
+
+		.pay-btn-2 {
+			margin: 10rpx auto;
+			text-align: left;
 			border-radius: 12rpx;
 			height: 78rpx;
+			font-weight: 200rpx;
 			line-height: 78rpx;
 			font-size: 48;
 			background-color: #FFFFFF;
 		}
 	}
+
 	.home-pages {
 		padding: 188rpx 10rpx 0;
 		background-color: #F7F7F7;
+
 		.scroll-Y {
 			height: calc(100vh - 200rpx);
 			padding-top: 20rpx;
 		}
 	}
+
 	.home-modal {
 		width: 100vw;
 		min-height: 20vh;
-		
+
 		.title {
 			line-height: 100rpx;
 			margin-top: 40rpx;
 			background-color: #FFF;
 		}
-		
+
 		.label-class {
 			line-height: 100rpx;
 			padding: 0 26rpx;
 			background-color: #FFF;
 			position: relative;
 		}
-		
+
 		.label-class::after {
-			content: " ";
+			content: "";
 			width: 30rpx;
 			height: 30rpx;
 			border-radius: 50%;
 			border: 1rpx solid #888;
-			
+
 			position: absolute;
 			right: 36rpx;
 			top: calc((100rpx - 32rpx) / 2);
 		}
-		
+
 		.label-class.active::after {
 			background-color: #544AFF;
 			border-color: #544AFF;
 		}
-		
+
 		.label-class.active::before {
 			background-color: #FFF;
 			border: none;
@@ -290,12 +643,11 @@
 			height: 12rpx;
 			border-radius: 50%;
 			z-index: 1;
-			
+
 			position: absolute;
 			top: calc((100rpx - 12rpx) / 2);
 			right: 46rpx;
 		}
-	
+
 	}
-		
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/my/kanwudetails.vue b/pages/my/kanwudetails.vue
index 90f202e..5d7a3cc 100644
--- a/pages/my/kanwudetails.vue
+++ b/pages/my/kanwudetails.vue
@@ -1,7 +1,23 @@
 <template>
 	<view class="home-pages">
 		<view class="context">
-			<rich-text :nodes="nodes"></rich-text>
+			<text>名称:{{order.name}}</text>
+		</view>
+		<view class="context">
+			<text>版本:{{order.type}}</text>
+		</view>
+		<view class="context">
+			<text>内容:{{order.content}}</text>
+		</view>
+		<view class="context">
+			<text>原价:{{order.oldPrice}}</text>
+		</view>
+		<view class="context">
+			<text>现价:{{order.price}}</text>
+		</view>
+		<view class="context">
+			
+			<rich-text :nodes="order.details"></rich-text>
 		</view>
 	</view>
 </template>
@@ -10,11 +26,21 @@
 	export default {
 		data() {
 			return {
-				nodes: "<p><strong>语文 人教版</strong></p><p><strong>商品价格:￥39</strong></p><p><strong>商品原价:￥39</strong></p><p>订阅须知:</p><p>本公司提供的小学语文、数学、英语报纸均为四开四版彩色周报，每学期20期报纸+4张月考试卷，合计39元/套，订阅成功后将按照每4期为一次，共分六次配送，订阅时请注意以下几点:</p><p>一、订阅时间，以学期为单位分为两个时间段</p><p>1、期末预定:每学期期未预订下学期报纸，预订的报纸按以下时间配送。(第一周配送1-4期，后5次将每隔三周左右配送一次.)</p><p>2、开学前后订阅: 每学期开学前一周和开学后的第一个月内订阅，报纸配送的时间为订阅成功后一周左右配送1-4期的报纸，后续报纸均与预订报纸配送的时间一致。</p><p>、配送方式:班级集体订阅报纸，本公司直接配送到学校，更好的方便学生与教学同步使用报纸 (免收配送费)。</p><p>客服电话: 15819859838</p>"
+				order:{}
 			}
 		},
 		methods: {
-
+			getById(id){
+				this.$api('getKwById', {'id':id}).then(res => {
+					if(res.code == 200){
+						this.order =res.result;
+					}
+				})
+			}
+		},
+		onLoad(optons) {
+			console.log("optons.id"+optons.id)
+			this.getById(optons.id)
 		}
 	}
 </script>
diff --git a/pages/my/kanwus.vue b/pages/my/kanwus.vue
index 0f12aea..4a42a85 100644
--- a/pages/my/kanwus.vue
+++ b/pages/my/kanwus.vue
@@ -26,17 +26,7 @@
 					isLock: true
 				},
 				list:[
-					{
-						name:"语文学习报+试卷",
-						text:"【人教版】每学期20期彩色周报及4张单元试卷"
-					},
-					{
-						name:"数学学习报+试卷",
-						text:"【湘教版】每学期20期彩色周报及4张单元试卷"
-					},{
-						name:"英语学习报+试卷",
-						text:"【北大师版】每学期26期彩色周报及14张单元试卷"
-					}
+					
 				]
 			}
 		},
@@ -44,7 +34,7 @@
 			this.params.pageNo = 1;
 			this.params.total = null;
 			this.params.isLock = true;
-			
+			this.queryPageListJobRelease();
 		},
 		onReady() {
 			this.$com.displayNav()
@@ -54,7 +44,7 @@
 			this.params.pageNo = 1;
 			this.params.total = null;
 			this.params.isLock = true;
-			
+			this.queryPageListJobRelease()
 		},
 		onReachBottom() {
 			if(this.params.isLock){
@@ -68,13 +58,37 @@
 				}
 				this.params.pageNo+=1;
 				this.$Toast('数据加载成功！');
-				
+				this.queryPageListJobRelease();
 			}
 		},
 		methods:{
+			queryPageListJobRelease(){//学习列表
+				if(this.pageNo>1){
+					uni.showLoading({})
+				}
+				this.$api('getKwList',this.params)
+				.then(res=>{
+					if(res.code == 200){
+						if(this.params.total== null) {
+							this.params.total = res.result.total
+						}
+						
+						if(this.params.pageNo>1){
+							uni.hideLoading();
+						}
+						this.list = this.list.concat(res.result.records);
+						this.params.isLock = true;
+					}else {
+						if(this.params.pageNo>1){
+							uni.hideLoading();
+						}
+						this.params.isLock = true;
+					}	
+				})
+			},
 			seeDetail(item){
 				uni.navigateTo({
-					url:`/pages/my/kanwudetails`
+					url:`/pages/my/kanwudetails?id=`+item.id
 				})
 			}
 		}
diff --git a/pages/my/login-kehu.vue b/pages/my/login-kehu.vue
index 24c6833..e10a84b 100644
--- a/pages/my/login-kehu.vue
+++ b/pages/my/login-kehu.vue
@@ -5,7 +5,7 @@
 			<view class="login-img flex align-center justify-center">
 				<image src="@/static/img/logon-icon.png" mode=""></image>
 			</view>
-			<view class="login-title">兼职尽在兼兼街</view>
+			<view class="login-title">汇智文化学苑</view>
 			<view class="btn-box">
 				<u-button v-if="code !== ''" text="微信授权登录"  :round="true" openType="getUserInfo" @click="logionClick" :customStyle="baomingStyle" :hairline="false" color="#00CCCC"></u-button>
 				<u-button v-else="code === ''" text="获取登录权限"  :round="true" openType="getUserInfo" @click="logionClick" :customStyle="baomingStyle" :hairline="false" color="#00CCCC"></u-button>
@@ -59,6 +59,13 @@
 				this.getwx_authorize();
 			}
 		},
+		onShow() {
+			if(uni.getStorageSync("set_userToken")){
+				uni.navigateTo({
+					url:'/pages/home/index'
+				})
+			}
+		},
 
 		// 隐藏微信h5的标题栏
 		onReady() {
@@ -71,19 +78,19 @@
 				})
 			},
 			logionClick(){
-				// let actoken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2OTA4NjAxNjgsInVzZXJuYW1lIjoib2ROdHc2dEJVNmMxenlnU1lmb2d4ZWdTX2xxbyJ9.OfGbI5WQJYA_wMUUz-BlGHunkLTO0aNoTyOgEdyt8UQ";
+				// let actoken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2OTMzNjA0NDEsInVzZXJuYW1lIjoib1loZmFzdlY0RjVpMk5nWGR2cmU3akZwME5zTSJ9.KtxULfyzKVouBAWRe41AFEB3uSL_VTVU-lXpSGF-yw8";
 				// this.$store.commit('set_userToken',actoken);
-				// uni.switchTab({
-				// 	url:'/pages/my/index'
+				// uni.navigateTo({
+				// 	url:'/pages/home/index'
 				// })
 				// let did = uni.getStorageSync("did");
 				// if (did) {
 				// 	uni.navigateTo({
-				// 		url:'/pages/home/course-detial?id=' + did
+				// 		url:'/pages/home/index?id=' + did
 				// 	})
 				// } else {
-				// 	uni.switchTab({
-				// 		url:'/pages/my/index'
+				// 	uni.navigateTo({
+				// 		url:'/pages/home/index'
 				// 	})
 				// }
 				if(this.code){
@@ -105,11 +112,11 @@
 						if (did) {
 							uni.setStorageSync("did", null);
 							uni.navigateTo({
-								url:'/pages/home/course-detial?id=' + did
+								url:'/pages/home/index?id=' + did
 							})
 						} else {
 							uni.navigateTo({
-								url:'/pages/my/my-xiansuo-now'
+								url:'/pages/home/index'
 							})
 						}
 					}else{
@@ -126,9 +133,9 @@
 				// this.logionClick()
 				let vid = uni.getStorageSync("ivcode"); 
 				//授权的回调地址
-				let redirect_uri = encodeURIComponent('https://job.java996.icu/pages/my/login-kehu');
+				let redirect_uri = encodeURIComponent('https://cmbms-h5.xzaiyp.top/pages/my/login-kehu');
 				//这是我们公众号的appid
-				let appid = 'wx6fb4a17b28186d58';
+				let appid = 'wx77fe1fcd6471ecbe';
 				//修改授权参数
 				window.location.href="https://open.weixin.qq.com/connect/oauth2/authorize?appid="+appid+'&redirect_uri='+redirect_uri+'&response_type=code&scope=snsapi_userinfo&state='+vid+'&connect_redirect=1#wechat_redirect';
 			},
diff --git a/pages/my/orderdetails.vue b/pages/my/orderdetails.vue
index 6fb940b..bff54d5 100644
--- a/pages/my/orderdetails.vue
+++ b/pages/my/orderdetails.vue
@@ -7,31 +7,35 @@
 			
 			<view class="from-line">
 				<span class="label-class">订单编号:</span>
-				<view><input v-model="release.tranNo"/></view>
+				<view><input v-model="order.orderCode"/></view>
 			</view>
 			<view class="from-line">
 				<span class="label-class">创建时间:</span>
-				<view><input v-model="release.createTime"/></view>
+				<view><input v-model="order.createTime"/></view>
 			</view>
 			<view class="from-line">
 				<span class="label-class">姓名:</span>
-				<view><input v-model="release.name"/></view>
+				<view><input v-model="order.userName"/></view>
 			</view>
 			<view class="from-line">
 				<span class="label-class">联系方式:</span>
-				<view><input v-model="release.mobile"/></view>
+				<view><input v-model="order.mobilePhone"/></view>
 			</view>
 			<view class="from-line">
 				<span class="label-class">学校:</span>
-				<view><input v-model="release.shool"/></view>
+				<view><input v-model="order.schoolName"/></view>
 			</view>
 			<view class="from-line">
 				<span class="label-class">年级:</span>
-				<view><input v-model="release.nclass"/></view>
+				<view><input v-model="order.gradeName"/></view>
 			</view>
 			<view class="from-line">
 				<span class="label-class">班级:</span>
-				<view><input v-model="release.class"/></view>
+				<view><input v-model="order.className"/></view>
+			</view>
+			<view class="from-line">
+				<span class="label-class">价格:</span>
+				<view><input v-model="order.totalPrice"/></view>
 			</view>
 			
 	
@@ -43,8 +47,8 @@
 			<view class="from-line">
 				<span class="label-class">订阅内容</span>
 			</view>
-			<view class="form-context">
-				¥ 39.00 数学 + 试卷 （共21份试卷）
+			<view class="form-context" v-for="(item,index) in order.list" >
+				¥ {{item.unitPrice}} {{item.bookitems}}
 			</view>
 		</view>
 		
@@ -55,19 +59,22 @@
 	export default {
 		data() {
 			return {
-				release:{
-					tranNo: "7368742356479233423",
-					createTime: "2031-09-09 22:10:09",
-					name: "廖",
-					mobile: "1992898292",
-					shool: "花样年华华盖中学",
-					nclass: "高中一年级",
-					class: "1409班"
-				}
+				order:{}
 			}
 		},
 		methods: {
+			getById(id){
+				this.$api('getOrderById', {'id':id}).then(res => {
+					if(res.code == 200){
+						this.order =res.result;
+					}
+				})
+			}
 			
+		},
+		onLoad(optons) {
+			console.log("optons.id"+optons.id)
+			this.getById(optons.id)
 		}
 	}
 </script>
diff --git a/pages/my/orders.vue b/pages/my/orders.vue
index dc8b322..77d2c82 100644
--- a/pages/my/orders.vue
+++ b/pages/my/orders.vue
@@ -16,17 +16,15 @@
 			return{
 				params:{
 					pageNo:1,
-					state:'0',
 					pageSize:10,
 					total: null,
 					isLock: true
 				},
 				current:0,
-				list:[{tranNo: "69732894782348932"},{tranNo: "69732894782348931"}],
+				list:[],
 			}
 		},
 		onLoad() {
-			this.params.state = "0";
 			this.params.pageNo = 1;
 			this.params.total = null;
 			this.params.isLock = true;
@@ -59,38 +57,32 @@
 		},
 		methods:{
 			queryPageListJobRelease(){//学习列表
-				// if(this.pageNo>1){
-				// 	uni.showLoading({})
-				// }
-				// this.$api('getOrderList',this.params)
-				// .then(res=>{
-				// 	if(res.code == 200){
-				// 		if(this.params.total== null) {
-				// 			this.params.total = res.result.total
-				// 		}
+				if(this.pageNo>1){
+					uni.showLoading({})
+				}
+				this.$api('getOrderList',this.params)
+				.then(res=>{
+					if(res.code == 200){
+						if(this.params.total== null) {
+							this.params.total = res.result.total
+						}
 						
-				// 		if(this.params.pageNo>1){
-				// 			uni.hideLoading();
-				// 		}
-				// 		this.list = this.list.concat(res.result.records);
-				// 		this.params.isLock = true;
-				// 	}else {
-				// 		if(this.params.pageNo>1){
-				// 			uni.hideLoading();
-				// 		}
-				// 		this.params.isLock = true;
-				// 	}	
-				// })
-			},
-			tabClick(e){
-				// this.params.state = e.id;
-				// this.params.pageNo =1;
-				// this.list = [];
-				// this.queryPageListJobRelease();
+						if(this.params.pageNo>1){
+							uni.hideLoading();
+						}
+						this.list = this.list.concat(res.result.records);
+						this.params.isLock = true;
+					}else {
+						if(this.params.pageNo>1){
+							uni.hideLoading();
+						}
+						this.params.isLock = true;
+					}	
+				})
 			},
 			seeDetail(item){
 				uni.navigateTo({
-					url:`/pages/my/orderdetails`
+					url:`/pages/my/orderdetails?id=`+item.id
 				})
 			}
 		}
diff --git a/request/shopro.js b/request/shopro.js
index 00f82cd..398c177 100644
--- a/request/shopro.js
+++ b/request/shopro.js
@@ -2,11 +2,32 @@
  * 接口列表文件
  */
 export default {
-	myInfo: {url:'/han-hai-dev/sm/index/getUserInfo',auth:false,method:'GET'},
+	myInfo: {url:'/han-hai-dev/sm/index/getUserInfo',auth:true,method:'GET'},
 	//用户-微信公众号授权登录
 	wxLogin: {url:'/han-hai-dev/sm/index/wxLogin',auth:false,method:'POST'},
 	//微信支付
-	create: {url:'/job-dev/job/pay/create',auth:false,method:'GET'},
-	//创建分享
-	creteFenxian: {url:'/job-dev/binYuan/pay/creteFenXian',auth:false,method:'POST'},
+	create: {url:'/han-hai-dev/sm/index/create',auth:false,method:'GET'},
+	//创建订单
+	createShopOrder: {url:'/han-hai-dev/sm/index/saveOrder',auth:false,method:'POST'},
+	//订单列表
+	getOrderList: {url:'/han-hai-dev/sm/index/getOrderList',auth:false,method:'GET'},
+	//订单详情
+	getOrderById: {url:'/han-hai-dev/sm/index/getOrderById',auth:false,method:'GET'},
+	//订单列表
+	getKwList: {url:'/han-hai-dev/sm/index/getKwList',auth:false,method:'GET'},
+	//订单详情
+	getKwById: {url:'/han-hai-dev/sm/index/getKwById',auth:false,method:'GET'},
+	
+	//获取省份
+	getProvinceNameList: {url:'/han-hai-dev/sm/index/getProvinceNameList',auth:false,method:'GET'},
+	//获取区域信息
+	getRegionNameList: {url:'/han-hai-dev/sm/index/getRegionNameList',auth:false,method:'GET'},
+	//获取学校信息
+	getSchoolList: {url:'/han-hai-dev/sm/index/getSchoolList',auth:false,method:'GET'},
+	//获取订阅方式价格
+	getDinList: {url:'/han-hai-dev/sm/index/getDinList',auth:false,method:'GET'},
+	//获取年级
+	getYerList: {url:'/han-hai-dev/sm/index/getYerList',auth:false,method:'GET'},
+	//获取班级
+	getClassList: {url:'/han-hai-dev/sm/index/getClassList',auth:false,method:'GET'},
 };