12-20

components/news-module/news-module.vue

@@ -30,7 +30,7 @@
 						</view> -->
 						<view v-if="item1.images.length > 2" class="imgList hflex acenter jbetween">
 							<block v-for="(item2,index2) in item1.images" :key="index2">
-								<image :src="item2" mode="aspectFill" class="img" @tap.stop="priveImg(index,index2)"></image>
+								<image :src="item2" mode="aspectFill" class="img" @tap.stop="priveImg(index,index1,index2)"></image>
 							</block>
 						</view>
 						<view v-if="item1.images.length == 1 && !item1.has_img" class="imgList hflex acenter jcenter">
@@ -75,11 +75,12 @@
 				$api.jump('/page_index/pages/index/newDetail?id=' + id)
 			},
 			// 查看图片
-			priveImg(index,index2) {
+			priveImg(index,index1,index2) {
 				var that = this
+				console.log(index,index2);
 				uni.previewImage({
-					urls: that.pageList[index].imgs,
-					current: that.pageList[index].imgs[index2]
+					urls: that.pageList[index].xw[index1].images,
+					current: that.pageList[index].xw[index1].images[index2]
 				});
 			}
 		}

page_index/pages/index/newDetail.vue

@@ -13,31 +13,31 @@
 		<!-- <video :src="pageData.video" play-btn-position="center" class="video" v-if="pageData.video"></video> -->
 		<view class="date">发布于{{pageData.create_time}}</view>
 		<view class="comment">
-			<view class="comment_title">评论{{pageData.comment.num?pageData.comment.num:''}}</view>
-			<view v-if="pageData.comment.length == 0" class="hflex acenter jcenter comment_none">暂无评论</view>
+			<view class="comment_title">评论{{comment.total?comment.total:''}}</view>
+			<view v-if="comment.total == 0" class="hflex acenter jcenter comment_none">暂无评论</view>
 			<view v-else>
-				<block v-for="(item,index) in pageData.comment" :key="index">
+				<block v-for="(item,index) in comment.data" :key="index">
 					<view class="hflex">
-						<image :src="item.headimg" class="headimg"></image>
+						<image :src="item.user.headimg" class="headimg"></image>
 						<view class="comment_right">
-							<view class="comment_name">{{item.name}}</view>
+							<view class="comment_name">{{item.uer.name}}</view>
 							<view class="comment_content">{{item.content}}</view>
-							<view class="comment_date">{{item.date}}</view>
+							<view class="comment_date">{{item.create_time}}</view>
 						</view>
 					</view>
 				</block>
 			</view>
 		</view>
 		<view class="bottom hflex acenter jbetween">
-			<view class="hflex acenter">
-				<image src="/static/images/comment/dianzan1.png" class="dianzan" v-if="!pageData.is_dz"></image>
+			<view class="hflex acenter" @click="getLike">
+				<image src="/static/images/comment/dianzan1.png" class="dianzan" v-if="!pageData.is_liked"></image>
 				<image src="/static/images/comment/dianzan2.png" class="dianzan" v-else></image>
-				<view class="dz_text">{{!pageData.is_dz?'点赞':pageData.dzNum}}</view>
+				<view class="dz_text">{{!pageData.is_liked?'点赞':pageData.likes_count}}</view>
 			</view>
 			<view class="hflex acenter ">
-				<u-input v-model="comment" border="none" placeholder="我来说两句" shape="circle"></u-input>
-				<image src="/static/images/comment/comment.png" class="comment_icon"></image>
-				<view class="dz_text">{{pageData.comment.num?'评论':pageData.comment.num}}</view>
+				<u-input v-model="message" border="none" placeholder="我来说两句" shape="circle"></u-input>
+				<image src="/static/images/comment/comment.png" class="comment_icon" @click="send"></image>
+				<view class="dz_text">{{comment.total == 0?'评论':comment.total}}</view>
 			</view>
 		</view>
 	</view>
