2.1

common/city-data.js

@@ -16079,4 +16079,5 @@ var city = [{
       }
     ]
   }
-];
+];
+export default city

pages/index/contribute.vue

@@ -118,10 +118,20 @@
 				<view class="name">
 					<text style="color: rgba(34, 34, 34, 1);">作者简介及目录上传</text>
 				</view>
-				<view class="uploading" @click="upload1">
+				<view v-if="showd" class="uploading" style="position: relative;">
+					<view class="" @click="close">
+						<image  src="../../static/images/close (2).png" style="position: absolute;top:-20rpx;right: -20rpx;width: 40rpx;height: 40rpx;" mode=""></image>
+					</view>
+					<image src="../../static/images/pdf (2).png" style="width: 64rpx;height: 64rpx;" mode=""></image>
+					<view  style="margin-top: 16rpx;font-size: 20rpx;
+font-family: PingFangSC, PingFang SC;
+font-weight: 400;
+color: #222222;">{{name}}</view>
+				</view>
+				<view v-else class="uploading" @click="upload1">
 					<image src="../../static/images/uploading.png" style="width: 64rpx;height: 64rpx;" mode=""></image>
 					<view class="up" style="margin-top: 16rpx;">选择文件</view>
-					<view class="up">（不超过10M）</view>
+					<view class="up" style="text-align: center;">请上传pdf,不超过10M</view>
 				</view>
 			</view>
 			<view class="btn" @click="touploading">
@@ -193,13 +203,21 @@
 				manuscript: '', //稿件状态
 				showa: false,
 				showb: false,
