2.1

common/url.js

@@ -1,4 +1,4 @@
-var url = '/api'
+var url = 'https://tyjc.hdlkeji.com/'
 // var url = 'https://tyjc.hdlkeji.com/'
 export default url
 

manifest.json

@@ -1,90 +1,91 @@
 {
-	"name": "tiyu",
-	"appid": "__UNI__7140AF8",
-	"description": "",
-	"versionName": "1.0.0",
-	"versionCode": "100",
-	"transformPx": false,
-	/* 5+App特有相关 */
-	"app-plus": {
-		"usingComponents": true,
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		/* 模块配置 */
-		"modules": {},
-		/* 应用发布信息 */
-		"distribute": {
-			/* android打包配置 */
-			"android": {
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				]
-			},
-			/* ios打包配置 */
-			"ios": {},
-			/* SDK配置 */
-			"sdkConfigs": {}
-		}
-	},
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "",
-		"setting": {
-			"urlCheck": false
-		},
-		"usingComponents": true
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"h5": {
-		"router": {
-			"mode": "history"
-		},
-		"devServer": {
-			"https": false,
-			"proxy": {
-				"/api": {
-					"target": "https://tyjc.hdlkeji.com/",
-					"changeOrigin": true,
-					"ws": true,
-					"pathRewrite": {
-						"^/api": ""
-					}
-				}
-			}
-		}
-	},
-	"uniStatistics": {
-		"enable": false
-	},
-	"vueVersion": "2"
-}
+    "name" : "tiyu",
+    "appid" : "__UNI__7140AF8",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {},
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {},
+            /* SDK配置 */
+            "sdkConfigs" : {}
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "h5" : {
+        "router" : {
+            "mode" : "history",
+            "base" : "./"
+        },
+        "devServer" : {
+            "https" : false,
+            "proxy" : {
+                "/api" : {
+                    "target" : "https://tyjc.hdlkeji.com/",
+                    "changeOrigin" : true,
+                    "ws" : true,
+                    "pathRewrite" : {
+                        "^/api" : ""
+                    }
+                }
+            }
+        }
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "2"
+}

pages/index/bookinfo.vue

@@ -60,8 +60,8 @@
 						<view class="brief">前言</view>
 						<image class="image" src="/static/images/compile.png" mode=""></image>
 					</view>
-					<view class="fonta">
-						{{datainfo.preface}}
+					<view class="fonta" v-html="datainfo.preface">
+						<!-- {{}} -->
 					</view>
 				</view>
 				<view class="tu">
@@ -69,8 +69,8 @@
 						<view class="brief">内容简介</view>
 						<image class="image" src="/static/images/compile2.png" mode=""></image>
 					</view>
-					<view class="fonta">
-						{{datainfo.content_desc}}
+					<view class="fonta" v-html='datainfo.content_desc'>
+						<!-- {{}} -->
 					</view>
 				</view>
 				<view class="tu">
@@ -78,8 +78,8 @@
 						<view class="brief">作者简介</view>
 						<image class="image" src="/static/images/compile2.png" mode=""></image>
 					</view>
-					<view class="fonta">
-						{{datainfo.author_desc}}
+					<view class="fonta" v-html="datainfo.author_desc">
+						<!-- {{}} -->
 					</view>
 				</view>
 			</view>
@@ -99,7 +99,7 @@
 				<view class="">
 					<view class="sample u-flex u-row-between">
 						<view class="">资源包</view>
-						<view v-if="datainfo.is_free==1" class="u-flex">
+						<view v-if="datainfo.is_free==1&&book_type==0" class="u-flex">
 							<view class="selling">资源售价</view>
 							<!-- <view class="selling">纸质售价</view> -->
 							<view class="money5">¥{{price}}</view>
@@ -144,6 +144,7 @@
 			<view v-if="datainfo.is_free==0" class="right" @click="show=true">免费下载</view>
 			<!-- <view v-if="datainfo.is_certificate==0" @click="show=true" class="right">体验下载</view> -->
 			<view v-if="datainfo.is_pay==0" class="right" @click="show=true">已购买，可下载</view>