@@ -51,9 +51,13 @@
 			return {
 				pageData: {
 				},
+				message: '',
 				name: '船百知官方账号',
-				comment:'',
+				comment: [],
 				id: '',
+				page: 1,
+				limit: 10,
+				total: 10
 			}
 		},
 		onLoad(options) {
@@ -72,6 +76,57 @@
 				}, function(res) {
 					if(res.code == 1) {
 						that.pageData = res.data
+						that.getComment()
+					}
+				})
+			},
+			getComment() {
+				$api.req({
+					url: '/data/api.Xw/comments',
+					data: {
+						id: that.id,
+						page: that.page,
+						limit: that.limit
+					}
+				}, function(res) {
+					if(res.code == 1) {
+						that.comment = res.data
+						that.total = res.data.total
+					}
+				})
+			},
+			getLike() {
+				if(that.pageData.is_liked) {
+					that.pageData.is_liked = 0
+					that.pageData.likes_count -=1
+				} else {
+					that.pageData.is_liked = 1
+					that.pageData.likes_count +=1
+				}
+				$api.req({
+					url: '/data/api.Xw/like',
+					data: {
+						id: that.id
+					}
+				}, function(res) {
+					if(res.code == 1) {
+						$api.info(res.info)
+					}
+				})
+			},
+			send() {
+				$api.req({
+					url: '/data/api.Xw/comment',
+					method: 'POST',
+					data: {
+						id: that.id,
+						content: that.message
+					}
+				}, function(res) {
+					if(res.code == 1) {
+						that.message = ""
+						$api.info(res.info)
+						that.getComment()
 					}
 				})
 			}
@@ -209,7 +264,7 @@
 			height: 166rpx;
 			background: #FFFFFF;
 			box-sizing: border-box;
-			padding: 8rpx 30rpx 74rpx;
+			padding: 8rpx 20rpx 74rpx;
 			.dianzan {
 				width: 48rpx;
 				height: 48rpx;

page_index/pages/purchase/purchase.vue

@@ -22,22 +22,22 @@
 							<image src="/static/images/comment/order_type2.png"  v-if="item.type == 1" class="order_img"></image>
 							<image src="/static/images/comment/order_type3.png"  v-if="item.type == 2" class="order_img"></image>
 							<image src="/static/images/comment/order_type4.png"  v-if="item.type == 3" class="order_img"></image>
-							<view class="order_title">{{item.name}}</view>
+							<view class="order_title">{{item.real_name}}</view>
 						</view>
 						<view class="">
-							<block v-for="(item2,inx) in item.order" :key="inx">
+							<block v-for="(item2,inx) in item.item" :key="inx">
 								<view class="order_item">
 									<view class="item_name">{{item2.name}}</view>
 									<view class="hflex acenter ">
-										<view class="text_style1 padR-20" >规格：{{item2.norm}}</view>
-										<view class="text_style1">数量：{{item2.num}}</view>
+										<view class="text_style1 padR-20" >规格：{{item2.spec}}</view>
+										<view class="text_style1">数量：{{item2.number}}</view>
 									</view>
 								</view>
 							</block>
 						</view>
 						<view class="hflex acenter jbetween order_bottom">
-							<view class="text_style1">发布于{{item.date}}</view>
-							<view class="more" @click="toDetail(item.index)">查看更多 》</view>
+							<view class="text_style1">发布于{{item.create_time}}</view>
+							<view class="more" @click="toDetail(item.id)">查看更多 》</view>
 						</view>
 					</view>
 				</block>
@@ -208,7 +208,7 @@
 					url: '/data/api.auth.Offer/purchase_order'
 				}, function(res) {
 					if(res.code == 1) {
-						that.pageList = res.data
+						that.pageList = res.data.list
 					}
 				})
 			},

page_index/pages/resources/resourDetail.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<view class="top hflex acenter">
 			<image src="/static/images/comment/company1.png" class="top_img"></image>
-			<view class="top_text">{{pageData.name}}</view>
+			<view class="top_text">{{pageData.title}}</view>
 		</view>
 		<view class="box">
 			<view class="tabs hflex acenter jcenter">
