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

me/setting/xieyi.vue

@@ -9,6 +9,7 @@
 </template>
 
 <script>
+	import { $cache_config } from '@/store/cashe.js'
     export default {
         data() {
             return {
@@ -38,6 +39,18 @@
 				// 		this.content = res.data.content;
 				// 	}
 				// });
+				console.log($cache_config.agreement)
+				
+				uni.request({
+				      url: $cache_config.agreement,
+				      method: 'GET',
+				      success: (res) => {
+						  console.log(res.data[154])
+				      },
+				      fail: (err) => {
+				        console.error(err)
+				      }
+				    })
 				this.$u.get('app/common/type/154').then(res => {
 					this.content = res.data.value
 					

pages/index/index.vue

@@ -439,14 +439,17 @@
 				this.ruleInit()
 				return
 			}
-			httpsRequest.getT("app/announcement", {type: 0}).then(res => {
+			if(!uni.getStorageSync('ruleShow')){
-				if (res.code == 0&&res.data.length > 0) {
+				httpsRequest.getT("app/announcement", {type: 0}).then(res => {
-					this.ruleShow = true
+					if (res.code == 0&&res.data.length > 0) {
-					this.ruleList = res.data
+						this.ruleShow = true
-					$cache_rule.set('ruleIndex',this.ruleList)
+						this.ruleList = res.data
-					this.ruleInit()
+						$cache_rule.set('ruleIndex',this.ruleList)
-				}
+						this.ruleInit()
-			});
+					}
+				});
+			}
+			
 		},
 		onReachBottom() {
 			if (this.page < this.pages) {
@@ -486,6 +489,8 @@
 				this.ruleIndex++
 				if( this.ruleIndex >= this.ruleList.length) {
 					this.ruleIndex = 0
+					uni.setStorageSync('ruleShow', true)
+
 					return
 				}
 				this.ruleShow = false

pages/login/appEq.vue

@@ -99,44 +99,24 @@
 					this.$Request.get('/app/common/type/50').then(res => {
 						if (res.code === 0) {
 							if (res.data && res.data.value) {
-								if (this.openShares) {
+								// #ifndef H5
-									let ua = navigator.userAgent.toLowerCase();
+								plus.runtime.openURL(res.data.value, function(res) {
-									if (ua.indexOf('micromessenger') === -1) {
+								
-										this.show_share = false;
+								});
-										// #ifndef H5
+								// #endif
-										plus.runtime.openURL(res.data.value, function(res) {
+								// #ifdef H5
-
+								uni.setClipboardData({
-										});
+									data: res.data.value,
-										// #endif
+									success: r => {
-										// #ifdef H5
+										// this.$queue.showToast('邀请码复制成功');
-										window.location.href = res.data.value;
-										// uni.switchTab({
-										// 	url: 'pages/index/index'
-										// })
-										// #endif
-									} else {
-										this.show_share = true;
 									}
-								} else {
+								});
-									// #ifndef H5
+								
-									plus.runtime.openURL(res.data.value, function(res) {
+								uni.switchTab({
-
+									url: '/pages/index/index'
-									});
+								})
-									// #endif
+								// window.location.href = res.data.value;
-									// #ifdef H5
+								// #endif
-									uni.setClipboardData({
-										data: res.data.value,
-										success: r => {
-											// this.$queue.showToast('邀请码复制成功');
-										}
-									});
-									
-									uni.switchTab({
-										url: '/pages/index/index'
-									})
-									// window.location.href = res.data.value;
-									// #endif
-								}
 							}
 						}
 					});

utils/init.js

@@ -46,7 +46,9 @@ const $map = {
 	860: 'dyadUnitId',
 	881: '',
 	109: '',
-	922: 'withdrawNum'
+	922: 'withdrawNum',
+	155: 'privacy',
+	154: 'agreement'
 }
 
 function callback() {