+			<view v-if="datainfo.is_pay==1&&datainfo.book_type==1" class="right" @click="orderinfo">立即购买</view>
 			<view v-if="datainfo.is_pay!=0&&datainfo.is_certificate!=0&&datainfo.is_free!=0" class="right"
 				@click="toyang()">在线试读</view>
 		</view>
@@ -373,10 +374,14 @@
 				this.current = index;
 			},
 			toupdown(index) {
-				uni.setStorageSync('bookid', this.id)
-				uni.navigateTo({
-					url: '/pages/index/updown?id=' + this.id + "&&index=" + index
-				})
+				if (uni.getStorageSync('token')) {
+					uni.setStorageSync('bookid', this.id)
+					uni.navigateTo({
+						url: '/pages/index/updown?id=' + this.series_id + "&&index=" + index
+					})
+				}else{
+					this.$u.toast('请登录后下载')
+				}
 			},
 			stylebook() {
 				uni.navigateTo({

pages/index/contribute.vue

@@ -55,7 +55,7 @@
 					<text style="color: rgba(34, 34, 34, 1);">选题名称</text>
 				</view>
 				<view class="box u-flex">
-					<input type="text" style="width: 100%;" />
+					<input v-model='from.selected_name' type="text" style="width: 100%;" />
 				</view>
 			</view>
 			<!-- 稿件状态 -->
@@ -120,10 +120,12 @@
 				</view>
 				<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>
+						<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;
+					<view style="margin-top: 16rpx;font-size: 20rpx;
 font-family: PingFangSC, PingFang SC;
 font-weight: 400;
 color: #222222;">{{name}}</view>
@@ -168,6 +170,7 @@ color: #222222;">{{name}}</view>
 					last_publish_time: '',
 					funds_status: 0,
 					biographical_url: '',
+					selected_name: ''
 				},
 				moneylist: [{
 						id: 0,
@@ -203,14 +206,14 @@ color: #222222;">{{name}}</view>
 				manuscript: '', //稿件状态
 				showa: false,
 				showb: false,
-				name:'',
-				path1:'',
-				path:'',
-				showd:false
+				name: '',
+				path1: '',
+				path: '',
+				showd: false
 			};
 		},
 		methods: {
-			close(){
+			close() {
 				this.showd = false
 				this.from.biographical_url = ''
 			},
@@ -279,14 +282,20 @@ color: #222222;">{{name}}</view>
 					this.$u.toast("请输入正确的邮箱号")
 					return
 				}
+				if (!this.from.selected_name) {
+					this.$u.toast('请填写选题名称')
+					return
+				}
 				this.$u.post('api/books/addContribute', {
 					...this.from
 				}).then(res => {
-					if(res.code==1){
+					if (res.code == 1) {
 						this.$u.toast('提交成功')
-						uni.switchTab({
-							url:'/pages/index/index'
-						})
+						setTimeout(() => {
+							uni.switchTab({
+								url: '/pages/index/index'
+							})
+						}, 800)
 					}
 				})
 			},

pages/index/index-search.vue

@@ -11,11 +11,11 @@
 				搜索历史
 			</view>
 			<view class="" @click="clear">
-				<u-icon name="trash" color="rgba(0,0,0,.7)" size="14"></u-icon>
+				<u-icon name="trash" color="rgba(0,0,0,.7)" size="28"></u-icon>
 			</view>
 		</view>
 		<view class="u-flex" style="flex-wrap: wrap;margin-top: 24rpx;" v-if="show1">
-			<view class="item" style="margin-right: 16rpx;" v-for="(item,index) in search" :key="index">
+			<view class="item" style="margin-right: 16rpx;" v-for="(item,index) in search" :key="index" @click="searcha(item)">
 				{{item}}
 			</view>
 		</view>
@@ -107,6 +107,10 @@
 			}
 		},
 		methods: {
+			searcha(item){
+				this.keyword1 = item
+				this.getBooksList()
+			},
 			onchange(index) {
 				this.curret = index
 				if (index == 2) {

pages/index/video.vue

@@ -35,26 +35,26 @@
 			<!-- 	<view class="" style="height: 166rpx;"></view> -->
 			<view class="catalogue" v-if="current==1 && file.length > 0">
 				<view v-for="(item,index) in file" :key="index" class="section u-flex u-row-between"
-					@click="onplay(item.url)">
+					@click="onplay(item.url,item.is_try)">
 					<view class="">
 						<text class="tong">{{item.title}}</text>
 					</view>
-					<view v-if="info.is_pay==1" class="look">
-						观看
-					</view>
 					<view v-if="item.is_try==0" class="look">
 						试看
 					</view>
+					<view v-else class="look">
+						观看
+					</view>
 				</view>
 			</view>
 		</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="" @click="open">免费试看</view>
+			<view class="button1 u-flex u-row-center" style="margin-right: 11rpx;" v-if="current==0&&trylist.length>0">
+				<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" @click="toorderinfo">
+			<view style="flex: 1;" class="button2" v-if="current==0" @click="toorderinfo">
 				立即订阅
 			</view>
 			<view @click="open()" class="button" v-if="current==1">
@@ -93,7 +93,8 @@
 				},
 				file: [],
 				url: '',
-				url1: ''
+				url1: '',
+				trylist: []
 			};
 		},
 		onLoad(options) {
@@ -102,16 +103,31 @@
 		},
 		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
-						})
-					}
-				})
+				if (uni.getStorageSync("token")) {
+					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
+							})
+						}
+					})
+				} else {
+					uni.showModal({
+						title: '提示',
+						content: '请先登录',
+						confirmText: '我知道了',
+						success: function(res) {
+							if (res.confirm) {
+
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+				}
 			},
 			open() {
 				this.show1 = true
@@ -129,7 +145,12 @@
 					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
+					res.data.file.map(item => {
+						if (item.is_try == 0) {
+							this.trylist.push(item)
+						}
+					})
+					this.url1 = trylist[0].url
 				})
 			},
 			change(index) {
@@ -140,9 +161,15 @@
 					url: '/pages/index/updown'
 				})
 			},