@@ -23,26 +23,38 @@
 		data() {
 			return {
 				pageData: {
-					name: '重庆长江轮船有限公司江湾船厂',
-					rule: '根据《中华人民共和国价格法》、《中华人民共和国商业银行法》、《商业银行服务价格管理办法》、《国家发展改革委 中国银监会关于印发商业银行服务政府指导价政府定价目录的通知》、《中国银保监会关于规范银行服务市场调节价管理的指导意见》等规定，按照“收费项目公开、服务质价公开、效用功能公开、优惠政策公开”的“四公开”要求，现将本行各项金融服务价格标准予以公告。本公告内容包括服务提示、政府指导价政府定价项目价格标准、中国农业银行免费服务项目及中国农业银行市场调节价服务价格标准等，自2022年4月30日起执行。',
-					convention:'根据《中华人民共和国价格法》、《中华人民共和国商业银行法》、《商业银行服务价格管理办法》、《国家发展改革委 中国银监会关于印发商业银行服务政府指导价政府定价目录的通知》、《中国银保监会关于规范银行服务市场调节价管理的指导意见》等规定，按照“收费项目公开、服务质价公开、效用功能公开、优惠政策公开”的“四公开”要求，现将本行各项金融服务价格标准予以公告。本公告内容包括服务提示、政府指导价政府定价项目价格标准、中国农业银行免费服务项目及中国农业银行市场调节价服务价格标准等，自2022年4月30日起执行。',
 				},
 				content: '',
-				tab_active: 1
+				tab_active: 1,
+				id: ''
 			}
 		},
-		onLoad() {
+		onLoad(options) {
 			that = this
-			that.content = that.pageData.rule
+			that.id = options.id
+			that.getData()
 		},
 		methods: {
+			getData() {
+				$api.req({
+					url: '/data/api.ResCenter/show',
+					data: {
+						id: that.id
+					}
+				}, function(res) {
+					if(res.code == 1) {
+						that.pageData = res.data
+						that.content = res.data.c_rule
+					}
+				})
+			},
 			// 切换tab
 			changeTab(index) {
 				that.tab_active = index
 				if(index == 1) {
-					that.content = that.pageData.rule
+					that.content = that.pageData.c_rule
 				} else {
-					that.content = that.pageData.convention
+					that.content = that.pageData.c_conv
 				}
 			}
 		},

page_index/pages/resources/resources.vue

@@ -2,21 +2,21 @@
 	<view class="content">
 		<view class="hflex acenter jbetween">
 			<view class="top_bg">
-				<view class="top" @click="toRule">规则</view>
+				<view class="top" @click="toRule(1)">规则</view>
 			</view>
 			<view class="top_bg">
-				<view class="top">公约</view>
+				<view class="top" @click="toRule(2)">公约</view>
 			</view>
 			<view class="top_bg">
-				<view class="top">供方认可机构清单</view>
+				<view class="top" @click="toRule(3)">供方认可机构清单</view>
 			</view>
 		</view>
 		<view class="">
 			<block v-for="(item,index) in pageList" :key="index">
 				<view class="box">
-					<view class="box_name">{{item.name}}</view>
-					<view class="text_style1 text_hide">规则：{{item.rule}}</view>
-					<view class="text_style1 text_hide">公约：{{item.convention}}</view>
+					<view class="box_name">{{item.title}}</view>
+					<view class="text_style1 text_hide">规则：{{item.c_rule}}</view>
+					<view class="text_style1 text_hide">公约：{{item.c_conv}}</view>
 					<view class="bottom hflex jend">
 						<view class="btn" @click="toDetail(item.id)">查看详情</view>
 					</view>
@@ -33,50 +33,41 @@
 		data() {
 			return {
 				pageList: [
-					{
-						id: 1,
-						name: '重庆长江轮船有限公司江湾船厂',
-						rule: '古宥村船溪二港北帝庙周边环境改造工程—招标项目的潜在投标…',
-						convention:'古宥村船溪二港北帝庙周边环境改造工程—招标项目的潜在投标…',
-					},
-					{
-						id: 1,
-						name: '重庆长江轮船有限公司江湾船厂',
-						rule: '古宥村船溪二港北帝庙周边环境改造工程—招标项目的潜在投标…',
-						convention:'古宥村船溪二港北帝庙周边环境改造工程—招标项目的潜在投标…',
-					},
-					{
-						id: 1,
-						name: '重庆长江轮船有限公司江湾船厂',
-						rule: '古宥村船溪二港北帝庙周边环境改造工程—招标项目的潜在投标…',
-						convention:'古宥村船溪二港北帝庙周边环境改造工程—招标项目的潜在投标…',
-					},
-					{
-						id: 1,
-						name: '重庆长江轮船有限公司江湾船厂',
-						rule: '古宥村船溪二港北帝庙周边环境改造工程—招标项目的潜在投标…',
-						convention:'古宥村船溪二港北帝庙周边环境改造工程—招标项目的潜在投标…',
-					},
-					{
-						id: 1,
-						name: '重庆长江轮船有限公司江湾船厂',
-						rule: '古宥村船溪二港北帝庙周边环境改造工程—招标项目的潜在投标…',
-						convention:'古宥村船溪二港北帝庙周边环境改造工程—招标项目的潜在投标…',
-					}
 				],
+				page: 1,
+				limit: 10,
+				total: 10
 			}
 		},
 		onLoad() {
 			that = this
+			that.getList()
 		},
 		methods: {
+			getList() {
+				$api.req({
+					url: '/data/api.ResCenter/index',
+					data: {
+						page: that.page,
+						limit: that.limit
+					}
+				}, function(res) {
+					if(res.code == 1) {
+						if(that.page == 1) {
+							that.pageList = res.data.data
+						} else {
+							that.pageList.concat(res.data.data)
+						}
+					}
+				})
+			},
 			// 查看详情
 			toDetail(id) {
 				$api.jump('/page_index/pages/resources/resourDetail?id=' + id)
 			},
 			// 规则
-			toRule() {
-				$api.jump('/page_index/pages/resources/rule')
+			toRule(index) {
+				$api.jump('/page_index/pages/resources/rule?index=' + index)
 			}
 		},
 	}

page_index/pages/resources/rule.vue

@@ -13,11 +13,45 @@
 				content: ''
 			}
 		},