+				name:'',
+				path1:'',
+				path:'',
+				showd:false
 			};
 		},
 		methods: {
+			close(){
+				this.showd = false
+				this.from.biographical_url = ''
+			},
 			upload1() {
 				let that = this;
 				uni.chooseFile({
-					count: 1, //限制选择的文件数量
+					// count: , //限制选择的文件数量
 					type: 'all', //非图片和视频的文件,不选默认为all
 					extension: [".pdf", 'pdf'], //此处限制文件类型
 					success(res) {
@@ -223,7 +241,6 @@
 						'user': 'test'
 					},
 					success: (res) => {
-						console.log('uploadImage success, res is:', res)
 						uni.hideLoading();
 						uni.showToast({
 							title: '上传成功',
@@ -231,8 +248,9 @@
 							duration: 1000
 						})
 						var obj = JSON.parse(res.data)
-						this.path = obj.data.fullurl
-						this.flielist.push(obj.data.fullurl)
+						this.from.biographical_url = obj.data.fullurl
+						this.showd = true
+						// this.flielist.push(obj.data.fullurl)
 					},
 					fail: (err) => {
 						console.log('uploadImage fail', err);
@@ -264,7 +282,12 @@
 				this.$u.post('api/books/addContribute', {
 					...this.from
 				}).then(res => {
-					console.log(res);
+					if(res.code==1){
+						this.$u.toast('提交成功')
+						uni.switchTab({
+							url:'/pages/index/index'
+						})
+					}
 				})
 			},
 			toshowb() {

pages/index/orderinfo.vue

@@ -20,7 +20,21 @@
 					<view class="money">¥{{item.price}}</view>
 				</view>
 			</view> -->
-			<view class="u-flex" style="margin-top: 32rpx;" v-for="(item,index) in orderlist" :key="index">
+			<view v-if="index==3" class="u-flex" style="margin-top: 32rpx;" v-for="(item,index) in orderlist" :key="index">
+				<view class="box">
+					<image :src="item.good_item.image" style="width: 200rpx;height: 160rpx;" mode=""></image>
+				</view>
+				<view class=""
+					style="margin-left: 20rpx;justify-content: space-between;display: flex;flex-direction: column;height: 160rpx;">
+					<view class="" style="width: 400rpx;">
+						<view class="title u-line-1" style="margin-bottom: 8rpx;">{{item.good_item.title}}</view>
+						<view class="fufei" v-if="item.good_item.price>0">资源类型：付费资源</view>
+						<view class="fufei" v-if="item.good_item.price==0">资源类型：免费资源</view>
+					</view>
+					<view class="money">¥{{item.good_item.price}}</view>
+				</view>
+			</view>
+			<view v-else class="u-flex" style="margin-top: 32rpx;" v-for="(item,index) in orderlist" :key="index">
 				<view class="box">
 					<image :src="item.good_item.image" style="width: 120rpx;height: 160rpx;" mode=""></image>
 				</view>
@@ -132,7 +146,7 @@
 			},
 			pay() {
 				uni.navigateTo({
-					url: '/pages/index/pay/pay'
+					url: '/pages/index/pay/pay?id='+this.orderid
 				})
 			}
 		}
@@ -252,8 +266,8 @@
 	}
 
 	.box {
-		width: 160rpx;
-		height: 160rpx;
+		// width: 160rpx;
+		// height: 160rpx;
 		border: 2rpx solid rgba(151, 151, 151, 0.2);
 		padding: 0 20rpx
 	}

pages/index/pay/pay.vue

@@ -5,10 +5,10 @@
 			<view class="success">支付成功</view>
 			<view class="" style="margin-top: 26rpx;">
 				<text class="money">¥</text>
-				<text class="money" style="font-size: 44rpx;">148.32</text>
+				<text class="money" style="font-size: 44rpx;">{{total_price}}</text>
 			</view>
 			<view class="order">
-				<text class="one">订单编号： 47903234955559</text>
+				<text class="one">订单编号： {{order_on}}</text>
 				<text class="one" style="color: rgba(10, 109, 205, 1);margin-left: 20rpx;" @click="success">查看订单</text>
 			</view>
 			<view class="button" @click="accomplish">
@@ -23,19 +23,29 @@
 		data() {
 			return {
 				id: '',
-				bookid: ''
+				bookid: '',
+				order_on:'',
+				total_price:''
 			};
 		},
 		onLoad(options) {
 			this.id = options.id
+			this.orderinfo()
 		},
 		methods: {
+			orderinfo(){
+				this.$u.post("api/order/getOrderInfo",{
+					id:this.id
+				}).then(res=>{
+					this.order_on = res.data.order_on
+					this.total_price = res.data.total_price
+				})
+			},
 			accomplish() {
 				this.bookid = uni.getStorageSync('bookid')
-				console.log(this.bookid);
 				uni.switchTab({
 					// url: '/pages/index/bookinfo?id=' + this.bookid
-					url:'/pages/index/index'
+					url: '/pages/index/index'
 				})
 			},
 			success() {

pages/index/stylebook.vue

@@ -77,10 +77,11 @@
 						<input v-model="from.mailing_name" type="text" style="width: 100%;" />
 					</view>
 				</view>
-				<view class="u-flex u-row-between" style="margin-top: 40rpx;">
+				<view @click="showc=true" class="u-flex u-row-between" style="margin-top: 40rpx;">
 					<view class="address">所在地区：</view>
-					<view class="box u-flex " style="margin-top: 0rpx;width: 500rpx;">
-						<input v-model="from.mailing_area" type="text" style="width: 100%;" />
+					<view  class="box u-flex " style="margin-top: 0rpx;width: 500rpx;">
+						{{from.mailing_area}}
+						<!-- <input  @click="showc=true" disabled v-model="from.mailing_area" type="text" style="width: 100%;" /> -->
 					</view>
 				</view>
 				<view class="u-flex u-row-between" style="margin-top: 40rpx;">
@@ -100,6 +101,8 @@
 				提交
 			</view>
 		</view>
+		<u-select :list='city' mode='mutil-column-auto' value-name='code' label-name='name' child-name='sub'
+			v-model="showc" @confirm="changecity"></u-select>
 	</view>
 </template>
 
@@ -108,7 +111,8 @@
 	export default {
 		data() {
 			return {
-				value:0,
+				showc:false,
+				value: 0,
 				list: [{
 						name: '教材用书',
 						disabled: false,
@@ -125,12 +129,13 @@
 						id: 2
 					}
 				],
+				city: city,
 				from: {
 					name: '',
 					phone: '',
 					email: '',
 					school: '',
-					use_to: '',
+					use_to: 0,
 					mailing_name: '',
 					mailing_area: '',
 					mailing_address: '',
@@ -141,10 +146,15 @@
 		},
 		onLoad(options) {
 			this.from.books_id = options.id
+			console.log(city);
 		},
 		methods: {
-			radioChange(e) {
+			changecity(e){
 				console.log(e);
+				this.from.mailing_area = e[0].label+e[1].label+e[2].label
+			},
+			radioChange(e) {
+				this.from.use_to = e
 			},
 			changeground(e) {
 				console.log(e);
@@ -185,7 +195,10 @@
 				this.$u.post("api/books/addSampleApply", {
 					...this.from
 				}).then(res => {
-
+					console.log(res);
+					if (res.code == 1) {
+						uni.navigateBack()
+					}
 				})
 			}
 		}

pages/index/video.vue

@@ -2,8 +2,8 @@
 	<view class="page">
 		<view class="video">
 			<image :src="info.image" style="width: 750rpx;height: 456rpx;" mode=""></image>
-			<image v-if="current==1" src="/static/images/play.png" mode="" class="ding"></image>
-			<image v-if="current==0" src="/static/images/free.png" mode="" class="free"></image>
+			<image v-if="current==1" src="/static/images/play.png" mode="" @click="open" class="ding"></image>
+			<image v-if="current==0" src="/static/images/free.png" mode="" @click="open" class="free"></image>
 		</view>
 		<view class="">
 			<u-tabs active-color='#06A971' :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
@@ -50,20 +50,22 @@
 		</view>
 		<view class="bottom" style="display: flex;justify-content: space-between;">
 			<view class="button1 u-flex u-row-center" v-if="current==0">
-				<view class="">免费试看</view>
+				<view class="" @click="open">免费试看</view>
 				<image src="/static/images/slice.png" style="width: 32rpx; height: 32rpx;margin-left: 12rpx;" mode="">
 				</image>
 			</view>
-			<view class="button2" v-if="current==0">
+			<view class="button2" v-if="current==0" @click="toorderinfo">
 				立即订阅
 			</view>
-			<view class="button" v-if="current==1">
+			<view @click="open()" class="button" v-if="current==1">
 				立即学习
 			</view>
 		</view>
 		<u-popup v-model="show1" mode="center">
-			<video :src='url' class="video" id="demoVideo" :controls="true" :enable-progress-gesture="false">
-			</video>
+			<view class="" style="font-size: 0;">
+				<video :src='url' class="video" id="demoVideo" :controls="true" :enable-progress-gesture="false">
+				</video>
+			</view>
 		</u-popup>
 	</view>
 </template>
@@ -90,7 +92,8 @@
 					is_pay: '',
 				},
 				file: [],
-				url: ''
+				url: '',
+				url1: ''
 			};
 		},
 		onLoad(options) {
@@ -98,6 +101,22 @@
 			this.getVideoInfo()
 		},
 		methods: {
+			toorderinfo() {
+				this.$u.post('api/order/createOrder', {
+					goods_id: this.id,
+					type: 1
+				}).then(res => {
+					if (res.code == 1) {
+						uni.navigateTo({
+							url: '/pages/index/orderinfo?id=' + res.data.id + "&index=" + 3
+						})
+					}
+				})
+			},
+			open() {
+				this.show1 = true
+				this.url = this.url1
+			},
 			//获取视频信息
 			getVideoInfo() {
 				this.$u.post('api/video/getVideoInfo', {
@@ -110,6 +129,7 @@
 					const regex = new RegExp('<img', 'gi')
 					this.video_desc = content.replace(regex, `<img style="max-width: 100%; height: auto"`)
 					this.file = res.data.file
+					this.url1 = res.data.file[0].url
 				})
 			},
 			change(index) {

pages/success.vue

@@ -13,13 +13,25 @@
 		</view>
 		<view class="order">
 			<view class="">订单信息</view>
-			<view class="" style="display: flex;margin-top: 32rpx;" v-for="(item,index) in goodslist" :key="index">
+			<view v-if="info.type==1" class="" style="display: flex;margin-top: 32rpx;" v-for="(item,index) in goodslist" :key="index">
+				<view class="box">
+					<image style="width: 200rpx;height: 160rpx;" :src="item.good_item.image" mode=""></image>
+				</view>
+				<view class="flexc" style="">
+					<view class="">
+						<view class="title u-line-1 ">{{item.good_item.title}}</view>
+						<view class="" style="margin-top: 12rpx;">资源类型：付费资源</view>
+					</view>
+					<view class="" style="margin-top: 32rpx;">¥{{item.good_item.price}}</view>
+				</view>
+			</view>
+			<view v-else class="" style="display: flex;margin-top: 32rpx;" v-for="(item,index) in goodslist" :key="index">
 				<view class="box">
 					<image style="width: 120rpx;height: 160rpx;" :src="item.good_item.image" mode=""></image>
 				</view>
 				<view class="flexc" style="">
 					<view class="">
-						<view class="title">{{item.good_item.title}}</view>
+						<view class="title u-line-1">{{item.good_item.title}}</view>
 						<view class="" style="margin-top: 12rpx;">资源类型：付费资源</view>
 					</view>
 					<view class="" style="margin-top: 32rpx;">¥{{item.good_item.price}}</view>
@@ -39,11 +51,11 @@
 			</view>
 			<view class="order1">
 				<text class="info1">下单时间</text>
-				<text class="math">239020283892034</text>
+				<text class="math">{{info.createtime}}</text>
 			</view>
 			<view class="order1">
 				<text class="info1">支付时间</text>
-				<text class="math">2023-11-12 18:23:12</text>
+				<text class="math">{{info.paytime}}</text>
 			</view>
 			<view class="order1">
 				<text class="info1">支付方式</text>
@@ -61,7 +73,10 @@
 				goodslist: [],
 				info: {
 					order_on: '',
-					total_price: ''
+					total_price: '',
+					createtime:'',
+					paytime:'',
+					type:''
 				}
 			};
 		},
@@ -167,8 +182,8 @@
 	}
 
 	.box {
-		width: 160rpx;
-		height: 160rpx;
+		// width: 160rpx;
+		// height: 160rpx;
 		border: 1rpx solid rgba(151, 151, 151, 0.2);
 		padding: 0 20rpx;
 	}
@@ -178,6 +193,7 @@
 		font-family: PingFangHK, PingFangHK;
 		font-weight: 400;
 		color: #333333;
+		width: 400rpx;
 	}
 
 	.felxc {