-			onplay(url) {
-				this.show1 = true
-				this.url = url
+			onplay(url, is_try) {
+				if (is_try == 0) {
+					this.open()
+				} else if (this.info.is_pay == 0) {
+					this.show1 = true
+					this.url = url
+				} else {
+					this.$u.toast("请购买后观看")
+				}
 			}
 		}
 	}

pages/mine/card.vue

@@ -79,9 +79,11 @@
 			};
 		},
 		onLoad() {
-			this.getMyCertificate()
-			this.Certificate()
-			this.unCertificate()
+			if (uni.getStorageSync('token')) {
+				this.getMyCertificate()
+				this.Certificate()
+				this.unCertificate()
+			}
 		},
 		methods: {
 			use(id) {

pages/mine/mine.vue

@@ -82,8 +82,8 @@
 		onLoad() {
 			if (uni.getStorageSync('token')) {
 				this.login = true
+				this.getUserinfo()
 			}
-			this.getUserinfo()
 		}
 	}
 </script>

pages/mine/myorder.vue

@@ -64,7 +64,12 @@
 			};
 		},
 		onLoad() {
-			this.getOrderList()
+			if (uni.getStorageSync('token')) {
+				this.getOrderList()
+			}
+		},
+		onPullDownRefresh() {
+			
 		},
 		methods: {
 			orderinfo(id) {

unpackage/dist/build/h5/index.html

@@ -0,0 +1,2 @@
+<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>tiyu</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.9abb6b03.js></script><script src=./static/js/index.96476d77.js></script></body></html>