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

http/http.js

@@ -162,7 +162,7 @@ function request(args) {
 			    result += encodeURIComponent(key) + '=' + encodeURIComponent(params[key]) + "&"
 		    }
 		})
-		url = url+'?'+result
+		url = url+'?'+(result.slice(0,result.length-1))
 		params = null
 	}
 	let headerObject = {}

manifest.json

@@ -3,7 +3,7 @@
     "appid" : "__UNI__E0B05B1",
     "description" : "",
     "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "versionCode" : 100,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/me/withdraw/index.vue

@@ -28,7 +28,7 @@
 
 			<view class="tab" style="">
 				<view @click="linkTo('/pages/me/withdraw/realName')">实名认证</view>
-				<view @click="linkTo('/pages/me/withdraw/alipay')">提现账号</view>
+				<!-- <view @click="linkTo('/pages/me/withdraw/alipay')">提现账号</view> -->
 				<view @click="linkTo('/pages/me/withdraw/moneyList?moneyType=1&viewType=2')">红包明细</view>
 			</view>
 
@@ -68,7 +68,7 @@
 		<up-modal :show="data.ruleShow" confirm-text="知道了" title="规则说明" :title-style="{fontWeight:'700'}" @confirm="data.ruleShow=false" 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: 14px;color: #333;" :nodes="data.ruleInfo"></rich-text>
+					<rich-text style="text-align: justify;font-size: 18px;color: #666;" :nodes="data.ruleInfo"></rich-text>
 				</scroll-view>
 			</view>
 			
@@ -105,7 +105,7 @@
 		<br/>
 		(2)高峰期提现人数多会导致网络拥堵，显示提现成功之后72小时内属于正常现象，请耐心等候。
 		<br/>
-		4，每日23:00至次日11:00为系统维护时间，活动的对应奖励可能延迟到账。提现通常会在72小时内到账，如遇双休日、节假日，提现到账时间可能会延长。活动高峰期间，由于网络拥堵，用户可能存在短时间内无法提现的情况。平台将尽最大努力及时恢复提现功能，但无需因此承担任何责任。
+		4，每日08:00至次日18:00为提现时间，活动的对应奖励可能延迟到账。提现通常会在72小时内到账，如遇双休日、节假日，提现到账时间可能会延长。活动高峰期间，由于网络拥堵，用户可能存在短时间内无法提现的情况。平台将尽最大努力及时恢复提现功能，但无需因此承担任何责任。
 		<br/>`,
 		money: '',
 		mayMoney: '0',

pages/me/withdraw/realName.vue

@@ -14,8 +14,7 @@
 				<template #right-icon> <up-input border="none" v-model="data.mobile" placeholder="请输入银行预留号码"></up-input> </template>
 			</up-cell>
 		</up-cell-group>
-		<button class="confirm-btn" @click="toLogin"
-			:disabled="data.logining">认证</button>
+		<button v-if="!data.isAccountNo" class="confirm-btn" @click="toLogin" :disabled="data.logining">认证</button>
 		<view style="font-size: 24upx;color: #999999;padding: 0 15rpx;margin-top: 32rpx;margin-bottom: 10rpx;">请正确填写收款人的银行卡号和真实的收款人姓名</view>
 		<view style="font-size: 24upx;color: #999999;padding: 0 15rpx;;margin-bottom: 10rpx;">手机号需是银行卡银行卡预留手机号</view>
 		<view style="font-size: 24upx;color: #999999;padding: 0 15rpx;;margin-bottom: 10rpx;">银行卡号需与收款人姓名一致</view>
@@ -29,6 +28,7 @@
 	import { reactive, nextTick, ref } from 'vue';
 	import { onReady,onLoad,onShow } from '@dcloudio/uni-app'
 	import { updateUser } from '@/api/me/withdraw.js';
+	import { selectUserById } from '@/api/user/user.js';
 	import { commonType } from '@/api/init.js';
 	
 	let data = reactive({
@@ -36,16 +36,29 @@
 		mobile: null,
 		certNum: null,
 		accountNo: null,
+		isAccountNo: null,
 		logining: false
 	})
 	
 	onLoad(() => {
-		data.certName = uni.getStorageSync('userInfo').certName;
-		data.mobile = uni.getStorageSync('userInfo').mobile;
-		data.certNum = uni.getStorageSync('userInfo').certNo;
-		data.accountNo = uni.getStorageSync('userInfo').accountNo;
+		getUserInfo()
 	})
 	
+	function getUserInfo () {
+		selectUserById().then(res=>{
+			if(res){
+				data.certName = res.certName;
+				data.mobile = res.mobile;
+				if ( res.accountNo ) {
+					data.accountNo = res.accountNo;
+					data.certNum = res.certNo;
+				}
+				data.isAccountNo = res.accountNo;
+			}
+			
+		})
+	}
+	
 	function inputChange(e) {
 		const key = e.currentTarget.dataset.key;
 		data[key] = e.detail.value;

pages/share/index.vue

@@ -85,7 +85,7 @@
 			<up-qrcode :size="200" :val="data.erweima" @result="qrR"></up-qrcode>
 			<canvas id="canvas" canvas-id="poster" :style="{width: data.canvasW+'px', height: data.canvasH+'px'}"></canvas>
 		</view>
-		<up-image :src="data.haibaoImg" alt="" width="400rpx" mode="widthFix"></up-image>
+		<!-- <up-image :src="data.haibaoImg" alt="" width="400rpx" mode="widthFix"></up-image> -->
 		<!-- <tki-qrcode ref="qrcode" :val="erweima" :size="200" background="#fff" foreground="#000" pdground="#000"
 			:onval="true" :loadMake="true" @result="qrR" :show="false"></tki-qrcode> -->
 		<view class="cu-modal" :class="modalName == 'Image' ? 'show' : 'show'" @tap="hideModal">