Merge branch 'test' of https://e.coding.net/g-cphe0354/duanju/new_app into ymf

commons/config.js

@@ -1,6 +1,6 @@
 
 //打包时修改env的值即可
-const env='production' //test , production,local
+const env='test' //test , production,local
 
 export const encryptKey='1234567890123456' // http数据加解密的key 
 

pages/index/components/contentlist.vue

@@ -26,7 +26,7 @@
 
 	function seVideo(item) {
 		uni.navigateTo({
-			url:"/pages/video/detail?courseId="+item.courseId+"&courseDetailsId="+item.courseDetailsId
+			url: "/pages/video/detail?courseId=" + item.courseId + "&courseDetailsId=" + item.courseDetailsId
 		})
 	}
 </script>
@@ -35,7 +35,7 @@
 	.contentlist {
 		display: flex;
 		align-items: center;
-		justify-content: space-around;
+		justify-content: space-between;
 		flex-wrap: wrap;
 		margin-top: 10rpx;
 		padding: 0 26rpx;
@@ -44,17 +44,19 @@
 			border-radius: 21rpx 21rpx 21rpx 21rpx;
 			width: 30%;
 			margin-top: 20rpx;
+			text-align: center;
 
 			>view {
 				font-weight: 400;
 				font-size: 25rpx;
 				text-align: left;
+				margin-left: 10rpx;
 			}
 		}
 
-		.liststyle:last-child {
+		// .liststyle:last-child {
-			margin-right: auto;
+		// 	margin-right: auto;
-			margin-left: 6rpx;
+		// 	margin-left: 6rpx;
-		}
+		// }
 	}
 </style>

pages/index/index.vue

@@ -45,11 +45,12 @@
 	<image v-if="datas.isExamine" @click="goMsg()" src="@/static/index/red-pack-new.gif"
 		style="width: 200rpx;height: 200rpx;position: fixed;right: 10rpx;bottom: 180rpx;" mode=""></image>
 	<up-modal :show="datas.version.show" :confirm-text="datas.version.confirmText"
-		:showCancelButton="datas.version.cancelText!=''" @cancel="cancelUpdateVersion" @confirm='confirmUpdateVersion' :title="datas.version.title"
+		:showCancelButton="datas.version.cancelText!=''" @cancel="cancelUpdateVersion" @confirm='confirmUpdateVersion'
-		:title-style="{ fontWeight: '700' }" confirm-color="rgb(255, 117, 129)">
+		:title="datas.version.title" :title-style="{ fontWeight: '700' }" confirm-color="rgb(255, 117, 129)">
 		<view class="" style="padding-top: 30rpx;text-align: left;">
 			<scroll-view scroll-y="true" style="max-height: 50vh;">
-				<rich-text style="color:#666" :nodes="datas.version.content"></rich-text>
+				<!-- <rich-text style="color:#666" :nodes="datas.version.content"></rich-text> -->
+				<view style="text-align: justify;font-size: 18px;color: #666;" v-html="datas.version.content"></view>
 			</scroll-view>
 		</view>
 	</up-modal>
@@ -97,6 +98,9 @@
 		// console.log('cash:' + uni.getStorageSync('userInfo').userId + "" + new Date().getTime(), 'debug')
 		// 判断ios是否审核
 		$common.init()
+		// #ifdef H5
+		datas.isExamine = $common.isIosExamine
+		// #endif 
 		// let sysInfo = uni.getSystemInfoSync()
 		// let isIos = sysInfo.platform == 'ios'
 		// if (isIos) {
@@ -126,7 +130,7 @@
 			cancelText: "",
 			downloadLink: ""
 		},
-		setindexdata :false
+		setindexdata: false
 	})
 	onLoad(() => {
 		versionUpdate()
@@ -158,23 +162,23 @@
 		//获取当前系统版本信息
 		plus.runtime.getProperty(plus.runtime.appid, widgetInfo => {
 			//请求后台接口 解析数据 对比版本
-			selectNewApp().then( async res => {
+			selectNewApp().then(async res => {
 				res = res[0];
-				console.log(uni.getSystemInfoSync().platform == 'ios',1101)
+				console.log(uni.getSystemInfoSync().platform == 'ios', 1101)
 				let version;
 				if (uni.getSystemInfoSync().platform == 'android') {
 					version = res.version
 				}
 				if (uni.getSystemInfoSync().platform == 'ios') {
 					version = res.iosVersion
-				} 
+				}
 				let isVersion = await $common.setversion(widgetInfo.version, version)
-				datas.isExamine = $common.isIosExamine 
+				datas.isExamine = $common.isIosExamine
-				console.log(isVersion,'')
+				console.log(isVersion, '')
-				if ( isVersion == 1 ) {
+				if (isVersion == 1) {
 					datas.version.downloadLink = res.androidWgtUrl;
 					datas.version.show = true;
-					datas.version.title = "发现新版本"; 
+					datas.version.title = "发现新版本";
 					datas.version.content = res.des;
 					uni.hideTabBar()
 					if (res.method == "true") {
@@ -189,10 +193,12 @@
 		});
 		//#endif
 	}
-	function cancelUpdateVersion () {
+
+	function cancelUpdateVersion() {
 		uni.showTabBar()
 		datas.version.show = false
 	}
+
 	function confirmUpdateVersion() {
 		// plus.runtime.openURL(config.baseUrl + '/pages/login/appEq')
 		linkTo('/pages/login/download')

pages/me/withdraw/index.vue

@@ -76,7 +76,8 @@
 		<up-modal :show="data.ruleShow" confirm-text="知道了" title="规则说明" :title="data.rule_title" :title-style="{fontWeight:'700'}" @confirm="ruleConfirm" confirm-color="rgb(255, 117, 129)">
 			<view class="u-p-30 u-text-left">
 				<scroll-view scroll-y="true" style="max-height: 50vh;" >
-					<rich-text style="text-align: justify;font-size: 18px;color: #666;" :nodes="data.rule_content"></rich-text>
+					<!-- <rich-text style="text-align: justify;font-size: 18px;color: #666;" :nodes="data.rule_content"></rich-text> -->
+					<view style="text-align: justify;font-size: 18px;color: #666;" v-html="data.rule_content"></view>
 				</scroll-view>
 			</view>
 		</up-modal>
@@ -100,7 +101,7 @@
 	import { commonType } from '@/api/init.js';
 	import { linkTo } from '@/utils/app.js';
 	
-	let data = reactive({
+	const data = reactive({
 		ruleShow: false,
 		rule_title: "",
 		rule_content: "",
@@ -135,6 +136,7 @@
 		getCanCash()
 		announcement({type: 1}).then(res=>{
 			data.ruleList = res
+			
 			ruleInit()
 			
 		})
@@ -163,6 +165,7 @@
 		getMoneyDetail();
 	})
 	function ruleInit(){
+		data.rule_content = ""
 		data.rule_title = data.ruleList[data.ruleIndex].title
 		data.rule_content = data.ruleList[data.ruleIndex].content
 	}
@@ -175,7 +178,7 @@
 				title: "暂未配置规则",
 				icon: 'none'
 			})
-			return
+			return false;
 		}
 		ruleInit()
 		data.ruleShow = true
@@ -184,6 +187,7 @@
 	 * 规则确认
 	 */
 	function ruleConfirm() {
+		console.log(1)
 		data.ruleShow = false
 		data.ruleIndex++
 		if( data.ruleIndex >= data.ruleList.length) {