-		onLoad() {
+		onLoad(options) {
 			that = this
+			var title = ''
+			switch(options.index) {
+				case '1': 
+					title = '规则';
+					break;
+				case '2':
+					title = '公约';
+					break;
+				case '3':
+					title = '供方认可机构清单';
+					break;
+			}
+			uni.setNavigationBarTitle({
+				title: title
+			})
+			that.getData(options.index)
 		},
 		methods: {
-			
+			getData(index) {
+				$api.req({
+					url: '/data/api.ResCenter/config'
+				}, function(res) {
+					if(res.code == 1) {
+						switch(index) {
+							case '1': 
+								that.content = res.data.c_rule;
+								break;
+							case '2':
+								that.content = res.data.c_conv;
+								break;
+							case '3':
+								that.content = res.data.c_menu;
+								break;
+						}
+					}
+				})
+			}
 		},
 	}
 </script>

page_mine/pages/member/index.vue

@@ -16,7 +16,7 @@
 				<u-checkbox-group @change="checkboxChange">
 					<u-checkbox v-model="agree" shape="circle"></u-checkbox>
 				</u-checkbox-group>
-				<view class="text">已阅读并同意<span class="read" @click="open(0)">《会员服务协议》</span></view>
+				<view class="text">已阅读并同意<span class="read" @click="open">《会员服务协议》</span></view>
 			</view>
 			<view class="button hflex acenter jcenter" @click="openMember">
 				<view>确定协议并开通</view>
@@ -28,13 +28,13 @@
 				<view class="price">￥{{price}}</view>
 				<!-- <view class="text1">支付方式</view> -->
 				<view class="vflex">
-					<u-checkbox-group @change="checkboxChange1" placement="column" value="checkValue">
+					<u-radio-group @change="checkboxChange1" placement="column" value="checkValue">
 						<view class="box1 hflex acenter jbetween">
 							<view class="hflex acenter">
 								<image src="/static/images/shop/wx_pay.png" style="width: 48rpx;height: 48rpx;"></image>
 								<view class="box_right">微信支付</view>
 							</view>
-							<u-checkbox :checked="true" name="0" shape="circle"></u-checkbox>
+							<u-radio :checked="true" name="0" shape="circle"></u-radio>
 						</view>
 						<view class="box1 hflex acenter jbetween">
 							<view class="hflex acenter">
@@ -43,10 +43,10 @@
 							</view>
 							<view class="hflex acenter">
 								<view class="info">{{info}}</view>
-								<u-checkbox name="1" shape="circle"></u-checkbox>
+								<u-radio name="1" shape="circle"></u-radio>
 							</view>
 						</view>
-					</u-checkbox-group>
+					</u-radio-group>
 				</view>
 				<view class="btn" @click="pay">立即支付</view>
 			</view>
