共力分加成

apis/index.js

@@ -10,8 +10,8 @@ import router from '../router'
 
 // 基础配置
 const config = {
-	apiUrl	: 'https://api.gongli.vip/api/', // 正式环境
+	// apiUrl	: 'https://api.gongli.vip/api/', // 正式环境
-	// apiUrl	: 'http://api.gl.shangkelian.cn/api/', //  测试
+	apiUrl	: 'http://api.gl.shangkelian.cn/api/', //  测试
 	timeout	: 60000
 }
 

apis/interfaces/account.js

@@ -108,3 +108,4 @@ export {
 	integral,
 	paymentpre
 }
+

apis/interfaces/reading.js

@@ -0,0 +1,20 @@
+
+/**
+ * Web唐明明
+ * 匆匆数载恍如梦，岁月迢迢华发增。
+ * 碌碌无为枉半生，一朝惊醒万事空。
+ * moduleName: 微信阅读
+ */
+
+import { request } from '../index'
+
+// url
+const readingUrl = () =>{
+	return request({
+		url: "user/reading/get_url"
+	})
+}
+
+export {
+	readingUrl
+}

manifest.json

@@ -2,11 +2,14 @@
     "name" : "共力生态",
     "appid" : "__UNI__DE7B0E6",
     "description" : "共力生态",
-    "versionName" : "1.0.34",
+    "versionName" : "1.0.35",
     "versionCode" : 100,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
+        "compatible" : {
+            "ignoreVersion" : true
+        },
         "usingComponents" : true,
         "nvueStyleCompiler" : "uni-app",
         "compilerVersion" : 3,

pages/life/capacity.vue

@@ -47,7 +47,7 @@
 				<view class="title">共建产率<text>{{build.capacity}}GLF/h</text></view>
 				<view class="subtitle">{{build.current}}/{{build.max}}</view>
 			</view>
-			<view class="capacity-block-text ">产品当前设置共建者每日可以通过看广告获得共建值</view>
+			<view class="capacity-block-text ">产品当前设置共建者每日可以通过看广告获得共建值（暂未开放，敬请期待）</view>
 		</view>
 		<view class="capacity-block">
 			<view class="capacity-block-title">

pages/life/life.vue

@@ -8,6 +8,7 @@
 		</view>
 		<!-- 共力人生 -->
 		<view class="life-cover">
+			<!-- 签到 -->
 			<view class="life-sign">
 				<view class="life-sign-icon number-float" @click="onSign">
 					<view class="life-sign-icon-text">{{isSign ? 'GLF': '签到'}}</view>
@@ -31,6 +32,13 @@
 					</view>
 				</view>
 			</view>
+			<!-- 微信阅读 -->
+			<view class="reading" v-if="!isOver">
+				<view class="reading-icon number-float" @click="onReading">
+					<image class="reading-icon-image" :src="require('@/static/icon/reading_btn.png')" alt="签到"></image>
+				</view>
+				<view class="reading-title">共力分加成</view>
+			</view>
 			<image class="life-cover-back" :src="require('@/static/life/back.png')"></image>
 			<view class="life-role">
 				<image class="life-role-src" :src="figurePath" mode="widthFix" />
@@ -111,6 +119,9 @@
 		life,
 		sign
 	} from '@/apis/interfaces/life.js'
+	import {
+		readingUrl
+	} from '@/apis/interfaces/reading.js'
 	import AD from '@/utils/ad.js'
 	var account;
 	export default {
@@ -139,6 +150,7 @@
 				timeData: {},
 				isSign: false,
 				isAccount: false,
+				isOver	 : false,
 			};
 		},
 		onShow() {
@@ -171,6 +183,7 @@
 					this.message = res.message
 					this.order = res.order
 					this.isSign = res.is_sign
+					this.isOver = res.is_over
 					if (res.is_sign) {
 						this.outTime()
 					}
@@ -241,6 +254,25 @@
 					}
 				})
 			},
+			// 微信阅读
+			onReading(){
+				uni.showLoading({
+					title: ''
+				})
+				readingUrl().then(res => {
+					if(res.is_over){
+						plus.runtime.openURL(res.ticket)
+					}
+					
+					console.log(res)
+					uni.hideLoading()
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+			},
 			// 激励广告
 			showAd() {
 				AD.show({
@@ -248,25 +280,26 @@
 					adType: 'RewardedVideo'
 				}, detail => {
 					if (detail && detail.isEnded) {
-						uni.showLoading({
+						this.Sign()
-							title: '签到中..'
-						})
-						sign().then(res => {
-							uni.showToast({
-								title: '签到成功',
-								icon: 'none'
-							})
-							this.getLife()
-						}).catch(err => {
-							uni.showToast({
-								title: err.message,
-								icon: 'none'
-							})
-						})
 					}
 				}, err => {
+					this.Sign()
+				})
+			},
+			// 签到
+			Sign(){
+				uni.showLoading({
+					title: '签到中..'
+				})
+				sign().then(res => {
 					uni.showToast({
-						title: err.errMsg,
+						title: '签到成功',
+						icon: 'none'
+					})
+					this.getLife()
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
 						icon: 'none'
 					})
 				})
@@ -610,7 +643,33 @@
 		width: 100%;
 		padding-top: 134%;
 		overflow: hidden;
-
+		// 加成
+		.reading{
+			position: absolute;
+			top: 35vh;
+			left: $margin * 3;
+			z-index: 999;
+			text-align: center;
+			.reading-icon{
+				display: inline-block;
+				width: 78rpx;
+				height: 78rpx;
+				border-radius: 50%;
+				position: relative;
+				.reading-icon-image {
+					position: absolute;
+					top: 0;
+					left: 0;
+					width: 78rpx;
+					height: 78rpx;
+				}
+			}
+			.reading-title{
+				font-size: 26rpx;
+				color: #333;
+			}
+		}
+		// 签到
 		.life-sign {
 			position: absolute;
 			top: 15vh;

pages/rank/index.vue

@@ -20,7 +20,7 @@
         </view>
 
         <view class="rank_update_time" v-if="lists.length > 0">
-            <view class="title"> 加成{{type === '1'?' 结束':'生效'}}倒计时 : </view>
+            <view class="title"> 加成{{type === '1'?'结束':'生效'}}倒计时 : </view>
             <u-count-down :time="end_timestamp" format="DD:HH:mm:ss" autoStart millisecond @change="onChange">
                 <view class="time">
                     <view class="time__item">