@@ -60,17 +60,11 @@
 	export default {
 		data() {
 			return {
-				text: `
-					<p>权益说明:</p>
-					<p>1.纯净去广告,优质外刊原著精读,导师领读;</p>
-					<p>2.纯净去广告,优质外刊原著精读,导师领读;</p>
-					<p>3.纯净去广告,优质外刊原著精读,导师领读;</p>
-					<p>4.纯净去广告,优质外刊原著精读,导师领读,纯净去广告,优质外刊原著精读,导师领读;</p>
-				`,
+				text: '',
 				agree: false,
-				agree1: ['0'],
+				agree1: '',
 				pay_show: false,
-				price: 588,
+				price: 0,
 				is_member: 1,
 				member_date: '2022-12-01',
 				amount: '',
@@ -82,13 +76,27 @@
 					{
 						name: 'yue'
 					}
-				]
+				],
+				data: ''
 			}
 		},
 		onLoad() {
 			that = this
+			that.getData() 
 		},
 		methods: {
+			getData() {
+				$api.req({
+					url: '/data/api.auth.Center/getvipinfo',
+					method: 'POST',
+				}, function(res) {
+					if(res.code == 1) {
+						that.price = res.data.price
+						that.text = res.data.user_vip_des
+						that.data = res.data.user_vip_agreement
+					}
+				})
+			},
 			// 阅读并同意
 			checkboxChange(n) {
 				this.agree = !this.agree
@@ -96,7 +104,6 @@
 			// 选择支付方式
 			checkboxChange1(n) {
 				this.agree1 = n
-				console.log(this.agree1);
 			},
 			// 确定协议并开通
 			openMember() {
@@ -107,6 +114,10 @@
 				}
 				
 			},
+			open() {
+				uni.setStorageSync('agreement',that.data)
+				$api.jump('/pages/user/agreement?title=会员服务协议')
+			},
 			// 关闭弹窗
 			close() {
 				that.pay_show = false

page_mine/pages/wallet/bankList.vue

@@ -8,7 +8,7 @@
 		</view>
 		<view class="vflex" v-else>
 			<block v-for="(item,index) in pageList" :key="index">
-				<view class="box1" @click="open">
+				<view class="box1" @click="open(item.id)">
 					<view class="hflex">
 						<!-- <image :src="item.icon" class="bank_info"></image> -->
 						<view class="name">{{item.card_name}}</view>
@@ -21,9 +21,9 @@
 			<u-icon name="plus-circle" color="#506DFF" size="19"></u-icon>
 			<view class="add_text">去添加</view>
 		</view>
-		<u-popup :show="show" :round="10" mode="bottom" @close="close" @open="open">
+		<u-popup :show="show" :round="10" mode="bottom" @close="close">
 			<view class="popu">
-				<view class="popu_text hflex acenter jcenter">解除绑定</view>
+				<view class="popu_text hflex acenter jcenter" @click="delbank">解除绑定</view>
 				<view class="popu_btn hflex acenter jcenter" @click="close">取消</view>
 			</view>
 		</u-popup>
@@ -39,7 +39,8 @@
 				pageList: [
 					
 				],
-				show: false
+				show: false,
+				id: ''
 			}
 		},
 		onLoad() {
@@ -65,11 +66,27 @@
 			add() {
 				$api.jump('/page_mine/pages/wallet/add')
 			},
-			open() {
+			open(id) {
+				that.id = id
 				that.show = true
 			},
 			close() {
 				that.show = false
+			},
+			delbank() {
+				$api.req({
+					url: '/data/api.auth.Center/delbank',
+					method: 'POST',
+					data: {
+						id: that.id
+					}
+				}, function(res) {
+					if(res.code == 1) {
+						that.close()
+						$api.info(res.info)
+						that.getBank()
+					}
+				})
 			}
 		},
 	}

pages.json

@@ -80,6 +80,13 @@
 				"navigationBarBackgroundColor": "#fff",
 				"navigationStyle": "custom" // 隐藏系统导航栏
 			}
+		},
+		{
+			"path": "pages/user/agreement",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#fff"
+			}
 		}
 	],
 	"subPackages": [

pages/user/agreement.vue

@@ -0,0 +1,33 @@
+<template>
+	<view class="content">
+		<u-parse :content="data"></u-parse>
+	</view>
+</template>
+
+<script>
+	import $api from '@/static/js/api.js'
+	var that = ''
+	export default {
+		data() {
+			return {
+				data: ''
+			}
+		},
+		onLoad(options) {
+			that = this
+			if(options.title) {
+				uni.setNavigationBarTitle({
+					title: options.title
+				})
+			}
+			that.data = uni.getStorageSync('agreement')
+		},
+		methods: {
+			
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content {}
+</style>